PR#66: libre/iceweasel: update to 108.0 upstream updates - abslibre

		`@@ -1,33 +1,45 @@`
		`- Many packages (PKGBUILDs and associated files) comes from one of these`
		`- projects:`
		`- - Arch Linux`
		`- - Arch Linux ARM`
		`- - Arch Linux 32`
		`- - Aur (Arch User repository)`
		`+ Many PKGBUILDs and associated files were originally imported`
		`+ from other projects, such as:`

		`- They typically come without a license, so while most of them seem to`
		`- be uncopyrightable due to their extreme simplicity and standardness,`
		`+ ---------------------------------------------------------------`
		`+ \| Project \| "Maintainer (upstream):" identifier \|`
		`+ \|-------------------------------------------------------------\|`
		`+ \| Archlinux \| (arch) \|`
		`+ \| Archlinux32 \| (arch32) \|`
		`+ \| ArchlinuxARM \| (archarm) \|`
		`+ \| Artix \| (artix) \|`
		`+ \| Arch User repository \| (aur) \|`
		`+ \| Gentoo \| n/a \|`
		`+ \| Hyperbola \| (hyperbola) \|`
		`+ ---------------------------------------------------------------`
		`+`
		`+ These typically come without a license, so while most of them seem to`
		`+ be uncopyrightable, due to their extreme simplicity and standardness,`
		`this still creates some legal uncertaincy about their licensing.`

		`- Some packages also come from Hyperbola, and here there is also some`
		`- uncertaincy as the project added a CC0 license in its git repository`
		`- without adding any clear statement associated with it. We still need`
		`- to contact them to get more clarification on their packages licenses`
		`- for new contributions.`
		`+ Several PKGBUILDs and associated files in this repository were`
		`+ created from scratch for the Parabola GNU/Linux-libre project,`
		`+ so they don't depend on other projects licensing decisions.`

		`- Several packages (and associated files) in this repository were`
		`- created from scratch, so they don't depend on other projects licensing`
		`- decisions.`
		`+ Several contributors have agreed to license their past contributions`
		`+ to this repository, under the CC0 license:`

		`- And several contributors agreed to license their past contributions to`
		`- packages in this repository under the CC0 license:`
		`- - Andreas Grapentin`
		`- - bill-auger`
		`- - Denis 'GNUtoo' Carikli`
		`- - Freemor`
		`+ --------------------------------------`
		`+ \| Name \| Hacker ID \|`
		`+ \|------------------------------------\|`
		`+ \| Andreas Grapentin \| (oaken-source) \|`
		`+ \| Bill Auger \| (bill-auger) \|`
		`+ \| Denis Carikli \| (gnutoo) \|`
		`+ \| Freemor \| (freemor) \|`
		`+ \| Joseph Graham \| (xylon) \|`
		`+ \| Omar Vega Ramos \| (ovruni) \|`
		`+ \| Luke Shumaker \| (lukeshu) \|`
		`+ \| David Pizarro \| (megver83) \|`
		`+ --------------------------------------`

		`- As for patches, as they are combined with original project source code`
		`- they are under the same license than the original project.`
		`+ As for patches, as they are combined with, or otherwise contributed to,`
		`+ upstream project source code, they are taken under the same license`
		`+ as the original project, per the inbound<->outbound convention.`

		`- All contributions to packages in this repository must be offered under`
		`- the CC0 license.`
		`+ All contributions to this repository, from Parabola team members and users,`
		`+ must be offered under the CC0 license.`

libre-multilib-testing/gcc-multilib/PKGBUILD

file modified

+1 -1

		`@@ -1,6 +1,6 @@`
		`# $Id$`
		`# Maintainer: Luke R. <g4jc@openmailbox.org> GPG: rsa4096/3EAE8697`
		`- # Maintainer (Arch): Allan McRae <allan@archlinux.org>`
		`+ # Maintainer (arch): Allan McRae <allan@archlinux.org>`

		`# toolchain build order: linux-libre-api-headers->glibc->binutils->gcc->binutils->glibc`
		`# NOTE: libtool requires rebuilt with each new gcc version`

libre-multilib-testing/lib32-glibc/PKGBUILD

file modified

+1 -1

		`@@ -1,6 +1,6 @@`
		`# $Id$`
		`# Maintainer: Luke R. <g4jc@openmailbox.org> GPG: rsa4096/3EAE8697`
		`- # Maintainer (Arch): Allan McRae <allan@archlinux.org>`
		`+ # Maintainer (arch): Allan McRae <allan@archlinux.org>`

		`# toolchain build order: linux-libre-api-headers->glibc->binutils->gcc->binutils->glibc`
		`# NOTE: valgrind requires rebuilt with each major glibc version`

libre-multilib/lib32-mesa-demos/PKGBUILD

file modified

+3 -3

		`@@ -1,7 +1,7 @@`
		`# $Id: PKGBUILD 186203 2016-08-09 13:55:48Z lcarlier $`
		`- # Maintainer (Arch): Jan de Groot <jgc@archlinux.org>`
		`- # Maintainer (Arch): Andreas Radke <andyrtr@archlinux.org>`
		`- # Maintainer (Hyperbola): André Silva <emulatorman@hyperbola.info>`
		`+ # Maintainer (arch): Jan de Groot <jgc@archlinux.org>`
		`+ # Maintainer (arch): Andreas Radke <andyrtr@archlinux.org>`
		`+ # Contributor: André Silva <emulatorman@hyperbola.info>`
		`# Maintainer: Omar Vega Ramos <ovruni@gnu.org.pe>`

		`_pkgbasename=mesa-demos`

libre-multilib/pcsx2/PKGBUILD

file modified

+4 -4

		`@@ -1,8 +1,8 @@`
		`# $Id: PKGBUILD 186214 2016-08-09 14:33:03Z arojas $`
		`- # Maintainer (Arch): Maxime Gauduin <alucryd@archlinux.org>`
		`- # Contributor (Arch): josephgbr <rafael.f.f1@gmail.com>`
		`- # Contributor (Arch): vEX <vex@niechift.com>`
		`- # Maintainer (Hyperbola): Márcio Silva <coadde@hyperbola.info>`
		`+ # Maintainer (arch): Maxime Gauduin <alucryd@archlinux.org>`
		`+ # Contributor: josephgbr <rafael.f.f1@gmail.com>`
		`+ # Contributor: vEX <vex@niechift.com>`
		`+ # Contributor: Márcio Silva <coadde@hyperbola.info>`
		`# Maintainer: Omar Vega Ramos <ovruni@gnu.org.pe>`

		`# NOTE: This package is not in ArchLinux32, maybe`

libre-testing/barebox/PKGBUILD

file modified

+1 -1

		`@@ -1,7 +1,7 @@`
		`# Copyright (C) 2018, 2019 Denis 'GNUtoo' Carikli <GNUtoo@cyberdimension.org>`
		`# This program is free software: you can redistribute it and/or modify`
		`# it under the terms of the CC0 1.0 License.`
		`- # Maintainers: Parabola hackers <dev@lists.parabola.nu>`
		`+ # Maintainer: Parabola Hackers <dev@lists.parabola.nu>`

		`_pkgname=barebox`
		`pkgname=barebox-am335x`

libre-testing/bash/PKGBUILD

file modified

+1 -1

		`@@ -1,4 +1,4 @@`
		`- # Maintainer: Bartłomiej Piotrowski <bpiotrowski@archlinux.org>`
		`+ # Maintainer: Bartłomiej Piotrowski <bpiotrowski@archlinux.org>`
		`# Contributor: Allan McRae <allan@archlinux.org>`
		`# Contributor: Aaron Griffin <aaron@archlinux.org>`

libre-testing/cnchi/PKGBUILD

file removed

-46

		`@@ -1,46 +0,0 @@`
		`- # Maintainer (Artegos): Alex Filgueira <alexfilgueira@antergos.com>`
		`- # Maintainer: André Silva <emulatorman@hyperbola.info>`
		`-`
		`- _pkgname=Cnchi`
		`- pkgname=cnchi`
		`- pkgver=0.12.0`
		`- pkgrel=1.parabola1`
		`- pkgdesc='Graphical Installer for Parabola GNU/Linux-libre, without nonfree software installation support (Parabola rebranded)'`
		`- arch=(any)`
		`- license=(GPL)`
		`- url="https://github.com/Antergos/Cnchi"`
		`- conflicts=(cnchi-dev)`
		`- depends=(python pyalpm python-gobject python-dbus python-cairo python-requests`
		`- python-parted webkitgtk upower python-mako iso-codes gptfdisk python-bugsnag)`
		`- source=("${pkgname}-${pkgver}.tar.gz::https://github.com/Antergos/Cnchi/archive/v${pkgver}.tar.gz"`
		`- libre+rebranding.patch)`
		`- sha256sums=('ada2fecd5710307570feb6a8e01ebafb57ef55d2f1fe1d01d1929608a89af17b')`
		`-`
		`- prepare() {`
		`- cd "${srcdir}/${pkgname}-${pkgver}"`
		`-`
		`- patch -Np1 -i ${srcdir}/libre+rebranding.patch`
		`- }`
		`-`
		`- package() {`
		`- cd "${srcdir}/${pkgname}-${pkgver}"`
		`-`
		`- install -d ${pkgdir}/usr/share/locale/`
		`- install -d ${pkgdir}/usr/share/cnchi`
		`- install -Dm755 "bin/${pkgname}" "${pkgdir}/usr/bin/cnchi"`
		`- install -Dm755 "${pkgname}.desktop" "${pkgdir}/usr/share/applications/cnchi.desktop"`
		`- for i in cnchi bin data scripts ui; do`
		`- cp -R ${i} "${pkgdir}/usr/share/cnchi/"`
		`- done`
		`-`
		`- for files in po/*; do`
		`- if [ -f "$files" ] && [ "$files" != 'po/cnchi.pot' ]; then`
		- STRING_PO=`echo ${files#*/}`
		- STRING=`echo ${STRING_PO%.po}`
		`- mkdir -p ${pkgdir}/usr/share/locale/${STRING}/LC_MESSAGES`
		`- msgfmt $files -o ${pkgdir}/usr/share/locale/${STRING}/LC_MESSAGES/cnchi.mo`
		`- echo "${STRING} installed..."`
		`- fi`
		`- done`
		`- }`
		`- # -- mode: bash;--`

libre-testing/cnchi/libre+rebranding.patch

file removed

-3257

		`@@ -1,3257 +0,0 @@`
		`- diff -Nur Cnchi-0.12.0/cnchi/bootinfo.py Cnchi-0.12.0.orig/cnchi/bootinfo.py`
		`- --- Cnchi-0.12.0/cnchi/bootinfo.py 2016-02-19 20:14:13.172945784 -0200`
		`- +++ Cnchi-0.12.0.orig/cnchi/bootinfo.py 2016-01-29 08:56:41.000000000 -0200`
		`- @@ -3,8 +3,7 @@`
		`- #`
		`- # bootinfo.py`
		`- #`
		`- -# Copyright © 2013-2016 Antergos`
		`- -# Copyright © 2016 Parabola`
		`- +# Copyright © 2013-2015 Antergos`
		`- #`
		`- # This file is part of Cnchi.`
		`- #`
		`- @@ -163,7 +162,7 @@`
		`-`
		`-`
		`- def _check_linux(mount_name):`
		`- - """ Checks for GNU/Linux """`
		`- + """ Checks for linux """`
		`- detected_os = _("unknown")`
		`-`
		`- for os_release in OS_RELEASE_PATHS:`
		`- diff -Nur Cnchi-0.12.0/cnchi/check.py Cnchi-0.12.0.orig/cnchi/check.py`
		`- --- Cnchi-0.12.0/cnchi/check.py 2016-02-19 20:18:59.011770171 -0200`
		`- +++ Cnchi-0.12.0.orig/cnchi/check.py 2016-01-29 08:56:41.000000000 -0200`
		`- @@ -4,7 +4,6 @@`
		`- # check.py`
		`- #`
		`- # Copyright © 2013-2015 Antergos`
		`- -# Copyright © 2016 Parabola`
		`- #`
		`- # This file is part of Cnchi.`
		`- #`
		`- @@ -28,7 +27,7 @@`
		`- # along with Cnchi; If not, see <http://www.gnu.org/licenses/>.`
		`-`
		`-`
		`- -""" Check screen (detects if Parabola prerequisites are meet) """`
		`- +""" Check screen (detects if Antergos prerequisites are meet) """`
		`-`
		`-`
		`- from gi.repository import GLib`
		`- diff -Nur Cnchi-0.12.0/cnchi/cnchi.py Cnchi-0.12.0.orig/cnchi/cnchi.py`
		`- --- Cnchi-0.12.0/cnchi/cnchi.py 2016-02-19 20:25:29.778727112 -0200`
		`- +++ Cnchi-0.12.0.orig/cnchi/cnchi.py 2016-01-29 08:56:41.000000000 -0200`
		`- @@ -3,8 +3,7 @@`
		`- #`
		`- # cnchi.py`
		`- #`
		`- -# Copyright © 2013-2016 Antergos`
		`- -# Copyright © 2016 Parabola`
		`- +# Copyright © 2013-2015 Antergos`
		`- #`
		`- # This file is part of Cnchi.`
		`- #`
		`- @@ -27,7 +26,7 @@`
		`- # You should have received a copy of the GNU General Public License`
		`- # along with Cnchi; If not, see <http://www.gnu.org/licenses/>.`
		`-`
		`- -""" Main Cnchi (Parabola Installer) module """`
		`- +""" Main Cnchi (Antergos Installer) module """`
		`-`
		`- import os`
		`- import sys`
		`- @@ -72,7 +71,7 @@`
		`- def __init__(self):`
		`- """ Constructor. Call base class """`
		`- Gtk.Application.__init__(self,`
		`- - application_id="nu.parabola.cnchi",`
		`- + application_id="com.antergos.cnchi",`
		`- flags=Gio.ApplicationFlags.FLAGS_NONE)`
		`- self.TMP_RUNNING = "/tmp/.setup-running"`
		`-`
		`- @@ -288,7 +287,7 @@`
		`-`
		`- import argparse`
		`-`
		`- - desc = _("Cnchi v{0} - Parabola Installer").format(info.CNCHI_VERSION)`
		`- + desc = _("Cnchi v{0} - Antergos Installer").format(info.CNCHI_VERSION)`
		`- parser = argparse.ArgumentParser(description=desc)`
		`-`
		`- parser.add_argument(`
		`- @@ -343,7 +342,7 @@`
		`- action="store_true")`
		`- parser.add_argument(`
		`- "--disable-rank-mirrors",`
		`- - help=_("Do not try to rank Parabola mirrors"),`
		`- + help=_("Do not try to rank Arch and Antergos mirrors"),`
		`- action="store_true")`
		`- parser.add_argument(`
		`- "-v", "--verbose",`
		`- @@ -382,6 +381,34 @@`
		`- GObject.threads_init()`
		`- # Gdk.threads_init()`
		`-`
		`- +`
		`- +def update_cnchi():`
		`- + """ Runs updater function to update cnchi to the latest version if necessary """`
		`- + upd = updater.Updater(`
		`- + force_update=cmd_line.update,`
		`- + local_cnchi_version=info.CNCHI_VERSION)`
		`- +`
		`- + if upd.update():`
		`- + logging.info("Program updated! Restarting...")`
		`- + misc.remove_temp_files()`
		`- + if cmd_line.update:`
		`- + # Remove -u and --update options from new call`
		`- + new_argv = []`
		`- + for argv in sys.argv:`
		`- + if argv != "-u" and argv != "--update":`
		`- + new_argv.append(argv)`
		`- + else:`
		`- + new_argv = sys.argv`
		`- +`
		`- + # Do not try to update again now`
		`- + new_argv.append("--disable-update")`
		`- +`
		`- + # Run another instance of Cnchi (which will be the new version)`
		`- + with misc.raised_privileges():`
		`- + os.execl(sys.executable, *([sys.executable] + new_argv))`
		`- + sys.exit(0)`
		`- +`
		`- +`
		`- def setup_gettext():`
		`- """ This allows to translate all py texts (not the glade ones) """`
		`-`
		`- diff -Nur Cnchi-0.12.0/cnchi/config.py Cnchi-0.12.0.orig/cnchi/config.py`
		`- --- Cnchi-0.12.0/cnchi/config.py 2016-02-19 20:29:01.968540784 -0200`
		`- +++ Cnchi-0.12.0.orig/cnchi/config.py 2016-01-29 08:56:41.000000000 -0200`
		`- @@ -3,8 +3,7 @@`
		`- #`
		`- # pacman_conf.py`
		`- #`
		`- -# Copyright © 2013-2016 Antergos`
		`- -# Copyright © 2016 Parabola`
		`- +# Copyright © 2013-2015 Antergos`
		`- #`
		`- # This file is part of Cnchi.`
		`- #`
		`- @@ -45,7 +44,7 @@`
		`- self.settings.put({`
		`- 'alternate_package_list': '',`
		`- 'auto_device': '/dev/sda',`
		`- - 'bootloader': 'grub',`
		`- + 'bootloader': 'grub2',`
		`- 'bootloader_device': '/dev/sda',`
		`- 'bootloader_install': True,`
		`- 'bootloader_installation_successful': False,`
		`- @@ -55,7 +54,7 @@`
		`- 'country_name': '',`
		`- 'country_code': '',`
		`- 'data': '/usr/share/cnchi/data/',`
		`- - 'desktop': 'mate',`
		`- + 'desktop': 'gnome',`
		`- 'desktop_ask': True,`
		`- 'desktops': [],`
		`- 'download_module': 'requests',`
		`- @@ -63,19 +62,22 @@`
		`- 'encrypt_home': False,`
		`- 'f2fs': False,`
		`- 'failed_download': False,`
		`- - #'feature_pur': False,`
		`- + 'feature_aur': False,`
		`- 'feature_bluetooth': False,`
		`- 'feature_cups': False,`
		`- - 'feature_iceweasel': False,`
		`- + 'feature_firefox': False,`
		`- 'feature_firewall': False,`
		`- - 'feature_glamp': False,`
		`- - 'feature_glemp': False,`
		`- + 'feature_fonts': False,`
		`- + 'feature_games': False,`
		`- + 'feature_lamp': False,`
		`- + 'feature_lemp': False,`
		`- 'feature_lts': False,`
		`- 'feature_office': False,`
		`- 'feature_smb': False,`
		`- + 'feature_visual': False,`
		`- 'fullname': '',`
		`- 'GRUB_CMDLINE_LINUX': '',`
		`- - 'hostname': 'parabola',`
		`- + 'hostname': 'antergos',`
		`- 'is_vbox': False,`
		`- 'keyboard_layout': '',`
		`- 'keyboard_variant': '',`
		`- @@ -94,6 +96,7 @@`
		`- 'require_password': True,`
		`- 'ruuid': '',`
		`- 'sentry_dsn': '',`
		`- + 'third_party_software': False,`
		`- 'timezone_human_zone': '',`
		`- 'timezone_country': '',`
		`- 'timezone_zone': '',`
		`- diff -Nur Cnchi-0.12.0/cnchi/desktop_info.py Cnchi-0.12.0.orig/cnchi/desktop_info.py`
		`- --- Cnchi-0.12.0/cnchi/desktop_info.py 2016-02-19 20:40:09.796551421 -0200`
		`- +++ Cnchi-0.12.0.orig/cnchi/desktop_info.py 2016-01-29 08:56:41.000000000 -0200`
		`- @@ -3,8 +3,7 @@`
		`- #`
		`- # desktop_info.py`
		`- #`
		`- -# Copyright © 2013-2016 Antergos`
		`- -# Copyright © 2016 Parabola`
		`- +# Copyright © 2013-2015 Antergos`
		`- #`
		`- # This file is part of Cnchi.`
		`- #`
		`- @@ -64,29 +63,31 @@`
		`- 'qt': ["kde", "lxqt"]`
		`- }`
		`-`
		`- -ALL_FEATURES = ["bluetooth", "cups", "iceweasel", "glamp", "lts", "office",`
		`- +ALL_FEATURES = ["aur", "bluetooth", "cups", "firefox", "fonts", "games", "graphic_drivers", "lamp", "lts", "office",`
		`- "visual", "firewall", "smb"]`
		`-`
		`- # Each desktop has its own available features`
		`- # TODO: Rework and simplify features logic by only storing excluded features for each each desktop.`
		`- FEATURES = {`
		`- - 'cinnamon': ["bluetooth", "cups", "iceweasel", "firewall", "lts",`
		`- + 'cinnamon': ["aur", "bluetooth", "cups", "firefox", "firewall", "fonts", "games", "graphic_drivers", "lts",`
		`- "office", "smb"],`
		`- 'gnome': [`
		`- - "bluetooth", "cups", "iceweasel", "firewall", "fonts",`
		`- + "aur", "bluetooth", "cups", "firefox", "firewall", "fonts",`
		`- "games", "graphic_drivers", "lts", "office", "smb"`
		`- ],`
		`- 'kde': [`
		`- - "bluetooth", "cups", "iceweasel", "firewall", "lts", "office", "smb"`
		`- + "aur", "bluetooth", "cups", "firefox", "firewall", "fonts",`
		`- + "games", "graphic_drivers", "lts", "office", "smb"`
		`- ],`
		`- - 'mate': ["bluetooth", "cups", "iceweasel", "firewall", "lts", "office", "smb"],`
		`- - 'enlightenment': ["bluetooth", "cups", "iceweasel", "firewall", "lts", "office", "smb"],`
		`- - 'base': ["cups", "glamp", "lts"],`
		`- - 'openbox': ["bluetooth", "cups", "iceweasel", "firewall", "lts",`
		`- - "office", "smb"],`
		`- - 'lxqt': ["bluetooth", "cups", "iceweasel", "firewall", "lts",`
		`- + 'mate': ["aur", "bluetooth", "cups", "firefox", "firewall", "fonts", "lts", "office", "games", "graphic_drivers", "smb"],`
		`- + 'enlightenment': ["aur", "bluetooth", "cups", "firefox", "firewall", "fonts", "games", "graphic_drivers", "lts",`
		`- + "office", "smb"],`
		`- + 'base': ["aur", "cups", "fonts", "lamp", "lts"],`
		`- + 'openbox': ["aur", "bluetooth", "cups", "firefox", "firewall", "fonts", "games", "graphic_drivers", "lts",`
		`- + "office", "smb", "visual"],`
		`- + 'lxqt': ["aur", "bluetooth", "cups", "firefox", "firewall", "fonts", "games", "graphic_drivers", "lts",`
		`- "office", "smb"],`
		`- - 'xfce': ["bluetooth", "cups", "iceweasel", "firewall", "lts",`
		`- + 'xfce': ["aur", "bluetooth", "cups", "firefox", "firewall", "fonts", "games", "graphic_drivers", "lts",`
		`- "office", "smb"]}`
		`-`
		`- # Session names for lightDM setup`
		`- @@ -111,7 +112,7 @@`
		`- "computer. It features the Activities Overview which "`
		`- "is an easy way to access all your basic tasks."),`
		`-`
		`- - 'cinnamon': _("Cinnamon is a GNU/Linux desktop which provides advanced, "`
		`- + 'cinnamon': _("Cinnamon is a Linux desktop which provides advanced, "`
		`- "innovative features and a traditional desktop user experience. "`
		`- "Cinnamon aims to make users feel at home by providing them with "`
		`- "an easy-to-use and comfortable desktop experience."),`
		`- @@ -124,10 +125,10 @@`
		`- 'openbox': _("Not actually a desktop environment, Openbox is a highly "`
		`- "configurable window manager. It is known for its "`
		`- "minimalistic appearance and its flexibility. It is the most "`
		`- - "lightweight graphical option offered by Parabola. Please "`
		`- - "Note: Openbox is not recommended for users who are new to GNU/Linux."),`
		`- + "lightweight graphical option offered by antergos. Please "`
		`- + "Note: Openbox is not recommended for users who are new to Linux."),`
		`-`
		`- - 'enlightenment': _("Enlightenment is not just a window manager for GNU/Linux X11 "`
		`- + 'enlightenment': _("Enlightenment is not just a window manager for Linux/X11 "`
		`- "and others, but also a whole suite of libraries to help "`
		`- "you create beautiful user interfaces with much less work"),`
		`-`
		`- @@ -139,9 +140,9 @@`
		`- "Environment. It is lightweight, modular, blazing-fast, and "`
		`- "user-friendly."),`
		`-`
		`- - 'base': _("This option will install Parabola as command-line only system, "`
		`- + 'base': _("This option will install Antergos as command-line only system, "`
		`- "without any type of graphical interface. After the installation you can "`
		`- - "customize Parabola by installing packages with the command-line package manager."),`
		`- + "customize Antergos by installing packages with the command-line package manager."),`
		`-`
		`- 'mate': _("MATE is an intuitive, attractive, and lightweight desktop "`
		`- "environment which provides a more traditional desktop "`
		`- diff -Nur Cnchi-0.12.0/cnchi/desktop.py Cnchi-0.12.0.orig/cnchi/desktop.py`
		`- --- Cnchi-0.12.0/cnchi/desktop.py 2016-02-19 20:31:21.811430206 -0200`
		`- +++ Cnchi-0.12.0.orig/cnchi/desktop.py 2016-01-29 08:56:41.000000000 -0200`
		`- @@ -3,8 +3,7 @@`
		`- #`
		`- # desktop.py`
		`- #`
		`- -# Copyright © 2013-2016 Antergos`
		`- -# Copyright © 2016 Parabola`
		`- +# Copyright © 2013-2015 Antergos`
		`- #`
		`- # This file is part of Cnchi.`
		`- #`
		`- @@ -59,7 +58,7 @@`
		`- self.listbox.set_selection_mode(Gtk.SelectionMode.BROWSE)`
		`- self.listbox.set_sort_func(self.listbox_sort_by_name, None)`
		`-`
		`- - self.desktop_choice = 'mate'`
		`- + self.desktop_choice = 'gnome'`
		`-`
		`- self.enabled_desktops = self.settings.get("desktops")`
		`-`
		`- @@ -151,8 +150,8 @@`
		`-`
		`- self.listbox.add(box)`
		`-`
		`- - # Set MATE as default`
		`- - self.select_default_row(desktop_info.NAMES["mate"])`
		`- + # Set Gnome as default`
		`- + self.select_default_row(desktop_info.NAMES["gnome"])`
		`-`
		`- @staticmethod`
		`- def listbox_sort_by_name(row1, row2, user_data):`
		`- @@ -206,7 +205,7 @@`
		`- def store_values(self):`
		`- """ Store desktop """`
		`- self.settings.set('desktop', self.desktop_choice.lower())`
		`- - logging.info("Cnchi will install Parabola with the '%s' desktop", self.desktop_choice.lower())`
		`- + logging.info("Cnchi will install Antergos with the '%s' desktop", self.desktop_choice.lower())`
		`- return True`
		`-`
		`- @staticmethod`
		`- diff -Nur Cnchi-0.12.0/cnchi/download/download_aria2.py Cnchi-0.12.0.orig/cnchi/download/download_aria2.py`
		`- --- Cnchi-0.12.0/cnchi/download/download_aria2.py 2016-02-19 22:15:49.368734503 -0200`
		`- +++ Cnchi-0.12.0.orig/cnchi/download/download_aria2.py 2016-01-29 08:56:41.000000000 -0200`
		`- @@ -4,7 +4,6 @@`
		`- # download_aria2.py`
		`- #`
		`- # Copyright © 2013-2015 Antergos`
		`- -# Copyright © 2016 Parabola`
		`- #`
		`- # This file is part of Cnchi.`
		`- #`
		`- @@ -49,7 +48,7 @@`
		`- class Download(object):`
		`- """ Class to download packages using Aria2`
		`- This class tries to previously download all necessary packages for`
		`- - Parabola installation using aria2 """`
		`- + Antergos installation using aria2 """`
		`-`
		`- def __init__(self, pacman_cache_dir, cache_dir, callback_queue):`
		`- """ Initialize DownloadAria2 class. Gets default configuration """`
		`- diff -Nur Cnchi-0.12.0/cnchi/download/download.py Cnchi-0.12.0.orig/cnchi/download/download.py`
		`- --- Cnchi-0.12.0/cnchi/download/download.py 2016-02-19 22:15:11.740240137 -0200`
		`- +++ Cnchi-0.12.0.orig/cnchi/download/download.py 2016-01-29 08:56:41.000000000 -0200`
		`- @@ -4,7 +4,6 @@`
		`- # download.py`
		`- #`
		`- # Copyright © 2013-2015 Antergos`
		`- -# Copyright © 2016 Parabola`
		`- #`
		`- # This file is part of Cnchi.`
		`- #`
		`- @@ -55,7 +54,7 @@`
		`- class DownloadPackages(object):`
		`- """ Class to download packages using Aria2, requests (default) or urllib`
		`- This class tries to previously download all necessary packages for`
		`- - Parabola installation using aria2, requests or urllib`
		`- + Antergos installation using aria2, requests or urllib`
		`- Aria2 is known to use too much memory (not Aria2's fault but ours)`
		`- so until it's fixed it it's not advised to use it """`
		`-`
		`- diff -Nur Cnchi-0.12.0/cnchi/download/download_requests.py Cnchi-0.12.0.orig/cnchi/download/download_requests.py`
		`- --- Cnchi-0.12.0/cnchi/download/download_requests.py 2016-02-19 22:16:20.944168570 -0200`
		`- +++ Cnchi-0.12.0.orig/cnchi/download/download_requests.py 2016-01-29 08:56:41.000000000 -0200`
		`- @@ -4,7 +4,6 @@`
		`- # download_requests.py`
		`- #`
		`- # Copyright © 2013-2015 Antergos`
		`- -# Copyright © 2016 Parabola`
		`- #`
		`- # This file is part of Cnchi.`
		`- #`
		`- @@ -52,7 +51,7 @@`
		`- class Download(object):`
		`- """ Class to download packages using requests`
		`- This class tries to previously download all necessary packages for`
		`- - Parabola installation using requests """`
		`- + Antergos installation using requests """`
		`-`
		`- def __init__(self, pacman_cache_dir, cache_dir, callback_queue):`
		`- """ Initialize Download class. Gets default configuration """`
		`- diff -Nur Cnchi-0.12.0/cnchi/download/download_urllib.py Cnchi-0.12.0.orig/cnchi/download/download_urllib.py`
		`- --- Cnchi-0.12.0/cnchi/download/download_urllib.py 2016-02-19 22:17:07.892384102 -0200`
		`- +++ Cnchi-0.12.0.orig/cnchi/download/download_urllib.py 2016-01-29 08:56:41.000000000 -0200`
		`- @@ -4,7 +4,6 @@`
		`- # download_urllib.py`
		`- #`
		`- # Copyright © 2013-2015 Antergos`
		`- -# Copyright © 2016 Parabola`
		`- #`
		`- # This file is part of Cnchi.`
		`- #`
		`- @@ -93,7 +92,7 @@`
		`- class Download(object):`
		`- """ Class to download packages using urllib`
		`- This class tries to previously download all necessary packages for`
		`- - Parabola installation using urllib """`
		`- + Antergos installation using urllib """`
		`-`
		`- def __init__(self, pacman_cache_dir, cache_dir, callback_queue):`
		`- """ Initialize Download class. Gets default configuration """`
		`- diff -Nur Cnchi-0.12.0/cnchi/encfs.py Cnchi-0.12.0.orig/cnchi/encfs.py`
		`- --- Cnchi-0.12.0/cnchi/encfs.py 2016-02-19 20:42:59.504622165 -0200`
		`- +++ Cnchi-0.12.0.orig/cnchi/encfs.py 2016-01-29 08:56:41.000000000 -0200`
		`- @@ -4,7 +4,6 @@`
		`- # encfs.py`
		`- #`
		`- # Copyright © 2013-2015 Antergos`
		`- -# Copyright © 2016 Parabola`
		`- #`
		`- # This file is part of Cnchi.`
		`- #`
		`- @@ -28,7 +27,7 @@`
		`- # along with Cnchi; If not, see <http://www.gnu.org/licenses/>.`
		`-`
		`-`
		`- -""" Configures Parabola to encrypt user's home with encFS """`
		`- +""" Configures Antergos to encrypt user's home with encFS """`
		`-`
		`- import os`
		`- import shutil`
		`- @@ -58,7 +57,7 @@`
		`- def setup_conf_files(dest_dir):`
		`- path = os.path.join(dest_dir, "etc/security/pam_encfs.conf")`
		`- with open(path, 'w') as pam_encfs:`
		`- - pam_encfs.write("# File created by Cnchi (Parabola Installer)\n\n")`
		`- + pam_encfs.write("# File created by Cnchi (Antergos Installer)\n\n")`
		`- pam_encfs.write("# If this is specified program will attempt to drop permissions before running encfs.\n")`
		`- pam_encfs.write("drop_permissions\n\n")`
		`- pam_encfs.write("# This specifies which options to pass to encfs for every user.\n")`
		`- @@ -67,30 +66,30 @@`
		`- pam_encfs.write("# Same for fuse\n")`
		`- pam_encfs.write("# you can find fuse options with encfs -H\n")`
		`- pam_encfs.write("fuse_default allow_root,nonempty\n\n")`
		`- - pam_encfs.write("# Added by Cnchi - Parabola Installer\n")`
		`- + pam_encfs.write("# Added by Cnchi - Antergos Installer\n")`
		`- # USERNAME SOURCE TARGET_PATH ENCFS_Options FUSE_Options`
		`- pam_encfs.write("-\t/home/.encfs\t-\t-v\t-\n")`
		`-`
		`- path = os.path.join(dest_dir, "etc/security/pam_env.conf")`
		`- with open(path, 'a') as pam_env:`
		`- - pam_env.write("\n# Added by Cnchi - Parabola Installer\n")`
		`- - pam_env.write("# Set the ICEAUTHORITY file location to allow MATE to start on encfs $HOME\n")`
		`- + pam_env.write("\n# Added by Cnchi - Antergos Installer\n")`
		`- + pam_env.write("# Set the ICEAUTHORITY file location to allow GNOME to start on encfs $HOME\n")`
		`- pam_env.write("ICEAUTHORITY DEFAULT=/tmp/.ICEauthority_@{PAM_USER}\n")`
		`-`
		`- path = os.path.join(dest_dir, "etc/fuse.conf")`
		`- with open(path, 'a') as fuse_conf:`
		`- - fuse_conf.write("\n# Added by Cnchi - Parabola Installer\n")`
		`- + fuse_conf.write("\n# Added by Cnchi - Antergos Installer\n")`
		`- fuse_conf.write("user_allow_other\n")`
		`-`
		`- path = os.path.join(dest_dir, "etc/pam.d/system-login")`
		`- with open(path, 'a') as system_login:`
		`- - system_login.write("\n# Added by Cnchi - Parabola Installer\n")`
		`- + system_login.write("\n# Added by Cnchi - Antergos Installer\n")`
		`- system_login.write("session required\tpam_encfs.so\n")`
		`- system_login.write("session optional\tpam_mount.so\n")`
		`-`
		`- path = os.path.join(dest_dir, "etc/pam.d/system-auth")`
		`- with open(path, "a") as system_auth:`
		`- - system_auth.write("\n# Added by Cnchi - Parabola Installer\n")`
		`- + system_auth.write("\n# Added by Cnchi - Antergos Installer\n")`
		`- system_auth.write("auth sufficient\tpam_encfs.so\n")`
		`- system_auth.write("auth optional\tpam_mount.so\n")`
		`-`
		`- @@ -99,7 +98,7 @@`
		`- def setup(username, dest_dir, password):`
		`- """ Encrypt user's home folder """`
		`- # encfs and pam_mount packages are needed`
		`- - # and pam_encfs from [pcr], too.`
		`- + # and pam_encfs from AUR, too.`
		`- # Reference: https://wiki.debian.org/TransparentEncryptionForHomeFolder`
		`-`
		`- try:`
		`- diff -Nur Cnchi-0.12.0/cnchi/features_info.py Cnchi-0.12.0.orig/cnchi/features_info.py`
		`- --- Cnchi-0.12.0/cnchi/features_info.py 2016-02-19 21:41:28.925343575 -0200`
		`- +++ Cnchi-0.12.0.orig/cnchi/features_info.py 2016-01-29 08:56:41.000000000 -0200`
		`- @@ -3,8 +3,7 @@`
		`- #`
		`- # features_info.py`
		`- #`
		`- -# Copyright © 2013-2016 Antergos`
		`- -# Copyright © 2016 Parabola`
		`- +# Copyright © 2013-2015 Antergos`
		`- #`
		`- # This file is part of Cnchi.`
		`- #`
		`- @@ -34,15 +33,19 @@`
		`- # in desktop_info file instead of here.`
		`-`
		`- ICON_NAMES = {`
		`- - #'pur': 'system-software-install',`
		`- + 'aur': 'system-software-install',`
		`- 'bluetooth': 'bluetooth',`
		`- 'cups': 'printer',`
		`- - 'iceweasel': 'iceweasel',`
		`- + 'firefox': 'firefox',`
		`- 'firewall': 'network-server',`
		`- - 'glamp': 'applications-internet',`
		`- + 'fonts': 'preferences-desktop-font',`
		`- + 'games': 'applications-games',`
		`- + 'graphic_drivers': 'gnome-system',`
		`- + 'lamp': 'applications-internet',`
		`- 'lts': 'applications-accessories',`
		`- 'office': 'accessories-text-editor',`
		`- - 'smb': 'gnome-mime-x-directory-smb-share'}`
		`- + 'smb': 'gnome-mime-x-directory-smb-share',`
		`- + 'visual': 'video-display'}`
		`-`
		`-`
		`- # See http://docs.python.org/2/library/gettext.html "22.1.3.4. Deferred translations"`
		`- @@ -50,30 +53,38 @@`
		`- return message`
		`-`
		`- TITLES = {`
		`- - #'pur': _("Parabola User Repository (PUR) Support"),`
		`- + 'aur': _("Arch User Repository (AUR) Support"),`
		`- 'bluetooth': _("Bluetooth Support"),`
		`- 'cups': _("Printing Support"),`
		`- - 'iceweasel': _("Iceweasel Web Browser"),`
		`- + 'firefox': _("Firefox Web Browser"),`
		`- 'firewall': _("Uncomplicated Firewall"),`
		`- + 'fonts': _("Extra Truetype Fonts"),`
		`- + 'games': _("Steam + PlayonLinux"),`
		`- + 'graphic_drivers': _("Graphic drivers (Proprietary)"),`
		`- 'lamp': _("Apache (or Nginx) + Mariadb + PHP"),`
		`- 'lts': _("Kernel (LTS version)"),`
		`- 'office': _("LibreOffice"),`
		`- - 'smb': _("Windows sharing SMB")}`
		`- + 'smb': _("Windows sharing SMB"),`
		`- + 'visual': _("Visual Effects")}`
		`-`
		`- DESCRIPTIONS = {`
		`- - #'pur': _("The PUR is a community-driven repository for Parabola users."),`
		`- + 'aur': _("The AUR is a community-driven repository for Arch users."),`
		`- 'bluetooth': _("Enables your system to make wireless connections via Bluetooth."),`
		`- - 'glamp': _("Apache (or Nginx) + Mariadb + PHP installation and setup."),`
		`- + 'fonts': _("TrueType fonts from the Google Fonts project."),`
		`- + 'graphic_drivers': _("Installs AMD or Nvidia proprietary graphic driver."),`
		`- + 'games': _("Installs Steam and Playonlinux for gaming enthusiasts."),`
		`- + 'lamp': _("Apache (or Nginx) + Mariadb + PHP installation and setup."),`
		`- 'cups': _("Installation of printer drivers and management tools."),`
		`- - 'office': _("Free software office suite. Supports editing MS Office files."),`
		`- + 'office': _("Open source office suite. Supports editing MS Office files."),`
		`- + 'visual': _("Enable transparency, shadows, and other desktop effects."),`
		`- 'firewall': _("Control the incoming and outgoing network traffic."),`
		`- 'lts': _("Long term support (LTS) Linux kernel and modules."),`
		`- - 'iceweasel': _("A popular free software graphical web browser from Mozilla."),`
		`- + 'firefox': _("A popular open-source graphical web browser from Mozilla."),`
		`- 'smb': _("SMB provides shared access to files and printers.")}`
		`-`
		`- TOOLTIPS = {`
		`- - #'aur': _("Use yaourt to install PUR packages.\n"`
		`- - "The PUR was created to organize and share new packages\n"`
		`- + 'aur': _("Use yaourt to install AUR packages.\n"`
		`- + "The AUR was created to organize and share new packages\n"`
		`- "from the community and to help expedite popular packages'\n"`
		`- "inclusion into the [community] repository."),`
		`- 'bluetooth': _("Bluetooth is a standard for the short-range wireless\n"`
		`- @@ -83,33 +94,54 @@`
		`- 'cups': _("CUPS is the standards-based, open source printing\n"`
		`- "system developed by Apple Inc. for OS® X and other\n"`
		`- "UNIX®-like operating systems."),`
		`- - 'iceweasel': _("Iceweasel (based on Mozilla Firefox) is a free\n"`
		`- - "web browser developed for GNU/Linux by the\n"`
		`- - "Mozilla Foundation and its subsidiary, the Mozilla Corporation.`
		`- - "Iceweasel uses the Gecko layout engine to render web\n"`
		`- - "pages, which implements current and anticipated web standards."),`
		`- + 'firefox': _("Mozilla Firefox (known simply as Firefox) is a free and\n"`
		`- + "open-source web browser developed for Windows, OS X, and Linux,\n"`
		`- + "with a mobile version for Android, by the Mozilla Foundation and\n"`
		`- + "its subsidiary, the Mozilla Corporation. Firefox uses the Gecko\n"`
		`- + "layout engine to render web pages, which implements current and\n"`
		`- + "anticipated web standards."),`
		`- 'firewall': _("Ufw stands for Uncomplicated Firewall, and is a program for\n"`
		`- - "managing a netfilter firewall. It provides a command-line\n"`
		`- - "interface and aims to be simple and easy to use."),`
		`- - 'glamp': _("This option installs a web server (you can choose\n"`
		`- + "managing a netfilter firewall. It provides a command line\n"`
		`- + "interface and aims to be uncomplicated and easy to use."),`
		`- + 'fonts': "Fonts: adobe-source-code-pro, adobe-source-sans-pro, jsmath, lohit\n"`
		`- + "oldstand, openarch, otf-bitter, otf-goudy, andika, anonymous-pro\n"`
		`- + "cantarell, cardo, chromeos-fonts, comfortaa, droid, google-fonts\n"`
		`- + "google-webfonts, inconsolata, kimberly_geswein_print, lekton\n"`
		`- + "medievalsharp, nova, oldstandard, opensans, oxygen, pt-mono\n"`
		`- + "pt-sans, roboto, sil-fonts, sortsmillgoudy, source-code-pro\n"`
		`- + "source-sans-pro, ubuntu-font-family, vollkorn, fira-mono\n"`
		`- + "fira-sans and lato.",`
		`- +`
		`- + 'games': _("Steam is one of the most popular gaming clients that supports\n"`
		`- + "linux in technology and gaming, while PlayOnLinux\n"`
		`- + "is a very easy manager to setting up games to play\n"`
		`- + "through wine, instead of doing it manually."),`
		`- + 'graphic_drivers': _("Installs AMD or Nvidia proprietary graphics driver."),`
		`- + 'lamp': _("This option installs a web server (you can choose\n"`
		`- "Apache or Nginx) plus a database server (Mariadb)\n"`
		`- "and PHP."),`
		`- - 'lts': _("The linux-libre-lts package is an alternative kernel package\n"`
		`- - "based upon Linux-libre kernel 3.14 and is available in the core repository.\n"`
		`- + 'lts': _("The linux-lts package is an alternative Arch kernel package\n"`
		`- + "based upon Linux kernel 3.14 and is available in the core repository.\n"`
		`- "This particular kernel version enjoys long-term support from upstream,\n"`
		`- "including security fixes and some feature backports. Additionally, this\n"`
		`- - "package includes ext4 support. For Parabola users seeking a long-term\n"`
		`- + "package includes ext4 support. For Antergos users seeking a long-term\n"`
		`- "support kernel, or who want a fallback kernel in case the latest kernel\n"`
		`- "version causes problems, this option is the answer."),`
		`- - 'office': _("LibreOffice is the power-packed Free Software\n"`
		`- + 'office': _("LibreOffice is the free power-packed Open Source\n"`
		`- "personal productivity suite for Windows, Macintosh\n"`
		`- - "and GNU/Linux, that gives you six feature-rich applications\n"`
		`- + "and Linux, that gives you six feature-rich applications\n"`
		`- "for all your document production and data processing\n"`
		`- "needs: Writer, Calc, Impress, Draw, Math and Base."),`
		`- 'smb': _("In computer networking, Server Message Block (SMB)\n"`
		`- "operates as an application-layer network protocol mainly used\n"`
		`- "for providing shared access to files, printers, serial ports,\n"`
		`- - "and miscellaneous communications between nodes on a network.\n"),`
		`- + "and miscellaneous communications between nodes on a network.\n"`
		`- + "Most usage of SMB involves computers running Microsoft Windows."),`
		`- + 'visual': _("Compton is a lightweight, standalone composite manager,\n"`
		`- + "suitable for use with window managers that do not natively\n"`
		`- + "provide compositing functionality. Compton itself is a fork\n"`
		`- + "of xcompmgr-dana, which in turn is a fork of xcompmgr.\n"`
		`- + "See the compton github page for further information.")}`
		`-`
		`- # Delete previous _() dummy declaration`
		`- del _`
		`- diff -Nur Cnchi-0.12.0/cnchi/features.py Cnchi-0.12.0.orig/cnchi/features.py`
		`- --- Cnchi-0.12.0/cnchi/features.py 2016-02-19 20:51:51.147145669 -0200`
		`- +++ Cnchi-0.12.0.orig/cnchi/features.py 2016-01-29 08:56:41.000000000 -0200`
		`- @@ -4,7 +4,6 @@`
		`- # features.py`
		`- #`
		`- # Copyright © 2013-2015 Antergos`
		`- -# Copyright © 2016 Parabola`
		`- #`
		`- # This file is part of Cnchi.`
		`- #`
		`- @@ -66,16 +65,39 @@`
		`- # This is initialized each time this screen is shown in prepare()`
		`- self.features = None`
		`-`
		`- - # Only show ufw rules and pur disclaimer info once`
		`- - self.info_already_shown = {"ufw": False, "pur": False}`
		`- + # Only show ufw rules and aur disclaimer info once`
		`- + self.info_already_shown = {"ufw": False, "aur": False}`
		`-`
		`- # Only load defaults the first time this screen is shown`
		`- self.load_defaults = True`
		`-`
		`- @staticmethod`
		`- + def nvidia_detected():`
		`- + from hardware.nvidia import Nvidia`
		`- + if Nvidia().detect():`
		`- + return True`
		`- + from hardware.nvidia_340xx import Nvidia_340xx`
		`- + if Nvidia_340xx().detect():`
		`- + return True`
		`- + from hardware.nvidia_304xx import Nvidia_304xx`
		`- + if Nvidia_304xx().detect():`
		`- + return True`
		`- + return False`
		`- +`
		`- + @staticmethod`
		`- + def amd_detected():`
		`- + from hardware.catalyst import Catalyst`
		`- + return Catalyst().detect()`
		`- +`
		`- + @staticmethod`
		`- def on_listbox_row_selected(listbox, listbox_row):`
		`- """ Someone selected a different row of the listbox`
		`- WARNING: IF LIST LAYOUT IS CHANGED THEN THIS SHOULD BE CHANGED ACCORDINGLY. """`
		`- + if listbox_row is not None:`
		`- + for vbox in listbox_row:`
		`- + switch = vbox.get_children()[2]`
		`- + if switch:`
		`- + switch.set_active(not switch.get_active())`
		`-`
		`- def fill_listbox(self):`
		`- for listbox_row in self.listbox.get_children():`
		`- @@ -83,6 +105,15 @@`
		`-`
		`- self.listbox_rows = {}`
		`-`
		`- + # Only add graphic-driver feature if an AMD or Nvidia is detected`
		`- + # FIXME: Conflict between lib32-nvidia-libgl and lib32-mesa-libgl`
		`- + #if "graphic_drivers" in self.features:`
		`- + # if not self.amd_detected() and not self.nvidia_detected():`
		`- + # logging.debug("Neither nvidia nor amd have been detected. Removing proprietary graphic driver feature")`
		`- + # self.features.remove("graphic_drivers")`
		`- + if "graphic_drivers" in self.features:`
		`- + self.features.remove("graphic_drivers")`
		`- +`
		`- for feature in self.features:`
		`- box = Gtk.Box(spacing=20)`
		`- box.set_name(feature + "-row")`
		`- @@ -104,6 +135,15 @@`
		`- self.listbox_rows[feature].append(image)`
		`- box.pack_start(image, False, False, 0)`
		`-`
		`- + text_box = Gtk.VBox()`
		`- + object_name = "label_title_" + feature`
		`- + label_title = Gtk.Label.new()`
		`- + label_title.set_halign(Gtk.Align.START)`
		`- + label_title.set_justify(Gtk.Justification.LEFT)`
		`- + label_title.set_name(object_name)`
		`- + self.listbox_rows[feature].append(label_title)`
		`- + text_box.pack_start(label_title, False, False, 0)`
		`- +`
		`- object_name = "label_" + feature`
		`- label = Gtk.Label.new()`
		`- label.set_name(object_name)`
		`- @@ -168,6 +208,16 @@`
		`- txt = desktop_info.NAMES[desktop] + " - " + _("Feature Selection")`
		`- self.header.set_subtitle(txt)`
		`-`
		`- + for feature in self.features:`
		`- + if feature == "graphic_drivers":`
		`- + # Only add this feature if NVIDIA or AMD are detected`
		`- + if not self.amd_detected() and not self.nvidia_detected():`
		`- + continue`
		`- + title = _(features_info.TITLES[feature])`
		`- + desc = _(features_info.DESCRIPTIONS[feature])`
		`- + tooltip = _(features_info.TOOLTIPS[feature])`
		`- + self.set_row_text(feature, title, desc, tooltip)`
		`- +`
		`- # Sort listbox items`
		`- self.listbox.invalidate_sort()`
		`-`
		`- @@ -190,6 +240,10 @@`
		`- row = self.listbox_rows['cups']`
		`- row[COL_SWITCH].set_active(True)`
		`-`
		`- + if 'visual' in self.features:`
		`- + row = self.listbox_rows['visual']`
		`- + row[COL_SWITCH].set_active(True)`
		`- +`
		`- def store_values(self):`
		`- """ Get switches values and store them """`
		`- for feature in self.features:`
		`- @@ -204,28 +258,28 @@`
		`- self.show_info_dialog("ufw")`
		`- self.info_already_shown["ufw"] = True`
		`-`
		`- - # Show PUR disclaimer if PUR is selected (show it only once)`
		`- - #if self.settings.get("feature_pur") and not self.info_already_shown["pur"]:`
		`- - # self.show_info_dialog("pur")`
		`- - # self.info_already_shown["pur"] = True`
		`- + # Show AUR disclaimer if AUR is selected (show it only once)`
		`- + if self.settings.get("feature_aur") and not self.info_already_shown["aur"]:`
		`- + self.show_info_dialog("aur")`
		`- + self.info_already_shown["aur"] = True`
		`-`
		`- - # GLAMP: Ask user if she wants Apache or Nginx`
		`- - if self.settings.get("feature_glamp"):`
		`- + # LAMP: Ask user if he wants Apache or Nginx`
		`- + if self.settings.get("feature_lamp"):`
		`- info = Gtk.MessageDialog(`
		`- transient_for=self.get_toplevel(),`
		`- modal=True,`
		`- destroy_with_parent=True,`
		`- message_type=Gtk.MessageType.INFO,`
		`- buttons=Gtk.ButtonsType.YES_NO)`
		`- - info.set_markup("GLAMP / GLEMP")`
		`- + info.set_markup("LAMP / LEMP")`
		`- msg = _("Do you want to install the Nginx server instead of the Apache server?")`
		`- info.format_secondary_markup(msg)`
		`- response = info.run()`
		`- info.destroy()`
		`- if response == Gtk.ResponseType.YES:`
		`- - self.settings.set("feature_glemp", True)`
		`- + self.settings.set("feature_lemp", True)`
		`- else:`
		`- - self.settings.set("feature_glemp", False)`
		`- + self.settings.set("feature_lemp", False)`
		`-`
		`- self.listbox_rows = {}`
		`-`
		`- @@ -233,12 +287,12 @@`
		`-`
		`- def show_info_dialog(self, feature):`
		`- """ Some features show an information dialog when this screen is accepted """`
		`- - #if feature == "pur":`
		`- - # # Pur disclaimer`
		`- - # txt1 = _("Parabola User Repository - Disclaimer")`
		`- - # txt2 = _("The Parabola User Repository is a collection of user-submitted PKGBUILDs\n"`
		`- - # "that supplement software available from the official repositories.\n\n"`
		`- - # "The PUR is community-driven.\n")`
		`- + if feature == "aur":`
		`- + # Aur disclaimer`
		`- + txt1 = _("Arch User Repository - Disclaimer")`
		`- + txt2 = _("The Arch User Repository is a collection of user-submitted PKGBUILDs\n"`
		`- + "that supplement software available from the official repositories.\n\n"`
		`- + "The AUR is community driven and NOT supported by Arch or Antergos.\n")`
		`- elif feature == "ufw":`
		`- # Ufw rules info`
		`- txt1 = _("Uncomplicated Firewall will be installed with these rules:")`
		`- diff -Nur Cnchi-0.12.0/cnchi/hardware/hardware.py Cnchi-0.12.0.orig/cnchi/hardware/hardware.py`
		`- --- Cnchi-0.12.0/cnchi/hardware/hardware.py 2016-02-19 22:36:12.424692013 -0200`
		`- +++ Cnchi-0.12.0.orig/cnchi/hardware/hardware.py 2016-01-29 08:56:41.000000000 -0200`
		`- @@ -4,7 +4,6 @@`
		`- # hardware.py`
		`- #`
		`- # Copyright © 2013-2015 Antergos`
		`- -# Copyright © 2016 Parabola`
		`- #`
		`- # This file is part of Cnchi.`
		`- #`
		`- @@ -95,8 +94,8 @@`
		`- @staticmethod`
		`- def is_proprietary():`
		`- """ Proprietary drivers are drivers for your hardware devices`
		`- - that are not freely-available, and must be`
		`- - avoided as much as possible. """`
		`- + that are not freely-available or open source, and must be`
		`- + obtained from the hardware manufacturer. """`
		`- return False`
		`-`
		`- def is_graphic_driver(self):`
		`- @@ -160,7 +159,12 @@`
		`-`
		`-`
		`- class HardwareInstall(object):`
		`- - """ This class checks user's hardware """`
		`- + """ This class checks user's hardware`
		`- +`
		`- + If 'use_proprietary_graphic_drivers' is True, this module will try to install the proprietary`
		`- + variants of the graphic drivers available (only if the hardware is detected).`
		`- + For non graphical drivers, the open one is always choosen as default.`
		`- + """`
		`-`
		`- def __init__(self, use_proprietary_graphic_drivers=False):`
		`- self.use_proprietary_graphic_drivers = use_proprietary_graphic_drivers`
		`- @@ -230,8 +234,49 @@`
		`- for device in self.objects_found:`
		`- drivers_available = self.objects_found[device]`
		`- objects_selected = []`
		`- -`
		`- - # Only one option, add it (it doesn't matter if it's free or not)`
		`- + if len(drivers_available) > 1:`
		`- + # We have more than one driver for this device!`
		`- + # We'll need to choose one`
		`- +`
		`- + # Check if there is a proprietary driver`
		`- + is_one_closed = False`
		`- + for driver in drivers_available:`
		`- + if driver.is_proprietary():`
		`- + is_one_closed = True`
		`- + break`
		`- +`
		`- + for driver in drivers_available:`
		`- + if not driver.is_graphic_driver():`
		`- + # For non graphical drivers, we choose the open one as default`
		`- + if not driver.is_proprietary():`
		`- + objects_selected.append(driver)`
		`- + else:`
		`- + # It's a graphic driver`
		`- + # We choose the open one if the user does not want to`
		`- + # use proprietary (or if all the ones available are open)`
		`- + if not self.use_proprietary_graphic_drivers or not is_one_closed:`
		`- + # OK, we choose the open one`
		`- + if not driver.is_proprietary():`
		`- + objects_selected.append(driver)`
		`- + else:`
		`- + # One of them is proprietary and user wants to use it`
		`- + if driver.is_proprietary():`
		`- + objects_selected.append(driver)`
		`- +`
		`- + if len(objects_selected) > 1:`
		`- + # We still have two or more options,`
		`- + # let's check their priority`
		`- + priorities = []`
		`- + for driver in objects_selected:`
		`- + priorities.append(driver.get_priority())`
		`- + for driver in objects_selected:`
		`- + if driver.get_priority() == max(priorities):`
		`- + self.objects_used.append(driver)`
		`- + break`
		`- + else:`
		`- + self.objects_used.extend(objects_selected)`
		`- + else:`
		`- + # Only one option, add it (it doesn't matter if it's open or not)`
		`- self.objects_used.append(drivers_available[0])`
		`-`
		`- @staticmethod`
		`- @@ -288,3 +333,35 @@`
		`- """ Run post install commands for all detected devices """`
		`- for obj in self.objects_used:`
		`- obj.post_install(dest_dir)`
		`- +`
		`- +`
		`- +''' Test case '''`
		`- +if __name__ == "__main__":`
		`- + def _(x): return x`
		`- + hardware_install = HardwareInstall(use_proprietary_graphic_drivers=False)`
		`- + # hardware_install = HardwareInstall(use_proprietary_graphic_drivers=True)`
		`- + hardware_pkgs = hardware_install.get_packages()`
		`- + print(hardware_install.get_found_driver_names())`
		`- + if len(hardware_pkgs) > 0:`
		`- + txt = " ".join(hardware_pkgs)`
		`- + print("Hardware module added these packages :")`
		`- + print(txt)`
		`- +`
		`- + """`
		`- + from nvidia import Nvidia`
		`- + if Nvidia().detect():`
		`- + print("Nvidia detected")`
		`- + # Nvidia().post_install("/")`
		`- +`
		`- + from nvidia_340xx import Nvidia_340xx`
		`- + if Nvidia_340xx().detect():`
		`- + print("Nvidia-340xx detected")`
		`- +`
		`- + from nvidia_304xx import Nvidia_304xx`
		`- + if Nvidia_304xx().detect():`
		`- + print("nvidia-304xx detected")`
		`- +`
		`- + from catalyst import Catalyst`
		`- + if Catalyst().detect():`
		`- + print("Catalyst detected")`
		`- + """`
		`- diff -Nur Cnchi-0.12.0/cnchi/info.py Cnchi-0.12.0.orig/cnchi/info.py`
		`- --- Cnchi-0.12.0/cnchi/info.py 2016-02-19 21:43:19.124426725 -0200`
		`- +++ Cnchi-0.12.0.orig/cnchi/info.py 2016-01-29 08:56:41.000000000 -0200`
		`- @@ -3,8 +3,7 @@`
		`- #`
		`- # info.py`
		`- #`
		`- -# Copyright © 2013-2016 Antergos`
		`- -# Copyright © 2016 Parabola`
		`- +# Copyright © 2013-2015 Antergos`
		`- #`
		`- # This file is part of Cnchi.`
		`- #`
		`- @@ -31,7 +30,7 @@`
		`- """ Set some Cnchi global constants """`
		`-`
		`- CNCHI_VERSION = "0.12.47"`
		`- -CNCHI_WEBSITE = "https://www.parabola.nu"`
		`- +CNCHI_WEBSITE = "http://www.antergos.com"`
		`- CNCHI_RELEASE_STAGE = "production"`
		`-`
		`- if __name__ == '__main__':`
		`- diff -Nur Cnchi-0.12.0/cnchi/installation/advanced.py Cnchi-0.12.0.orig/cnchi/installation/advanced.py`
		`- --- Cnchi-0.12.0/cnchi/installation/advanced.py 2016-02-19 22:44:57.397750736 -0200`
		`- +++ Cnchi-0.12.0.orig/cnchi/installation/advanced.py 2016-01-29 08:56:41.000000000 -0200`
		`- @@ -4,7 +4,6 @@`
		`- # advanced.py`
		`- #`
		`- # Copyright © 2013-2015 Antergos`
		`- -# Copyright © 2016 Parabola`
		`- #`
		`- # This file is part of Cnchi.`
		`- #`
		`- @@ -171,7 +170,7 @@`
		`- for mount_point in fs.COMMON_MOUNT_POINTS:`
		`- combo.append_text(mount_point)`
		`-`
		`- - self.bootloader = "grub"`
		`- + self.bootloader = "grub2"`
		`- self.bootloader_device = ""`
		`- self.bootloader_entry = self.ui.get_object('bootloader_entry')`
		`- self.bootloader_device_entry = self.ui.get_object('bootloader_device_entry')`
		`- @@ -341,7 +340,7 @@`
		`- self.bootloader_entry.remove_all()`
		`-`
		`- if os.path.exists('/sys/firmware/efi'):`
		`- - self.bootloader_entry.append_text("Grub")`
		`- + self.bootloader_entry.append_text("Grub2")`
		`- self.bootloader_entry.append_text("Systemd-boot")`
		`- if not self.select_combobox_value(self.bootloader_entry, self.bootloader):`
		`- # Automatically select first entry`
		`- @@ -1703,7 +1702,7 @@`
		`- """`
		`- Check that all necessary mount points are specified.`
		`- At least root (/) partition must be defined and in UEFI systems`
		`- - a fat partition mounted in /boot (Systemd-boot) or /boot/efi (grub) must be defined too.`
		`- + a fat partition mounted in /boot (Systemd-boot) or /boot/efi (grub2) must be defined too.`
		`- """`
		`-`
		`- check_parts = ["/", "/boot", "/boot/efi", "swap"]`
		`- @@ -1736,7 +1735,7 @@`
		`- part_label["/"].show()`
		`-`
		`- if is_uefi:`
		`- - if self.bootloader == "grub":`
		`- + if self.bootloader == "grub2":`
		`- part_label["/boot/efi"].show()`
		`- if self.bootloader == "systemd-boot":`
		`- part_label["/boot"].show()`
		`- @@ -1766,8 +1765,8 @@`
		`- if is_uefi:`
		`- # /boot or /boot/efi need to be fat32 in UEFI systems`
		`- if "fat" in fsystem:`
		`- - if self.bootloader == "grub" and mnt == "/boot/efi":`
		`- - # Grub in UEFI`
		`- + if self.bootloader == "grub2" and mnt == "/boot/efi":`
		`- + # Grub2 in UEFI`
		`- has_part["/boot/efi"] = True`
		`- part_label["/boot/efi"].show()`
		`- part_label["/boot/efi"].set_state(True)`
		`- @@ -1787,8 +1786,8 @@`
		`- check_ok = has_part["/"]`
		`-`
		`- if is_uefi:`
		`- - if self.bootloader == "grub":`
		`- - # Grub needs a /boot/efi partition in UEFI`
		`- + if self.bootloader == "grub2":`
		`- + # Grub2 needs a /boot/efi partition in UEFI`
		`- check_ok = check_ok and has_part["/boot/efi"]`
		`- elif self.bootloader == "systemd-boot":`
		`- # Systemd-boot (Gummiboot) needs a /boot partition`
		`- @@ -2009,7 +2008,7 @@`
		`- self.settings.set('bootloader_device', self.bootloader_device)`
		`-`
		`- self.settings.set('bootloader', self.bootloader)`
		`- - msg = "Parabola will install the bootloader {0} in device {1}"`
		`- + msg = "Antergos will install the bootloader {0} in device {1}"`
		`- msg = msg.format(self.bootloader, self.bootloader_device)`
		`- logging.info(msg)`
		`-`
		`- diff -Nur Cnchi-0.12.0/cnchi/installation/alongside.py Cnchi-0.12.0.orig/cnchi/installation/alongside.py`
		`- --- Cnchi-0.12.0/cnchi/installation/alongside.py 2016-02-19 22:49:47.171043395 -0200`
		`- +++ Cnchi-0.12.0.orig/cnchi/installation/alongside.py 2016-01-29 08:56:41.000000000 -0200`
		`- @@ -4,7 +4,6 @@`
		`- # alongside.py`
		`- #`
		`- # Copyright © 2013-2015 Antergos`
		`- -# Copyright © 2016 Parabola`
		`- #`
		`- # This file is part of Cnchi.`
		`- #`
		`- @@ -52,7 +51,7 @@`
		`-`
		`- from gtkbasebox import GtkBaseBox`
		`-`
		`- -# Leave at least 6.5GB for Parabola when shrinking`
		`- +# Leave at least 6.5GB for Antergos when shrinking`
		`- MIN_ROOT_SIZE = 6500`
		`-`
		`-`
		`- @@ -120,7 +119,7 @@`
		`-`
		`- @staticmethod`
		`- def get_new_device(device_to_shrink):`
		`- - """ Get new device where Cnchi will install Parabola`
		`- + """ Get new device where Cnchi will install Antergos`
		`- returns an empty string if no device is available """`
		`- number = int(device_to_shrink[len("/dev/sdX"):])`
		`- disk = device_to_shrink[:len("/dev/sdX")]`
		`- @@ -152,10 +151,10 @@`
		`- (min_size, part_size) = get_partition_size_info(device_to_shrink)`
		`- max_size = part_size - (MIN_ROOT_SIZE * 1000.0)`
		`- if max_size < 0:`
		`- - # Full Parabola does not fit but maybe base fits... ask user.`
		`- - txt = _("Cnchi recommends at least 6.5GB free to install Parabola.") + "\n\n"`
		`- + # Full Antergos does not fit but maybe base fits... ask user.`
		`- + txt = _("Cnchi recommends at least 6.5GB free to install Antergos.") + "\n\n"`
		`- txt += _("New partition {0} resulting of shrinking {1} will not have enough free space for a full installation.").format(new_device, device_to_shrink) + "\n\n"`
		`- - txt += _("You can still install Parabola, but be carefull on which DE you choose as it might not fit in.") + "\n\n"`
		`- + txt += _("You can still install Antergos, but be carefull on which DE you choose as it might not fit in.") + "\n\n"`
		`- txt += _("Install at your own risk!")`
		`- show.warning(self.get_toplevel(), txt)`
		`- max_size = part_size`
		`- @@ -175,8 +174,8 @@`
		`- icon_file = self.get_distributor_icon_file(self.oses[device_to_shrink])`
		`- self.resize_widget.set_part_icon('existing', icon_file=icon_file)`
		`-`
		`- - self.resize_widget.set_part_title('new', 'New Parabola', new_device)`
		`- - icon_file = self.get_distributor_icon_file('Parabola')`
		`- + self.resize_widget.set_part_title('new', 'New Antergos', new_device)`
		`- + icon_file = self.get_distributor_icon_file('Antergos')`
		`- self.resize_widget.set_part_icon('new', icon_file=icon_file)`
		`-`
		`- self.resize_widget.set_pref_size(max_size)`
		`- @@ -186,10 +185,10 @@`
		`- """ Gets an icon for the installed distribution """`
		`- os_name = os_name.lower()`
		`-`
		`- - # No numix icon for Parabola, use our own.`
		`- - if "parabola" in os_name:`
		`- + # No numix icon for Antergos, use our own.`
		`- + if "antergos" in os_name:`
		`- icons_path = os.path.join(self.settings.get('data'), "icons/48x48")`
		`- - icon_file = os.path.join(icons_path, "distributor-logo-parabola.png")`
		`- + icon_file = os.path.join(icons_path, "distributor-logo-antergos.png")`
		`- return icon_file`
		`-`
		`- icon_names = [`
		`- @@ -217,7 +216,7 @@`
		`- txt = _("Choose the partition that you want to shrink:")`
		`- self.choose_partition_label.set_markup(txt)`
		`-`
		`- - self.header.set_subtitle(_("Parabola Alongside Installation"))`
		`- + self.header.set_subtitle(_("Antergos Alongside Installation"))`
		`-`
		`- def on_choose_partition_combo_changed(self, combobox):`
		`- txt = combobox.get_active_text()`
		`- @@ -418,7 +417,7 @@`
		`- if self.settings.get('bootloader_install'):`
		`- self.settings.set('bootloader', "grub2")`
		`- self.settings.set('bootloader_device', device_path)`
		`- - msg = "Parabola will install the bootloader {0} in device {1}"`
		`- + msg = "Antergos will install the bootloader {0} in device {1}"`
		`- msg = msg.format(self.bootloader, self.bootloader_device)`
		`- logging.info(msg)`
		`- else:`
		`- diff -Nur Cnchi-0.12.0/cnchi/installation/ask.py Cnchi-0.12.0.orig/cnchi/installation/ask.py`
		`- --- Cnchi-0.12.0/cnchi/installation/ask.py 2016-02-19 22:56:49.698034148 -0200`
		`- +++ Cnchi-0.12.0.orig/cnchi/installation/ask.py 2016-01-29 08:56:41.000000000 -0200`
		`- @@ -4,7 +4,6 @@`
		`- # ask.py`
		`- #`
		`- # Copyright © 2013-2015 Antergos`
		`- -# Copyright © 2016 Parabola`
		`- #`
		`- # This file is part of Cnchi.`
		`- #`
		`- @@ -228,9 +227,9 @@`
		`- # Automatic Install`
		`- radio = self.ui.get_object("automatic_radiobutton")`
		`- if len(oses_str) > 0:`
		`- - txt = _("Replace {0} with Parabola").format(oses_str)`
		`- + txt = _("Replace {0} with Antergos").format(oses_str)`
		`- else:`
		`- - txt = _("Erase disk and install Parabola")`
		`- + txt = _("Erase disk and install Antergos")`
		`- radio.set_label(txt)`
		`- radio.set_name('auto_radio_btn')`
		`-`
		`- @@ -296,12 +295,12 @@`
		`-`
		`- # Alongside Install (For now, only works with Windows)`
		`- # if len(oses_str) > 0:`
		`- - # txt = _("Install Parabola alongside {0}").format(oses_str)`
		`- + # txt = _("Install Antergos alongside {0}").format(oses_str)`
		`- # radio = self.ui.get_object("alongside_radiobutton")`
		`- # radio.set_label(txt)`
		`- #`
		`- # label = self.ui.get_object("alongside_description")`
		`- - # txt = _("Installs Parabola without removing {0}").format(oses_str)`
		`- + # txt = _("Installs Antergos without removing {0}").format(oses_str)`
		`- # txt = description_style.format(txt)`
		`- # label.set_markup(txt)`
		`- # label.set_line_wrap(True)`
		`- @@ -321,7 +320,7 @@`
		`-`
		`- # Advanced Install`
		`- radio = self.ui.get_object("advanced_radiobutton")`
		`- - radio.set_label(_("Choose exactly where Parabola should be installed."))`
		`- + radio.set_label(_("Choose exactly where Antergos should be installed."))`
		`- radio.set_name("advanced_radio_btn")`
		`-`
		`- label = self.ui.get_object("advanced_description")`
		`- @@ -348,7 +347,7 @@`
		`- self.settings.set('use_lvm', use_lvm)`
		`- self.settings.set('use_luks', use_luks)`
		`- self.settings.set('use_luks_in_root', True)`
		`- - self.settings.set('luks_root_volume', "cryptParabola")`
		`- + self.settings.set('luks_root_volume', "cryptAntergos")`
		`- self.settings.set('use_home', use_home)`
		`- else:`
		`- # Set defaults. We don't know these yet.`
		`- @@ -359,14 +358,14 @@`
		`- self.settings.set('use_home', False)`
		`-`
		`- if self.settings.get('use_luks'):`
		`- - logging.info("Parabola installation will be encrypted using LUKS")`
		`- + logging.info("Antergos installation will be encrypted using LUKS")`
		`-`
		`- if self.settings.get('use_lvm'):`
		`- - logging.info("Parabola will be installed using LVM volumes")`
		`- + logging.info("Antergos will be installed using LVM volumes")`
		`- if self.settings.get('use_home'):`
		`- - logging.info("Parabola will be installed using a separate /home volume.")`
		`- + logging.info("Antergos will be installed using a separate /home volume.")`
		`- elif self.settings.get('use_home'):`
		`- - logging.info("Parabola will be installed using a separate /home partition.")`
		`- + logging.info("Antergos will be installed using a separate /home partition.")`
		`-`
		`- if self.next_page == "installation_alongside":`
		`- self.settings.set('partition_mode', 'alongside')`
		`- diff -Nur Cnchi-0.12.0/cnchi/installation/automatic.py Cnchi-0.12.0.orig/cnchi/installation/automatic.py`
		`- --- Cnchi-0.12.0/cnchi/installation/automatic.py 2016-02-19 22:57:43.423730654 -0200`
		`- +++ Cnchi-0.12.0.orig/cnchi/installation/automatic.py 2016-01-29 08:56:41.000000000 -0200`
		`- @@ -4,7 +4,6 @@`
		`- # automatic.py`
		`- #`
		`- # Copyright © 2013-2015 Antergos`
		`- -# Copyright © 2016 Parabola`
		`- #`
		`- # This file is part of Cnchi.`
		`- #`
		`- @@ -71,7 +70,7 @@`
		`- self.devices = {}`
		`- self.installation = None`
		`-`
		`- - self.bootloader = "grub"`
		`- + self.bootloader = "grub2"`
		`- self.bootloader_entry = self.ui.get_object('bootloader_entry')`
		`- self.bootloader_device_entry = self.ui.get_object('bootloader_device_entry')`
		`- self.bootloader_devices = {}`
		`- @@ -90,7 +89,7 @@`
		`- label.set_markup(txt)`
		`-`
		`- label = self.ui.get_object('info_label')`
		`- - txt = _("Select the drive we should use to install Parabola and then click above to start the process.")`
		`- + txt = _("Select the drive we should use to install Antergos and then click above to start the process.")`
		`- label.set_markup(txt)`
		`-`
		`- label = self.ui.get_object('label_luks_password')`
		`- @@ -226,7 +225,7 @@`
		`- self.bootloader_entry.remove_all()`
		`-`
		`- if os.path.exists('/sys/firmware/efi'):`
		`- - self.bootloader_entry.append_text("Grub")`
		`- + self.bootloader_entry.append_text("Grub2")`
		`- self.bootloader_entry.append_text("Gummiboot")`
		`- self.bootloader_entry.set_active(0)`
		`- self.bootloader_entry.show()`
		`- @@ -342,12 +341,12 @@`
		`- self.settings.set('bootloader_device', self.bootloader_device)`
		`-`
		`- self.settings.set('bootloader', self.bootloader)`
		`- - msg = _("Parabola will install the bootloader '{0}' in device '{1}'")`
		`- + msg = _("Antergos will install the bootloader '{0}' in device '{1}'")`
		`- msg = msg.format(self.bootloader, self.bootloader_device)`
		`- logging.info(msg)`
		`-`
		`- def run_install(self, packages, metalinks):`
		`- - txt = _("Cnchi will install Parabola on device %s")`
		`- + txt = _("Cnchi will install Antergos on device %s")`
		`- logging.info(txt, self.auto_device)`
		`-`
		`- self.settings.set('auto_device', self.auto_device)`
		`- diff -Nur Cnchi-0.12.0/cnchi/installation/auto_partition.py Cnchi-0.12.0.orig/cnchi/installation/auto_partition.py`
		`- --- Cnchi-0.12.0/cnchi/installation/auto_partition.py 2016-02-19 23:10:39.301156133 -0200`
		`- +++ Cnchi-0.12.0.orig/cnchi/installation/auto_partition.py 2016-01-29 08:56:41.000000000 -0200`
		`- @@ -4,7 +4,6 @@`
		`- # auto_partition.py`
		`- #`
		`- # Copyright © 2013-2015 Antergos`
		`- -# Copyright © 2016 Parabola`
		`- #`
		`- # This file is part of Cnchi.`
		`- #`
		`- @@ -151,10 +150,10 @@`
		`- failed installation) """`
		`-`
		`- try:`
		`- - if os.path.exists("/dev/mapper/cryptParabola"):`
		`- - subprocess.check_call(["cryptsetup", "luksClose", "/dev/mapper/cryptParabola"])`
		`- - if os.path.exists("/dev/mapper/cryptParabolaHome"):`
		`- - subprocess.check_call(["cryptsetup", "luksClose", "/dev/mapper/cryptParabolaHome"])`
		`- + if os.path.exists("/dev/mapper/cryptAntergos"):`
		`- + subprocess.check_call(["cryptsetup", "luksClose", "/dev/mapper/cryptAntergos"])`
		`- + if os.path.exists("/dev/mapper/cryptAntergosHome"):`
		`- + subprocess.check_call(["cryptsetup", "luksClose", "/dev/mapper/cryptAntergosHome"])`
		`- except subprocess.CalledProcessError as err:`
		`- logging.warning("Can't close already opened LUKS devices, command %s failed: %s", err.cmd, err.output)`
		`-`
		`- @@ -467,7 +466,7 @@`
		`- else:`
		`- part_num = 1`
		`-`
		`- - if self.bootloader == "grub":`
		`- + if self.bootloader == "grub2":`
		`- devices['efi'] = "{0}{1}".format(device, part_num)`
		`- part_num += 1`
		`-`
		`- @@ -490,25 +489,25 @@`
		`- if self.lvm:`
		`- # LUKS and LVM`
		`- devices['luks_root'] = devices['root']`
		`- - devices['lvm'] = "/dev/mapper/cryptParabola"`
		`- + devices['lvm'] = "/dev/mapper/cryptAntergos"`
		`- else:`
		`- # LUKS and no LVM`
		`- devices['luks_root'] = devices['root']`
		`- - devices['root'] = "/dev/mapper/cryptParabola"`
		`- + devices['root'] = "/dev/mapper/cryptAntergos"`
		`- if self.home:`
		`- # In this case we'll have two LUKS devices, one for root`
		`- # and the other one for /home`
		`- devices['luks_home'] = devices['home']`
		`- - devices['home'] = "/dev/mapper/cryptParabolaHome"`
		`- + devices['home'] = "/dev/mapper/cryptAntergosHome"`
		`- elif self.lvm:`
		`- # No LUKS but using LVM`
		`- devices['lvm'] = devices['root']`
		`-`
		`- if self.lvm:`
		`- - devices['root'] = "/dev/ParabolaVG/ParabolaRoot"`
		`- - devices['swap'] = "/dev/ParabolaVG/ParabolaSwap"`
		`- + devices['root'] = "/dev/AntergosVG/AntergosRoot"`
		`- + devices['swap'] = "/dev/AntergosVG/AntergosSwap"`
		`- if self.home:`
		`- - devices['home'] = "/dev/ParabolaVG/ParabolaHome"`
		`- + devices['home'] = "/dev/AntergosVG/AntergosHome"`
		`-`
		`- return devices`
		`-`
		`- @@ -518,7 +517,7 @@`
		`- devices = self.get_devices()`
		`- mount_devices = {}`
		`-`
		`- - if self.GPT and self.bootloader == "grub":`
		`- + if self.GPT and self.bootloader == "grub2":`
		`- mount_devices['/boot/efi'] = devices['efi']`
		`-`
		`- mount_devices['/boot'] = devices['boot']`
		`- @@ -546,7 +545,7 @@`
		`-`
		`- fs_devices = {}`
		`-`
		`- - if self.GPT and self.bootloader == "grub":`
		`- + if self.GPT and self.bootloader == "grub2":`
		`- fs_devices[devices['efi']] = "vfat"`
		`-`
		`- if self.GPT and self.bootloader == "systemd-boot":`
		`- @@ -578,7 +577,7 @@`
		`- def get_part_sizes(self, disk_size, start_part_sizes=1):`
		`- part_sizes = {'disk': disk_size, 'boot': 256, 'efi': 0}`
		`-`
		`- - if self.GPT and self.bootloader == "grub":`
		`- + if self.GPT and self.bootloader == "grub2":`
		`- part_sizes['efi'] = 200`
		`-`
		`- mem_total = check_output("grep MemTotal /proc/meminfo")`
		`- @@ -626,7 +625,7 @@`
		`-`
		`- def log_part_sizes(self, part_sizes):`
		`- logging.debug("Total disk size: %dMiB", part_sizes['disk'])`
		`- - if self.GPT and self.bootloader == "grub":`
		`- + if self.GPT and self.bootloader == "grub2":`
		`- logging.debug("EFI System Partition (ESP) size: %dMiB", part_sizes['efi'])`
		`- logging.debug("Boot partition size: %dMiB", part_sizes['boot'])`
		`-`
		`- @@ -710,7 +709,7 @@`
		`- sgdisk_new(device, part_num, "BIOS_BOOT", gpt_bios_grub_part_size, "EF02")`
		`- part_num += 1`
		`-`
		`- - if self.bootloader == "grub":`
		`- + if self.bootloader == "grub2":`
		`- # Create EFI System Partition (ESP)`
		`- # GPT GUID: C12A7328-F81F-11D2-BA4B-00A0C93EC93B`
		`- sgdisk_new(device, part_num, "UEFI_SYSTEM", part_sizes['efi'], "EF00")`
		`- @@ -718,22 +717,22 @@`
		`-`
		`- # Create Boot partition`
		`- if self.bootloader == "systemd-boot":`
		`- - sgdisk_new(device, part_num, "PARABOLA_BOOT", part_sizes['boot'], "EF00")`
		`- + sgdisk_new(device, part_num, "ANTERGOS_BOOT", part_sizes['boot'], "EF00")`
		`- else:`
		`- - sgdisk_new(device, part_num, "PARABOLA_BOOT", part_sizes['boot'], "8300")`
		`- + sgdisk_new(device, part_num, "ANTERGOS_BOOT", part_sizes['boot'], "8300")`
		`- part_num += 1`
		`-`
		`- if self.lvm:`
		`- # Create partition for lvm (will store root, swap and home (if desired) logical volumes)`
		`- - sgdisk_new(device, part_num, "PARABOLA_LVM", part_sizes['lvm_pv'], "8E00")`
		`- + sgdisk_new(device, part_num, "ANTERGOS_LVM", part_sizes['lvm_pv'], "8E00")`
		`- part_num += 1`
		`- else:`
		`- - sgdisk_new(device, part_num, "PARABOLA_ROOT", part_sizes['root'], "8300")`
		`- + sgdisk_new(device, part_num, "ANTERGOS_ROOT", part_sizes['root'], "8300")`
		`- part_num += 1`
		`- if self.home:`
		`- - sgdisk_new(device, part_num, "PARABOLA_HOME", part_sizes['home'], "8302")`
		`- + sgdisk_new(device, part_num, "ANTERGOS_HOME", part_sizes['home'], "8302")`
		`- part_num += 1`
		`- - sgdisk_new(device, part_num, "PARABOLA_SWAP", 0, "8200")`
		`- + sgdisk_new(device, part_num, "ANTERGOS_SWAP", 0, "8200")`
		`-`
		`- logging.debug(check_output("sgdisk --print {0}".format(device)))`
		`- else:`
		`- @@ -794,7 +793,7 @@`
		`-`
		`- devices = self.get_devices()`
		`-`
		`- - if self.GPT and self.bootloader == "grub":`
		`- + if self.GPT and self.bootloader == "grub2":`
		`- logging.debug("EFI: %s", devices['efi'])`
		`-`
		`- logging.debug("Boot: %s", devices['boot'])`
		`- @@ -806,9 +805,9 @@`
		`- logging.debug("Swap: %s", devices['swap'])`
		`-`
		`- if self.luks:`
		`- - setup_luks(devices['luks_root'], "cryptParabola", self.luks_password, key_files[0])`
		`- + setup_luks(devices['luks_root'], "cryptAntergos", self.luks_password, key_files[0])`
		`- if self.home and not self.lvm:`
		`- - setup_luks(devices['luks_home'], "cryptParabolaHome", self.luks_password, key_files[1])`
		`- + setup_luks(devices['luks_home'], "cryptAntergosHome", self.luks_password, key_files[1])`
		`-`
		`- if self.lvm:`
		`- logging.debug("Cnchi will setup LVM on device %s", devices['lvm'])`
		`- @@ -824,7 +823,7 @@`
		`- raise InstallError(txt)`
		`-`
		`- try:`
		`- - subprocess.check_call(["vgcreate", "-f", "-y", "ParabolaVG", devices['lvm']])`
		`- + subprocess.check_call(["vgcreate", "-f", "-y", "AntergosVG", devices['lvm']])`
		`- except subprocess.CalledProcessError as err:`
		`- txt = "Error creating LVM volume group in device {0}. Command {1} failed: {2}".format(`
		`- devices['lvm'], err.cmd, err.Output)`
		`- @@ -835,11 +834,11 @@`
		`-`
		`- # Fix issue 180`
		`- # Check space we have now for creating logical volumes`
		`- - vg_info = check_output("vgdisplay -c ParabolaVG")`
		`- + vg_info = check_output("vgdisplay -c AntergosVG")`
		`- # Get column number 12: Size of volume group in kilobytes`
		`- vg_size = int(vg_info.split(":")[11]) / 1024`
		`- if part_sizes['lvm_pv'] > vg_size:`
		`- - logging.debug("Real ParabolaVG volume group size: %d MiB", vg_size)`
		`- + logging.debug("Real AntergosVG volume group size: %d MiB", vg_size)`
		`- logging.debug("Reajusting logical volume sizes")`
		`- diff_size = part_sizes['lvm_pv'] - vg_size`
		`- part_sizes = self.get_part_sizes(disk_size - diff_size, start_part_sizes)`
		`- @@ -848,19 +847,19 @@`
		`- # Create LVM volumes`
		`- try:`
		`- size = str(int(part_sizes['root']))`
		`- - cmd = ["lvcreate", "--name", "ParabolaRoot", "--size", size, "ParabolaVG"]`
		`- + cmd = ["lvcreate", "--name", "AntergosRoot", "--size", size, "AntergosVG"]`
		`- subprocess.check_call(cmd)`
		`-`
		`- if not self.home:`
		`- # Use the remainig space for our swap volume`
		`- - cmd = ["lvcreate", "--name", "ParabolaSwap", "--extents", "100%FREE", "ParabolaVG"]`
		`- + cmd = ["lvcreate", "--name", "AntergosSwap", "--extents", "100%FREE", "AntergosVG"]`
		`- subprocess.check_call(cmd)`
		`- else:`
		`- size = str(int(part_sizes['swap']))`
		`- - cmd = ["lvcreate", "--name", "ParabolaSwap", "--size", size, "ParabolaVG"]`
		`- + cmd = ["lvcreate", "--name", "AntergosSwap", "--size", size, "AntergosVG"]`
		`- subprocess.check_call(cmd)`
		`- # Use the remaining space for our home volume`
		`- - cmd = ["lvcreate", "--name", "ParabolaHome", "--extents", "100%FREE", "ParabolaVG"]`
		`- + cmd = ["lvcreate", "--name", "AntergosHome", "--extents", "100%FREE", "AntergosVG"]`
		`- subprocess.check_call(cmd)`
		`- except subprocess.CalledProcessError as err:`
		`- txt = "Error creating LVM logical volume. Command {0} failed: {1}".format(err.cmd, err.output)`
		`- @@ -879,10 +878,10 @@`
		`-`
		`- labels = {`
		`- 'efi': 'UEFI_SYSTEM',`
		`- - 'boot': 'ParabolaBoot',`
		`- - 'root': 'ParabolaRoot',`
		`- - 'home': 'ParabolaHome',`
		`- - 'swap': 'ParabolaSwap'}`
		`- + 'boot': 'AntergosBoot',`
		`- + 'root': 'AntergosRoot',`
		`- + 'home': 'AntergosHome',`
		`- + 'swap': 'AntergosSwap'}`
		`-`
		`- fs_devices = self.get_fs_devices()`
		`-`
		`- @@ -897,7 +896,7 @@`
		`- self.mkfs(devices['boot'], fs_devices[devices['boot']], mount_points['boot'], labels['boot'])`
		`-`
		`- # Note: Make sure the "boot" partition is defined before the "efi" one!`
		`- - if self.GPT and self.bootloader == "grub":`
		`- + if self.GPT and self.bootloader == "grub2":`
		`- # Format EFI System Partition (ESP) with vfat (fat32)`
		`- self.mkfs(devices['efi'], fs_devices[devices['efi']], mount_points['efi'], labels['efi'], "-F 32")`
		`-`
		`- @@ -942,6 +941,6 @@`
		`- luks_password="luks",`
		`- use_lvm=True,`
		`- use_home=True,`
		`- - bootloader="grub",`
		`- + bootloader="grub2",`
		`- callback_queue=None)`
		`- auto.run()`
		`- diff -Nur Cnchi-0.12.0/cnchi/installation/bootloader.py Cnchi-0.12.0.orig/cnchi/installation/bootloader.py`
		`- --- Cnchi-0.12.0/cnchi/installation/bootloader.py 2016-02-19 23:21:47.223671813 -0200`
		`- +++ Cnchi-0.12.0.orig/cnchi/installation/bootloader.py 2016-01-29 08:56:41.000000000 -0200`
		`- @@ -4,7 +4,6 @@`
		`- # bootloader.py`
		`- #`
		`- # Copyright © 2013-2015 Antergos`
		`- -# Copyright © 2016 Parabola`
		`- #`
		`- # This file is part of Cnchi.`
		`- #`
		`- @@ -79,7 +78,7 @@`
		`- self.freeze_unfreeze_xfs()`
		`-`
		`- bootloader = self.settings.get('bootloader').lower()`
		`- - if bootloader == "grub":`
		`- + if bootloader == "grub2":`
		`- self.install_grub()`
		`- elif bootloader == "systemd-boot":`
		`- logging.debug("Cnchi will install the Systemd-boot loader")`
		`- @@ -90,11 +89,11 @@`
		`- self.prepare_grub_d()`
		`-`
		`- if os.path.exists('/sys/firmware/efi'):`
		`- - logging.debug("Cnchi will install the Grub (efi) loader")`
		`- - self.install_grub_efi()`
		`- + logging.debug("Cnchi will install the Grub2 (efi) loader")`
		`- + self.install_grub2_efi()`
		`- else:`
		`- - logging.debug("Cnchi will install the Grub (bios) loader")`
		`- - self.install_grub_bios()`
		`- + logging.debug("Cnchi will install the Grub2 (bios) loader")`
		`- + self.install_grub2_bios()`
		`-`
		`- self.check_root_uuid_in_grub()`
		`-`
		`- @@ -116,7 +115,7 @@`
		`-`
		`- boot_command = 'linux /vmlinuz-linux {0} {1} {2}\n'.format(ruuid_str, cmdline_linux, cmdline_linux_default)`
		`-`
		`- - pattern = re.compile("menuentry 'Parabola GNU/Linux-libre'[\s\S]*initramfs-linux.img\n}")`
		`- + pattern = re.compile("menuentry 'Antergos Linux'[\s\S]*initramfs-linux.img\n}")`
		`-`
		`- cfg = os.path.join(self.dest_dir, "boot/grub/grub.cfg")`
		`- with open(cfg) as grub_file:`
		`- @@ -151,9 +150,9 @@`
		`- else:`
		`- cmd_linux_default = 'quiet {0}'.format(use_splash)`
		`-`
		`- - self.set_grub_option("GRUB_THEME", "/boot/grub/themes/Parabola-Default/theme.txt")`
		`- + self.set_grub_option("GRUB_THEME", "/boot/grub/themes/Antergos-Default/theme.txt")`
		`- self.set_grub_option("GRUB_CMDLINE_LINUX_DEFAULT", cmd_linux_default)`
		`- - self.set_grub_option("GRUB_DISTRIBUTOR", "Parabola")`
		`- + self.set_grub_option("GRUB_DISTRIBUTOR", "Antergos")`
		`-`
		`- if self.settings.get('use_luks'):`
		`- # Should fix issue #352`
		`- @@ -218,10 +217,10 @@`
		`- logging.error(general_error)`
		`-`
		`- def prepare_grub_d(self):`
		`- - """ Copies 10_parabola script into /etc/grub.d/ """`
		`- + """ Copies 10_antergos script into /etc/grub.d/ """`
		`- grub_d_dir = os.path.join(self.dest_dir, "etc/grub.d")`
		`- script_dir = os.path.join(self.settings.get("cnchi"), "scripts")`
		`- - script = "10_parabola"`
		`- + script = "10_antergos"`
		`-`
		`- os.makedirs(grub_d_dir, mode=0o755, exist_ok=True)`
		`-`
		`- @@ -237,10 +236,10 @@`
		`- else:`
		`- logging.warning("Can't find script %s", script_path)`
		`-`
		`- - def install_grub_bios(self):`
		`- - """ Install Grub bootloader in a BIOS system """`
		`- + def install_grub2_bios(self):`
		`- + """ Install Grub2 bootloader in a BIOS system """`
		`- grub_location = self.settings.get('bootloader_device')`
		`- - txt = _("Installing GRUB BIOS boot loader in {0}").format(grub_location)`
		`- + txt = _("Installing GRUB(2) BIOS boot loader in {0}").format(grub_location)`
		`- logging.info(txt)`
		`-`
		`- # /dev and others need to be mounted (binded).`
		`- @@ -267,7 +266,7 @@`
		`- except Exception as general_error:`
		`- logging.error('Command grub-install failed. Unknown Error: %s', general_error)`
		`-`
		`- - self.install_grub_locales()`
		`- + self.install_grub2_locales()`
		`-`
		`- # Add -l option to os-prober's umount call so that it does not hang`
		`- self.apply_osprober_patch()`
		`- @@ -286,12 +285,12 @@`
		`-`
		`- cfg = os.path.join(self.dest_dir, "boot/grub/grub.cfg")`
		`- with open(cfg) as grub_cfg:`
		`- - if "Parabola" in grub_cfg.read():`
		`- - txt = _("GRUB BIOS has been successfully installed.")`
		`- + if "Antergos" in grub_cfg.read():`
		`- + txt = _("GRUB(2) BIOS has been successfully installed.")`
		`- logging.info(txt)`
		`- self.settings.set('bootloader_installation_successful', True)`
		`- else:`
		`- - txt = _("ERROR installing GRUB BIOS.")`
		`- + txt = _("ERROR installing GRUB(2) BIOS.")`
		`- logging.warning(txt)`
		`- self.settings.set('bootloader_installation_successful', False)`
		`-`
		`- @@ -300,15 +299,15 @@`
		`- """ Generates a random string to be used as an identifier for the UEFI bootloader_id """`
		`- return ''.join(random.choice(chars) for x in range(size))`
		`-`
		`- - def install_grub_efi(self):`
		`- - """ Install Grub bootloader in a UEFI system """`
		`- + def install_grub2_efi(self):`
		`- + """ Install Grub2 bootloader in a UEFI system """`
		`- uefi_arch = "x86_64"`
		`- spec_uefi_arch = "x64"`
		`- spec_uefi_arch_caps = "X64"`
		`- - bootloader_id = 'parabola_grub' if not os.path.exists('/install/boot/efi/EFI/parabola_grub') else \`
		`- - 'parabola_grub_{0}'.format(self.random_generator())`
		`- + bootloader_id = 'antergos_grub' if not os.path.exists('/install/boot/efi/EFI/antergos_grub') else \`
		`- + 'antergos_grub_{0}'.format(self.random_generator())`
		`-`
		`- - txt = _("Installing GRUB UEFI {0} boot loader").format(uefi_arch)`
		`- + txt = _("Installing GRUB(2) UEFI {0} boot loader").format(uefi_arch)`
		`- logging.info(txt)`
		`-`
		`- grub_install = [`
		`- @@ -330,21 +329,21 @@`
		`- except Exception as general_error:`
		`- logging.error('Command grub-install failed. Unknown Error: %s', general_error)`
		`-`
		`- - self.install_grub_locales()`
		`- + self.install_grub2_locales()`
		`-`
		`- # Copy grub into dirs known to be used as default by some OEMs if they do not exist yet.`
		`- grub_defaults = [os.path.join(self.dest_dir, "boot/efi/EFI/BOOT", "BOOT{0}.efi".format(spec_uefi_arch_caps)),`
		`- os.path.join(self.dest_dir, "boot/efi/EFI/Microsoft/Boot", 'bootmgfw.efi')]`
		`-`
		`- - grub_path = os.path.join(self.dest_dir, "boot/efi/EFI/parabola_grub", "grub{0}.efi".format(spec_uefi_arch))`
		`- + grub_path = os.path.join(self.dest_dir, "boot/efi/EFI/antergos_grub", "grub{0}.efi".format(spec_uefi_arch))`
		`-`
		`- for grub_default in grub_defaults:`
		`- path = grub_default.split()[0]`
		`- if not os.path.exists(path):`
		`- - msg = _("No OEM loader found in %s. Copying Grub into dir.")`
		`- + msg = _("No OEM loader found in %s. Copying Grub(2) into dir.")`
		`- logging.info(msg, path)`
		`- os.makedirs(path, mode=0o755)`
		`- - msg_failed = _("Copying Grub into OEM dir failed: %s")`
		`- + msg_failed = _("Copying Grub(2) into OEM dir failed: %s")`
		`- try:`
		`- shutil.copy(grub_path, grub_default)`
		`- except FileNotFoundError:`
		`- @@ -386,10 +385,10 @@`
		`- logging.debug("Path '%s' doesn't exist, when it should", path)`
		`-`
		`- if exists:`
		`- - logging.info("GRUB UEFI install completed successfully")`
		`- + logging.info("GRUB(2) UEFI install completed successfully")`
		`- self.settings.set('bootloader_installation_successful', True)`
		`- else:`
		`- - logging.warning("GRUB UEFI install may not have completed successfully.")`
		`- + logging.warning("GRUB(2) UEFI install may not have completed successfully.")`
		`- self.settings.set('bootloader_installation_successful', False)`
		`-`
		`- def apply_osprober_patch(self):`
		`- @@ -404,9 +403,9 @@`
		`- else:`
		`- logging.warning("Failed to patch 50mounted-tests, file not found.")`
		`-`
		`- - def install_grub_locales(self):`
		`- - """ Install Grub locales """`
		`- - logging.debug("Installing Grub locales.")`
		`- + def install_grub2_locales(self):`
		`- + """ Install Grub2 locales """`
		`- + logging.debug("Installing Grub2 locales.")`
		`- dest_locale_dir = os.path.join(self.dest_dir, "boot/grub/locale")`
		`-`
		`- os.makedirs(dest_locale_dir, mode=0o755, exist_ok=True)`
		`- @@ -416,7 +415,7 @@`
		`- try:`
		`- shutil.copy2(grub_mo, os.path.join(dest_locale_dir, "en.mo"))`
		`- except FileNotFoundError:`
		`- - logging.warning("Can't install GRUB locale.")`
		`- + logging.warning("Can't install GRUB(2) locale.")`
		`- except FileExistsError:`
		`- # Ignore if already exists`
		`- pass`
		`- @@ -428,35 +427,35 @@`
		`- os.makedirs(menu_dir, mode=0o755, exist_ok=True)`
		`- menu_path = os.path.join(menu_dir, "loader.conf")`
		`- with open(menu_path, 'w') as menu_file:`
		`- - menu_file.write("default parabola")`
		`- + menu_file.write("default antergos")`
		`-`
		`- # Setup boot entries`
		`- conf = {}`
		`-`
		`- if not self.settings.get('use_luks'):`
		`- conf['default'] = []`
		`- - conf['default'].append("title\tParabola\n")`
		`- + conf['default'].append("title\tAntergos\n")`
		`- conf['default'].append("linux\t/vmlinuz-linux\n")`
		`- conf['default'].append("initrd\t/initramfs-linux.img\n")`
		`- conf['default'].append("options\troot=UUID={0} rw quiet\n\n".format(self.root_uuid))`
		`-`
		`- conf['fallback'] = []`
		`- - conf['fallback'].append("title\tParabola (fallback)\n")`
		`- + conf['fallback'].append("title\tAntergos (fallback)\n")`
		`- conf['fallback'].append("linux\t/vmlinuz-linux\n")`
		`- conf['fallback'].append("initrd\t/initramfs-linux-fallback.img\n")`
		`- conf['fallback'].append("options\troot=UUID={0} rw quiet\n\n".format(self.root_uuid))`
		`-`
		`- if self.settings.get('feature_lts'):`
		`- conf['lts'] = []`
		`- - conf['lts'].append("title\tParabola LTS\n")`
		`- - conf['lts'].append("linux\t/vmlinuz-linux-libre-lts\n")`
		`- - conf['lts'].append("initrd\t/initramfs-linux-libre-lts.img\n")`
		`- + conf['lts'].append("title\tAntergos LTS\n")`
		`- + conf['lts'].append("linux\t/vmlinuz-linux-lts\n")`
		`- + conf['lts'].append("initrd\t/initramfs-linux-lts.img\n")`
		`- conf['lts'].append("options\troot=UUID={0} rw quiet\n\n".format(self.root_uuid))`
		`-`
		`- conf['lts_fallback'] = []`
		`- - conf['lts_fallback'].append("title\tParabola LTS (fallback)\n\n")`
		`- - conf['lts_fallback'].append("linux\t/vmlinuz-linux-libre-lts\n")`
		`- - conf['lts_fallback'].append("initrd\t/initramfs-linux-libre-lts-fallback.img\n")`
		`- + conf['lts_fallback'].append("title\tAntergos LTS (fallback)\n\n")`
		`- + conf['lts_fallback'].append("linux\t/vmlinuz-linux-lts\n")`
		`- + conf['lts_fallback'].append("initrd\t/initramfs-linux-lts-fallback.img\n")`
		`- conf['lts_fallback'].append("options\troot=UUID={0} rw quiet\n\n".format(self.root_uuid))`
		`- else:`
		`- luks_root_volume = self.settings.get('luks_root_volume')`
		`- @@ -478,47 +477,47 @@`
		`- root_uuid_line = root_uuid_line.format(root_uuid, luks_root_volume, key, luks_root_volume_uuid)`
		`-`
		`- conf['default'] = []`
		`- - conf['default'].append("title\tParabola\n")`
		`- + conf['default'].append("title\tAntergos\n")`
		`- conf['default'].append("linux\t/vmlinuz-linux\n")`
		`- conf['default'].append("options\tinitrd=/initramfs-linux.img {0}\n\n".format(root_uuid_line))`
		`-`
		`- conf['fallback'] = []`
		`- - conf['fallback'].append("title\tParabola (fallback)\n")`
		`- + conf['fallback'].append("title\tAntergos (fallback)\n")`
		`- conf['fallback'].append("linux\t/vmlinuz-linux\n")`
		`- conf['fallback'].append("options\tinitrd=/initramfs-linux-fallback.img {0}\n\n".format(root_uuid_line))`
		`-`
		`- if self.settings.get('feature_lts'):`
		`- conf['lts'] = []`
		`- - conf['lts'].append("title\tParabola LTS\n")`
		`- - conf['lts'].append("linux\t/vmlinuz-linux-libre-lts\n")`
		`- - conf['lts'].append("options\tinitrd=/initramfs-linux-libre-lts.img {0}\n\n".format(root_uuid_line))`
		`- + conf['lts'].append("title\tAntergos LTS\n")`
		`- + conf['lts'].append("linux\t/vmlinuz-linux-lts\n")`
		`- + conf['lts'].append("options\tinitrd=/initramfs-linux-lts.img {0}\n\n".format(root_uuid_line))`
		`-`
		`- conf['lts_fallback'] = []`
		`- - conf['lts_fallback'].append("title\tParabola LTS (fallback)\n")`
		`- - conf['lts_fallback'].append("linux\t/vmlinuz-linux-libre-lts\n")`
		`- - conf['lts_fallback'].append("options\tinitrd=/initramfs-linux-libre-lts-fallback.img {0}\n\n".format(root_uuid_line))`
		`- + conf['lts_fallback'].append("title\tAntergos LTS (fallback)\n")`
		`- + conf['lts_fallback'].append("linux\t/vmlinuz-linux-lts\n")`
		`- + conf['lts_fallback'].append("options\tinitrd=/initramfs-linux-lts-fallback.img {0}\n\n".format(root_uuid_line))`
		`-`
		`- # Write boot entries`
		`- entries_dir = os.path.join(self.dest_dir, "boot/loader/entries")`
		`- os.makedirs(entries_dir, mode=0o755, exist_ok=True)`
		`-`
		`- - entry_path = os.path.join(entries_dir, "parabola.conf")`
		`- + entry_path = os.path.join(entries_dir, "antergos.conf")`
		`- with open(entry_path, 'w') as entry_file:`
		`- for line in conf['default']:`
		`- entry_file.write(line)`
		`-`
		`- - entry_path = os.path.join(entries_dir, "parabola-fallback.conf")`
		`- + entry_path = os.path.join(entries_dir, "antergos-fallback.conf")`
		`- with open(entry_path, 'w') as entry_file:`
		`- for line in conf['fallback']:`
		`- entry_file.write(line)`
		`-`
		`- if self.settings.get('feature_lts'):`
		`- - entry_path = os.path.join(entries_dir, "parabola-lts.conf")`
		`- + entry_path = os.path.join(entries_dir, "antergos-lts.conf")`
		`- with open(entry_path, 'w') as entry_file:`
		`- for line in conf['lts']:`
		`- entry_file.write(line)`
		`-`
		`- - entry_path = os.path.join(entries_dir, "parabola-lts-fallback.conf")`
		`- + entry_path = os.path.join(entries_dir, "antergos-lts-fallback.conf")`
		`- with open(entry_path, 'w') as entry_file:`
		`- for line in conf['lts_fallback']:`
		`- entry_file.write(line)`
		`- @@ -543,7 +542,7 @@`
		`- self.settings.set('bootloader_installation_successful', False)`
		`-`
		`- def freeze_unfreeze_xfs(self):`
		`- - """ Freeze and unfreeze xfs, as hack for grub installing """`
		`- + """ Freeze and unfreeze xfs, as hack for grub(2) installing """`
		`- if not os.path.exists("/usr/bin/xfs_freeze"):`
		`- return`
		`-`
		`- diff -Nur Cnchi-0.12.0/cnchi/installation/glamp.py Cnchi-0.12.0.orig/cnchi/installation/glamp.py`
		`- --- Cnchi-0.12.0/cnchi/installation/glamp.py 2016-02-19 23:35:10.418447127 -0200`
		`- +++ Cnchi-0.12.0.orig/cnchi/installation/glamp.py 1969-12-31 21:00:00.000000000 -0300`
		`- @@ -1,175 +0,0 @@`
		`- -#!/usr/bin/env python`
		`- -# -- coding: utf-8 --`
		`- -#`
		`- -# glamp.py`
		`- -#`
		`- -# Copyright © 2013-2015 Antergos`
		`- -# Copyright © 2016 Parabola`
		`- -#`
		`- -# This file is part of Cnchi.`
		`- -#`
		`- -# Cnchi is free software; you can redistribute it and/or modify`
		`- -# it under the terms of the GNU General Public License as published by`
		`- -# the Free Software Foundation; either version 3 of the License, or`
		`- -# (at your option) any later version.`
		`- -#`
		`- -# Cnchi is distributed in the hope that it will be useful,`
		`- -# but WITHOUT ANY WARRANTY; without even the implied warranty of`
		`- -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the`
		`- -# GNU General Public License for more details.`
		`- -#`
		`- -# The following additional terms are in effect as per Section 7 of the license:`
		`- -#`
		`- -# The preservation of all legal notices and author attributions in`
		`- -# the material or in the Appropriate Legal Notices displayed`
		`- -# by works containing it is required.`
		`- -#`
		`- -# You should have received a copy of the GNU General Public License`
		`- -# along with Cnchi; If not, see <http://www.gnu.org/licenses/>.`
		`- -`
		`- -`
		`- -"""`
		`- -GLAMP stack is a group of open source software to get web servers up`
		`- -and running. The acronym stands for GNU/Linux, Apache, MySQL, and PHP.`
		`- -Since the server is already running Parabola, the GNU/Linux`
		`- -part is taken care of.`
		`- -"""`
		`- -`
		`- -`
		`- -import os`
		`- -import logging`
		`- -import shutil`
		`- -`
		`- -try:`
		`- - from installation import chroot`
		`- -except ImportError:`
		`- - import chroot`
		`- -`
		`- -DEST_DIR = '/install'`
		`- -`
		`- -`
		`- -def chroot_run(cmd):`
		`- - chroot.run(cmd, DEST_DIR)`
		`- -`
		`- -`
		`- -def setup():`
		`- - try:`
		`- - logging.debug("Doing Mariadb setup...")`
		`- - mariadb_setup()`
		`- - logging.debug("Mariadb setup done. Doing Apache setup...")`
		`- - apache_setup()`
		`- - logging.debug("Apache setup done. Doing PHP setup...")`
		`- - php_setup()`
		`- - logging.debug("PHP setup done.")`
		`- - except (FileExistsError, OSError) as io_error:`
		`- - logging.error(io_error)`
		`- -`
		`- -`
		`- -def mariadb_setup():`
		`- - cmd = [`
		`- - "mysql_install_db",`
		`- - "--user=mysql",`
		`- - "--basedir=/usr",`
		`- - "--datadir=/var/lib/mysql"]`
		`- - chroot_run(cmd)`
		`- -`
		`- - cmd = ["systemctl", "enable", "mysqld"]`
		`- - chroot_run(cmd)`
		`- -`
		`- - # TODO: Warn user to run mysql_secure_installation`
		`- -`
		`- -`
		`- -def apache_setup():`
		`- - # Allow site virtualization`
		`- - httpd_path = os.path.join(DEST_DIR, 'etc/httpd/conf/httpd.conf')`
		`- - with open(httpd_path, 'a') as httpd_conf:`
		`- - httpd_conf.write('IncludeOptional conf/sites-enabled/*.conf\n')`
		`- - httpd_conf.write('IncludeOptional conf/mods-enabled/*.conf\n')`
		`- -`
		`- - # We create config directories`
		`- - dirs = [`
		`- - "etc/httpd/conf/sites-available",`
		`- - "etc/httpd/conf/sites-enabled",`
		`- - "etc/httpd/conf/mods-enabled"]`
		`- -`
		`- - for path in dirs:`
		`- - path = os.path.join(DEST_DIR, path)`
		`- - os.makedirs(path, mode=0o755, exist_ok=True)`
		`- -`
		`- - # Copy a2ensite and a2dissite scripts`
		`- - scripts = ["a2ensite", "a2dissite"]`
		`- - for script in scripts:`
		`- - try:`
		`- - src = os.path.join("/usr/share/cnchi/scripts", script)`
		`- - dst = os.path.join(DEST_DIR, 'usr/local/bin', script)`
		`- - shutil.copy2(src, dst)`
		`- - os.chmod(dst, 0o755)`
		`- - except (FileExistsError, shutil.Error) as file_error:`
		`- - logging.warning(file_error)`
		`- -`
		`- - # Create localhost.conf in /etc/httpd/conf/sites-available/`
		`- - localhost_path = os.path.join(DEST_DIR, "etc/httpd/conf/sites-available/localhost.conf")`
		`- - with open(localhost_path, 'a') as localhost_conf:`
		`- - localhost_conf.write('\n# phpmyadmin alias and directory setup\n')`
		`- - localhost_conf.write('Alias /phpmyadmin "/usr/share/webapps/phpMyAdmin"\n')`
		`- - localhost_conf.write('<Directory "/usr/share/webapps/phpMyAdmin">\n')`
		`- - localhost_conf.write(' DirectoryIndex index.html index.php\n')`
		`- - localhost_conf.write(' AllowOverride All\n')`
		`- - localhost_conf.write(' Options FollowSymlinks\n')`
		`- - localhost_conf.write(' Require all granted\n')`
		`- - localhost_conf.write('</Directory>\n')`
		`- -`
		`- - # We activate the virtual localhost site`
		`- - chroot_run(["a2ensite", "localhost"])`
		`- -`
		`- - cmd = ["systemctl", "enable", "httpd"]`
		`- - chroot_run(cmd)`
		`- -`
		`- -`
		`- -def php_setup():`
		`- - # Comment mpm_event_module`
		`- - httpd_path = os.path.join(DEST_DIR, 'etc/httpd/conf/httpd.conf')`
		`- - with open(httpd_path, 'r') as load_module:`
		`- - lines = load_module.readlines()`
		`- - with open(httpd_path, 'w') as load_module:`
		`- - for line in lines:`
		`- - if "LoadModule mpm_event_module" in line:`
		`- - line = '# LoadModule mpm_event_module modules/mod_mpm_event.so\n'`
		`- - load_module.write(line)`
		`- -`
		`- - # Add mpm_prefork_module and php5_module`
		`- - php_path = os.path.join(DEST_DIR, 'etc/httpd/conf/mods-enabled/php.conf')`
		`- - with open(php_path, 'w') as php_conf:`
		`- - php_conf.write("LoadModule mpm_prefork_module /etc/httpd/modules/mod_mpm_prefork.so\n")`
		`- - php_conf.write("LoadModule php5_module /etc/httpd/modules/libphp5.so\n")`
		`- - php_conf.write("Include conf/extra/php5_module.conf\n")`
		`- -`
		`- - # PHP extensions that will be activated`
		`- - so_extensions = ["mysql", "mcrypt", "mssql", "mysqli", "openssl", "iconv", "imap", "zip", "bz2"]`
		`- -`
		`- - php_ini_path = os.path.join(DEST_DIR, 'etc/php/php.ini')`
		`- - with open(php_ini_path, 'r') as php_ini:`
		`- - lines = php_ini.readlines()`
		`- -`
		`- - with open(php_ini_path, 'w') as php_ini:`
		`- - for line in lines:`
		`- - # Uncomment extensions`
		`- - for so_ext in so_extensions:`
		`- - ext = ";extension={0}.so".format(so_ext)`
		`- - if line.startswith(ext):`
		`- - line = line[1:]`
		`- - # Add PhpMyAdmin system path (/etc/webapps/ and /usr/share/webapps/)`
		`- - # to make sure PHP can access and read files under those directories`
		`- - if "open_basedir =" in line:`
		`- - line = 'open_basedir = /srv/http/:/home/:/tmp/:/usr/share/pear/:/usr/share/webapps/:/etc/webapps/\n'`
		`- - php_ini.write(line)`
		`- -`
		`- - # Create a symlink (sites-enabled/localhost.conf) to sites-available/localhost.conf`
		`- - # Not necessary, a2ensite does this for us`
		`- - # source = os.path.join(DEST_DIR, 'etc/httpd/conf/sites-available/localhost.conf')`
		`- - # link_name = os.path.join(DEST_DIR, 'etc/httpd/conf/sites-enabled/localhost.conf')`
		`- - # os.symlink(source, link_name)`
		`- -`
		`- -`
		`- -if __name__ == '__main__':`
		`- - setup()`
		`- diff -Nur Cnchi-0.12.0/cnchi/installation/glemp.py Cnchi-0.12.0.orig/cnchi/installation/glemp.py`
		`- --- Cnchi-0.12.0/cnchi/installation/glemp.py 2016-02-19 23:34:42.652611620 -0200`
		`- +++ Cnchi-0.12.0.orig/cnchi/installation/glemp.py 1969-12-31 21:00:00.000000000 -0300`
		`- @@ -1,142 +0,0 @@`
		`- -#!/usr/bin/env python`
		`- -# -- coding: utf-8 --`
		`- -#`
		`- -# glemp.py`
		`- -#`
		`- -# Copyright © 2013-2015 Antergos`
		`- -# Copyright © 2016 Parabola`
		`- -#`
		`- -# This file is part of Cnchi.`
		`- -#`
		`- -# Cnchi is free software; you can redistribute it and/or modify`
		`- -# it under the terms of the GNU General Public License as published by`
		`- -# the Free Software Foundation; either version 3 of the License, or`
		`- -# (at your option) any later version.`
		`- -#`
		`- -# Cnchi is distributed in the hope that it will be useful,`
		`- -# but WITHOUT ANY WARRANTY; without even the implied warranty of`
		`- -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the`
		`- -# GNU General Public License for more details.`
		`- -#`
		`- -# The following additional terms are in effect as per Section 7 of the license:`
		`- -#`
		`- -# The preservation of all legal notices and author attributions in`
		`- -# the material or in the Appropriate Legal Notices displayed`
		`- -# by works containing it is required.`
		`- -#`
		`- -# You should have received a copy of the GNU General Public License`
		`- -# along with Cnchi; If not, see <http://www.gnu.org/licenses/>.`
		`- -`
		`- -`
		`- -"""`
		`- -GLEMP stack is a group of open source software to get web servers up`
		`- -and running. The acronym stands for Linux, nginx (pronounced Engine x),`
		`- -MySQL, and PHP. Since the server is already running Antergos, the linux`
		`- -part is taken care of.`
		`- -"""`
		`- -`
		`- -`
		`- -import os`
		`- -import logging`
		`- -`
		`- -try:`
		`- - from installation import chroot`
		`- -except ImportError:`
		`- - import chroot`
		`- -`
		`- -DEST_DIR = '/install'`
		`- -`
		`- -`
		`- -def chroot_run(cmd):`
		`- - chroot.run(cmd, DEST_DIR)`
		`- -`
		`- -`
		`- -def setup():`
		`- - try:`
		`- - logging.debug("Doing Mariadb setup...")`
		`- - mariadb_setup()`
		`- - logging.debug("Mariadb setup done. Doing Nginx setup...")`
		`- - nginx_setup()`
		`- - logging.debug("Nginx setup done. Doing PHP-fpm setup...")`
		`- - php_setup()`
		`- - logging.debug("PHP-fpm setup done.")`
		`- - except (FileExistsError, OSError) as io_error:`
		`- - logging.error(io_error)`
		`- -`
		`- -`
		`- -def mariadb_setup():`
		`- - cmd = [`
		`- - "mysql_install_db",`
		`- - "--user=mysql",`
		`- - "--basedir=/usr",`
		`- - "--datadir=/var/lib/mysql"]`
		`- - chroot_run(cmd)`
		`- -`
		`- - cmd = ["systemctl", "enable", "mysqld"]`
		`- - chroot_run(cmd)`
		`- -`
		`- - # TODO: Warn user to run mysql_secure_installation`
		`- -`
		`- -`
		`- -def nginx_setup():`
		`- - cmd = ["systemctl", "enable", "nginx"]`
		`- - chroot_run(cmd)`
		`- -`
		`- - # We need to tell nginx to run php using php-fpm.`
		`- - path = os.path.join(DEST_DIR, "etc/nginx/nginx.conf")`
		`- - with open(path, 'r') as nginx_conf:`
		`- - lines = nginx_conf.readlines()`
		`- -`
		`- - sections = {"http": False, "server": False, "location": False}`
		`- - with open(path, 'w') as nginx_conf:`
		`- - for line in lines:`
		`- - if "http {" in line:`
		`- - sections["http"] = True`
		`- -`
		`- - if sections["http"] and "server {" in line:`
		`- - sections["server"] = True`
		`- -`
		`- - if sections["http"] and sections["server"] and "#location ~ \.php$ {" in line:`
		`- - nginx_conf.write(" location ~ \.php$ {\n")`
		`- - nginx_conf.write(" fastcgi_pass unix:/var/run/php-fpm/php-fpm.sock;\n")`
		`- - nginx_conf.write(" fastcgi_index index.php;\n")`
		`- - nginx_conf.write(" root /usr/share/nginx/html;\n")`
		`- - nginx_conf.write(" include fastcgi.conf;\n")`
		`- - nginx_conf.write(" }\n\n")`
		`- - sections = {"http": False, "server": False, "location": False}`
		`- -`
		`- - nginx_conf.write(line)`
		`- -`
		`- -`
		`- -def php_setup():`
		`- - # Setup /etc/php/php.ini`
		`- - php_ini_path = os.path.join(DEST_DIR, 'etc/php/php.ini')`
		`- - with open(php_ini_path, 'r') as php_ini:`
		`- - lines = php_ini.readlines()`
		`- -`
		`- - # PHP extensions that will be activated`
		`- - so_extensions = ["mysql", "mcrypt", "mssql", "mysqli", "openssl", "iconv", "imap", "zip", "bz2"]`
		`- -`
		`- - php_ini_path = os.path.join(DEST_DIR, 'etc/php/php.ini')`
		`- - with open(php_ini_path, 'r') as php_ini:`
		`- - lines = php_ini.readlines()`
		`- -`
		`- - with open(php_ini_path, 'w') as php_ini:`
		`- - for line in lines:`
		`- - # Uncomment extensions`
		`- - for so_ext in so_extensions:`
		`- - ext = ";extension={0}.so".format(so_ext)`
		`- - if line.startswith(ext):`
		`- - line = line[1:]`
		`- - # Add PhpMyAdmin system path (/etc/webapps/ and /usr/share/webapps/)`
		`- - # to make sure PHP can access and read files under those directories`
		`- - if "open_basedir =" in line:`
		`- - line = 'open_basedir = /srv/http/:/home/:/tmp/:/usr/share/pear/:/usr/share/webapps/:/etc/webapps/\n'`
		`- - php_ini.write(line)`
		`- -`
		`- - cmd = ["systemctl", "enable", "php-fpm"]`
		`- - chroot_run(cmd)`
		`- -`
		`- -`
		`- -if __name__ == '__main__':`
		`- - setup()`
		`- diff -Nur Cnchi-0.12.0/cnchi/installation/install.py Cnchi-0.12.0.orig/cnchi/installation/install.py`
		`- --- Cnchi-0.12.0/cnchi/installation/install.py 2016-02-19 23:30:21.520796142 -0200`
		`- +++ Cnchi-0.12.0.orig/cnchi/installation/install.py 2016-01-29 08:56:41.000000000 -0200`
		`- @@ -4,7 +4,6 @@`
		`- # installation.py`
		`- #`
		`- # Copyright © 2013-2015 Antergos`
		`- -# Copyright © 2016 Parabola`
		`- #`
		`- # This file is part of Cnchi.`
		`- #`
		`- @@ -399,7 +398,7 @@`
		`- try:`
		`- cmd = ["pacman-key", "--init", "--gpgdir", dest_path]`
		`- subprocess.check_call(cmd)`
		`- - cmd = ["pacman-key", "--populate", "--gpgdir", dest_path, "archlinux", "parabola"]`
		`- + cmd = ["pacman-key", "--populate", "--gpgdir", dest_path, "archlinux", "antergos"]`
		`- subprocess.check_call(cmd)`
		`- except subprocess.CalledProcessError as process_error:`
		`- txt = "Error regenerating gnupg files with pacman-key, command {0} failed: {1}".format(`
		`- @@ -514,13 +513,13 @@`
		`-`
		`- os.chmod(crypttab_path, 0o666)`
		`- with open(crypttab_path, 'a') as crypttab_file:`
		`- - line = "cryptParabolaHome /dev/disk/by-uuid/{0} {1} luks\n".format(uuid, home_keyfile)`
		`- + line = "cryptAntergosHome /dev/disk/by-uuid/{0} {1} luks\n".format(uuid, home_keyfile)`
		`- crypttab_file.write(line)`
		`- logging.debug("Added %s to crypttab", line)`
		`- os.chmod(crypttab_path, 0o600)`
		`-`
		`- # Add line to fstab`
		`- - txt = "/dev/mapper/cryptParabolaHome {0} {1} defaults 0 0".format(mount_point, myfmt)`
		`- + txt = "/dev/mapper/cryptAntergosHome {0} {1} defaults 0 0".format(mount_point, myfmt)`
		`- all_lines.append(txt)`
		`- logging.debug("Added %s to fstab", txt)`
		`- continue`
		`- @@ -668,7 +667,7 @@`
		`-`
		`- @staticmethod`
		`- def update_pacman_conf():`
		`- - """ Add multilib repos """`
		`- + """ Add Antergos and multilib repos """`
		`- path = os.path.join(DEST_DIR, "etc/pacman.conf")`
		`- if os.path.exists(path):`
		`- paclines = []`
		`- @@ -681,6 +680,10 @@`
		`- paclines[i] = "[multilib]\n"`
		`- paclines[i+1] = "Include = /etc/pacman.d/mirrorlist\n"`
		`- break`
		`- + paclines.append("\n")`
		`- + paclines.append("[antergos]\n")`
		`- + paclines.append("SigLevel = PackageRequired\n")`
		`- + paclines.append("Include = /etc/pacman.d/antergos-mirrorlist\n")`
		`- with open(path, "w") as f:`
		`- f.write("".join(paclines))`
		`- else:`
		`- @@ -759,22 +762,22 @@`
		`- firewall.run(["enable"])`
		`- services.append('ufw')`
		`-`
		`- - if self.settings.get("feature_glamp") and not self.settings.get("feature_glemp"):`
		`- + if self.settings.get("feature_lamp") and not self.settings.get("feature_lemp"):`
		`- try:`
		`- - from installation import glamp`
		`- - logging.debug("Configuring GLAMP...")`
		`- - glamp.setup()`
		`- + from installation import lamp`
		`- + logging.debug("Configuring LAMP...")`
		`- + lamp.setup()`
		`- services.extend(["httpd", "mysqld"])`
		`- except ImportError as import_error:`
		`- - logging.warning("Unable to import GLAMP module: %s", str(import_error))`
		`- - elif self.settings.get("feature_glemp"):`
		`- + logging.warning("Unable to import LAMP module: %s", str(import_error))`
		`- + elif self.settings.get("feature_lemp"):`
		`- try:`
		`- - from installation import glemp`
		`- - logging.debug("Configuring GLEMP...")`
		`- - glemp.setup()`
		`- + from installation import lemp`
		`- + logging.debug("Configuring LEMP...")`
		`- + lemp.setup()`
		`- services.extend(["nginx", "mysqld", "php-fpm"])`
		`- except ImportError as import_error:`
		`- - logging.warning("Unable to import GLEMP module: %s", str(import_error))`
		`- + logging.warning("Unable to import LEMP module: %s", str(import_error))`
		`-`
		`- self.enable_services(services)`
		`-`
		`- @@ -889,7 +892,7 @@`
		`- audio_system = "pulse"`
		`-`
		`- with open(fluid_path, "w") as fluid_conf:`
		`- - fluid_conf.write('# Created by Cnchi, Parabola installer\n')`
		`- + fluid_conf.write('# Created by Cnchi, Antergos installer\n')`
		`- fluid_conf.write('SYNTHOPTS="-is -a {0} -m alsa_seq -r 48000"\n\n'.format(audio_system))`
		`-`
		`- def configure_system(self):`
		`- @@ -943,6 +946,7 @@`
		`- except FileExistsError:`
		`- logging.warning("File %s already exists.", mirrorlist_dst_path)`
		`-`
		`- + # Add Antergos repo to /etc/pacman.conf`
		`- self.update_pacman_conf()`
		`-`
		`- logging.debug("pacman.conf has been created successfully")`
		`- diff -Nur Cnchi-0.12.0/cnchi/installation/lamp.py Cnchi-0.12.0.orig/cnchi/installation/lamp.py`
		`- --- Cnchi-0.12.0/cnchi/installation/lamp.py 1969-12-31 21:00:00.000000000 -0300`
		`- +++ Cnchi-0.12.0.orig/cnchi/installation/lamp.py 2016-01-29 08:56:41.000000000 -0200`
		`- @@ -0,0 +1,174 @@`
		`- +#!/usr/bin/env python`
		`- +# -- coding: utf-8 --`
		`- +#`
		`- +# lamp.py`
		`- +#`
		`- +# Copyright © 2013-2015 Antergos`
		`- +#`
		`- +# This file is part of Cnchi.`
		`- +#`
		`- +# Cnchi is free software; you can redistribute it and/or modify`
		`- +# it under the terms of the GNU General Public License as published by`
		`- +# the Free Software Foundation; either version 3 of the License, or`
		`- +# (at your option) any later version.`
		`- +#`
		`- +# Cnchi is distributed in the hope that it will be useful,`
		`- +# but WITHOUT ANY WARRANTY; without even the implied warranty of`
		`- +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the`
		`- +# GNU General Public License for more details.`
		`- +#`
		`- +# The following additional terms are in effect as per Section 7 of the license:`
		`- +#`
		`- +# The preservation of all legal notices and author attributions in`
		`- +# the material or in the Appropriate Legal Notices displayed`
		`- +# by works containing it is required.`
		`- +#`
		`- +# You should have received a copy of the GNU General Public License`
		`- +# along with Cnchi; If not, see <http://www.gnu.org/licenses/>.`
		`- +`
		`- +`
		`- +"""`
		`- +LAMP stack is a group of open source software to get web servers up`
		`- +and running. The acronym stands for Linux, Apache, MySQL, and PHP.`
		`- +Since the server is already running Antergos, the linux`
		`- +part is taken care of.`
		`- +"""`
		`- +`
		`- +`
		`- +import os`
		`- +import logging`
		`- +import shutil`
		`- +`
		`- +try:`
		`- + from installation import chroot`
		`- +except ImportError:`
		`- + import chroot`
		`- +`
		`- +DEST_DIR = '/install'`
		`- +`
		`- +`
		`- +def chroot_run(cmd):`
		`- + chroot.run(cmd, DEST_DIR)`
		`- +`
		`- +`
		`- +def setup():`
		`- + try:`
		`- + logging.debug("Doing Mariadb setup...")`
		`- + mariadb_setup()`
		`- + logging.debug("Mariadb setup done. Doing Apache setup...")`
		`- + apache_setup()`
		`- + logging.debug("Apache setup done. Doing PHP setup...")`
		`- + php_setup()`
		`- + logging.debug("PHP setup done.")`
		`- + except (FileExistsError, OSError) as io_error:`
		`- + logging.error(io_error)`
		`- +`
		`- +`
		`- +def mariadb_setup():`
		`- + cmd = [`
		`- + "mysql_install_db",`
		`- + "--user=mysql",`
		`- + "--basedir=/usr",`
		`- + "--datadir=/var/lib/mysql"]`
		`- + chroot_run(cmd)`
		`- +`
		`- + cmd = ["systemctl", "enable", "mysqld"]`
		`- + chroot_run(cmd)`
		`- +`
		`- + # TODO: Warn user to run mysql_secure_installation`
		`- +`
		`- +`
		`- +def apache_setup():`
		`- + # Allow site virtualization`
		`- + httpd_path = os.path.join(DEST_DIR, 'etc/httpd/conf/httpd.conf')`
		`- + with open(httpd_path, 'a') as httpd_conf:`
		`- + httpd_conf.write('IncludeOptional conf/sites-enabled/*.conf\n')`
		`- + httpd_conf.write('IncludeOptional conf/mods-enabled/*.conf\n')`
		`- +`
		`- + # We create config directories`
		`- + dirs = [`
		`- + "etc/httpd/conf/sites-available",`
		`- + "etc/httpd/conf/sites-enabled",`
		`- + "etc/httpd/conf/mods-enabled"]`
		`- +`
		`- + for path in dirs:`
		`- + path = os.path.join(DEST_DIR, path)`
		`- + os.makedirs(path, mode=0o755, exist_ok=True)`
		`- +`
		`- + # Copy a2ensite and a2dissite scripts`
		`- + scripts = ["a2ensite", "a2dissite"]`
		`- + for script in scripts:`
		`- + try:`
		`- + src = os.path.join("/usr/share/cnchi/scripts", script)`
		`- + dst = os.path.join(DEST_DIR, 'usr/local/bin', script)`
		`- + shutil.copy2(src, dst)`
		`- + os.chmod(dst, 0o755)`
		`- + except (FileExistsError, shutil.Error) as file_error:`
		`- + logging.warning(file_error)`
		`- +`
		`- + # Create localhost.conf in /etc/httpd/conf/sites-available/`
		`- + localhost_path = os.path.join(DEST_DIR, "etc/httpd/conf/sites-available/localhost.conf")`
		`- + with open(localhost_path, 'a') as localhost_conf:`
		`- + localhost_conf.write('\n# phpmyadmin alias and directory setup\n')`
		`- + localhost_conf.write('Alias /phpmyadmin "/usr/share/webapps/phpMyAdmin"\n')`
		`- + localhost_conf.write('<Directory "/usr/share/webapps/phpMyAdmin">\n')`
		`- + localhost_conf.write(' DirectoryIndex index.html index.php\n')`
		`- + localhost_conf.write(' AllowOverride All\n')`
		`- + localhost_conf.write(' Options FollowSymlinks\n')`
		`- + localhost_conf.write(' Require all granted\n')`
		`- + localhost_conf.write('</Directory>\n')`
		`- +`
		`- + # We activate the virtual localhost site`
		`- + chroot_run(["a2ensite", "localhost"])`
		`- +`
		`- + cmd = ["systemctl", "enable", "httpd"]`
		`- + chroot_run(cmd)`
		`- +`
		`- +`
		`- +def php_setup():`
		`- + # Comment mpm_event_module`
		`- + httpd_path = os.path.join(DEST_DIR, 'etc/httpd/conf/httpd.conf')`
		`- + with open(httpd_path, 'r') as load_module:`
		`- + lines = load_module.readlines()`
		`- + with open(httpd_path, 'w') as load_module:`
		`- + for line in lines:`
		`- + if "LoadModule mpm_event_module" in line:`
		`- + line = '# LoadModule mpm_event_module modules/mod_mpm_event.so\n'`
		`- + load_module.write(line)`
		`- +`
		`- + # Add mpm_prefork_module and php5_module`
		`- + php_path = os.path.join(DEST_DIR, 'etc/httpd/conf/mods-enabled/php.conf')`
		`- + with open(php_path, 'w') as php_conf:`
		`- + php_conf.write("LoadModule mpm_prefork_module /etc/httpd/modules/mod_mpm_prefork.so\n")`
		`- + php_conf.write("LoadModule php5_module /etc/httpd/modules/libphp5.so\n")`
		`- + php_conf.write("Include conf/extra/php5_module.conf\n")`
		`- +`
		`- + # PHP extensions that will be activated`
		`- + so_extensions = ["mysql", "mcrypt", "mssql", "mysqli", "openssl", "iconv", "imap", "zip", "bz2"]`
		`- +`
		`- + php_ini_path = os.path.join(DEST_DIR, 'etc/php/php.ini')`
		`- + with open(php_ini_path, 'r') as php_ini:`
		`- + lines = php_ini.readlines()`
		`- +`
		`- + with open(php_ini_path, 'w') as php_ini:`
		`- + for line in lines:`
		`- + # Uncomment extensions`
		`- + for so_ext in so_extensions:`
		`- + ext = ";extension={0}.so".format(so_ext)`
		`- + if line.startswith(ext):`
		`- + line = line[1:]`
		`- + # Add PhpMyAdmin system path (/etc/webapps/ and /usr/share/webapps/)`
		`- + # to make sure PHP can access and read files under those directories`
		`- + if "open_basedir =" in line:`
		`- + line = 'open_basedir = /srv/http/:/home/:/tmp/:/usr/share/pear/:/usr/share/webapps/:/etc/webapps/\n'`
		`- + php_ini.write(line)`
		`- +`
		`- + # Create a symlink (sites-enabled/localhost.conf) to sites-available/localhost.conf`
		`- + # Not necessary, a2ensite does this for us`
		`- + # source = os.path.join(DEST_DIR, 'etc/httpd/conf/sites-available/localhost.conf')`
		`- + # link_name = os.path.join(DEST_DIR, 'etc/httpd/conf/sites-enabled/localhost.conf')`
		`- + # os.symlink(source, link_name)`
		`- +`
		`- +`
		`- +if __name__ == '__main__':`
		`- + setup()`
		`- diff -Nur Cnchi-0.12.0/cnchi/installation/lemp.py Cnchi-0.12.0.orig/cnchi/installation/lemp.py`
		`- --- Cnchi-0.12.0/cnchi/installation/lemp.py 1969-12-31 21:00:00.000000000 -0300`
		`- +++ Cnchi-0.12.0.orig/cnchi/installation/lemp.py 2016-01-29 08:56:41.000000000 -0200`
		`- @@ -0,0 +1,141 @@`
		`- +#!/usr/bin/env python`
		`- +# -- coding: utf-8 --`
		`- +#`
		`- +# lemp.py`
		`- +#`
		`- +# Copyright © 2013-2015 Antergos`
		`- +#`
		`- +# This file is part of Cnchi.`
		`- +#`
		`- +# Cnchi is free software; you can redistribute it and/or modify`
		`- +# it under the terms of the GNU General Public License as published by`
		`- +# the Free Software Foundation; either version 3 of the License, or`
		`- +# (at your option) any later version.`
		`- +#`
		`- +# Cnchi is distributed in the hope that it will be useful,`
		`- +# but WITHOUT ANY WARRANTY; without even the implied warranty of`
		`- +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the`
		`- +# GNU General Public License for more details.`
		`- +#`
		`- +# The following additional terms are in effect as per Section 7 of the license:`
		`- +#`
		`- +# The preservation of all legal notices and author attributions in`
		`- +# the material or in the Appropriate Legal Notices displayed`
		`- +# by works containing it is required.`
		`- +#`
		`- +# You should have received a copy of the GNU General Public License`
		`- +# along with Cnchi; If not, see <http://www.gnu.org/licenses/>.`
		`- +`
		`- +`
		`- +"""`
		`- +LEMP stack is a group of open source software to get web servers up`
		`- +and running. The acronym stands for Linux, nginx (pronounced Engine x),`
		`- +MySQL, and PHP. Since the server is already running Antergos, the linux`
		`- +part is taken care of.`
		`- +"""`
		`- +`
		`- +`
		`- +import os`
		`- +import logging`
		`- +`
		`- +try:`
		`- + from installation import chroot`
		`- +except ImportError:`
		`- + import chroot`
		`- +`
		`- +DEST_DIR = '/install'`
		`- +`
		`- +`
		`- +def chroot_run(cmd):`
		`- + chroot.run(cmd, DEST_DIR)`
		`- +`
		`- +`
		`- +def setup():`
		`- + try:`
		`- + logging.debug("Doing Mariadb setup...")`
		`- + mariadb_setup()`
		`- + logging.debug("Mariadb setup done. Doing Nginx setup...")`
		`- + nginx_setup()`
		`- + logging.debug("Nginx setup done. Doing PHP-fpm setup...")`
		`- + php_setup()`
		`- + logging.debug("PHP-fpm setup done.")`
		`- + except (FileExistsError, OSError) as io_error:`
		`- + logging.error(io_error)`
		`- +`
		`- +`
		`- +def mariadb_setup():`
		`- + cmd = [`
		`- + "mysql_install_db",`
		`- + "--user=mysql",`
		`- + "--basedir=/usr",`
		`- + "--datadir=/var/lib/mysql"]`
		`- + chroot_run(cmd)`
		`- +`
		`- + cmd = ["systemctl", "enable", "mysqld"]`
		`- + chroot_run(cmd)`
		`- +`
		`- + # TODO: Warn user to run mysql_secure_installation`
		`- +`
		`- +`
		`- +def nginx_setup():`
		`- + cmd = ["systemctl", "enable", "nginx"]`
		`- + chroot_run(cmd)`
		`- +`
		`- + # We need to tell nginx to run php using php-fpm.`
		`- + path = os.path.join(DEST_DIR, "etc/nginx/nginx.conf")`
		`- + with open(path, 'r') as nginx_conf:`
		`- + lines = nginx_conf.readlines()`
		`- +`
		`- + sections = {"http": False, "server": False, "location": False}`
		`- + with open(path, 'w') as nginx_conf:`
		`- + for line in lines:`
		`- + if "http {" in line:`
		`- + sections["http"] = True`
		`- +`
		`- + if sections["http"] and "server {" in line:`
		`- + sections["server"] = True`
		`- +`
		`- + if sections["http"] and sections["server"] and "#location ~ \.php$ {" in line:`
		`- + nginx_conf.write(" location ~ \.php$ {\n")`
		`- + nginx_conf.write(" fastcgi_pass unix:/var/run/php-fpm/php-fpm.sock;\n")`
		`- + nginx_conf.write(" fastcgi_index index.php;\n")`
		`- + nginx_conf.write(" root /usr/share/nginx/html;\n")`
		`- + nginx_conf.write(" include fastcgi.conf;\n")`
		`- + nginx_conf.write(" }\n\n")`
		`- + sections = {"http": False, "server": False, "location": False}`
		`- +`
		`- + nginx_conf.write(line)`
		`- +`
		`- +`
		`- +def php_setup():`
		`- + # Setup /etc/php/php.ini`
		`- + php_ini_path = os.path.join(DEST_DIR, 'etc/php/php.ini')`
		`- + with open(php_ini_path, 'r') as php_ini:`
		`- + lines = php_ini.readlines()`
		`- +`
		`- + # PHP extensions that will be activated`
		`- + so_extensions = ["mysql", "mcrypt", "mssql", "mysqli", "openssl", "iconv", "imap", "zip", "bz2"]`
		`- +`
		`- + php_ini_path = os.path.join(DEST_DIR, 'etc/php/php.ini')`
		`- + with open(php_ini_path, 'r') as php_ini:`
		`- + lines = php_ini.readlines()`
		`- +`
		`- + with open(php_ini_path, 'w') as php_ini:`
		`- + for line in lines:`
		`- + # Uncomment extensions`
		`- + for so_ext in so_extensions:`
		`- + ext = ";extension={0}.so".format(so_ext)`
		`- + if line.startswith(ext):`
		`- + line = line[1:]`
		`- + # Add PhpMyAdmin system path (/etc/webapps/ and /usr/share/webapps/)`
		`- + # to make sure PHP can access and read files under those directories`
		`- + if "open_basedir =" in line:`
		`- + line = 'open_basedir = /srv/http/:/home/:/tmp/:/usr/share/pear/:/usr/share/webapps/:/etc/webapps/\n'`
		`- + php_ini.write(line)`
		`- +`
		`- + cmd = ["systemctl", "enable", "php-fpm"]`
		`- + chroot_run(cmd)`
		`- +`
		`- +`
		`- +if __name__ == '__main__':`
		`- + setup()`
		`- diff -Nur Cnchi-0.12.0/cnchi/installation/mkinitcpio.py Cnchi-0.12.0.orig/cnchi/installation/mkinitcpio.py`
		`- --- Cnchi-0.12.0/cnchi/installation/mkinitcpio.py 2016-02-19 23:36:56.995310355 -0200`
		`- +++ Cnchi-0.12.0.orig/cnchi/installation/mkinitcpio.py 2016-01-29 08:56:41.000000000 -0200`
		`- @@ -4,7 +4,6 @@`
		`- # mkinitcpio.py`
		`- #`
		`- # Copyright © 2013-2015 Antergos`
		`- -# Copyright © 2016 Parabola`
		`- #`
		`- # This file is part of Cnchi.`
		`- #`
		`- @@ -97,7 +96,7 @@`
		`- cmd = ['sh', '-c', 'LANG={0} /usr/bin/mkinitcpio -p linux'.format(locale)]`
		`- chroot.run(cmd, dest_dir)`
		`- if settings.get('feature_lts'):`
		`- - cmd = ['sh', '-c', 'LANG={0} /usr/bin/mkinitcpio -p linux-libre-lts'.format(locale)]`
		`- + cmd = ['sh', '-c', 'LANG={0} /usr/bin/mkinitcpio -p linux-lts'.format(locale)]`
		`- chroot.run(cmd, dest_dir)`
		`- # chroot.umount_special_dirs(dest_dir)`
		`-`
		`- diff -Nur Cnchi-0.12.0/cnchi/installation/select_packages.py Cnchi-0.12.0.orig/cnchi/installation/select_packages.py`
		`- --- Cnchi-0.12.0/cnchi/installation/select_packages.py 2016-02-20 00:14:32.357662164 -0200`
		`- +++ Cnchi-0.12.0.orig/cnchi/installation/select_packages.py 2016-01-29 08:56:41.000000000 -0200`
		`- @@ -4,7 +4,6 @@`
		`- # select_packages.py`
		`- #`
		`- # Copyright © 2013-2015 Antergos`
		`- -# Copyright © 2016 Parabola`
		`- #`
		`- # This file is part of Cnchi.`
		`- #`
		`- @@ -163,7 +162,7 @@`
		`- self.queue_event('info', _("Getting package list..."))`
		`-`
		`- try:`
		`- - url = ''.format(info.CNCHI_VERSION.rsplit('.')[-2])`
		`- + url = 'http://install.antergos.com/packages-{0}.xml'.format(info.CNCHI_VERSION.rsplit('.')[-2])`
		`- logging.debug("Getting url %s...", url)`
		`- req = urllib.request.Request(url, headers={'User-Agent': 'Mozilla/5.0'})`
		`- packages_xml = urllib.request.urlopen(req, timeout=10)`
		`- @@ -236,7 +235,7 @@`
		`- try:`
		`- # Detect which hardware drivers are needed`
		`- hardware_install = hardware.HardwareInstall(`
		`- - #use_proprietary_graphic_drivers=self.settings.get('feature_graphic_drivers'))`
		`- + use_proprietary_graphic_drivers=self.settings.get('feature_graphic_drivers'))`
		`- driver_names = hardware_install.get_found_driver_names()`
		`- if len(driver_names) > 0:`
		`- logging.debug("Hardware module detected these drivers: %s", driver_names)`
		`- @@ -324,8 +323,8 @@`
		`- for xml_feature in xml_features.iter('feature'):`
		`- feature = xml_feature.attrib.get("name")`
		`-`
		`- - # If GLEMP is selected, do not install glamp even if it's selected`
		`- - if feature == "glamp" and self.settings.get("feature_glemp"):`
		`- + # If LEMP is selected, do not install lamp even if it's selected`
		`- + if feature == "lamp" and self.settings.get("feature_lemp"):`
		`- continue`
		`-`
		`- # Add packages from each feature`
		`- @@ -369,9 +368,9 @@`
		`- pkg = "libreoffice-fresh-{0}".format(lang_code)`
		`- self.packages.append(pkg)`
		`-`
		`- - # Add iceweasel language package`
		`- - if self.settings.get('feature_iceweasel'):`
		`- - # Iceweasel is available in these languages`
		`- + # Add firefox language package`
		`- + if self.settings.get('feature_firefox'):`
		`- + # Firefox is available in these languages`
		`- lang_codes = [`
		`- 'ach', 'af', 'an', 'ar', 'as', 'ast', 'az', 'be', 'bg', 'bn-bd',`
		`- 'bn-in', 'br', 'bs', 'ca', 'cs', 'cy', 'da', 'de', 'dsb', 'el',`
		`- @@ -388,5 +387,5 @@`
		`- lang_code = self.settings.get('language_code')`
		`- lang_code = lang_code.replace('_', '-')`
		`- if lang_code in lang_codes:`
		`- - pkg = "iceweasel-i18n-{0}".format(lang_code)`
		`- + pkg = "firefox-i18n-{0}".format(lang_code)`
		`- self.packages.append(pkg)`
		`- diff -Nur Cnchi-0.12.0/cnchi/language.py Cnchi-0.12.0.orig/cnchi/language.py`
		`- --- Cnchi-0.12.0/cnchi/language.py 2016-02-19 21:46:21.342287789 -0200`
		`- +++ Cnchi-0.12.0.orig/cnchi/language.py 2016-01-29 08:56:41.000000000 -0200`
		`- @@ -88,7 +88,7 @@`
		`- "It does not yet properly handle RAID, btrfs subvolumes, or other advanced "`
		`- "setups. Please proceed with caution as data loss is possible!\n\n"`
		`- "If you find any bugs, please report them at {0}")`
		`- - txt = txt.format("<a href='http://labs.parabola.nu'>labs.parabola.nu</a>")`
		`- + txt = txt.format("<a href='http://bugs.antergos.com'>bugs.antergos.com</a>")`
		`- txt_markup = "<span weight='bold'>{0}</span>\n\n{1}".format(txt_bold, txt)`
		`- label = self.ui.get_object("welcome_label")`
		`- label.set_markup(txt_markup)`
		`- @@ -167,7 +167,7 @@`
		`- self.forward_button.set_sensitive(True)`
		`- self.show_all()`
		`-`
		`- - # Launch rank mirrors process to optimize Parabola mirrorlists`
		`- + # Launch rank mirrors process to optimize Arch and Antergos mirrorlists`
		`- if not self.testing and not self.disable_rank_mirrors and not self.rank_mirrors_launched:`
		`- proc = AutoRankmirrorsProcess(self.settings)`
		`- proc.daemon = True`
		`- diff -Nur Cnchi-0.12.0/cnchi/logging_utils.py Cnchi-0.12.0.orig/cnchi/logging_utils.py`
		`- --- Cnchi-0.12.0/cnchi/logging_utils.py 2016-02-19 21:50:05.455558690 -0200`
		`- +++ Cnchi-0.12.0.orig/cnchi/logging_utils.py 2016-01-29 08:56:41.000000000 -0200`
		`- @@ -4,7 +4,6 @@`
		`- # logging_utils.py`
		`- #`
		`- # Copyright © 2015 Antergos`
		`- -# Copyright © 2016 Parabola`
		`- #`
		`- # This file is part of Cnchi.`
		`- #`
		`- @@ -96,18 +95,18 @@`
		`- BUGSNAG_ERROR = "Cannot find /etc/raven.conf file"`
		`- return bugsnag_api`
		`-`
		`- -# def get_url_for_id_request(self):`
		`- -# build_server = None`
		`- -# if self.api_key:`
		`- -# build_srv = ['http://build', 'parabola', 'nu']`
		`- -# build_srv_query = ['/hook', 'cnchi=']`
		`- -# build_server = '.'.join(build_srv) + '?'.join(build_srv_query) + self.api_key`
		`- -# return build_server`
		`- + def get_url_for_id_request(self):`
		`- + build_server = None`
		`- + if self.api_key:`
		`- + build_srv = ['http://build', 'antergos', 'com']`
		`- + build_srv_query = ['/hook', 'cnchi=']`
		`- + build_server = '.'.join(build_srv) + '?'.join(build_srv_query) + self.api_key`
		`- + return build_server`
		`-`
		`- def bugsnag_before_notify_callback(self, notification=None):`
		`- if notification is not None:`
		`- if self.after_location_screen and not self.have_install_id:`
		`- self.get_and_save_install_id()`
		`-`
		`- - notification.user = {"id": self.id, "name": "Parabola User", "install_id": self.install}`
		`- - return notification`
		`- + notification.user = {"id": self.id, "name": "Antergos User", "install_id": self.install}`
		`- + return notification`
		`- \ No newline at end of file`
		`- diff -Nur Cnchi-0.12.0/cnchi/main_window.py Cnchi-0.12.0.orig/cnchi/main_window.py`
		`- --- Cnchi-0.12.0/cnchi/main_window.py 2016-02-19 21:53:41.061759531 -0200`
		`- +++ Cnchi-0.12.0.orig/cnchi/main_window.py 2016-01-29 08:56:41.000000000 -0200`
		`- @@ -4,7 +4,6 @@`
		`- # main_window.py`
		`- #`
		`- # Copyright © 2013-2015 Antergos`
		`- -# Copyright © 2016 Parabola`
		`- #`
		`- # This file is part of Cnchi.`
		`- #`
		`- @@ -125,7 +124,7 @@`
		`- self.header = self.header_ui.get_object("header")`
		`-`
		`- self.logo = self.header_ui.get_object("logo")`
		`- - path = os.path.join(data_dir, "images", "parabola", "parabola-logo-mini2.png")`
		`- + path = os.path.join(data_dir, "images", "antergos", "antergos-logo-mini2.png")`
		`- self.logo.set_from_file(path)`
		`-`
		`- # To honor our css`
		`- @@ -194,7 +193,7 @@`
		`- self.pages = dict()`
		`- self.pages["welcome"] = welcome.Welcome(self.params)`
		`-`
		`- - if os.path.exists('/home/root/.config/openbox'):`
		`- + if os.path.exists('/home/antergos/.config/openbox'):`
		`- # In minimal iso, load language screen now`
		`- self.pages["language"] = language.Language(self.params)`
		`-`
		`- @@ -211,19 +210,19 @@`
		`- title = "Cnchi {0}".format(info.CNCHI_VERSION)`
		`- self.set_title(title)`
		`- self.header.set_title(title)`
		`- - self.header.set_subtitle(_("Parabola Installer"))`
		`- + self.header.set_subtitle(_("Antergos Installer"))`
		`- self.header.set_show_close_button(True)`
		`-`
		`- self.set_geometry()`
		`-`
		`- # Set window icon`
		`- - icon_path = os.path.join(data_dir, "images", "parabola", "parabola-icon.png")`
		`- + icon_path = os.path.join(data_dir, "images", "antergos", "antergos-icon.png")`
		`- self.set_icon_from_file(icon_path)`
		`-`
		`- # Set the first page to show`
		`-`
		`- # If minimal iso is detected, skip the welcome page.`
		`- - if os.path.exists('/home/root/.config/openbox'):`
		`- + if os.path.exists('/home/antergos/.config/openbox'):`
		`- self.current_page = self.pages["language"]`
		`- self.settings.set('timezone_start', True)`
		`- else:`
		`- @@ -258,14 +257,14 @@`
		`- self.progressbar_step = 0`
		`-`
		`- # Do not hide progress bar for minimal iso as it would break the widget alignment on language page.`
		`- - if not os.path.exists('/home/root/.config/openbox'):`
		`- + if not os.path.exists('/home/antergos/.config/openbox'):`
		`- # Hide progress bar`
		`- self.progressbar.hide()`
		`-`
		`- misc.gtk_refresh()`
		`-`
		`- def load_pages(self):`
		`- - if not os.path.exists('/home/root/.config/openbox'):`
		`- + if not os.path.exists('/home/antergos/.config/openbox'):`
		`- self.pages["language"] = language.Language(self.params)`
		`- self.pages["check"] = check.Check(self.params)`
		`- self.pages["location"] = location.Location(self.params)`
		`- @@ -293,7 +292,7 @@`
		`- self.pages["slides"] = slides.Slides(self.params)`
		`-`
		`- diff = 2`
		`- - if os.path.exists('/home/root/.config/openbox'):`
		`- + if os.path.exists('/home/antergos/.config/openbox'):`
		`- # In minimal (openbox) we don't have a welcome screen`
		`- diff = 3`
		`-`
		`- diff -Nur Cnchi-0.12.0/cnchi/misc/keyboard_widget.py Cnchi-0.12.0.orig/cnchi/misc/keyboard_widget.py`
		`- --- Cnchi-0.12.0/cnchi/misc/keyboard_widget.py 2016-02-20 00:23:24.174938773 -0200`
		`- +++ Cnchi-0.12.0.orig/cnchi/misc/keyboard_widget.py 2016-01-29 08:56:41.000000000 -0200`
		`- @@ -5,7 +5,6 @@`
		`- #`
		`- # Copyright 2013 Manjaro (QT version)`
		`- # Copyright © 2013-2015 Antergos (GTK version)`
		`- -# Copyright © 2016 Parabola`
		`- #`
		`- # This file is part of Cnchi.`
		`- #`
		`- @@ -89,7 +88,7 @@`
		`-`
		`- self.layout = "us"`
		`- self.variant = None`
		`- - self.font = "Droid Sans"`
		`- + self.font = "Helvetica"`
		`-`
		`- self.space = 6`
		`-`
		`- @@ -103,7 +102,7 @@`
		`- # broken: ad (Andorra), lk (Sri Lanka), brai (Braille)`
		`- # ?!?: us:chr`
		`-`
		`- - self.font = "Droid Sans"`
		`- + self.font = "Helvetica"`
		`-`
		`- # Load fonts from ttf-aboriginal-sans package`
		`-`
		`- diff -Nur Cnchi-0.12.0/cnchi/parted3/fs_module.py Cnchi-0.12.0.orig/cnchi/parted3/fs_module.py`
		`- --- Cnchi-0.12.0/cnchi/parted3/fs_module.py 2016-02-20 00:48:07.592890467 -0200`
		`- +++ Cnchi-0.12.0.orig/cnchi/parted3/fs_module.py 2016-01-29 08:56:41.000000000 -0200`
		`- @@ -4,7 +4,6 @@`
		`- # fs_module.py`
		`- #`
		`- # Copyright © 2013-2015 Antergos`
		`- -# Copyright © 2016 Parabola`
		`- #`
		`- # This file is part of Cnchi.`
		`- #`
		`- @@ -307,7 +306,7 @@`
		`- def resize_fat(part, new_size_in_mb):`
		`- """ Resize a fat partition """`
		`- # https://bbs.archlinux.org/viewtopic.php?id=131728`
		`- - # the only GNU/Linux tool that was capable of resizing fat32, isn't capable of it anymore?`
		`- + # the only Linux tool that was capable of resizing fat32, isn't capable of it anymore?`
		`- return False`
		`-`
		`-`
		`- diff -Nur Cnchi-0.12.0/cnchi/rank_mirrors.py Cnchi-0.12.0.orig/cnchi/rank_mirrors.py`
		`- --- Cnchi-0.12.0/cnchi/rank_mirrors.py 2016-02-19 22:00:23.107190678 -0200`
		`- +++ Cnchi-0.12.0.orig/cnchi/rank_mirrors.py 2016-01-29 08:56:41.000000000 -0200`
		`- @@ -5,7 +5,6 @@`
		`- #`
		`- # Copyright © 2013-2015 Antergos`
		`- # Copyright © 2012, 2013 Xyne`
		`- -# Copyright © 2016 Parabola`
		`- #`
		`- # This file is part of Cnchi.`
		`- #`
		`- @@ -56,9 +55,10 @@`
		`- super().__init__()`
		`- self.rankmirrors_pid = None`
		`- self.json_obj = None`
		`- - self.parabola_mirrorlist = "/etc/pacman.d/mirrorlist"`
		`- - self.parabola_mirror_status = "https://www.parabola.nu/mirrors/status/json/"`
		`- - self.parabola_mirrorlist_ranked = []`
		`- + self.antergos_mirrorlist = "/etc/pacman.d/antergos-mirrorlist"`
		`- + self.arch_mirrorlist = "/etc/pacman.d/mirrorlist"`
		`- + self.arch_mirror_status = "http://www.archlinux.org/mirrors/status/json/"`
		`- + self.arch_mirrorlist_ranked = []`
		`- self.settings = settings`
		`-`
		`- @staticmethod`
		`- @@ -74,12 +74,29 @@`
		`- except subprocess.CalledProcessError as why:`
		`- logging.warning("Can't synchronize cached writes to persistent storage: %s", why)`
		`-`
		`- + def update_mirrorlist(self):`
		`- + """ Make sure we have the latest antergos-mirrorlist files """`
		`- + with misc.raised_privileges():`
		`- + try:`
		`- + cmd = ['pacman', '-Syy', '--noconfirm', '--noprogressbar', '--quiet', 'antergos-mirrorlist']`
		`- + with open(os.devnull, 'w') as fnull:`
		`- + subprocess.call(cmd, stdout=fnull, stderr=subprocess.STDOUT)`
		`- + # Use the new downloaded mirrorlist (.pacnew) files (if any)`
		`- + pacnew_path = self.antergos_mirrorlist + ".pacnew"`
		`- + if os.path.exists(pacnew_path):`
		`- + shutil.copy(pacnew_path, self.antergos_mirrorlist)`
		`- + except subprocess.CalledProcessError as why:`
		`- + logging.debug('Update of antergos-mirrorlist package failed with error: %s', why)`
		`- + except OSError as why:`
		`- + logging.debug('Error copying new mirrorlist files: %s', why)`
		`- + self.sync()`
		`- +`
		`- def get_mirror_stats(self):`
		`- """Retrieve the current mirror status JSON data."""`
		`- if not self.json_obj:`
		`- try:`
		`- with requests.Session() as session:`
		`- - self.json_obj = session.get(self.parabola_mirror_status).json()`
		`- + self.json_obj = session.get(self.arch_mirror_status).json()`
		`- except requests.RequestException as err:`
		`- logging.debug('Failed to retrieve mirror status information: %s', err)`
		`-`
		`- @@ -180,8 +197,56 @@`
		`-`
		`- return rated_mirrors`
		`-`
		`- - def filter_and_sort_Parabola_mirrorlist(self):`
		`- - output = '# Parabola mirrorlist generated by Cnchi #\n'`
		`- + def uncomment_antergos_mirrors(self):`
		`- + """ Uncomment Antergos mirrors and comment out auto selection so`
		`- + rankmirrors can find the best mirror. """`
		`- +`
		`- + autoselect = "http://mirrors.antergos.com/$repo/$arch"`
		`- +`
		`- + if os.path.exists(self.antergos_mirrorlist):`
		`- + with open(self.antergos_mirrorlist) as mirrors:`
		`- + lines = [x.strip() for x in mirrors.readlines()]`
		`- +`
		`- + for i in range(len(lines)):`
		`- + if lines[i].startswith("Server") and autoselect in lines[i]:`
		`- + # Comment out auto selection`
		`- + lines[i] = "#" + lines[i]`
		`- + elif lines[i].startswith("#Server") and autoselect not in lines[i]:`
		`- + # Uncomment Antergos mirror`
		`- + lines[i] = lines[i].lstrip("#")`
		`- +`
		`- + # sourceforge server does not get updated as often as necessary`
		`- + if "sourceforge" in lines[i]:`
		`- + lines[i] = "#" + lines[i]`
		`- +`
		`- + with misc.raised_privileges():`
		`- + # Write new one`
		`- + with open(self.antergos_mirrorlist, 'w') as mirrors:`
		`- + mirrors.write("\n".join(lines) + "\n")`
		`- + self.sync()`
		`- +`
		`- + def run_rankmirrors(self):`
		`- + if os.path.exists("/usr/bin/rankmirrors"):`
		`- + # Uncomment Antergos mirrors and comment out auto selection so`
		`- + # rankmirrors can find the best mirror.`
		`- + self.uncomment_antergos_mirrors()`
		`- +`
		`- + with misc.raised_privileges():`
		`- + try:`
		`- + # Store rankmirrors output in a temporary file`
		`- + with tempfile.TemporaryFile(mode='w+t') as temp_file:`
		`- + cmd = ['rankmirrors', '-n', '0', '-r', 'antergos', self.antergos_mirrorlist]`
		`- + subprocess.call(cmd, stdout=temp_file)`
		`- + temp_file.seek(0)`
		`- + # Copy new mirrorlist to the old one`
		`- + with open(self.antergos_mirrorlist, 'w') as antergos_mirrorlist_file:`
		`- + antergos_mirrorlist_file.write(temp_file.read())`
		`- + except subprocess.CalledProcessError as why:`
		`- + logging.debug('Error running rankmirrors on Antergos mirrorlist: %s', why)`
		`- + self.sync()`
		`- +`
		`- + def filter_and_sort_arch_mirrorlist(self):`
		`- + output = '# Arch Linux mirrorlist generated by Cnchi #\n'`
		`- mlist = self.get_mirror_stats()`
		`- mirrors = self.sort_mirrors_by_speed(mirrors=mlist)`
		`-`
		`- @@ -190,10 +255,10 @@`
		`- line = "Server = {0}{1}/os/{2}\n".format(mirror['url'], '$repo', '$arch')`
		`- output += line`
		`-`
		`- - # Write modified Parabola mirrorlist`
		`- + # Write modified Arch mirrorlist`
		`- with misc.raised_privileges():`
		`- - with open(self.parabola_mirrorlist, 'w') as parabola_mirrors:`
		`- - parabola_mirrors.write(output)`
		`- + with open(self.arch_mirrorlist, 'w') as arch_mirrors:`
		`- + arch_mirrors.write(output)`
		`- self.sync()`
		`-`
		`- def run(self):`
		`- @@ -203,11 +268,16 @@`
		`- while not misc.has_connection():`
		`- time.sleep(2) # Delay, try again after 4 seconds`
		`-`
		`- - logging.debug("Updating mirrorlist...")`
		`- + logging.debug("Updating both mirrorlists (Arch and Antergos)...")`
		`- self.update_mirrorlist()`
		`-`
		`- - logging.debug("Filtering and sorting Parabola mirrors...")`
		`- - self.filter_and_sort_parabola_mirrorlist()`
		`- + logging.debug("Filtering and sorting Arch mirrors...")`
		`- + self.filter_and_sort_arch_mirrorlist()`
		`- +`
		`- + logging.debug("Running rankmirrors command to sort Antergos mirrors...")`
		`- + self.run_rankmirrors()`
		`- + self.arch_mirrorlist_ranked = [x for x in self.arch_mirrorlist_ranked if x]`
		`- + self.settings.set('rankmirrors_result', self.arch_mirrorlist_ranked)`
		`-`
		`- logging.debug("Auto mirror selection has been run successfully.")`
		`-`
		`- diff -Nur Cnchi-0.12.0/cnchi/show_message.py Cnchi-0.12.0.orig/cnchi/show_message.py`
		`- --- Cnchi-0.12.0/cnchi/show_message.py 2016-02-19 22:01:27.929186653 -0200`
		`- +++ Cnchi-0.12.0.orig/cnchi/show_message.py 2016-01-29 08:56:41.000000000 -0200`
		`- @@ -4,7 +4,6 @@`
		`- # show_message.py`
		`- #`
		`- # Copyright © 2013-2015 Antergos`
		`- -# Copyright © 2016 Parabola`
		`- #`
		`- # This file is part of Cnchi.`
		`- #`
		`- @@ -56,7 +55,7 @@`
		`- destroy_with_parent=True,`
		`- message_type=Gtk.MessageType.ERROR,`
		`- buttons=Gtk.ButtonsType.CLOSE,`
		`- - text=_("Parabola Installer - Error"))`
		`- + text=_("Antergos Installer - Error"))`
		`- msg_dialog.format_secondary_text(my_message)`
		`- msg_dialog.run()`
		`- msg_dialog.destroy()`
		`- @@ -69,7 +68,7 @@`
		`- destroy_with_parent=True,`
		`- message_type=Gtk.MessageType.WARNING,`
		`- buttons=Gtk.ButtonsType.CLOSE,`
		`- - text=_("Parabola Installer - Warning"))`
		`- + text=_("Antergos Installer - Warning"))`
		`- msg_dialog.format_secondary_text(my_message)`
		`- msg_dialog.run()`
		`- msg_dialog.destroy()`
		`- @@ -82,7 +81,7 @@`
		`- destroy_with_parent=True,`
		`- message_type=Gtk.MessageType.INFO,`
		`- buttons=Gtk.ButtonsType.CLOSE,`
		`- - text=_("Parabola Installer - Information"))`
		`- + text=_("Antergos Installer - Information"))`
		`- msg_dialog.format_secondary_text(my_message)`
		`- msg_dialog.run()`
		`- msg_dialog.destroy()`
		`- @@ -95,7 +94,7 @@`
		`- destroy_with_parent=True,`
		`- message_type=Gtk.MessageType.QUESTION,`
		`- buttons=Gtk.ButtonsType.YES_NO,`
		`- - text=_("Parabola Installer - Confirmation"))`
		`- + text=_("Antergos Installer - Confirmation"))`
		`- msg_dialog.format_secondary_text(my_message)`
		`- response = msg_dialog.run()`
		`- msg_dialog.destroy()`
		`- diff -Nur Cnchi-0.12.0/cnchi/slides.py Cnchi-0.12.0.orig/cnchi/slides.py`
		`- --- Cnchi-0.12.0/cnchi/slides.py 2016-02-19 22:03:44.053006981 -0200`
		`- +++ Cnchi-0.12.0.orig/cnchi/slides.py 2016-01-29 08:56:41.000000000 -0200`
		`- @@ -4,7 +4,6 @@`
		`- # slides.py`
		`- #`
		`- # Copyright © 2013-2015 Antergos`
		`- -# Copyright © 2016 Parabola`
		`- #`
		`- # This file is part of Cnchi.`
		`- #`
		`- @@ -79,7 +78,7 @@`
		`- if len(self.info_label.get_label()) <= 0:`
		`- self.set_message(_("Please wait..."))`
		`-`
		`- - self.header.set_subtitle(_("Installing Parabola..."))`
		`- + self.header.set_subtitle(_("Installing Antergos..."))`
		`-`
		`- def prepare(self, direction):`
		`- # We don't load webkit until we reach this screen`
		`- @@ -196,14 +195,14 @@`
		`- boot_warn = _("IMPORTANT: There may have been a problem with the bootloader\n"`
		`- "installation which could prevent your system from booting properly. Before\n"`
		`- "rebooting, you may want to verify whether or not the bootloader is installed and\n"`
		`- - "configured. The Parabola Wiki contains troubleshooting information:\n"`
		`- - "\thttps://wiki.parabola.nu/GRUB\n"`
		`- + "configured. The Arch Linux Wiki contains troubleshooting information:\n"`
		`- + "\thttps://wiki.archlinux.org/index.php/GRUB\n"`
		`- "\nWould you like to view the wiki page now?")`
		`- response = show.question(self.get_toplevel(), boot_warn)`
		`- if response == Gtk.ResponseType.YES:`
		`- import webbrowser`
		`- misc.drop_privileges()`
		`- - webbrowser.open('https://wiki.parabola.nu/GRUB')`
		`- + webbrowser.open('https://wiki.archlinux.org/index.php/GRUB')`
		`-`
		`- install_ok = _("Installation Complete!\nDo you want to restart your system now?")`
		`- response = show.question(self.get_toplevel(), install_ok)`
		`- diff -Nur Cnchi-0.12.0/cnchi/timezone.py Cnchi-0.12.0.orig/cnchi/timezone.py`
		`- --- Cnchi-0.12.0/cnchi/timezone.py 2016-02-19 22:07:26.844930355 -0200`
		`- +++ Cnchi-0.12.0.orig/cnchi/timezone.py 2016-01-29 08:56:41.000000000 -0200`
		`- @@ -4,7 +4,6 @@`
		`- # timezone.py`
		`- #`
		`- # Copyright © 2013-2015 Antergos`
		`- -# Copyright © 2016 Parabola`
		`- #`
		`- # This file is part of Cnchi.`
		`- #`
		`- @@ -258,6 +257,62 @@`
		`- def on_switch_ntp_activate(self, ntp_switch):`
		`- self.settings['use_timesyncd'] = ntp_switch.get_active()`
		`-`
		`- +`
		`- +class AutoTimezoneProcess(multiprocessing.Process):`
		`- + def __init__(self, coords_queue, settings):`
		`- + super(AutoTimezoneProcess, self).__init__()`
		`- + self.coords_queue = coords_queue`
		`- + self.settings = settings`
		`- +`
		`- + def run(self):`
		`- + # Calculate logo hash`
		`- + logo = "data/images/antergos/antergos-logo-mini2.png"`
		`- + logo_path = os.path.join(self.settings.get("cnchi"), logo)`
		`- + with open(logo_path, "rb") as logo_file:`
		`- + logo_bytes = logo_file.read()`
		`- + logo_hasher = hashlib.sha1()`
		`- + logo_hasher.update(logo_bytes)`
		`- + logo_digest = logo_hasher.digest()`
		`- +`
		`- + # Wait until there is an Internet connection available`
		`- + if not misc.has_connection():`
		`- + logging.warning("Can't get network status. Cnchi will try again in a moment")`
		`- + while not misc.has_connection():`
		`- + time.sleep(4) # Wait 4 seconds and try again`
		`- +`
		`- + logging.debug("A working network connection has been detected.")`
		`- +`
		`- + # Do not start looking for our timezone until we've reached the language screen`
		`- + # (welcome.py sets timezone_start to true when next is clicked)`
		`- + while not self.settings.get('timezone_start'):`
		`- + time.sleep(2)`
		`- +`
		`- + # OK, now get our timezone`
		`- +`
		`- + logging.debug("We have connection. Let's get our timezone")`
		`- + try:`
		`- + url = urllib.request.Request(`
		`- + url="http://geo.antergos.com",`
		`- + data=logo_digest,`
		`- + headers={"User-Agent": "Antergos Installer", "Connection": "close"})`
		`- + with urllib.request.urlopen(url) as conn:`
		`- + coords = conn.read().decode('utf-8').strip()`
		`- +`
		`- + if coords == "0 0":`
		`- + # Sometimes server returns 0 0, we treat it as an error`
		`- + coords = None`
		`- + except Exception as general_error:`
		`- + logging.error(general_error)`
		`- + coords = None`
		`- +`
		`- + if coords:`
		`- + coords = coords.split()`
		`- + logging.debug(`
		`- + _("Timezone (latitude %s, longitude %s) detected."),`
		`- + coords[0],`
		`- + coords[1])`
		`- + self.coords_queue.put(coords)`
		`- +`
		`- if __name__ == '__main__':`
		`- def _(x): return x`
		`-`
		`- diff -Nur Cnchi-0.12.0/cnchi/updater.py Cnchi-0.12.0.orig/cnchi/updater.py`
		`- --- Cnchi-0.12.0/cnchi/updater.py 2016-02-19 22:09:05.772799172 -0200`
		`- +++ Cnchi-0.12.0.orig/cnchi/updater.py 2016-01-29 08:56:41.000000000 -0200`
		`- @@ -4,7 +4,6 @@`
		`- # updater.py`
		`- #`
		`- # Copyright © 2013-2015 Antergos`
		`- -# Copyright © 2016 Parabola`
		`- #`
		`- # This file is part of Cnchi.`
		`- #`
		`- @@ -40,9 +39,9 @@`
		`- import misc.misc as misc`
		`- import requests`
		`-`
		`- -_update_info_url = ""`
		`- -_master_zip_url = ""`
		`- -_update_info = ""`
		`- +_update_info_url = "https://raw.github.com/Antergos/Cnchi/master/update.info"`
		`- +_master_zip_url = "https://github.com/Antergos/Cnchi/archive/master.zip"`
		`- +_update_info = "/usr/share/cnchi/update.info"`
		`-`
		`- _src_dir = os.path.dirname(__file__) or '.'`
		`- _base_dir = os.path.join(_src_dir, "..")`
		`- diff -Nur Cnchi-0.12.0/cnchi/user_info.py Cnchi-0.12.0.orig/cnchi/user_info.py`
		`- --- Cnchi-0.12.0/cnchi/user_info.py 2016-02-19 22:10:32.367590738 -0200`
		`- +++ Cnchi-0.12.0.orig/cnchi/user_info.py 2016-01-29 08:56:41.000000000 -0200`
		`- @@ -4,7 +4,6 @@`
		`- # user_info.py`
		`- #`
		`- # Copyright © 2013-2015 Antergos`
		`- -# Copyright © 2016 Parabola`
		`- #`
		`- # This file is part of Cnchi.`
		`- #`
		`- @@ -195,9 +194,9 @@`
		`- # Do not use this, is confusing for others when testing dev version`
		`- '''`
		`- if self.settings.get('z_hidden'):`
		`- - self.settings.set('fullname', 'Parabola Testing')`
		`- + self.settings.set('fullname', 'Antergos Testing')`
		`- self.settings.set('hostname', 'Testing Machine')`
		`- - self.settings.set('username', 'parabola')`
		`- + self.settings.set('username', 'antergos')`
		`- self.settings.set('password', 'testing')`
		`- self.settings.set('require_password', True)`
		`- else:`
		`- diff -Nur Cnchi-0.12.0/cnchi/welcome.py Cnchi-0.12.0.orig/cnchi/welcome.py`
		`- --- Cnchi-0.12.0/cnchi/welcome.py 2016-02-19 22:11:48.189216528 -0200`
		`- +++ Cnchi-0.12.0.orig/cnchi/welcome.py 2016-01-29 08:56:41.000000000 -0200`
		`- @@ -4,7 +4,6 @@`
		`- # welcome.py`
		`- #`
		`- # Copyright © 2013-2015 Antergos`
		`- -# Copyright © 2016 Parabola`
		`- #`
		`- # This file is part of Cnchi.`
		`- #`
		`- @@ -75,13 +74,13 @@`
		`- def translate_ui(self):`
		`- """ Translates all ui elements """`
		`- if not self.disable_tryit:`
		`- - txt = _("Use Parabola without making any changes to your system.") + "\n"`
		`- + txt = _("Use Antergos without making any changes to your system.") + "\n"`
		`- else:`
		`- txt = ""`
		`- self.labels['tryit'].set_markup(txt)`
		`- self.labels['tryit'].set_name('tryit_label')`
		`-`
		`- - txt = _("Create a permanent place for Parabola on your system.")`
		`- + txt = _("Create a permanent place for Antergos on your system.")`
		`- self.labels['installit'].set_markup(txt)`
		`- self.labels['installit'].set_name('installit_label')`
		`-`
		`- @@ -94,7 +93,7 @@`
		`- txt = _("Install It")`
		`- self.buttons['graph'].set_label(txt)`
		`-`
		`- - txt = _("Welcome to Parabola!")`
		`- + txt = _("Welcome to Antergos!")`
		`- self.header.set_subtitle(txt)`
		`-`
		`- def quit_cnchi(self):`
		`- diff -Nur Cnchi-0.12.0/utils/download_package_list.py Cnchi-0.12.0.orig/utils/download_package_list.py`
		`- --- Cnchi-0.12.0/utils/download_package_list.py 2016-02-20 01:05:40.793106408 -0200`
		`- +++ Cnchi-0.12.0.orig/utils/download_package_list.py 2016-01-29 08:56:41.000000000 -0200`
		`- @@ -1,28 +1,8 @@`
		`- -# download_package_list.py`
		`- -#`
		`- -# Copyright Antergos`
		`- -# Copyright 2016 Parabola`
		`- -#`
		`- -# This program is free software; you can redistribute it and/or modify`
		`- -# it under the terms of the GNU General Public License as published by`
		`- -# the Free Software Foundation; either version 3 of the License, or`
		`- -# (at your option) any later version.`
		`- -#`
		`- -# This program is distributed in the hope that it will be useful,`
		`- -# but WITHOUT ANY WARRANTY; without even the implied warranty of`
		`- -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the`
		`- -# GNU General Public License for more details.`
		`- -#`
		`- -# You should have received a copy of the GNU General Public License`
		`- -# along with this program; if not, write to the Free Software`
		`- -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,`
		`- -# MA 02110-1301, USA.`
		`- -`
		`- import urllib.request`
		`- import urllib.error`
		`-`
		`- try:`
		`- - packages_xml = urllib.request.urlopen('')`
		`- + packages_xml = urllib.request.urlopen('http://install.antergos.com/packages-0.8.xml')`
		`- except urllib.error.URLError as e:`
		`- # If the installer can't retrieve the remote file, try to install with a local`
		`- # copy, that may not be updated`
		`- diff -Nur Cnchi-0.12.0/utils/info.py Cnchi-0.12.0.orig/utils/info.py`
		`- --- Cnchi-0.12.0/utils/info.py 2016-02-19 21:43:19.124426725 -0200`
		`- +++ Cnchi-0.12.0.orig/utils/info.py 2016-01-29 08:56:41.000000000 -0200`
		`- @@ -3,8 +3,7 @@`
		`- #`
		`- # info.py`
		`- #`
		`- -# Copyright © 2013-2016 Antergos`
		`- -# Copyright © 2016 Parabola`
		`- +# Copyright © 2013-2015 Antergos`
		`- #`
		`- # This file is part of Cnchi.`
		`- #`
		`- @@ -31,7 +30,7 @@`
		`- """ Set some Cnchi global constants """`
		`-`
		`- CNCHI_VERSION = "0.12.47"`
		`- -CNCHI_WEBSITE = "https://www.parabola.nu"`
		`- +CNCHI_WEBSITE = "http://www.antergos.com"`
		`- CNCHI_RELEASE_STAGE = "production"`
		`-`
		`- if __name__ == '__main__':`

libre-testing/cryptsetup/PKGBUILD

file modified

+1 -1

		`@@ -1,4 +1,4 @@`
		`- # Maintainer: Bartłomiej Piotrowski <bpiotrowski@archlinux.org>`
		`+ # Maintainer: Bartłomiej Piotrowski <bpiotrowski@archlinux.org>`
		`# Contributor: Thomas Bächler <thomas@archlinux.org>`

		`pkgname=cryptsetup`

libre-testing/findutils/PKGBUILD

file removed

-37

		`@@ -1,37 +0,0 @@`
		`- # Maintainer:`
		`-`
		`- pkgname=findutils`
		`- pkgver=4.6.0`
		`- pkgrel=2`
		`- pkgdesc="GNU utilities to locate files"`
		`- arch=(x86_64 ppc64le)`
		`- license=('GPL3')`
		`- groups=('base' 'base-devel')`
		`- depends=('glibc' 'sh')`
		`- url='https://www.gnu.org/software/findutils/'`
		`- source=("https://ftp.gnu.org/pub/gnu/findutils/${pkgname}-${pkgver}.tar.gz")`
		`- sha1sums=('f18e8aaee3f3d4173a1f598001003be8706d28b0')`
		`- #validpgpkeys=('A15B725964A95EE5') # James Youngman <james@youngman.org>`
		`-`
		`- build() {`
		`- cd "${srcdir}/${pkgname}-${pkgver}"`
		`-`
		`- # Don't build or install locate because we use mlocate,`
		`- # which is a secure version of locate.`
		`- sed -i '/^SUBDIRS/s/locate//' Makefile.in`
		`-`
		`- ./configure --prefix=/usr`
		`- # don't build locate, but the docs want a file in there.`
		`- make -C locate dblocation.texi`
		`- make`
		`- }`
		`-`
		`- check() {`
		`- cd "${srcdir}/${pkgname}-${pkgver}"`
		`- make check`
		`- }`
		`-`
		`- package() {`
		`- cd "${srcdir}/${pkgname}-${pkgver}"`
		`- make DESTDIR=$pkgdir install`
		`- }`

libre-testing/gawk/PKGBUILD

file removed

-37

		`@@ -1,37 +0,0 @@`
		`- # Maintainer:`
		`- # Contributor: Tom Newsom <Jeepster@gmx.co.uk>`
		`-`
		`- pkgname=gawk`
		`- pkgver=4.2.1`
		`- pkgrel=1`
		`- pkgdesc="GNU version of awk"`
		`- arch=(x86_64 ppc64le)`
		`- url="http://www.gnu.org/software/gawk/"`
		`- license=('GPL')`
		`- groups=('base' 'base-devel')`
		`- depends=('sh' 'glibc' 'mpfr')`
		`- provides=('awk')`
		`- source=(https://ftp.gnu.org/pub/gnu/${pkgname}/${pkgname}-${pkgver}.tar.gz{,.sig})`
		`- md5sums=('0256724a0af50cb83ac92f833488673d'`
		`- 'SKIP')`
		`- validpgpkeys=('D1967C63788713177D861ED7DF597815937EC0D2') # Arnold Robbins`
		`-`
		`- build() {`
		`- cd ${srcdir}/${pkgname}-${pkgver}`
		`- ./configure --prefix=/usr --libexecdir=/usr/lib --sysconfdir=/etc --without-libsigsegv`
		`- make`
		`- }`
		`-`
		`- check() {`
		`- cd ${srcdir}/${pkgname}-${pkgver}`
		`- make check`
		`- }`
		`-`
		`- package() {`
		`- cd ${srcdir}/${pkgname}-${pkgver}`
		`- make DESTDIR=${pkgdir} install`
		`-`
		`- #install -dm755 ${pkgdir}/bin`
		`- #ln -sf /usr/bin/gawk ${pkgdir}/bin/`
		`- #ln -sf gawk ${pkgdir}/bin/awk`
		`- }`

libre-testing/gettext/PKGBUILD

file removed

-50

		`@@ -1,50 +0,0 @@`
		`- # Maintainer:`
		`-`
		`- pkgname=gettext`
		`- pkgver=0.19.8.1`
		`- pkgrel=2`
		`- pkgdesc="GNU internationalization library"`
		`- url="https://www.gnu.org/software/gettext/"`
		`- arch=(x86_64 ppc64le)`
		`- license=(GPL)`
		`- groups=(base base-devel)`
		`- depends=(gcc-libs acl sh glib2 libunistring libcroco)`
		`- makedepends=(gettext emacs git)`
		`- optdepends=('git: for autopoint infrastructure updates')`
		`- options=(!docs)`
		`- source=(https://ftp.gnu.org/pub/gnu/gettext/$pkgname-$pkgver.tar.gz{,.sig}`
		`- gettext-0.19.8-its-segfault.patch)`
		`- sha256sums=('ff942af0e438ced4a8b0ea4b0b6e0d6d657157c5e2364de57baa279c1c125c43'`
		`- 'SKIP'`
		`- '0e3b19ea94e956a6a484ca4c4ecea32a01a83f10a413e586183de464c51f158d')`
		`- validpgpkeys=('462225C3B46F34879FC8496CD605848ED7E69871') # Daiki Ueno`
		`-`
		`- prepare() {`
		`- cd $pkgname-$pkgver`
		`- patch -Np1 -i ../gettext-0.19.8-its-segfault.patch`
		`- }`
		`-`
		`- build() {`
		`- cd $pkgname-$pkgver`
		`- ./configure \`
		`- --prefix=/usr \`
		`- --enable-csharp \`
		`- --enable-nls \`
		`- --with-xz \`
		`- --without-included-gettext`
		`-`
		`- sed -e 's/ -shared / -Wl,-O1,--as-needed\0/g' \`
		`- -i gettext-{tools,runtime,runtime/libasprintf}/libtool`
		`-`
		`- make`
		`- }`
		`-`
		`- check() {`
		`- cd $pkgname-$pkgver`
		`- make check`
		`- }`
		`-`
		`- package() {`
		`- cd $pkgname-$pkgver`
		`- make DESTDIR="$pkgdir" install`
		`- }`

libre-testing/icecat/PKGBUILD

file modified

+4 -4

		`@@ -1,8 +1,8 @@`
		`- # Maintainer (Arch:firefox): Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>`
		`- # Contributor (Arch:firefox): Ionut Biru <ibiru@archlinux.org>`
		`- # Contributor (Arch:firefox): Jakub Schmidtke <sjakub@gmail.com>`
		`+ # Maintainer (arch:firefox): Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>`
		`+ # Contributor: Ionut Biru <ibiru@archlinux.org>`
		`+ # Contributor: Jakub Schmidtke <sjakub@gmail.com>`

		`- # Contributor (ConnochaetOS:iceweasel): Henry Jensen <hjensen@connochaetos.org>`
		`+ # Contributor: Henry Jensen <hjensen@connochaetos.org>`

		`# Maintainer: Andreas Grapentin <andreas@grapentin.org>`
		`# Maintainer: Luke Shumaker <lukeshu@parabola.nu>`

libre-testing/procps-ng/PKGBUILD

file modified

+1 -1

		`@@ -1,4 +1,4 @@`
		`- # Maintainer: Bartłomiej Piotrowski <bpiotrowski@archlinux.org>`
		`+ # Maintainer: Bartłomiej Piotrowski <bpiotrowski@archlinux.org>`
		`# Contributor: Gaetan Bisson <bisson@archlinux.org>`
		`# Contributor: Eric Bélanger <eric@archlinux.org>`

libre-testing/ruby/PKGBUILD

file modified

+4 -4

		`@@ -1,7 +1,7 @@`
		`- # Contributor (Arch): Thomas Dziedzic <gostrc@gmail.com>`
		`- # Contributor (Arch): Allan McRae <allan@archlinux.org>`
		`- # Contributor (Arch): John Proctor <jproctor@prium.net>`
		`- # Contributor (Arch): Jeramy Rutley <jrutley@gmail.com>`
		`+ # Contributor: Thomas Dziedzic <gostrc@gmail.com>`
		`+ # Contributor: Allan McRae <allan@archlinux.org>`
		`+ # Contributor: John Proctor <jproctor@prium.net>`
		`+ # Contributor: Jeramy Rutley <jrutley@gmail.com>`

		`# Maintainer: Omar Vega Ramos <ovruni@gnu.org.pe>`
		`# Contributor: Daniel Milewski <niitotantei@riseup.net>`

libre-testing/sdcc/PKGBUILD

file modified

+3 -3

		`@@ -1,7 +1,7 @@`
		`# Maintainer: Freemor <freemor@freemor.ca>`
		`- # Maintainer (ARCH): Kyle Keen <keenerd@gmail.com>`
		`- # Contributor (ARCH): Sergej Pupykin <pupykin.s+arch@gmail.com>`
		`- # Contributor (ARCH): Jose Negron <josenj.arch@mailnull.net>`
		`+ # Maintainer (arch): Kyle Keen <keenerd@gmail.com>`
		`+ # Contributor: Sergej Pupykin <pupykin.s+arch@gmail.com>`
		`+ # Contributor: Jose Negron <josenj.arch@mailnull.net>`

		`# Rationale for Libre:`
		`# Remove non-free PIC Headers etc.`

libre-testing/syslinux/PKGBUILD

file modified

+5 -5

		`@@ -1,8 +1,8 @@`
		`- # Maintainer (Arch): Tobias Powalowski <tpowa@archlinux.org>`
		`- # Maintainer (Arch): Thomas Bächler <thomas@archlinux.org>`
		`- # Maintainer (Arch): Anatol Pomozov <anatol.pomozov@gmail.com>`
		`- # Contributor (Arch): Keshav Amburay <(the ddoott ridikulus ddoott rat) (aatt) (gemmaeiil) (ddoott) (ccoomm)>`
		`- # Maintainer (Hyperbola): André Silva <emulatorman@hyperbola.info>`
		`+ # Maintainer (arch): Tobias Powalowski <tpowa@archlinux.org>`
		`+ # Maintainer (arch): Thomas Bächler <thomas@archlinux.org>`
		`+ # Maintainer (arch): Anatol Pomozov <anatol.pomozov@gmail.com>`
		`+ # Contributor: Keshav Amburay <(the ddoott ridikulus ddoott rat) (aatt) (gemmaeiil) (ddoott) (ccoomm)>`
		`+ # Contributor: André Silva <emulatorman@hyperbola.info>`
		`# Maintainer: Omar Vega Ramos <ovruni@gnu.org.pe>`

		`pkgname=syslinux`

libre-testing/systemd/PKGBUILD

file modified

+3 -3

		`@@ -1,6 +1,6 @@`
		`- # Maintainer (Arch): Christian Hesse <mail@eworm.de>`
		`- # Maintainer (Arch): Dave Reisner <dreisner@archlinux.org>`
		`- # Maintainer (Arch): Tom Gundersen <teg@jklm.no>`
		`+ # Maintainer (arch): Christian Hesse <mail@eworm.de>`
		`+ # Maintainer (arch): Dave Reisner <dreisner@archlinux.org>`
		`+ # Maintainer (arch): Tom Gundersen <teg@jklm.no>`
		`# Maintainer: Luke Shumaker <lukeshu@parabola.nu>`
		`# Contributor: Omar Vega Ramos <ovruni@gnu.org.pe>`
		`# Contributor: Denis 'GNUtoo' Carikli <GNUtoo@cyberdimension.org>`

libre-testing/texinfo/PKGBUILD

file modified

+1 -1

		`@@ -1,4 +1,4 @@`
		`- # Maintainer: Bartłomiej Piotrowski <bpiotrowski@archlinux.org>`
		`+ # Maintainer: Bartłomiej Piotrowski <bpiotrowski@archlinux.org>`
		`# Contributor: Allan McRae <allan@archlinux.org>`
		`# Contributor: Tom Newsom <Jeepster@gmx.co.uk>`

libre-testing/uboot4extlinux-sunxi/PKGBUILD

file modified

+1 -1

		`@@ -3,7 +3,7 @@`
		`# Contributor: André Silva <emulatorman@hyperbola.info>`
		`# Contributor: Timothy Redaelli <timothy.redaelli@gmail.com>`
		`# Contributor: Denis 'GNUtoo' Carikli <GNUtoo@cyberdimension.org>`
		`- # Maintainer: Parabola hackers <dev@lists.parabola.nu>`
		`+ # Maintainer: Parabola Hackers <dev@lists.parabola.nu>`

		`# To add a new board (that uses an Allwinner System On a Chip) you need:`
		`# - The package name. Example: uboot4extlinux-a20-olinuxino_micro`

libre-testing/your-system-sanity/PKGBUILD

file modified

+12 -15

		`@@ -1,26 +1,23 @@`
		`- # Copyright (C) 2019 Freemor <freemor@freemor.ca>`
		`- # This program is free software: you can redistribute it and/or modify`
		`- # it under the terms of the CC0 1.0 License.`
		`- # Maintainers: Parabola hackers <dev@lists.parabola.nu>`
		`+ # SPDX-License-Identifier: CC0-1.0`
		`+ # Maintainer: Parabola Hackers <dev@lists.parabola.nu>`
		`+`

		`pkgname=your-system-sanity`
		`- pkgdesc="This package Warns about and fails to install/upgrade any offending Third Party Package Manager."`
		`- license=('GPL3')`
		`- url="https://git.parabola.nu/abslibre.git"`
		`pkgver=0.2`
		`pkgrel=2`
		`-`
		`- arch=('any')`
		`- depends=('pacman')`
		`- groups=('base' 'base-openrc')`
		`+ pkgdesc="This package Warns about and fails to install/upgrade any offending Third Party Package Manager."`
		`+ arch=(any)`
		`+ url=https://labs.parabola.nu/issues/1035 # TODO: add wiki article for 'url'`
		`+ license=(GPL3)`

		`source=('TPPM.hook' 'TPPMwarn')`
		`+`
		`sha512sums=('452022078de19bc9353ee3f0a2bfca2142c56b99d21276ae4de00568dbf77e3701bd4edd6e70f7454b35602712d601ce08542afcce7a86370399318d09aa74ba'`
		`'cc30673b8bdf63c8de6cb0cdd4397f93f3c855a051ce194cb3d2459f83728d8749b661dfab33ae961b64ba6ec4809946421806c596e459101f1da28d2fec6876')`

		`- package() {`
		`- cd "$srcdir"`

		`- install -Dm755 TPPMwarn "$pkgdir"/usr/bin/TPPMwarn`
		`- install -Dm644 TPPM.hook "$pkgdir"/etc/pacman.d/hooks/TPPM.hook`
		`+ package()`
		`+ {`
		`+ install -Dm755 TPPMwarn "${pkgdir}"/usr/bin/TPPMwarn`
		`+ install -Dm644 TPPM.hook "${pkgdir}"/etc/pacman.d/hooks/TPPM.hook`
		`}`

libre-testing/your-system-sanity/your-system-sanity.hook

file added

+24

		`@@ -0,0 +1,24 @@`
		`+ notice()`
		`+ {`
		`+ cat <<EOF`
		`+ The 'your-system-sanity' package detects other packages on your system,`
		`+ which are known to facilitate installing other non-free packages,`
		`+ or to otherwise disregard the authority of the system package manager,`
		`+ and protects you from (accidentally) installing those in the future.`
		`+`
		`+ Also, as any other such packages are identified in the future,`
		`+ an updated 'your-system-sanity' package will prompt you for their removal.`
		`+`
		`+ Your feedback/participation is important. It is _your_ system, after all.`
		`+ If you notice any problems caused by this package, or notice some package`
		`+ which does or does not deserve to be guarded, please do start a discussion.`
		`+`
		`+ * Bugs: https://labs.parabola.nu`
		`+ * Forum: https://forum.parabola.nu`
		`+ * Email: mailto:assist@lists.parabola.nu`
		`+ * Chat: ircs://irc.libera.chat/#parabola`
		`+ EOF`
		`+ }`
		`+`
		`+ pre_install() { notice ; }`
		`+ pre_upgrade() { notice ; }`

libre/aarch64-linux-gnu-gcc-initial/PKGBUILD

file modified

+1 -1

		`@@ -1,4 +1,4 @@`
		`- # Maintainers: Parabola hackers <dev@lists.parabola.nu>`
		`+ # Maintainer: Parabola Hackers <dev@lists.parabola.nu>`

		`_target=aarch64-linux-gnu`
		`pkgname=$_target-gcc-initial`

libre/aarch64-linux-gnu-gcc/PKGBUILD

file modified

+1 -1

		`@@ -1,4 +1,4 @@`
		`- # Maintainers: Parabola hackers <dev@lists.parabola.nu>`
		`+ # Maintainer: Parabola Hackers <dev@lists.parabola.nu>`

		`_target=aarch64-linux-gnu`
		`pkgname=$_target-gcc`

libre/aarch64-linux-gnu-linux-libre-api-headers/PKGBUILD

file modified

+1 -1

		`@@ -1,5 +1,5 @@`
		`# Maintainer: David P. <megver83@parabola.nu>`
		`- # Maintainer (Arch): Anatol Pomozov <anatol.pomozov@gmail.com>`
		`+ # Maintainer (arch): Anatol Pomozov <anatol.pomozov@gmail.com>`

		`_target_arch=arm64`
		`_target=aarch64-linux-gnu`

libre/abiword/PKGBUILD

file modified

+4 -4

		`@@ -1,7 +1,7 @@`
		`- # Maintainer (Arch): Jan de Groot <jgc@archlinux.org>`
		`- # Contributor (Arch): Giovanni Scafora <giovanni@archlinux.org>`
		`- # Contributor (Arch): Maël Lavault <moimael@neuf.fr>`
		`- # Contributor (Hyperbola): André Silva <emulatorman@hyperbola.info>`
		`+ # Maintainer (arch): Jan de Groot <jgc@archlinux.org>`
		`+ # Contributor: Giovanni Scafora <giovanni@archlinux.org>`
		`+ # Contributor: Maël Lavault <moimael@neuf.fr>`
		`+ # Contributor: André Silva <emulatorman@hyperbola.info>`
		`# Maintainer: Andreas Grapentin <andreas@grapentin.org>`
		`# Contributor: Omar Vega Ramos <ovruni@gnu.org.pe>`

libre/abuse/PKGBUILD

file removed

-85

		`@@ -1,85 +0,0 @@`
		`- # Maintainer (Arch): Alexander F Rødseth <xyproto@archlinux.org>`
		`- # Contributor (Arch): Lukas Fleischer <lfleischer@archlinux.org>`
		`- # Contributor (Arch): jlvsimoes <jlvsimoes@oninet.pt>`
		`- # Contributor (Arch): kevin <kevin@archlinux.org>`
		`- # Contributor (Hyperbola): André Silva <emulatorman@hyperbola.info>`
		`- # Contributor (Hyperbola): Márcio Silva <coadde@hyperbola.info>`
		`- # Maintainer: Omar Vega Ramos <ovruni@gnu.org.pe>`
		`-`
		`- pkgname=abuse`
		`- _pkgname=$pkgname-libre`
		`- pkgver=0.8`
		`- pkgrel=10`
		`- pkgrel+=.parabola1`
		`- pkgdesc='Side-scroller action game that pits you against ruthless alien killers, without nonfree claudio support'`
		`- arch=('x86_64')`
		`- arch+=('i686' 'armv7h')`
		`- url='http://abuse.zoy.org/'`
		`- license=('GPL' 'custom')`
		`- replaces=($_pkgname)`
		`- conflicts=($_pkgname)`
		`- depends=('desktop-file-utils' 'gcc-libs' 'glu' 'libgl' 'sdl_mixer')`
		`- makedepends=('gendesk' 'glu' 'mesa-libgl')`
		`- mksource=("http://$pkgname.zoy.org/raw-attachment/wiki/download/$pkgname-$pkgver.tar.gz")`
		`- source=("https://repo.parabola.nu/other/$_pkgname/$_pkgname-$pkgver.tar.gz"`
		`- "$pkgname.sh"`
		`- "default.${pkgname}rc"`
		`- 'default.gamma.lsp'`
		`- 'libre.patch')`
		`- mksha256sums=('0104db5fd2695c9518583783f7aaa7e5c0355e27c5a803840a05aef97f9d3488')`
		`- sha256sums=('8f77e8020bf17b10d8a5269d7d4d9bc3592f961ce352672ce183e1f41efc956b'`
		`- '8dcf3b6b6ac419e5ffabc847166917d70ce43af3092c4d651f473947fff0cc7d'`
		`- '6ea2fa9e65c10bbcab4432f40d0c7284cb3970835c40c5c00ced14b39ce1b00f'`
		`- '13df83fea60918d29d5141cdfbd8d56147c053e88d3701209ae676f46447c2f6'`
		`- '7566a3affb01c64ff4f859bcd549661220847e9c62327e71e1d585c0048f90ea')`
		`-`
		`- mksource() {`
		`- cd "$pkgname-$pkgver"`
		`-`
		`- # Remove the nonfree claudio addon`
		`- rm -rvf ./data/addon/claudio`
		`- }`
		`-`
		`- prepare() {`
		`- cd "$pkgname-$pkgver"`
		`-`
		`- patch -p1 -i "$srcdir/libre.patch"`
		`-`
		`- gendesk -f -n --pkgname "$pkgname" --pkgdesc "$pkgdesc"`
		`- }`
		`-`
		`- build() {`
		`- cd "$pkgname-$pkgver"`
		`-`
		`- ./configure \`
		`- --prefix=/usr \`
		`- --with-assetdir="/usr/share/$pkgname/orig" \`
		`- --with-x \`
		`- --enable-debug # Fix for FS#52915`
		`- make`
		`- }`
		`-`
		`- package() {`
		`- cd "$pkgname-$pkgver"`
		`-`
		`- make DESTDIR="$pkgdir" install`
		`-`
		`- # Desktop shortcut and icon`
		`- install -Dm644 "$pkgname.desktop" \`
		`- "$pkgdir/usr/share/applications/$pkgname.desktop"`
		`- install -Dm644 "doc/$pkgname.png" "$pkgdir/usr/share/pixmaps/$pkgname.png"`
		`-`
		`- # Default configuration`
		`- mv "$pkgdir/usr/bin/$pkgname" "$pkgdir/usr/bin/$pkgname.elf"`
		`- install -Dm755 "$srcdir/$pkgname.sh" "$pkgdir/usr/bin/$pkgname"`
		`- install -Dm644 "$srcdir/default.${pkgname}rc" \`
		`- "$pkgdir/usr/share/$pkgname/default.${pkgname}rc"`
		`- install -Dm644 "$srcdir/default.gamma.lsp" \`
		`- "$pkgdir/usr/share/$pkgname/default.gamma.lsp"`
		`-`
		`- # License (for the original source code)`
		`- install -d "$pkgdir/usr/share/licenses/$pkgname"`
		`- sed -n '1,/^$/p' src/view.cpp > "$pkgdir/usr/share/licenses/$pkgname/original"`
		`- }`
		`-`
		`- # vim:set ts=2 sw=2 et:`

libre/abuse/abuse.sh

file removed

-15

		`@@ -1,15 +0,0 @@`
		`- #!/bin/bash`
		`-`
		`- # Copy over sane configuration files, unless they already exists`
		`- if [ ! -d $HOME/.abuse ]; then`
		`- mkdir -p $HOME/.abuse`
		`- fi`
		`- if [ ! -f $HOME/.abuse/abuserc ]; then`
		`- cp /usr/share/abuse/default.abuserc $HOME/.abuse/abuserc`
		`- fi`
		`- if [ ! -f $HOME/.abuse/gamma.lsp ]; then`
		`- cp /usr/share/abuse/default.gamma.lsp $HOME/.abuse/gamma.lsp`
		`- fi`
		`-`
		`- # Run abuse`
		`- exec /usr/bin/abuse.elf "$@"`

libre/abuse/default.abuserc

file removed

-37

		`@@ -1,37 +0,0 @@`
		`- ; Abuse-SDL Configuration file`
		`-`
		`- ; Startup fullscreen`
		`- fullscreen=0`
		`-`
		`- ; Use DoubleBuffering`
		`- doublebuf=1`
		`-`
		`- ; Use OpenGL`
		`- gl=1`
		`-`
		`- ; Location of the datafiles`
		`- datadir=/usr/share/abuse/orig`
		`-`
		`- ; Use mono audio only`
		`- mono=0`
		`-`
		`- ; Grab the mouse to the window`
		`- grabmouse=0`
		`-`
		`- ; Set the scale factor`
		`- scale=2`
		`-`
		`- ; Use anti-aliasing (with gl=1 only)`
		`- antialias=0`
		`-`
		`- ; Disable the SDL parachute in the case of a crash`
		`- nosdlparachute=0`
		`-`
		`- ; Key mappings`
		`- left=a`
		`- right=d`
		`- up=w`
		`- down=s`
		`- fire=Space`
		`- weapprev=q`
		`- weapnext=e`

libre/abuse/default.gamma.lsp

file removed

-1

		`@@ -1,1 +0,0 @@`
		`- (setq darkest_gray 20)`

libre/abuse/libre.patch

file removed

-234

		`@@ -1,234 +0,0 @@`
		`- diff --git a/data/Makefile.am b/data/Makefile.am`
		`- index cad0b9ff4..abbb8941f 100644`
		`- --- a/data/Makefile.am`
		`- +++ b/data/Makefile.am`
		`- @@ -35,7 +35,6 @@ lisp += \`
		`- \`
		`- addon/bong/bong.lsp \`
		`- \`
		`- - addon/claudio/claudio.lsp addon/claudio/oldclaud.lsp \`
		`- addon/deathmat/cur_lev.lsp addon/deathmat/deathmat.lsp \`
		`- addon/deathmat/dstartup.lsp addon/deathmat/gamename.lsp \`
		`- addon/deathmat/large.lsp addon/deathmat/levelset.lsp \`
		`- @@ -113,21 +112,6 @@ art += \`
		`- \`
		`- addon/bong/bong.spe \`
		`- \`
		`- - addon/claudio/antship.spe addon/claudio/bigexp.spe \`
		`- - addon/claudio/deepw1.spe addon/claudio/deepw2.spe addon/claudio/droid.spe \`
		`- - addon/claudio/extiles.spe addon/claudio/fire.spe addon/claudio/lamp.spe \`
		`- - addon/claudio/lava2.spe addon/claudio/mypanels.spe \`
		`- - addon/claudio/nplatfor.spe addon/claudio/pal21.spe addon/claudio/pal2.spe \`
		`- - addon/claudio/pal5.spe addon/claudio/pal81f.spe addon/claudio/pal81.spe \`
		`- - addon/claudio/pal82f.spe addon/claudio/pal82.spe addon/claudio/pal90.spe \`
		`- - addon/claudio/rob2.spe addon/claudio/skull.spe addon/claudio/spaced.spe \`
		`- - addon/claudio/spaceh.spe addon/claudio/spacymed.spe \`
		`- - addon/claudio/spacytdm.spe addon/claudio/sswitch.spe \`
		`- - addon/claudio/t_lamp.spe addon/claudio/trex1.spe \`
		`- - addon/claudio/t_skull.spe addon/claudio/t_space.spe \`
		`- - addon/claudio/t_trex.spe addon/claudio/t_water.spe \`
		`- - addon/claudio/umbrel3.spe addon/claudio/watem.spe \`
		`- - \`
		`- addon/example/example.spe \`
		`- \`
		`- addon/leon/gray.spe addon/leon/level00.spe addon/leon/level01.spe \`
		`- @@ -214,7 +198,6 @@ demos = \`
		`- doc = \`
		`- addon/aliens/aliens.txt \`
		`- addon/aliens/readme.txt \`
		`- - addon/claudio/palettes.txt \`
		`- addon/leon/leon.txt \`
		`- addon/newart/tiledoc.txt \`
		`- addon/pong/pong.txt \`
		`- @@ -267,11 +250,6 @@ sound += \`
		`- addon/aliens/altaunt.wav addon/aliens/aslash01.wav \`
		`- addon/aliens/egghatch.wav addon/aliens/jarbreak.wav \`
		`- \`
		`- - addon/claudio/aship.wav addon/claudio/drill.wav addon/claudio/fire.wav \`
		`- - addon/claudio/glass1.wav addon/claudio/sewers.wav addon/claudio/skull.wav \`
		`- - addon/claudio/spaceo.wav addon/claudio/trex1.wav addon/claudio/trex2.wav \`
		`- - addon/claudio/unhealth.wav addon/claudio/wfall.wav \`
		`- - \`
		`- addon/leon/sfx/ambship1.wav addon/leon/sfx/ambship2.wav \`
		`- addon/leon/sfx/gren5.wav addon/leon/sfx/gren6.wav \`
		`- addon/leon/sfx/rain2.wav addon/leon/sfx/rain3.wav \`
		`- diff --git a/data/Makefile.in b/data/Makefile.in`
		`- index b27371448..77b140231 100644`
		`- --- a/data/Makefile.in`
		`- +++ b/data/Makefile.in`
		`- @@ -184,7 +184,6 @@ lisp = abuse.lsp edit.lsp hardness.lsp music/playhmp.lsp lisp/ant.lsp \`
		`- addon/aliens/objects.lsp addon/aliens/powerold.lsp \`
		`- addon/aliens/powerups.lsp addon/aliens/sfx.lsp \`
		`- addon/aliens/tiles.lsp addon/bong/bong.lsp \`
		`- - addon/claudio/claudio.lsp addon/claudio/oldclaud.lsp \`
		`- addon/deathmat/cur_lev.lsp addon/deathmat/deathmat.lsp \`
		`- addon/deathmat/dstartup.lsp addon/deathmat/gamename.lsp \`
		`- addon/deathmat/large.lsp addon/deathmat/levelset.lsp \`
		`- @@ -245,23 +244,6 @@ art = art/ant.spe art/ball.spe art/blowups.spe art/bold.spe \`
		`- art/tints/guns/orange.spe art/tints/guns/redish.spe \`
		`- addon/aliens/aliens.spe addon/aliens/bactiles.spe \`
		`- addon/aliens/fortiles.spe addon/bong/bong.spe \`
		`- - addon/claudio/antship.spe addon/claudio/bigexp.spe \`
		`- - addon/claudio/deepw1.spe addon/claudio/deepw2.spe \`
		`- - addon/claudio/droid.spe addon/claudio/extiles.spe \`
		`- - addon/claudio/fire.spe addon/claudio/lamp.spe \`
		`- - addon/claudio/lava2.spe addon/claudio/mypanels.spe \`
		`- - addon/claudio/nplatfor.spe addon/claudio/pal21.spe \`
		`- - addon/claudio/pal2.spe addon/claudio/pal5.spe \`
		`- - addon/claudio/pal81f.spe addon/claudio/pal81.spe \`
		`- - addon/claudio/pal82f.spe addon/claudio/pal82.spe \`
		`- - addon/claudio/pal90.spe addon/claudio/rob2.spe \`
		`- - addon/claudio/skull.spe addon/claudio/spaced.spe \`
		`- - addon/claudio/spaceh.spe addon/claudio/spacymed.spe \`
		`- - addon/claudio/spacytdm.spe addon/claudio/sswitch.spe \`
		`- - addon/claudio/t_lamp.spe addon/claudio/trex1.spe \`
		`- - addon/claudio/t_skull.spe addon/claudio/t_space.spe \`
		`- - addon/claudio/t_trex.spe addon/claudio/t_water.spe \`
		`- - addon/claudio/umbrel3.spe addon/claudio/watem.spe \`
		`- addon/example/example.spe addon/leon/gray.spe \`
		`- addon/leon/level00.spe addon/leon/level01.spe \`
		`- addon/leon/level02.spe addon/leon/lmisc.spe \`
		`- @@ -333,7 +315,6 @@ demos = \`
		`- doc = \`
		`- addon/aliens/aliens.txt \`
		`- addon/aliens/readme.txt \`
		`- - addon/claudio/palettes.txt \`
		`- addon/leon/leon.txt \`
		`- addon/newart/tiledoc.txt \`
		`- addon/pong/pong.txt \`
		`- @@ -414,17 +395,6 @@ extra = \`
		`- @HAVE_NONFREE_TRUE@ addon/aliens/aslash01.wav \`
		`- @HAVE_NONFREE_TRUE@ addon/aliens/egghatch.wav \`
		`- @HAVE_NONFREE_TRUE@ addon/aliens/jarbreak.wav \`
		`- -@HAVE_NONFREE_TRUE@ addon/claudio/aship.wav \`
		`- -@HAVE_NONFREE_TRUE@ addon/claudio/drill.wav \`
		`- -@HAVE_NONFREE_TRUE@ addon/claudio/fire.wav \`
		`- -@HAVE_NONFREE_TRUE@ addon/claudio/glass1.wav \`
		`- -@HAVE_NONFREE_TRUE@ addon/claudio/sewers.wav \`
		`- -@HAVE_NONFREE_TRUE@ addon/claudio/skull.wav \`
		`- -@HAVE_NONFREE_TRUE@ addon/claudio/spaceo.wav \`
		`- -@HAVE_NONFREE_TRUE@ addon/claudio/trex1.wav \`
		`- -@HAVE_NONFREE_TRUE@ addon/claudio/trex2.wav \`
		`- -@HAVE_NONFREE_TRUE@ addon/claudio/unhealth.wav \`
		`- -@HAVE_NONFREE_TRUE@ addon/claudio/wfall.wav \`
		`- @HAVE_NONFREE_TRUE@ addon/leon/sfx/ambship1.wav \`
		`- @HAVE_NONFREE_TRUE@ addon/leon/sfx/ambship2.wav \`
		`- @HAVE_NONFREE_TRUE@ addon/leon/sfx/gren5.wav \`
		`- diff --git a/data/abuse.lsp b/data/abuse.lsp`
		`- index cc09aa930..6b15f8dd2 100644`
		`- --- a/data/abuse.lsp`
		`- +++ b/data/abuse.lsp`
		`- @@ -42,7 +42,6 @@`
		`- (load "addon/twist/f2chars.lsp")`
		`- (load "addon/twist/f2ai.lsp")`
		`- (load "addon/aliens/astartup.lsp")`
		`- -(load "addon/claudio/claudio.lsp")`
		`- (load "addon/twist/lisp/dray.lsp")`
		`- (load "addon/twist/lisp/mario.lsp")`
		`- (load "addon/leon/4frabs.lsp")`
		`- @@ -50,13 +49,11 @@`
		`-`
		`- (setq bad_guy_list`
		`- (list DARNEL ANT_ROOF TRACK_GUN SPRAY_GUN JUGGER ROB1 WHO ROCKET FLYER`
		`- - GREEN_FLYER BOSS_ANT DROID_JUGGER DROID DEATH_SKULL DEATH_UMBRELLA`
		`- - ANT_SHIP WALK_ROB T_REX FACE_HUGGER ALIEN_DRONE ALIEN_WARRIOR ANT`
		`- + GREEN_FLYER BOSS_ANT WALK_ROB FACE_HUGGER ALIEN_DRONE ALIEN_WARRIOR ANT`
		`- ANT_JUMPER ANT_PRED ANT_GREATER2 WALK_ROB2 WALK_ROBHEAD))`
		`- (setq object_destroyable_list`
		`- (list DARNEL ANT_ROOF TRACK_GUN SPRAY_GUN JUGGER ROB1 WHO ROCKET FLYER`
		`- - GREEN_FLYER BOSS_ANT DROID_JUGGER DROID DEATH_SKULL DEATH_UMBRELLA`
		`- - ANT_SHIP WALK_ROB T_REX FACE_HUGGER ALIEN_DRONE ALIEN_WARRIOR ANT`
		`- + GREEN_FLYER BOSS_ANT WALK_ROB FACE_HUGGER ALIEN_DRONE ALIEN_WARRIOR ANT`
		`- ANT_JUMPER ANT_PRED ANT_GREATER2 WALK_ROB2 WALK_ROBHEAD))`
		`-`
		`- (gc) ;; garbage collection perm space`
		`- diff --git a/data/addon/deathmat/deathmat.lsp b/data/addon/deathmat/deathmat.lsp`
		`- index 3d5a78e77..5452ddad7 100644`
		`- --- a/data/addon/deathmat/deathmat.lsp`
		`- +++ b/data/addon/deathmat/deathmat.lsp`
		`- @@ -28,7 +28,6 @@`
		`- (load "lisp/switch.lsp")`
		`-`
		`- ;; Artwork from fRaBs`
		`- -(load "addon/claudio/claudio.lsp")`
		`- (load "addon/aliens/astartup.lsp")`
		`- (load "addon/newart/newart.lsp")`
		`- (load "addon/leon/4frabsdm.lsp")`
		`- diff --git a/data/addon/newart/tiledoc.txt b/data/addon/newart/tiledoc.txt`
		`- index 5dbebea33..3f864353c 100644`
		`- --- a/data/addon/newart/tiledoc.txt`
		`- +++ b/data/addon/newart/tiledoc.txt`
		`- @@ -21,8 +21,6 @@ NEW FOREGROUND TILES`
		`- /addon/newart/frabs_2.spe 1250-1285`
		`- /addon/newart/final.spe 1300-1336`
		`- /addon/aliens/fortiles.spe 2000-2077`
		`- -/addon/claudio/pal81f.spe 2200-2217`
		`- -/addon/claudio/pal82f.spe 2250-2283`
		`-`
		`- REGULAR ABUSE BACKGROUND TILES`
		`-`
		`- @@ -38,11 +36,7 @@ REGULAR ABUSE BACKGROUND TILES`
		`- NEW BACKGROUND TILES`
		`-`
		`- /addon/aliens/bactiles.spe 340-374`
		`- -/addon/claudio/pal2.spe 380-387`
		`- -/addon/claudio/pal5.spe 430-444`
		`- /addon/newart/space.spe 450-468`
		`- -/addon/claudio/pal90.spe 475-494`
		`- -/addon/claudio/pal21.spe 500-529`
		`- /addon/newart/blcave.spe 560-574`
		`- /addon/newart/frbsblue.spe 580-611`
		`-`
		`- @@ -72,39 +66,16 @@ FOREGROUND DESCRIPTIONS`
		`- ;; Green cave foreground tiles used in`
		`- ;; the Aliens Abuse addon, by Michael Moss`
		`-`
		`- -/addon/claudio/pal81f.spe 2200`
		`- -/addon/claudio/pal82f.spe 2250`
		`- -;; Out of all the addon tiles for Abuse,`
		`- -;; Claudio Bolzoni's grey space ones just`
		`- -;; stand out as the best. These were`
		`- -;; numbered from 8100 in older versions of`
		`- -;; fRaBs.`
		`- -`
		`- BACKGROUND DESCRIPTIONS`
		`-`
		`- /addon/aliens/bactiles.spe 340-374`
		`- ;; Aliens Abuse background tiles. Have`
		`- ;; you ever played Doom? :)`
		`-`
		`- -/addon/claudio/pal2.spe 380-387`
		`- -;; Metal sewer tiles also from Doom.`
		`- -`
		`- -/addon/claudio/pal5.spe 430-444`
		`- -;; Limestone cave tiles! Very cool.`
		`- -;; Also by Claudio.`
		`- -`
		`- /addon/newart/space.spe 450-468`
		`- ;; Space tiles with planets. Thanks`
		`- ;; Cypress!`
		`-`
		`- -/addon/claudio/pal90.spe 475-494`
		`- -;; Starry tiles. These were`
		`- -;; numbered from 9000 in previous`
		`- -;; versions of fRaBs. By Claudio.`
		`- -`
		`- -/addon/claudio/pal21.spe 500-529`
		`- -;; Starry tiles by Claudio Bolzoni.`
		`- -`
		`- /addon/newart/blcave.spe 560-574`
		`- ;; Blue caves. By Cypress.`
		`-`
		`- diff --git a/data/addon/twist/lisp/dray.lsp b/data/addon/twist/lisp/dray.lsp`
		`- index eba873f45..84c4e27e7 100644`
		`- --- a/data/addon/twist/lisp/dray.lsp`
		`- +++ b/data/addon/twist/lisp/dray.lsp`
		`- @@ -9,7 +9,7 @@`
		`- ;; make sure you add all the objects that the deathray's light beam will have effect on.`
		`- ;; the objects are simply the bad_guy_list... BUT, remove DARNEL from the list.`
		`-`
		`- -(setq object_destroyable_list (list DARNEL ANT_ROOF TRACK_GUN SPRAY_GUN JUGGER ROB1 WHO ROCKET FLYER GREEN_FLYER BOSS_ANT DROID_JUGGER DROID DEATH_SKULL DEATH_UMBRELLA ANT_SHIP WALK_ROB T_REX FACE_HUGGER ALIEN_DRONE ALIEN_WARRIOR))`
		`- +(setq object_destroyable_list (list DARNEL ANT_ROOF TRACK_GUN SPRAY_GUN JUGGER ROB1 WHO ROCKET FLYER GREEN_FLYER BOSS_ANT WALK_ROB FACE_HUGGER ALIEN_DRONE ALIEN_WARRIOR))`
		`-`
		`-`
		`- ;; this will allow the player to pick up both ammo and weapons.`

libre/acpi_call-dkms/PKGBUILD

file modified

+16 -2

		`@@ -6,7 +6,20 @@`
		`# Maintainer: Omar Vega Ramos <ovruni@gnu.org.pe>`


		`- _basekernel=5.17.3`
		`+ # build order:`
		`+ # acpi_call-dkms <- acpi_call-lts`
		`+ # acpi_call`
		`+ # linux-libre-lts-headers <- acpi_call-lts`
		`+ # tp_smapi-lts`
		`+ # linux-libre-headers <- acpi_call`
		`+ # tp_smapi`
		`+ #`
		`+ # these packages may be built as a batch, with the helper script:`
		`+ # 'scripts/package-all-acpi_call-tp_smapi'`
		`+ # simply edit '_basekernel' in each # TODO: automate that too`
		`+`
		`+`
		`+ _basekernel=5.18.14`

		`pkgname=acpi_call-dkms`
		`_tag='9f1c0b5d046bdfdec769809435257647fd475473' # git rev-parse v${_tag_name}`
		`@@ -16,7 +29,8 @@`
		`pkgdesc='A linux kernel module that enables calls to ACPI methods through /proc/acpi/call - module sources'`
		`pkgdesc+=' (for linux-libre)'`
		`url='https://github.com/nix-community/acpi_call'`
		`- arch=('armv7h' 'i686' 'x86_64')`
		`+ arch=('any')`
		`+ arch=('armv7h' 'i686' 'x86_64') # just to simplify the package-all-acpi_call-tp_smapi script`
		`license=('GPL')`
		`depends=('dkms')`
		`makedepends=('git')`

libre/acpi_call-lts/PKGBUILD

file modified

+20 -7

		`@@ -1,12 +1,25 @@`
		`- # Maintainer (Arch): Maxime Gauduin <alucryd@archlinux.org>`
		`- # Contributor (Arch): mortzu <me@mortzu.de>`
		`- # Contributor (Arch): fnord0 <fnord0@riseup.net>`
		`- # Contributor (Hyperbola): André Silva <emulatorman@hyperbola.info>`
		`- # Contributor (Hyperbola): Márcio Silva <coadde@hyperbola.info>`
		`+ # Maintainer (arch): Maxime Gauduin <alucryd@archlinux.org>`
		`+ # Contributor: mortzu <me@mortzu.de>`
		`+ # Contributor: fnord0 <fnord0@riseup.net>`
		`+ # Contributor: André Silva <emulatorman@hyperbola.info>`
		`+ # Contributor: Márcio Silva <coadde@hyperbola.info>`
		`# Maintainer: Omar Vega Ramos <ovruni@gnu.org.pe>`


		`- _basekernel=5.10.89`
		`+ # build order:`
		`+ # acpi_call-dkms <- acpi_call-lts`
		`+ # acpi_call`
		`+ # linux-libre-lts-headers <- acpi_call-lts`
		`+ # tp_smapi-lts`
		`+ # linux-libre-headers <- acpi_call`
		`+ # tp_smapi`
		`+ #`
		`+ # these packages may be built as a batch, with the helper script:`
		`+ # 'scripts/package-all-acpi_call-tp_smapi'`
		`+ # simply edit '_basekernel' in each # TODO: automate that too`
		`+`
		`+`
		`+ _basekernel=5.15.41`

		`pkgname=acpi_call-lts`
		`pkgver=1.2.2`
		`@@ -16,7 +29,7 @@`
		`pkgdesc+=' (for linux-libre-lts)'`
		`url='https://github.com/mkottman/acpi_call'`
		`arch=('x86_64')`
		`- arch+=('i686' 'armv7h')`
		`+ arch+=('armv7h' 'i686')`
		`license=('GPL')`
		`makedepends=(linux-libre-lts-headers=${_basekernel} acpi_call-dkms=$pkgver libelf)`
		`conflicts=('acpi_call-dkms')`

libre/acpi_call/PKGBUILD

file modified

+15 -2

		`@@ -6,7 +6,20 @@`
		`# Maintainer: Omar Vega Ramos <ovruni@gnu.org.pe>`


		`- _basekernel=5.17.3`
		`+ # build order:`
		`+ # acpi_call-dkms <- acpi_call-lts`
		`+ # acpi_call`
		`+ # linux-libre-lts-headers <- acpi_call-lts`
		`+ # tp_smapi-lts`
		`+ # linux-libre-headers <- acpi_call`
		`+ # tp_smapi`
		`+ #`
		`+ # these packages may be built as a batch, with the helper script:`
		`+ # 'scripts/package-all-acpi_call-tp_smapi'`
		`+ # simply edit '_basekernel' in each # TODO: automate that too`
		`+`
		`+`
		`+ _basekernel=5.18.14`

		`pkgname=acpi_call`
		`pkgver=1.2.2`
		`@@ -19,7 +32,7 @@`
		`arch+=('armv7h' 'i686')`
		`license=('GPL')`
		`makedepends=(linux-libre-headers=${_basekernel} "acpi_call-dkms=$pkgver")`
		- makedepends+=(gcc=11.2.0) # `dkms` requires the same compiler version which built the kernel
		+ #makedepends+=(gcc=11.2.0) # `dkms` requires the same compiler version which built the kernel
		`conflicts=('acpi_call-dkms')`

		`build() {`

libre/angband/PKGBUILD

file modified

+8 -8

		`@@ -1,11 +1,11 @@`
		`- # Maintainer (Arch): schuay <jakob.gruber@gmail.com>`
		`- # Contributor (Arch): Mike Sampson <mike at sambodata dot com>`
		`- # Contributor (Arch): Adrian Stratulat <adrian.stratulat at inboxcom>`
		`- # Contributor (Arch): Anton Bazhenov <anton.bazhenov at gmail>`
		`- # Contributor (Arch): KillaB <xGenoBlast@gmail.com>`
		`- # Contributor (Arch): Callan Barrett <wizzomafizzo@gmail.com>`
		`- # Contributor (Arch): Christian Schmidt <xmucknertx@googlemail.com>`
		`- # Contributor (Arch): Sebastian Sareyko <public@nooms.de>`
		`+ # Maintainer (arch): schuay <jakob.gruber@gmail.com>`
		`+ # Contributor: Mike Sampson <mike at sambodata dot com>`
		`+ # Contributor: Adrian Stratulat <adrian.stratulat at inboxcom>`
		`+ # Contributor: Anton Bazhenov <anton.bazhenov at gmail>`
		`+ # Contributor: KillaB <xGenoBlast@gmail.com>`
		`+ # Contributor: Callan Barrett <wizzomafizzo@gmail.com>`
		`+ # Contributor: Christian Schmidt <xmucknertx@googlemail.com>`
		`+ # Contributor: Sebastian Sareyko <public@nooms.de>`
		`# Maintainer: Omar Vega Ramos <ovruni@gnu.org.pe>`
		`# Contributor: Isaac David <isacdaavid@at@isacdaavid@dot@info>`
		`# Contributor: André Silva <emulatorman@parabola.nu>`

libre/antlr2/PKGBUILD

file removed

-93

		`@@ -1,93 +0,0 @@`
		`- # Maintainer (Arch): Andrea Scarpino <andrea@archlinux.org>`
		`- # Contributor (Arch): George Giorgidze <giorgidze (at) gmail.com>`
		`- # Contributor (Arch): Stefan Husmann <stefan-husmann@t-online.de>`
		`- # Maintainer: Omar Vega Ramos <ovruni@gnu.org.pe>`
		`- # Contributor: Luke Shumaker <lukeshu@parabola.nu>`
		`-`
		`- pkgbase=antlr2`
		`- pkgname=('antlr2' antlr2-{java,python2,cxx})`
		`- pkgver=2.7.7`
		`- pkgrel=9`
		`- pkgrel+=.par1`
		`- pkgdesc="Language recognition tool providing a framework to build grammatical parsers"`
		`- arch=('x86_64')`
		`- arch+=('i686' 'armv7h')`
		`- url="http://www.antlr2.org/"`
		`- license=('custom:Public Domain')`
		`- makedepends=('java-environment' 'python2' 'bash' 'jh')`
		`- options=('staticlibs')`
		`- source=("http://www.antlr2.org/download/antlr-${pkgver}.tar.gz"`
		`- "https://repo.maven.apache.org/maven2/antlr/antlr/$pkgver/antlr-$pkgver.pom"`
		`- 'runantlr2.sh'`
		`- 'gcc4.4.patch')`
		`- sha256sums=('853aeb021aef7586bda29e74a6b03006bcb565a755c86b66032d8ec31b67dbb9'`
		`- '100f793ba27f8b4e4204edb46171ebf36e54e0f94cfc02527fea07a0bb1fceb7'`
		`- '04c5b1e4d1fef6fe31852ecba2c18313dfa9d9971ee317274ea964b6f658c255'`
		`- 'b37444f9867544b8c7ad498b0bface51de0b34af8ef88eb7e2b298f102a10b1b')`
		`-`
		`- prepare() {`
		`- cd "${srcdir}/antlr-${pkgver}"`
		`- patch -Np1 -i "${srcdir}"/gcc4.4.patch`
		`- }`
		`-`
		`- build() {`
		`- cd "${srcdir}/antlr-${pkgver}"`
		`-`
		`- ./configure --prefix=/usr \`
		`- --disable-examples \`
		`- --disable-csharp`
		`- make`
		`- }`
		`-`
		`- _install_license() {`
		`- install -Dm644 "$srcdir"/antlr-${pkgver}/LICENSE.txt \`
		`- "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"`
		`- }`
		`-`
		`- package_antlr2() {`
		`- depends=('bash' 'antlr2-java')`
		`-`
		`- install -Dm755 "$srcdir"/runantlr2.sh "$pkgdir"/usr/bin/runantlr2`
		`- _install_license`
		`- }`
		`-`
		`- package_antlr2-java() {`
		`- pkgdesc+=" (Java version)"`
		`- depends=('java-runtime')`
		`-`
		`- provides=("java-antlr2=$pkgver")`
		`- conflicts=("java-antlr2")`
		`- replaces=("java-antlr2")`
		`-`
		`- DESTDIR="$pkgdir" jh mvn-install antlr antlr $pkgver \`
		`- "$srcdir"/antlr-${pkgver}.pom \`
		`- "$srcdir"/antlr-${pkgver}/antlr/antlr.jar \`
		`- antlr2.jar`
		`-`
		`- ln -s "/usr/share/java/antlr2.jar" \`
		`- "${pkgdir}/usr/share/java/antlr2-${pkgver}.jar"`
		`- _install_license`
		`- }`
		`-`
		`- package_antlr2-python2() {`
		`- pkgdesc+=" (Python version)"`
		`- depends=('python2')`
		`-`
		`- provides=("python2-antlr2=$pkgver")`
		`- conflicts=("python2-antlr2")`
		`- replaces=("python2-antlr2")`
		`-`
		`- cd "$srcdir"/antlr-${pkgver}/lib/python`
		`- python2 setup.py install --root="${pkgdir}" --optimize=1`
		`-`
		`- _install_license`
		`- }`
		`-`
		`- package_antlr2-cxx() {`
		`- pkgdesc+=" (C++ version)"`
		`-`
		`- cd "$srcdir"/antlr-${pkgver}/lib/cpp`
		`- make prefix="${pkgdir}/usr" install`
		`-`
		`- _install_license`
		`- }`

libre/antlr2/gcc4.4.patch

file removed

-12

		`@@ -1,12 +0,0 @@`
		`- diff -Nur antlr-2.7.7.orig/lib/cpp/antlr/CharScanner.hpp antlr-2.7.7/lib/cpp/antlr/CharScanner.hpp`
		`- --- antlr-2.7.7.orig/lib/cpp/antlr/CharScanner.hpp`
		`- +++ antlr-2.7.7/lib/cpp/antlr/CharScanner.hpp`
		`- @@ -10,6 +10,8 @@`
		`-`
		`- #include <antlr/config.hpp>`
		`-`
		`- +#include <cstdio>`
		`- +#include <cstring>`
		`- #include <map>`
		`-`
		`- #ifdef HAS_NOT_CCTYPE_H`

libre/antlr2/runantlr2.sh

file removed

-3

		`@@ -1,3 +0,0 @@`
		`- #!/bin/bash`
		`- export CLASSPATH="/usr/share/java/antlr2.jar${CLASSPATH:+:$CLASSPATH}"`
		`- java antlr.Tool "$@"`

libre/archlinuxarm-keyring/PKGBUILD

file modified

+1 -1

		`@@ -1,5 +1,5 @@`
		`# Maintainer: Isaac David <isacdaavid@at@isacdaavid@dot@info>`
		`- # Maintainer (ALARM): Kevin Mihelich <kevin@archlinuxarm.org>`
		`+ # Maintainer (archarm): Kevin Mihelich <kevin@archlinuxarm.org>`

		`pkgname=archlinuxarm-keyring`
		`pkgver=20140119`

libre/ark/PKGBUILD

file modified

+3 -3

		`@@ -1,6 +1,6 @@`
		`- # Maintainer (Arch): Antonio Rojas <arojas@archlinux.org>`
		`- # Maintainer (Arch): Felix Yan <felixonmars@archlinux.org>`
		`- # Contributor (Arch): Andrea Scarpino <andrea@archlinux.org>`
		`+ # Maintainer (arch): Antonio Rojas <arojas@archlinux.org>`
		`+ # Maintainer (arch): Felix Yan <felixonmars@archlinux.org>`
		`+ # Contributor: Andrea Scarpino <andrea@archlinux.org>`
		`# Maintainer: Andreas Grapentin <andreas@grapentin.org>`
		`# Contributor: André Silva <emulatorman@hyperbola.info>`
		`# Contributor: jc_gargma <jc_gargma@iserlohn-fortress.net>`

libre/arm-linux-gnueabi-binutils/PKGBUILD

file modified

+5 -6

		`@@ -2,18 +2,17 @@`

		`_target=arm-linux-gnueabi`
		`pkgname=$_target-binutils`
		`- pkgver=2.37`
		`+ pkgver=2.39`
		`pkgrel=1`
		`pkgdesc='A set of programs to assemble and manipulate binary and object files for the ARM GNU EABI little-endian target'`
		`- arch=('x86_64' 'i686' 'armv7h')`
		`+ arch=(x86_64 i686 armv7h)`
		`url='https://www.gnu.org/software/binutils/'`
		`license=(GPL)`
		`- depends=(zlib)`
		`+ depends=(zlib libelf)`
		`source=(https://ftp.gnu.org/gnu/binutils/binutils-$pkgver.tar.bz2{,.sig})`
		`- sha512sums=('b3f5184697f77e94c95d48f6879de214eb5e17aa6ef8e96f65530d157e515b1ae2f290e98453e4ff126462520fa0f63852b6e1c8fbb397ed2e41984336bc78c6'`
		`+ sha512sums=('faa592dd48fc715901ad704ac96dbd34b1792c51e77c7a92a387964b0700703c74be07de45cc4751945c8c0674368c73dc17bbc563d1d2cd235b5ebd8c6e7efb'`
		`'SKIP')`
		`- validpgpkeys=('EAF1C276A747E9ED86210CBAC3126D3B4AE55E93' # Tristan Gingold <gingold@adacore.com>`
		`- '3A24BC1E8FB409FA9F14371813FCEF89DD9E3C4F') # Nick Clifton (Chief Binutils Maintainer) <nickc@redhat.com>`
		`+ validpgpkeys=('3A24BC1E8FB409FA9F14371813FCEF89DD9E3C4F') # Nick Clifton (Chief Binutils Maintainer) <nickc@redhat.com>`

		`prepare() {`
		`cd binutils-$pkgver`

libre/arm-linux-gnueabi-gcc/PKGBUILD

file modified

+14 -16

		`@@ -2,24 +2,22 @@`

		`_target=arm-linux-gnueabi`
		`pkgname=$_target-gcc`
		`- pkgver=11.2.0`
		`- _islver=0.24`
		`+ pkgver=12.2.0`
		`pkgrel=1`
		`#_snapshot=8-20210107`
		`pkgdesc='The GNU Compiler Collection - cross compiler for ARM GNU EABI little-endian target'`
		`arch=(x86_64 i686 armv7h)`
		`url='http://gcc.gnu.org/'`
		`license=(GPL LGPL FDL)`
		`- depends=($_target-binutils libmpc zlib)`
		`+ depends=($_target-binutils libmpc zlib libisl zstd)`
		`makedepends=(gmp mpfr)`
		`- options=(!emptydirs !strip)`
		`- source=(https://gcc.gnu.org/pub/gcc/releases/gcc-$pkgver/gcc-$pkgver.tar.xz{,.sig}`
		`+ options=(!emptydirs !strip !lto)`
		`+ source=(https://gcc.gnu.org/pub/gcc/releases/gcc-$pkgver/gcc-$pkgver.tar.xz{,.sig})`
		`#https://gcc.gnu.org/pub/gcc/snapshots/$_snapshot/gcc-$_snapshot.tar.xz`
		`- https://libisl.sourceforge.io/isl-$_islver.tar.bz2)`
		`- sha512sums=('d53a0a966230895c54f01aea38696f818817b505f1e2bfa65e508753fcd01b2aedb4a61434f41f3a2ddbbd9f41384b96153c684ded3f0fa97c82758d9de5c7cf'`
		`- 'SKIP'`
		`- 'aab3bddbda96b801d0f56d2869f943157aad52a6f6e6a61745edd740234c635c38231af20bc3f1a08d416a5e973a90e18249078ed8e4ae2f1d5de57658738e95')`
		`- validpgpkeys=(33C235A34C46AA3FFB293709A328C3A2C3C45C06 # Jakub Jelinek <jakub@redhat.com>`
		`+ sha512sums=('e9e857bd81bf7a370307d6848c81b2f5403db8c7b5207f54bce3f3faac3bde63445684092c2bc1a2427cddb6f7746496d9fbbef05fbbd77f2810b2998f1f9173'`
		`+ 'SKIP')`
		`+ validpgpkeys=(D3A93CAD751C2AF4F8C7AD516C35B99309B5FA62 # Jakub Jelinek <jakub@redhat.com>`
		`+ 33C235A34C46AA3FFB293709A328C3A2C3C45C06 # Jakub Jelinek <jakub@redhat.com>`
		`13975A70E63C361C73AE69EF6EEB81F8981C74C7) # Richard Guenther <richard.guenther@gmail.com>`

		`if [ -n "$_snapshot" ]; then`
		`@@ -31,14 +29,8 @@`
		`prepare() {`
		`cd $_basedir`

		`- # link isl for in-tree builds`
		`- ln -sf ../isl-$_islver isl`
		`-`
		`echo $pkgver > gcc/BASE-VER`

		`- # hack! - some configure tests for header files using "$CPP $CPPFLAGS"`
		`- sed -i "/ac_cpp=/s/\$CPPFLAGS/\$CPPFLAGS -O2/" "$srcdir"/$_basedir/{libiberty,gcc}/configure`
		`-`
		`mkdir $srcdir/gcc-build`
		`}`

		`@@ -50,6 +42,12 @@`
		`CFLAGS=${CFLAGS/-pipe/}`
		`CXXFLAGS=${CXXFLAGS/-pipe/}`

		`+ # Credits @allanmcrae`
		`+ # https://github.com/allanmcrae/toolchain/blob/f18604d70c5933c31b51a320978711e4e6791cf1/gcc/PKGBUILD`
		`+ # TODO: properly deal with the build issues resulting from this`
		`+ CFLAGS=${CFLAGS/-Werror=format-security/}`
		`+ CXXFLAGS=${CXXFLAGS/-Werror=format-security/}`
		`+`
		`if [ "$CARCH" = i686 ]; then`
		`# using -Werror=format-security causes i686 build to fail`
		`CXXFLAGS+=' -Wno-error=format-security'`

libre/arm-linux-gnueabi-linux-api-headers/PKGBUILD

file modified

+1 -1

		`@@ -1,4 +1,4 @@`
		`- # Maintainer (Arch): Anatol Pomozov <anatol.pomozov@gmail.com>`
		`+ # Maintainer (arch): Anatol Pomozov <anatol.pomozov@gmail.com>`

		`_target_arch=arm`
		`_target=arm-linux-gnueabi`

libre/arrayfire/PKGBUILD

file modified

+1 -1

		`@@ -1,6 +1,6 @@`
		`# Maintainer: Andreas Grapentin <andreas@grapentin.org>`
		`# Contributor: André Silva <emulatorman@hyperbola.info>`
		`- # Maintainer (Arch): Sven-Hendrik Haase <sh@lutzhaase.com>`
		`+ # Maintainer (arch): Sven-Hendrik Haase <sh@lutzhaase.com>`

		`pkgname=arrayfire`
		`pkgdesc="High performance software library for parallel computing with an easy-to-use API, without nonfree cuda and nvidia-utils support and nonfree SIFT algorithm"`

libre/asciidoc/PKGBUILD

file modified

+54 -33

		`@@ -1,22 +1,37 @@`
		`- # Maintainer (Arch): Eli Schwartz <eschwartz@archlinux.org>`
		`- # Maintainer (Arch): Levente Polyak <anthraxx[at]archlinux[dot]org>`
		`- # Contributor (Arch): Florian Pritz <flo@xinu.at>`
		`- # Contributor (Arch): Chris Brannon <cmbrannon79@gmail.com>`
		`- # Contributor (Arch): Geoffroy Carrier <geoffroy@archlinux.org>`
		`- # Contributor (Arch): Dan McGee <dan@archlinux.org>`
		`- # Contributor (Arch): Jaroslaw Rosiek <philosoph@interia.pl>`
		`- # Contributor (Arch): Darwin Bautista <djclue917@gmail.com>`
		`- # Contributor (Arch): Daniel J Griffiths <ghost1227@archlinux.us>`
		`+ # Maintainer (arch): Eli Schwartz <eschwartz@archlinux.org>`
		`+ # Maintainer (arch): Levente Polyak <anthraxx[at]archlinux[dot]org>`
		`+ # Contributor: Florian Pritz <flo@xinu.at>`
		`+ # Contributor: Chris Brannon <cmbrannon79@gmail.com>`
		`+ # Contributor: Geoffroy Carrier <geoffroy@archlinux.org>`
		`+ # Contributor: Dan McGee <dan@archlinux.org>`
		`+ # Contributor: Jaroslaw Rosiek <philosoph@interia.pl>`
		`+ # Contributor: Darwin Bautista <djclue917@gmail.com>`
		`+ # Contributor: Daniel J Griffiths <ghost1227@archlinux.us>`
		`# Contributor: André Silva <emulatorman@hyperbola.info>`
		`# Contributor: Andreas Grapentin <andreas@grapentin.org>`
		`# Contributor: Denis 'GNUtoo' Carikli <GNUtoo@cyberdimension.org>`

		`+`
		`# parabola changes and rationale:`
		`- # - Removed fop optional dependency as fop is blacklisted`
		`+ # - Removed build dependency on blacklisted 'python-pip' (FIXME: fails to build)`
		`+ # - Removed optional dependency on blacklisted 'fop'`
		`+ # - Removed pip build support (FIXME: fails to build)`
		`+`
		`+ # NOTE: This PKGBUILD is kept in-sync, as closely as possible,`
		`+ # with arch{,arm,32} and parabola, for the sake of documentation and cleaner diffs.`
		`+ # That also helps to identify which changes were made by Parabola vs upstream.`
		`+ # Therefore, this PKGBUILD may declare blacklisted dependencies, non-free sources,`
		`+ # or include code for anti-features; but those will be filtered-out subsequently.`
		`+ # Any code which implements an anti-feature should be commented-out;`
		`+ # and include an 'anti-feature' comment, for clarity.`
		`+ # Any blacklisted dependencies and non-free sources should be filtered,`
		`+ # and include a 'non-free' comment, for clarity.`
		`+ # Without those over-rides, the resulting program may not be FSDG-fit.`
		`+ # Do not circumvent those over-rides, if compiling for the Parabola repos.`


		`pkgname=asciidoc`
		`- pkgver=9.1.0`
		`+ pkgver=10.2.0`
		`pkgrel=1`
		`pkgrel+=.parabola1`
		`pkgdesc='Text document format for short documents, articles, books and UNIX man pages'`
		`@@ -24,45 +39,51 @@`
		`url='https://asciidoc.org/'`
		`license=('GPL')`
		`depends=('python' 'libxslt' 'docbook-xsl')`
		`- checkdepends=('dblatex' 'graphviz' 'lilypond' 'source-highlight')`
		`+ checkdepends=('dblatex' 'graphviz' 'lilypond' 'python-pytest'{,-mock} 'source-highlight')`
		`+ makedepends=('python-pip')`
		`+ makedepends+=('python-setuptools')`
		`+ makedepends=( ${makedepends[*]/python-pip/} ) # non-free - FSDG-unfit repositories`
		`+ # FIXME: Parabola (will have\|has) no 'pip' package ~since python 2 deprecated`
		`+ # \| python3 -m pip install --root /build/asciidoc/pkg/asciidoc .`
		`+ # \| /usr/bin/python3: No module named pip`
		`optdepends=('graphviz: graphviz-filter'`
		`'lilypond: music-filter'`
		`- 'imagemagick: music-filter (used in conjunction with lilypond)'`
		`+ 'imagemagick: music-filter'`
		`'source-highlight: source-highlight-filter'`
		`'dblatex: pdf generation'`
		`- 'w3m: text generation (alternative to lynx)'`
		`- 'lynx: text generation')`
		`- source=("https://github.com/asciidoc/asciidoc-py3/archive/${pkgver}/${pkgname}-${pkgver}.tar.gz")`
		`- sha256sums=('8a6e3ae99785d9325fba0856e04dbe532492af3cb20d49831bfd757166d46c6b')`
		`- b2sums=('dd2376a3b9ffa1d7a8016c9eb1030a9d0d3a01cde587d3179cb425a5be5ae120ea7fc1fa971cb1bb53faa2a7e93b4a1c2e8cf854e7e960c1299398a02b8aa42e')`
		`+ 'w3m: text generation'`
		`+ 'lynx: alternative text generation')`
		`+ source=("https://github.com/asciidoc-py/asciidoc-py/releases/download/$pkgver/$pkgname-$pkgver.tar.gz")`
		`+ sha256sums=('237b2ba5c35c0ae7ccd4cd44ebf1d87c20b2695dae01798954416d492ef7fa0e')`
		`+ b2sums=('ed5db8fd1432b255e9c03e17805c26c76a42392c2ebeaf839b8c0aaaf38cd1a36d79b645ca4474503181200924df91218eb0997dd82335a30d6a0a1b35eb5730')`

		`prepare() {`
		`- cd ${pkgname}-py3-${pkgver}`
		`-`
		`+ cd ${pkgname}-${pkgver}`
		`+ # https://github.com/asciidoc-py/asciidoc-py/issues/234`
		`autoconf`
		`}`

		`build() {`
		`- cd ${pkgname}-py3-${pkgver}`
		`-`
		`+ cd ${pkgname}-${pkgver}`
		`+ # https://github.com/asciidoc-py/asciidoc-py/issues/234#issuecomment-1045970138`
		`./configure \`
		`- --prefix=/usr \`
		`- --sysconfdir=/etc`
		`+ --docdir /usr/share/doc/$pkgname \`
		`+ --prefix /usr`
		`+ make build`
		`make manpages`
		`}`

		`check() {`
		`- cd ${pkgname}-py3-${pkgver}`
		`-`
		`+ cd ${pkgname}-${pkgver}`
		`make test`
		`}`

		`package() {`
		`- cd ${pkgname}-py3-${pkgver}`
		`-`
		`- make install DESTDIR="${pkgdir}"`
		`- make docs DESTDIR="${pkgdir}"`
		`-`
		`- install -Dm644 asciidocapi.py \`
		`- "${pkgdir}/$(python -c 'import sysconfig; print(sysconfig.get_paths()["platlib"])')"/asciidocapi.py`
		`+ cd ${pkgname}-${pkgver}`
		`+ make DESTDIR="${pkgdir}" install`
		`+ make DESTDIR="${pkgdir}" docs`
		`+ install -Dm0644 -t "$pkgdir/usr/share/man/man1/" doc/*.1`
		`+ # ascidocapi is deprecated, but still included in 10.x on a "provisional" basis`
		`+ local _platlib="$(python -c 'import sysconfig; print(sysconfig.get_paths()["platlib"])')"`
		`+ install -Dm0644 -t "${pkgdir}/${_platlib}/${pkgname}/" asciidoc/api.py`
		`}`

libre/atool/PKGBUILD

file modified

+4 -4

		`@@ -1,7 +1,7 @@`
		`- # Maintainer (Arch): Jaroslav Lichtblau <svetlemodry@archlinux.org>`
		`- # Contributor (Arch): leif_thande <leif.thande@gmail.com>`
		`- # Contributor (Arch): tranquility <trankas@gmail.com>`
		`- # Contributor (Arch): Daniel J Griffiths <ghost1227@archlinux.us>`
		`+ # Maintainer (arch): Jaroslav Lichtblau <svetlemodry@archlinux.org>`
		`+ # Contributor: leif_thande <leif.thande@gmail.com>`
		`+ # Contributor: tranquility <trankas@gmail.com>`
		`+ # Contributor: Daniel J Griffiths <ghost1227@archlinux.us>`
		`# Maintainer: Márcio Silva <coadde@hyperbola.info>`
		`# Contributor: André Silva <emulatorman@hyperbola.info>`

libre/audex/PKGBUILD

file modified

+5 -5

		`@@ -1,8 +1,8 @@`
		`- # Maintainer (Arch): Laurent Carlier <lordheavym@gmail.com>`
		`- # Contributor (Arch): Andrea Scarpino <andrea@archlinux.org>`
		`- # Contributor (Arch): mightyjaym <jmambrosino@gmail.com>`
		`- # Contributor (Arch): moostik <mooostik_at_gmail.com>`
		`- # Maintainer (Hyperbola): André Silva <emulatorman@hyperbola.info>`
		`+ # Maintainer (arch): Laurent Carlier <lordheavym@gmail.com>`
		`+ # Contributor: Andrea Scarpino <andrea@archlinux.org>`
		`+ # Contributor: mightyjaym <jmambrosino@gmail.com>`
		`+ # Contributor: moostik <mooostik_at_gmail.com>`
		`+ # Contributor: André Silva <emulatorman@hyperbola.info>`
		`# Maintainer: Omar Vega Ramos <ovruni@gnu.org.pe>`

		`pkgname=audex`

libre/audio-convert/PKGBUILD

file modified

+3 -3

		`@@ -1,6 +1,6 @@`
		`- # Maintainer (Arch): Jaroslav Lichtblau <dragonlord@aur.archlinux.org>`
		`- # Contributor (Arch): Igor Galic <i.galic@gmail.com>`
		`- # Maintainer (Hyperbola): André Silva <emulatorman@hyperbola.info>`
		`+ # Maintainer (arch): Jaroslav Lichtblau <dragonlord@aur.archlinux.org>`
		`+ # Contributor: Igor Galic <i.galic@gmail.com>`
		`+ # Contributor: André Silva <emulatorman@hyperbola.info>`
		`# Maintainer: Omar Vega Ramos <ovruni@gnu.org.pe>`

		`pkgname=audio-convert`

libre/avidemux/PKGBUILD

file modified

+2 -2

		`@@ -1,5 +1,5 @@`
		`- # Maintainer (Arch): Levente Polyak <anthraxx[at]archlinux[dot]org>`
		`- # Maintainer (Arch): Eric Bélanger <eric@archlinux.org>`
		`+ # Maintainer (arch): Levente Polyak <anthraxx[at]archlinux[dot]org>`
		`+ # Maintainer (arch): Eric Bélanger <eric@archlinux.org>`
		`# Maintainer: Andreas Grapentin <andreas@grapentin.org>`
		`# Contributor: André Silva <emulatorman@hyperbola.info>`

libre/b43-tools/PKGBUILD

file modified

+1 -1

		`@@ -1,4 +1,4 @@`
		`- # Contributor (Arch): maz-1 <loveayawaka[at]gmail[dot]com>`
		`+ # Contributor: maz-1 <loveayawaka[at]gmail[dot]com>`
		`# Maintainer: André Silva <emulatorman@hyperbola.info>`

		`pkgname=b43-tools`

libre/barebox-tools/PKGBUILD

file modified

+1 -1

		`@@ -1,6 +1,6 @@`
		`# Barebox: am335x`
		`# Contributor: Denis Carikli <GNUtoo@cyberdimension.org>`
		`- # Maintainers: Parabola hackers <dev@lists.parabola.nu>`
		`+ # Maintainer: Parabola Hackers <dev@lists.parabola.nu>`

		`_pkgname=barebox`
		`pkgname=barebox-tools`

libre/bbswitch/PKGBUILD

file modified

+5 -5

		`@@ -1,8 +1,8 @@`
		`- # Maintainer (Arch): Sven-Hendrik Haase <sh@lutzhaase.com>`
		`- # Contributor (Arch): M0Rf30`
		`- # Contributor (Arch): Samsagax <samsagax@gmail.com>`
		`- # Contributor (Hyperbola): André Silva <emulatorman@hyperbola.info>`
		`- # Contributor (Hyperbola): Márcio Silva <coadde@hyperbola.info>`
		`+ # Maintainer (arch): Sven-Hendrik Haase <sh@lutzhaase.com>`
		`+ # Contributor: M0Rf30`
		`+ # Contributor: Samsagax <samsagax@gmail.com>`
		`+ # Contributor: André Silva <emulatorman@hyperbola.info>`
		`+ # Contributor: Márcio Silva <coadde@hyperbola.info>`
		`# Maintainer: Omar Vega Ramos <ovruni@gnu.org.pe>`

		`_basekernel=5.15.12`

libre/beanshell/PKGBUILD

file modified

+1 -1

		`@@ -1,5 +1,5 @@`
		`# $Id$`
		`- # Maintainer (Arch): AndyRTR <andyrtr at archlinux.org>`
		`+ # Maintainer (arch): AndyRTR <andyrtr at archlinux.org>`
		`# Maintainer: Omar Vega Ramos <ovruni@gnu.org.pe>`

		`pkgname=beanshell`

libre/bfgminer/PKGBUILD

file removed

-53

		`@@ -1,53 +0,0 @@`
		`- # Maintainer (Arch): Christian Rebischke <chris.rebischke@archlinux.org>`
		`- # Contributor (Arch): Timothy Redaelli <timothy.redaelli@gmail.com>`
		`- # Contributor (Arch): Andy Weidenbaum <archbaum@gmail.com>`
		`- # Maintainer: Omar Vega Ramos <ovruni@gnu.org.pe>`
		`- # Contributor: Márcio Silva <coadde@hyperbola.info>`
		`-`
		`- # parabola changes and rationale:`
		`- # - replaced opencl-nvidia recommendation with opencl-mesa`
		`-`
		`- pkgname=bfgminer`
		`- pkgver=5.5.0`
		`- pkgrel=3`
		`- pkgrel+=.parabola1`
		`- pkgdesc="Bitcoin miner featuring overclocking, monitoring, fan speed control and remote management. For FPGA/GPU/CPU Bitcoin mining"`
		`- pkgdesc+=", with opencl-mesa recommendation"`
		`- arch=('x86_64')`
		`- arch+=('i686' 'armv7h')`
		`- depends=('curl' 'jansson' 'libevent' 'libmicrohttpd' 'libusb' 'lm_sensors')`
		`- makedepends=('uthash' 'yasm')`
		`- optdepends=('opencl-mesa: OpenCL implementation for AMD/ATI GPUs')`
		`- url='https://bitcointalk.org/?topic=877081'`
		`- license=('GPL3')`
		`- source=("https://luke.dashjr.org/programs/bitcoin/files/${pkgname}/${pkgver}/${pkgname}-${pkgver}.txz"`
		`- 'remove-dangerous-rpath.patch')`
		`- sha512sums=('d1adae473e01fcf1cd0efde74d3e8ce10609e520397d688bf4e226c1113c1606c782e3cfdba6847f1a3886cac30de6b5baa03b731aca86287d53bf01ef705cdb'`
		`- '087aa60d818ff37cb7a4edce7a34331a492b5e379a8e034d7a2e02b106bb6ea52b4ce6a1077f602987a2c30213bc185063990796a828ae95f60cff03c7a0bc3f')`
		`-`
		`- prepare() {`
		`- cd "${pkgname}"-"${pkgver}"`
		`-`
		`- patch -p1 -i "${srcdir}"/remove-dangerous-rpath.patch`
		`- }`
		`-`
		`- build() {`
		`- cd "${pkgname}"-"${pkgver}"`
		`-`
		`- ./configure --prefix=/usr \`
		`- --sbindir=/usr/bin \`
		`- --enable-cpumining \`
		`- --enable-bfsb \`
		`- --enable-metabank \`
		`- --enable-scrypt \`
		`- --enable-opencl \`
		`- --with-udevrulesdir=/usr/lib/udev/rules.d`
		`- # --enable-knc (FS#33640)`
		`- make`
		`- }`
		`-`
		`- package() {`
		`- cd "${pkgname}"-"${pkgver}"`
		`-`
		`- make DESTDIR="${pkgdir}" install`
		`- }`

libre/bfgminer/remove-dangerous-rpath.patch

file removed

-21

		`@@ -1,21 +0,0 @@`
		`- diff -Naur bfgminer-4.8.0-orig/configure bfgminer-4.8.0/configure`
		`- --- bfgminer-4.8.0-orig/configure 2014-10-04 20:54:28.717071865 -0400`
		`- +++ bfgminer-4.8.0/configure 2014-10-04 20:55:50.140274445 -0400`
		`- @@ -14111,7 +14111,7 @@`
		`- ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir_suffix`
		`-`
		`- libbase58_CFLAGS='-I'"${ac_abs_top_srcdir}"'/libbase58'`
		`- - libbase58_LIBS='-L'"${ac_abs_top_builddir}"'/libbase58/.libs -Wl,-rpath,\$$ORIGIN/libbase58/.libs'"$origin_LDFLAGS"' -lbase58'`
		`- + libbase58_LIBS='-L'"${ac_abs_top_builddir}"'/libbase58/.libs -Wl,-rpath,/usr/lib'"$origin_LDFLAGS"' -lbase58'`
		`- libbase58_SUBDIRS=libbase58`
		`- libbase58_EXTRADEPS=libbase58_directory`
		`- BUNDLED_LIB_RULES="$BUNDLED_LIB_RULES`
		`- @@ -14380,7 +14380,7 @@`
		`- ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir_suffix`
		`-`
		`- libblkmaker_CFLAGS='-I'"${ac_abs_top_srcdir}"'/libblkmaker'`
		`- - libblkmaker_LIBS='-L'"${ac_abs_top_builddir}"'/libblkmaker/.libs -Wl,-rpath,\$$ORIGIN/libblkmaker/.libs'"$origin_LDFLAGS"' -lblkmaker_jansson-0.1 -lblkmaker-0.1'`
		`- + libblkmaker_LIBS='-L'"${ac_abs_top_builddir}"'/libblkmaker/.libs -Wl,-rpath,/usr/lib'"$origin_LDFLAGS"' -lblkmaker_jansson-0.1 -lblkmaker-0.1'`
		`- libblkmaker_SUBDIRS=libblkmaker`
		`- libblkmaker_EXTRADEPS=libblkmaker_directory`
		`- BUNDLED_LIB_RULES="$BUNDLED_LIB_RULES`

libre/blackbox/PKGBUILD

file modified

+4 -4

		`@@ -1,7 +1,7 @@`
		`- # Maintainer (Arch): Sergej Pupykin <pupykin.s+arch@gmail.com>`
		`- # Contributor (Arch): durbatuluk <dvdscripter@gmail.org>`
		`- # Contributor (Arch): Steve Ponsford <sp4d@lavabit.com>`
		`- # Maintainer (Hyperbola): Márcio Silva <coadde@hyperbola.info>`
		`+ # Maintainer (arch): Sergej Pupykin <pupykin.s+arch@gmail.com>`
		`+ # Contributor: durbatuluk <dvdscripter@gmail.org>`
		`+ # Contributor: Steve Ponsford <sp4d@lavabit.com>`
		`+ # Contributor: Márcio Silva <coadde@hyperbola.info>`
		`# Maintainer: Omar Vega Ramos <ovruni@gnu.org.pe>`

		`pkgname=blackbox`

libre/bladerf/PKGBUILD

file modified

+2 -2

		`@@ -1,5 +1,5 @@`
		`- # Maintainer (Arch): Kyle Keen <keenerd@gmail.com>`
		`- # Contributor (Arch): Dominik Heidler <dheidler@gmail.com>`
		`+ # Maintainer (arch): Kyle Keen <keenerd@gmail.com>`
		`+ # Contributor: Dominik Heidler <dheidler@gmail.com>`
		`# Maintainer: Omar Vega Ramos <ovruni@gnu.org.pe>`

		`# it looks like the release model has gotten better`

libre/blender/PKGBUILD

file modified

+78 -39

		`@@ -1,9 +1,12 @@`
		`- # Maintainer (arch): Sven-Hendrik Haase <svenstaro@gmail.com>`
		`+ # Maintainer (arch): Sven-Hendrik Haase <svenstaro@archlinux.org>`
		`+ # Maintainer (arch32): Andreas Baumann <mail@andreasbaumann.cc>`
		`+ # Maintainer (archarm): Kevin Mihelich <kevin@archlinuxarm.org>`
		`# Contributor: John Sowiak <john@archlinux.org>`
		`# Contributor: tobias <tobias@archlinux.org>`
		`# Contributor: Andreas Grapentin <andreas@grapentin.org>`
		`# Contributor: Márcio Silva <coadde@hyperbola.info>`
		`# Contributor: bill-auger <bill-auger@programmer.net>`
		`+ # Maintainer: Parabola Hackers <dev@lists.parabola.nu>`


		`# parabola changes and rationale:`
		`@@ -11,19 +14,27 @@`
		`# - set OS type string to GNU/Linux-libre`
		`# - pin to tightly-coupled dependency versions`

		`+ # NOTE: This PKGBUILD is kept in-sync, as closely as possible,`
		`+ # with arch{,arm,32}, for the sake of documentation and cleaner diffs.`
		`+ # That also helps to identify which changes were made by Parabola vs upstream.`
		`+ # Therefore, this PKGBUILD may declare blacklisted dependencies, non-free sources,`
		`+ # or include code for anti-features; but those will be filtered-out subsequently.`
		`+ # Any code which implements an anti-feature should be commented-out;`
		`+ # and include an 'anti-feature' comment, for clarity.`
		`+ # Any blacklisted dependencies and non-free sources should be filtered,`
		`+ # and include a 'non-free' comment, for clarity.`
		`+ # Without those over-rides, the resulting program may not be FSDG-fit.`
		`+ # Do not circumvent those over-rides, if compiling for the Parabola repos.`
		`+`

		`pkgname=blender`
		`- pkgver=3.2.0`
		`- pkgrel=4`
		`+ pkgver=3.3.1`
		`+ pkgrel=6`
		`pkgrel+=.parabola1`
		`epoch=17`
		`- _pythonver_x86_64=3.10`
		`- _pythonver_i686=3.10`
		`- _pythonver_armv7h=3.10`
		`- eval "_python_ver=\$_pythonver_${CARCH}"`
		`pkgdesc="A fully integrated 3D graphics creation suite"`
		`arch=('x86_64')`
		`- arch+=('i686' 'armv7h')`
		`+ arch+=('armv7h' 'i686')`
		`license=('GPL')`
		`url="https://www.blender.org"`
		`depends=('libpng' 'libtiff' 'openexr' 'python' 'desktop-file-utils' 'python-requests' 'potrace'`
		`@@ -32,9 +43,9 @@`
		`'openimageio' 'libsndfile' 'jack' 'opencolorio' 'openshadinglanguage' 'openimagedenoise'`
		`'jemalloc' 'libspnav' 'ptex' 'opensubdiv' 'openvdb' 'log4cplus' 'sdl2' 'embree' 'libharu'`
		`'draco')`
		`- [[ "${CARCH}" != 'x86_64' ]] && depends=( ${depends[*]/openimagedenoise/} )`
		`- [[ "${CARCH}" != 'x86_64' ]] && depends=( ${depends[*]/libharu/} )`
		`- [[ "${CARCH}" == 'armv7h' ]] && depends=( ${depends[*]/embree/} )`
		`+ [[ "${CARCH}" != 'x86_64' ]] && depends=( ${depends[*]/openimagedenoise/} ) # unavailable for armv7h and i686`
		`+ [[ "${CARCH}" == 'armv7h' ]] && depends=( ${depends[*]/embree/} ) # unavailable for armv7h`
		`+ [[ "${CARCH}" == 'i686' ]] && depends=( ${depends[*]/jack/pipewire-jack} ) # (arch32) FS32#297: unable to satisfy dependency 'libcelt0.so=2-32' required by jack2`
		`makedepends=('cmake' 'boost' 'mesa' 'git' 'llvm' 'cuda' 'ninja')`
		`makedepends=( ${makedepends[*]/cuda/} ) # non-free`
		`options=(!strip)`
		`@@ -43,10 +54,11 @@`
		`"git+https://git.blender.org/blender-addons-contrib.git"`
		`"git+https://git.blender.org/blender-translations.git"`
		`"git+https://git.blender.org/blender-dev-tools.git"`
		`- https://developer.download.nvidia.com/redist/optix/v7.3/OptiX-7.3.0-Include.zip`
		`+ https://developer.download.nvidia.com/redist/optix/v7.5/OptiX-7.5-Include.zip`
		`force-draco1.patch`
		`force-draco2.patch)`
		`source=( ${source[]/optix*/dummy-source} ) # non-free`
		`+ source_i686=(no-sse2.patch)`
		`sha512sums=('SKIP'`
		`'SKIP'`
		`'SKIP'`
		`@@ -55,35 +67,45 @@`
		`'SKIP' # dummy-source`
		`'e239da4f3906f1b54265435181cf770bae3d269c8d915df9a73861e6ee71ec70bf2339426e7c81a91e5a567273b3b3742d7a99feefd3398d821b26e1ff3a56d0'`
		`'527ab66e5eace777de0043c1ca5787a488f6471450ce67fd6d08137ad0ef56177bc0c17696f30a5fca23fa55d8ca9c3f30cb7b17550dba2dbd8e89ca0b361990')`
		`+ sha512sums_i686=('87da2bedb90af6dee559ef9d1eb83262ba75fb412aba83dcb2b88fe9c0740ff75ad336331033fec7a14ad6ecc3dd70f8f4742f147594e8dc530197dd51922c01')`


		`_version_constraint() # (dep_pkgname [precision])`
		`{`
		`local dep_pkgname=$1`
		`+ local req_precision=$2`
		`local full_version=$(pacman -S --print-format='%v' ${dep_pkgname} \| tail -n 1)`
		`local n_dots=$(tmp=${full_version%-*} ; tmp=${tmp//[^\.]} ; echo "${#tmp}" ;)`
		`local def_precision=$(( n_dots + 1 ))`
		`- local precision=$( [[ "$2" =~ ^[1-${def_precision}]$ ]] && echo $2 \|\| echo ${def_precision} )`
		`+ local is_reqprecision_valid=$( [[ "${req_precision}" =~ ^[1-${def_precision}]$ ]] && echo 1 \|\| echo 0 )`
		`+ local precision=$( (( is_reqprecision_valid )) && echo ${req_precision} \|\| echo ${def_precision} )`
		`local pkgver_rx='[^-\.\ ]+'`
		`local subver_rx='\.'${pkgver_rx}`
		`local pkgrel_rx='[^-\ ]+'`
		`local capture_rx=${pkgver_rx}`
		`- for (( n_dots=1 ; n_dots < precision ; n_dots++ )) ; do capture_rx+=${subver_rx} ; done ;`
		`+ for (( n_dots=1 ; n_dots < precision ; ++n_dots )) ; do capture_rx+=${subver_rx} ; done ;`

		`- if [[ "${full_version}" =~ ^(${capture_rx})(${subver_rx})*-${pkgrel_rx}$ ]]`
		`+ if [[ "${full_version}" =~ ^(${capture_rx})(${subver_rx})*-(${pkgrel_rx})$ ]]`
		`then local version=${BASH_REMATCH[1]}`
		`- local subver_inc=$(( ${version##*.} + 1 ))`
		`- local version_inc=$( [[ "${version}" =~ \. ]] && echo ${version%.*}.${subver_inc} \|\| \`
		`- echo ${subver_inc} )`
		`- local constraint_string="${dep_pkgname}>=${version} ${dep_pkgname}<${version_inc}"`
		`-`
		`- echo "applied version constraint: ${constraint_string}" >&2`
		`- echo -n "${constraint_string}"`
		`+ local pkgrel=${BASH_REMATCH[3]%%.*}`
		`+ local subver_inc=$(( ${version##*.} + 1 )) # right-trims from any non-numeric`
		`+ local pkgrel_inc=$(( pkgrel + 1 ))`
		`+ local version_min=$( (( ! is_reqprecision_valid )) && echo ${full_version%-*}-${pkgrel} \|\| \`
		`+ echo ${version} )`
		`+ local version_max=$( ( (( ! is_reqprecision_valid )) && echo ${full_version%-*}-${pkgrel_inc} ) \|\| \`
		`+ ( [[ "${version}" =~ \. ]] && echo ${version%.*}.${subver_inc} ) \|\| \`
		`+ echo ${subver_inc} )`
		`+ local constraint_string="${dep_pkgname}>=${version_min} ${dep_pkgname}<${version_max}"`
		`+`
		`+ echo "applied version constraint: '${constraint_string}'" >&2`
		`else echo "ERROR: _version_constraint() error parsing: dep_pkgname='${dep_pkgname}' full_version='${full_version}'" >&2`
		`exit 1`
		`fi`
		`+`
		`+ echo -n "${constraint_string}"`
		`}`

		`+`
		`prepare() {`
		`cd "$pkgname"`

		`@@ -92,40 +114,57 @@`
		`git config submodule."release/scripts/addons_contrib".url "${srcdir}/blender-addons-contrib"`
		`git config submodule."release/datafiles/locale".url "${srcdir}/blender-translations"`
		`git config submodule."source/tools".url "${srcdir}/blender-dev-tools"`
		`- git submodule update`
		`+ git -c protocol.file.allow=always submodule update`
		`git submodule foreach git checkout v${pkgver}`

		`+`
		`+ ## technical patching ##`
		`+`
		`patch -p1 -i "$srcdir"/force-draco1.patch`
		`patch -p1 -d release/scripts/addons -i "$srcdir"/force-draco2.patch`

		`+ case "${CARCH}" in`
		`+ armv7h)`
		`+ ;;`
		`+ i686)`
		`+ patch -Np1 -i "$srcdir"/no-sse2.patch`
		`+`
		`+ # FIXME: error: implicit declaration of function ‘atomic_add_and_fetch_uint64’;`
		`+ # did you mean ‘atomic_add_and_fetch_uint32’? [-Werror=implicit-function-declaration]`
		`+ local sed_cmd='s\| atomic_add_and_fetch_uint64(\| atomic_add_and_fetch_uint32(\|'`
		`+ sed -i "${sed_cmd}" source/blender/blenlib/intern/session_uuid.c`
		`+`
		`+ # FIXME: intern/cycles/kernel/../util/transform_inverse.h:15:9: error: ‘ssef’ does not name a type`
		`+ # -- SSE2 SIMD instructions enabled`
		`+ sed -i 's\|if(NOT DEFINED SUPPORT_SSE2_BUILD\|& AND FALSE\|' build_files/cmake/macros.cmake`
		`+ # the above change corrects 'SSE2 SIMD instructions enabled'; but the original 'ssef' error persists`
		`+ sed -i 's\|# set(COMPILER_SSE2_FLAG)\| unset(COMPILER_SSE2_FLAG)\|' CMakeLists.txt`
		`+ ;;`
		`+ x86_64)`
		`+ ;;`
		`+ esac`
		`+`

		`- ## parabola patching ##`
		`+ ## libre patching ##`

		`# set OS type string`
		`sed -i 's\|BUILD_PLATFORM;\|"GNU/Linux-libre";\|' 'source/creator/buildinfo.c'`
		`-`
		`- # FIXME: error: implicit declaration of function ‘atomic_add_and_fetch_uint64’;`
		`- # did you mean ‘atomic_add_and_fetch_uint32’? [-Werror=implicit-function-declaration]`
		`- if [[ "${CARCH}" == 'armv7h' ]] \|\| [[ "${CARCH}" == 'i686' ]]`
		`- then local sed_cmd='s\| atomic_add_and_fetch_uint64(\| atomic_add_and_fetch_uint32(\|'`
		`- sed -i "${sed_cmd}" source/blender/blenlib/intern/session_uuid.c`
		`- fi`
		`}`

		`build() {`
		`cd "$pkgname"`

		`- local PYTHON_VER=${_python_ver}`
		`+ local PYTHON_VER=3.10`
		`+ case "${CARCH}" in armv7h) PYTHON_VER=3.10 ;; i686) PYTHON_VER=3.10 ;; esac`

		`- # libre options`
		`+ # libre configuration`
		`local _parabola_opts=( -DWITH_CYCLES_CUDA_BINARIES=OFF \`
		`-DWITH_CYCLES_DEVICE_CUDA=OFF \`
		`-DWITH_CYCLES_DEVICE_OPTIX=OFF )`
		`- # arch-specific options`
		`+ # arch-specific configuration`
		`case "${CARCH}" in`
		`- 'i686' ) _parabola_opts+=( -DWITH_RAYOPTIMIZATION=OFF \`
		`- -DWITH_CYCLES_EMBREE=ON ) ;;`
		`- 'x86_64') _parabola_opts+=( -DWITH_CYCLES_EMBREE=ON ) ;;`
		`+ 'armv7h') _parabola_opts+=( -DWITH_CYCLES_EMBREE=OFF ) ;;`
		`+ 'i686' ) _parabola_opts+=( -DWITH_RAYOPTIMIZATION=OFF ) ;;`
		`esac`

		`cmake \`
		`@@ -142,7 +181,7 @@`
		`-DPYTHON_LIBRARY=python$PYTHON_VER \`
		`-DPYTHON_INCLUDE_DIRS=/usr/include/python$PYTHON_VER \`
		`-DCMAKE_CXX_FLAGS="-I /usr/include/python$PYTHON_VER"`
		`- ninja -C build`
		`+ cmake --build build`
		`}`

		`package() {`
		`@@ -162,7 +201,7 @@`
		`$(_version_constraint openvdb 2) # eg: libopenvdb.so.6.2`
		`$(_version_constraint python 2) ) # eg: libpython3.6.so.1.0`

		`- DESTDIR="${pkgdir}" ninja -C build install`
		`+ DESTDIR="${pkgdir}" cmake --install build`
		`install -Dm755 release/bin/blender-softwaregl "${pkgdir}/usr/bin/blender-softwaregl"`
		`python -m compileall "${pkgdir}/usr/share/blender"`
		`python -O -m compileall "${pkgdir}/usr/share/blender"`

libre/blender/no-sse2.patch

file added

+12

		`@@ -0,0 +1,12 @@`
		`+ diff -rauN blender-vanilla/CMakeLists.txt blender-no-sse2-patch/CMakeLists.txt`
		`+ --- blender-vanilla/CMakeLists.txt 2022-04-07 16:36:48.842414275 +0200`
		`+ +++ blender-no-sse2-patch/CMakeLists.txt 2022-04-07 16:37:12.012470531 +0200`
		`+ @@ -981,7 +981,7 @@`
		`+ # Test SIMD support, before platform includes to determine if sse2neon is needed.`
		`+ if(WITH_CPU_SIMD)`
		`+ set(COMPILER_SSE_FLAG)`
		`+ - set(COMPILER_SSE2_FLAG)`
		`+ +# set(COMPILER_SSE2_FLAG)`
		`+`
		`+ # Test Neon first since macOS Arm can compile and run x86-64 SSE binaries.`
		`+ TEST_NEON_SUPPORT()`

libre/cbootimage/PKGBUILD

file modified

+1 -1

		`@@ -1,5 +1,5 @@`
		`# Maintainer: Andreas Grapentin <andreas@grapentin.org>`
		`- # Maintainer (AUR): lks <lukas dot graetz at web dot de>`
		`+ # Maintainer (aur): lks <lukas dot graetz at web dot de>`

		`pkgname=cbootimage`
		`pkgver=1.7`

libre/cdrkit/PKGBUILD

file modified

+2 -2

		`@@ -1,6 +1,6 @@`
		`# Ma# $Id: PKGBUILD 186761 2013-05-31 04:50:41Z allan $`
		`- # Maintainer (Arch): Andrea Scarpino <andrea@archlinux.org>`
		`- # Contributor (Arch): Alexander Fehr <pizzapunk gmail com>`
		`+ # Maintainer (arch): Andrea Scarpino <andrea@archlinux.org>`
		`+ # Contributor: Alexander Fehr <pizzapunk gmail com>`

		`pkgname=cdrkit`
		`_pkgname=$pkgname-libre`

libre/clamav/PKGBUILD

file modified

+6 -6

		`@@ -1,9 +1,9 @@`
		`- # Maintainer (Arch): Levente Polyak <anthraxx[at]archlinux[dot]org>`
		`- # Maintainer (Arch): Giancarlo Razzolini <grazzolini@archlinux.org>`
		`- # Contributor (Arch): Dale Blount <dale@archlinux.org>`
		`- # Contributor (Arch): Gregor Ibic <gregor.ibic@intelicom.si>`
		`- # Contributor (Arch): Gaetan Bisson <bisson@archlinux.org>`
		`- # Contributor (Hyperbola): André Silva <emulatorman@hyperbola.info>`
		`+ # Maintainer (arch): Levente Polyak <anthraxx[at]archlinux[dot]org>`
		`+ # Maintainer (arch): Giancarlo Razzolini <grazzolini@archlinux.org>`
		`+ # Contributor: Dale Blount <dale@archlinux.org>`
		`+ # Contributor: Gregor Ibic <gregor.ibic@intelicom.si>`
		`+ # Contributor: Gaetan Bisson <bisson@archlinux.org>`
		`+ # Contributor: André Silva <emulatorman@hyperbola.info>`
		`# Maintainer: Omar Vega Ramos <ovruni@gnu.org.pe>`
		`# Contributor: Isaac David <isacdaavid@at@isacdaavid@dot@info>`
		`# Contributor: Andreas Grapentin <andreas@grapentin.org>`

libre/cool-retro-term/PKGBUILD

file modified

+4 -4

		`@@ -1,7 +1,7 @@`
		`- # Maintainer (Arch): Sven-Hendrik Haase <sh@lutzhaase.com>`
		`- # Contributor (Arch): Doug Newgard <scimmia at archlinux dot info>`
		`- # Contributor (Arch): Andrey Mivrenik <gim at fastmail dot fm>`
		`- # Contributor (Arch): Glen Oakley <goakley123@gmail.com>`
		`+ # Maintainer (arch): Sven-Hendrik Haase <sh@lutzhaase.com>`
		`+ # Contributor: Doug Newgard <scimmia at archlinux dot info>`
		`+ # Contributor: Andrey Mivrenik <gim at fastmail dot fm>`
		`+ # Contributor: Glen Oakley <goakley123@gmail.com>`
		`# Maintainer: André Silva <emulatorman@hyperbola.info>`

		`pkgname=cool-retro-term`

libre/cowsay/PKGBUILD

file modified

+3 -3

		`@@ -1,7 +1,7 @@`
		`# $Id$`
		`- # Maintainer (Arch): Guillaume ALAUX <guillaume@archlinux.org>`
		`- # Contributor (Arch): Eric Belanger <eric@archlinux.org>`
		`- # Contributor (Arch): Sarah Hay <sarahhay@mb.sympatico.ca>`
		`+ # Maintainer (arch): Guillaume ALAUX <guillaume@archlinux.org>`
		`+ # Contributor: Eric Belanger <eric@archlinux.org>`
		`+ # Contributor: Sarah Hay <sarahhay@mb.sympatico.ca>`
		`# Maintainer: Omar Vega Ramos <ovruni@gnu.org.pe>`

		`pkgname=cowsay`

libre/cuneiform/PKGBUILD

file modified

+4 -4

		`@@ -1,8 +1,8 @@`
		`# $Id: PKGBUILD 200098 2016-12-18 10:27:54Z arojas $`
		`- # Maintainer (Arch): Balló György <ballogyor+arch at gmail dot com>`
		`- # Contributor (Arch): Sergej Pupykin <pupykin.s+arch@gmail.com>`
		`- # Contributor (Arch): Maxim Vuets <maxim.vuets@gmail.com>`
		`- # Maintainer (Hyperbola): André Silva <emulatorman@hyperbola.info>`
		`+ # Maintainer (arch): Balló György <ballogyor+arch at gmail dot com>`
		`+ # Contributor: Sergej Pupykin <pupykin.s+arch@gmail.com>`
		`+ # Contributor: Maxim Vuets <maxim.vuets@gmail.com>`
		`+ # Contributor: André Silva <emulatorman@hyperbola.info>`
		`# Maintainer: Omar Vega Ramos <ovruni@gnu.org.pe>`

		`pkgname=cuneiform`

libre/cups-filters/PKGBUILD

file modified

+53 -10

		`@@ -10,28 +10,66 @@`


		`pkgname=cups-filters`
		`- pkgver=1.28.10`
		`- pkgrel=1`
		`+ pkgver=1.28.16`
		`+ pkgrel=2`
		`pkgrel+=.parabola1`
		`pkgdesc="OpenPrinting CUPS Filters"`
		`- pkgdesc+=", without foomatic-db-nonfree recommendation"`
		`arch=('x86_64')`
		`arch+=('armv7h' 'i686')`
		`url="https://wiki.linuxfoundation.org/openprinting/cups-filters"`
		`license=('custom')`
		`- depends=('lcms2' 'poppler' 'qpdf' 'imagemagick' 'liblouis' 'ijs' 'libcups>=2.2.6-2' 'systemd')`
		`+ depends=('lcms2' 'poppler' 'qpdf' 'ijs' 'libcups>=2.2.6-2' 'systemd' 'libexif')`
		`depends=( ${depends[@]/systemd/udev} )`
		`- depends+=(libpoppler.so libpoppler-cpp.so)`
		`- makedepends=('ghostscript' 'ttf-dejavu' 'python' 'mupdf-tools') # ttf-dejavu for make check`
		`+ makedepends=('ghostscript' 'python' 'mupdf-tools' 'liblouis')`
		`makedepends_i686=('pkgconf')`
		`optdepends=('ghostscript: for non-PostScript printers to print with CUPS to convert PostScript to raster images'`
		`'foomatic-db: drivers use Ghostscript to convert PostScript to a printable form directly'`
		`'foomatic-db-engine: drivers use Ghostscript to convert PostScript to a printable form directly'`
		`- 'antiword: to convert MS Word documents'`
		`- 'docx2txt: to convert Microsoft OOXML text from DOCX files')`
		`+ 'imagemagick: for Braille embosser support'`
		`+ 'liblouis: for Braille embosser support'`
		`+ 'antiword: to convert MS Word documents for Braille embosser support'`
		`+ 'docx2txt: to convert Microsoft OOXML text from DOCX files for Braille embosser support')`
		`backup=(etc/cups/cups-browsed.conf)`
		`source=(https://www.openprinting.org/download/cups-filters/$pkgname-$pkgver.tar.xz)`
		`- sha256sums=('cf8c904694c44cf689b5724e46d23da9ae5125d54374b340c642077cc29ca837')`
		`+ sha256sums=('3a400bfa751da2020775cd7d48d1647448551ff051f9345abc1df6357b199ac0')`
		`+`
		`+ _SHOULD_SKIP_CHECK=0 # check() requires networking`
		`+`
		`+`
		`+ _version_constraint() # (dep_pkgname [precision])`
		`+ {`
		`+ local dep_pkgname=$1`
		`+ local req_precision=$2`
		`+ local full_version=$(pacman -S --print-format='%v' ${dep_pkgname} \| tail -n 1)`
		`+ local n_dots=$(tmp=${full_version%-*} ; tmp=${tmp//[^\.]} ; echo "${#tmp}" ;)`
		`+ local def_precision=$(( n_dots + 1 ))`
		`+ local is_reqprecision_valid=$( [[ "${req_precision}" =~ ^[1-${def_precision}]$ ]] && echo 1 \|\| echo 0 )`
		`+ local precision=$( (( is_reqprecision_valid )) && echo ${req_precision} \|\| echo ${def_precision} )`
		`+ local pkgver_rx='[^-\.\ ]+'`
		`+ local subver_rx='\.'${pkgver_rx}`
		`+ local pkgrel_rx='[^-\ ]+'`
		`+ local capture_rx=${pkgver_rx}`
		`+ for (( n_dots=1 ; n_dots < precision ; ++n_dots )) ; do capture_rx+=${subver_rx} ; done ;`
		`+`
		`+ if [[ "${full_version}" =~ ^(${capture_rx})(${subver_rx})*-(${pkgrel_rx})$ ]]`
		`+ then local version=${BASH_REMATCH[1]}`
		`+ local pkgrel=${BASH_REMATCH[3]%%.*}`
		`+ local subver_inc=$(( ${version##*.} + 1 )) # right-trims from any non-numeric`
		`+ local pkgrel_inc=$(( pkgrel + 1 ))`
		`+ local version_min=$( (( ! is_reqprecision_valid )) && echo ${full_version%-*}-${pkgrel} \|\| \`
		`+ echo ${version} )`
		`+ local version_max=$( ( (( ! is_reqprecision_valid )) && echo ${full_version%-*}-${pkgrel_inc} ) \|\| \`
		`+ ( [[ "${version}" =~ \. ]] && echo ${version%.*}.${subver_inc} ) \|\| \`
		`+ echo ${subver_inc} )`
		`+ local constraint_string="${dep_pkgname}>=${version_min} ${dep_pkgname}<${version_max}"`
		`+`
		`+ echo "applied version constraint: '${constraint_string}'" >&2`
		`+ else echo "ERROR: _version_constraint() error parsing: dep_pkgname='${dep_pkgname}' full_version='${full_version}'" >&2`
		`+ exit 1`
		`+ fi`
		`+`
		`+ echo -n "${constraint_string}"`
		`+ }`

		`build() {`
		`cd "$pkgname"-$pkgver`
		`@@ -42,18 +80,23 @@`
		`--with-rcdir=no \`
		`--enable-avahi \`
		`--with-browseremoteprotocols=DNSSD,CUPS \`
		`- --enable-auto-setup-driverless \`
		`--with-test-font-path=/usr/share/fonts/TTF/DejaVuSans.ttf`
		`sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool`
		`make`
		`}`

		`check() {`
		`+ (( _SHOULD_SKIP_CHECK )) && return \|\| :`
		`+`
		`cd "$pkgname"-$pkgver`
		`make check`
		`}`

		`package() {`
		`+ # pin to strongly-coupled dependency versions`
		`+ depends=( ${depends[*]/qpdf/} $(_version_constraint qpdf 1) )`
		`+ depends+=( libpoppler.so libpoppler-cpp.so )`
		`+`
		`cd "$pkgname"-$pkgver`
		`make DESTDIR="$pkgdir/" install`

libre/debootstrap/PKGBUILD

file modified

+1 -1

		`@@ -1,4 +1,4 @@`
		`- # Maintainer (Arch): Felix Yan <felixonmars@archlinux.org>`
		`+ # Maintainer (arch): Felix Yan <felixonmars@archlinux.org>`
		`# Maintainer: Omar Vega Ramos <ovruni@gnu.org.pe>`
		`# Contributor: Andreas Grapentin <andreas@grapentin.org>`
		`# Contributor: Denis 'GNUtoo' Carikli <GNUtoo@cyberdimension.org>`

libre/deepin-anything-module/PKGBUILD

file modified

+1 -1

		`@@ -1,4 +1,4 @@`
		`- # Maintainer (Arch): Felix Yan <felixonmars@archlinux.org>`
		`+ # Maintainer (arch): Felix Yan <felixonmars@archlinux.org>`
		`# Contributor: Andreas Grapentin <andreas@grapentin.org>`

		`_basekernel=5.4.12-1`

libre/digikam/PKGBUILD

file removed

-66

		`@@ -1,66 +0,0 @@`
		`- # $Id$`
		`- # Maintainer (Arch): Ronald van Haren <ronald@archlinux.org>`
		`- # Maintainer (Arch): Antonio Rojas <arojas@archlinux.org>`
		`- # Contributor (Arch): Andrea Scarpino <andrea@archlinux.org>`
		`- # Contributor (Arch): Tobias Powalowski <tpowa@archlinux.org>`
		`- # Contributor: André Silva <emulatorman@hyperbola.info>`
		`- # Contributor: Márcio Silva <coadde@hyperbola.info>`
		`- # Contributor: jc_gargma <jc_gargma@iserlohn-fortress.net>`
		`-`
		`- pkgbase=digikam`
		`- pkgname=(kipi-plugins)`
		`- _pkgver=5.9.0`
		`- pkgver=${_pkgver//-/_} # for beta versions`
		`- pkgrel=1`
		`- pkgrel+=.parabola1`
		`- pkgdesc="An advanced digital photo management application"`
		`- arch=(x86_64)`
		`- arch+=(i686 armv7h)`
		`- license=(GPL)`
		`- url="http://www.digikam.org/"`
		`- makedepends=(extra-cmake-modules libkipi libksane liblqr opencv doxygen lensfun eigen boost kdoctools marble-common`
		`- kfilemetadata akonadi-contacts qtav threadweaver kcalcore knotifyconfig libmediawiki libkvkontakte glu)`
		`- source=("http://download.kde.org/stable/${pkgbase}/${pkgbase}-${_pkgver}.tar.xz")`
		`- source+=("libre.patch")`
		`- sha256sums=('660d32eedcfd6fe1a75170a651fab068ae62f7f092ae710771a2f32a1c550d1b'`
		`- '80fbe434d326551f3dc029c5db3ad1b50e87870b03185467aa25a5c03764cc89')`
		`-`
		`- prepare() {`
		`- mkdir -p build`
		`-`
		`- # fix freedom issues`
		`- cd $pkgbase-$_pkgver`
		`- patch -Np1 -i "$srcdir"/libre.patch`
		`- }`
		`-`
		`- build() {`
		`- cd build`
		`-`
		`- cmake ../$pkgbase-${_pkgver} \`
		`- -DCMAKE_INSTALL_PREFIX=/usr \`
		`- -DCMAKE_INSTALL_LIBDIR=lib \`
		`- -DBUILD_TESTING=OFF \`
		`- -DENABLE_KFILEMETADATASUPPORT=ON \`
		`- -DENABLE_MEDIAPLAYER=ON \`
		`- -DENABLE_AKONADICONTACTSUPPORT=ON \`
		`- -DENABLE_MYSQLSUPPORT=ON \`
		`- -DENABLE_OPENCV3=ON \`
		`- -DENABLE_APPSTYLES=ON`
		`- make`
		`- }`
		`-`
		`- package_kipi-plugins() {`
		`- pkgdesc="A collection of plugins extending the KDE graphics and image applications as digiKam"`
		`- pkgdesc+=", without nonfree suggestions"`
		`- depends=(kio libkipi)`
		`- optdepends=('libmediawiki: MediaWiki Export plugin'`
		`- 'libkvkontakte: VKontakte.ru Exporter plugin')`
		`-`
		`- cd build/extra`
		`- make DESTDIR="$pkgdir" install`
		`- cd $srcdir/build/po`
		`- make DESTDIR="$pkgdir" install`
		`-`
		`- # Provided by digikam`
		`- rm "$pkgdir"/usr/share/locale/*/LC_MESSAGES/digikam.mo`
		`- }`

libre/digikam/libre.patch

file removed

-58

		`@@ -1,58 +0,0 @@`
		`- diff --git a/extra/kipi-plugins/sendimages/emailsettings.h b/extra/kipi-plugins/sendimages/emailsettings.h`
		`- index 0f58cc4..b497299 100644`
		`- --- a/extra/kipi-plugins/sendimages/emailsettings.h`
		`- +++ b/extra/kipi-plugins/sendimages/emailsettings.h`
		`- @@ -64,10 +64,9 @@ public:`
		`- CLAWSMAIL,`
		`- EVOLUTION,`
		`- KMAIL,`
		`- - NETSCAPE,`
		`- SYLPHEED,`
		`- SYLPHEEDCLAWS,`
		`- - THUNDERBIRD`
		`- + ICEDOVE`
		`- };`
		`-`
		`- enum ImageSize`
		`- diff --git a/extra/kipi-plugins/sendimages/sendimages.cpp b/extra/kipi-plugins/sendimages/sendimages.cpp`
		`- index 1be65d6..68094de 100644`
		`- --- a/extra/kipi-plugins/sendimages/sendimages.cpp`
		`- +++ b/extra/kipi-plugins/sendimages/sendimages.cpp`
		`- @@ -589,18 +589,13 @@ bool SendImages::invokeMailAgent()`
		`- // More info about command lines options with Mozilla & co:`
		`- // http://www.mozilla.org/docs/command-line-args.html#Syntax_Rules`
		`-`
		`- - case EmailSettings::NETSCAPE:`
		`- - case EmailSettings::THUNDERBIRD:`
		`- + case EmailSettings::ICEDOVE:`
		`- {`
		`- QString prog;`
		`-`
		`- - if (d->settings.emailProgram == EmailSettings::NETSCAPE)`
		`- + if (d->settings.emailProgram == EmailSettings::ICEDOVE)`
		`- {`
		`- - prog = QLatin1String("netscape");`
		`- - }`
		`- - else`
		`- - {`
		`- - prog = QLatin1String("thunderbird");`
		`- + prog = QLatin1String("icedove");`
		`- }`
		`-`
		`- QStringList args;`
		`- diff --git a/extra/kipi-plugins/sendimages/settingswidget.cpp b/extra/kipi-plugins/sendimages/settingswidget.cpp`
		`- index b8416a4..f160310 100644`
		`- --- a/extra/kipi-plugins/sendimages/settingswidget.cpp`
		`- +++ b/extra/kipi-plugins/sendimages/settingswidget.cpp`
		`- @@ -97,10 +97,9 @@ SettingsWidget::SettingsWidget(QWidget* const parent)`
		`- d->mailAgentName->insertItem(EmailSettings::CLAWSMAIL, QLatin1String("Claws Mail"));`
		`- d->mailAgentName->insertItem(EmailSettings::EVOLUTION, QLatin1String("Evolution"));`
		`- d->mailAgentName->insertItem(EmailSettings::KMAIL, QLatin1String("KMail"));`
		`- - d->mailAgentName->insertItem(EmailSettings::NETSCAPE, QLatin1String("Netscape"));`
		`- d->mailAgentName->insertItem(EmailSettings::SYLPHEED, QLatin1String("Sylpheed"));`
		`- d->mailAgentName->insertItem(EmailSettings::SYLPHEEDCLAWS, QLatin1String("Sylpheed-Claws"));`
		`- - d->mailAgentName->insertItem(EmailSettings::THUNDERBIRD, QLatin1String("Thunderbird"));`
		`- + d->mailAgentName->insertItem(EmailSettings::ICEDOVE, QLatin1String("Icedove"));`
		`- #endif`
		`- d->mailAgentName->setCurrentIndex(EmailSettings::DEFAULT);`
		`- d->mailAgentName->setWhatsThis(i18n("Select your preferred external email program here. "`

libre/distcc-nozeroconf/PKGBUILD

file modified

+3 -3

		`@@ -1,8 +1,8 @@`
		`# $Id$`
		`# Maintainer: Luke Shumaker <lukeshu@sbcglobal.net>`
		`- # Maintainer (Arch): Sergej Pupykin <pupykin.s+arch@gmail.com>`
		`- # Maintainer (Arch): Judd Vinet <jvinet@zeroflux.org>`
		`- # Contributor (Arch): Giovanni Scafora <giovanni@archlinux.org>`
		`+ # Maintainer (arch): Sergej Pupykin <pupykin.s+arch@gmail.com>`
		`+ # Maintainer (arch): Judd Vinet <jvinet@zeroflux.org>`
		`+ # Contributor: Giovanni Scafora <giovanni@archlinux.org>`

		`_pkgname=distcc`
		`pkgname=distcc-nozeroconf`

libre/django1.8/PKGBUILD

file modified

+2 -2

		`@@ -1,6 +1,6 @@`
		`# Maintainer: Luke Shumaker <lukeshu@lukeshu.com>`
		`- # Maintainer (Arch:django): Dan McGee <dan@archlinux.org>`
		`- # Contributor (Arch:django): Shahar Weiss <sweiss4@gmx.net>`
		`+ # Maintainer (arch:django): Dan McGee <dan@archlinux.org>`
		`+ # Contributor: Shahar Weiss <sweiss4@gmx.net>`

		`# Rational for inclusion in [libre]:`
		`# - Used by libre/parabolaweb-utils`

libre/doublecmd/PKGBUILD

file modified

+2 -2

		`@@ -1,6 +1,6 @@`
		`# vim:set ft=sh:`
		`- # Maintainer (Arch): BlackIkeEagle <ike DOT devolder AT gmail DOT com>`
		`- # Contributor (Arch): (sirocco AT ngs.ru)`
		`+ # Maintainer (arch): BlackIkeEagle <ike DOT devolder AT gmail DOT com>`
		`+ # Contributor: (sirocco AT ngs.ru)`
		`# Contributor: André Silva <emulatorman@hyperbola.info>`

		`# parabola changes and rationale:`

libre/ecasound/PKGBUILD

file modified

+5 -5

		`@@ -1,8 +1,8 @@`
		`- # Maintainer (Arch): David Runge <dave@archlinux.org>`
		`- # Contributor (Arch): Ray Rashif <schiv@archlinux.org>`
		`- # Contributor (Arch): Eric Belanger <eric@archlinux.org>`
		`- # Contributor (Arch): Tom Newsom <Jeepster@gmx.co.uk>`
		`- # Maintainer (Hyperbola): André Silva <emulatorman@hyperbola.info>`
		`+ # Maintainer (arch): David Runge <dave@archlinux.org>`
		`+ # Contributor: Ray Rashif <schiv@archlinux.org>`
		`+ # Contributor: Eric Belanger <eric@archlinux.org>`
		`+ # Contributor: Tom Newsom <Jeepster@gmx.co.uk>`
		`+ # Contributor: André Silva <emulatorman@hyperbola.info>`
		`# Maintainer: Omar Vega Ramos <ovruni@gnu.org.pe>`

		`pkgname=ecasound`

libre/engrampa/PKGBUILD

file modified

+3 -3

		`@@ -1,6 +1,6 @@`
		`- # Maintainer (Arch): Brad Fanella <cesura@archlinux.org>`
		`- # Contributor (Arch): Martin Wimpress <code@flexion.org>`
		`- # Maintainer (Hyperbola): André Silva <emulatorman@hyperbola.info>`
		`+ # Maintainer (arch): Brad Fanella <cesura@archlinux.org>`
		`+ # Contributor: Martin Wimpress <code@flexion.org>`
		`+ # Contributor: André Silva <emulatorman@hyperbola.info>`
		`# Maintainer: Omar Vega Ramos <ovruni@gnu.org.pe>`

		`pkgname=engrampa`

libre/epdfview/PKGBUILD

file modified

+6 -6

		`@@ -1,9 +1,9 @@`
		`- # Maintainer (Arch): Kyle Keen <keenerd@gmail.com>`
		`- # Contributor (Arch): Bartłomiej Piotrowski <bpiotrowski@archlinux.org>`
		`- # Contributor (Arch): schuay <jakob.gruber@gmail.com>`
		`- # Contributor (Arch): Tom K <tomk@runbox.com>`
		`- # Contributor (Arch): Thayer Williams <thayer@archlinux.org>`
		`- # Maintainer (Hyperbola): Márcio Silva <coadde@hyperbola.info>`
		`+ # Maintainer (arch): Kyle Keen <keenerd@gmail.com>`
		`+ # Contributor: Bartłomiej Piotrowski <bpiotrowski@archlinux.org>`
		`+ # Contributor: schuay <jakob.gruber@gmail.com>`
		`+ # Contributor: Tom K <tomk@runbox.com>`
		`+ # Contributor: Thayer Williams <thayer@archlinux.org>`
		`+ # Contributor: Márcio Silva <coadde@hyperbola.info>`
		`# Maintainer: Omar Vega Ramos <ovruni@gnu.org.pe>`
		`# Contributor: Michał Masłowski <mtjm@mtjm.eu>`

libre/epiphany/PKGBUILD

file modified

+13 -9

		`@@ -14,8 +14,8 @@`
		`# - pin to sodeps`

		`pkgname=epiphany`
		`- pkgver=41.3`
		`- pkgrel=1`
		`+ pkgver=42.3`
		`+ pkgrel=3`
		`pkgrel+=.parabola1`
		`pkgdesc="A GNOME web browser based on the WebKit rendering engine"`
		`pkgdesc+=", with DuckDuckGo-HTML search"`
		`@@ -24,23 +24,23 @@`
		`arch+=(i686 armv7h)`
		`license=(GPL)`
		`depends=(webkit2gtk-4.1 gcr icu libdazzle libhandy libarchive)`
		`+ # we don't have libportal-gtk3 yet on i686`
		`+ depends_armv7h+=(libportal-gtk3)`
		`+ depends_x86_64+=(libportal-gtk3)`
		`depends=( $( sed 's\| icu \| \|' <<<${depends[@]} ) )`
		`depends+=(libhogweed.so)`
		`makedepends=(docbook-xml startup-notification lsb-release gobject-introspection`
		`yelp-tools git meson)`
		`- makedepends=( ${makedepends[*]/meson/meson<0.61.0} ) # FIXME: FTBS with meson 0.61.x`
		`- # "epiphany/data/meson.build:18:0: ERROR: Function does not take positional arguments."`
		`- # possibly related: https://cgit.freebsd.org/ports/commit/?id=299348602e6d75b6f85b2e7303a0bea5f37541b6`
		`checkdepends=(xorg-server-xvfb aspell hspell hunspell nuspell libvoikko)`
		`groups=(gnome)`
		`- _commit=ce3713dfd4f69275c2c46a6687c24deb8b8aa367 # tags/41.3^0`
		`+ _commit=6cdf86702e747867b2f4b338429733f84f554f80 # tags/42.3^0`
		`source=("git+https://gitlab.gnome.org/GNOME/epiphany.git#commit=$_commit")`
		`source+=(libre.patch)`
		`sha256sums=('SKIP')`
		`- sha256sums+=('2ef991ade98fbe9a3a6cd80220d3348e69007abff5141bea42bbdf1c72836689')`
		`+ sha256sums+=('bf1dd1692ec9f94f8fc669a5ee71dd811d6083465dbb197e3fcc64e2aaf2f709')`

		`# check() requires networking`
		`- _run_check=1`
		`+ _run_check=0`


		`pkgver() {`
		`@@ -56,7 +56,11 @@`
		`}`

		`build() {`
		`- arch-meson $pkgname build -D soup2=disabled -D libportal=disabled`
		`+ if [ "${CARCH}" != "i686" ] ; then`
		`+ arch-meson $pkgname build -D soup2=disabled`
		`+ else`
		`+ arch-meson $pkgname build -D soup2=disabled -D libportal=disabled`
		`+ fi`
		`meson compile -C build`
		`}`

libre/epiphany/libre.patch

file modified

+38 -21

		`@@ -1,24 +1,41 @@`
		`- --- epiphany.orig/data/org.gnome.epiphany.gschema.xml 2019-04-27 00:17:50.060428000 -0500`
		`- +++ epiphany/data/org.gnome.epiphany.gschema.xml 2019-04-27 00:17:50.360428000 -0500`
		`- @@ -26,9 +26,7 @@`
		`+ From f5240f67aa9f00277570b3b28b726311c32d7843 Mon Sep 17 00:00:00 2001`
		`+ From: =?UTF-8?q?Iv=C3=A1n=20=C3=81valos?= <avalos@disroot.org>`
		`+ Date: Sun, 24 Jul 2022 02:07:05 -0500`
		`+ Subject: [PATCH] libre`
		`+`
		`+ ---`
		`+ data/org.gnome.epiphany.gschema.xml \| 4 +---`
		`+ lib/ephy-search-engine-manager.h \| 2 +-`
		`+ 2 files changed, 2 insertions(+), 4 deletions(-)`
		`+`
		`+ diff --git a/data/org.gnome.epiphany.gschema.xml b/data/org.gnome.epiphany.gschema.xml`
		`+ index 7fcac67b3..6f1444167 100644`
		`+ --- a/data/org.gnome.epiphany.gschema.xml`
		`+ +++ b/data/org.gnome.epiphany.gschema.xml`
		`+ @@ -53,9 +53,7 @@`
		`<default l10n="messages">`
		`- <!-- TRANSLATORS: These are the prepopulated search engines. You should`
		`- add country-specific URL query parameters if appropriate. -->`
		`- - [('DuckDuckGo', 'https://duckduckgo.com/?q=%s&t=epiphany', '!ddg'),`
		`- - ('Google', 'https://www.google.com/search?q=%s', '!g'),`
		`- - ('Bing', 'https://www.bing.com/search?q=%s', '!b')]`
		`- + [('DuckDuckGo', 'https://duckduckgo.com/html/?q=%s&t=epiphany', '!ddg')]`
		`- </default>`
		`- <summary>Default search engines.</summary>`
		`- <description>List of the default search engines. It is an array in which each search engine is described by a name, an address, and a bang (shortcut).</description>`
		`- --- epiphany.orig/lib/ephy-search-engine-manager.c 2019-04-27 00:17:49.860428000 -0500`
		`- +++ epiphany/lib/ephy-search-engine-manager.c 2019-04-27 00:55:14.840404975 -0500`
		`- @@ -27,7 +27,7 @@`
		`- #include "ephy-settings.h"`
		`- #include "ephy-prefs.h"`
		`+ <![CDATA[`
		`+ [`
		`+ - {'name': <'DuckDuckGo'>, 'url': <'https://duckduckgo.com/?q=%s&t=epiphany'>, 'bang': <'!ddg'>},`
		`+ - {'name': <'Google'>, 'url': <'https://www.google.com/search?q=%s'>, 'bang': <'!g'>},`
		`+ - {'name': <'Bing'>, 'url': <'https://www.bing.com/search?q=%s'>, 'bang': <'!b'>}`
		`+ + {'name': <'DuckDuckGo'>, 'url': <'https://duckduckgo.com/html/?q=%s&t=epiphany'>, 'bang': <'!ddg'>}`
		`+ ]`
		`+ ]]></default>`
		`+ <summary>List of the search engines.</summary>`
		`+ diff --git a/lib/ephy-search-engine-manager.h b/lib/ephy-search-engine-manager.h`
		`+ index c1939d31f..d29bb78c2 100644`
		`+ --- a/lib/ephy-search-engine-manager.h`
		`+ +++ b/lib/ephy-search-engine-manager.h`
		`+ @@ -32,7 +32,7 @@ G_BEGIN_DECLS`
		`+ * the version used in your country. For example for the french version :`
		`+ * replace the ".com" with ".fr" : "https://duckduckgo.fr/?q=%s&t=epiphany"`
		`+ */`
		`+ -#define EPHY_SEARCH_ENGINE_DEFAULT_ADDRESS _("https://duckduckgo.com/?q=%s&t=epiphany")`
		`+ +#define EPHY_SEARCH_ENGINE_DEFAULT_ADDRESS _("https://duckduckgo.com/html/?q=%s&t=epiphany")`

		`- -#define FALLBACK_ADDRESS "https://duckduckgo.com/?q=%s&t=epiphany"`
		`- +#define FALLBACK_ADDRESS "https://duckduckgo.com/html/?q=%s&t=epiphany"`
		`+ #define EPHY_TYPE_SEARCH_ENGINE_MANAGER (ephy_search_engine_manager_get_type ())`

		`- enum {`
		`- SEARCH_ENGINES_CHANGED,`
		`+ --`
		`+ 2.37.1`
		`+`

libre/faenza-icon-theme/PKGBUILD

file removed

-88

		`@@ -1,88 +0,0 @@`
		`- # Maintainer (Arch): Daniel Micay <danielmicay@gmail.com>`
		`- # Contributor (Arch): Elia Notarangelo <elia.notarangelo AT gmail DOT com>`
		`- # Contributor (Arch): Frikilinux <frikilinux at frikilinux.com.ar>`
		`- # Contributor (Arch): graysky <graysky AT archlinux DOT us>`
		`- # Contributor (Arch): Samsagax <samsagax AT gmail DOT com>`
		`- # Contributor (Arch): simongmzlj <simongmzlj AT gmail DOT com>`
		`- # Maintainer: André Silva <emulatorman@hyperbola.info>`
		`- # Contributor: Jorge Araya Navarro <elcorreo@deshackra.com>`
		`- # Contributor: Márcio Silva <coadde@hyperbola.info>`
		`-`
		`- pkgname=faenza-icon-theme`
		`- pkgver=1.3.1`
		`- pkgrel=5`
		`- pkgrel+=.par1`
		`- pkgdesc='Icon theme designed for Equinox GTK theme'`
		`- pkgdesc+=', without nonfree distros and application icons (Parabola rebranded)'`
		`- url='http://gnome-look.org/content/show.php/Faenza?content=128143'`
		`- license=('GPL3')`
		`- arch=('any')`
		`- replaces=(${pkgname}-libre)`
		`- conflicts=(${pkgname}-libre)`
		`- makedepends=('librsvg')`
		`- options=(!strip)`
		`- source=("http://ppa.launchpad.net/tiheum/equinox/ubuntu/pool/main/f/$pkgname/${pkgname}_${pkgver}.tar.gz"`
		`- 'distributor-logo-parabola.svg'`
		`- 'start-here-parabola-symbolic.svg')`
		`- sha512sums=('0c017ddbaa2dba485341d3bb1e321fafad026aafc893fa2519ddfd3fe0475fc8d011c99ce3de581c9b1c6aa7d250312673dda7c10bb12783db2d45816646ddc9'`
		`- 'a6efee8dc521c3975033185eb8a7bf5d89e9a5a157f0f22e2cdee32d631bcaf0930e3a55dbfaf7e7ae2b5249d28895bd06c8957eb6139544b807e8494e601a41'`
		`- '8bcc02e44606af66908b8c377965f1df36341e7991544c7c89375dfa19d05abb8055280a8ec8038e889ba18aa3dd9ab8e5292c9c7c83fec8fac46bebedc3415e')`
		`-`
		`- prepare() {`
		`- cd "$srcdir/$pkgname-1.3"`
		`- rm -rv debian`
		`-`
		`- # remove nonfree distros and application logos`
		`- for nonfree in archlinux debian fedora frugalware gentoo linux-mint mandriva opensuse redhat slackware ubuntu flash rpmdrake novell skype; do`
		`- find -name $nonfree -delete`
		`- done`
		`-`
		`- # add the Parabola GNU/Linux-libre logos to the source code`
		`- cp -a "$srcdir/distributor-logo-parabola.svg" Faenza/places/scalable`
		`- cp -a "$srcdir/distributor-logo-parabola.svg" Faenza/places/scalable/start-here-parabola.svg`
		`- cp -a "$srcdir/start-here-parabola-symbolic.svg" Faenza/places/scalable`
		`-`
		`- for size in 22 24 32 48 64 96; do`
		`- rsvg-convert -w $size -h $size -o Faenza/places/$size/distributor-logo-parabola.png "$srcdir/distributor-logo-parabola.svg"`
		`- rsvg-convert -w $size -h $size -o Faenza/places/$size/start-here-parabola.png "$srcdir/distributor-logo-parabola.svg"`
		`- rsvg-convert -w $size -h $size -o Faenza/places/$size/start-here-parabola-symbolic.png "$srcdir/start-here-parabola-symbolic.svg"`
		`-`
		`- ln -sf Faenza/places/$size/distributor-logo-parabola.png Faenza/places/$size/parabola-logo.png`
		`- ln -sf Faenza/places/scalable/distributor-logo-parabola.svg parabola-logo.svg`
		`- ln -sf Faenza/places/scalable/start-here-parabola.svg Faenza-Dark/places/scalable/start-here-parabola.svg`
		`- ln -sf Faenza/places/scalable/start-here-parabola-symbolic.svg Faenza-Dark/places/scalable/start-here-parabola-symbolic.svg`
		`- done`
		`- }`
		`-`
		`- package() {`
		`- cd $pkgname-1.3`
		`- mkdir -p "$pkgdir/usr/share/icons" "$pkgdir/usr/lib" "$pkgdir/usr/share"`
		`-`
		`- cp -rf Faenza{,-Dark,-Darkest,-Darker,-Ambiance,-Radiance} "$pkgdir/usr/share/icons/"`
		`- cp -rf rhythmbox "$pkgdir/usr/lib/"`
		`- cp -rf emesene "$pkgdir/usr/share/"`
		`-`
		`- # set the Parabola GNU/Linux-libre Distributor and start menu logo`
		`- for theme in Faenza{,-Dark}; do`
		`- for size in 22 24 32 48 64 96; do`
		`- cd "$pkgdir/usr/share/icons/$theme/places/$size/"`
		`- # no distributor-logo for Faenza-Dark`
		`- [[ $theme == Faenza ]] && ln -sf distributor-logo{-parabola,}.png`
		`- ln -sf start-here{-parabola,}.png`
		`- done`
		`- cd "$pkgdir/usr/share/icons/$theme/places/scalable/"`
		`- # no distributor-logo for Faenza-Dark`
		`- [[ $theme == Faenza ]] && ln -sf distributor-logo{-parabola,}.svg`
		`- ln -sf start-here{-parabola,}.svg`
		`- ln -sf start-here{-parabola-symbolic,-symbolic}.svg`
		`- done`
		`-`
		`- for theme in Faenza{,-Dark}; do`
		`- cd "$pkgdir/usr/share/icons/$theme/apps/scalable/"`
		`- ln -sf gnome-session-reboot.svg system-reboot.svg`
		`- for size in 16 22 24 32 48 64 96; do`
		`- cd "$pkgdir/usr/share/icons/$theme/apps/$size/"`
		`- ln -sf gnome-session-reboot.png system-reboot.png`
		`- done`
		`- done`
		`- }`

libre/faenza-icon-theme/distributor-logo-parabola.svg

file removed

-570

		`@@ -1,570 +0,0 @@`
		`- <?xml version="1.0" encoding="UTF-8" standalone="no"?>`
		`- <!-- Created with Inkscape (http://www.inkscape.org/) -->`
		`-`
		`- <svg`
		`- xmlns:dc="http://purl.org/dc/elements/1.1/"`
		`- xmlns:cc="http://creativecommons.org/ns#"`
		`- xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"`
		`- xmlns:svg="http://www.w3.org/2000/svg"`
		`- xmlns="http://www.w3.org/2000/svg"`
		`- xmlns:xlink="http://www.w3.org/1999/xlink"`
		`- xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"`
		`- xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"`
		`- version="1.0"`
		`- width="96"`
		`- height="96"`
		`- id="svg2408"`
		`- inkscape:version="0.48.4 r9939"`
		`- sodipodi:docname="distributor-logo-parabola.svg">`
		`- <sodipodi:namedview`
		`- pagecolor="#ffffff"`
		`- bordercolor="#666666"`
		`- borderopacity="1"`
		`- objecttolerance="10"`
		`- gridtolerance="10"`
		`- guidetolerance="10"`
		`- inkscape:pageopacity="0"`
		`- inkscape:pageshadow="2"`
		`- inkscape:window-width="1280"`
		`- inkscape:window-height="752"`
		`- id="namedview3048"`
		`- showgrid="false"`
		`- inkscape:zoom="4.916429"`
		`- inkscape:cx="46.064774"`
		`- inkscape:cy="49.491663"`
		`- inkscape:window-x="0"`
		`- inkscape:window-y="0"`
		`- inkscape:window-maximized="1"`
		`- inkscape:current-layer="svg2408"`
		`- showguides="true"`
		`- inkscape:guide-bbox="true" />`
		`- <defs`
		`- id="defs2410">`
		`- <linearGradient`
		`- id="linearGradient3919">`
		`- <stop`
		`- id="stop3921"`
		`- style="stop-color:#fafafa;stop-opacity:1"`
		`- offset="0" />`
		`- <stop`
		`- id="stop3923"`
		`- style="stop-color:#f0f0f0;stop-opacity:1"`
		`- offset="1" />`
		`- </linearGradient>`
		`- <linearGradient`
		`- id="linearGradient3903">`
		`- <stop`
		`- id="stop3905"`
		`- style="stop-color:#3b3f5f;stop-opacity:1;"`
		`- offset="0" />`
		`- <stop`
		`- id="stop3907"`
		`- style="stop-color:#abaecb;stop-opacity:1;"`
		`- offset="1" />`
		`- </linearGradient>`
		`- <linearGradient`
		`- x1="45.447727"`
		`- y1="92.539597"`
		`- x2="45.447727"`
		`- y2="7.0165396"`
		`- id="ButtonShadow"`
		`- gradientUnits="userSpaceOnUse"`
		`- gradientTransform="scale(1.0058652,0.994169)">`
		`- <stop`
		`- id="stop3750"`
		`- style="stop-color:#000000;stop-opacity:1"`
		`- offset="0" />`
		`- <stop`
		`- id="stop3752"`
		`- style="stop-color:#000000;stop-opacity:0.58823532"`
		`- offset="1" />`
		`- </linearGradient>`
		`- <linearGradient`
		`- id="linearGradient3737">`
		`- <stop`
		`- id="stop3739"`
		`- style="stop-color:#ffffff;stop-opacity:1"`
		`- offset="0" />`
		`- <stop`
		`- id="stop3741"`
		`- style="stop-color:#ffffff;stop-opacity:0"`
		`- offset="1" />`
		`- </linearGradient>`
		`- <filter`
		`- color-interpolation-filters="sRGB"`
		`- id="filter3174">`
		`- <feGaussianBlur`
		`- id="feGaussianBlur3176"`
		`- stdDeviation="1.71" />`
		`- </filter>`
		`- <linearGradient`
		`- x1="36.357143"`
		`- y1="6"`
		`- x2="36.357143"`
		`- y2="63.893143"`
		`- id="linearGradient3188"`
		`- xlink:href="#linearGradient3737"`
		`- gradientUnits="userSpaceOnUse" />`
		`- <filter`
		`- x="-0.192"`
		`- y="-0.192"`
		`- width="1.3839999"`
		`- height="1.3839999"`
		`- color-interpolation-filters="sRGB"`
		`- id="filter3794">`
		`- <feGaussianBlur`
		`- id="feGaussianBlur3796"`
		`- stdDeviation="5.28" />`
		`- </filter>`
		`- <linearGradient`
		`- x1="48"`
		`- y1="20.220806"`
		`- x2="48"`
		`- y2="138.66119"`
		`- id="linearGradient3613"`
		`- xlink:href="#linearGradient3737"`
		`- gradientUnits="userSpaceOnUse" />`
		`- <radialGradient`
		`- cx="48"`
		`- cy="90.171875"`
		`- r="42"`
		`- fx="48"`
		`- fy="90.171875"`
		`- id="radialGradient3619"`
		`- xlink:href="#linearGradient3737"`
		`- gradientUnits="userSpaceOnUse"`
		`- gradientTransform="matrix(1.1573129,0,0,0.99590774,-7.5510206,0.19713193)" />`
		`- <clipPath`
		`- id="clipPath3613">`
		`- <rect`
		`- width="84"`
		`- height="84"`
		`- rx="6"`
		`- ry="6"`
		`- x="6"`
		`- y="6"`
		`- id="rect3615"`
		`- style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none" />`
		`- </clipPath>`
		`- <linearGradient`
		`- x1="45.447727"`
		`- y1="92.539597"`
		`- x2="45.447727"`
		`- y2="7.0165396"`
		`- id="ButtonShadow-0"`
		`- gradientUnits="userSpaceOnUse"`
		`- gradientTransform="matrix(1.0058652,0,0,0.994169,100,0)">`
		`- <stop`
		`- id="stop3750-8"`
		`- style="stop-color:#000000;stop-opacity:1"`
		`- offset="0" />`
		`- <stop`
		`- id="stop3752-5"`
		`- style="stop-color:#000000;stop-opacity:0.58823532"`
		`- offset="1" />`
		`- </linearGradient>`
		`- <linearGradient`
		`- x1="32.251034"`
		`- y1="6.1317081"`
		`- x2="32.251034"`
		`- y2="90.238609"`
		`- id="linearGradient3780"`
		`- xlink:href="#ButtonShadow-0"`
		`- gradientUnits="userSpaceOnUse"`
		`- gradientTransform="matrix(1.0238095,0,0,1.0119048,-1.1428571,-98.071429)" />`
		`- <linearGradient`
		`- x1="32.251034"`
		`- y1="6.1317081"`
		`- x2="32.251034"`
		`- y2="90.238609"`
		`- id="linearGradient3772"`
		`- xlink:href="#ButtonShadow-0"`
		`- gradientUnits="userSpaceOnUse"`
		`- gradientTransform="matrix(1.0238095,0,0,1.0119048,-1.1428571,-98.071429)" />`
		`- <linearGradient`
		`- x1="32.251034"`
		`- y1="6.1317081"`
		`- x2="32.251034"`
		`- y2="90.238609"`
		`- id="linearGradient3725"`
		`- xlink:href="#ButtonShadow-0"`
		`- gradientUnits="userSpaceOnUse"`
		`- gradientTransform="matrix(1.0238095,0,0,1.0119048,-1.1428571,-98.071429)" />`
		`- <linearGradient`
		`- x1="32.251034"`
		`- y1="6.1317081"`
		`- x2="32.251034"`
		`- y2="90.238609"`
		`- id="linearGradient3721"`
		`- xlink:href="#ButtonShadow-0"`
		`- gradientUnits="userSpaceOnUse"`
		`- gradientTransform="translate(0,-97)" />`
		`- <linearGradient`
		`- x1="32.251034"`
		`- y1="6.1317081"`
		`- x2="32.251034"`
		`- y2="90.238609"`
		`- id="linearGradient3026"`
		`- xlink:href="#ButtonShadow-0"`
		`- gradientUnits="userSpaceOnUse"`
		`- gradientTransform="matrix(1.0238095,0,0,1.0119048,-1.1428571,-98.071429)" />`
		`- <linearGradient`
		`- x1="541.33502"`
		`- y1="104.50665"`
		`- x2="606.91248"`
		`- y2="303.14029"`
		`- id="linearGradient3060-4"`
		`- xlink:href="#path1082_2_-8"`
		`- gradientUnits="userSpaceOnUse"`
		`- gradientTransform="matrix(-0.13677913,0,0,0.13677146,122.19582,8.5219823)" />`
		`- <linearGradient`
		`- x1="112.49854"`
		`- y1="6.1372099"`
		`- x2="112.49853"`
		`- y2="129.3468"`
		`- id="path1082_2_-8"`
		`- gradientUnits="userSpaceOnUse"`
		`- gradientTransform="translate(287,-83)">`
		`- <stop`
		`- id="stop193-9"`
		`- style="stop-color:#ffffff;stop-opacity:0"`
		`- offset="0" />`
		`- <stop`
		`- id="stop195-6"`
		`- style="stop-color:#ffffff;stop-opacity:0.60465115"`
		`- offset="1" />`
		`- <midPointStop`
		`- id="midPointStop197-7"`
		`- style="stop-color:#FFFFFF"`
		`- offset="0" />`
		`- <midPointStop`
		`- id="midPointStop199-4"`
		`- style="stop-color:#FFFFFF"`
		`- offset="0.5" />`
		`- <midPointStop`
		`- id="midPointStop201-8"`
		`- style="stop-color:#000000"`
		`- offset="1" />`
		`- </linearGradient>`
		`- <linearGradient`
		`- x1="48"`
		`- y1="90"`
		`- x2="48"`
		`- y2="5.9464455"`
		`- id="linearGradient3909"`
		`- xlink:href="#linearGradient3903"`
		`- gradientUnits="userSpaceOnUse" />`
		`- <radialGradient`
		`- cx="48"`
		`- cy="71.995491"`
		`- r="32.993801"`
		`- fx="48"`
		`- fy="71.995491"`
		`- id="radialGradient3925"`
		`- xlink:href="#linearGradient3919"`
		`- gradientUnits="userSpaceOnUse"`
		`- gradientTransform="matrix(1,0,0,1.0001879,0,-0.00901697)" />`
		`- <radialGradient`
		`- inkscape:collect="always"`
		`- xlink:href="#linearGradient3737"`
		`- id="radialGradient3051"`
		`- gradientUnits="userSpaceOnUse"`
		`- gradientTransform="matrix(1.1573129,0,0,0.99590774,-7.5510206,0.19713193)"`
		`- cx="48"`
		`- cy="90.171875"`
		`- fx="48"`
		`- fy="90.171875"`
		`- r="42" />`
		`- <linearGradient`
		`- inkscape:collect="always"`
		`- xlink:href="#linearGradient3737"`
		`- id="linearGradient3054"`
		`- gradientUnits="userSpaceOnUse"`
		`- x1="36.357143"`
		`- y1="6"`
		`- x2="36.357143"`
		`- y2="63.893143" />`
		`- <linearGradient`
		`- inkscape:collect="always"`
		`- xlink:href="#linearGradient3903"`
		`- id="linearGradient3057"`
		`- gradientUnits="userSpaceOnUse"`
		`- x1="48"`
		`- y1="90"`
		`- x2="48"`
		`- y2="5.9464455" />`
		`- <linearGradient`
		`- inkscape:collect="always"`
		`- xlink:href="#path1082_2_-8"`
		`- id="linearGradient3060"`
		`- gradientUnits="userSpaceOnUse"`
		`- gradientTransform="matrix(-0.13677913,0,0,0.13677146,122.19582,8.5219823)"`
		`- x1="541.33502"`
		`- y1="104.50665"`
		`- x2="606.91248"`
		`- y2="303.14029" />`
		`- <radialGradient`
		`- inkscape:collect="always"`
		`- xlink:href="#linearGradient3919"`
		`- id="radialGradient3064"`
		`- gradientUnits="userSpaceOnUse"`
		`- gradientTransform="matrix(1,0,0,1.0001879,0,-0.00901697)"`
		`- cx="48"`
		`- cy="71.995491"`
		`- fx="48"`
		`- fy="71.995491"`
		`- r="32.993801" />`
		`- <linearGradient`
		`- inkscape:collect="always"`
		`- xlink:href="#ButtonShadow-0"`
		`- id="linearGradient3072"`
		`- gradientUnits="userSpaceOnUse"`
		`- gradientTransform="translate(0,-97)"`
		`- x1="32.251034"`
		`- y1="6.1317081"`
		`- x2="32.251034"`
		`- y2="90.238609" />`
		`- <linearGradient`
		`- inkscape:collect="always"`
		`- xlink:href="#ButtonShadow-0"`
		`- id="linearGradient3075"`
		`- gradientUnits="userSpaceOnUse"`
		`- gradientTransform="matrix(1.0238095,0,0,1.0119048,-1.1428571,-98.071429)"`
		`- x1="32.251034"`
		`- y1="6.1317081"`
		`- x2="32.251034"`
		`- y2="90.238609" />`
		`- <linearGradient`
		`- inkscape:collect="always"`
		`- xlink:href="#ButtonShadow-0"`
		`- id="linearGradient3078"`
		`- gradientUnits="userSpaceOnUse"`
		`- gradientTransform="matrix(1.0238095,0,0,-1.0119048,-1.1428571,98.071429)"`
		`- x1="32.251034"`
		`- y1="6.1317081"`
		`- x2="32.251034"`
		`- y2="90.238609" />`
		`- <linearGradient`
		`- inkscape:collect="always"`
		`- xlink:href="#ButtonShadow-0"`
		`- id="linearGradient3081"`
		`- gradientUnits="userSpaceOnUse"`
		`- gradientTransform="matrix(1.0238095,0,0,-1.0119048,-1.1428571,98.071429)"`
		`- x1="32.251034"`
		`- y1="6.1317081"`
		`- x2="32.251034"`
		`- y2="90.238609" />`
		`- <linearGradient`
		`- inkscape:collect="always"`
		`- xlink:href="#ButtonShadow-0"`
		`- id="linearGradient3084"`
		`- gradientUnits="userSpaceOnUse"`
		`- gradientTransform="matrix(1.0238095,0,0,-1.0119048,-1.1428571,98.071429)"`
		`- x1="32.251034"`
		`- y1="6.1317081"`
		`- x2="32.251034"`
		`- y2="90.238609" />`
		`- <radialGradient`
		`- inkscape:collect="always"`
		`- xlink:href="#linearGradient3919"`
		`- id="radialGradient4038"`
		`- cx="64.249374"`
		`- cy="33.144417"`
		`- fx="64.249374"`
		`- fy="33.144417"`
		`- r="38.221073"`
		`- gradientTransform="matrix(-0.78678604,-0.09535636,0.09179943,-0.77782881,119.48475,60.816388)"`
		`- gradientUnits="userSpaceOnUse" />`
		`- <radialGradient`
		`- inkscape:collect="always"`
		`- xlink:href="#linearGradient3919"`
		`- id="radialGradient4042"`
		`- gradientUnits="userSpaceOnUse"`
		`- gradientTransform="matrix(-0.78678604,-0.09535636,0.09179943,-0.77782881,119.48475,60.816388)"`
		`- cx="64.249374"`
		`- cy="33.144417"`
		`- fx="64.249374"`
		`- fy="33.144417"`
		`- r="38.221073" />`
		`- <filter`
		`- inkscape:collect="always"`
		`- id="filter4052">`
		`- <feGaussianBlur`
		`- inkscape:collect="always"`
		`- stdDeviation="0.32474815"`
		`- id="feGaussianBlur4054" />`
		`- </filter>`
		`- <filter`
		`- inkscape:collect="always"`
		`- id="filter4066">`
		`- <feGaussianBlur`
		`- inkscape:collect="always"`
		`- stdDeviation="0.97424445"`
		`- id="feGaussianBlur4068" />`
		`- </filter>`
		`- <radialGradient`
		`- inkscape:collect="always"`
		`- xlink:href="#linearGradient3919"`
		`- id="radialGradient4093"`
		`- gradientUnits="userSpaceOnUse"`
		`- gradientTransform="matrix(-0.78678604,-0.09535636,0.09179943,-0.77782881,119.48475,60.816388)"`
		`- cx="64.249374"`
		`- cy="33.144417"`
		`- fx="64.249374"`
		`- fy="33.144417"`
		`- r="38.221073" />`
		`- <radialGradient`
		`- inkscape:collect="always"`
		`- xlink:href="#linearGradient3919"`
		`- id="radialGradient4105"`
		`- gradientUnits="userSpaceOnUse"`
		`- gradientTransform="matrix(-0.78678604,-0.09535636,0.09179943,-0.77782881,119.48475,60.816388)"`
		`- cx="64.249374"`
		`- cy="33.144417"`
		`- fx="64.249374"`
		`- fy="33.144417"`
		`- r="38.221073" />`
		`- <radialGradient`
		`- inkscape:collect="always"`
		`- xlink:href="#linearGradient3919"`
		`- id="radialGradient4107"`
		`- gradientUnits="userSpaceOnUse"`
		`- gradientTransform="matrix(-0.78678604,-0.09535636,0.09179943,-0.77782881,119.48475,60.816388)"`
		`- cx="64.249374"`
		`- cy="33.144417"`
		`- fx="64.249374"`
		`- fy="33.144417"`
		`- r="38.221073" />`
		`- </defs>`
		`- <metadata`
		`- id="metadata2413">`
		`- <rdf:RDF>`
		`- <cc:Work`
		`- rdf:about="">`
		`- <dc:format>image/svg+xml</dc:format>`
		`- <dc:type`
		`- rdf:resource="http://purl.org/dc/dcmitype/StillImage" />`
		`- <dc:title></dc:title>`
		`- </cc:Work>`
		`- </rdf:RDF>`
		`- </metadata>`
		`- <g`
		`- id="layer2">`
		`- <rect`
		`- width="86"`
		`- height="85"`
		`- rx="6"`
		`- ry="6"`
		`- x="5"`
		`- y="7"`
		`- id="rect3745"`
		`- style="opacity:0.9;fill:url(#ButtonShadow);fill-opacity:1;fill-rule:nonzero;stroke:none;filter:url(#filter3174)" />`
		`- </g>`
		`- <path`
		`- inkscape:connector-curvature="0"`
		`- style="opacity:0.07999998;fill:url(#linearGradient3084);fill-opacity:1;fill-rule:nonzero;stroke:none;display:inline"`
		`- id="path3786"`
		`- d="M 12,95.03125 C 6.4889097,95.03125 1.96875,90.51109 1.96875,85 l 0,-71 C 1.96875,8.4889098 6.4889098,3.96875 12,3.96875 l 72,0 c 5.51109,0 10.03125,4.5201597 10.03125,10.03125 l 0,71 c 0,5.51109 -4.52016,10.03125 -10.03125,10.03125 l -72,0 z" />`
		`- <path`
		`- inkscape:connector-curvature="0"`
		`- style="opacity:0.1;fill:url(#linearGradient3081);fill-opacity:1;fill-rule:nonzero;stroke:none;display:inline"`
		`- id="path3778"`
		`- d="M 12,94.03125 C 7.028367,94.03125 2.96875,89.971633 2.96875,85 l 0,-71 C 2.96875,9.0283671 7.0283671,4.96875 12,4.96875 l 72,0 c 4.971633,0 9.03125,4.059617 9.03125,9.03125 l 0,71 c 0,4.971633 -4.059617,9.03125 -9.03125,9.03125 l -72,0 z" />`
		`- <path`
		`- inkscape:connector-curvature="0"`
		`- style="opacity:0.2;fill:url(#linearGradient3078);fill-opacity:1;fill-rule:nonzero;stroke:none;display:inline"`
		`- id="path3770"`
		`- d="M 12,93 C 7.5908667,93 4,89.409133 4,85 L 4,14 C 4,9.5908667 7.5908667,6 12,6 l 72,0 c 4.409133,0 8,3.5908667 8,8 l 0,71 c 0,4.409133 -3.590867,8 -8,8 l -72,0 z" />`
		`- <rect`
		`- style="opacity:0.3;fill:url(#linearGradient3075);fill-opacity:1;fill-rule:nonzero;stroke:none;display:inline"`
		`- id="rect3723"`
		`- transform="scale(1,-1)"`
		`- y="-92"`
		`- x="5"`
		`- ry="7"`
		`- rx="7"`
		`- height="85"`
		`- width="86" />`
		`- <rect`
		`- style="opacity:0.45;fill:url(#linearGradient3072);fill-opacity:1;fill-rule:nonzero;stroke:none;display:inline"`
		`- id="rect3716"`
		`- transform="scale(1,-1)"`
		`- y="-91"`
		`- x="6"`
		`- ry="6"`
		`- rx="6"`
		`- height="84"`
		`- width="84" />`
		`- <rect`
		`- style="fill:url(#linearGradient3057);fill-opacity:1;fill-rule:nonzero;stroke:none"`
		`- id="rect2419"`
		`- y="6"`
		`- x="6"`
		`- ry="6"`
		`- rx="6"`
		`- height="84"`
		`- width="84" />`
		`- <path`
		`- style="opacity:0.4;fill:url(#linearGradient3054);fill-opacity:1;fill-rule:nonzero;stroke:none"`
		`- id="rect3728"`
		`- inkscape:connector-curvature="0"`
		- d="M 12,6 C 8.676,6 6,8.676 6,12 l 0,2 0,68 0,2 c 0,0.334721 0.04135,0.6507 0.09375,0.96875 0.0487,0.295596 0.09704,0.596915 0.1875,0.875 0.00988,0.03038 0.020892,0.0636 0.03125,0.09375 0.098865,0.287771 0.2348802,0.547452 0.375,0.8125 0.1445918,0.273507 0.3156161,0.535615 0.5,0.78125 0.1843839,0.245635 0.3737765,0.473472 0.59375,0.6875 0.439947,0.428056 0.94291,0.814526 1.5,1.09375 0.278545,0.139612 0.5734731,0.246947 0.875,0.34375 -0.2562018,-0.100222 -0.4867109,-0.236272 -0.71875,-0.375 -0.00741,-0.0044 -0.023866,0.0045 -0.03125,0 -0.031933,-0.0193 -0.062293,-0.04251 -0.09375,-0.0625 -0.120395,-0.0767 -0.2310226,-0.163513 -0.34375,-0.25 -0.1061728,-0.0808 -0.2132809,-0.161112 -0.3125,-0.25 C 8.4783201,88.557317 8.3087904,88.373362 8.15625,88.1875 8.0486711,88.057245 7.9378561,87.922215 7.84375,87.78125 7.818661,87.74287 7.805304,87.69538 7.78125,87.65625 7.716487,87.553218 7.6510225,87.451733 7.59375,87.34375 7.4927417,87.149044 7.3880752,86.928049 7.3125,86.71875 7.30454,86.69694 7.288911,86.6782 7.28125,86.65625 7.2494249,86.5643 7.2454455,86.469419 7.21875,86.375 7.1884177,86.268382 7.1483606,86.171969 7.125,86.0625 7.0521214,85.720988 7,85.364295 7,85 L 7,83 7,15 7,13 C 7,10.218152 9.2181517,8 12,8 l 2,0 68,0 2,0 c 2.781848,0 5,2.218152 5,5 l 0,2 0,68 0,2 c 0,0.364295 -0.05212,0.720988 -0.125,1.0625 -0.04415,0.206893 -0.08838,0.397658 -0.15625,0.59375 -0.0077,0.02195 -0.0233,0.04069 -0.03125,0.0625 -0.06274,0.173739 -0.138383,0.367449 -0.21875,0.53125 -0.04158,0.0828 -0.07904,0.169954 -0.125,0.25 -0.0546,0.09721 -0.126774,0.18835 -0.1875,0.28125 -0.09411,0.140965 -0.204921,0.275995 -0.3125,0.40625 -0.143174,0.17445 -0.303141,0.346998 -0.46875,0.5 -0.01117,0.0102 -0.01998,0.02115 -0.03125,0.03125 -0.138386,0.125556 -0.285091,0.234436 -0.4375,0.34375 -0.102571,0.07315 -0.204318,0.153364 -0.3125,0.21875 -0.0074,0.0045 -0.02384,-0.0044 -0.03125,0 -0.232039,0.138728 -0.462548,0.274778 -0.71875,0.375 0.301527,-0.0968 0.596455,-0.204138 0.875,-0.34375 0.55709,-0.279224 1.060053,-0.665694 1.5,-1.09375 0.219973,-0.214028 0.409366,-0.441865 0.59375,-0.6875 0.184384,-0.245635 0.355408,-0.507743 0.5,-0.78125 0.14012,-0.265048 0.276135,-0.524729 0.375,-0.8125 0.01041,-0.03078 0.02133,-0.06274 0.03125,-0.09375 0.09046,-0.278085 0.1388,-0.579404 0.1875,-0.875 C 89.95865,84.6507 90,84.334721 90,84 l 0,-2 0,-68 0,-2 C 90,8.676 87.324,6 84,6 L 12,6 z" />
		`- <path`
		`- style="opacity:0.2;fill:url(#radialGradient3051);fill-opacity:1;fill-rule:nonzero;stroke:none"`
		`- id="path3615"`
		`- inkscape:connector-curvature="0"`
		- d="M 12,90 C 8.676,90 6,87.324 6,84 L 6,82 6,14 6,12 c 0,-0.334721 0.04135,-0.6507 0.09375,-0.96875 0.0487,-0.295596 0.09704,-0.596915 0.1875,-0.875 C 6.29113,10.12587 6.302142,10.09265 6.3125,10.0625 6.411365,9.774729 6.5473802,9.515048 6.6875,9.25 6.8320918,8.976493 7.0031161,8.714385 7.1875,8.46875 7.3718839,8.223115 7.5612765,7.995278 7.78125,7.78125 8.221197,7.353194 8.72416,6.966724 9.28125,6.6875 9.559795,6.547888 9.8547231,6.440553 10.15625,6.34375 9.9000482,6.443972 9.6695391,6.580022 9.4375,6.71875 c -0.00741,0.0044 -0.023866,-0.0045 -0.03125,0 -0.031933,0.0193 -0.062293,0.04251 -0.09375,0.0625 -0.120395,0.0767 -0.2310226,0.163513 -0.34375,0.25 -0.1061728,0.0808 -0.2132809,0.161112 -0.3125,0.25 C 8.4783201,7.442683 8.3087904,7.626638 8.15625,7.8125 8.0486711,7.942755 7.9378561,8.077785 7.84375,8.21875 7.818661,8.25713 7.805304,8.30462 7.78125,8.34375 7.716487,8.446782 7.6510225,8.548267 7.59375,8.65625 7.4927417,8.850956 7.3880752,9.071951 7.3125,9.28125 7.30454,9.30306 7.288911,9.3218 7.28125,9.34375 7.2494249,9.4357 7.2454455,9.530581 7.21875,9.625 7.1884177,9.731618 7.1483606,9.828031 7.125,9.9375 7.0521214,10.279012 7,10.635705 7,11 l 0,2 0,68 0,2 c 0,2.781848 2.2181517,5 5,5 l 2,0 68,0 2,0 c 2.781848,0 5,-2.218152 5,-5 l 0,-2 0,-68 0,-2 C 89,10.635705 88.94788,10.279012 88.875,9.9375 88.83085,9.730607 88.78662,9.539842 88.71875,9.34375 88.71105,9.3218 88.69545,9.30306 88.6875,9.28125 88.62476,9.107511 88.549117,8.913801 88.46875,8.75 88.42717,8.6672 88.38971,8.580046 88.34375,8.5 88.28915,8.40279 88.216976,8.31165 88.15625,8.21875 88.06214,8.077785 87.951329,7.942755 87.84375,7.8125 87.700576,7.63805 87.540609,7.465502 87.375,7.3125 87.36383,7.3023 87.35502,7.29135 87.34375,7.28125 87.205364,7.155694 87.058659,7.046814 86.90625,6.9375 86.803679,6.86435 86.701932,6.784136 86.59375,6.71875 c -0.0074,-0.0045 -0.02384,0.0044 -0.03125,0 -0.232039,-0.138728 -0.462548,-0.274778 -0.71875,-0.375 0.301527,0.0968 0.596455,0.204138 0.875,0.34375 0.55709,0.279224 1.060053,0.665694 1.5,1.09375 0.219973,0.214028 0.409366,0.441865 0.59375,0.6875 0.184384,0.245635 0.355408,0.507743 0.5,0.78125 0.14012,0.265048 0.276135,0.524729 0.375,0.8125 0.01041,0.03078 0.02133,0.06274 0.03125,0.09375 0.09046,0.278085 0.1388,0.579404 0.1875,0.875 C 89.95865,11.3493 90,11.665279 90,12 l 0,2 0,68 0,2 c 0,3.324 -2.676,6 -6,6 l -72,0 z" />
		`- <rect`
		`- style="opacity:0.1;fill:url(#linearGradient3613);fill-opacity:1;fill-rule:nonzero;stroke:#ffffff;stroke-width:0.5;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;filter:url(#filter3794)"`
		`- id="rect3171"`
		`- clip-path="url(#clipPath3613)"`
		`- y="15"`
		`- x="15"`
		`- ry="12"`
		`- rx="12"`
		`- height="66"`
		`- width="66" />`
		`- <g`
		`- id="g4095"`
		`- transform="translate(-1.3624913e-7,-0.815655)">`
		`- <path`
		`- style="fill:url(#radialGradient4105);fill-opacity:1;stroke:none"`
		- d="m 68.98139,18.058681 c -1.805638,0.174842 -3.722729,0.496204 -5.72243,0.924784 L 50.590153,32.158951 c 1.452131,0.177025 2.781071,0.469288 3.99389,0.881269 L 68.98139,18.058681 z m 8.921858,0.739827 -17.532347,18.223731 c 4.93079,6.475383 3.1939,19.482786 -7.182568,40.91908 7.677014,-8.492297 41.181935,-50.694604 25.852962,-58.653211 -0.3559,-0.184781 -0.745082,-0.343727 -1.138047,-0.4896 z m -23.362146,2.567648 c -2.425295,0.782103 -4.893923,1.668745 -7.354354,2.611158 l -8.385037,8.714748 c 1.92341,-0.316005 3.747134,-0.528416 5.464769,-0.641909 L 54.541102,21.366156 z M 41.968916,26.055362 C 26.67139,32.431928 12.991689,40.220919 12.991689,40.220919 c 8.126424,-3.086163 15.465662,-5.39329 21.869804,-6.778148 l 7.107423,-7.387409 z"
		`- id="path4040"`
		`- inkscape:connector-curvature="0" />`
		`- <path`
		`- inkscape:connector-curvature="0"`
		`- id="path4087"`
		- d="m 68.98139,18.874336 c -1.805638,0.174842 -3.722729,0.496204 -5.72243,0.924784 L 50.590153,32.974606 c 1.452131,0.177025 2.781071,0.469288 3.99389,0.881269 L 68.98139,18.874336 z m 8.921858,0.739827 -17.532347,18.223731 c 4.93079,6.475383 3.1939,19.482786 -7.182568,40.91908 7.677014,-8.492297 41.181935,-50.694604 25.852962,-58.653211 -0.3559,-0.184781 -0.745082,-0.343727 -1.138047,-0.4896 z m -23.362146,2.567648 c -2.425295,0.782103 -4.893923,1.668745 -7.354354,2.611158 l -8.385037,8.714748 c 1.92341,-0.316005 3.747134,-0.528416 5.464769,-0.641909 L 54.541102,22.181811 z M 41.968916,26.871017 C 26.67139,33.247583 12.991689,41.036574 12.991689,41.036574 c 8.126424,-3.086163 15.465662,-5.39329 21.869804,-6.778148 l 7.107423,-7.387409 z"
		`- style="opacity:0.1;fill:#1a1a1a;fill-opacity:1;stroke:#1a1a1a;stroke-width:6;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />`
		`- <path`
		`- style="opacity:0.3;fill:#1a1a1a;fill-opacity:1;stroke:#1a1a1a;stroke-width:4;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"`
		- d="m 68.98139,18.874336 c -1.805638,0.174842 -3.722729,0.496204 -5.72243,0.924784 L 50.590153,32.974606 c 1.452131,0.177025 2.781071,0.469288 3.99389,0.881269 L 68.98139,18.874336 z m 8.921858,0.739827 -17.532347,18.223731 c 4.93079,6.475383 3.1939,19.482786 -7.182568,40.91908 7.677014,-8.492297 41.181935,-50.694604 25.852962,-58.653211 -0.3559,-0.184781 -0.745082,-0.343727 -1.138047,-0.4896 z m -23.362146,2.567648 c -2.425295,0.782103 -4.893923,1.668745 -7.354354,2.611158 l -8.385037,8.714748 c 1.92341,-0.316005 3.747134,-0.528416 5.464769,-0.641909 L 54.541102,22.181811 z M 41.968916,26.871017 C 26.67139,33.247583 12.991689,41.036574 12.991689,41.036574 c 8.126424,-3.086163 15.465662,-5.39329 21.869804,-6.778148 l 7.107423,-7.387409 z"
		`- id="path4085"`
		`- inkscape:connector-curvature="0" />`
		`- <path`
		`- inkscape:connector-curvature="0"`
		`- id="path4083"`
		- d="m 68.98139,18.874336 c -1.805638,0.174842 -3.722729,0.496204 -5.72243,0.924784 L 50.590153,32.974606 c 1.452131,0.177025 2.781071,0.469288 3.99389,0.881269 L 68.98139,18.874336 z m 8.921858,0.739827 -17.532347,18.223731 c 4.93079,6.475383 3.1939,19.482786 -7.182568,40.91908 7.677014,-8.492297 41.181935,-50.694604 25.852962,-58.653211 -0.3559,-0.184781 -0.745082,-0.343727 -1.138047,-0.4896 z m -23.362146,2.567648 c -2.425295,0.782103 -4.893923,1.668745 -7.354354,2.611158 l -8.385037,8.714748 c 1.92341,-0.316005 3.747134,-0.528416 5.464769,-0.641909 L 54.541102,22.181811 z M 41.968916,26.871017 C 26.67139,33.247583 12.991689,41.036574 12.991689,41.036574 c 8.126424,-3.086163 15.465662,-5.39329 21.869804,-6.778148 l 7.107423,-7.387409 z"
		`- style="opacity:0.4;fill:#1a1a1a;fill-opacity:1;stroke:#1a1a1a;stroke-width:2;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />`
		`- <path`
		`- style="opacity:0.4;fill:#1a1a1a;fill-opacity:1;stroke:none"`
		- d="m 68.98139,18.874336 c -1.805638,0.174842 -3.722729,0.496204 -5.72243,0.924784 L 50.590153,32.974606 c 1.452131,0.177025 2.781071,0.469288 3.99389,0.881269 L 68.98139,18.874336 z m 8.921858,0.739827 -17.532347,18.223731 c 4.93079,6.475383 3.1939,19.482786 -7.182568,40.91908 7.677014,-8.492297 41.181935,-50.694604 25.852962,-58.653211 -0.3559,-0.184781 -0.745082,-0.343727 -1.138047,-0.4896 z m -23.362146,2.567648 c -2.425295,0.782103 -4.893923,1.668745 -7.354354,2.611158 l -8.385037,8.714748 c 1.92341,-0.316005 3.747134,-0.528416 5.464769,-0.641909 L 54.541102,22.181811 z M 41.968916,26.871017 C 26.67139,33.247583 12.991689,41.036574 12.991689,41.036574 c 8.126424,-3.086163 15.465662,-5.39329 21.869804,-6.778148 l 7.107423,-7.387409 z"
		`- id="path4081"`
		`- inkscape:connector-curvature="0" />`
		`- <g`
		`- transform="translate(0.3720417,-0.36217118)"`
		`- id="g4089">`
		`- <path`
		`- style="fill:url(#radialGradient4107);fill-opacity:1;stroke:none"`
		- d="m 68.98139,18.058681 c -1.805638,0.174842 -3.722729,0.496204 -5.72243,0.924784 L 50.590153,32.158951 c 1.452131,0.177025 2.781071,0.469288 3.99389,0.881269 L 68.98139,18.058681 z m 8.921858,0.739827 -17.532347,18.223731 c 4.93079,6.475383 3.1939,19.482786 -7.182568,40.91908 7.677014,-8.492297 41.181935,-50.694604 25.852962,-58.653211 -0.3559,-0.184781 -0.745082,-0.343727 -1.138047,-0.4896 z m -23.362146,2.567648 c -2.425295,0.782103 -4.893923,1.668745 -7.354354,2.611158 l -8.385037,8.714748 c 1.92341,-0.316005 3.747134,-0.528416 5.464769,-0.641909 L 54.541102,21.366156 z M 41.968916,26.055362 C 26.67139,32.431928 12.991689,40.220919 12.991689,40.220919 c 8.126424,-3.086163 15.465662,-5.39329 21.869804,-6.778148 l 7.107423,-7.387409 z"
		`- id="path3488"`
		`- inkscape:connector-curvature="0" />`
		`- <path`
		`- inkscape:connector-curvature="0"`
		`- style="color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"`
		- d="m 68.96875,18.0625 c -1.805638,0.174842 -3.719049,0.47767 -5.71875,0.90625 l -4.53125,4.71875 c 1.380487,0.163601 2.805429,0.370309 4.25,0.625 l 6,-6.25 z m 8.9375,0.75 -7.03125,7.3125 c 4.628934,1.323647 8.615381,2.971692 11.625,4.71875 1.173125,-5.310086 0.416327,-9.545417 -3.46875,-11.5625 -0.3559,-0.184781 -0.732035,-0.322877 -1.125,-0.46875 z m -23.375,2.5625 c -1.808246,0.583119 -3.633684,1.22712 -5.46875,1.90625 1.164404,-0.05954 2.393939,-0.06327 3.6875,-0.03125 l 1.78125,-1.875 z"
		`- id="path4075" />`
		`- </g>`
		`- </g>`
		`- </svg>`

libre/faenza-icon-theme/start-here-parabola-symbolic.svg

file removed

-738

		`@@ -1,738 +0,0 @@`
		`- <?xml version="1.0" encoding="UTF-8" standalone="no"?>`
		`- <!-- Created with Inkscape (http://www.inkscape.org/) -->`
		`-`
		`- <svg`
		`- xmlns:dc="http://purl.org/dc/elements/1.1/"`
		`- xmlns:cc="http://creativecommons.org/ns#"`
		`- xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"`
		`- xmlns:svg="http://www.w3.org/2000/svg"`
		`- xmlns="http://www.w3.org/2000/svg"`
		`- xmlns:xlink="http://www.w3.org/1999/xlink"`
		`- xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"`
		`- xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"`
		`- width="16"`
		`- height="16"`
		`- id="svg2"`
		`- sodipodi:version="0.32"`
		`- inkscape:version="0.48.4 r9939"`
		`- version="1.0"`
		`- sodipodi:docname="start-here-parabola-symbolic.svg"`
		`- inkscape:output_extension="org.inkscape.output.svg.inkscape"`
		`- style="display:inline">`
		`- <defs`
		`- id="defs4">`
		`- <linearGradient`
		`- id="linearGradient3722">`
		`- <stop`
		`- id="stop3724"`
		`- offset="0"`
		`- style="stop-color:#aaaaaa;stop-opacity:1;" />`
		`- <stop`
		`- id="stop3726"`
		`- offset="1"`
		`- style="stop-color:#f0f0f0;stop-opacity:1;" />`
		`- </linearGradient>`
		`- <linearGradient`
		`- id="linearGradient3295">`
		`- <stop`
		`- style="stop-color:#559829;stop-opacity:1;"`
		`- offset="0"`
		`- id="stop3297" />`
		`- <stop`
		`- style="stop-color:#86c837;stop-opacity:1;"`
		`- offset="1"`
		`- id="stop3299" />`
		`- </linearGradient>`
		`- <linearGradient`
		`- id="linearGradient3287">`
		`- <stop`
		`- style="stop-color:#cd0000;stop-opacity:1;"`
		`- offset="0"`
		`- id="stop3289" />`
		`- <stop`
		`- style="stop-color:#e55300;stop-opacity:1;"`
		`- offset="1"`
		`- id="stop3291" />`
		`- </linearGradient>`
		`- <linearGradient`
		`- id="linearGradient3279">`
		`- <stop`
		`- style="stop-color:#f08e00;stop-opacity:1;"`
		`- offset="0"`
		`- id="stop3281" />`
		`- <stop`
		`- style="stop-color:#ffd200;stop-opacity:1;"`
		`- offset="1"`
		`- id="stop3283" />`
		`- </linearGradient>`
		`- <linearGradient`
		`- id="linearGradient3271">`
		`- <stop`
		`- style="stop-color:#395d93;stop-opacity:1;"`
		`- offset="0"`
		`- id="stop3273" />`
		`- <stop`
		`- style="stop-color:#6e92c7;stop-opacity:1;"`
		`- offset="1"`
		`- id="stop3275" />`
		`- </linearGradient>`
		`- <linearGradient`
		`- inkscape:collect="always"`
		`- id="linearGradient3327">`
		`- <stop`
		`- style="stop-color:#000000;stop-opacity:1;"`
		`- offset="0"`
		`- id="stop3330" />`
		`- <stop`
		`- style="stop-color:#000000;stop-opacity:0;"`
		`- offset="1"`
		`- id="stop3333" />`
		`- </linearGradient>`
		`- <linearGradient`
		`- inkscape:collect="always"`
		`- xlink:href="#linearGradient3327"`
		`- id="linearGradient3335"`
		`- x1="11.375"`
		`- y1="22"`
		`- x2="11.375"`
		`- y2="-9.817296"`
		`- gradientUnits="userSpaceOnUse" />`
		`- <inkscape:perspective`
		`- sodipodi:type="inkscape:persp3d"`
		`- inkscape:vp_x="0 : 11 : 1"`
		`- inkscape:vp_y="0 : 1000 : 0"`
		`- inkscape:vp_z="22 : 11 : 1"`
		`- inkscape:persp3d-origin="11 : 7.3333333 : 1"`
		`- id="perspective102" />`
		`- <linearGradient`
		`- id="linearGradient4081">`
		`- <stop`
		`- style="stop-color:#aaaaaa;stop-opacity:1;"`
		`- offset="0"`
		`- id="stop4083" />`
		`- <stop`
		`- style="stop-color:#f0f0f0;stop-opacity:1;"`
		`- offset="1"`
		`- id="stop4085" />`
		`- </linearGradient>`
		`- <linearGradient`
		`- id="linearGradient4057">`
		`- <stop`
		`- style="stop-color:#816647;stop-opacity:1;"`
		`- offset="0"`
		`- id="stop4059" />`
		`- <stop`
		`- style="stop-color:#a6845d;stop-opacity:1;"`
		`- offset="1"`
		`- id="stop4061" />`
		`- </linearGradient>`
		`- <linearGradient`
		`- id="linearGradient3929">`
		`- <stop`
		`- style="stop-color:#000000;stop-opacity:1;"`
		`- offset="0"`
		`- id="stop3931" />`
		`- <stop`
		`- style="stop-color:#000000;stop-opacity:0;"`
		`- offset="1"`
		`- id="stop3933" />`
		`- </linearGradient>`
		`- <linearGradient`
		`- inkscape:collect="always"`
		`- xlink:href="#linearGradient3929"`
		`- id="linearGradient4051"`
		`- x1="9.494998"`
		`- y1="15.516565"`
		`- x2="9.494998"`
		`- y2="-4.1786065"`
		`- gradientUnits="userSpaceOnUse" />`
		`- <linearGradient`
		`- inkscape:collect="always"`
		`- xlink:href="#linearGradient4057"`
		`- id="linearGradient4063"`
		`- x1="9.17138"`
		`- y1="21.000002"`
		`- x2="9.17138"`
		`- y2="0.97239029"`
		`- gradientUnits="userSpaceOnUse" />`
		`- <linearGradient`
		`- inkscape:collect="always"`
		`- xlink:href="#linearGradient4081"`
		`- id="linearGradient4089"`
		`- x1="6.101758"`
		`- y1="154.58195"`
		`- x2="6.101758"`
		`- y2="36.995476"`
		`- gradientUnits="userSpaceOnUse" />`
		`- <linearGradient`
		`- inkscape:collect="always"`
		`- xlink:href="#linearGradient4081"`
		`- id="linearGradient4103"`
		`- gradientUnits="userSpaceOnUse"`
		`- x1="6.101758"`
		`- y1="154.58195"`
		`- x2="6.101758"`
		`- y2="36.995476" />`
		`- <linearGradient`
		`- inkscape:collect="always"`
		`- xlink:href="#linearGradient4081"`
		`- id="linearGradient4105"`
		`- gradientUnits="userSpaceOnUse"`
		`- x1="6.101758"`
		`- y1="154.58195"`
		`- x2="6.101758"`
		`- y2="36.995476" />`
		`- <linearGradient`
		`- inkscape:collect="always"`
		`- xlink:href="#linearGradient4081"`
		`- id="linearGradient4107"`
		`- gradientUnits="userSpaceOnUse"`
		`- x1="6.101758"`
		`- y1="154.58195"`
		`- x2="6.101758"`
		`- y2="36.995476" />`
		`- <linearGradient`
		`- inkscape:collect="always"`
		`- xlink:href="#linearGradient4081"`
		`- id="linearGradient4109"`
		`- gradientUnits="userSpaceOnUse"`
		`- x1="6.101758"`
		`- y1="154.58195"`
		`- x2="6.101758"`
		`- y2="36.995476" />`
		`- <linearGradient`
		`- inkscape:collect="always"`
		`- xlink:href="#linearGradient4081"`
		`- id="linearGradient4111"`
		`- gradientUnits="userSpaceOnUse"`
		`- x1="6.101758"`
		`- y1="154.58195"`
		`- x2="6.101758"`
		`- y2="36.995476" />`
		`- <linearGradient`
		`- inkscape:collect="always"`
		`- xlink:href="#linearGradient4081"`
		`- id="linearGradient4113"`
		`- gradientUnits="userSpaceOnUse"`
		`- x1="6.101758"`
		`- y1="154.58195"`
		`- x2="6.101758"`
		`- y2="36.995476" />`
		`- <linearGradient`
		`- inkscape:collect="always"`
		`- xlink:href="#linearGradient4081"`
		`- id="linearGradient4115"`
		`- gradientUnits="userSpaceOnUse"`
		`- x1="6.101758"`
		`- y1="154.58195"`
		`- x2="6.101758"`
		`- y2="36.995476" />`
		`- <linearGradient`
		`- inkscape:collect="always"`
		`- xlink:href="#linearGradient4081"`
		`- id="linearGradient4117"`
		`- gradientUnits="userSpaceOnUse"`
		`- x1="6.101758"`
		`- y1="154.58195"`
		`- x2="6.101758"`
		`- y2="36.995476" />`
		`- <linearGradient`
		`- inkscape:collect="always"`
		`- xlink:href="#linearGradient4081"`
		`- id="linearGradient4119"`
		`- gradientUnits="userSpaceOnUse"`
		`- x1="6.101758"`
		`- y1="154.58195"`
		`- x2="6.101758"`
		`- y2="36.995476" />`
		`- <linearGradient`
		`- inkscape:collect="always"`
		`- xlink:href="#linearGradient4081"`
		`- id="linearGradient4121"`
		`- gradientUnits="userSpaceOnUse"`
		`- x1="6.101758"`
		`- y1="154.58195"`
		`- x2="6.101758"`
		`- y2="36.995476" />`
		`- <linearGradient`
		`- inkscape:collect="always"`
		`- xlink:href="#linearGradient4081"`
		`- id="linearGradient4123"`
		`- gradientUnits="userSpaceOnUse"`
		`- x1="6.101758"`
		`- y1="154.58195"`
		`- x2="6.101758"`
		`- y2="36.995476" />`
		`- <linearGradient`
		`- inkscape:collect="always"`
		`- xlink:href="#linearGradient4081"`
		`- id="linearGradient4125"`
		`- gradientUnits="userSpaceOnUse"`
		`- x1="6.101758"`
		`- y1="154.58195"`
		`- x2="6.101758"`
		`- y2="36.995476" />`
		`- <linearGradient`
		`- inkscape:collect="always"`
		`- xlink:href="#linearGradient4081"`
		`- id="linearGradient4127"`
		`- gradientUnits="userSpaceOnUse"`
		`- x1="6.101758"`
		`- y1="154.58195"`
		`- x2="6.101758"`
		`- y2="36.995476" />`
		`- <linearGradient`
		`- inkscape:collect="always"`
		`- xlink:href="#linearGradient4081"`
		`- id="linearGradient4129"`
		`- gradientUnits="userSpaceOnUse"`
		`- x1="6.101758"`
		`- y1="154.58195"`
		`- x2="6.101758"`
		`- y2="36.995476" />`
		`- <linearGradient`
		`- inkscape:collect="always"`
		`- xlink:href="#linearGradient4081"`
		`- id="linearGradient4132"`
		`- gradientUnits="userSpaceOnUse"`
		`- x1="6.101758"`
		`- y1="154.58195"`
		`- x2="6.101758"`
		`- y2="36.995476"`
		`- gradientTransform="matrix(0.1317916,0,0,0.1317916,11.619896,-1.9882468)" />`
		`- <linearGradient`
		`- inkscape:collect="always"`
		`- xlink:href="#linearGradient4081"`
		`- id="linearGradient4141"`
		`- gradientUnits="userSpaceOnUse"`
		`- x1="6.101758"`
		`- y1="154.58195"`
		`- x2="6.101758"`
		`- y2="36.995476"`
		`- gradientTransform="matrix(0.1317916,0,0,0.1317916,11.619896,-1.9882468)" />`
		`- <linearGradient`
		`- inkscape:collect="always"`
		`- xlink:href="#linearGradient4081"`
		`- id="linearGradient4148"`
		`- gradientUnits="userSpaceOnUse"`
		`- x1="6.101758"`
		`- y1="154.58195"`
		`- x2="6.101758"`
		`- y2="36.995476"`
		`- gradientTransform="matrix(0.1317916,0,0,0.1317916,11.619896,-1.9882468)" />`
		`- <linearGradient`
		`- inkscape:collect="always"`
		`- xlink:href="#linearGradient4081"`
		`- id="linearGradient4158"`
		`- gradientUnits="userSpaceOnUse"`
		`- x1="6.101758"`
		`- y1="154.58195"`
		`- x2="6.101758"`
		`- y2="36.995476"`
		`- gradientTransform="matrix(0.1317916,0,0,0.1317916,11.619896,-1.9882468)" />`
		`- <linearGradient`
		`- inkscape:collect="always"`
		`- xlink:href="#linearGradient4081"`
		`- id="linearGradient4180"`
		`- gradientUnits="userSpaceOnUse"`
		`- x1="6.101758"`
		`- y1="154.58195"`
		`- x2="6.101758"`
		`- y2="36.995476" />`
		`- <linearGradient`
		`- inkscape:collect="always"`
		`- xlink:href="#linearGradient4081"`
		`- id="linearGradient4182"`
		`- gradientUnits="userSpaceOnUse"`
		`- gradientTransform="matrix(0.1317916,0,0,0.1317916,11.619896,-1.9882468)"`
		`- x1="6.101758"`
		`- y1="154.58195"`
		`- x2="6.101758"`
		`- y2="36.995476" />`
		`- <linearGradient`
		`- inkscape:collect="always"`
		`- xlink:href="#linearGradient4081"`
		`- id="linearGradient4184"`
		`- gradientUnits="userSpaceOnUse"`
		`- x1="6.101758"`
		`- y1="154.58195"`
		`- x2="6.101758"`
		`- y2="36.995476" />`
		`- <linearGradient`
		`- inkscape:collect="always"`
		`- xlink:href="#linearGradient4081"`
		`- id="linearGradient4186"`
		`- gradientUnits="userSpaceOnUse"`
		`- gradientTransform="matrix(0.1317916,0,0,0.1317916,11.619896,-1.9882468)"`
		`- x1="6.101758"`
		`- y1="154.58195"`
		`- x2="6.101758"`
		`- y2="36.995476" />`
		`- <linearGradient`
		`- inkscape:collect="always"`
		`- xlink:href="#linearGradient4081"`
		`- id="linearGradient2480"`
		`- gradientUnits="userSpaceOnUse"`
		`- gradientTransform="matrix(0.1256322,0,0,0.1256322,11.921746,-1.0005124)"`
		`- x1="6.101758"`
		`- y1="154.58195"`
		`- x2="6.101758"`
		`- y2="36.995476" />`
		`- <linearGradient`
		`- inkscape:collect="always"`
		`- xlink:href="#linearGradient4081"`
		`- id="linearGradient2483"`
		`- gradientUnits="userSpaceOnUse"`
		`- gradientTransform="matrix(0.1256322,0,0,0.1256322,11.921746,-1.0005124)"`
		`- x1="6.101758"`
		`- y1="154.58195"`
		`- x2="6.101758"`
		`- y2="36.995476" />`
		`- <linearGradient`
		`- inkscape:collect="always"`
		`- xlink:href="#linearGradient4081"`
		`- id="linearGradient2489"`
		`- gradientUnits="userSpaceOnUse"`
		`- gradientTransform="matrix(0.1256322,0,0,0.1256322,11.921746,-1.0005124)"`
		`- x1="6.101758"`
		`- y1="154.58195"`
		`- x2="6.101758"`
		`- y2="36.995476" />`
		`- <linearGradient`
		`- inkscape:collect="always"`
		`- xlink:href="#linearGradient4081"`
		`- id="linearGradient2495"`
		`- gradientUnits="userSpaceOnUse"`
		`- gradientTransform="matrix(0.1256322,0,0,0.1256322,11.921746,-1.0005124)"`
		`- x1="6.101758"`
		`- y1="154.58195"`
		`- x2="6.101758"`
		`- y2="36.995476" />`
		`- <linearGradient`
		`- inkscape:collect="always"`
		`- xlink:href="#linearGradient4081"`
		`- id="linearGradient2498"`
		`- gradientUnits="userSpaceOnUse"`
		`- gradientTransform="matrix(0.1256322,0,0,0.1256322,11.921746,-1.0005124)"`
		`- x1="6.101758"`
		`- y1="154.58195"`
		`- x2="6.101758"`
		`- y2="36.995476" />`
		`- <linearGradient`
		`- inkscape:collect="always"`
		`- xlink:href="#linearGradient4081"`
		`- id="linearGradient2501"`
		`- gradientUnits="userSpaceOnUse"`
		`- gradientTransform="matrix(0.1256322,0,0,0.1256322,11.921746,-1.0005124)"`
		`- x1="6.101758"`
		`- y1="154.58195"`
		`- x2="6.101758"`
		`- y2="36.995476" />`
		`- <linearGradient`
		`- inkscape:collect="always"`
		`- xlink:href="#linearGradient4081"`
		`- id="linearGradient2504"`
		`- gradientUnits="userSpaceOnUse"`
		`- gradientTransform="matrix(0.1256322,0,0,0.1256322,11.921746,-1.0005124)"`
		`- x1="6.101758"`
		`- y1="154.58195"`
		`- x2="6.101758"`
		`- y2="36.995476" />`
		`- <linearGradient`
		`- inkscape:collect="always"`
		`- xlink:href="#linearGradient4081"`
		`- id="linearGradient2506"`
		`- gradientUnits="userSpaceOnUse"`
		`- x1="6.101758"`
		`- y1="154.58195"`
		`- x2="6.101758"`
		`- y2="36.995476" />`
		`- <linearGradient`
		`- inkscape:collect="always"`
		`- xlink:href="#linearGradient4081"`
		`- id="linearGradient2508"`
		`- gradientUnits="userSpaceOnUse"`
		`- gradientTransform="matrix(0.1317916,0,0,0.1317916,11.619896,-1.9882468)"`
		`- x1="6.101758"`
		`- y1="154.58195"`
		`- x2="6.101758"`
		`- y2="36.995476" />`
		`- <linearGradient`
		`- inkscape:collect="always"`
		`- xlink:href="#linearGradient4081"`
		`- id="linearGradient2510"`
		`- gradientUnits="userSpaceOnUse"`
		`- gradientTransform="matrix(0.1317916,0,0,0.1317916,11.619896,-1.9882468)"`
		`- x1="6.101758"`
		`- y1="154.58195"`
		`- x2="6.101758"`
		`- y2="36.995476" />`
		`- <clipPath`
		`- clipPathUnits="userSpaceOnUse"`
		`- id="clipPath4974">`
		`- <path`
		`- id="path4976"`
		- d="M 16.625,2 C 15.93281,2.046173 15.13978,2.350316 14.5,2.875 13.716105,3.517873 13.079371,5.1522168 13.25,6.0625 13.337976,6.531842 13.692147,7.1029241 14.03125,7.28125 14.662734,7.613335 15.813682,7.0624791 16.875,5.9375 18.021489,4.722239 18.547995,3.383178 18.15625,2.625 17.915497,2.159052 17.31719,1.953827 16.625,2 z M 10.96875,2.71875 C 10.005789,2.719616 9.496306,3.3967078 9.5,4.6875 c 0.00253,0.88392 0.31322,1.6791318 0.71875,1.875 0.301512,0.145631 0.309051,0.1320361 0.6875,0 C 11.533114,6.343793 12.122053,4.8839409 12,3.90625 11.900109,3.106091 11.556193,2.7182209 10.96875,2.71875 z m -3.8125,1.3125 C 6.976067,4.0573035 6.795347,4.173262 6.625,4.34375 6.281636,4.687396 6.277056,4.8747068 6.28125,5.53125 6.286196,6.305553 6.475145,6.7277249 7,7.28125 7.392601,7.695296 7.675716,7.7200481 8.03125,7.34375 8.416388,6.936117 8.535971,6.296057 8.40625,5.59375 8.208416,4.5226825 7.696799,3.9530895 7.15625,4.03125 z M 4.46875,6.375 C 4.281799,6.4054104 4.1133,6.5115553 3.9375,6.6875 3.476154,7.14923 3.798831,8.4188978 4.53125,9.0625 5.405425,9.830669 6.111327,9.1273309 5.8125,7.78125 5.599846,6.8233425 5.029603,6.2837687 4.46875,6.375 z M 12.5,8.0625 C 11.88094,8.0518483 11.187196,8.1034691 10.46875,8.25 8.61799,8.627471 7.13709,9.3254488 6.1875,10.28125 5.640611,10.831715 5.327697,11.341306 5.0625,12.125 c -0.641919,1.896963 0.546896,4.595678 2.8125,6.4375 0.844088,0.686203 1.359152,0.993313 2.21875,1.28125 0.445736,0.149308 0.799163,0.183992 1.625,0.15625 0.946716,-0.03181 1.139252,-0.07408 1.75,-0.375 0.895036,-0.440989 1.909553,-1.461035 2.34375,-2.34375 0.264885,-0.5385 0.307321,-0.768628 0.28125,-1.21875 -0.04452,-0.768578 -0.342658,-0.977756 -1.3125,-0.96875 -1.38452,0.01285 -1.965756,0.333932 -2.25,1.3125 -0.21469,0.739118 -0.452038,1 -0.9375,1 -0.769368,0 -1.5625,-0.611791 -1.5625,-1.25 0,-0.443994 0.715313,-1.10577 2.5,-2.3125 2.514116,-1.69994 3.378489,-2.734111 3.25,-3.875 C 15.64852,8.7901993 14.35718,8.0944552 12.5,8.0625 z"
		`- style="fill:#ffffff;fill-opacity:1;stroke:none"`
		`- inkscape:connector-curvature="0" />`
		`- </clipPath>`
		`- <clipPath`
		`- clipPathUnits="userSpaceOnUse"`
		`- id="clipPath4995">`
		`- <path`
		`- style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;display:inline"`
		- d="M 30,0 30,22 52,22 52,0 30,0 z M 46.625,2 C 47.31719,1.953827 47.915497,2.159052 48.15625,2.625 48.547995,3.383178 48.021489,4.722239 46.875,5.9375 45.813682,7.0624791 44.662734,7.613335 44.03125,7.28125 43.692147,7.1029241 43.337976,6.531842 43.25,6.0625 43.079371,5.1522168 43.716105,3.517873 44.5,2.875 45.13978,2.350316 45.93281,2.046173 46.625,2 z m -5.65625,0.71875 c 0.587443,-5.291e-4 0.931359,0.387341 1.03125,1.1875 0.122053,0.9776909 -0.466886,2.437543 -1.09375,2.65625 -0.378449,0.1320361 -0.385988,0.145631 -0.6875,0 C 39.81322,6.3666318 39.502528,5.57142 39.5,4.6875 39.496306,3.3967078 40.005789,2.719616 40.96875,2.71875 z m -3.8125,1.3125 c 0.540549,-0.078161 1.052166,0.4914325 1.25,1.5625 0.129721,0.702307 0.01014,1.342367 -0.375,1.75 C 37.675716,7.7200481 37.392601,7.695296 37,7.28125 36.475145,6.7277249 36.286196,6.305553 36.28125,5.53125 36.277056,4.8747068 36.281636,4.687396 36.625,4.34375 36.795347,4.173262 36.976067,4.0573035 37.15625,4.03125 z M 34.46875,6.375 C 35.029603,6.2837687 35.599846,6.8233425 35.8125,7.78125 36.111327,9.1273309 35.405425,9.830669 34.53125,9.0625 33.798831,8.4188978 33.476154,7.14923 33.9375,6.6875 34.1133,6.5115553 34.281799,6.4054104 34.46875,6.375 z M 42.5,8.0625 c 1.85718,0.031955 3.14852,0.7276993 3.28125,1.90625 0.128489,1.140889 -0.735884,2.17506 -3.25,3.875 -1.784687,1.20673 -2.5,1.868506 -2.5,2.3125 0,0.638209 0.793132,1.25 1.5625,1.25 0.485462,0 0.72281,-0.260882 0.9375,-1 0.284244,-0.978568 0.86548,-1.299646 2.25,-1.3125 0.969842,-0.009 1.267977,0.200172 1.3125,0.96875 0.02607,0.450122 -0.01637,0.68025 -0.28125,1.21875 -0.434197,0.882715 -1.448714,1.902761 -2.34375,2.34375 -0.610748,0.300916 -0.803284,0.343192 -1.75,0.375 -0.825837,0.02774 -1.179264,-0.0069 -1.625,-0.15625 C 39.234152,19.555813 38.719088,19.248703 37.875,18.5625 35.609396,16.720678 34.420581,14.021963 35.0625,12.125 35.327697,11.341306 35.640611,10.831715 36.1875,10.28125 37.13709,9.3254488 38.61799,8.627471 40.46875,8.25 41.187196,8.1034691 41.88094,8.0518483 42.5,8.0625 z"
		`- id="path4997"`
		`- inkscape:connector-curvature="0" />`
		`- </clipPath>`
		`- <inkscape:perspective`
		`- id="perspective4374"`
		`- inkscape:persp3d-origin="0.5 : 0.33333333 : 1"`
		`- inkscape:vp_z="1 : 0.5 : 1"`
		`- inkscape:vp_y="0 : 1000 : 0"`
		`- inkscape:vp_x="0 : 0.5 : 1"`
		`- sodipodi:type="inkscape:persp3d" />`
		`- <linearGradient`
		`- id="StandardGradient-1"`
		`- gradientTransform="matrix(0.9984539,0,0,0.9984539,-0.0459776,0.05767558)"`
		`- x1="10.710332"`
		`- y1="1.9963325"`
		`- x2="10.710332"`
		`- y2="18.974037"`
		`- gradientUnits="userSpaceOnUse">`
		`- <stop`
		`- style="stop-color:#000000;stop-opacity:0.86274511;"`
		`- offset="0"`
		`- id="stop3277-4" />`
		`- <stop`
		`- style="stop-color:#000000;stop-opacity:0.47058824;"`
		`- offset="1"`
		`- id="stop3279-3" />`
		`- </linearGradient>`
		`- <linearGradient`
		`- id="SpecificGradient-5"`
		`- x1="10.761708"`
		`- y1="3.9999998"`
		`- x2="10.761708"`
		`- y2="18.011395"`
		`- gradientUnits="userSpaceOnUse">`
		`- <stop`
		`- style="stop-color:#a50000;stop-opacity:1;"`
		`- offset="0"`
		`- id="stop3292-8" />`
		`- <stop`
		`- style="stop-color:#e73800;stop-opacity:1;"`
		`- offset="1"`
		`- id="stop3294-0" />`
		`- </linearGradient>`
		`- <linearGradient`
		`- inkscape:collect="always"`
		`- xlink:href="#StandardGradient-1"`
		`- id="linearGradient3738"`
		`- gradientUnits="userSpaceOnUse"`
		`- x1="12"`
		`- y1="8"`
		`- x2="12"`
		`- y2="20.041595" />`
		`- <linearGradient`
		`- inkscape:collect="always"`
		`- xlink:href="#StandardGradient-1"`
		`- id="linearGradient3741"`
		`- gradientUnits="userSpaceOnUse"`
		`- x1="12"`
		`- y1="8"`
		`- x2="12"`
		`- y2="20.041595"`
		`- gradientTransform="translate(-30,0)" />`
		`- <linearGradient`
		`- inkscape:collect="always"`
		`- xlink:href="#StandardGradient-1"`
		`- id="linearGradient3747"`
		`- gradientUnits="userSpaceOnUse"`
		`- x1="12"`
		`- y1="8"`
		`- x2="12"`
		`- y2="20.041595"`
		`- gradientTransform="translate(0,1)" />`
		`- <linearGradient`
		`- inkscape:collect="always"`
		`- xlink:href="#StandardGradient-1"`
		`- id="linearGradient3751"`
		`- gradientUnits="userSpaceOnUse"`
		`- x1="12"`
		`- y1="8"`
		`- x2="12"`
		`- y2="20.041595" />`
		`- <clipPath`
		`- clipPathUnits="userSpaceOnUse"`
		`- id="clipPath3758">`
		`- <path`
		`- style="fill:#ff00ff;fill-opacity:1;stroke:none;display:inline"`
		- d="m -30,0 0,22 22,0 0,-22 -22,0 z m 16.625,2 c 0.69219,-0.046173 1.290497,0.159052 1.53125,0.625 0.391745,0.758178 -0.134761,2.097239 -1.28125,3.3125 -1.061318,1.124979 -2.212266,1.675835 -2.84375,1.34375 C -16.307853,7.102924 -16.66202,6.531842 -16.75,6.0625 -16.920629,5.152217 -16.283895,3.517873 -15.5,2.875 -14.86022,2.350316 -14.06719,2.046173 -13.375,2 z m -5.65625,0.71875 c 0.587443,-5.29e-4 0.93136,0.387341 1.03125,1.1875 0.122053,0.977691 -0.466886,2.437543 -1.09375,2.65625 -0.378449,0.132036 -0.385988,0.145631 -0.6875,0 -0.40553,-0.195868 -0.71625,-0.99108 -0.71875,-1.875 -0.0037,-1.290792 0.505789,-1.967884 1.46875,-1.96875 z m -3.8125,1.3125 c 0.540549,-0.078161 1.052166,0.4914325 1.25,1.5625 0.129721,0.702307 0.01014,1.342367 -0.375,1.75 -0.355534,0.376298 -0.638649,0.351546 -1.03125,-0.0625 -0.524855,-0.553525 -0.71385,-0.975697 -0.71875,-1.75 -0.0042,-0.656543 3.86e-4,-0.843854 0.34375,-1.1875 0.170347,-0.170488 0.351067,-0.286447 0.53125,-0.3125 z m -2.6875,2.34375 c 0.560853,-0.091231 1.131096,0.4483425 1.34375,1.40625 0.298827,1.346081 -0.407075,2.049419 -1.28125,1.28125 -0.732419,-0.643602 -1.055096,-1.91327 -0.59375,-2.375 0.1758,-0.1759448 0.344299,-0.282089 0.53125,-0.3125 z M -17.5,8.0625 c 1.85718,0.031955 3.14852,0.7276993 3.28125,1.90625 0.128489,1.140889 -0.735884,2.17506 -3.25,3.875 -1.784687,1.20673 -2.5,1.868506 -2.5,2.3125 0,0.638209 0.793132,1.25 1.5625,1.25 0.485462,0 0.72281,-0.260882 0.9375,-1 0.284244,-0.978569 0.86548,-1.29965 2.25,-1.3125 0.969842,-0.009 1.26798,0.200172 1.3125,0.96875 0.02607,0.450123 -0.01637,0.68025 -0.28125,1.21875 -0.434197,0.882715 -1.448714,1.902761 -2.34375,2.34375 -0.610748,0.30092 -0.803284,0.34319 -1.75,0.375 -0.825837,0.02774 -1.179264,-0.0069 -1.625,-0.15625 -0.859598,-0.287937 -1.374662,-0.595047 -2.21875,-1.28125 -2.265604,-1.841822 -3.454419,-4.540537 -2.8125,-6.4375 0.265198,-0.783694 0.578111,-1.293285 1.125,-1.84375 0.94959,-0.9558013 2.43049,-1.653779 4.28125,-2.03125 0.718447,-0.146531 1.41219,-0.198152 2.03125,-0.1875 z"
		`- id="path3760"`
		`- inkscape:connector-curvature="0" />`
		`- </clipPath>`
		`- <linearGradient`
		`- inkscape:collect="always"`
		`- xlink:href="#StandardGradient-1"`
		`- id="linearGradient6801"`
		`- gradientUnits="userSpaceOnUse"`
		`- x1="12"`
		`- y1="8"`
		`- x2="12"`
		`- y2="20.041595" />`
		`- <linearGradient`
		`- inkscape:collect="always"`
		`- xlink:href="#StandardGradient-1"`
		`- id="linearGradient6806"`
		`- gradientUnits="userSpaceOnUse"`
		`- x1="12"`
		`- y1="8"`
		`- x2="12"`
		`- y2="20.041595" />`
		`- <linearGradient`
		`- inkscape:collect="always"`
		`- xlink:href="#StandardGradient-1"`
		`- id="linearGradient6810"`
		`- gradientUnits="userSpaceOnUse"`
		`- x1="12"`
		`- y1="8"`
		`- x2="12"`
		`- y2="20.041595" />`
		`- <linearGradient`
		`- inkscape:collect="always"`
		`- xlink:href="#StandardGradient-1-1"`
		`- id="linearGradient3745"`
		`- x1="13"`
		`- y1="2"`
		`- x2="13"`
		`- y2="18.031219"`
		`- gradientUnits="userSpaceOnUse"`
		`- gradientTransform="matrix(1.1252108,0,0,1.1249999,-2.5078172,-0.2808096)" />`
		`- <linearGradient`
		`- id="StandardGradient-1-1"`
		`- gradientTransform="matrix(0.9984539,0,0,0.9984539,-0.0459776,0.05767558)"`
		`- x1="10.710332"`
		`- y1="1.9963325"`
		`- x2="10.710332"`
		`- y2="18.974037"`
		`- gradientUnits="userSpaceOnUse">`
		`- <stop`
		`- style="stop-color:#000000;stop-opacity:0.86274511;"`
		`- offset="0"`
		`- id="stop3277-4-7" />`
		`- <stop`
		`- style="stop-color:#000000;stop-opacity:0.47058824;"`
		`- offset="1"`
		`- id="stop3279-3-5" />`
		`- </linearGradient>`
		`- </defs>`
		`- <sodipodi:namedview`
		`- id="base"`
		`- pagecolor="#ffffff"`
		`- bordercolor="#f05656"`
		`- borderopacity="1"`
		`- inkscape:pageopacity="0.0"`
		`- inkscape:pageshadow="2"`
		`- inkscape:zoom="22.640001"`
		`- inkscape:cx="2.1794604"`
		`- inkscape:cy="0.60330206"`
		`- inkscape:document-units="px"`
		`- inkscape:current-layer="layer1"`
		`- showgrid="true"`
		`- inkscape:showpageshadow="false"`
		`- showguides="false"`
		`- inkscape:guide-bbox="true"`
		`- inkscape:window-width="1596"`
		`- inkscape:window-height="1161"`
		`- inkscape:window-x="0"`
		`- inkscape:window-y="18"`
		`- inkscape:window-maximized="0">`
		`- <sodipodi:guide`
		`- orientation="1,0"`
		`- position="0,112"`
		`- id="guide2383" />`
		`- <sodipodi:guide`
		`- orientation="0,1"`
		`- position="26.278146,128"`
		`- id="guide2385" />`
		`- <sodipodi:guide`
		`- orientation="1,0"`
		`- position="128,54.082119"`
		`- id="guide2387" />`
		`- <sodipodi:guide`
		`- orientation="0,1"`
		`- position="78.156291,0"`
		`- id="guide2389" />`
		`- <sodipodi:guide`
		`- orientation="0,1"`
		`- position="60.863576,64.084768"`
		`- id="guide2391" />`
		`- <inkscape:grid`
		`- type="xygrid"`
		`- id="grid3672"`
		`- visible="true"`
		`- enabled="true"`
		`- empspacing="8"`
		`- snapvisiblegridlinesonly="true" />`
		`- </sodipodi:namedview>`
		`- <metadata`
		`- id="metadata7">`
		`- <rdf:RDF>`
		`- <cc:Work`
		`- rdf:about="">`
		`- <dc:format>image/svg+xml</dc:format>`
		`- <dc:type`
		`- rdf:resource="http://purl.org/dc/dcmitype/StillImage" />`
		`- <dc:title></dc:title>`
		`- </cc:Work>`
		`- </rdf:RDF>`
		`- </metadata>`
		`- <g`
		`- inkscape:groupmode="layer"`
		`- id="layer2"`
		`- inkscape:label="Dark background"`
		`- sodipodi:insensitive="true"`
		`- style="display:none"`
		`- transform="translate(0,-6)">`
		`- <rect`
		`- y="0"`
		`- x="0"`
		`- height="22"`
		`- width="22"`
		`- id="rect4898"`
		`- style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none;display:inline" />`
		`- </g>`
		`- <g`
		`- inkscape:groupmode="layer"`
		`- id="layer3"`
		`- inkscape:label="Pale darkground"`
		`- sodipodi:insensitive="true"`
		`- style="display:none"`
		`- transform="translate(0,-6)">`
		`- <rect`
		`- style="fill:#efebe7;fill-opacity:1;fill-rule:nonzero;stroke:none"`
		`- id="rect4126"`
		`- width="22"`
		`- height="22"`
		`- x="0"`
		`- y="0" />`
		`- </g>`
		`- <g`
		`- inkscape:label="Button"`
		`- inkscape:groupmode="layer"`
		`- id="layer1"`
		`- style="display:inline"`
		`- transform="translate(0,-6)">`
		`- <path`
		`- style="fill:#d40000;fill-opacity:1;stroke:none"`
		- d="m -13.375,32 c -0.69219,0.04617 -1.48522,0.350316 -2.125,0.875 -0.783895,0.642873 -1.420629,2.277217 -1.25,3.1875 0.08798,0.469342 0.442147,1.040424 0.78125,1.21875 0.631484,0.332085 1.782432,-0.218771 2.84375,-1.34375 1.146489,-1.215261 1.672995,-2.554322 1.28125,-3.3125 C -12.084503,32.159052 -12.68281,31.953827 -13.375,32 z m -5.65625,0.71875 c -0.962961,8.66e-4 -1.472444,0.677958 -1.46875,1.96875 0.0025,0.88392 0.31322,1.679132 0.71875,1.875 0.301512,0.145631 0.309051,0.132036 0.6875,0 0.626864,-0.218707 1.215803,-1.678559 1.09375,-2.65625 -0.09989,-0.800159 -0.443807,-1.188029 -1.03125,-1.1875 z m -3.8125,1.3125 c -0.180183,0.02605 -0.360903,0.142012 -0.53125,0.3125 -0.343364,0.343646 -0.347944,0.530957 -0.34375,1.1875 0.0049,0.774303 0.193895,1.196475 0.71875,1.75 0.392601,0.414046 0.675716,0.438798 1.03125,0.0625 0.385138,-0.407633 0.504721,-1.047693 0.375,-1.75 -0.197834,-1.071067 -0.709451,-1.64066 -1.25,-1.5625 z m -2.6875,2.34375 c -0.186951,0.03041 -0.35545,0.136555 -0.53125,0.3125 -0.461346,0.46173 -0.138669,1.731398 0.59375,2.375 0.874175,0.768169 1.580077,0.06483 1.28125,-1.28125 -0.212654,-0.957908 -0.782897,-1.497481 -1.34375,-1.40625 z M -17.5,38.0625 c -0.61906,-0.01065 -1.312804,0.04097 -2.03125,0.1875 -1.85076,0.377471 -3.33166,1.075449 -4.28125,2.03125 -0.546889,0.550465 -0.859803,1.060056 -1.125,1.84375 -0.641919,1.896963 0.546896,4.595678 2.8125,6.4375 0.844088,0.686203 1.359152,0.993313 2.21875,1.28125 0.445736,0.149308 0.799163,0.183992 1.625,0.15625 0.946716,-0.03181 1.139252,-0.07408 1.75,-0.375 0.895036,-0.440989 1.909553,-1.461035 2.34375,-2.34375 0.264885,-0.5385 0.307321,-0.768628 0.28125,-1.21875 -0.04452,-0.768578 -0.342658,-0.977756 -1.3125,-0.96875 -1.38452,0.01285 -1.965756,0.333932 -2.25,1.3125 -0.21469,0.739118 -0.452038,1 -0.9375,1 -0.769368,0 -1.5625,-0.611791 -1.5625,-1.25 0,-0.443994 0.715313,-1.10577 2.5,-2.3125 2.514116,-1.69994 3.378489,-2.734111 3.25,-3.875 -0.13273,-1.178551 -1.42407,-1.874295 -3.28125,-1.90625 z"
		`- id="path4951"`
		`- inkscape:connector-curvature="0" />`
		`- <path`
		`- inkscape:connector-curvature="0"`
		- d="m 12.794607,7.2463486 c -0.412619,0.039429 -0.850706,0.1118949 -1.307673,0.2085403 L 8.5918944,10.425987 c 0.3318369,0.03992 0.6355226,0.105825 0.9126725,0.198728 L 12.794607,7.2463486 z m 2.038798,0.1668323 -4.006442,4.1094871 C 11.953734,12.982879 11.556824,15.916073 9.1856228,20.75 10.939952,18.83497 18.596402,9.318268 15.093469,7.5235868 15.01214,7.4819169 14.923205,7.4460756 14.833405,7.4131809 z M 9.494754,7.9921903 C 8.9405327,8.1685562 8.3764085,8.3684955 7.8141582,8.5810114 L 5.898033,10.546205 c 0.4395322,-0.07126 0.8562847,-0.119159 1.2487937,-0.144752 L 9.494754,7.9921903 z M 6.6217935,9.049616 C 3.1260463,10.487544 0,12.243977 0,12.243977 1.8570277,11.54804 3.5341689,11.027779 4.9976258,10.715491 L 6.6217935,9.049616 z"
		`- id="path3488"`
		`- style="fill:#bebebe;stroke:none;fill-opacity:1" />`
		`- </g>`
		`- </svg>`

libre/faience-icon-theme/PKGBUILD

file modified

+5 -5

		`@@ -1,9 +1,9 @@`
		`# $Id: PKGBUILD 114621 2014-07-02 09:40:38Z alucryd $`
		`- # Maintainer (Arch): Maxime Gauduin <alucryd@gmail.com>`
		`- # Contributor (Arch): Ner0 <darkelfdarkelf666@yahoo.co.uk>`
		`- # Contributor (Arch): Sander Deryckere <sanderd17@gmail.com>`
		`- # Maintainer (Hyperbola): André Silva <emulatorman@hyperbola.info>`
		`- # Contributor (Hyperbola): Márcio Silva <coadde@hyperbola.info>`
		`+ # Maintainer (arch): Maxime Gauduin <alucryd@gmail.com>`
		`+ # Contributor: Ner0 <darkelfdarkelf666@yahoo.co.uk>`
		`+ # Contributor: Sander Deryckere <sanderd17@gmail.com>`
		`+ # Contributor: André Silva <emulatorman@hyperbola.info>`
		`+ # Contributor: Márcio Silva <coadde@hyperbola.info>`
		`# Maintainer: Omar Vega Ramos <ovruni@gnu.org.pe>`
		`# Contributor: Jorge Araya Navarro <elcorreo@deshackra.com>`

libre/fakeroot-tcp/PKGBUILD

file modified

+3 -3

		`@@ -1,7 +1,7 @@`
		`# Maintainer: David P. <megver83@parabola.nu>`
		`- # Maintainer (Arch): Bartłomiej Piotrowski <bpiotrowski@archlinux.org>`
		`- # Contributor (Arch): Allan McRae <allan@archlinux.org>`
		`- # Contributor (Arch): Jochem Kossen <j.kossen@home.nl>`
		`+ # Maintainer (arch): Bartłomiej Piotrowski <bpiotrowski@archlinux.org>`
		`+ # Contributor: Allan McRae <allan@archlinux.org>`
		`+ # Contributor: Jochem Kossen <j.kossen@home.nl>`

		`# parabola changes and rationale:`
		`# - librechroot ARM builds fail with sysv IPC`

libre/file-roller/PKGBUILD

file modified

+2 -2

		`@@ -1,5 +1,5 @@`
		`- # Maintainer (Arch): Jan Alexander Steffens (heftig) <heftig@archlinux.org>`
		`- # Contributor (Arch): Jan de Groot <jgc@archlinux.org>`
		`+ # Maintainer (arch): Jan Alexander Steffens (heftig) <heftig@archlinux.org>`
		`+ # Contributor: Jan de Groot <jgc@archlinux.org>`
		`# Maintainer: Isaac David <isacdaavid@at@isacdaavid@dot@info>`

		`# parabola changes and rationale:`

libre/fop/PKGBUILD

file modified

+3 -3

		`@@ -1,6 +1,6 @@`
		`- # Maintainer (Arch): Lukas Fleischer <lfleischer@archlinux.org>`
		`- # Contributor (Arch): Stefan Husmann <stefan-husmann@t-online.de>`
		`- # Contributor (Arch): Simon Lipp <sloonz+aur@gmail.com>`
		`+ # Maintainer (arch): Lukas Fleischer <lfleischer@archlinux.org>`
		`+ # Contributor: Stefan Husmann <stefan-husmann@t-online.de>`
		`+ # Contributor: Simon Lipp <sloonz+aur@gmail.com>`
		`# Maintainer: Omar Vega Ramos <ovruni@gnu.org.pe>`

		`pkgname=fop`

libre/freecad/PKGBUILD

file added

+91

		`@@ -0,0 +1,91 @@`
		`+ # Maintainer (arch): Alexander F. Rødseth <xyproto@archlinux.org>`
		`+ # Contributor: loqs <bugs-archlinux@entropy-collector.net>`
		`+ # Contributor: Gabriel Souza Franco <gabrielfrancosouza@gmail.com>`
		`+ # Contributor: Florian Pritz`
		`+ # Contributor: Jonas Heinrich <onny@project-insanity.org>`
		`+ # Contributor: Jordi De Groof <jordi.degroof@gmail.com>`
		`+ # Contributor: mickele`
		`+ # Contributor: manwithgrenade`
		`+ # Contributor: bricem13`
		`+ # Contributor: gborzi`
		`+ # Contributor: Adrian Insaurralde`
		`+`
		`+`
		`+ # parabola changes and rationale:`
		`+ # - build without webengine`
		`+ # - disable downloader`
		`+ # - build from versioned source-ball, not VCS`
		`+`
		`+ # FIXME: this package fails to build with libretools, without the -N flag`
		`+ # -> could NOT find MPI (missing: MPI_C_FOUND MPI_CXX_FOUND)`
		`+`
		`+`
		`+ pkgname=freecad`
		`+ pkgver=0.20.1`
		`+ pkgrel=5`
		`+ pkgrel+=.parabola1`
		`+ pkgdesc='Feature based parametric 3D CAD modeler'`
		`+ arch=(x86_64)`
		`+ arch+=(armv7h i686)`
		`+ arch=( ${arch[*]/i686/} ) # FTBS on i686 - 'med-openmpi' is unavailable`
		`+ url='https://freecadweb.org/'`
		`+ license=(LGPL)`
		`+ depends=(boost-libs fmt glew jsoncpp libspnav med-openmpi netcdf opencascade`
		`+ openmpi pyside2 pyside2-tools python-gitpython python-markdown`
		`+ python-matplotlib python-pivy python-ply python-pyqt5-webengine pugixml`
		`+ qt5-svg qt5-tools qt5-webkit qt5-x11extras qt5-xmlpatterns xerces-c)`
		`+ depends=( ${depends[*]/python-markdown/} )`
		`+ depends=( ${depends[*]/python-pyqt5-webengine/} )`
		`+ makedepends=(boost cgns cli11 cmake coin eigen gcc-fortran git jdk-openjdk`
		`+ libharu liblas ninja openmpi openvdb openvr ospray pdal postgresql-libs`
		`+ python-mpi4py python-shiboken2 shiboken2 swig utf8cpp)`
		`+ makedepends=( ${makedepends[*]/git/} ) # build from source-ball`
		`+ makedepends=( ${makedepends[*]/openmpi/} ) # duplicate entry`
		`+ [[ "${CARCH}" == x86_64 ]] \|\| makedepends=( ${makedepends[*]/ospray/} ) # unavailable for i686 and armv7h`
		`+ optdepends=('graphviz: dependency graph support'`
		`+ 'openscad: OpenSCAD support')`
		`+ _upstream_name=FreeCAD`
		`+ source=(${pkgname}-${pkgver}.tar.gz::https://github.com/${_upstream_name}/${_upstream_name}/archive/refs/tags/${pkgver}.tar.gz)`
		`+ sha256sums=(70c15f7c1c676e3376cdc2a66c136030c5502f9802935e5b626ca8ce3f8812ed)`
		`+`
		`+`
		`+ build() {`
		`+ cmake \`
		`+ -B build \`
		`+ -D BUILD_ENABLE_CXX_STD=C++17 \`
		`+ -D BUILD_FLAT_MESH=ON \`
		`+ -D BUILD_QT5=ON \`
		`+ -D BUILD_ADDONMGR=OFF \`
		`+ -D CMAKE_BUILD_TYPE=Release \`
		`+ -D CMAKE_C_FLAGS="$CFLAGS -fPIC -w" \`
		`+ -D CMAKE_CXX_FLAGS="$CXXFLAGS -fPIC -w" \`
		`+ -D CMAKE_INSTALL_BINDIR=/usr/lib/freecad/bin \`
		`+ -D CMAKE_INSTALL_DATADIR=/usr/share/freecad \`
		`+ -D CMAKE_INSTALL_DATAROOTDIR=/usr/share \`
		`+ -D CMAKE_INSTALL_DOCDIR=/usr/share/freecad/doc \`
		`+ -D CMAKE_INSTALL_LIBDIR=/usr/lib/freecad/lib \`
		`+ -D CMAKE_INSTALL_PREFIX=/usr/lib/freecad \`
		`+ -D FREECAD_USE_EXTERNAL_PIVY=ON \`
		`+ -D FREECAD_USE_OCC_VARIANT='Official Version' \`
		`+ -D FREECAD_USE_QT_FILEDIALOG=ON \`
		`+ -D PYTHON_EXECUTABLE=/usr/bin/python \`
		`+ -D INSTALL_TO_SITEPACKAGES=ON \`
		`+ -G Ninja \`
		`+ -S ${_upstream_name}-${pkgver}`
		`+ ninja -C build`
		`+ }`
		`+`
		`+ package() {`
		`+ DESTDIR="$pkgdir" ninja -C build install`
		`+`
		`+ cd "${srcdir}"/${_upstream_name}-${pkgver}`
		`+`
		`+ # thumbnailer`
		`+ install -Dm755 src/Tools/$pkgname-thumbnailer -t "$pkgdir/usr/bin/"`
		`+ # symlinks`
		`+ install -d "$pkgdir/usr/bin"`
		`+ ln -sf /usr/lib/freecad/bin/FreeCAD "$pkgdir/usr/bin/freecad"`
		`+ ln -sf /usr/lib/freecad/bin/FreeCAD "$pkgdir/usr/bin/FreeCAD"`
		`+ ln -sf /usr/lib/freecad/bin/FreeCADCmd "$pkgdir/usr/bin/freecadcmd"`
		`+ ln -sf /usr/lib/freecad/bin/FreeCADCmd "$pkgdir/usr/bin/FreeCADCmd"`
		`+ }`

libre/freerdp/PKGBUILD

file modified

+1 -1

		`@@ -1,4 +1,4 @@`
		`- # Maintainer (Arch): Sergej Pupykin <pupykin.s+arch@gmail.com>`
		`+ # Maintainer (arch): Sergej Pupykin <pupykin.s+arch@gmail.com>`
		`# Contributor: David Runge <dave@sleepmap.de>`
		`# Contributor: Stijn Segers <francesco dot borromini at gmail dot com>`
		`# Maintainer: Freemor <freemor@freemor.ca>`

libre/gloobus-preview/PKGBUILD

file modified

+2 -2

		`@@ -1,5 +1,5 @@`
		`- # Maintainer (Arch): Balló György <ballogyor+arch at gmail dot com>`
		`- # Maintainer (Hyperbola): André Silva <emulatorman@hyperbola.info>`
		`+ # Maintainer (arch): Balló György <ballogyor+arch at gmail dot com>`
		`+ # Contributor: André Silva <emulatorman@hyperbola.info>`
		`# Maintainer: Omar Vega Ramos <ovruni@gnu.org.pe>`

		`pkgname=gloobus-preview`

libre/gnome-boxes/PKGBUILD

file modified

+4 -4

		`@@ -1,9 +1,9 @@`
		`- # Maintainer (Arch): Balló György <ballogyor+arch at gmail dot com>`
		`- # Contributor (Arch): Stefano Facchini <stefano.facchini@gmail.com>`
		`+ # Maintainer (arch): Balló György <ballogyor+arch at gmail dot com>`
		`+ # Contributor: Stefano Facchini <stefano.facchini@gmail.com>`
		`# Maintainer: Omar Vega Ramos <ovruni@gnu.org.pe>`
		`- # Contributor : Isaac David <isacdaavid@at@isacdaavid@dot@info>`
		`+ # Contributor: Isaac David <isacdaavid@at@isacdaavid@dot@info>`
		`# Contributor: Daniel Milewski <niitotantei@gmail.com>`
		`- # Contributor : André Silva <emulatorman@hyperbola.info>`
		`+ # Contributor: André Silva <emulatorman@hyperbola.info>`

		`# Parabola changes and rationale:`
		`# - Remove download links of nonfree OS`

libre/grub-crypt-git/PKGBUILD

file modified

+6 -6

		`@@ -1,9 +1,9 @@`
		`- # Maintainer (Arch): Christian Hesse <mail@eworm.de>`
		`- # Maintainer (Arch): Ronald van Haren <ronald.archlinux.org>`
		`- # Contributor (Arch): Tobias Powalowski <tpowa@archlinux.org>`
		`- # Contributor (Arch): Keshav Amburay <(the ddoott ridikulus ddoott rat) (aatt) (gemmaeiil) (ddoott) (ccoomm)>`
		`- # Maintainer (Hyperbola): André Silva <emulatorman@hyperbola.info>`
		`- # Maintainer (Hyperbola): Márcio Silva <coadde@hyperbola.info>`
		`+ # Maintainer (arch): Christian Hesse <mail@eworm.de>`
		`+ # Maintainer (arch): Ronald van Haren <ronald.archlinux.org>`
		`+ # Contributor: Tobias Powalowski <tpowa@archlinux.org>`
		`+ # Contributor: Keshav Amburay <(the ddoott ridikulus ddoott rat) (aatt) (gemmaeiil) (ddoott) (ccoomm)>`
		`+ # Contributor: André Silva <emulatorman@hyperbola.info>`
		`+ # Contributor: Márcio Silva <coadde@hyperbola.info>`
		`# Maintainer: Omar Vega Ramos <ovruni@gnu.org.pe>`

		`## '1' to enable Xen support, '0' to disable`

libre/grub/PKGBUILD

file modified

+6 -6

		`@@ -1,9 +1,9 @@`
		`- # Maintainer (Arch): Christian Hesse <mail@eworm.de>`
		`- # Maintainer (Arch): Ronald van Haren <ronald.archlinux.org>`
		`- # Contributor (Arch): Tobias Powalowski <tpowa@archlinux.org>`
		`- # Contributor (Arch): Keshav Amburay <(the ddoott ridikulus ddoott rat) (aatt) (gemmaeiil) (ddoott) (ccoomm)>`
		`- # Maintainer (Hyperbola): André Silva <emulatorman@hyperbola.info>`
		`- # Maintainer (Hyperbola): Márcio Silva <coadde@hyperbola.info>`
		`+ # Maintainer (arch): Christian Hesse <mail@eworm.de>`
		`+ # Maintainer (arch): Ronald van Haren <ronald.archlinux.org>`
		`+ # Contributor: Tobias Powalowski <tpowa@archlinux.org>`
		`+ # Contributor: Keshav Amburay <(the ddoott ridikulus ddoott rat) (aatt) (gemmaeiil) (ddoott) (ccoomm)>`
		`+ # Contributor: André Silva <emulatorman@hyperbola.info>`
		`+ # Contributor: Márcio Silva <coadde@hyperbola.info>`
		`# Maintainer: Omar Vega Ramos <ovruni@gnu.org.pe>`

		`## '1' to enable Xen support, '0' to disable`

libre/gst-plugins-bad/PKGBUILD

file modified

+2 -2

		`@@ -1,5 +1,5 @@`
		`- # Maintainer (Arch): Jan Alexander Steffens (heftig) <heftig@archlinux.org>`
		`- # Contributor (Arch): Jan de Groot <jgc@archlinux.org>`
		`+ # Maintainer (arch): Jan Alexander Steffens (heftig) <heftig@archlinux.org>`
		`+ # Contributor: Jan de Groot <jgc@archlinux.org>`
		`# Maintainer: Omar Vega Ramos <ovruni@gnu.org.pe>`
		`# Contributor: Isaac David <isacdaavid@at@isacdaavid@dot@info>`
		`# Contributor: Márcio Silva <coadde@hyperbola.info>`

libre/handbrake/PKGBUILD

file modified

+3 -3

		`@@ -1,6 +1,6 @@`
		`- # Maintainer (Arch): Evangelos Foutras <evangelos@foutrelis.com>`
		`- # Contributor (Arch): Giovanni Scafora <giovanni@archlinux.org>`
		`- # Contributor (Arch): Sebastien Piccand <sebcactus gmail com>`
		`+ # Maintainer (arch): Evangelos Foutras <evangelos@foutrelis.com>`
		`+ # Contributor: Giovanni Scafora <giovanni@archlinux.org>`
		`+ # Contributor: Sebastien Piccand <sebcactus gmail com>`
		`# Maintainer: Omar Vega Ramos <ovruni@gnu.org.pe>`
		`# Contributor: Denis 'GNUtoo' Carikli <GNUtoo@cyberdimension.org>`

libre/hexchat/PKGBUILD

file modified

+2 -2

		`@@ -1,5 +1,5 @@`
		`- # Maintainer (Arch): Maxime Gauduin <alucryd@archlinux.org>`
		`- # Contributor (Arch): TingPing <tingping@tingping.se>`
		`+ # Maintainer (arch): Maxime Gauduin <alucryd@archlinux.org>`
		`+ # Contributor: TingPing <tingping@tingping.se>`
		`# Contributor: André Silva <emulatorman@hyperbola.info>`
		`# Maintainer: Freemor <freemor@freemor.ca>`

libre/hplip/0003-models.dat-Re-add-drivers-missing-from-3.19.1.patch

file added

+622

		`@@ -0,0 +1,622 @@`
		`+ From: Zdenek Dohnal <zdohnal@redhat.com>`
		`+ Date: Fri, 31 Jan 2020 13:50:05 +0100`
		`+ Subject: models.dat: Re-add drivers missing from 3.19.1`
		`+`
		`+ several printers were removed in 3.19.1, but actually someone still uses them`
		`+ reported upstream https://bugs.launchpad.net/hplip/+bug/1843592`
		`+ bugzillas 1742949, 1740132, 1739855`
		`+`
		`+ Origin: https://src.fedoraproject.org/rpms/hplip/blob/master/f/hplip-missing-drivers.patch`
		`+ ---`
		`+ Makefile.in \| 4 +`
		`+ cups_drv.inc \| 2 +`
		`+ data/models/models.dat \| 477 ++++++++++++++++++++++++++++++++++++++++++++++++-`
		`+ prnt/drv/hpcups.drv.in \| 16 ++`
		`+ 4 files changed, 490 insertions(+), 9 deletions(-)`
		`+`
		`+ diff --git a/Makefile.in b/Makefile.in`
		`+ index aef0fbc..cdee8e7 100644`
		`+ --- a/Makefile.in`
		`+ +++ b/Makefile.in`
		`+ @@ -1621,6 +1621,7 @@ am__dist_ppd_DATA_DIST = prnt/ps/hp-laserjet_3050-ps.ppd.gz \`
		`+ ppd/hpcups/hp-laserjet_cm1418fnw-pcl3.ppd.gz \`
		`+ ppd/hpcups/hp-laserjet_cp1025.ppd.gz \`
		`+ ppd/hpcups/hp-laserjet_cp1025nw.ppd.gz \`
		`+ + ppd/hpcups/hp-laserjet_cp_1025nw.ppd.gz \`
		`+ ppd/hpcups/hp-laserjet_m1005.ppd.gz \`
		`+ ppd/hpcups/hp-laserjet_m101-m106.ppd.gz \`
		`+ ppd/hpcups/hp-laserjet_m109-m112.ppd.gz \`
		`+ @@ -1738,6 +1739,7 @@ am__dist_ppd_DATA_DIST = prnt/ps/hp-laserjet_3050-ps.ppd.gz \`
		`+ ppd/hpcups/hp-laserjet_professional_p1608dn.ppd.gz \`
		`+ ppd/hpcups/hp-laserjet_professional_p1609dn.ppd.gz \`
		`+ ppd/hpcups/hp-laserjet_professional_p_1102w.ppd.gz \`
		`+ + ppd/hpcups/hp-laserjet_professional_p1102w.ppd.gz \`
		`+ ppd/hpcups/hp-laserjet_tank_1020.ppd.gz \`
		`+ ppd/hpcups/hp-laserjet_tank_150x.ppd.gz \`
		`+ ppd/hpcups/hp-laserjet_tank_250x.ppd.gz \`
		`+ @@ -4106,6 +4108,7 @@ dist_unrel_DATA =`
		`+ @HPLIP_CLASS_DRIVER_FALSE@ ppd/hpcups/hp-laserjet_cm1418fnw-pcl3.ppd.gz \`
		`+ @HPLIP_CLASS_DRIVER_FALSE@ ppd/hpcups/hp-laserjet_cp1025.ppd.gz \`
		`+ @HPLIP_CLASS_DRIVER_FALSE@ ppd/hpcups/hp-laserjet_cp1025nw.ppd.gz \`
		`+ +@HPLIP_CLASS_DRIVER_FALSE@ ppd/hpcups/hp-laserjet_cp_1025nw.ppd.gz \`
		`+ @HPLIP_CLASS_DRIVER_FALSE@ ppd/hpcups/hp-laserjet_m1005.ppd.gz \`
		`+ @HPLIP_CLASS_DRIVER_FALSE@ ppd/hpcups/hp-laserjet_m101-m106.ppd.gz \`
		`+ @HPLIP_CLASS_DRIVER_FALSE@ ppd/hpcups/hp-laserjet_m109-m112.ppd.gz \`
		`+ @@ -4222,6 +4225,7 @@ dist_unrel_DATA =`
		`+ @HPLIP_CLASS_DRIVER_FALSE@ ppd/hpcups/hp-laserjet_professional_p1607dn.ppd.gz \`
		`+ @HPLIP_CLASS_DRIVER_FALSE@ ppd/hpcups/hp-laserjet_professional_p1608dn.ppd.gz \`
		`+ @HPLIP_CLASS_DRIVER_FALSE@ ppd/hpcups/hp-laserjet_professional_p1609dn.ppd.gz \`
		`+ +@HPLIP_CLASS_DRIVER_FALSE@ ppd/hpcups/hp-laserjet_professional_p1102w.ppd.gz \`
		`+ @HPLIP_CLASS_DRIVER_FALSE@ ppd/hpcups/hp-laserjet_professional_p_1102w.ppd.gz \`
		`+ @HPLIP_CLASS_DRIVER_FALSE@ ppd/hpcups/hp-laserjet_tank_1020.ppd.gz \`
		`+ @HPLIP_CLASS_DRIVER_FALSE@ ppd/hpcups/hp-laserjet_tank_150x.ppd.gz \`
		`+ diff --git a/cups_drv.inc b/cups_drv.inc`
		`+ index a87ea98..e39bde4 100644`
		`+ --- a/cups_drv.inc`
		`+ +++ b/cups_drv.inc`
		`+ @@ -411,6 +411,7 @@ cups_ppd_printers = \`
		`+ ppd/hpcups/hp-laserjet_cm1418fnw-pcl3.ppd.gz \`
		`+ ppd/hpcups/hp-laserjet_cp1025.ppd.gz \`
		`+ ppd/hpcups/hp-laserjet_cp1025nw.ppd.gz \`
		`+ + ppd/hpcups/hp-laserjet_cp_1025nw.ppd.gz \`
		`+ ppd/hpcups/hp-laserjet_m1005.ppd.gz \`
		`+ ppd/hpcups/hp-laserjet_m101-m106.ppd.gz \`
		`+ ppd/hpcups/hp-laserjet_m109-m112.ppd.gz \`
		`+ @@ -527,6 +528,7 @@ cups_ppd_printers = \`
		`+ ppd/hpcups/hp-laserjet_professional_p1607dn.ppd.gz \`
		`+ ppd/hpcups/hp-laserjet_professional_p1608dn.ppd.gz \`
		`+ ppd/hpcups/hp-laserjet_professional_p1609dn.ppd.gz \`
		`+ + ppd/hpcups/hp-laserjet_professional_p1102w.ppd.gz \`
		`+ ppd/hpcups/hp-laserjet_professional_p_1102w.ppd.gz \`
		`+ ppd/hpcups/hp-laserjet_tank_1020.ppd.gz \`
		`+ ppd/hpcups/hp-laserjet_tank_150x.ppd.gz \`
		`+ diff --git a/data/models/models.dat b/data/models/models.dat`
		`+ index 12e9a08..7d9650b 100644`
		`+ --- a/data/models/models.dat`
		`+ +++ b/data/models/models.dat`
		`+ @@ -2104,7 +2104,7 @@ usb-pid=411`
		`+ usb-vid=3f0`
		`+ wifi-config=0`
		`+`
		`+ -[hp_laserjet_100_colormfp_m175]`
		`+ +[hp_laserjet_100_colormfp_m175nw]`
		`+ align-type=0`
		`+ clean-type=0`
		`+ color-cal-type=0`
		`+ @@ -2119,14 +2119,6 @@ io-support=14`
		`+ job-storage=0`
		`+ linefeed-cal-type=0`
		`+ model1=HP LaserJet 100 Color MFP M175`
		`+ -model2=HP LaserJet 100 Color MFP M175a`
		`+ -model3=HP LaserJet 100 Color MFP M175b`
		`+ -model4=HP LaserJet 100 Color MFP M175c`
		`+ -model5=HP LaserJet 100 Color MFP M175e`
		`+ -model6=HP LaserJet 100 Color MFP M175nw`
		`+ -model7=HP LaserJet 100 Color MFP M175p`
		`+ -model8=HP LaserJet 100 Color MFP M175q`
		`+ -model9=HP LaserJet 100 Color MFP M175r`
		`+ ppd-name=hp-laserjet_100_color_mfp_m175-ps.ppd`
		`+ monitor-type=0`
		`+ panel-check-type=0`
		`+ @@ -2165,6 +2157,378 @@ usb-pid=62a`
		`+ usb-vid=3f0`
		`+ wifi-config=3`
		`+`
		`+ +[hp_laserjet_100_colormfp_m175r]`
		`+ +align-type=0`
		`+ +clean-type=0`
		`+ +color-cal-type=0`
		`+ +copy-type=0`
		`+ +embedded-server-type=1`
		`+ +fax-type=0`
		`+ +fw-download=False`
		`+ +icon=hp_color_laserjet_cm1312_mfp.png`
		`+ +io-mfp-mode=3`
		`+ +io-mode=1`
		`+ +io-support=14`
		`+ +job-storage=0`
		`+ +linefeed-cal-type=0`
		`+ +model1=HP LaserJet 100 Color MFP M175`
		`+ +ppd-name=hp-laserjet_100_color_mfp_m175-ps.ppd`
		`+ +monitor-type=0`
		`+ +panel-check-type=0`
		`+ +pcard-type=0`
		`+ +plugin=1`
		`+ +plugin-reason=64`
		`+ +power-settings=0`
		`+ +pq-diag-type=0`
		`+ +r-type=0`
		`+ +r0-agent1-kind=4`
		`+ +r0-agent1-sku=CE310A`
		`+ +r0-agent1-type=1`
		`+ +r0-agent2-kind=4`
		`+ +r0-agent2-sku=CE311A`
		`+ +r0-agent2-type=4`
		`+ +r0-agent3-kind=4`
		`+ +r0-agent3-sku=CE313A`
		`+ +r0-agent3-type=5`
		`+ +r0-agent4-kind=4`
		`+ +r0-agent4-sku=CE312A`
		`+ +r0-agent4-type=6`
		`+ +scan-src=3`
		`+ +scan-type=5`
		`+ +status-battery-check=0`
		`+ +status-dynamic-counters=0`
		`+ +status-type=10`
		`+ +support-released=True`
		`+ +support-subtype=219b2b`
		`+ +support-type=2`
		`+ +support-ver=3.11.7`
		`+ +tech-class=Postscript`
		`+ +family-class=Undefined`
		`+ +tech-subclass=Normal`
		`+ +tech-type=4`
		`+ +usb-pid=62a`
		`+ +usb-vid=3f0`
		`+ +wifi-config=3`
		`+ +`
		`+ +[hp_laserjet_100_colormfp_m175q]`
		`+ +align-type=0`
		`+ +clean-type=0`
		`+ +color-cal-type=0`
		`+ +copy-type=0`
		`+ +embedded-server-type=1`
		`+ +fax-type=0`
		`+ +fw-download=False`
		`+ +icon=hp_color_laserjet_cm1312_mfp.png`
		`+ +io-mfp-mode=3`
		`+ +io-mode=1`
		`+ +io-support=14`
		`+ +job-storage=0`
		`+ +linefeed-cal-type=0`
		`+ +model1=HP LaserJet 100 Color MFP M175`
		`+ +ppd-name=hp-laserjet_100_color_mfp_m175-ps.ppd`
		`+ +monitor-type=0`
		`+ +panel-check-type=0`
		`+ +pcard-type=0`
		`+ +plugin=1`
		`+ +plugin-reason=64`
		`+ +power-settings=0`
		`+ +pq-diag-type=0`
		`+ +r-type=0`
		`+ +r0-agent1-kind=4`
		`+ +r0-agent1-sku=CE310A`
		`+ +r0-agent1-type=1`
		`+ +r0-agent2-kind=4`
		`+ +r0-agent2-sku=CE311A`
		`+ +r0-agent2-type=4`
		`+ +r0-agent3-kind=4`
		`+ +r0-agent3-sku=CE313A`
		`+ +r0-agent3-type=5`
		`+ +r0-agent4-kind=4`
		`+ +r0-agent4-sku=CE312A`
		`+ +r0-agent4-type=6`
		`+ +scan-src=3`
		`+ +scan-type=5`
		`+ +status-battery-check=0`
		`+ +status-dynamic-counters=0`
		`+ +status-type=10`
		`+ +support-released=True`
		`+ +support-subtype=219b2b`
		`+ +support-type=2`
		`+ +support-ver=3.11.7`
		`+ +tech-class=Postscript`
		`+ +family-class=Undefined`
		`+ +tech-subclass=Normal`
		`+ +tech-type=4`
		`+ +usb-pid=62a`
		`+ +usb-vid=3f0`
		`+ +wifi-config=3`
		`+ +`
		`+ +[hp_laserjet_100_colormfp_m175p]`
		`+ +align-type=0`
		`+ +clean-type=0`
		`+ +color-cal-type=0`
		`+ +copy-type=0`
		`+ +embedded-server-type=1`
		`+ +fax-type=0`
		`+ +fw-download=False`
		`+ +icon=hp_color_laserjet_cm1312_mfp.png`
		`+ +io-mfp-mode=3`
		`+ +io-mode=1`
		`+ +io-support=14`
		`+ +job-storage=0`
		`+ +linefeed-cal-type=0`
		`+ +model1=HP LaserJet 100 Color MFP M175`
		`+ +ppd-name=hp-laserjet_100_color_mfp_m175-ps.ppd`
		`+ +monitor-type=0`
		`+ +panel-check-type=0`
		`+ +pcard-type=0`
		`+ +plugin=1`
		`+ +plugin-reason=64`
		`+ +power-settings=0`
		`+ +pq-diag-type=0`
		`+ +r-type=0`
		`+ +r0-agent1-kind=4`
		`+ +r0-agent1-sku=CE310A`
		`+ +r0-agent1-type=1`
		`+ +r0-agent2-kind=4`
		`+ +r0-agent2-sku=CE311A`
		`+ +r0-agent2-type=4`
		`+ +r0-agent3-kind=4`
		`+ +r0-agent3-sku=CE313A`
		`+ +r0-agent3-type=5`
		`+ +r0-agent4-kind=4`
		`+ +r0-agent4-sku=CE312A`
		`+ +r0-agent4-type=6`
		`+ +scan-src=3`
		`+ +scan-type=5`
		`+ +status-battery-check=0`
		`+ +status-dynamic-counters=0`
		`+ +status-type=10`
		`+ +support-released=True`
		`+ +support-subtype=219b2b`
		`+ +support-type=2`
		`+ +support-ver=3.11.7`
		`+ +tech-class=Postscript`
		`+ +family-class=Undefined`
		`+ +tech-subclass=Normal`
		`+ +tech-type=4`
		`+ +usb-pid=62a`
		`+ +usb-vid=3f0`
		`+ +wifi-config=3`
		`+ +`
		`+ +[hp_laserjet_100_colormfp_m175e]`
		`+ +align-type=0`
		`+ +clean-type=0`
		`+ +color-cal-type=0`
		`+ +copy-type=0`
		`+ +embedded-server-type=1`
		`+ +fax-type=0`
		`+ +fw-download=False`
		`+ +icon=hp_color_laserjet_cm1312_mfp.png`
		`+ +io-mfp-mode=3`
		`+ +io-mode=1`
		`+ +io-support=2`
		`+ +job-storage=0`
		`+ +linefeed-cal-type=0`
		`+ +model1=HP LaserJet 100 Color MFP M175`
		`+ +ppd-name=hp-laserjet_100_color_mfp_m175-ps.ppd`
		`+ +monitor-type=0`
		`+ +panel-check-type=0`
		`+ +pcard-type=0`
		`+ +plugin=1`
		`+ +plugin-reason=64`
		`+ +power-settings=0`
		`+ +pq-diag-type=0`
		`+ +r-type=0`
		`+ +r0-agent1-kind=4`
		`+ +r0-agent1-sku=CE310A`
		`+ +r0-agent1-type=1`
		`+ +r0-agent2-kind=4`
		`+ +r0-agent2-sku=CE311A`
		`+ +r0-agent2-type=4`
		`+ +r0-agent3-kind=4`
		`+ +r0-agent3-sku=CE313A`
		`+ +r0-agent3-type=5`
		`+ +r0-agent4-kind=4`
		`+ +r0-agent4-sku=CE312A`
		`+ +r0-agent4-type=6`
		`+ +scan-src=3`
		`+ +scan-type=5`
		`+ +status-battery-check=0`
		`+ +status-dynamic-counters=0`
		`+ +status-type=10`
		`+ +support-released=True`
		`+ +support-subtype=219b2b`
		`+ +support-type=2`
		`+ +support-ver=3.11.7`
		`+ +tech-class=Postscript`
		`+ +family-class=Undefined`
		`+ +tech-subclass=Normal`
		`+ +tech-type=4`
		`+ +usb-pid=62a`
		`+ +usb-vid=3f0`
		`+ +wifi-config=-1`
		`+ +`
		`+ +[hp_laserjet_100_colormfp_m175a]`
		`+ +align-type=0`
		`+ +clean-type=0`
		`+ +color-cal-type=0`
		`+ +copy-type=0`
		`+ +embedded-server-type=1`
		`+ +ppd-name=hp-laserjet_100_color_mfp_m175-ps.ppd`
		`+ +family-ppd=hp-postscript-laserjet-pro.ppd`
		`+ +fax-type=0`
		`+ +fw-download=False`
		`+ +icon=hp_color_laserjet_cm1312_mfp.png`
		`+ +io-mfp-mode=3`
		`+ +io-mode=1`
		`+ +io-support=2`
		`+ +job-storage=0`
		`+ +linefeed-cal-type=0`
		`+ +model1=HP LaserJet 100 Color MFP M175`
		`+ +monitor-type=0`
		`+ +panel-check-type=0`
		`+ +pcard-type=0`
		`+ +plugin=1`
		`+ +plugin-reason=64`
		`+ +power-settings=0`
		`+ +pq-diag-type=0`
		`+ +r-type=0`
		`+ +r0-agent1-kind=4`
		`+ +r0-agent1-sku=CE310A`
		`+ +r0-agent1-type=1`
		`+ +r0-agent2-kind=4`
		`+ +r0-agent2-sku=CE311A`
		`+ +r0-agent2-type=4`
		`+ +r0-agent3-kind=4`
		`+ +r0-agent3-sku=CE313A`
		`+ +r0-agent3-type=5`
		`+ +r0-agent4-kind=4`
		`+ +r0-agent4-sku=CE312A`
		`+ +r0-agent4-type=6`
		`+ +scan-src=3`
		`+ +scan-type=5`
		`+ +status-battery-check=0`
		`+ +status-dynamic-counters=0`
		`+ +status-type=10`
		`+ +support-released=True`
		`+ +support-subtype=219b2b`
		`+ +support-type=2`
		`+ +support-ver=3.11.7`
		`+ +tech-class=Postscript`
		`+ +family-class=Undefined`
		`+ +tech-subclass=Normal`
		`+ +tech-type=4`
		`+ +usb-pid=62a`
		`+ +usb-vid=3f0`
		`+ +wifi-config=-1`
		`+ +`
		`+ +[hp_laserjet_100_colormfp_m175c]`
		`+ +align-type=0`
		`+ +clean-type=0`
		`+ +color-cal-type=0`
		`+ +copy-type=0`
		`+ +embedded-server-type=1`
		`+ +fax-type=0`
		`+ +fw-download=False`
		`+ +icon=hp_color_laserjet_cm1312_mfp.png`
		`+ +io-mfp-mode=3`
		`+ +io-mode=1`
		`+ +io-support=2`
		`+ +job-storage=0`
		`+ +linefeed-cal-type=0`
		`+ +model1=HP LaserJet 100 Color MFP M175`
		`+ +ppd-name=hp-laserjet_100_color_mfp_m175-ps.ppd`
		`+ +monitor-type=0`
		`+ +panel-check-type=0`
		`+ +pcard-type=0`
		`+ +plugin=1`
		`+ +plugin-reason=64`
		`+ +power-settings=0`
		`+ +pq-diag-type=0`
		`+ +r-type=0`
		`+ +r0-agent1-kind=4`
		`+ +r0-agent1-sku=CE310A`
		`+ +r0-agent1-type=1`
		`+ +r0-agent2-kind=4`
		`+ +r0-agent2-sku=CE311A`
		`+ +r0-agent2-type=4`
		`+ +r0-agent3-kind=4`
		`+ +r0-agent3-sku=CE313A`
		`+ +r0-agent3-type=5`
		`+ +r0-agent4-kind=4`
		`+ +r0-agent4-sku=CE312A`
		`+ +r0-agent4-type=6`
		`+ +scan-src=3`
		`+ +scan-type=5`
		`+ +status-battery-check=0`
		`+ +status-dynamic-counters=0`
		`+ +status-type=10`
		`+ +support-released=True`
		`+ +support-subtype=219b2b`
		`+ +support-type=2`
		`+ +support-ver=3.11.7`
		`+ +tech-class=Postscript`
		`+ +family-class=Undefined`
		`+ +tech-subclass=Normal`
		`+ +tech-type=4`
		`+ +usb-pid=62a`
		`+ +usb-vid=3f0`
		`+ +wifi-config=-1`
		`+ +`
		`+ +[hp_laserjet_100_colormfp_m175b]`
		`+ +align-type=0`
		`+ +clean-type=0`
		`+ +color-cal-type=0`
		`+ +copy-type=0`
		`+ +embedded-server-type=1`
		`+ +fax-type=0`
		`+ +fw-download=False`
		`+ +icon=hp_color_laserjet_cm1312_mfp.png`
		`+ +io-mfp-mode=3`
		`+ +io-mode=1`
		`+ +io-support=2`
		`+ +job-storage=0`
		`+ +linefeed-cal-type=0`
		`+ +model1=HP LaserJet 100 Color MFP M175`
		`+ +ppd-name=hp-laserjet_100_color_mfp_m175-ps.ppd`
		`+ +monitor-type=0`
		`+ +panel-check-type=0`
		`+ +pcard-type=0`
		`+ +plugin=1`
		`+ +plugin-reason=64`
		`+ +power-settings=0`
		`+ +pq-diag-type=0`
		`+ +r-type=0`
		`+ +r0-agent1-kind=4`
		`+ +r0-agent1-sku=CE310A`
		`+ +r0-agent1-type=1`
		`+ +r0-agent2-kind=4`
		`+ +r0-agent2-sku=CE311A`
		`+ +r0-agent2-type=4`
		`+ +r0-agent3-kind=4`
		`+ +r0-agent3-sku=CE313A`
		`+ +r0-agent3-type=5`
		`+ +r0-agent4-kind=4`
		`+ +r0-agent4-sku=CE312A`
		`+ +r0-agent4-type=6`
		`+ +scan-src=3`
		`+ +scan-type=5`
		`+ +status-battery-check=0`
		`+ +status-dynamic-counters=0`
		`+ +status-type=10`
		`+ +support-released=True`
		`+ +support-subtype=219b2b`
		`+ +support-type=2`
		`+ +support-ver=3.11.7`
		`+ +tech-class=Postscript`
		`+ +family-class=Undefined`
		`+ +tech-subclass=Normal`
		`+ +tech-type=4`
		`+ +usb-pid=62a`
		`+ +usb-vid=3f0`
		`+ +wifi-config=-1`
		`+ +`
		`+ [officejet_100_mobile_l411]`
		`+ align-type=-1`
		`+ clean-type=1`
		`+ @@ -17867,6 +18231,58 @@ usb-pid=2c17`
		`+ usb-vid=3f0`
		`+ wifi-config=0`
		`+`
		`+ +[hp_laserjet_cp_1025nw]`
		`+ +align-type=0`
		`+ +clean-type=0`
		`+ +color-cal-type=0`
		`+ +copy-type=0`
		`+ +embedded-server-type=1`
		`+ +fax-type=0`
		`+ +fw-download=False`
		`+ +icon=hp_color_laserjet_cp2025.png`
		`+ +io-mfp-mode=1`
		`+ +io-mode=1`
		`+ +io-support=14`
		`+ +job-storage=0`
		`+ +linefeed-cal-type=0`
		`+ +model1=HP LaserJet Pro CP 1025nw Color Printer Series`
		`+ +monitor-type=0`
		`+ +panel-check-type=0`
		`+ +pcard-type=0`
		`+ +plugin=1`
		`+ +plugin-reason=1`
		`+ +power-settings=0`
		`+ +pq-diag-type=0`
		`+ +r-type=0`
		`+ +r0-agent1-kind=4`
		`+ +r0-agent1-sku=CE310A`
		`+ +r0-agent1-type=1`
		`+ +r0-agent2-kind=4`
		`+ +r0-agent2-sku=CE311A`
		`+ +r0-agent2-type=4`
		`+ +r0-agent3-kind=4`
		`+ +r0-agent3-sku=CE313A`
		`+ +r0-agent3-type=5`
		`+ +r0-agent4-kind=4`
		`+ +r0-agent4-sku=CE312A`
		`+ +r0-agent4-type=6`
		`+ +scan-src=0`
		`+ +scan-type=0`
		`+ +status-battery-check=0`
		`+ +status-dynamic-counters=0`
		`+ +status-type=8`
		`+ +support-released=True`
		`+ +support-subtype=219b2b`
		`+ +support-type=2`
		`+ +support-ver=3.12.4`
		`+ +tech-class=LJZjsColor`
		`+ +family-class=LJ-Class4`
		`+ +tech-subclass=Advanced`
		`+ +tech-type=4`
		`+ +usb-pid=112a`
		`+ +usb-vid=3f0`
		`+ +wifi-config=3`
		`+ +`
		`+ [hp_laserjet_cp1025nw]`
		`+ align-type=0`
		`+ clean-type=0`
		`+ @@ -18468,6 +18884,49 @@ usb-pid=3011`
		`+ usb-vid=3f0`
		`+ wifi-config=0`
		`+`
		`+ +[hp_laserjet_professional_p1102w]`
		`+ +align-type=0`
		`+ +clean-type=0`
		`+ +color-cal-type=0`
		`+ +copy-type=0`
		`+ +embedded-server-type=0`
		`+ +fax-type=0`
		`+ +fw-download=False`
		`+ +icon=HP_LaserJet_1012.png`
		`+ +io-mfp-mode=6`
		`+ +io-mode=1`
		`+ +io-support=10`
		`+ +job-storage=0`
		`+ +linefeed-cal-type=0`
		`+ +model1=HP LaserJet Professional P1102w Printer`
		`+ +monitor-type=0`
		`+ +panel-check-type=0`
		`+ +pcard-type=0`
		`+ +plugin=1`
		`+ +plugin-reason=1`
		`+ +power-settings=0`
		`+ +pq-diag-type=0`
		`+ +r-type=0`
		`+ +r0-agent1-kind=4`
		`+ +r0-agent1-sku=85A`
		`+ +r0-agent1-type=1`
		`+ +scan-src=0`
		`+ +scan-type=0`
		`+ +status-battery-check=0`
		`+ +status-dynamic-counters=0`
		`+ +status-type=8`
		`+ +support-released=True`
		`+ +support-subtype=219b2b`
		`+ +support-type=2`
		`+ +support-ver=3.10.4`
		`+ +tech-class=LJZjsMono`
		`+ +family-class=LJ-Class4`
		`+ +tech-subclass=NoAutoDuplex`
		`+ +tech-type=3`
		`+ +usb-pid=32a`
		`+ +usb-vid=3f0`
		`+ +wifi-config=3`
		`+ +`
		`+ [hp_laserjet_professional_p1102]`
		`+ align-type=0`
		`+ clean-type=0`
		`+ diff --git a/prnt/drv/hpcups.drv.in b/prnt/drv/hpcups.drv.in`
		`+ index 494758d..af65389 100644`
		`+ --- a/prnt/drv/hpcups.drv.in`
		`+ +++ b/prnt/drv/hpcups.drv.in`
		`+ @@ -22688,6 +22688,14 @@ Group "RLT/HP Real Life Technologies"`
		`+ Attribute "Product" "" "(HP LaserJet Professional p1102 Printer)"`
		`+ Attribute "Product" "" "(HP LaserJet Professional p1102s Printer)"`
		`+ }`
		`+ + {`
		`+ + ModelName "HP LaserJet Professional p1102w"`
		`+ + Attribute "NickName" "" "HP LaserJet Professional p1102w, hpcups $Version, requires proprietary plugin"`
		`+ + Attribute "ShortNickName" "" "HP LaserJet Professional p1102w hpijs"`
		`+ + Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:hp laserjet professional p1102w;DES:hp laserjet professional p1102w;"`
		`+ + PCFileName "hp-laserjet_professional_p1102w.ppd"`
		`+ + Attribute "Product" "" "(HP LaserJet Professional p1102w Printer)"`
		`+ + }`
		`+ {`
		`+ ModelName "HP LaserJet Professional p1106"`
		`+ Attribute "NickName" "" "HP LaserJet Professional p1106, hpcups $Version"`
		`+ @@ -23122,6 +23130,14 @@ Group "RLT/HP Real Life Technologies"`
		`+ PCFileName "hp-laserjet_cp1025nw.ppd"`
		`+ Attribute "Product" "" "(HP LaserJet Pro cp1025nw Color Printer Series)"`
		`+ }`
		`+ + {`
		`+ + ModelName "HP LaserJet Cp 1025nw"`
		`+ + Attribute "NickName" "" "HP LaserJet Cp 1025nw, hpcups $Version, requires proprietary plugin"`
		`+ + Attribute "ShortNickName" "" "HP LaserJet Cp 1025nw hpijs"`
		`+ + Attribute "1284DeviceID" "" "MFG:Hewlett-Packard;MDL:hp laserjet cp 1025nw;DES:hp laserjet cp 1025nw;"`
		`+ + PCFileName "hp-laserjet_cp_1025nw.ppd"`
		`+ + Attribute "Product" "" "(HP LaserJet Pro Cp 1025nw Color Printer Series)"`
		`+ + }`
		`+ }`
		`+ } // End LJZjsColor (for proprietary plugin)`
		`+`

libre/hplip/0025-Remove-all-ImageProcessor-functionality-which-is-clo.patch

file removed

-113

		`@@ -1,113 +0,0 @@`
		`- From fa9c0cf1a5db9bf8880b4796d5e3e0da46534e3d Mon Sep 17 00:00:00 2001`
		`- From: Didier Raboud <odyx@debian.org>`
		`- Date: Tue, 21 Aug 2018 18:18:10 +0200`
		`- Subject: Remove all ImageProcessor functionality, which is closed-source`
		`-`
		`- ---`
		`- Makefile.am \| 14 ++------------`
		`- prnt/hpcups/HPCupsFilter.cpp \| 21 ---------------------`
		`- 2 files changed, 2 insertions(+), 33 deletions(-)`
		`-`
		`- diff --git a/Makefile.am b/Makefile.am`
		`- index 1b097c4f9..8d5d78c9f 100644`
		`- --- a/Makefile.am`
		`- +++ b/Makefile.am`
		`- @@ -166,7 +166,7 @@ if !HPLIP_CLASS_DRIVER`
		`- dist_hplip_SCRIPTS = hpssd.py __init__.py hpdio.py`
		`- endif #HPLIP_CLASS_DRIVER`
		`-`
		`- -dist_noinst_DATA += prnt/drv/hpijs.drv.in.template prnt/drv/hpcups.drv.in.template prnt/hpcups/libImageProcessor-x86_64.so prnt/hpcups/libImageProcessor-x86_32.so`
		`- +dist_noinst_DATA += prnt/drv/hpijs.drv.in.template prnt/drv/hpcups.drv.in.template`
		`- dist_noinst_SCRIPTS += dat2drv.py install.py hplip-install init-suse-firewall init-iptables-firewall class_rpm_build.sh hplipclassdriver.spec createPPD.sh Makefile_dat2drv hpijs-drv`
		`-`
		`- if !HPLIP_CLASS_DRIVER`
		`- @@ -594,7 +594,7 @@ hpcups_SOURCES = prnt/hpcups/HPCupsFilter.cpp prnt/hpcups/HPCupsFilter.h prnt/hp`
		`- prnt/hpcups/ImageProcessor.h`
		`-`
		`- hpcups_CXXFLAGS = $(APDK_ENDIAN_FLAG) $(DBUS_CFLAGS)`
		`- -hpcups_LDADD = -L./prnt/hpcups/ -ljpeg -ldl -lImageProcessor -lcups -lcupsimage -lz $(DBUS_LIBS)`
		`- +hpcups_LDADD = -L./prnt/hpcups/ -ljpeg -ldl -lcups -lcupsimage -lz $(DBUS_LIBS)`
		`- #else`
		`- #hpcupsdir = $(cupsfilterdir)`
		`- #hpcups_PROGRAMS = hpcups`
		`- @@ -686,16 +686,6 @@ endif #HPLIP_CLASS_DRIVER`
		`-`
		`- install-data-hook:`
		`- if HPLIP_BUILD`
		`- - if [ $ "$(UNAME)" = "x86_64" -a -d "$(libdir)/" $ ]; then \`
		`- - cp prnt/hpcups/libImageProcessor-x86_64.so $(libdir)/ ; \`
		`- - chmod 775 $(libdir)/libImageProcessor-x86_64.so ; \`
		`- - ln -sf $(libdir)/libImageProcessor-x86_64.so $(libdir)/libImageProcessor.so ; \`
		`- - fi; \`
		`- - if [ $ \( "$(UNAME)" = "i686" -o "$(UNAME)" = "i386" $ -a -d "$(libdir)/" \) ]; then \`
		`- - cp prnt/hpcups/libImageProcessor-x86_32.so $(libdir)/ ; \`
		`- - chmod 775 $(libdir)/libImageProcessor-x86_32.so ; \`
		`- - ln -sf $(libdir)/libImageProcessor-x86_32.so $(libdir)/libImageProcessor.so ; \`
		`- - fi`
		`- if !HPLIP_CLASS_DRIVER`
		`- # If scanner build, add hpaio entry to sane dll.conf.`
		`- if [ "$(scan_build)" = "yes" ]; then \`
		`- diff --git a/prnt/hpcups/HPCupsFilter.cpp b/prnt/hpcups/HPCupsFilter.cpp`
		`- index 5b282d83f..0bacfafac 100644`
		`- --- a/prnt/hpcups/HPCupsFilter.cpp`
		`- +++ b/prnt/hpcups/HPCupsFilter.cpp`
		`- @@ -31,7 +31,6 @@`
		`- \*****************************************************************************/`
		`-`
		`- #include "HPCupsFilter.h"`
		`- -#include "ImageProcessor.h"`
		`-`
		`- #include <signal.h>`
		`- #include <sys/wait.h>`
		`- @@ -637,16 +636,10 @@ int HPCupsFilter::processRasterData(cups_raster_t *cups_raster)`
		`-`
		`-`
		`- sprintf(hpPreProcessedRasterFile, "%s/hp_%s_cups_SwapedPagesXXXXXX",CUPS_TMP_DIR, m_JA.user_name);`
		`- - image_processor_t* imageProcessor = imageProcessorCreate();`
		`-`
		`- while (cupsRasterReadHeader2(cups_raster, &cups_header))`
		`- {`
		`-`
		`- - IMAGE_PROCESSOR_ERROR result = imageProcessorStartPage(imageProcessor, &cups_header);`
		`- - if (result != IPE_SUCCESS){`
		`- - dbglog("DEBUG: imageProcessorStartPage failed result = %d\n", result);`
		`- - }`
		`- -`
		`- current_page_number++;`
		`-`
		`- if (current_page_number == 1) {`
		`- @@ -745,12 +738,6 @@ int HPCupsFilter::processRasterData(cups_raster_t *cups_raster)`
		`- color_raster = rgbRaster;`
		`- black_raster = kRaster;`
		`-`
		`- - result = imageProcessorProcessLine(imageProcessor, m_pPrinterBuffer, cups_header.cupsBytesPerLine);`
		`- - if (result != IPE_SUCCESS){`
		`- - dbglog("DEBUG: imageProcessorProcessLine failed result = %d\n", result);`
		`- - }`
		`- -`
		`- -`
		`- if ((y == 0) && !is_ljmono) {`
		`- //For ljmono, make sure that first line is not a blankRaster line.Otherwise printer`
		`- //may not skip blank lines before actual data`
		`- @@ -780,12 +767,6 @@ int HPCupsFilter::processRasterData(cups_raster_t *cups_raster)`
		`- }`
		`- } // for() loop end`
		`-`
		`- - result = imageProcessorEndPage(imageProcessor);`
		`- - if (result != IPE_SUCCESS){`
		`- - dbglog("DEBUG: imageProcessorEndPage failed result = %d\n", result);`
		`- - }`
		`- -`
		`- -`
		`- m_Job.NewPage();`
		`- if (err != NO_ERROR) {`
		`- break;`
		`- @@ -800,8 +781,6 @@ int HPCupsFilter::processRasterData(cups_raster_t *cups_raster)`
		`- rgbRaster = NULL;`
		`- }`
		`-`
		`- - imageProcessorDestroy(imageProcessor);`
		`- -`
		`- unlink(hpPreProcessedRasterFile);`
		`- return ret_status;`
		`- }`

libre/hplip/0025_fix-Werror-format-security.patch

file added

+47

		`@@ -0,0 +1,47 @@`
		`+ --- hplip-3.22.6/protocol/hp_ipp.c 2022-06-28 20:44:38.000000000 +0200`
		`+ +++ hplip-3.22.6/protocol/hp_ipp.c.new 2022-06-28 20:56:14.336097721 +0200`
		`+ @@ -110,7 +110,7 @@`
		`+ }`
		`+`
		`+ if ( info == NULL )`
		`+ - snprintf( info,sizeof(info), name );`
		`+ + snprintf( info, sizeof(info), "%s", name );`
		`+`
		`+ sprintf( printer_uri, "ipp://localhost/printers/%s", name );`
		`+`
		`+ --- hplip-3.22.6/protocol/hp_ipp.c 2022-06-28 21:08:10.000000000 +0200`
		`+ +++ hplip-3.22.6/protocol/hp_ipp.c.new 2022-06-28 21:14:15.921484059 +0200`
		`+ @@ -511,27 +511,27 @@`
		`+`
		`+ if ( strcmp(attr_name, "printer-name") == 0 &&`
		`+ val_tag == IPP_TAG_NAME ) {`
		`+ - snprintf(t_printer->name, sizeof(t_printer->name),ippGetString(attr, 0, NULL) );`
		`+ + snprintf(t_printer->name, sizeof(t_printer->name), "%s", ippGetString(attr, 0, NULL) );`
		`+ }`
		`+ else if ( strcmp(attr_name, "device-uri") == 0 &&`
		`+ val_tag == IPP_TAG_URI ) {`
		`+ - snprintf(t_printer->device_uri,sizeof(t_printer->device_uri), ippGetString(attr, 0, NULL) );`
		`+ + snprintf(t_printer->device_uri,sizeof(t_printer->device_uri), "%s", ippGetString(attr, 0, NULL) );`
		`+ }`
		`+ else if ( strcmp(attr_name, "printer-uri-supported") == 0 &&`
		`+ val_tag == IPP_TAG_URI ) {`
		`+ - snprintf(t_printer->printer_uri,sizeof(t_printer->printer_uri), ippGetString(attr, 0, NULL) );`
		`+ + snprintf(t_printer->printer_uri,sizeof(t_printer->printer_uri), "%s", ippGetString(attr, 0, NULL) );`
		`+ }`
		`+ else if ( strcmp(attr_name, "printer-info") == 0 &&`
		`+ val_tag == IPP_TAG_TEXT ) {`
		`+ - snprintf(t_printer->info,sizeof(t_printer->info), ippGetString(attr, 0, NULL) );`
		`+ + snprintf(t_printer->info,sizeof(t_printer->info), "%s", ippGetString(attr, 0, NULL) );`
		`+ }`
		`+ else if ( strcmp(attr_name, "printer-location") == 0 &&`
		`+ val_tag == IPP_TAG_TEXT ) {`
		`+ - snprintf(t_printer->location,sizeof(t_printer->location),ippGetString(attr, 0, NULL) );`
		`+ + snprintf(t_printer->location,sizeof(t_printer->location),"%s", ippGetString(attr, 0, NULL) );`
		`+ }`
		`+ else if ( strcmp(attr_name, "printer-make-and-model") == 0 &&`
		`+ val_tag == IPP_TAG_TEXT ) {`
		`+ - snprintf(t_printer->make_model,sizeof(t_printer->make_model),ippGetString(attr, 0, NULL) );`
		`+ + snprintf(t_printer->make_model,sizeof(t_printer->make_model),"%s", ippGetString(attr, 0, NULL) );`
		`+ }`
		`+ else if ( strcmp(attr_name, "printer-state") == 0 &&`
		`+ val_tag == IPP_TAG_ENUM ) {`

libre/hplip/PKGBUILD

file modified

+44 -47

		`@@ -1,16 +1,16 @@`
		`- # Maintainer (Arch): Andreas Radke <andyrtr@archlinux.org>`
		`- # Maintainer (Arch): Tom Gundersen <teg@jklm.no>`
		`- # Contributor (Arch): Rémy Oudompheng <remy@archlinux.org>`
		`- # Contributor (Arch): Morgan LEFIEUX <comete@archlinuxfr.org>`
		`- # Maintainer (Hyperbola): André Silva <emulatorman@hyperbola.info>`
		`- # Contributor (Hyperbola): Márcio Silva <coadde@hyperbola.info>`
		`- # Contributor (Hyperbola): Jorge López <jorginho@hyperbola.info>`
		`+ # Maintainer (arch): Andreas Radke <andyrtr@archlinux.org>`
		`+ # Maintainer (arch): Tom Gundersen <teg@jklm.no>`
		`+ # Contributor: Rémy Oudompheng <remy@archlinux.org>`
		`+ # Contributor: Morgan LEFIEUX <comete@archlinuxfr.org>`
		`+ # Contributor: André Silva <emulatorman@hyperbola.info>`
		`+ # Contributor: Márcio Silva <coadde@hyperbola.info>`
		`+ # Contributor: Jorge López <jorginho@hyperbola.info>`
		`# Maintainer: Omar Vega Ramos <ovruni@gnu.org.pe>`
		`# Maintainer: David P. <megver83@parabola.nu>`

		`pkgname=hplip`
		`- pkgver=3.20.6`
		`- pkgrel=3`
		`+ pkgver=3.22.6`
		`+ pkgrel=1`
		`pkgrel+=.par1`
		`epoch=1`
		`pkgdesc="Drivers for HP DeskJet, OfficeJet, Photosmart, Business Inkjet and some LaserJet"`
		`@@ -35,31 +35,52 @@`
		`backup=('etc/hp/hplip.conf' 'etc/sane.d/dll.d/hpaio')`
		`source=(https://downloads.sourceforge.net/${pkgname}/$pkgname-$pkgver.tar.gz{,.asc}`
		`disable_upgrade.patch`
		`+ 0003-models.dat-Re-add-drivers-missing-from-3.19.1.patch`
		`0022-Add-include-cups-ppd.h-in-various-places-as-CUPS-2.2.patch`
		`0023-Fix-handling-of-unicode-filenames-in-sixext.py.patch`
		`- 0025-Remove-all-ImageProcessor-functionality-which-is-clo.patch`
		`- https://launchpadlibrarian.net/480406888/hplip-configure-python.patch`
		`+ 0025_fix-Werror-format-security.patch`
		`+ # use the one from Fedora`
		`+ hplip-configure-python.patch`
		`python3.diff`
		`- reproducible-gzip.patch`
		`- hplip-revert-plugins.patch)`
		`- sha512sums=('ccd82112afb5ee73f5d027819ab89ba8f52ec36a4b061d314565f95d288be24e045050c3368332eeae50c0fb170f8cb015fdd8dde4b32a08e3758f0f0f4e8e96'`
		`+ reproducible-gzip.patch)`
		`+ sha512sums=('cb25c07c767d3d8921468429ef154401a4df9d2fdf87ead3ab18f0d06e1bd3de610843b8131641a1af8d920c7e15e290a0923405bf609cdc0a3fba9df93ddb5e'`
		`'SKIP'`
		`- 'f0cf2774e53070406e89614b748e3c45079be889b83d5854340b92093643f6f8b332d6b6e617884d2bdcbef667a84ee5741b07c5fb080bb04925bb454af448d1'`
		`+ 'ee0bd240568a7dbb4dc6ef64dba28ea84c4bedf7d688d054960c686666f8f0bc4562961c40845107ef0c936e60d3e676bffb2a1ba708039690bb0520cda3a525'`
		`+ 'f79b3f09d022178099f38b9eae1792396e730eb5352a03d088e6610d92b3895f3f65bb92089ce7f5b21d794f9716ceb176d29ca7283e8a48bb04cf6aba305a2f'`
		`'22aeb5b851f78bc6bc62e0bc3da99fecaf42d7604af41e2f3343f8d3666541f7b06b7d1a7d0ddf24f1731ac7b12dfe582375a98e3b94dfa323d6ce954549ca67'`
		`'763949a0bc460dcc9faefc86f2a91cf342781bfce696ed0c3826758572dd03ac266bbeb7b6a4f9376ac298d7d3c9c4def42d94921a8e1d1695e39396e36d95ff'`
		`- '8710e039626878270b8b7bc1569566274d935c84652d758e25ce8fe01c0f44d911148620bb494489e1238201c01f3ba255c19f7dc5c2ff0d45a5f2a79190286b'`
		`- 'c41d5812ab9b5994e06f82acb0299c69edeaed548f5df2a3578c6c6428223e9cf7ec3b746f6e3071b6c858e2b0552417ba4695e1032ea41657bf852eb3ffc3fe'`
		`- '5885b223f96706bc09a147b5c141d620846c9058563e986983ca2ab90922cabe891a651d90d5004d45549b3874c40f8a1570a8a79e067d66f1826681111c7e82'`
		`- '7bad907228b7c2f3c43128f087a2f8e03778760b7a26179ff441c1f60127e2fca08c94dff76baea2469d3a253a8f46b285d0af0f62a6d8738926caf7a10f670b'`
		`- '0dda7afaa96746a45c4720304338aea2315c983edeb8cdde4fbb98ea18421e64209947f87a374c6333ce777ea0e9565e7c5ad4c8f4c987f17d308466d02f475b')`
		`+ 'b7e67bccb2516f4d98e4c5ea55f7d2299d95bfdc341dbc0149af1423169bedcd8bcfdb125c92f373e9e7be57ea284fef80a8343035fb42572b9cb927929cd257'`
		`+ '089c102357ea5fd55d81ae76aaff62713f780fd84500c3b92ecd6b2bb11ccdc3a162978548e9a5f9e98a8354a5be3997e416c52daa18eda4621ed79a29d6fea8'`
		`+ 'b8a4c860e90a52ec566ca5a9c7f3a5ecb7386ae76e17b2c6c878073e60eeaf0cb63883b740b4725794be9914e1ab8fc91313efb288395f3095f599c07f54cf14'`
		`+ '379fcbe9dc2986da828a174a0ac4e71a1da43a98408894d5e713e09d7d9cba1e9fac30f9602b81d48d992abe6b65b6402b8a07664efe97400c5d839be33cf15f')`
		`validpgpkeys=('4ABA2F66DBD5A95894910E0673D770CDA59047B9') # HPLIP <hplip@hp.com>`

		`prepare() {`
		`cd "$pkgname"-$pkgver`

		`+ # disable insecure update - https://bugs.archlinux.org/task/38083`
		`+ patch -Np0 -i "${srcdir}"/disable_upgrade.patch`
		`+ # add missing 'include <cups/ppd.h>' at various places`
		`+ patch -Np1 -i "${srcdir}"/0022-Add-include-cups-ppd.h-in-various-places-as-CUPS-2.2.patch`
		`+ # fix some handling unicode file names FS#58412`
		`+ patch -Np1 -i "${srcdir}"/0023-Fix-handling-of-unicode-filenames-in-sixext.py.patch`
		`+ # Workaround patch for missing Python3 transition of the old`
		`+ # (pre-USB-storage) photo memory card support (pcardext) - Debian patch`
		`+ patch -Np1 -i "${srcdir}"/python3.diff`
		`+ # fix model support / Debian patch / FS#74942`
		`+ patch -Np1 -i "${srcdir}"/0003-models.dat-Re-add-drivers-missing-from-3.19.1.patch`
		`+ # fix -Werror=format-security build error with gcc 12`
		`+ patch -Np1 -i "${srcdir}"/0025_fix-Werror-format-security.patch`
		`+ # https://bugs.launchpad.net/hplip/+bug/1879445`
		`+ # broken scanning - https://bugs.archlinux.org/task/66704`
		`+ patch -Np1 -i ../hplip-configure-python.patch`
		`+`
		`+ # make gzip creation reproducible by removing the timestamp`
		`+ patch -Np1 -i ../reproducible-gzip.patch`
		`+`
		`echo "Removing printers not supported with free drivers from the database"`

		`- # based on https://devel.trisquel.info/trisquel/package-helpers/raw/master/helpers/make-hplip`
		`+ # based on https://gitlab.trisquel.org/trisquel/package-helpers/raw/nabia/helpers/make-hplip`
		`# keep header license`
		`sed '/\[/,99999d' data/models/models.dat > mktemp`

		`@@ -80,44 +101,20 @@`
		`# remove nonfree software recommendation - https://labs.parabola.nu/issues/893`
		`sed -i 's/\, requires proprietary plugin//' $(grep -rlI '[,] requires proprietary plugin')`

		`- echo "Preparing source"`
		`-`
		`- # disable insecure update - https://bugs.archlinux.org/task/38083`
		`- patch -Np0 -i "${srcdir}"/disable_upgrade.patch`
		`-`
		`- # add missing 'include <cups/ppd.h>' at various places`
		`- patch -Np1 -i "${srcdir}"/0022-Add-include-cups-ppd.h-in-various-places-as-CUPS-2.2.patch`
		`- # fix some handling unicode file names FS#58412`
		`- patch -Np1 -i "${srcdir}"/0023-Fix-handling-of-unicode-filenames-in-sixext.py.patch`
		`- # remove binary blob libImageProcessor and all linking - FS#59681`
		`- patch -Np1 -i "${srcdir}"/0025-Remove-all-ImageProcessor-functionality-which-is-clo.patch`
		`- # Workaround patch for missing Python3 transition of the old`
		`- # (pre-USB-storage) photo memory card support (pcardext) - Debian patch`
		`- patch -Np1 -i "${srcdir}"/python3.diff`
		`-`
		`- # https://bugs.launchpad.net/hplip/+bug/1879445`
		`- # broken scanning - https://bugs.archlinux.org/task/66704`
		`- patch -Np1 -i ../hplip-configure-python.patch`
		`-`
		`- # make gzip creation reproducible by removing the timestamp`
		`- patch -Np1 -i ../reproducible-gzip.patch`
		`-`
		`- # why do they disable the plugins for almost all printers??? - FS#67119`
		`- patch -Np1 -i ../hplip-revert-plugins.patch`
		`-`
		`export AUTOMAKE='automake --foreign'`
		`autoreconf --force --install`
		`}`

		`build() {`
		`cd "$pkgname"-$pkgver`
		`- #export CFLAGS+=" $(python3-config --includes)" # Fix build with python 3.8`
		`./configure --prefix=/usr \`
		`--enable-qt5 \`
		`--disable-qt4 \`
		`--enable-hpcups-install \`
		`--enable-cups-drv-install \`
		`+ --disable-imageProcessor-build \`
		`--enable-pp-build #--help`
		`+ sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool`
		`make`
		`}`

libre/hplip/disable_upgrade.patch

file modified

+1 -1

		`@@ -5,7 +5,7 @@`
		`log.set_level('debug')`

		`+`
		`- +log.error("HPLIP upgrade is disabled by Parabola for security reasons, see https://bugs.archlinux.org/task/38083 - if you like to upgrade HPLIP, use the Parabola software package manager pacman.")`
		`+ +log.error("HPLIP upgrade is disabled by Archlinux for security reasons, see https://bugs.archlinux.org/task/38083 - if you like to upgrade HPLIP, use the Archlinux software package manager pacman.")`
		`+clean_exit(1)`
		`+`
		`+`

libre/hplip/hplip-configure-python.patch

file added

+52

		`@@ -0,0 +1,52 @@`
		`+ diff -up hplip-3.20.9/configure.in.configure-python hplip-3.20.9/configure.in`
		`+ --- hplip-3.20.9/configure.in.configure-python 2020-09-23 07:24:27.000000000 +0200`
		`+ +++ hplip-3.20.9/configure.in 2020-10-02 07:27:09.082331431 +0200`
		`+ @@ -604,17 +604,29 @@ if test "$class_driver" = "no" && test "`
		`+ fi`
		`+ fi`
		`+`
		`+ -SAVE_CPPFLAGS="$CPPFLAGS"`
		+ -CFLAGS=`python-config --includes`
		`+ -if [ $? -eq 0 ]`
		`+ -then`
		`+ - echo $FLAGS`
		`+ -else`
		+ -CFLAGS=`python3-config --includes`
		`+ - if [ $? -eq 0 ]`
		`+ - then`
		`+ - echo $FLAGS`
		`+ - fi`
		`+ +AC_PATH_PROG(python3_config_path, python3-config, [AC_MSG_ERROR([python3-config not installed], 6)])`
		`+ +`
		+ +PYTHON_INCLUDES=`$python3_config_path --includes`
		`+ +if test "X$PYTHON_INCLUDES" = "X" ; then`
		`+ + AC_MSG_ERROR([Cannot get Python includes via python3-config], 6)`
		`+ +fi`
		`+ +`
		+ +PYTHON_LIBS=`$python3_config_path --libs`
		`+ +if test "X$PYTHON_LIBS" = "X" ; then`
		`+ + AC_MSG_ERROR([Cannot get Python libs via python3-config], 6)`
		`+ +fi`
		`+ +`
		`+ +SAVE_CFLAGS=$CFLAGS`
		`+ +SAVE_LIBS=$LIBS`
		`+ +`
		`+ +CFLAGS="$CFLAGS $PYTHON_INCLUDES"`
		`+ +LIBS="$LIBS $PYTHON_LIBS"`
		`+ +`
		`+ +AC_TRY_LINK(,[ ], AC_MSG_RESULT(yes); python_includes="ok", AC_MSG_ERROR([no: PYTHON DISABLED], 6))`
		`+ +`
		`+ +if test "X$python_includes" != "Xok" ; then`
		`+ + CFLAGS="$SAVE_CFLAGS"`
		`+ + LIBS="$SAVE_LIBS"`
		`+ fi`
		`+`
		+ #CFLAGS=`(python-config --includes)`
		`+ @@ -631,7 +643,6 @@ if test "$class_driver" = "no" && test "`
		`+ AS_IF([test "x$FOUND_HEADER" != "xyes"],`
		`+ [AC_MSG_ERROR([cannot find python-devel support], 6)])`
		`+ fi`
		`+ -CFLAGS="$save_CFLAGS"`
		`+`
		`+ if test "$hpijs_only_build" = "no" && test "$scan_build" = "yes" && test "$hpcups_only_build" = "no"; then`
		`+ AC_CHECK_LIB([sane], [sane_open], [LIBS="$LIBS"], [AC_MSG_ERROR([cannot find sane-backends-devel support (or --disable-scan-build)], 12)])`

libre/hplip/hplip-revert-plugins.patch

file removed

-1312

		`@@ -1,1312 +0,0 @@`
		`- diff --git a/data/models/models.dat b/data/models/models.dat`
		`- index 85485636e..3a430e250 100644`
		`- --- a/data/models/models.dat`
		`- +++ b/data/models/models.dat`
		`- @@ -2131,7 +2131,7 @@ ppd-name=hp-laserjet_100_color_mfp_m175-ps.ppd`
		`- monitor-type=0`
		`- panel-check-type=0`
		`- pcard-type=0`
		`- -plugin=0`
		`- +plugin=1`
		`- plugin-reason=64`
		`- power-settings=0`
		`- pq-diag-type=0`
		`- @@ -3913,8 +3913,8 @@ model1=HP LaserJet Pro 200 color MFP M276nw`
		`- monitor-type=0`
		`- panel-check-type=0`
		`- pcard-type=0`
		`- -plugin=0`
		`- -plugin-reason=0`
		`- +plugin=1`
		`- +plugin-reason=64`
		`- power-settings=0`
		`- ppd-name=hp-laserjet_200_colormfp_m276-ps.ppd`
		`- family-ppd=hp-postscript-laserjet-pro.ppd`
		`- @@ -3967,8 +3967,8 @@ model1=HP LaserJet 200 Color MFP M275s`
		`- monitor-type=0`
		`- panel-check-type=0`
		`- pcard-type=0`
		`- -plugin=0`
		`- -plugin-reason=0`
		`- +plugin=1`
		`- +plugin-reason=64`
		`- power-settings=0`
		`- ppd-name=hp-laserjet_200_colormfp_m275-ps.ppd`
		`- family-ppd=hp-postscript-laserjet-pro.ppd`
		`- @@ -4021,8 +4021,8 @@ model1=HP LaserJet 200 Color MFP M275u`
		`- monitor-type=0`
		`- panel-check-type=0`
		`- pcard-type=0`
		`- -plugin=0`
		`- -plugin-reason=0`
		`- +plugin=1`
		`- +plugin-reason=64`
		`- power-settings=0`
		`- ppd-name=hp-laserjet_200_colormfp_m275-ps.ppd`
		`- family-ppd=hp-postscript-laserjet-pro.ppd`
		`- @@ -4075,8 +4075,8 @@ model1=HP LaserJet 200 Color MFP M275t`
		`- monitor-type=0`
		`- panel-check-type=0`
		`- pcard-type=0`
		`- -plugin=0`
		`- -plugin-reason=0`
		`- +plugin=1`
		`- +plugin-reason=64`
		`- power-settings=0`
		`- ppd-name=hp-laserjet_200_colormfp_m275-ps.ppd`
		`- family-ppd=hp-postscript-laserjet-pro.ppd`
		`- @@ -4128,8 +4128,8 @@ linefeed-cal-type=0`
		`- monitor-type=0`
		`- panel-check-type=0`
		`- pcard-type=0`
		`- -plugin=0`
		`- -plugin-reason=0`
		`- +plugin=1`
		`- +plugin-reason=64`
		`- power-settings=0`
		`- ppd-name=hp-laserjet_200_colormfp_m276-ps.ppd`
		`- family-ppd=hp-postscript-laserjet-pro.ppd`
		`- @@ -4181,8 +4181,8 @@ linefeed-cal-type=0`
		`- monitor-type=0`
		`- panel-check-type=0`
		`- pcard-type=0`
		`- -plugin=0`
		`- -plugin-reason=0`
		`- +plugin=1`
		`- +plugin-reason=64`
		`- power-settings=0`
		`- ppd-name=hp-laserjet_200_colormfp_m276-ps.ppd`
		`- family-ppd=hp-postscript-laserjet-pro.ppd`
		`- @@ -4234,8 +4234,8 @@ linefeed-cal-type=0`
		`- monitor-type=0`
		`- panel-check-type=0`
		`- pcard-type=0`
		`- -plugin=0`
		`- -plugin-reason=0`
		`- +plugin=1`
		`- +plugin-reason=64`
		`- power-settings=0`
		`- ppd-name=hp-laserjet_200_colormfp_m276-ps.ppd`
		`- family-ppd=hp-postscript-laserjet-pro.ppd`
		`- @@ -4288,8 +4288,8 @@ model1=HP LaserJet Pro 200 color MFP M276n`
		`- monitor-type=0`
		`- panel-check-type=0`
		`- pcard-type=0`
		`- -plugin=0`
		`- -plugin-reason=0`
		`- +plugin=1`
		`- +plugin-reason=64`
		`- power-settings=0`
		`- ppd-name=hp-laserjet_200_colormfp_m276-ps.ppd`
		`- family-ppd=hp-postscript-laserjet-pro.ppd`
		`- @@ -4341,8 +4341,8 @@ linefeed-cal-type=0`
		`- monitor-type=0`
		`- panel-check-type=0`
		`- pcard-type=0`
		`- -plugin=0`
		`- -plugin-reason=0`
		`- +plugin=1`
		`- +plugin-reason=64`
		`- power-settings=0`
		`- ppd-name=hp-laserjet_200_colormfp_m276-ps.ppd`
		`- family-ppd=hp-postscript-laserjet-pro.ppd`
		`- @@ -4394,8 +4394,8 @@ linefeed-cal-type=0`
		`- monitor-type=0`
		`- panel-check-type=0`
		`- pcard-type=0`
		`- -plugin=0`
		`- -plugin-reason=0`
		`- +plugin=1`
		`- +plugin-reason=64`
		`- power-settings=0`
		`- ppd-name=hp-laserjet_200_colormfp_m276-ps.ppd`
		`- family-ppd=hp-postscript-laserjet-pro.ppd`
		`- @@ -4447,8 +4447,8 @@ linefeed-cal-type=0`
		`- monitor-type=0`
		`- panel-check-type=0`
		`- pcard-type=0`
		`- -plugin=0`
		`- -plugin-reason=0`
		`- +plugin=1`
		`- +plugin-reason=64`
		`- power-settings=0`
		`- ppd-name=hp-laserjet_200_colormfp_m276-ps.ppd`
		`- family-ppd=hp-postscript-laserjet-pro.ppd`
		`- @@ -4500,8 +4500,8 @@ linefeed-cal-type=0`
		`- monitor-type=0`
		`- panel-check-type=0`
		`- pcard-type=0`
		`- -plugin=0`
		`- -plugin-reason=0`
		`- +plugin=1`
		`- +plugin-reason=64`
		`- power-settings=0`
		`- ppd-name=hp-laserjet_200_colormfp_m276-ps.ppd`
		`- family-ppd=hp-postscript-laserjet-pro.ppd`
		`- @@ -4553,8 +4553,8 @@ linefeed-cal-type=0`
		`- monitor-type=0`
		`- panel-check-type=0`
		`- pcard-type=0`
		`- -plugin=0`
		`- -plugin-reason=0`
		`- +plugin=1`
		`- +plugin-reason=64`
		`- power-settings=0`
		`- ppd-name=hp-laserjet_200_colormfp_m276-ps.ppd`
		`- family-ppd=hp-postscript-laserjet-pro.ppd`
		`- @@ -4606,8 +4606,8 @@ linefeed-cal-type=0`
		`- monitor-type=0`
		`- panel-check-type=0`
		`- pcard-type=0`
		`- -plugin=0`
		`- -plugin-reason=0`
		`- +plugin=1`
		`- +plugin-reason=64`
		`- power-settings=0`
		`- ppd-name=hp-laserjet_200_colormfp_m276-ps.ppd`
		`- family-ppd=hp-postscript-laserjet-pro.ppd`
		`- @@ -4659,8 +4659,8 @@ linefeed-cal-type=0`
		`- monitor-type=0`
		`- panel-check-type=0`
		`- pcard-type=0`
		`- -plugin=0`
		`- -plugin-reason=0`
		`- +plugin=1`
		`- +plugin-reason=64`
		`- power-settings=0`
		`- ppd-name=hp-laserjet_200_colormfp_m276-ps.ppd`
		`- family-ppd=hp-postscript-laserjet-pro.ppd`
		`- @@ -4713,8 +4713,8 @@ model1=HP LaserJet 200 Color MFP M275nw`
		`- monitor-type=0`
		`- panel-check-type=0`
		`- pcard-type=0`
		`- -plugin=0`
		`- -plugin-reason=0`
		`- +plugin=1`
		`- +plugin-reason=64`
		`- power-settings=0`
		`- ppd-name=hp-laserjet_200_colormfp_m275-ps.ppd`
		`- family-ppd=hp-postscript-laserjet-pro.ppd`
		`- @@ -5850,7 +5850,7 @@ model1=HP LaserJet Pro MFP M225rdn`
		`- monitor-type=0`
		`- panel-check-type=0`
		`- pcard-type=0`
		`- -plugin=0`
		`- +plugin=1`
		`- plugin-reason=2112`
		`- power-settings=0`
		`- ppd-name=hp-laserjet_pro_mfp_m225_m226-ps.ppd`
		`- @@ -5893,7 +5893,7 @@ model1=HP LaserJet Pro MFP M225dw`
		`- monitor-type=0`
		`- panel-check-type=0`
		`- pcard-type=0`
		`- -plugin=0`
		`- +plugin=1`
		`- plugin-reason=2112`
		`- power-settings=0`
		`- ppd-name=hp-laserjet_pro_mfp_m225_m226-ps.ppd`
		`- @@ -5934,7 +5934,7 @@ model1=HP LaserJet Pro MFP M225dn`
		`- monitor-type=0`
		`- panel-check-type=0`
		`- pcard-type=0`
		`- -plugin=0`
		`- +plugin=1`
		`- plugin-reason=2112`
		`- power-settings=0`
		`- ppd-name=hp-laserjet_pro_mfp_m225_m226-ps.ppd`
		`- @@ -5975,7 +5975,7 @@ model1=HP LaserJet Pro MFP M226dw`
		`- monitor-type=0`
		`- panel-check-type=0`
		`- pcard-type=0`
		`- -plugin=0`
		`- +plugin=1`
		`- plugin-reason=2112`
		`- power-settings=0`
		`- ppd-name=hp-laserjet_pro_mfp_m225_m226-ps.ppd`
		`- @@ -6017,7 +6017,7 @@ model1=HP LaserJet Pro MFP M226dn`
		`- monitor-type=0`
		`- panel-check-type=0`
		`- pcard-type=0`
		`- -plugin=0`
		`- +plugin=1`
		`- plugin-reason=2112`
		`- power-settings=0`
		`- ppd-name=hp-laserjet_pro_mfp_m225_m226-ps.ppd`
		`- @@ -6466,8 +6466,8 @@ model1=HP LaserJet 300 Color MFP M375nw`
		`- monitor-type=0`
		`- panel-check-type=0`
		`- pcard-type=0`
		`- -plugin=0`
		`- -plugin-reason=0`
		`- +plugin=1`
		`- +plugin-reason=64`
		`- power-settings=0`
		`- ppd-name=hp-lj_300_400_color_mfp_m375_m475-ps.ppd`
		`- family-ppd=hp-postscript-laserjet-pro.ppd`
		`- @@ -7863,8 +7863,8 @@ model1=HP LaserJet 400 Color MFP M475dw`
		`- monitor-type=0`
		`- panel-check-type=0`
		`- pcard-type=0`
		`- -plugin=0`
		`- -plugin-reason=0`
		`- +plugin=1`
		`- +plugin-reason=64`
		`- power-settings=0`
		`- ppd-name=hp-lj_300_400_color_mfp_m375_m475-ps.ppd`
		`- family-ppd=hp-postscript-laserjet-pro.ppd`
		`- @@ -8007,8 +8007,8 @@ model1=HP LaserJet 400 MFP M425dw`
		`- monitor-type=1`
		`- panel-check-type=0`
		`- pcard-type=0`
		`- -plugin=0`
		`- -plugin-reason=0`
		`- +plugin=1`
		`- +plugin-reason=64`
		`- power-settings=0`
		`- ppd-name=hp-laserjet_400_mfp_m425-ps.ppd`
		`- family-ppd=hp-postscript-laserjet-pro.ppd`
		`- @@ -8052,8 +8052,8 @@ model1=HP Laserjet 400 MFP M425dn`
		`- monitor-type=1`
		`- panel-check-type=0`
		`- pcard-type=0`
		`- -plugin=0`
		`- -plugin-reason=0`
		`- +plugin=1`
		`- +plugin-reason=64`
		`- power-settings=0`
		`- ppd-name=hp-laserjet_400_mfp_m425-ps.ppd`
		`- family-ppd=hp-postscript-laserjet-pro.ppd`
		`- @@ -8440,8 +8440,8 @@ model1=HP LaserJet 400 Color MFP M475dn`
		`- monitor-type=0`
		`- panel-check-type=0`
		`- pcard-type=0`
		`- -plugin=0`
		`- -plugin-reason=0`
		`- +plugin=1`
		`- +plugin-reason=64`
		`- power-settings=0`
		`- ppd-name=hp-lj_300_400_color_mfp_m375_m475-ps.ppd`
		`- family-ppd=hp-postscript-laserjet-pro.ppd`
		`- @@ -8751,8 +8751,8 @@ model1=HP LaserJet Pro MFP M435nw`
		`- monitor-type=0`
		`- panel-check-type=0`
		`- pcard-type=0`
		`- -plugin=0`
		`- -plugin-reason=0`
		`- +plugin=1`
		`- +plugin-reason=64`
		`- power-settings=0`
		`- pq-diag-type=0`
		`- r-type=0`
		`- @@ -9374,8 +9374,8 @@ model1=HP Color Laserjet Pro MFP M476dw`
		`- monitor-type=0`
		`- panel-check-type=0`
		`- pcard-type=0`
		`- -plugin=0`
		`- -plugin-reason=0`
		`- +plugin=1`
		`- +plugin-reason=64`
		`- power-settings=0`
		`- ppd-name=hp-color_laserjet_pro_mfp_m476-ps.ppd`
		`- family-ppd=hp-postscript-laserjet-pro.ppd`
		`- @@ -9416,8 +9416,8 @@ model1=HP Color Laserjet Pro MFP M476nw`
		`- monitor-type=0`
		`- panel-check-type=0`
		`- pcard-type=0`
		`- -plugin=0`
		`- -plugin-reason=0`
		`- +plugin=1`
		`- +plugin-reason=64`
		`- power-settings=0`
		`- ppd-name=hp-color_laserjet_pro_mfp_m476-ps.ppd`
		`- family-ppd=hp-postscript-laserjet-pro.ppd`
		`- @@ -9458,8 +9458,8 @@ model1=HP Color Laserjet Pro MFP M476dn`
		`- monitor-type=0`
		`- panel-check-type=0`
		`- pcard-type=0`
		`- -plugin=0`
		`- -plugin-reason=0`
		`- +plugin=1`
		`- +plugin-reason=64`
		`- power-settings=0`
		`- ppd-name=hp-color_laserjet_pro_mfp_m476-ps.ppd`
		`- family-ppd=hp-postscript-laserjet-pro.ppd`
		`- @@ -9754,8 +9754,8 @@ model1=HP LaserJet Pro 500 color MFP M570dw`
		`- monitor-type=0`
		`- panel-check-type=0`
		`- pcard-type=0`
		`- -plugin=0`
		`- -plugin-reason=0`
		`- +plugin=1`
		`- +plugin-reason=64`
		`- power-settings=0`
		`- ppd-name=hp-laserjet_500_color_mfp_m570-ps.ppd`
		`- family-ppd=hp-postscript-laserjet-pro.ppd`
		`- @@ -9808,8 +9808,8 @@ model1=HP LaserJet Pro 500 color MFP M570dn`
		`- monitor-type=0`
		`- panel-check-type=0`
		`- pcard-type=0`
		`- -plugin=0`
		`- -plugin-reason=0`
		`- +plugin=1`
		`- +plugin-reason=64`
		`- power-settings=0`
		`- ppd-name=hp-laserjet_500_color_mfp_m570-ps.ppd`
		`- family-ppd=hp-postscript-laserjet-pro.ppd`
		`- @@ -10383,8 +10383,8 @@ model1=HP LaserJet Pro M521dn Multifunction Printer`
		`- monitor-type=0`
		`- panel-check-type=0`
		`- pcard-type=0`
		`- -plugin=0`
		`- -plugin-reason=0`
		`- +plugin=1`
		`- +plugin-reason=64`
		`- power-settings=0`
		`- ppd-name=hp-laserjet_mfp_m521-ps.ppd`
		`- family-ppd=hp-postscript-laserjet.ppd`
		`- @@ -10428,8 +10428,8 @@ model1=HP LaserJet Pro M521dw Multifunction Printer`
		`- monitor-type=0`
		`- panel-check-type=0`
		`- pcard-type=0`
		`- -plugin=0`
		`- -plugin-reason=0`
		`- +plugin=1`
		`- +plugin-reason=64`
		`- power-settings=0`
		`- ppd-name=hp-laserjet_mfp_m521-ps.ppd`
		`- family-ppd=hp-postscript-laserjet.ppd`
		`- @@ -16911,7 +16911,7 @@ model1=HP LaserJet 1000 Printer`
		`- monitor-type=0`
		`- panel-check-type=0`
		`- pcard-type=0`
		`- -plugin=0`
		`- +plugin=1`
		`- plugin-reason=1`
		`- power-settings=0`
		`- pq-diag-type=0`
		`- @@ -17091,7 +17091,7 @@ model1=HP LaserJet 1005 Printer`
		`- monitor-type=0`
		`- panel-check-type=0`
		`- pcard-type=0`
		`- -plugin=0`
		`- +plugin=1`
		`- plugin-reason=1`
		`- power-settings=0`
		`- pq-diag-type=0`
		`- @@ -17131,7 +17131,7 @@ model1=HP LaserJet P1005 Printer`
		`- monitor-type=0`
		`- panel-check-type=0`
		`- pcard-type=0`
		`- -plugin=0`
		`- +plugin=1`
		`- plugin-reason=1`
		`- power-settings=0`
		`- pq-diag-type=0`
		`- @@ -17174,7 +17174,7 @@ model1=HP LaserJet M1005 Multifunction Printer`
		`- monitor-type=0`
		`- panel-check-type=0`
		`- pcard-type=0`
		`- -plugin=0`
		`- +plugin=1`
		`- plugin-reason=65`
		`- power-settings=0`
		`- pq-diag-type=0`
		`- @@ -17217,7 +17217,7 @@ model1=HP LaserJet P1006 Printer`
		`- monitor-type=0`
		`- panel-check-type=0`
		`- pcard-type=0`
		`- -plugin=0`
		`- +plugin=1`
		`- plugin-reason=1`
		`- power-settings=0`
		`- pq-diag-type=0`
		`- @@ -17260,7 +17260,7 @@ model1=HP LaserJet P1007 Printer`
		`- monitor-type=0`
		`- panel-check-type=0`
		`- pcard-type=0`
		`- -plugin=0`
		`- +plugin=1`
		`- plugin-reason=1`
		`- power-settings=0`
		`- pq-diag-type=0`
		`- @@ -17303,7 +17303,7 @@ model1=HP LaserJet P1008 Printer`
		`- monitor-type=0`
		`- panel-check-type=0`
		`- pcard-type=0`
		`- -plugin=0`
		`- +plugin=1`
		`- plugin-reason=1`
		`- power-settings=0`
		`- pq-diag-type=0`
		`- @@ -17346,7 +17346,7 @@ model1=HP LaserJet P1009 Printer`
		`- monitor-type=0`
		`- panel-check-type=0`
		`- pcard-type=0`
		`- -plugin=0`
		`- +plugin=1`
		`- plugin-reason=1`
		`- power-settings=0`
		`- pq-diag-type=0`
		`- @@ -17563,8 +17563,8 @@ model1=HP Color LaserJet CM1015 Multifunction Printer`
		`- monitor-type=0`
		`- panel-check-type=1`
		`- pcard-type=2`
		`- -plugin=0`
		`- -plugin-reason=0`
		`- +plugin=1`
		`- +plugin-reason=64`
		`- power-settings=0`
		`- pq-diag-type=0`
		`- r-type=0`
		`- @@ -17615,8 +17615,8 @@ model1=HP Color LaserJet CM1017 Multifunction Printer`
		`- monitor-type=0`
		`- panel-check-type=1`
		`- pcard-type=2`
		`- -plugin=0`
		`- -plugin-reason=0`
		`- +plugin=1`
		`- +plugin-reason=64`
		`- power-settings=0`
		`- pq-diag-type=0`
		`- r-type=0`
		`- @@ -17668,7 +17668,7 @@ model2=HP LaserJet 1018s Printer`
		`- monitor-type=0`
		`- panel-check-type=0`
		`- pcard-type=0`
		`- -plugin=0`
		`- +plugin=1`
		`- plugin-reason=1`
		`- power-settings=0`
		`- pq-diag-type=0`
		`- @@ -17712,7 +17712,7 @@ model2=HP LaserJet 1020 Plus Printer`
		`- monitor-type=0`
		`- panel-check-type=0`
		`- pcard-type=0`
		`- -plugin=0`
		`- +plugin=1`
		`- plugin-reason=1`
		`- power-settings=0`
		`- pq-diag-type=0`
		`- @@ -17885,7 +17885,7 @@ model1=HP LaserJet Pro CP1025nw Color Printer Series`
		`- monitor-type=0`
		`- panel-check-type=0`
		`- pcard-type=0`
		`- -plugin=0`
		`- +plugin=1`
		`- plugin-reason=1`
		`- power-settings=0`
		`- pq-diag-type=0`
		`- @@ -17937,7 +17937,7 @@ model1=HP LaserJet Pro CP1025 Color Printer Series`
		`- monitor-type=0`
		`- panel-check-type=0`
		`- pcard-type=0`
		`- -plugin=0`
		`- +plugin=1`
		`- plugin-reason=1`
		`- power-settings=0`
		`- pq-diag-type=0`
		`- @@ -18487,7 +18487,7 @@ model2=HP Laserjet Professional P1102s Printer`
		`- monitor-type=0`
		`- panel-check-type=0`
		`- pcard-type=0`
		`- -plugin=0`
		`- +plugin=1`
		`- plugin-reason=1`
		`- power-settings=0`
		`- pq-diag-type=0`
		`- @@ -18530,7 +18530,7 @@ model1=HP LaserJet Professional P 1102w Printer`
		`- monitor-type=0`
		`- panel-check-type=0`
		`- pcard-type=0`
		`- -plugin=0`
		`- +plugin=1`
		`- plugin-reason=1`
		`- power-settings=0`
		`- pq-diag-type=0`
		`- @@ -18573,7 +18573,7 @@ model1=HP Laserjet Professional P1106w Printer`
		`- monitor-type=0`
		`- panel-check-type=0`
		`- pcard-type=0`
		`- -plugin=0`
		`- +plugin=1`
		`- plugin-reason=1`
		`- power-settings=0`
		`- pq-diag-type=0`
		`- @@ -18616,7 +18616,7 @@ model1=HP Laserjet Professional P1106 Printer`
		`- monitor-type=0`
		`- panel-check-type=0`
		`- pcard-type=0`
		`- -plugin=0`
		`- +plugin=1`
		`- plugin-reason=1`
		`- power-settings=0`
		`- pq-diag-type=0`
		`- @@ -18659,7 +18659,7 @@ model1=HP LaserJet Professional P1107 Printer`
		`- monitor-type=0`
		`- panel-check-type=0`
		`- pcard-type=0`
		`- -plugin=0`
		`- +plugin=1`
		`- plugin-reason=1`
		`- power-settings=0`
		`- pq-diag-type=0`
		`- @@ -18702,7 +18702,7 @@ model1=HP LaserJet Professional P1107w Printer`
		`- monitor-type=0`
		`- panel-check-type=0`
		`- pcard-type=0`
		`- -plugin=0`
		`- +plugin=1`
		`- plugin-reason=1`
		`- power-settings=0`
		`- pq-diag-type=0`
		`- @@ -18745,7 +18745,7 @@ model1=HP Laserjet Professional P1108w Printer`
		`- monitor-type=0`
		`- panel-check-type=0`
		`- pcard-type=0`
		`- -plugin=0`
		`- +plugin=1`
		`- plugin-reason=1`
		`- power-settings=0`
		`- pq-diag-type=0`
		`- @@ -18788,7 +18788,7 @@ model1=HP Laserjet Professional P1108 Printer`
		`- monitor-type=0`
		`- panel-check-type=0`
		`- pcard-type=0`
		`- -plugin=0`
		`- +plugin=1`
		`- plugin-reason=1`
		`- power-settings=0`
		`- pq-diag-type=0`
		`- @@ -18831,7 +18831,7 @@ model1=HP LaserJet Professional P1109w Printer`
		`- monitor-type=0`
		`- panel-check-type=0`
		`- pcard-type=0`
		`- -plugin=0`
		`- +plugin=1`
		`- plugin-reason=1`
		`- power-settings=0`
		`- pq-diag-type=0`
		`- @@ -18874,7 +18874,7 @@ model1=HP LaserJet Professional P1109 Printer`
		`- monitor-type=0`
		`- panel-check-type=0`
		`- pcard-type=0`
		`- -plugin=0`
		`- +plugin=1`
		`- plugin-reason=1`
		`- power-settings=0`
		`- pq-diag-type=0`
		`- @@ -19091,7 +19091,7 @@ model1=HP LaserJet M1120 Multifunction Printer`
		`- monitor-type=0`
		`- panel-check-type=0`
		`- pcard-type=0`
		`- -plugin=0`
		`- +plugin=1`
		`- plugin-reason=65`
		`- power-settings=0`
		`- pq-diag-type=0`
		`- @@ -19134,7 +19134,7 @@ model1=HP LaserJet M1120n Multifunction Printer`
		`- monitor-type=0`
		`- panel-check-type=0`
		`- pcard-type=0`
		`- -plugin=0`
		`- +plugin=1`
		`- plugin-reason=65`
		`- power-settings=0`
		`- pq-diag-type=0`
		`- @@ -19224,7 +19224,7 @@ model2=HP LaserJet Professional M1132s Multifunction Printer`
		`- monitor-type=0`
		`- panel-check-type=0`
		`- pcard-type=0`
		`- -plugin=0`
		`- +plugin=1`
		`- plugin-reason=65`
		`- power-settings=0`
		`- pq-diag-type=0`
		`- @@ -19267,7 +19267,7 @@ model1=HP Laserjet Professional M1136 Multifunction Printer`
		`- monitor-type=0`
		`- panel-check-type=0`
		`- pcard-type=0`
		`- -plugin=0`
		`- +plugin=1`
		`- plugin-reason=65`
		`- power-settings=0`
		`- pq-diag-type=0`
		`- @@ -19310,7 +19310,7 @@ model1=HP LaserJet Professional M1137 Multifunction Printer`
		`- monitor-type=0`
		`- panel-check-type=0`
		`- pcard-type=0`
		`- -plugin=0`
		`- +plugin=1`
		`- plugin-reason=65`
		`- power-settings=0`
		`- pq-diag-type=0`
		`- @@ -19353,7 +19353,7 @@ model1=HP LaserJet Professional M1138 Multifunction Printer`
		`- monitor-type=0`
		`- panel-check-type=0`
		`- pcard-type=0`
		`- -plugin=0`
		`- +plugin=1`
		`- plugin-reason=65`
		`- power-settings=0`
		`- pq-diag-type=0`
		`- @@ -19396,7 +19396,7 @@ model1=HP LaserJet Professional M1139 Multifunction Printer`
		`- monitor-type=0`
		`- panel-check-type=0`
		`- pcard-type=0`
		`- -plugin=0`
		`- +plugin=1`
		`- plugin-reason=65`
		`- power-settings=0`
		`- pq-diag-type=0`
		`- @@ -19988,7 +19988,7 @@ model1=HP LaserJet Professional M1212nf Multifunction Printer`
		`- monitor-type=0`
		`- panel-check-type=0`
		`- pcard-type=0`
		`- -plugin=0`
		`- +plugin=1`
		`- plugin-reason=65`
		`- power-settings=0`
		`- pq-diag-type=0`
		`- @@ -20031,7 +20031,7 @@ model1=HP LaserJet Professional M1213nf Multifunction Printer`
		`- monitor-type=0`
		`- panel-check-type=0`
		`- pcard-type=0`
		`- -plugin=0`
		`- +plugin=1`
		`- plugin-reason=65`
		`- power-settings=0`
		`- pq-diag-type=0`
		`- @@ -20074,7 +20074,7 @@ model1=HP LaserJet Professional M1214nfh Multifunction Printer`
		`- monitor-type=0`
		`- panel-check-type=0`
		`- pcard-type=0`
		`- -plugin=0`
		`- +plugin=1`
		`- plugin-reason=65`
		`- power-settings=0`
		`- pq-diag-type=0`
		`- @@ -20117,7 +20117,7 @@ model1=HP Color LaserJet CP1215 Printer`
		`- monitor-type=0`
		`- panel-check-type=1`
		`- pcard-type=0`
		`- -plugin=0`
		`- +plugin=1`
		`- plugin-reason=1`
		`- power-settings=0`
		`- pq-diag-type=0`
		`- @@ -20216,7 +20216,7 @@ model1=HP LaserJet Professional M1216nfh MFP`
		`- monitor-type=0`
		`- panel-check-type=0`
		`- pcard-type=0`
		`- -plugin=0`
		`- +plugin=1`
		`- plugin-reason=65`
		`- power-settings=0`
		`- pq-diag-type=0`
		`- @@ -20259,7 +20259,7 @@ model1=HP Color LaserJet CP1217 Printer`
		`- monitor-type=0`
		`- panel-check-type=1`
		`- pcard-type=0`
		`- -plugin=0`
		`- +plugin=1`
		`- plugin-reason=1`
		`- power-settings=0`
		`- pq-diag-type=0`
		`- @@ -20311,7 +20311,7 @@ model1=HP LaserJet Professional M1217nfW Multifunction Printer`
		`- monitor-type=0`
		`- panel-check-type=0`
		`- pcard-type=0`
		`- -plugin=0`
		`- +plugin=1`
		`- plugin-reason=65`
		`- power-settings=0`
		`- pq-diag-type=0`
		`- @@ -20354,7 +20354,7 @@ model1=HP Laserjet M1210 MFP Series`
		`- monitor-type=0`
		`- panel-check-type=0`
		`- pcard-type=0`
		`- -plugin=0`
		`- +plugin=1`
		`- plugin-reason=65`
		`- power-settings=0`
		`- pq-diag-type=0`
		`- @@ -20444,7 +20444,7 @@ model1=HP HotSpot LaserJet Pro M1218nfs MFP`
		`- monitor-type=0`
		`- panel-check-type=0`
		`- pcard-type=0`
		`- -plugin=0`
		`- +plugin=1`
		`- plugin-reason=65`
		`- power-settings=0`
		`- pq-diag-type=0`
		`- @@ -20486,7 +20486,7 @@ linefeed-cal-type=0`
		`- monitor-type=0`
		`- panel-check-type=0`
		`- pcard-type=0`
		`- -plugin=0`
		`- +plugin=1`
		`- plugin-reason=65`
		`- power-settings=0`
		`- pq-diag-type=0`
		`- @@ -20528,7 +20528,7 @@ linefeed-cal-type=0`
		`- monitor-type=0`
		`- panel-check-type=0`
		`- pcard-type=0`
		`- -plugin=0`
		`- +plugin=1`
		`- plugin-reason=65`
		`- power-settings=0`
		`- pq-diag-type=0`
		`- @@ -20571,7 +20571,7 @@ model1=HP LaserJet Professional M1219nf MFP`
		`- monitor-type=0`
		`- panel-check-type=0`
		`- pcard-type=0`
		`- -plugin=0`
		`- +plugin=1`
		`- plugin-reason=65`
		`- power-settings=0`
		`- pq-diag-type=0`
		`- @@ -21235,8 +21235,8 @@ model1=HP Color LaserJet CM1312nfi Multifunction Printer`
		`- monitor-type=0`
		`- panel-check-type=1`
		`- pcard-type=2`
		`- -plugin=0`
		`- -plugin-reason=0`
		`- +plugin=1`
		`- +plugin-reason=64`
		`- power-settings=0`
		`- pq-diag-type=0`
		`- r-type=0`
		`- @@ -21287,8 +21287,8 @@ model1=HP Color LaserJet CM1312 Multifunction Printer`
		`- monitor-type=0`
		`- panel-check-type=1`
		`- pcard-type=0`
		`- -plugin=0`
		`- -plugin-reason=0`
		`- +plugin=1`
		`- +plugin-reason=64`
		`- power-settings=0`
		`- pq-diag-type=0`
		`- r-type=0`
		`- @@ -21385,7 +21385,7 @@ model1=HP LaserJet M1319f Multifunction Printer`
		`- monitor-type=0`
		`- panel-check-type=0`
		`- pcard-type=0`
		`- -plugin=0`
		`- +plugin=1`
		`- plugin-reason=65`
		`- power-settings=0`
		`- pq-diag-type=0`
		`- @@ -21861,8 +21861,8 @@ model1=HP LaserJet Professional CM1411fn`
		`- monitor-type=0`
		`- panel-check-type=1`
		`- pcard-type=0`
		`- -plugin=0`
		`- -plugin-reason=0`
		`- +plugin=1`
		`- +plugin-reason=64`
		`- power-settings=0`
		`- ppd-name=hp-laserjet_cm1410_series-ps.ppd`
		`- pq-diag-type=0`
		`- @@ -21914,8 +21914,8 @@ model1=HP LaserJet Professional CM1412fn`
		`- monitor-type=0`
		`- panel-check-type=1`
		`- pcard-type=0`
		`- -plugin=0`
		`- -plugin-reason=0`
		`- +plugin=1`
		`- +plugin-reason=64`
		`- power-settings=0`
		`- ppd-name=hp-laserjet_cm1410_series-ps.ppd`
		`- pq-diag-type=0`
		`- @@ -21967,8 +21967,8 @@ model1=HP LaserJet Professional CM1413fn`
		`- monitor-type=0`
		`- panel-check-type=1`
		`- pcard-type=0`
		`- -plugin=0`
		`- -plugin-reason=0`
		`- +plugin=1`
		`- +plugin-reason=64`
		`- power-settings=0`
		`- ppd-name=hp-laserjet_cm1410_series-ps.ppd`
		`- pq-diag-type=0`
		`- @@ -22020,8 +22020,8 @@ model1=HP LaserJet Professional CM1415fn`
		`- monitor-type=0`
		`- panel-check-type=1`
		`- pcard-type=0`
		`- -plugin=0`
		`- -plugin-reason=0`
		`- +plugin=1`
		`- +plugin-reason=64`
		`- power-settings=0`
		`- ppd-name=hp-laserjet_cm1410_series-ps.ppd`
		`- pq-diag-type=0`
		`- @@ -22073,8 +22073,8 @@ model1=HP LaserJet Professional CM1415fnw`
		`- monitor-type=0`
		`- panel-check-type=1`
		`- pcard-type=0`
		`- -plugin=0`
		`- -plugin-reason=0`
		`- +plugin=1`
		`- +plugin-reason=64`
		`- power-settings=0`
		`- ppd-name=hp-laserjet_cm1410_series-ps.ppd`
		`- pq-diag-type=0`
		`- @@ -22126,8 +22126,8 @@ model1=HP LaserJet Professional CM1416fnw`
		`- monitor-type=0`
		`- panel-check-type=1`
		`- pcard-type=0`
		`- -plugin=0`
		`- -plugin-reason=0`
		`- +plugin=1`
		`- +plugin-reason=64`
		`- power-settings=0`
		`- ppd-name=hp-laserjet_cm1410_series-ps.ppd`
		`- pq-diag-type=0`
		`- @@ -22179,8 +22179,8 @@ model1=HP LaserJet Professional CM1417fnw`
		`- monitor-type=0`
		`- panel-check-type=1`
		`- pcard-type=0`
		`- -plugin=0`
		`- -plugin-reason=0`
		`- +plugin=1`
		`- +plugin-reason=64`
		`- power-settings=0`
		`- ppd-name=hp-laserjet_cm1410_series-ps.ppd`
		`- pq-diag-type=0`
		`- @@ -22232,8 +22232,8 @@ model1=HP LaserJet Professional CM1418fnw`
		`- monitor-type=0`
		`- panel-check-type=1`
		`- pcard-type=0`
		`- -plugin=0`
		`- -plugin-reason=0`
		`- +plugin=1`
		`- +plugin-reason=64`
		`- power-settings=0`
		`- ppd-name=hp-laserjet_cm1410_series-ps.ppd`
		`- pq-diag-type=0`
		`- @@ -22619,7 +22619,7 @@ model1=HP LaserJet P1505 Printer`
		`- monitor-type=0`
		`- panel-check-type=0`
		`- pcard-type=0`
		`- -plugin=0`
		`- +plugin=1`
		`- plugin-reason=1`
		`- power-settings=0`
		`- pq-diag-type=0`
		`- @@ -22921,8 +22921,8 @@ ppd-name=hp-laserjet_m1522_mfp-ps.ppd`
		`- monitor-type=0`
		`- panel-check-type=0`
		`- pcard-type=0`
		`- -plugin=0`
		`- -plugin-reason=0`
		`- +plugin=1`
		`- +plugin-reason=64`
		`- power-settings=0`
		`- pq-diag-type=0`
		`- r-type=0`
		`- @@ -23019,8 +23019,8 @@ ppd-name=hp-laserjet_m1522_mfp-ps.ppd`
		`- monitor-type=0`
		`- panel-check-type=0`
		`- pcard-type=0`
		`- -plugin=0`
		`- -plugin-reason=0`
		`- +plugin=1`
		`- +plugin-reason=64`
		`- power-settings=0`
		`- pq-diag-type=0`
		`- r-type=0`
		`- @@ -23063,8 +23063,8 @@ ppd-name=hp-laserjet_m1522_mfp-ps.ppd`
		`- monitor-type=0`
		`- panel-check-type=0`
		`- pcard-type=0`
		`- -plugin=0`
		`- -plugin-reason=0`
		`- +plugin=1`
		`- +plugin-reason=64`
		`- power-settings=0`
		`- pq-diag-type=0`
		`- r-type=0`
		`- @@ -23430,8 +23430,8 @@ model1=HP LaserJet M1536dnf MFP`
		`- monitor-type=0`
		`- panel-check-type=0`
		`- pcard-type=0`
		`- -plugin=0`
		`- -plugin-reason=0`
		`- +plugin=1`
		`- +plugin-reason=64`
		`- power-settings=0`
		`- ppd-name=hp-laserjet_m1530_mfp_series-ps.ppd`
		`- family-ppd=hp-postscript-laserjet.ppd`
		`- @@ -23475,8 +23475,8 @@ model1=HP LaserJet M1537dnf MFP`
		`- monitor-type=0`
		`- panel-check-type=0`
		`- pcard-type=0`
		`- -plugin=0`
		`- -plugin-reason=0`
		`- +plugin=1`
		`- +plugin-reason=64`
		`- power-settings=0`
		`- ppd-name=hp-laserjet_m1530_mfp_series-ps.ppd`
		`- pq-diag-type=0`
		`- @@ -23519,8 +23519,8 @@ model1=HP LaserJet M1538dnf MFP`
		`- monitor-type=0`
		`- panel-check-type=0`
		`- pcard-type=0`
		`- -plugin=0`
		`- -plugin-reason=0`
		`- +plugin=1`
		`- +plugin-reason=64`
		`- power-settings=0`
		`- ppd-name=hp-laserjet_m1530_mfp_series-ps.ppd`
		`- pq-diag-type=0`
		`- @@ -23563,8 +23563,8 @@ model1=HP LaserJet M1539dnf MFP`
		`- monitor-type=0`
		`- panel-check-type=0`
		`- pcard-type=0`
		`- -plugin=0`
		`- -plugin-reason=0`
		`- +plugin=1`
		`- +plugin-reason=64`
		`- power-settings=0`
		`- ppd-name=hp-laserjet_m1530_mfp_series-ps.ppd`
		`- pq-diag-type=0`
		`- @@ -23607,7 +23607,7 @@ model1=HP LaserJet Professional P1566`
		`- monitor-type=0`
		`- panel-check-type=0`
		`- pcard-type=0`
		`- -plugin=0`
		`- +plugin=1`
		`- plugin-reason=1`
		`- power-settings=0`
		`- pq-diag-type=0`
		`- @@ -23650,7 +23650,7 @@ model1=HP LaserJet Professional P1567`
		`- monitor-type=0`
		`- panel-check-type=0`
		`- pcard-type=0`
		`- -plugin=0`
		`- +plugin=1`
		`- plugin-reason=1`
		`- power-settings=0`
		`- pq-diag-type=0`
		`- @@ -23693,7 +23693,7 @@ model1=HP LaserJet Professional P1568`
		`- monitor-type=0`
		`- panel-check-type=0`
		`- pcard-type=0`
		`- -plugin=0`
		`- +plugin=1`
		`- plugin-reason=1`
		`- power-settings=0`
		`- pq-diag-type=0`
		`- @@ -23736,7 +23736,7 @@ model1=HP LaserJet Professional P1569`
		`- monitor-type=0`
		`- panel-check-type=0`
		`- pcard-type=0`
		`- -plugin=0`
		`- +plugin=1`
		`- plugin-reason=1`
		`- power-settings=0`
		`- pq-diag-type=0`
		`- @@ -24132,7 +24132,7 @@ model1=HP Color LaserJet 1600 Printer`
		`- monitor-type=0`
		`- panel-check-type=0`
		`- pcard-type=0`
		`- -plugin=0`
		`- +plugin=1`
		`- plugin-reason=1`
		`- power-settings=0`
		`- pq-diag-type=0`
		`- @@ -24172,7 +24172,7 @@ model1=HP LaserJet Professional P1606dn Printer`
		`- monitor-type=0`
		`- panel-check-type=0`
		`- pcard-type=0`
		`- -plugin=0`
		`- +plugin=1`
		`- plugin-reason=1`
		`- power-settings=0`
		`- pq-diag-type=0`
		`- @@ -24215,7 +24215,7 @@ model1=HP LaserJet Professional P1607dn Printer`
		`- monitor-type=0`
		`- panel-check-type=0`
		`- pcard-type=0`
		`- -plugin=0`
		`- +plugin=1`
		`- plugin-reason=1`
		`- power-settings=0`
		`- pq-diag-type=0`
		`- @@ -24258,7 +24258,7 @@ model1=HP LaserJet Professional P1608dn Printer`
		`- monitor-type=0`
		`- panel-check-type=0`
		`- pcard-type=0`
		`- -plugin=0`
		`- +plugin=1`
		`- plugin-reason=1`
		`- power-settings=0`
		`- pq-diag-type=0`
		`- @@ -24301,7 +24301,7 @@ model1=HP LaserJet Professional P1609dn Printer`
		`- monitor-type=0`
		`- panel-check-type=0`
		`- pcard-type=0`
		`- -plugin=0`
		`- +plugin=1`
		`- plugin-reason=1`
		`- power-settings=0`
		`- pq-diag-type=0`
		`- @@ -25254,7 +25254,7 @@ model1=HP LaserJet P2035n Printer`
		`- monitor-type=0`
		`- panel-check-type=0`
		`- pcard-type=0`
		`- -plugin=0`
		`- +plugin=1`
		`- plugin-reason=1`
		`- power-settings=0`
		`- pq-diag-type=0`
		`- @@ -25297,7 +25297,7 @@ model1=HP LaserJet P2035 Printer`
		`- monitor-type=0`
		`- panel-check-type=0`
		`- pcard-type=0`
		`- -plugin=0`
		`- +plugin=1`
		`- plugin-reason=1`
		`- power-settings=0`
		`- pq-diag-type=0`
		`- @@ -26939,8 +26939,8 @@ model1=HP Color LaserJet CM2320 Multifunction Printer`
		`- monitor-type=0`
		`- panel-check-type=0`
		`- pcard-type=0`
		`- -plugin=0`
		`- -plugin-reason=0`
		`- +plugin=1`
		`- +plugin-reason=64`
		`- power-settings=0`
		`- pq-diag-type=0`
		`- r-type=0`
		`- @@ -26991,8 +26991,8 @@ model1=HP Color LaserJet CM2320nf Multifunction Printer`
		`- monitor-type=0`
		`- panel-check-type=0`
		`- pcard-type=0`
		`- -plugin=0`
		`- -plugin-reason=0`
		`- +plugin=1`
		`- +plugin-reason=64`
		`- power-settings=0`
		`- pq-diag-type=0`
		`- r-type=0`
		`- @@ -27043,8 +27043,8 @@ model1=HP Color LaserJet CM2320fxi Multifunction Printer`
		`- monitor-type=0`
		`- panel-check-type=0`
		`- pcard-type=0`
		`- -plugin=0`
		`- -plugin-reason=0`
		`- +plugin=1`
		`- +plugin-reason=64`
		`- power-settings=0`
		`- pq-diag-type=0`
		`- r-type=0`
		`- @@ -27095,8 +27095,8 @@ model1=HP Color LaserJet CM2320n Multifunction Printer`
		`- monitor-type=0`
		`- panel-check-type=0`
		`- pcard-type=0`
		`- -plugin=0`
		`- -plugin-reason=0`
		`- +plugin=1`
		`- +plugin-reason=64`
		`- power-settings=0`
		`- pq-diag-type=0`
		`- r-type=0`
		`- @@ -28453,7 +28453,7 @@ model1=HP Color LaserJet 2600n Printer`
		`- monitor-type=0`
		`- panel-check-type=0`
		`- pcard-type=0`
		`- -plugin=0`
		`- +plugin=1`
		`- plugin-reason=1`
		`- power-settings=0`
		`- pq-diag-type=0`
		`- @@ -29353,8 +29353,8 @@ model1=HP LaserJet M2727 Multifunction Printer`
		`- monitor-type=0`
		`- panel-check-type=0`
		`- pcard-type=0`
		`- -plugin=0`
		`- -plugin-reason=0`
		`- +plugin=1`
		`- +plugin-reason=64`
		`- power-settings=0`
		`- ppd-name=hp-laserjet_m2727_mfp_series-ps.ppd`
		`- pq-diag-type=0`
		`- @@ -29397,8 +29397,8 @@ model1=HP LaserJet M2727nfs Multifunction Printer`
		`- monitor-type=0`
		`- panel-check-type=0`
		`- pcard-type=0`
		`- -plugin=0`
		`- -plugin-reason=0`
		`- +plugin=1`
		`- +plugin-reason=64`
		`- power-settings=0`
		`- ppd-name=hp-laserjet_m2727_mfp_series-ps.ppd`
		`- pq-diag-type=0`
		`- @@ -29441,8 +29441,8 @@ model1=HP LaserJet M2727nf Multifunction Printer`
		`- monitor-type=0`
		`- panel-check-type=0`
		`- pcard-type=0`
		`- -plugin=0`
		`- -plugin-reason=0`
		`- +plugin=1`
		`- +plugin-reason=64`
		`- power-settings=0`
		`- ppd-name=hp-laserjet_m2727_mfp_series-ps.ppd`
		`- family-ppd=hp-postscript-laserjet.ppd`
		`- @@ -52679,8 +52679,8 @@ model1=HP Color LaserJet MFP M277n`
		`- monitor-type=0`
		`- panel-check-type=0`
		`- pcard-type=0`
		`- -plugin=0`
		`- -plugin-reason=0`
		`- +plugin=1`
		`- +plugin-reason=64`
		`- power-settings=0`
		`- ppd-name=hp-color_laserjet_mfp_m277`
		`- family-ppd=hp-postscript-laserjet-pro.ppd`
		`- @@ -52733,8 +52733,8 @@ model1=HP Color LaserJet MFP M277dw`
		`- monitor-type=0`
		`- panel-check-type=0`
		`- pcard-type=0`
		`- -plugin=0`
		`- -plugin-reason=0`
		`- +plugin=1`
		`- +plugin-reason=64`
		`- power-settings=0`
		`- ppd-name=hp-color_laserjet_pro_mfp_m277`
		`- family-ppd=hp-postscript-laserjet-pro.ppd`
		`- @@ -53474,8 +53474,8 @@ model1=HP Color LaserJet Pro MFP M274n`
		`- monitor-type=0`
		`- panel-check-type=0`
		`- pcard-type=0`
		`- -plugin=0`
		`- -plugin-reason=0`
		`- +plugin=1`
		`- +plugin-reason=64`
		`- power-settings=0`
		`- ppd-name=hp-color_laserjet_mfp_m274-ps.ppd`
		`- family-ppd=hp-postscript-laserjet-pro.ppd`
		`- @@ -54257,8 +54257,8 @@ model1=HP Laserjet Pro MFP M426fdn`
		`- monitor-type=0`
		`- panel-check-type=0`
		`- pcard-type=0`
		`- -plugin=0`
		`- -plugin-reason=0`
		`- +plugin=1`
		`- +plugin-reason=64`
		`- power-settings=0`
		`- ppd-name=laserjet_mfp_m426_m427`
		`- family-ppd=hp-postscript-laserjet-pro.ppd`
		`- @@ -54302,8 +54302,8 @@ model1=HP Laserjet Pro MFP M426fdw`
		`- monitor-type=0`
		`- panel-check-type=0`
		`- pcard-type=0`
		`- -plugin=0`
		`- -plugin-reason=0`
		`- +plugin=1`
		`- +plugin-reason=64`
		`- power-settings=0`
		`- ppd-name=laserjet_mfp_m426_m427`
		`- family-ppd=hp-postscript-laserjet-pro.ppd`
		`- @@ -54347,8 +54347,8 @@ model1=HP Laserjet Pro MFP M427dn`
		`- monitor-type=0`
		`- panel-check-type=0`
		`- pcard-type=0`
		`- -plugin=0`
		`- -plugin-reason=0`
		`- +plugin=1`
		`- +plugin-reason=64`
		`- power-settings=0`
		`- ppd-name=laserjet_mfp_m426_m427`
		`- family-ppd=hp-postscript-laserjet-pro.ppd`
		`- @@ -54392,8 +54392,8 @@ model1=HP Laserjet Pro MFP M427fdw`
		`- monitor-type=0`
		`- panel-check-type=0`
		`- pcard-type=0`
		`- -plugin=0`
		`- -plugin-reason=0`
		`- +plugin=1`
		`- +plugin-reason=64`
		`- power-settings=0`
		`- ppd-name=laserjet_mfp_m426_m427`
		`- family-ppd=hp-postscript-laserjet-pro.ppd`
		`- @@ -54437,8 +54437,8 @@ model1=HP Laserjet Pro MFP M426dw`
		`- monitor-type=0`
		`- panel-check-type=0`
		`- pcard-type=0`
		`- -plugin=0`
		`- -plugin-reason=0`
		`- +plugin=1`
		`- +plugin-reason=64`
		`- power-settings=0`
		`- ppd-name=laserjet_mfp_m426_m427`
		`- family-ppd=hp-postscript-laserjet-pro.ppd`
		`- @@ -54482,8 +54482,8 @@ model1=HP Laserjet Pro MFP M427dw`
		`- monitor-type=0`
		`- panel-check-type=0`
		`- pcard-type=0`
		`- -plugin=0`
		`- -plugin-reason=0`
		`- +plugin=1`
		`- +plugin-reason=64`
		`- power-settings=0`
		`- ppd-name=hp-laserjet_mfp_m426_m427-ps.ppd`
		`- family-ppd=hp-postscript-laserjet-pro.ppd`
		`- @@ -54812,8 +54812,8 @@ model1=HP Color Laserjet Pro MFP M477 fnw`
		`- monitor-type=0`
		`- panel-check-type=0`
		`- pcard-type=0`
		`- -plugin=0`
		`- -plugin-reason=0`
		`- +plugin=1`
		`- +plugin-reason=64`
		`- power-settings=0`
		`- ppd-name=hp-color_laserjet_pro_mfp_m477-ps.ppd`
		`- family-ppd=hp-postscript-laserjet-pro.ppd`
		`- @@ -54854,8 +54854,8 @@ model1=HP Color Laserjet Pro MFP M477 fdn`
		`- monitor-type=0`
		`- panel-check-type=0`
		`- pcard-type=0`
		`- -plugin=0`
		`- -plugin-reason=0`
		`- +plugin=1`
		`- +plugin-reason=64`
		`- power-settings=0`
		`- ppd-name=color_laserjet_pro_mfp_m477d`
		`- family-ppd=hp-postscript-laserjet-pro.ppd`
		`- @@ -54896,8 +54896,8 @@ model1=HP Color Laserjet Pro MFP M477 fdw`
		`- monitor-type=0`
		`- panel-check-type=0`
		`- pcard-type=0`
		`- -plugin=0`
		`- -plugin-reason=0`
		`- +plugin=1`
		`- +plugin-reason=64`
		`- power-settings=0`
		`- ppd-name=hp-color_laserjet_pro_mfp_m477d-ps.ppd`
		`- family-ppd=hp-postscript-laserjet-pro.ppd`
		`- @@ -56054,8 +56054,8 @@ model1=HP Color Laserjet MFP M377 fnw`
		`- monitor-type=0`
		`- panel-check-type=0`
		`- pcard-type=0`
		`- -plugin=0`
		`- -plugin-reason=0`
		`- +plugin=1`
		`- +plugin-reason=64`
		`- power-settings=0`
		`- ppd-name=hp-color_laserjet_pro_mfp_m377-ps.ppd`
		`- family-ppd=hp-postscript-laserjet-pro.ppd`
		`- @@ -57016,8 +57016,8 @@ model1=HP Color LaserJet MFP M277c6`
		`- monitor-type=0`
		`- panel-check-type=0`
		`- pcard-type=0`
		`- -plugin=0`
		`- -plugin-reason=0`
		`- +plugin=1`
		`- +plugin-reason=64`
		`- power-settings=0`
		`- ppd-name=hp-color_laserjet_pro_mfp_m277-ps.ppd`
		`- pq-diag-type=0`

libre/hplip/python3.diff

file modified

-13

		`@@ -116,19 +116,6 @@`
		`}`


		`- diff --git a/pcard/photocard.py b/pcard/photocard.py`
		`- index 913dc4e..2c73158 100644`
		`- --- a/pcard/photocard.py`
		`- +++ b/pcard/photocard.py`
		`- @@ -30,7 +30,7 @@ from base.codes import *`
		`- from base import device, utils, exif`
		`-`
		`- try:`
		`- - from . import pcardext`
		`- + import pcardext`
		`- except ImportError:`
		`- if not os.getenv("HPLIP_BUILD"):`
		`- log.error("PCARDEXT could not be loaded. Please check HPLIP installation.")`
		`diff --git a/unload.py b/unload.py`
		`index 3fdd5a3..ce8b069 100755`
		`--- a/unload.py`

libre/hplip/reproducible-gzip.patch

file modified

+6 -5

		`@@ -1,6 +1,6 @@`
		`- --- hplip-3.20.5/createPPD.sh 2020-05-11 15:34:06.000000000 +0200`
		`- +++ hplip-3.20.5.old/createPPD.sh 2020-05-27 12:02:44.089477299 +0200`
		`- @@ -54,15 +54,15 @@`
		`+ --- hplip-3.22.4/createPPD.sh 2022-04-26 06:16:59.000000000 +0200`
		`+ +++ hplip-3.22.4/createPPD.sh.new 2022-04-30 14:42:35.877365900 +0200`
		`+ @@ -55,16 +55,16 @@`
		`else`
		`cp prnt/ps/hp-postscript*.ppd ppd/classppd/ps`
		`for i in ppd/classppd/ps/*.ppd; do`
		`@@ -8,7 +8,8 @@`
		`+ gzip -nc "$i" > "$i.gz"`
		`done`
		`fi`
		`- #cp prnt/ps/hp-postscript*.ppd.gz ppd/classppd/ps`
		`+ #cp prnt/spd/*.ppd ppd/classppd/hpcups/.`
		`+ #cp prnt/ps/hp-postscript*.ppd.gz ppd/classppd/ps`
		`for i in ppd/classppd/hpcups/*.ppd; do`
		`- gzip -c "$i" > "$i.gz"`
		`+ gzip -nc "$i" > "$i.gz"`
		`@@ -19,7 +20,7 @@`
		`#done`

		`cat > class_cups_drv.inc <<EOF`
		`- @@ -81,14 +81,14 @@`
		`+ @@ -83,14 +83,14 @@`
		`install -d ppd/hpcups`
		`ppdc -d ppd/hpcups prnt/drv/hpcups.drv`
		`for i in ppd/hpcups/*.ppd; do`

libre/hyperbola-keyring/PKGBUILD

file modified

+1 -1

		`@@ -1,4 +1,4 @@`
		`- # Maintainer (Hyperbola): André Silva <emulatorman@hyperbola.info>`
		`+ # Contributor: André Silva <emulatorman@hyperbola.info>`
		`# Contributor: Denis 'GNUtoo' Carikli <GNUtoo@cyberdimension.org>`

		`pkgname=hyperbola-keyring`

libre/hyperbola-mirrorlist/PKGBUILD

file modified

+2 -2

		`@@ -1,5 +1,5 @@`
		`- # Maintainer (Hyperbola): André Silva <emulatorman@hyperbola.info>`
		`- # Maintainer (Parabola): Denis 'GNUtoo' Carikli <GNUtoo@cyberdimension.org>`
		`+ # Maintainer (hyperbola): André Silva <emulatorman@hyperbola.info>`
		`+ # Maintainer: Denis 'GNUtoo' Carikli <GNUtoo@cyberdimension.org>`

		`pkgname=hyperbola-mirrorlist`
		`pkgver=20190529`

libre/hyperbola-pacstrap-config/PKGBUILD

file modified

+1 -1

		`@@ -1,4 +1,4 @@`
		`- # Maintainer (Parabola): Denis 'GNUtoo' Carikli <GNUtoo@cyberdimension.org>`
		`+ # Maintainer: Denis 'GNUtoo' Carikli <GNUtoo@cyberdimension.org>`

		`# The configuration files have been imported from hyperbola's pacman package`
		`# with the following modifications:`

libre/iceape-l10n/PKGBUILD

file modified

+2 -2

		`@@ -31,8 +31,8 @@`
		`sha512sums.${CARCH})`

		`# load languages list and .xpi checksums`
		`- source languages.${CARCH} # sets $_languages`
		`- source sha512sums.${CARCH} # sets $_sha512sums`
		`+ source languages.${CARCH} &> /dev/null # sets $_languages`
		`+ source sha512sums.${CARCH} &> /dev/null # sets $_sha512sums`

		`# compile package names and .xpi sources`
		`_src_url=https://ftp.mozilla.org/pub/seamonkey/releases/${pkgver}/langpack`

libre/iceape/PKGBUILD

file modified

+1 -1

		`@@ -1,4 +1,4 @@`
		`- # Maintainer (Arch): Kyle Keen <keenerd@gmail.com>`
		`+ # Maintainer (arch): Kyle Keen <keenerd@gmail.com>`
		`# Maintainer: Andreas Grapentin <andreas@grapentin.org>`
		`# Contributor: André Silva <emulatorman@hyperbola.info>`
		`# Contributor: Márcio Silva <coadde@hyperbola.info>`

libre/icecat-l10n/PKGBUILD

file modified

+2 -2

		`@@ -35,8 +35,8 @@`
		`sha512sums.${CARCH})`

		`# load languages list and .xpi checksums`
		`- source languages.${CARCH} # sets $_languages`
		`- source sha512sums.${CARCH} # sets $_sha512sums`
		`+ source languages.${CARCH} &> /dev/null # sets $_languages`
		`+ source sha512sums.${CARCH} &> /dev/null # sets $_sha512sums`

		`# compile package names and .xpi sources`
		`#_src_url=http://ftp.gnu.org/gnu/gnuzilla/${pkgver%_*}/langpacks # FIXME: normal releases - gnuzilla lang-packs`

libre/icecat-noscript/PKGBUILD

file modified

+2 -2

		`@@ -1,6 +1,6 @@`
		`# Maintainer: Andreas Grapentin <andreas@grapentin.org>`
		`- # Maintainer (Arch): Sergej Pupykin <pupykin.s+arch@gmail.com>`
		`- # Maintainer (Arch): Eschwartz <eschwartz93@gmail.com>`
		`+ # Maintainer (arch): Sergej Pupykin <pupykin.s+arch@gmail.com>`
		`+ # Maintainer (arch): Eschwartz <eschwartz93@gmail.com>`
		`# Contributor: André Silva <emulatorman@hyperbola.info>`
		`# Contributor: jc_gargma <jc_gargma@iserlohn-fortress.net>`

libre/icecat-ublock-origin/PKGBUILD

file modified

+1 -1

		`@@ -1,5 +1,5 @@`
		`# Maintainer: Andreas Grapentin <andreas@grapentin.org>`
		`- # Maintainer (Arch): Daniel M. Capella <polyzen@archlinux.org>`
		`+ # Maintainer (arch): Daniel M. Capella <polyzen@archlinux.org>`
		`# Contributor: André Silva <emulatorman@hyperbola.info>`
		`# Contributor: jc_gargma <jc_gargma@iserlohn-fortress.net>`

libre/icecat/9003-FSDG-urihandlers.patch

file removed

-240

		`@@ -1,240 +0,0 @@`
		`- diff --git a/uriloader/exthandler/HandlerList.jsm b/uriloader/exthandler/HandlerList.jsm`
		`- index 04b9205..ff3aec5 100644`
		`- --- a/uriloader/exthandler/HandlerList.jsm`
		`- +++ b/uriloader/exthandler/HandlerList.jsm`
		`- @@ -11,229 +11,25 @@ this.kHandlerListVersion = 1;`
		`- this.kHandlerList = {`
		`- default: {`
		`- schemes: {`
		`- - mailto: {`
		`- + irc: {`
		`- handlers: [`
		`- {`
		`- - name: "Gmail",`
		`- - uriTemplate: "https://mail.google.com/mail/?extsrc=mailto&url=%s",`
		`- + name: "KiwiIRC",`
		`- + uriTemplate: "https://web.libera.chat/?url=%s",`
		`- },`
		`- ],`
		`- },`
		`- - },`
		`- - },`
		`- - cs: {`
		`- - schemes: {`
		`- - mailto: {`
		`- + ircs: {`
		`- handlers: [`
		`- {`
		`- - name: "Seznam",`
		`- - uriTemplate: "https://email.seznam.cz/newMessageScreen?mailto=%s",`
		`- - },`
		`- - {`
		`- - name: "Gmail",`
		`- - uriTemplate: "https://mail.google.com/mail/?extsrc=mailto&url=%s",`
		`- + name: "KiwiIRC",`
		`- + uriTemplate: "https://web.libera.chat/?url=%s",`
		`- },`
		`- ],`
		`- },`
		`- - },`
		`- - },`
		`- - csb: {`
		`- - schemes: {`
		`- mailto: {`
		`- handlers: [`
		`- {`
		`- - name: "Poczta Interia.pl",`
		`- - uriTemplate: "http://poczta.interia.pl/mh/?mailto=%s",`
		`- - },`
		`- - {`
		`- - name: "OnetPoczta",`
		`- - uriTemplate: "http://poczta.onet.pl/napisz.html?uri=%s",`
		`- - },`
		`- - ],`
		`- - },`
		`- - },`
		`- - },`
		`- - "es-CL": {`
		`- - schemes: {`
		`- - mailto: {`
		`- - handlers: [`
		`- - {`
		`- - name: "Gmail",`
		`- - uriTemplate: "https://mail.google.com/mail/?extsrc=mailto&url=%s",`
		`- - },`
		`- - {`
		`- - name: "Outlook",`
		`- - uriTemplate:`
		`- - "https://outlook.live.com/default.aspx?rru=compose&to=%s",`
		`- - },`
		`- - ],`
		`- - },`
		`- - },`
		`- - },`
		`- - "ja-JP-mac": {`
		`- - schemes: {`
		`- - mailto: {`
		`- - handlers: [`
		`- - {`
		`- - name: "Yahoo!メール",`
		`- - uriTemplate: "https://mail.yahoo.co.jp/compose/?To=%s",`
		`- - },`
		`- - {`
		`- - name: "Gmail",`
		`- - uriTemplate: "https://mail.google.com/mail/?extsrc=mailto&url=%s",`
		`- - },`
		`- - ],`
		`- - },`
		`- - },`
		`- - },`
		`- - ja: {`
		`- - schemes: {`
		`- - mailto: {`
		`- - handlers: [`
		`- - {`
		`- - name: "Yahoo!メール",`
		`- - uriTemplate: "https://mail.yahoo.co.jp/compose/?To=%s",`
		`- - },`
		`- - {`
		`- - name: "Gmail",`
		`- - uriTemplate: "https://mail.google.com/mail/?extsrc=mailto&url=%s",`
		`- - },`
		`- - ],`
		`- - },`
		`- - },`
		`- - },`
		`- - kk: {`
		`- - schemes: {`
		`- - mailto: {`
		`- - handlers: [`
		`- - {`
		`- - name: "Яндекс.Почта",`
		`- - uriTemplate: "https://mail.yandex.ru/compose?mailto=%s",`
		`- - },`
		`- - {`
		`- - name: "Mail.Ru",`
		`- - uriTemplate: "https://e.mail.ru/cgi-bin/sentmsg?mailto=%s",`
		`- - },`
		`- - {`
		`- - name: "Gmail",`
		`- - uriTemplate: "https://mail.google.com/mail/?extsrc=mailto&url=%s",`
		`- - },`
		`- - ],`
		`- - },`
		`- - },`
		`- - },`
		`- - ltg: {`
		`- - schemes: {`
		`- - mailto: {`
		`- - handlers: [`
		`- - {`
		`- - name: "Gmail",`
		`- - uriTemplate: "https://mail.google.com/mail/?extsrc=mailto&url=%s",`
		`- - },`
		`- - {`
		`- - name: "inbox.lv mail",`
		`- - uriTemplate: "https://mail.inbox.lv/compose?to=%s",`
		`- - },`
		`- - ],`
		`- - },`
		`- - },`
		`- - },`
		`- - lv: {`
		`- - schemes: {`
		`- - mailto: {`
		`- - handlers: [`
		`- - {`
		`- - name: "Gmail",`
		`- - uriTemplate: "https://mail.google.com/mail/?extsrc=mailto&url=%s",`
		`- - },`
		`- - {`
		`- - name: "inbox.lv mail",`
		`- - uriTemplate: "https://mail.inbox.lv/compose?to=%s",`
		`- - },`
		`- - ],`
		`- - },`
		`- - },`
		`- - },`
		`- - pl: {`
		`- - schemes: {`
		`- - mailto: {`
		`- - handlers: [`
		`- - {`
		`- - name: "Poczta Interia.pl",`
		`- - uriTemplate: "https://poczta.interia.pl/mh/?mailto=%s",`
		`- - },`
		`- - {`
		`- - name: "Gmail",`
		`- - uriTemplate: "https://mail.google.com/mail/?extsrc=mailto&url=%s",`
		`- - },`
		`- - ],`
		`- - },`
		`- - },`
		`- - },`
		`- - ru: {`
		`- - schemes: {`
		`- - mailto: {`
		`- - handlers: [`
		`- - {`
		`- - name: "Яндекс.Почту",`
		`- - uriTemplate: "https://mail.yandex.ru/compose?mailto=%s",`
		`- - },`
		`- - {`
		`- - name: "Mail.Ru",`
		`- - uriTemplate: "https://e.mail.ru/cgi-bin/sentmsg?mailto=%s",`
		`- - },`
		`- - {`
		`- - name: "Gmail",`
		`- - uriTemplate: "https://mail.google.com/mail/?extsrc=mailto&url=%s",`
		`- - },`
		`- - ],`
		`- - },`
		`- - },`
		`- - },`
		`- - sah: {`
		`- - schemes: {`
		`- - mailto: {`
		`- - handlers: [`
		`- - {`
		`- - name: "Яндекс.Почта",`
		`- - uriTemplate: "https://mail.yandex.ru/compose?mailto=%s",`
		`- - },`
		`- - {`
		`- - name: "Mail.Ru",`
		`- - uriTemplate: "https://e.mail.ru/cgi-bin/sentmsg?mailto=%s",`
		`- - },`
		`- - ],`
		`- - },`
		`- - },`
		`- - },`
		`- - uk: {`
		`- - schemes: {`
		`- - mailto: {`
		`- - handlers: [`
		`- - {`
		`- - name: "Gmail",`
		`- - uriTemplate: "https://mail.google.com/mail/?extsrc=mailto&url=%s",`
		`- - },`
		`- - {`
		`- - name: "Outlook",`
		`- - uriTemplate:`
		`- - "https://outlook.live.com/default.aspx?rru=compose&to=%s",`
		`- - },`
		`- - ],`
		`- - },`
		`- - },`
		`- - },`
		`- - uz: {`
		`- - schemes: {`
		`- - mailto: {`
		`- - handlers: [`
		`- - {`
		`- - name: "Gmail",`
		`- - uriTemplate: "https://mail.google.com/mail/?extsrc=mailto&url=%s",`
		`- - },`
		`- - {`
		`- - name: "Mail.Ru",`
		`- - uriTemplate: "https://e.mail.ru/cgi-bin/sentmsg?mailto=%s",`
		`- },`
		`- ],`
		`- },`

libre/icecat/9004-FSDG-misc.patch

file removed

-1095

		`@@ -1,1095 +0,0 @@`
		`- From d8ea43891548f1e2a205cf73bb5b39f916a0ee8d Mon Sep 17 00:00:00 2001`
		`- From: grizzlyuser <grizzlyuser@protonmail.com>`
		`- Date: Sat, 12 Mar 2022 17:14:25 +0100`
		`- Subject: [PATCH] FSDG: Replace upstream default bookmarks`
		`-`
		`- ---`
		`- browser/base/content/default-bookmarks.html \| 50 +++++++++------------`
		`- 1 file changed, 21 insertions(+), 29 deletions(-)`
		`-`
		`- diff --git a/browser/base/content/default-bookmarks.html b/browser/base/content/default-bookmarks.html`
		`- index b2d18d3098..e2e643bcf2 100644`
		`- --- a/browser/base/content/default-bookmarks.html`
		`- +++ b/browser/base/content/default-bookmarks.html`
		`- @@ -1,14 +1,14 @@`
		`- #filter substitution`
		`-`
		- -#define mozilla_icon data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' width='16' height='16'%3E %3Cpath d='M0 0h16v16H0z'/%3E %3Cpath d='M13.994 10.356H15V12h-3.171V7.741c0-1.308-.435-1.81-1.29-1.81-1.04 0-1.46.737-1.46 1.8v2.63h1.006V12H6.918V7.741c0-1.308-.435-1.81-1.291-1.81-1.039 0-1.459.737-1.459 1.8v2.63h1.441V12H1v-1.644h1.006V6.079H1V4.435h3.168v1.139a2.507 2.507 0 0 1 2.3-1.29A2.452 2.452 0 0 1 8.931 5.91 2.535 2.535 0 0 1 11.4 4.284 2.448 2.448 0 0 1 14 6.9v3.458z' fill='%23fff'/%3E %3C/svg%3E
		`- -`
		- -#define firefox_icon data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAHY0lEQVR4Aa3VA5RrSdfG8f+uOidJp/umczm2ffFhbNvG9722bdv22LZt+3I81+04B1XvfpPmWHut3yk06smus1Z4L8uXDv6MHzpowA8eWFS8FaY9eU+cCvxaFfF8W/FWGDy8a6n7DM7/H96DR3ldu0MVb8a0J+9CI1qXJP11a+79GOdP1f11FW/EtCfvQpx8mziFxMHEEEV1KYkrKl6Pea1Nbnrs/7hz7q2KUQsqRcUE/eV1acb/pyFQ7b9N3fguzNTxVsXrMa/avFgPb6SnukY8W6EgXvszrszjivH08F0VLZFK0rbUgRt9H2aS+lORznUxnTMV45kJG6fNPZSGnEodTJwUFGbphqdSll/H/SxWjEc92kYxSoO0uzEcwo90g/9rlKpHpCmX491MxQgzuvjtE0UieyqxhYZA3UGp8CjUtSMR2YrkFdf+/szi9X88+zM3/uncSx/81/f+7/HzPsu8q09i8MUNcCUHUTImceAAL+RC+UW1nMzHuUvxSVGBCloTgMT+GuOLipaGyg/OpLuE/jVI58wHb/zsdxD5tBVbDMQwOPe/8UDqHYuuPJjCZnP5nw/+mfyUPhADRtkAaIfosum23klBxH8b+KzCfuczG8IPXi4C5yHQwvDoPYhCBSkz1n9y1+WLd8xFzVUxxmIRjBIBVHXFZF58aEtW3exxsp0V8Aac8gpBnGQBRNymkP4VXKPdgdj8H2JB/DgMVwreATFhdoCdj/wY8x7+GM8/djyJ81hlnCPTUWfHb/0QlyRUelalEPcCHswIQARJPd64ohh/KHBagPcQB7sggHgIVHcM0wUyWWUAoNaEuobI9bP1dj9lw1nnMvehj/LS0wdinYO4wM1f/h6z3v9n1t3pTnAWBj04ZQA7LFROwMsu7QCpgcjuCh4Asg5Wa0ImgNDqqHTOtDyIgPPKkZ/cZOstzmT+Nw4jcA5JBO9SHjzzWKZt8CRd03ohD/RZALCigIwHawBmKgKSVoAiAi2VDCzsgo0bYB04lSojEAaQDyETsmTZf3PPdZ+irvMgTTF4SAVX7+SRC/dj5/f/C6D9d5UQLBAIFBJILIhtB1g2a8uZq+1+LwiAV8CSTujPwqoRbJjCJMdAeRVue+j/WLh4T2I3jcCEhN4ShmDFYR2IAXC8OHdDaMYAYBxU82AFAgPShHoejAEgUEViy2h5UbS9LLBajf5oMr866wc0wlWQvEEyNQKbIcSSwZBNIfAO41NQ9ZXd0IgBAQdUDAQWpjQhcfi6gCgguDtTm3vIUBdhdwUA/Pggqmy49/n/pr/q8ZMq4DziEwI0QOtpiT1kXUqQRqC8ohaDy0BqoGzxOUE6q9DwMBiOvtzm5OLi3migAFEwpjnOCzmKhZXUkyr1uEwtLqky1aStNk4jqhFFDVZb6ykYMjBodQxw5RAKZUgSqAq+YmmWzFxF0P8L61Z8pHhf5/S+bfHQJm1OLcuzw4YPcWH3/qysTcebFHyESTOkhLjUokt8M8VFCVYDbLXhvdCfARfiG3lkykDr2qhbXJTRUZBAngMwootGI3tbrbcIsR3ugp3Yhbun89l9/ko+qCDVGpQruHKJqDakBmnq2KyXaDZKrDX1KWau+ij0ZqAvgwR1JFuFmihwPTkdDQN9co3C6IMnwujs0sppELcOV+NHVc2wzv2eb+74J6ZP6kGazeEgZZJqiaRWJo6qbDb5MU7c4ixYmYUhC7YJaQxVgYrgSxa3sgNftdww31+usFuvuykfWDzU/4HytL0llTVz+SbiAScTryKxFFc6dlnnQVZP+wEo2grT7ACb5V7g2BnXsVfxHsLEgfGQTYb/1kJqWpKV3VDLM1iXi/a8PDrtqmecl451DwLg8oG1DtnMmcsKq/bQ1V3BmBTsfzgIfHucwINxICivADt8eADkBLJGtcc0ydHsmU7QEXBFfzwTeFwRnLFtDoBD7nv5+vv61v2XXzHlfR7oKtQxLkFcCqkDK8qMHdIex4gSMxaoKZBtS8lQ18NtJsPSmv/Nyfc3nma4RjsA8Jnq1HU+WC9cY01z865pJQrdDcQkrW6IpGOfun3oxLnw6m/SEBIyVFbOIMhmiXJy35oL+vYDBhkuGxY3YaTuy9TLA+Jv2inu2j2ph9NrTUMmCyIGjwEnyiCtUaUWnGlLR1hIlM6rKwpUX5qBiTuI02Du94aqx8zJhEsVI4IPduUZV+7vDC0CDv9GdeolUjObL18ckutqMKkQkc2kiFHOITLCwyiUp1bNUhuYRFrrxPoMzdDM/XbUf/gZvvYsozX+Cl5d5vh690afrk3+0hR4XyoxqYmQICaTSwjClI6cA3EIvhWi0QiIm6rRgaQh1ikfsMK43/xv8YWfASuUe6sBAIzqPmNwjb1nJdnP5PDbOpPgJMXjWhDAC4JgvEWUaQkoib/o/NzQb37S1fP0+Dt/6wHGKqe6v1yZvuG+zc69p3m7d4dnW8TjAaEdwmFKEcztkfSG67KVG346aeV8YEglincRYLQClVcdKsery6lI1VVNJbyF+jdp8gPG4E08mAAAAABJRU5ErkJggg==
		`- -`
		- -#define bugzilla_icon data:image/x-icon;base64,AAABAAEAEBAAAAEAIABoBAAAFgAAACgAAAAQAAAAIAAAAAEAIAAAAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAnYCL7J0pY9wwETY9kYEM9AAAAAEBAYAhVVVUDAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA1bjTOS1Vb/wAA2/8JEqT/Q0g8kQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAJnMqoiJtJ/0haST/NEkp/yQnW/8AAPD8AAHY/RsgP/JZUI+GKitih4ObUEAAAAAAAAAAAAAAAAAAAAAAKnouwip5Lv9ooW//a6Jz/y9GIv8JBXb/AADO/gEBvf8AAK7/FRJp/z9BfP8iLGj1AAAAAAAAAAAAAAAAL4YzwiB0I/+UwJ3/bK+C/02eZ/9CTjz/DBa1/wABxf8BAOj/AACp/w8Oc/sJCv//EhCN9AAAAAAAAAAANJA6iC2MMv93tYL/TZ5U/3mzjP9NoWr/NEss/wYIU/8CBOn/ARCX/wwNqP0TD6X/Cgyex5qacDAAAAAAAAAAADKUN/ZirWj/d76R/0SgXf9Ln1P/eLSM/1mda/8rOkb/CQiD/wMQvf8UEnT/MTAt4P//MwUhZyN8AAAAAAAAAAAznDf5UqlZ/228jP9NqnD/Qp9c/0yiVP+Dv5b/VaVw/0VxXf9PZXD/S3pQ/y54Nf8jcCf/I2wn/wAAAAA0ozjIM6E4/zOeOP+Uz6z/XLR+/06scv9BoV3/TqZX/4XBmP9XqHP/hr6Z/yp+Lf8leSr1JXUqbQAAAAA3rTz7Nqo7/zWmOqM3oz7rUK1W/43Mpf9etYD/T61z/0KjXf9Rqln/msup/46/lf8pgy7/JFg6sAAAAAAAAAAAOK8+8jqvOiMAAAAAAAAAADSlOv85pT//kM6o/2K5hP9Ysnv/YLJ2/ziXPv8piS3/V6Ri/yZQQ9wAAAAAAAAAAAAAAAAAAAAAAAAAADetP0E2qzz/OKg98UWsS/+e1K3/pNe4/4XDjv8ojy3/T7df/5fIqv8sjTH/K4kw/yqFLv8AAAAAAAAAAAAAAAA4sT3xN7A8+QAAAAA4qz3yNag6/zSlOf80oTn/csJ+/6/jwv9fjHj/MmRMdQAAAAAAAAAAAAAAAAAAAAAAAAAAOrdA/zm0QHQAAAAAAAAAADasO/k2qTvuRX5lpjqGT/gznDr/O3FXigAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAADq9QiMAAAAAAAAAAAAAAAA4sj7/Nq09s0uOaSI1qTplM6U68wAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAOrc//zu0P0EAAAAAOK4+UjWsPPgAAAAAAAAAAAAAAAAAAAAA/48AAP8HAAD4AQAA8AAAAOAAAADAAQAAwAMAAMAAAACAAwAAAAMAAHADAADwAAAA5AcAAO4HAAD+bwAA/u8AAA==
		`- -`
		- -#define mdn_icon data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAIAAAD8GO2jAAABgElEQVR4AWPouPiRpmjUAjgatSBj+aG0OVuyVhymsgWl2y475zXySikwwIC4lpFDVk3avG0BrXP9mmeV7bhCvgXuxW3M7JwMeAGfpByZFpjHFzAQB2KmrSfZAtuMKgaiAZ+MUuLc7SRY4FbYwkA60HAJiJm8uubQAwIWeJV1MlAAOAREHDJrcFqQMG+ngIK6oKyykLwqAyMjeXZwiUjgtKD+yGMIwyGzmoGBTAs4hcXrgObgi4OiVkpCiUtYov7YU5wW1B194t0ww69ldvjktYouwWRYIGdkQ1Q+iJ28hp2Xn7B5zKzIPAlNw6S52wlbkL3mJJecOq+CBqeIJC6TjUJTMlcdz9lwLmriSuPgJBVbj/D+5SSXRequQVhNN4nIoEJhV77jKgs7B6bprJw85XtuU8GCpNlbSS3gSA4ii4QiTAvElDWpWeH41kxg5eZDSypUrtFKd1zTcA1EpHRDS5rUyQEts+VN7JjYOGR0TWhY6RdsOhc/Y9NoswUJjVoAAE+h555Rgcg2AAAAAElFTkSuQmCC
		`- -`
		- -#define addon_icon data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAMAAABEpIrGAAABOFBMVEUAAAAAzdwAydcAyNgA//8AzOYAydcAyNgAyNgA2NgAytoAzNkAytgAydgA29sA0egAyNgAyNgA//8AyNgAydgA//8Ay9cAydcAytkAz90Ay9gA1eoAydgAytsAyNgAytgAydkAydgAydgAyNgAydgAyNcAy9oAydgA//8AytsAy9kAytkAyNgAydgAydkAy9kAzP8AydgAydgAydgAz98AzN0AyNcAyNsAydcAydgAydgAydcAytgAytcAydcAydcAytcAydcAyNcAydcAy9gAztgAydcAydgAzOAAydcAyNgAyNgAytwAyNcAyNgAy9wAyNcAyNcAyNgAydgAyNcAydcAydgA0uEAydkAyNgAyeQA4+MAyNgAydkAzN0AyNsA1f8AyNgAydgAydcA1eMAydgAydcAyNdj6PGJAAAAZ3RSTlMAJFpBAQqm8qwNPiiPygcLv8QEw5cDQMA1JU4MwiuDbl/+6+m4+0XLAj9KePz9cjYFvervEA/IDsfFr+xcgeaOYIDo+ica1OMZ9bXlHe73LM3M35itxs8Rf5ATCbFeHjgGttC5ErzO3WvwaAAAAWxJREFUOMt9kudCwkAQhFcITQWCoaggiBqxoaixYUVsYMMGCmLXff838LIXCJAL84fvmCHsTg4AYMDhlIDkcnu8Po4w6BjiIA0joj+gY1BmGKLEiMIwHNFR9xGjuh8jpMQoYZjRGBGOA8QTHDEUB4hynABwcEqCT8GW2DNSnCYBnJzSoSk0NT2jcphlM/rRXpk5NkRgfmFxSWBml6MrOWNlWBUEEmDKtyYIrGttP66gSP4Nww8mUKzNLd5/zHaJbb1Tl9xnzR2WcGM/5QE8BLvJvf0Dc4HDo8IxUVECL5Vywv7s9Mzwz/WLcFHSsWy8w0sa9+qa/JtbOlUY3mnGLbjnCz9Q4JEfnhCrNb5nXi3w754p8MIPKVWpt6psGJ+vFJBbBUO3GlozzYdsSmCV1NlntiTnegNvPQ29Wx7h7fKrEUvg47PD/6oLpgh8m7//AZEav4b/J/bbb75SAzvR3crY+6y8fLGsQV9ZSvwHF4LQIhDjT+8AAAAASUVORK5CYII=
		- +#define parabola_icon data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAABL0lEQVQ4jWNgoCcoq16VU1GzygnEBtEVDWuV8GooKFuhWVG3uiM3d5UokG4qr1szAaa5vGbVt4ralacwNDU0rGIrr10VBVG0+lxhwyqVsqqVtRW1q6eD5IvL19oB2V+B+D9QzQu4xtDQVZylVavygRKHqurWOlbUrknKK12qWlCwWLK8elUFA8N/xvLy5VYVtas+gzWDDVi9E2QjT1XdcufymjWpQJt1cXmnvHwVP1DzR7hmIC6vW+kOtpnYQKysW30arrlm9RVi9cFBRfXKJTADympWJZNsQFnN6rUQA1adAQU2SZqBXmUGBtozUDiU1qxQJtl2oCY3kO2l1avCSdYMAsBAWwyM2plkaS4p6eYGOv1YQ0MDB1kGlFWuDChuWKZBlmYQqK5eJU22ZkIAAEIlnQZQkzITAAAAAElFTkSuQmCC
		`- +`
		- +#define fsf_icon data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAIAAACQkWg2AAAACXBIWXMAAAsTAAALEwEAmpwYAAADG0lEQVQoFQEQA+/8AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAEAAAD///8AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABAQECAAAAAAAAAAAAAAAAAAAA2qOp7tTXAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQAAAP///wAAAAAAAOCyt7pUXQcSEgcQDwAAAP///wAAAAAAAAD//x9NSDqNhQEBAQQAAAAAAAAAAAAAAAAQJiQGDQ0aPToZPjoAAQEAAAAAAAAAAAABAQEpZV4AAAAAAAAAAAAA////////////////pSIv05KZ////////////////////////////////AAAAAQAAAP///6krNwAAAAAAAPHc3ggSEQcSEQAAAAAAAAAAABY3NEGelQAAAAAAAAEBAQEAAAD///+YARAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAGDg1g690CBgYAAAABAQEEAAAAAAAAS7etAAAAAAAAwGVtHklFIlJOAAAAAAAAAAAAAAAA+/X2BwYGAAAAAAAABAAAAAAAAB1IQwAAAAAAAAYNDBAmJB1IQwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIAAAAAAAAAAAAAAAAAAAAAAgL//v4AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACAAAAAAAAAAAAAAAAAAAAAQEB//7/AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAAAAAAAAAAAAAAECAv/+/gAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD////////////////cqK3qzM////////////////////////////////8AAAABAAAA////AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQEBAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAGuLjDf9F8oBAAAAAElFTkSuQmCC
		`- +`
		- +#define gnu_icon data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgBAMAAACBVGfHAAAAGFBMVEVFRUV+fn6mpqa/v7/Ozs7Y2Njg4OD8/Pwuhn+TAAAAAWJLR0QAiAUdSAAAAAlwSFlzAAALEQAACxEBf2RfkQAAAAd0SU1FB9MBDhQ6Gd8s57cAAAEVSURBVBgZBcGxVtpgGADQL9gHSBzqSognzMixmcWWzB6pmRHhnyvku6/fewMAIPD3TwHmQxHs6vr+A16bphNum/vV0x429201hcPjAGBTDZGnR/Kw1U181+u4HXvOdSxjUcztz8jjg1xGVBG9XPYxt4PviKiaWLg168iXtbrq+mPT1utjNcR1U73deRnL43M2sRgj3+oYs8uL3rLphPd2QWmHbMu/VS/cnk6UdtSW657g9yBlcZ0UAkUWzPvyRaAYmfd+HT4IZtvC59ibEJxXiqJjQpBpNEufBYE0McoOAunGhRMEFIPc7h4goJigQEBxk8u7AgEpL3IEAUZfcgAByGFXQACm5+4MAuB19QMEgI8CAgDgP4rivVgoKP6ZAAAAAElFTkSuQmCC
		`- +`
		- +#define libreplanet_icon data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAACfElEQVQ4jZXTS0hUcRTH8f+9M3fGd0gRRq1a2bZdBAotWtS6TQtB6IHgKzRy0UKqjRaRCAq+R21MDMsUR83JR5fJxhmaK2lzsWAWw+ToEHJxgnFm7reFIgza66z/58P/dzhHcESZpsluIsFPwyCVSmGa5lHPEEIIkdGYTqPPvqUlP4fK8nJ2DINYNEq71YJ3fv4QlAGkUynaj+VRdfUK7580M52rEN/ZYWNjg2GrjEMSPFXsmOn0YcA0TZ4V5tNZUkJTTTWfJiZIJhJ8U1VczwcZs0o4JUHzufM0ZGcf/OQASCaTxGIxDMNA00P8iEbpuXyJ8Tw77+wWJhWZQYuVbiHoFIKwpmUC4XCYzc1NDMMgHo9z8+IFvl6/xsf7D9ArbjOpyAxLEt1C0CUErfvJDwBd14lEImxvb/N9fR1fgY3egmyWsq0sO/poUyw4pb3mLiFolyRM09wDEokEfr+fUChEJBJh4HgBS7kKn92zLIy9ZriqklFZwiEEHfsRRp1O0un0HpDa3cU9M8PKygp3Tp5AzbKgZlmYt1uYtkn02q0MyYKmnBxWNI27Nhtut5tkMrkHmKZJbWkpqqryQpFxKTJTisyEVeaVRWJIlqgpLuZRWRkejwe/34/P58ucwZvWVhYXF5l2uejIzeHGqbM4ZYmB/dy1hUV8mJpibm4On8/H1tbW4T1YXV3F6/WysLDA5Pg4nfsDe5yfz8OiIjweD5qmEQwGf7/KwWCQtbU1NE2jRZbpEoI2SWKqr49lVUXX9T/fAkAgEKC/e5SW6mo6hKD+zGn6e0bw+/x/PyaA9S/rvOwfobGukfpbddyraMDR7iCwHPg34H9KCCF+Abts3KCj/p6aAAAAAElFTkSuQmCC
		`- +`
		- +#define hnode_icon data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAABgElEQVQ4jaXRz2uSARzHcb0vlRGEzTVWISU1BVkFYTIyjNK1pKcxHA+yhWMWIamHYikFgpoLIi9jwegi3QbL9SzdLmMbM9J+DkJBgm5RDvEPeHeQHOyQz0OH9+V7ePGBr0pqpPmfVPsP8a0AR4MnMEwf48x9K0s/E8oAY9iEMOvD+8yP2qVjrhhRBnSN61n5sIpULqC+pGHh8wNlgEY8jPQXcGh4VXukDND5evYAl46odIuXtYdKAANSudAChO52/XeMZMohecCbcoGdH99Y+7LO72adT9+/4nh8nYOjBl7/SsoB8gBkpHk8T0S2K++pN3fRin3cfnFDHvCuWkI9rEMvHGEo5gbAHnXhnLF1BpZLeRaLOVT2A8Q3A5wMngXgWtKLxX9KPqC+rCWQvYkpeK4NWKcGOgO50ts2MJJ0cPreeQDciTHMchZYIhcwh2wcuqjn+ccwGm9v6wsTxxn0dVgQXZ7Ek3Agpq6QrcaQGmmebtxFSDkRU1fJVmL/BpT2ByV/3eDMhinRAAAAAElFTkSuQmCC
		`- <!-- This Source Code Form is subject to the terms of the Mozilla Public`
		`- - License, v. 2.0. If a copy of the MPL was not distributed with this`
		`- - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->`
		`- @@ -29,31 +29,23 @@`
		`- <dl><p>`
		`- <dt><h3 personal_toolbar_folder="true" data-l10n-id="default-bookmarks-toolbarfolder">default-bookmarks-toolbarfolder</h3></dt>`
		`- <dd data-l10n-id="default-bookmarks-toolbarfolder-description">default-bookmarks-toolbarfolder-description</dd>`
		`- -#ifndef NIGHTLY_BUILD`
		`- <dl><p>`
		`- - <dt><a href="https://www.mozilla.org/firefox/central/" icon="@firefox_icon@" data-l10n-id="default-bookmarks-getting-started">default-bookmarks-getting-started</a></dt>`
		`- + <dt><a href="https://www.parabola.nu/" icon="@parabola_icon@">Parabola GNU/Linux-libre</a></dt>`
		`- </dl><p>`
		`- - <dt><h3 data-l10n-id="default-bookmarks-firefox-heading">default-bookmarks-firefox-heading</h3></dt>`
		`- + <dt><h3>Parabola GNU/Linux-libre</h3></dt>`
		`- <dl><p>`
		`- - <dt><a href="https://support.mozilla.org/products/firefox" icon="@firefox_icon@" data-l10n-id="default-bookmarks-firefox-get-help">default-bookmarks-firefox-get-help</a></dt>`
		`- - <dt><a href="https://support.mozilla.org/kb/customize-firefox-controls-buttons-and-toolbars?utm_source=firefox-browser&utm_medium=default-bookmarks&utm_campaign=customize" icon="@firefox_icon@" data-l10n-id="default-bookmarks-firefox-customize">default-bookmarks-firefox-customize</a></dt>`
		`- - <dt><a href="https://www.mozilla.org/contribute/" icon="@mozilla_icon@" data-l10n-id="default-bookmarks-firefox-community">default-bookmarks-firefox-community</a></dt>`
		`- - <dt><a href="https://www.mozilla.org/about/" icon="@mozilla_icon@" data-l10n-id="default-bookmarks-firefox-about">default-bookmarks-firefox-about</a></dt>`
		`- - </dl><p>`
		`- -#else`
		`- - <dl><p>`
		`- - <dt><a href="https://www.mozilla.org/contribute/" icon="@mozilla_icon@" data-l10n-id="default-bookmarks-firefox-community">default-bookmarks-firefox-community</a></dt>`
		`- - </dl><p>`
		`- - <dt><h3 data-l10n-id="default-bookmarks-nightly-heading">default-bookmarks-nightly-heading</h3></dt>`
		`- + <dt><a href="https://www.parabola.nu/" icon="@parabola_icon@">Parabola GNU/Linux-libre</a>`
		`- + <dt><a href="https://www.parabola.nu/packages/" icon="@parabola_icon@">Parabola GNU/Linux-libre Packages</a>`
		`- + <dt><a href="https://wiki.parabola.nu/" icon="@parabola_icon@">Parabola GNU/Linux-libre Wiki</a>`
		`- + <dt><a href="https://labs.parabola.nu/" icon="@parabola_icon@">Parabola GNU/Linux-libre Labs</a>`
		`- + </dl><p>`
		`- + <dt><h3>Free Software Foundation</h3></dt>`
		`- <dl><p>`
		`- - <dt><a href="https://blog.nightly.mozilla.org/" icon="@mozilla_icon@" data-l10n-id="default-bookmarks-nightly-blog">default-bookmarks-nightly-blog</a></dt>`
		`- - <dt><a href="https://bugzilla.mozilla.org/" icon="@bugzilla_icon@" shortcuturl="bz" data-l10n-id="default-bookmarks-bugzilla">default-bookmarks-bugzilla</a></dt>`
		`- - <dt><a href="https://developer.mozilla.org/" icon="@mdn_icon@" shortcuturl="mdn" data-l10n-id="default-bookmarks-mdn">default-bookmarks-mdn</a></dt>`
		`- - <dt><a href="https://addons.mozilla.org/firefox/addon/nightly-tester-tools/" icon="@addon_icon@" data-l10n-id="default-bookmarks-nightly-tester-tools">default-bookmarks-nightly-tester-tools</a></dt>`
		`- - <dt><a href="about:crashes" icon="@mozilla_icon@" data-l10n-id="default-bookmarks-crashes">default-bookmarks-crashes</a></dt>`
		`- - <dt><a href="https://planet.mozilla.org/" icon="@mozilla_icon@" data-l10n-id="default-bookmarks-planet">default-bookmarks-planet</a></dt>`
		`- + <dt><a href="https://www.fsf.org/" icon="@fsf_icon@">Free Software Foundation</a>`
		`- + <dt><a href="https://www.gnu.org/" icon="@gnu_icon@">The GNU Operating System and the Free Software Movement</a>`
		`- + <dt><a href="https://libreplanet.org/" icon="@libreplanet_icon@">LibrePlanet</a>`
		`- + <dt><a href="https://www.h-node.org/" icon="@hnode_icon@">h-node</a>`
		`- </dl><p>`
		`- -#endif`
		`- </dl>`
		`- </body>`
		`- </html>`
		`- --`
		`- 2.35.1`
		`-`
		`- From f4475bc77e63f16562aa8360233140522d72d8d4 Mon Sep 17 00:00:00 2001`
		`- From: grizzlyuser <grizzlyuser@protonmail.com>`
		`- Date: Sat, 7 May 2022 21:46:48 +0200`
		`- Subject: [PATCH] Remove 'More from Mozilla' section in Preferences`
		`-`
		`- Currently it contains functionality to provide links to nonfree software`
		`- like Firefox Mobile, which is not compatible with the FSDG for the same`
		`- reasons as desktop Firefox.`
		`- ---`
		`- browser/app/profile/firefox.js \| 2 +-`
		`- .../static/browser_all_files_referenced.js \| 12 -------`
		`- browser/components/preferences/jar.mn \| 4 ---`
		`- .../more-from-mozilla-qr-code-advanced.svg \| 4 ---`
		`- .../more-from-mozilla-qr-code-simple-cn.svg \| 4 ---`
		`- .../more-from-mozilla-qr-code-simple.svg \| 4 ---`
		`- .../components/preferences/moreFromMozilla.js \| 33 +------------------`
		`- browser/components/preferences/preferences.js \| 9 -----`
		`- .../components/preferences/preferences.xhtml \| 12 -------`
		`- 9 files changed, 2 insertions(+), 82 deletions(-)`
		`- delete mode 100644 browser/components/preferences/more-from-mozilla-qr-code-advanced.svg`
		`- delete mode 100644 browser/components/preferences/more-from-mozilla-qr-code-simple-cn.svg`
		`- delete mode 100644 browser/components/preferences/more-from-mozilla-qr-code-simple.svg`
		`-`
		`- diff --git a/browser/app/profile/firefox.js b/browser/app/profile/firefox.js`
		`- index 76b495ea6c..d0c2b98b11 100644`
		`- --- a/browser/app/profile/firefox.js`
		`- +++ b/browser/app/profile/firefox.js`
		`- @@ -1011,7 +1011,7 @@ pref("browser.preferences.experimental", true);`
		`- #else`
		`- pref("browser.preferences.experimental", false);`
		`- #endif`
		`- -pref("browser.preferences.moreFromMozilla", true);`
		`- +pref("browser.preferences.moreFromMozilla", false);`
		`- pref("browser.preferences.experimental.hidden", false);`
		`- pref("browser.preferences.defaultPerformanceSettings.enabled", true);`
		`-`
		`- diff --git a/browser/base/content/test/static/browser_all_files_referenced.js b/browser/base/content/test/static/browser_all_files_referenced.js`
		`- index 4c59b84a7c..44d36d3b28 100644`
		`- --- a/browser/base/content/test/static/browser_all_files_referenced.js`
		`- +++ b/browser/base/content/test/static/browser_all_files_referenced.js`
		`- @@ -33,7 +33,6 @@ var gExceptionPaths = [`
		`- "chrome://browser/content/assets/moz-vpn.svg",`
		`- "chrome://browser/content/assets/vpn-logo.svg",`
		`- "chrome://browser/content/assets/focus-promo.png",`
		`- - "chrome://browser/content/preferences/more-from-mozilla-qr-code-advanced.svg",`
		`- "chrome://browser/content/assets/klar-qr-code.svg",`
		`-`
		`- // These app marketplace icons are referenced based on the user's locale`
		`- @@ -136,17 +135,6 @@ var whitelist = [`
		`- // extensions/pref/autoconfig/src/nsReadConfig.cpp`
		`- { file: "resource://gre/defaults/autoconfig/prefcalls.js" },`
		`-`
		`- - // browser/components/preferences/moreFromMozilla.js`
		`- - // These files URLs are constructed programatically at run time.`
		`- - {`
		`- - file:`
		`- - "chrome://browser/content/preferences/more-from-mozilla-qr-code-simple.svg",`
		`- - },`
		`- - {`
		`- - file:`
		`- - "chrome://browser/content/preferences/more-from-mozilla-qr-code-simple-cn.svg",`
		`- - },`
		`- -`
		`- { file: "resource://gre/greprefs.js" },`
		`-`
		`- // layout/mathml/nsMathMLChar.cpp`
		`- diff --git a/browser/components/preferences/jar.mn b/browser/components/preferences/jar.mn`
		`- index 912d9edf08..dd4697a368 100644`
		`- --- a/browser/components/preferences/jar.mn`
		`- +++ b/browser/components/preferences/jar.mn`
		`- @@ -14,12 +14,8 @@ browser.jar:`
		`- content/browser/preferences/containers.js`
		`- content/browser/preferences/sync.js`
		`- content/browser/preferences/experimental.js`
		`- - content/browser/preferences/moreFromMozilla.js`
		`- content/browser/preferences/fxaPairDevice.xhtml`
		`- content/browser/preferences/fxaPairDevice.js`
		`- content/browser/preferences/findInPage.js`
		`- - content/browser/preferences/more-from-mozilla-qr-code-simple.svg`
		`- - content/browser/preferences/more-from-mozilla-qr-code-simple-cn.svg`
		`- - content/browser/preferences/more-from-mozilla-qr-code-advanced.svg`
		`- content/browser/preferences/web-appearance-dark.svg`
		`- content/browser/preferences/web-appearance-light.svg`
		`- diff --git a/browser/components/preferences/more-from-mozilla-qr-code-advanced.svg b/browser/components/preferences/more-from-mozilla-qr-code-advanced.svg`
		`- deleted file mode 100644`
		`- index 4848d3e20c..0000000000`
		`- --- a/browser/components/preferences/more-from-mozilla-qr-code-advanced.svg`
		`- +++ /dev/null`
		`- @@ -1,4 +0,0 @@`
		`- -<!-- This Source Code Form is subject to the terms of the Mozilla Public`
		`- - - License, v. 2.0. If a copy of the MPL was not distributed with this`
		`- - - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->`
		- -<svg width="113" height="113" fill="content" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" clip-rule="evenodd" d="M4 2h105a2 2 0 0 1 2 2v105a2 2 0 0 1-2 2H4a2 2 0 0 1-2-2V4a2 2 0 0 1 2-2ZM0 4a4 4 0 0 1 4-4h105a4 4 0 0 1 4 4v105a4 4 0 0 1-4 4H4a4 4 0 0 1-4-4V4Zm10 6h22.448v22.448H10V10Zm6.414 3.207h-3.207V29.24H29.24V13.207H16.414ZM38.862 10h6.414v3.207h3.207v3.207h-3.207v3.207h3.207v-3.207h3.207V10h6.413v3.207h3.207V10h3.207v6.414h-9.62v6.414h3.206v3.207h3.207v-3.207h3.207V19.62h3.207v-3.207h3.207v3.207h3.207v-6.414h3.207V22.828h-3.207v3.207H70.93v6.413h-3.207v-3.207h-3.207v6.414H61.31v-6.414h-3.207v3.207h-3.206v-6.413h-6.414v-3.207h-6.414v3.207h-3.207v-3.207h-3.207v-6.414h6.414v-3.207h-3.207V10Zm6.414 22.448h-3.207v-6.413h3.207v6.413Zm-9.62 9.621h6.413v-3.207h-3.207v-3.207h6.414v-3.207h3.207v-3.207h3.207v3.207h3.207v6.414H51.69v-3.207h-3.207v3.207h3.207v3.207h-6.414v3.207h-3.207V54.897h-3.207v3.206h-3.207v-3.206h-3.207V51.69h-3.207v-3.207h3.207v-3.207h3.207v3.207h3.207v-3.207h-3.207v-3.207Zm-3.208 0v3.207h-3.207v-3.207h3.207Zm-3.207-3.207v-3.207h6.414v6.414h-3.207v-3.207h-3.207Zm-9.62 0v-3.207h6.414v3.207h3.206v3.207h-6.413v-3.207H19.62Zm0 0v3.207h-3.207v3.207h-3.207v-3.207H10v-3.207H19.621Zm6.414 19.241V51.69h3.206v3.207h3.207v3.206h-6.413Zm0 3.207v-3.207h-3.207V48.483h3.207v-3.207H19.62v3.207h-6.414v6.414h6.414v3.206h3.207v3.207h-6.414v-3.207H10v19.242h12.828v-3.207H19.62V70.93h6.414v6.414h6.413v-3.207h3.207V83.759h3.207v-3.207h3.207v16.034h16.034v3.207H48.483V103h9.62v-3.207h3.207V103h16.035v-3.207H67.724v-3.207H61.31V93.38H70.931v-3.207h12.828v6.414h-3.207V93.38h-6.414v3.207h6.414V103H93.379v-3.207h3.207v-3.207h3.207v3.207H103V93.38h-3.207v-3.207H90.172v-3.206h3.207v-3.207h3.207V70.93h-9.62v-3.207H96.586v-3.207H93.38V61.31h3.207v-3.207H93.38v-3.206h3.207V51.69h3.207V64.517H103V51.69h-3.207v-3.207H103v-3.207h-3.207v3.207h-3.207v3.207H93.38v-3.207h-3.207v3.207h-3.206v3.207h-3.207v-6.414h3.207v-3.207H96.586v-3.207h3.207v-3.207h-3.207v-3.207h-6.414v3.207H83.76v3.207h-6.414v-3.207h-3.207v6.414H70.93v3.207h3.207v-3.207H83.759v3.207h-6.414v3.207h3.207v3.207H70.93v3.206H80.552v3.207h3.207v-3.207h3.207v3.207h3.206v3.207h-3.206v3.207h-3.207v-3.207h-6.414V61.31H70.93v3.207h3.207v3.207h-6.414v6.414h-3.207V70.93H61.31v3.207h-3.207V70.93h-3.206v3.207H51.69V83.759h-3.207v3.207h-3.207v-6.414h-3.207v-3.207h3.207v-3.207h-3.207v3.207h-3.207V70.93h-3.207v-6.414h3.207v3.207h3.207V61.31h-6.414v-3.207h-3.207v3.207h-6.413Zm0 3.207V61.31h-3.207v3.207H19.62v3.207h3.207v-3.207h3.207Zm3.206 6.414h3.207v3.207h-3.207V70.93Zm0 0v-3.207h3.207v-3.207h-6.413v6.414h3.206Zm25.656 16.035h-6.414v3.206h-3.207v3.207H58.103v-3.207h3.207v-3.206h3.207v-3.207h3.207v6.413h3.207V83.76h-3.207v-3.207h-3.207v-3.207H61.31v3.207h-3.207v3.207h-3.206v3.207Zm3.206 0h3.207v-3.207h3.207v-3.207H61.31v3.207h-3.207v3.207Zm0 0h-3.206v3.206h3.206v-3.206Zm-3.206-12.828v3.207h3.206v-3.207h-3.206Zm28.862-3.207v-3.207h-6.414v3.207H70.93v3.207h6.414V70.93h6.414Zm0 0v3.207h3.207V70.93h-3.207Zm6.413-16.034h-3.206v3.206h3.206v-3.206Zm-6.413 3.206v-3.206h-3.207v3.206h3.207Zm6.413-19.24v3.206h3.207v-3.207h-3.207Zm0 16.034V51.69h3.207v3.207h-3.207Zm3.207 28.862v-3.207h-3.207v3.207h3.207Zm-3.207 9.62v6.414h3.207V93.38h-3.207Zm0 0v-3.207h-3.206v3.207h3.206Zm-6.413 3.207v3.207h3.207v-3.207h-3.207ZM54.897 38.862H64.517v3.207h-9.62v-3.207Zm19.24-25.655h-6.413V10h6.414v3.207Zm-12.827 9.62h-3.207v-3.206h3.207v3.207ZM80.552 10H103v22.448H80.552V10Zm6.413 3.207H83.76V29.24H99.793V13.207H86.966Zm-70.551 3.207H26.035V26.035H16.414V16.414Zm70.552 0H96.586V26.035h-9.62V16.414ZM35.656 29.24h3.206v3.207h-3.207v-3.207Zm38.482 0h3.207v6.414h-3.207v-6.414Zm-6.414 6.414h3.207v3.207h-3.207v-3.207Zm32.07 32.07H103V77.344h-3.207V67.724Zm-6.415 6.413h-3.207v3.207h3.207v-3.207Zm-19.241 3.207H70.93v3.207h3.207v-3.207Zm6.414 0h-3.207V86.966H86.966V77.345h-6.414ZM10 80.552h22.448V103H10V80.552Zm6.414 3.207h-3.207V99.793H29.24V83.76H16.414Zm64.138-3.207h3.207v3.207h-3.207v-3.207Zm-64.138 6.413H26.035V96.587H16.414v-9.62Zm19.241 0h3.207v6.414h-3.207v-6.413Zm6.414 12.828h3.207V103h-3.207v-3.207Z" fill="#141422"/><path d="M65.068 53.042c-.403-.968-1.219-2.014-1.858-2.344.456.882.772 1.83.938 2.81l.002.015c-1.048-2.609-2.822-3.663-4.273-5.954a11.08 11.08 0 0 1-.218-.355 2.928 2.928 0 0 1-.102-.19 1.685 1.685 0 0 1-.144-.383.024.024 0 0 0-.015-.008.032.032 0 0 0-.017 0l-.005.002-.007.004.004-.006c-2.326 1.361-3.116 3.882-3.187 5.144a4.633 4.633 0 0 0-2.55.982 2.782 2.782 0 0 0-.239-.181 4.295 4.295 0 0 1-.026-2.264c-.854.414-1.613 1-2.229 1.723h-.004c-.367-.465-.341-1.999-.32-2.32a1.656 1.656 0 0 0-.31.165c-.323.231-.626.49-.904.775a8.089 8.089 0 0 0-.866 1.039v.001-.002a7.821 7.821 0 0 0-1.242 2.806l-.013.06c-.017.082-.08.49-.091.579l-.002.02a8.82 8.82 0 0 0-.15 1.277v.048a9.26 9.26 0 0 0 18.385 1.566c.016-.12.029-.238.042-.359a9.523 9.523 0 0 0-.6-4.652v.002ZM54.395 60.29c.043.02.083.043.128.063l.006.004a5.116 5.116 0 0 1-.134-.067Zm9.755-6.765v-.01l.001.01h-.001Z" fill="url(#a)"/><path d="M65.068 53.042c-.403-.968-1.219-2.014-1.858-2.344.456.883.772 1.83.938 2.81v.009l.002.01a8.387 8.387 0 0 1-.289 6.25c-1.061 2.277-3.629 4.611-7.65 4.497-4.344-.123-8.172-3.348-8.886-7.57-.13-.666 0-1.003.065-1.544-.089.42-.139.848-.148 1.277v.048a9.26 9.26 0 0 0 18.385 1.566c.016-.12.029-.238.042-.358a9.525 9.525 0 0 0-.6-4.652h-.001Z" fill="url(#b)"/><path d="M65.068 53.042c-.403-.968-1.219-2.014-1.858-2.344.456.883.772 1.83.938 2.81v.009l.002.01a8.387 8.387 0 0 1-.289 6.25c-1.061 2.277-3.629 4.611-7.65 4.497-4.344-.123-8.172-3.348-8.886-7.57-.13-.666 0-1.003.065-1.544-.089.42-.139.848-.148 1.277v.048a9.26 9.26 0 0 0 18.385 1.566c.016-.12.029-.238.042-.358a9.525 9.525 0 0 0-.6-4.652h-.001Z" fill="url(#c)"/><path d="m60.566 54.129.058.042a5.043 5.043 0 0 0-.86-1.121c-2.88-2.88-.755-6.241-.397-6.413l.004-.006c-2.326 1.362-3.116 3.883-3.187 5.145.108-.008.215-.017.325-.017a4.673 4.673 0 0 1 4.057 2.37Z" fill="url(#d)"/><path d="M56.514 54.705c-.015.23-.83 1.025-1.114 1.025-2.633 0-3.06 1.593-3.06 1.593.116 1.341 1.05 2.446 2.18 3.03.052.026.105.05.157.074.09.04.181.077.272.111a4.12 4.12 0 0 0 1.205.233c4.616.216 5.51-5.52 2.179-7.185a3.196 3.196 0 0 1 2.233.542 4.673 4.673 0 0 0-4.058-2.37c-.11 0-.217.01-.325.017a4.633 4.633 0 0 0-2.55.982c.142.12.301.28.637.61.628.62 2.24 1.26 2.243 1.336l.001.002Z" fill="url(#e)"/><path d="M56.514 54.705c-.015.23-.83 1.025-1.114 1.025-2.633 0-3.06 1.593-3.06 1.593.116 1.341 1.05 2.446 2.18 3.03.052.026.105.05.157.074.09.04.181.077.272.111a4.12 4.12 0 0 0 1.205.233c4.616.216 5.51-5.52 2.179-7.185a3.196 3.196 0 0 1 2.233.542 4.673 4.673 0 0 0-4.058-2.37c-.11 0-.217.01-.325.017a4.633 4.633 0 0 0-2.55.982c.142.12.301.28.637.61.628.62 2.24 1.26 2.243 1.336l.001.002Z" fill="url(#f)"/><path d="M53.202 52.452c.075.047.137.09.192.127a4.295 4.295 0 0 1-.026-2.264c-.855.414-1.614 1-2.23 1.723.046-.001 1.389-.025 2.064.414Z" fill="url(#g)"/><path d="M47.323 56.705c.715 4.222 4.542 7.447 8.886 7.57 4.021.113 6.59-2.222 7.65-4.498a8.387 8.387 0 0 0 .289-6.25v-.009c0-.007-.002-.01 0-.009l.002.016c.328 2.145-.763 4.222-2.469 5.629l-.005.012c-3.324 2.707-6.504 1.633-7.146 1.195a4.961 4.961 0 0 1-.135-.067c-1.938-.927-2.738-2.69-2.566-4.206a2.379 2.379 0 0 1-2.194-1.38 3.493 3.493 0 0 1 3.405-.136 4.611 4.611 0 0 0 3.476.136c-.003-.075-1.615-.716-2.243-1.335-.336-.331-.495-.49-.637-.61a2.78 2.78 0 0 0-.238-.181c-.055-.038-.117-.078-.192-.127-.675-.44-2.018-.415-2.063-.414h-.004c-.367-.465-.341-2-.32-2.32a1.66 1.66 0 0 0-.31.165c-.323.23-.626.49-.904.775-.319.32-.61.667-.87 1.036v.002-.002a7.82 7.82 0 0 0-1.242 2.805c-.005.019-.334 1.457-.172 2.203h.002Z" fill="url(#h)"/><path d="M59.763 53.05c.339.331.628.71.86 1.122.052.039.099.077.14.114 2.099 1.935.999 4.67.917 4.864 1.705-1.405 2.795-3.483 2.468-5.629-1.047-2.611-2.824-3.665-4.272-5.956a11.265 11.265 0 0 1-.218-.355 2.923 2.923 0 0 1-.102-.191 1.686 1.686 0 0 1-.144-.383.024.024 0 0 0-.015-.008.035.035 0 0 0-.018 0l-.004.003-.007.004c-.358.17-2.483 3.533.397 6.41l-.002.004Z" fill="url(#i)"/><path d="M60.762 54.287a1.93 1.93 0 0 0-.139-.114l-.057-.042a3.196 3.196 0 0 0-2.233-.542c3.33 1.665 2.437 7.4-2.179 7.184a4.12 4.12 0 0 1-1.205-.232 4.906 4.906 0 0 1-.428-.186l.007.004c.643.44 3.822 1.513 7.146-1.195l.005-.012c.083-.193 1.183-2.929-.917-4.864v-.001Z" fill="url(#j)"/><path d="M52.34 57.321s.427-1.593 3.06-1.593c.285 0 1.1-.794 1.114-1.025a4.612 4.612 0 0 1-3.476-.136 3.492 3.492 0 0 0-3.405.136 2.378 2.378 0 0 0 2.194 1.38c-.172 1.514.629 3.278 2.566 4.206.043.02.084.043.128.063-1.13-.585-2.065-1.69-2.181-3.03Z" fill="url(#k)"/><path d="M65.068 53.042c-.403-.968-1.219-2.014-1.858-2.344.456.882.772 1.83.938 2.81l.002.015c-1.048-2.609-2.822-3.663-4.273-5.954a11.265 11.265 0 0 1-.218-.355 2.923 2.923 0 0 1-.102-.19 1.685 1.685 0 0 1-.144-.383.024.024 0 0 0-.015-.008.033.033 0 0 0-.017 0l-.005.002-.007.004.004-.006c-2.326 1.361-3.116 3.882-3.187 5.144.108-.008.215-.017.325-.017a4.673 4.673 0 0 1 4.057 2.37 3.197 3.197 0 0 0-2.233-.542c3.331 1.665 2.437 7.4-2.178 7.184a4.117 4.117 0 0 1-1.205-.232 4.828 4.828 0 0 1-.429-.186l.007.004a4.825 4.825 0 0 1-.135-.067c.043.02.084.043.128.063-1.13-.584-2.064-1.69-2.18-3.03 0 0 .427-1.593 3.06-1.593.285 0 1.099-.794 1.114-1.024-.004-.076-1.616-.717-2.244-1.336-.336-.331-.495-.49-.636-.61a2.765 2.765 0 0 0-.24-.181 4.293 4.293 0 0 1-.025-2.264c-.855.414-1.614 1-2.23 1.723h-.004c-.366-.465-.34-1.999-.32-2.32a1.653 1.653 0 0 0-.309.165 6.75 6.75 0 0 0-.905.775 8.08 8.08 0 0 0-.866 1.039v.001-.002a7.82 7.82 0 0 0-1.242 2.805l-.013.062c-.017.081-.095.495-.106.584-.072.427-.117.858-.137 1.29v.049a9.261 9.261 0 0 0 18.386 1.566l.042-.359a9.525 9.525 0 0 0-.6-4.652Zm-.919.475.002.01-.002-.01Z" fill="url(#l)"/><defs><radialGradient id="b" cx="0" cy="0" r="1" gradientUnits="userSpaceOnUse" gradientTransform="translate(63.247 48.782) scale(19.3057)"><stop offset=".129" stop-color="#FFBD4F"/><stop offset=".186" stop-color="#FFAC31"/><stop offset=".247" stop-color="#FF9D17"/><stop offset=".283" stop-color="#FF980E"/><stop offset=".403" stop-color="#FF563B"/><stop offset=".467" stop-color="#FF3750"/><stop offset=".71" stop-color="#F5156C"/><stop offset=".782" stop-color="#EB0878"/><stop offset=".86" stop-color="#E50080"/></radialGradient><radialGradient id="c" cx="0" cy="0" r="1" gradientUnits="userSpaceOnUse" gradientTransform="translate(56.08 56.666) scale(19.3057)"><stop offset=".3" stop-color="#960E18"/><stop offset=".351" stop-color="#B11927" stop-opacity=".74"/><stop offset=".435" stop-color="#DB293D" stop-opacity=".343"/><stop offset=".497" stop-color="#F5334B" stop-opacity=".094"/><stop offset=".53" stop-color="#FF3750" stop-opacity="0"/></radialGradient><radialGradient id="d" cx="0" cy="0" r="1" gradientUnits="userSpaceOnUse" gradientTransform="translate(58.468 44.481) scale(13.9847)"><stop offset=".132" stop-color="#FFF44F"/><stop offset=".252" stop-color="#FFDC3E"/><stop offset=".506" stop-color="#FF9D12"/><stop offset=".526" stop-color="#FF980E"/></radialGradient><radialGradient id="e" cx="0" cy="0" r="1" gradientUnits="userSpaceOnUse" gradientTransform="translate(53.929 61.684) scale(9.19171)"><stop offset=".353" stop-color="#3A8EE6"/><stop offset=".472" stop-color="#5C79F0"/><stop offset=".669" stop-color="#9059FF"/><stop offset="1" stop-color="#C139E6"/></radialGradient><radialGradient id="f" cx="0" cy="0" r="1" gradientUnits="userSpaceOnUse" gradientTransform="matrix(4.73773 -1.14544 1.34103 5.5467 57.013 55.01)"><stop offset=".206" stop-color="#9059FF" stop-opacity="0"/><stop offset=".278" stop-color="#8C4FF3" stop-opacity=".064"/><stop offset=".747" stop-color="#7716A8" stop-opacity=".45"/><stop offset=".975" stop-color="#6E008B" stop-opacity=".6"/></radialGradient><radialGradient id="g" cx="0" cy="0" r="1" gradientUnits="userSpaceOnUse" gradientTransform="translate(55.84 48.065) scale(6.61363)"><stop stop-color="#FFE226"/><stop offset=".121" stop-color="#FFDB27"/><stop offset=".295" stop-color="#FFC82A"/><stop offset=".502" stop-color="#FFA930"/><stop offset=".732" stop-color="#FF7E37"/><stop offset=".792" stop-color="#FF7139"/></radialGradient><radialGradient id="h" cx="0" cy="0" r="1" gradientUnits="userSpaceOnUse" gradientTransform="translate(61.097 43.764) scale(28.2178)"><stop offset=".113" stop-color="#FFF44F"/><stop offset=".456" stop-color="#FF980E"/><stop offset=".622" stop-color="#FF5634"/><stop offset=".716" stop-color="#FF3647"/><stop offset=".904" stop-color="#E31587"/></radialGradient><radialGradient id="i" cx="0" cy="0" r="1" gradientUnits="userSpaceOnUse" gradientTransform="matrix(2.1701 20.56421 -13.49616 1.42422 58.751 45.329)"><stop stop-color="#FFF44F"/><stop offset=".06" stop-color="#FFE847"/><stop offset=".168" stop-color="#FFC830"/><stop offset=".304" stop-color="#FF980E"/><stop offset=".356" stop-color="#FF8B16"/><stop offset=".455" stop-color="#FF672A"/><stop offset=".57" stop-color="#FF3647"/><stop offset=".737" stop-color="#E31587"/></radialGradient><radialGradient id="j" cx="0" cy="0" r="1" gradientUnits="userSpaceOnUse" gradientTransform="translate(55.84 50.454) scale(17.614)"><stop offset=".137" stop-color="#FFF44F"/><stop offset=".48" stop-color="#FF980E"/><stop offset=".592" stop-color="#FF5634"/><stop offset=".655" stop-color="#FF3647"/><stop offset=".904" stop-color="#E31587"/></radialGradient><radialGradient id="k" cx="0" cy="0" r="1" gradientUnits="userSpaceOnUse" gradientTransform="translate(60.38 51.41) scale(19.2794)"><stop offset=".094" stop-color="#FFF44F"/><stop offset=".231" stop-color="#FFE141"/><stop offset=".509" stop-color="#FFAF1E"/><stop offset=".626" stop-color="#FF980E"/></radialGradient><linearGradient id="a" x1="63.842" y1="49.59" x2="48.468" y2="64.423" gradientUnits="userSpaceOnUse"><stop offset=".048" stop-color="#FFF44F"/><stop offset=".111" stop-color="#FFE847"/><stop offset=".225" stop-color="#FFC830"/><stop offset=".368" stop-color="#FF980E"/><stop offset=".401" stop-color="#FF8B16"/><stop offset=".462" stop-color="#FF672A"/><stop offset=".534" stop-color="#FF3647"/><stop offset=".705" stop-color="#E31587"/></linearGradient><linearGradient id="l" x1="63.656" y1="49.512" x2="50.577" y2="62.593" gradientUnits="userSpaceOnUse"><stop offset=".167" stop-color="#FFF44F" stop-opacity=".8"/><stop offset=".266" stop-color="#FFF44F" stop-opacity=".634"/><stop offset=".489" stop-color="#FFF44F" stop-opacity=".217"/><stop offset=".6" stop-color="#FFF44F" stop-opacity="0"/></linearGradient></defs></svg>
		`- \ No newline at end of file`
		`- diff --git a/browser/components/preferences/more-from-mozilla-qr-code-simple-cn.svg b/browser/components/preferences/more-from-mozilla-qr-code-simple-cn.svg`
		`- deleted file mode 100644`
		`- index 5052db9702..0000000000`
		`- --- a/browser/components/preferences/more-from-mozilla-qr-code-simple-cn.svg`
		`- +++ /dev/null`
		`- @@ -1,4 +0,0 @@`
		`- -<!-- This Source Code Form is subject to the terms of the Mozilla Public`
		`- - - License, v. 2.0. If a copy of the MPL was not distributed with this`
		`- - - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->`
		- -<svg width="80" height="80" fill="context-fill" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" clip-rule="evenodd" d="M4 2h72a2 2 0 0 1 2 2v72a2 2 0 0 1-2 2H4a2 2 0 0 1-2-2V4a2 2 0 0 1 2-2ZM0 4a4 4 0 0 1 4-4h72a4 4 0 0 1 4 4v72a4 4 0 0 1-4 4H4a4 4 0 0 1-4-4V4Zm7.08 3.08h15.892v15.892H7.08V7.08Zm4.54 2.27H9.35V20.701H20.701V9.35h-9.08Zm18.163-2.27h4.541v2.27h2.27v2.27h-2.27v2.27h-2.27v2.271h4.54v-4.54h2.27V9.35h2.271v6.811h-2.27v2.27h2.27v4.541h-2.27v-2.27h-2.27v-2.27h-2.27v2.27h-2.271v-2.27h-2.27V7.08Zm0 13.622v-2.27h-2.27V9.35h-2.27v13.622h2.27v2.27h-9.081v2.271h-2.27v2.27H13.89v-4.54h-2.27v2.27H7.08v2.27h2.27v2.27h2.27v2.271h9.081v2.27h2.271v2.27h-2.27v2.271h-2.27v-2.27h-2.27v-2.27H7.08v2.27h4.54v2.27H9.35v2.27h6.811v-2.27h2.27v4.54h6.811v-2.27h2.271v2.27h2.27v-4.54h-4.54v-2.27h2.27v-4.54h2.27v-2.271h-4.54v-2.27h2.27v-2.271h2.27v-4.54h2.27v2.27h4.541v2.27h-2.27v2.27h2.27v-2.27h2.27v-4.54h-2.27v-2.271h-2.27v2.27h-2.27v-2.27h-2.27Zm0 0h-2.27v2.27h2.27v-2.27Zm-9.081 11.352v2.27h2.27v2.27h2.27v-4.54h-4.54Zm4.54 9.081h-4.54v2.27h4.54v-2.27Zm-4.54-9.081v-2.27h2.27v-2.271h-4.54v4.54h2.27Zm-9.082 0v-2.27h2.27v2.27h-2.27ZM41.135 9.35V7.08h2.27v2.27h-2.27Zm2.27 20.433h-2.27v-4.54h2.27v2.27h2.27v-2.27h2.271v-4.541h2.27v2.27h2.271v-4.54h2.27V25.242h2.27v2.271h-4.54v-2.27h-2.27v4.54h-6.811Zm9.082 2.27v-2.27h-2.27v2.27h2.27Zm2.27 0h-2.27v4.541h-2.27v4.541h2.27v4.54h-2.27v4.541h-4.541v2.271h-2.27v-2.27h-2.27v2.27h2.27v2.27h-4.541v-4.54h-6.811v2.27h-2.27v-4.54h-4.541v2.27h-2.27v-2.27h-2.271v2.27h2.27v2.27h-4.54v-4.54H13.89v2.27h-2.27v-4.541H9.35v2.27H7.08v2.27h4.54v2.271H7.08v2.27h4.54v-2.27h2.27v2.27h2.271v-2.27h2.27v2.27h6.811v6.811h2.271v2.27h2.27v2.271h-4.54v2.27h2.27v2.271h2.27v-4.54h2.27v-2.271h-2.27v-4.54h4.541v2.27h2.27v2.27h-2.27v2.27h2.27v4.541h-2.27v2.27h2.27v-2.27h2.27v2.27h6.811v-2.27h4.541v-4.54h4.541v2.27h-2.27v4.54h2.27v-2.27h2.27v2.27h9.082V66.11h2.27v2.27h4.541v-2.27h-2.27v-6.811h2.27V45.675h-2.27v13.622h-2.27v-2.27h-2.27v-4.541h-6.811v-2.27h-4.541v-6.811h2.27v4.54h4.54v-4.54h-2.27v-2.27h-6.811v-2.271h2.27v-2.27h2.27v2.27h2.271v-4.54h4.54v9.08h2.271v-2.27h2.27v-2.27h-2.27v-6.811h2.27v-2.27h2.271v2.27h2.27v-4.541h-2.27v-2.27H59.299v2.27h-2.271v2.27h-2.27v2.27Zm2.27 0v2.271h-2.27v-2.27h2.27Zm2.271-2.27h2.27v2.27h2.27v-4.54h-4.54v2.27Zm0 0v2.27h-2.27v-2.27h2.27Zm9.082 29.515h-2.27v2.27h-2.271v2.27h4.54v-4.54ZM54.757 66.11h2.27v2.27h2.271v2.271h4.54v-2.27h-2.27v-2.27h-2.27v-2.271h-4.54v2.27Zm-6.81-2.27v2.27h2.27v-2.27h-2.27Zm-2.271 0v-2.27h-6.811v-2.27h2.27v-2.271h2.27v-2.27h9.082v4.54h-4.54v-2.27h-2.271v2.27h2.27v4.54h-2.27Zm0 0h-9.081v2.27h2.27v2.27h2.27v2.271h2.27v-2.27h2.27v-4.541Zm-9.082-6.811v2.27h-2.27v-2.27h2.27Zm0-2.27h2.27v2.27h-2.27v-2.27Zm0 0h-2.27v-2.271h2.27v2.27Zm-6.81 4.54v-6.811h-2.271v6.811h2.27ZM47.945 7.08h4.541v4.54h-2.27V9.35h-2.27V7.08Zm0 2.27v2.27h2.27v2.27h4.541v2.271h-4.54v2.27h-6.811v-2.27h2.27v-2.27h-2.27v-2.27h2.27V9.35h2.27Zm9.082-2.27H72.92v15.892H57.028V7.08Zm4.54 2.27h-2.27V20.701H70.65V9.35h-9.081ZM11.62 11.62h6.811v6.811H11.621V11.621Zm49.949 0H68.379v6.811H61.57V11.621Zm-18.163 9.082h2.27v2.27h-2.27v-2.27ZM68.38 34.324h2.27v2.27h-2.27v-2.27Zm2.27 2.27h2.27v4.541h-2.27v-4.54Zm-4.54 11.352h2.27v2.27h-2.27v-2.27Zm-9.082 6.811h-2.27v6.811H61.567V54.758h-4.54ZM7.08 57.027h15.892V72.92H7.08V57.028Zm4.54 2.271H9.35V70.65H20.701V59.299h-9.08Zm45.408-2.27h2.27v2.27h-2.27v-2.27Zm-45.408 4.54h6.811v6.811H11.621V61.57Zm59.03 9.082h2.27v2.27h-2.27v-2.27Z"/><path d="M46.066 37.552c-.285-.686-.863-1.426-1.316-1.66.323.625.547 1.296.664 1.99l.002.01c-.742-1.847-1.998-2.593-3.025-4.215-.052-.082-.104-.164-.154-.25a2.078 2.078 0 0 1-.073-.136 1.193 1.193 0 0 1-.102-.271.017.017 0 0 0-.01-.006.024.024 0 0 0-.013 0l-.003.002-.005.003.003-.005c-1.647.964-2.206 2.749-2.256 3.642a3.28 3.28 0 0 0-1.805.696 1.953 1.953 0 0 0-.17-.129 3.04 3.04 0 0 1-.018-1.602 4.856 4.856 0 0 0-1.578 1.22h-.003c-.26-.33-.242-1.416-.227-1.643-.077.031-.15.07-.219.117-.229.163-.444.347-.64.549-.225.227-.43.473-.613.735a5.537 5.537 0 0 0-.88 1.986l-.009.043c-.012.057-.056.346-.064.41l-.002.014c-.057.298-.093.6-.106.903v.034a6.556 6.556 0 0 0 13.017 1.109l.03-.254a6.742 6.742 0 0 0-.426-3.293Zm-7.556 5.132c.03.015.059.03.09.044l.005.003a3.257 3.257 0 0 1-.095-.047Zm6.906-4.79v-.006.007Z" fill="url(#a)"/><path d="M46.066 37.552c-.285-.685-.863-1.426-1.316-1.66.323.625.547 1.296.664 1.99v.006l.002.007a5.937 5.937 0 0 1-.204 4.425c-.752 1.612-2.57 3.265-5.417 3.184-3.075-.088-5.785-2.37-6.29-5.36-.093-.47 0-.71.046-1.093-.064.298-.099.6-.106.905v.034a6.557 6.557 0 0 0 13.017 1.108l.03-.254a6.743 6.743 0 0 0-.426-3.293Z" fill="url(#b)"/><path d="M46.066 37.552c-.285-.685-.863-1.426-1.316-1.66.323.625.547 1.296.664 1.99v.006l.002.007a5.937 5.937 0 0 1-.204 4.425c-.752 1.612-2.57 3.265-5.417 3.184-3.075-.088-5.785-2.37-6.29-5.36-.093-.47 0-.71.046-1.093-.064.298-.099.6-.106.905v.034a6.557 6.557 0 0 0 13.017 1.108l.03-.254a6.743 6.743 0 0 0-.426-3.293Z" fill="url(#c)"/><path d="m42.879 38.322.04.03a3.57 3.57 0 0 0-.608-.795c-2.039-2.038-.535-4.418-.28-4.54l.002-.004c-1.647.965-2.206 2.75-2.257 3.642.077-.005.152-.011.23-.011a3.307 3.307 0 0 1 2.873 1.677Z" fill="url(#d)"/><path d="M40.01 38.73c-.01.162-.587.725-.788.725-1.865 0-2.167 1.127-2.167 1.127.082.95.744 1.733 1.544 2.145.036.02.073.036.11.053.065.029.129.055.193.079.274.097.562.152.853.164 3.268.154 3.9-3.907 1.542-5.086a2.263 2.263 0 0 1 1.581.384 3.309 3.309 0 0 0-2.872-1.678c-.078 0-.154.007-.23.012a3.28 3.28 0 0 0-1.805.695c.1.085.213.198.45.432.445.439 1.586.893 1.589.946v.001Z" fill="url(#e)"/><path d="M40.01 38.73c-.01.162-.587.725-.788.725-1.865 0-2.167 1.127-2.167 1.127.082.95.744 1.733 1.544 2.145.036.02.073.036.11.053.065.029.129.055.193.079.274.097.562.152.853.164 3.268.154 3.9-3.907 1.542-5.086a2.263 2.263 0 0 1 1.581.384 3.309 3.309 0 0 0-2.872-1.678c-.078 0-.154.007-.23.012a3.28 3.28 0 0 0-1.805.695c.1.085.213.198.45.432.445.439 1.586.893 1.589.946v.001Z" fill="url(#f)"/><path d="m37.665 37.134.136.09a3.04 3.04 0 0 1-.019-1.602 4.854 4.854 0 0 0-1.578 1.22c.032-.002.983-.019 1.461.292Z" fill="url(#g)"/><path d="M33.503 40.145c.506 2.989 3.216 5.272 6.291 5.359 2.847.08 4.665-1.572 5.416-3.184a5.937 5.937 0 0 0 .204-4.425v-.012l.002.01c.232 1.52-.54 2.99-1.748 3.986l-.004.008c-2.352 1.917-4.604 1.156-5.059.846a3.524 3.524 0 0 1-.095-.047c-1.372-.656-1.939-1.905-1.817-2.977a1.683 1.683 0 0 1-1.553-.977 2.474 2.474 0 0 1 2.41-.097c.777.352 1.66.387 2.462.097-.003-.054-1.144-.508-1.589-.946-.238-.234-.35-.347-.45-.432a1.987 1.987 0 0 0-.17-.128 9.602 9.602 0 0 0-.135-.09c-.478-.31-1.429-.294-1.46-.293h-.003c-.26-.33-.242-1.415-.227-1.642-.077.03-.15.07-.219.116-.23.164-.444.348-.64.55a5.712 5.712 0 0 0-.616.733 5.536 5.536 0 0 0-.88 1.986c-.003.013-.236 1.031-.121 1.56l.001-.001Z" fill="url(#h)"/><path d="M42.31 37.557c.24.235.445.503.61.795.035.027.07.054.098.08 1.486 1.37.707 3.307.65 3.444 1.207-.994 1.978-2.466 1.747-3.985-.742-1.849-2-2.595-3.025-4.217a7.809 7.809 0 0 1-.154-.25 2.078 2.078 0 0 1-.073-.136 1.193 1.193 0 0 1-.102-.271.017.017 0 0 0-.01-.006.024.024 0 0 0-.013 0l-.003.002-.004.003c-.254.12-1.758 2.501.28 4.538v.003Z" fill="url(#i)"/><path d="M43.017 38.433a1.349 1.349 0 0 0-.098-.08l-.04-.03a2.263 2.263 0 0 0-1.581-.384c2.358 1.179 1.725 5.239-1.543 5.086a2.915 2.915 0 0 1-.853-.164 3.434 3.434 0 0 1-.303-.132l.005.003c.455.311 2.706 1.071 5.059-.846l.004-.008c.058-.137.837-2.074-.65-3.444Z" fill="url(#j)"/><path d="M37.055 40.581s.302-1.127 2.167-1.127c.201 0 .778-.563.788-.726a3.265 3.265 0 0 1-2.461-.097 2.471 2.471 0 0 0-2.41.097 1.683 1.683 0 0 0 1.552.977c-.121 1.072.446 2.32 1.817 2.977l.091.045c-.8-.414-1.462-1.196-1.544-2.145Z" fill="url(#k)"/><path d="M46.066 37.552c-.285-.686-.863-1.426-1.316-1.66.323.625.547 1.296.664 1.99l.002.01c-.742-1.847-1.998-2.593-3.025-4.215a8.036 8.036 0 0 1-.154-.25 2.078 2.078 0 0 1-.073-.136 1.193 1.193 0 0 1-.102-.271.017.017 0 0 0-.01-.006.024.024 0 0 0-.013 0l-.003.002-.005.003.003-.005c-1.647.964-2.206 2.749-2.256 3.642.076-.005.152-.011.23-.011a3.308 3.308 0 0 1 2.872 1.677 2.263 2.263 0 0 0-1.58-.384c2.357 1.18 1.725 5.239-1.543 5.087a2.916 2.916 0 0 1-.853-.165 3.432 3.432 0 0 1-.303-.132l.004.003a3.524 3.524 0 0 1-.095-.047l.09.044c-.8-.413-1.461-1.195-1.544-2.144 0 0 .303-1.128 2.167-1.128.202 0 .778-.563.789-.726-.003-.053-1.144-.507-1.589-.945-.237-.234-.35-.347-.45-.432a1.987 1.987 0 0 0-.17-.128 3.04 3.04 0 0 1-.018-1.603 4.854 4.854 0 0 0-1.578 1.22h-.003c-.26-.33-.241-1.415-.226-1.642-.077.03-.15.07-.22.116-.229.164-.443.347-.64.549-.224.227-.43.473-.613.735v.001-.001a5.536 5.536 0 0 0-.88 1.986l-.008.043c-.013.058-.068.35-.076.414-.05.302-.083.607-.097.914v.034a6.557 6.557 0 0 0 13.017 1.108l.03-.253a6.743 6.743 0 0 0-.426-3.294Zm-.65.337v.006-.007Z" fill="url(#l)"/><defs><radialGradient id="b" cx="0" cy="0" r="1" gradientUnits="userSpaceOnUse" gradientTransform="translate(44.777 34.536) scale(13.6677)"><stop offset=".129" stop-color="#FFBD4F"/><stop offset=".186" stop-color="#FFAC31"/><stop offset=".247" stop-color="#FF9D17"/><stop offset=".283" stop-color="#FF980E"/><stop offset=".403" stop-color="#FF563B"/><stop offset=".467" stop-color="#FF3750"/><stop offset=".71" stop-color="#F5156C"/><stop offset=".782" stop-color="#EB0878"/><stop offset=".86" stop-color="#E50080"/></radialGradient><radialGradient id="c" cx="0" cy="0" r="1" gradientUnits="userSpaceOnUse" gradientTransform="translate(39.702 40.118) scale(13.6677)"><stop offset=".3" stop-color="#960E18"/><stop offset=".351" stop-color="#B11927" stop-opacity=".74"/><stop offset=".435" stop-color="#DB293D" stop-opacity=".343"/><stop offset=".497" stop-color="#F5334B" stop-opacity=".094"/><stop offset=".53" stop-color="#FF3750" stop-opacity="0"/></radialGradient><radialGradient id="d" cx="0" cy="0" r="1" gradientUnits="userSpaceOnUse" gradientTransform="translate(41.394 31.491) scale(9.90066)"><stop offset=".132" stop-color="#FFF44F"/><stop offset=".252" stop-color="#FFDC3E"/><stop offset=".506" stop-color="#FF9D12"/><stop offset=".526" stop-color="#FF980E"/></radialGradient><radialGradient id="e" cx="0" cy="0" r="1" gradientUnits="userSpaceOnUse" gradientTransform="translate(38.18 43.67) scale(6.5074)"><stop offset=".353" stop-color="#3A8EE6"/><stop offset=".472" stop-color="#5C79F0"/><stop offset=".669" stop-color="#9059FF"/><stop offset="1" stop-color="#C139E6"/></radialGradient><radialGradient id="f" cx="0" cy="0" r="1" gradientUnits="userSpaceOnUse" gradientTransform="matrix(3.35414 -.81093 .9494 3.92687 40.363 38.945)"><stop offset=".206" stop-color="#9059FF" stop-opacity="0"/><stop offset=".278" stop-color="#8C4FF3" stop-opacity=".064"/><stop offset=".747" stop-color="#7716A8" stop-opacity=".45"/><stop offset=".975" stop-color="#6E008B" stop-opacity=".6"/></radialGradient><radialGradient id="g" cx="0" cy="0" r="1" gradientUnits="userSpaceOnUse" gradientTransform="translate(39.533 34.028) scale(4.68222)"><stop stop-color="#FFE226"/><stop offset=".121" stop-color="#FFDB27"/><stop offset=".295" stop-color="#FFC82A"/><stop offset=".502" stop-color="#FFA930"/><stop offset=".732" stop-color="#FF7E37"/><stop offset=".792" stop-color="#FF7139"/></radialGradient><radialGradient id="h" cx="0" cy="0" r="1" gradientUnits="userSpaceOnUse" gradientTransform="translate(43.254 30.983) scale(19.9772)"><stop offset=".113" stop-color="#FFF44F"/><stop offset=".456" stop-color="#FF980E"/><stop offset=".622" stop-color="#FF5634"/><stop offset=".716" stop-color="#FF3647"/><stop offset=".904" stop-color="#E31587"/></radialGradient><radialGradient id="i" cx="0" cy="0" r="1" gradientUnits="userSpaceOnUse" gradientTransform="rotate(83.976 2.969 39.153) scale(14.6396 9.60783)"><stop stop-color="#FFF44F"/><stop offset=".06" stop-color="#FFE847"/><stop offset=".168" stop-color="#FFC830"/><stop offset=".304" stop-color="#FF980E"/><stop offset=".356" stop-color="#FF8B16"/><stop offset=".455" stop-color="#FF672A"/><stop offset=".57" stop-color="#FF3647"/><stop offset=".737" stop-color="#E31587"/></radialGradient><radialGradient id="j" cx="0" cy="0" r="1" gradientUnits="userSpaceOnUse" gradientTransform="translate(39.533 35.72) scale(12.4701)"><stop offset=".137" stop-color="#FFF44F"/><stop offset=".48" stop-color="#FF980E"/><stop offset=".592" stop-color="#FF5634"/><stop offset=".655" stop-color="#FF3647"/><stop offset=".904" stop-color="#E31587"/></radialGradient><radialGradient id="k" cx="0" cy="0" r="1" gradientUnits="userSpaceOnUse" gradientTransform="translate(42.747 36.397) scale(13.6491)"><stop offset=".094" stop-color="#FFF44F"/><stop offset=".231" stop-color="#FFE141"/><stop offset=".509" stop-color="#FFAF1E"/><stop offset=".626" stop-color="#FF980E"/></radialGradient><linearGradient id="a" x1="45.198" y1="35.108" x2="34.314" y2="45.609" gradientUnits="userSpaceOnUse"><stop offset=".048" stop-color="#FFF44F"/><stop offset=".111" stop-color="#FFE847"/><stop offset=".225" stop-color="#FFC830"/><stop offset=".368" stop-color="#FF980E"/><stop offset=".401" stop-color="#FF8B16"/><stop offset=".462" stop-color="#FF672A"/><stop offset=".534" stop-color="#FF3647"/><stop offset=".705" stop-color="#E31587"/></linearGradient><linearGradient id="l" x1="45.066" y1="35.053" x2="35.806" y2="44.314" gradientUnits="userSpaceOnUse"><stop offset=".167" stop-color="#FFF44F" stop-opacity=".8"/><stop offset=".266" stop-color="#FFF44F" stop-opacity=".634"/><stop offset=".489" stop-color="#FFF44F" stop-opacity=".217"/><stop offset=".6" stop-color="#FFF44F" stop-opacity="0"/></linearGradient></defs></svg>
		`- diff --git a/browser/components/preferences/more-from-mozilla-qr-code-simple.svg b/browser/components/preferences/more-from-mozilla-qr-code-simple.svg`
		`- deleted file mode 100644`
		`- index 279595db10..0000000000`
		`- --- a/browser/components/preferences/more-from-mozilla-qr-code-simple.svg`
		`- +++ /dev/null`
		`- @@ -1,4 +0,0 @@`
		`- -<!-- This Source Code Form is subject to the terms of the Mozilla Public`
		`- - - License, v. 2.0. If a copy of the MPL was not distributed with this`
		`- - - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->`
		- -<svg width="80" height="80" fill="context-fill" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" clip-rule="evenodd" d="M76 2H4a2 2 0 0 0-2 2v72a2 2 0 0 0 2 2h72a2 2 0 0 0 2-2V4a2 2 0 0 0-2-2ZM4 0a4 4 0 0 0-4 4v72a4 4 0 0 0 4 4h72a4 4 0 0 0 4-4V4a4 4 0 0 0-4-4H4Zm3.08 7.08h15.892v15.892H7.08V7.08Zm4.54 2.27H9.35V20.701H20.701V9.35h-9.08Zm20.434-2.27h2.27v2.27h2.27V7.08h4.541v2.27h2.27v2.27H36.596v2.27h-4.541v2.271h-2.27v-2.27h-2.271v-2.27h2.27V9.35h2.27V7.08Zm-4.541 4.54h-2.27V9.35h2.27v2.27Zm2.27 11.352v-4.54h2.27v-2.27h4.541V13.89h4.541v2.27h4.54v2.27h-2.27v2.27h-2.27v-2.27h-2.27v2.27h-2.27v-2.27h-2.27v2.27h-2.271v2.271h-2.27Zm-4.54 2.27V18.433h2.27v4.54h2.27v2.27h-4.54Zm0 0v2.271h-9.081v-2.27h9.08Zm11.351-2.27h-2.27v-2.27h2.27v2.27Zm2.27 0h-2.27v4.541h-2.27v-2.27h-2.27v2.27h2.27v2.27h4.54V22.973Zm2.271 0v-2.27h-2.27v2.27h2.27Zm2.27 0h-2.27v6.811h4.54v-2.27h-2.27v-4.54Zm2.27 0h-2.27v-2.27h2.27v2.27Zm4.542-6.81h-2.27V22.971h-2.271v2.27h2.27v2.271h2.27v2.27h-2.27v2.27h2.27v-2.27h2.271v2.27h2.27v2.271h2.27v-4.54h2.271v2.27h2.27v2.27h-2.27v2.27h-2.27v2.27h-4.541v6.811h2.27v2.271h4.541v4.541h-6.811v-2.27h-2.27v2.27h-2.27v-2.27h-4.541v2.27h-4.541v-2.27h-4.54v2.27h2.27v2.27h2.27v2.27H45.675v4.541h2.271v2.27h-2.27v2.271h-2.27v-4.54h-4.541v-2.27h-2.27v-2.271h-2.27v2.27h2.27v2.27h-2.27v2.27h-2.271v-2.27h-2.27v-2.27h-2.271v-4.54h2.27v2.27h2.27v-2.27h-2.27v-2.271h2.27v-2.27h-4.54v-2.27h2.27v-2.271h-2.27v-4.54h2.27v-2.271h-2.27v-6.811h2.27v-2.27h-2.27v2.27h-4.54v-2.27h-2.271v2.27h2.27v2.27h-4.54v-4.54h-2.27V36.593H13.89v-4.54h-2.27v-2.27h2.27v-2.271H7.08v6.811h2.27v4.54h4.54v2.271h-2.27v2.27H9.35v-2.27H7.08v2.27h2.27v2.27H7.08v2.271h2.27v-2.27h2.27v2.27h2.27v-4.54h4.541v-2.27h-2.27v-4.541h2.27v2.27h2.27v2.27h2.271v2.27h-2.27v2.27h-2.27v2.271h-2.27v2.27H11.62v2.271H7.08v2.27h4.54v-2.27h4.541v2.27h9.081v9.081h4.541v4.541h-2.27v4.541h4.54v-2.27h2.271v2.27h2.27v-4.54h-4.54v-2.27h2.27v-2.271h2.27v-2.27h2.27v2.27h2.271v2.27h-2.27v6.811H45.675v-4.54h2.271v4.54h2.27v-4.54h2.271v4.54h6.811v-2.27h2.27v2.27h2.27v-2.27h-2.27v-2.27h-4.54v-2.27h-9.081v-2.271H59.297v2.27h2.27v-2.27h2.27v4.54h4.541v4.541h2.271v-2.27h2.27v-4.54h-2.27v-2.271h2.27v-2.27h-2.27v-2.27h2.27v-4.541h-2.27v-4.541h2.27V27.513h-2.27v-2.27h-2.27v2.27h-6.811v-2.27h-4.541v2.27h-2.27v-2.27h-2.271v-2.27h2.27v-4.541h-4.54v-2.27Zm2.27-6.812h2.27v4.54h-2.27v2.271h-2.27v-4.54h2.27V9.35Zm0 0h-6.811V7.08h6.811v2.27Zm0 13.622v-2.27h-2.27v2.27h2.27Zm9.081 6.811v2.27h2.27v2.271h-2.27v2.27h-2.27v4.541h-4.54v2.27h2.27v2.27h4.54v-2.27h2.27v4.541h-2.27v4.541h2.27v6.811h2.271v2.27h-2.27v2.27h4.54v-4.54h2.271v-4.54h-2.27v-4.541h2.27v-4.541h-2.27v-4.54h2.27v-6.811h-2.27v-2.271h2.27v-2.27h-4.54v2.27h-2.271v-2.27h-2.27Zm6.812 24.974h-2.27v2.27h2.27v-2.27Zm0-4.54h-4.541v-2.27h4.54v2.27Zm-4.541-9.082h2.27v2.27h-2.27v-2.27Zm-2.27 0v-4.54h2.27v4.54h-2.27Zm4.54-4.54v-2.27h-2.27v2.27h2.27Zm0 0h2.27v2.27h-2.27v-2.27Zm-4.54 4.54v2.27h-2.27v-2.27h2.27Zm0-11.352v-2.27h-2.27v2.27h2.27ZM57.028 68.38h-2.27v2.27h2.27v-2.27Zm-24.974 0h-2.27v2.27h2.27v-2.27ZM20.702 47.946v2.27h2.27v2.271h-4.54v-4.54h2.27Zm2.27-2.27v2.27h-2.27v-2.27h2.27Zm2.27 0v2.27h2.271v-2.27h-2.27Zm0 0h-2.27v-2.27h2.27v2.27Zm-2.27-9.082v2.27h-2.27v-2.27h2.27Zm0 0h2.27v-2.27h-2.27v2.27ZM9.35 34.324v-2.27h2.27v2.27H9.35Zm15.893 20.433h2.27v-2.27h-2.27v2.27ZM41.135 66.11v4.541h2.27v-4.54h-2.27Zm6.811-4.54v-2.27h2.27v2.27h-2.27Zm-2.27-6.812h-2.27v-2.27h2.27v2.27Zm0 0v2.27h2.27v-2.27h-2.27Zm4.54-20.433v2.27h2.271v-2.27h-2.27Zm2.271-9.081h-2.27v2.27h2.27v-2.27Zm4.54-18.163H72.92v15.892H57.028V7.08Zm4.541 2.27h-2.27V20.701H70.65V9.35h-9.081ZM11.62 11.62h6.811v6.811H11.621V11.621Zm34.056 0h2.27v2.27h-2.27v-2.27Zm15.892 0h6.811v6.811H61.57V11.621Zm-4.54 43.137h-2.27v6.811H61.567V54.758h-4.54ZM7.08 57.027h15.892V72.92H7.08V57.028Zm4.54 2.271H9.35V70.65H20.701V59.299h-9.08Zm45.408-2.27h2.27v2.27h-2.27v-2.27Zm-45.408 4.54h6.811v6.811H11.621V61.57Z"/><path d="M46.066 37.552c-.285-.686-.863-1.426-1.315-1.66a6.81 6.81 0 0 1 .663 1.99l.002.01c-.741-1.847-1.998-2.593-3.025-4.215a8.23 8.23 0 0 1-.154-.25 2.078 2.078 0 0 1-.072-.136 1.193 1.193 0 0 1-.102-.271.017.017 0 0 0-.011-.006.024.024 0 0 0-.013 0l-.003.002-.004.003.002-.005c-1.647.964-2.206 2.749-2.256 3.642a3.28 3.28 0 0 0-1.805.696 1.967 1.967 0 0 0-.17-.129 3.04 3.04 0 0 1-.018-1.602 4.855 4.855 0 0 0-1.578 1.22h-.003c-.26-.33-.242-1.416-.227-1.643-.076.031-.15.07-.218.117-.23.163-.444.347-.641.549a5.73 5.73 0 0 0-.613.735 5.535 5.535 0 0 0-.88 1.986l-.008.043c-.013.057-.057.346-.065.41l-.002.014c-.057.298-.092.6-.106.903v.034a6.556 6.556 0 0 0 13.017 1.109l.03-.254a6.743 6.743 0 0 0-.426-3.293Zm-7.556 5.132c.03.015.059.03.09.044l.005.003a3.257 3.257 0 0 1-.095-.047Zm6.906-4.79v-.006l.001.007h-.001Z" fill="url(#a)"/><path d="M46.066 37.552c-.285-.685-.863-1.426-1.315-1.66a6.81 6.81 0 0 1 .664 1.99V37.895a5.937 5.937 0 0 1-.203 4.425c-.752 1.612-2.57 3.265-5.417 3.184-3.075-.088-5.785-2.37-6.29-5.36-.093-.47 0-.71.046-1.093a4.88 4.88 0 0 0-.105.905v.034a6.557 6.557 0 0 0 13.016 1.108c.011-.084.02-.168.03-.254a6.742 6.742 0 0 0-.425-3.293h-.001Z" fill="url(#b)"/><path d="M46.066 37.552c-.285-.685-.863-1.426-1.315-1.66a6.81 6.81 0 0 1 .664 1.99V37.895a5.937 5.937 0 0 1-.203 4.425c-.752 1.612-2.57 3.265-5.417 3.184-3.075-.088-5.785-2.37-6.29-5.36-.093-.47 0-.71.046-1.093a4.88 4.88 0 0 0-.105.905v.034a6.557 6.557 0 0 0 13.016 1.108c.011-.084.02-.168.03-.254a6.742 6.742 0 0 0-.425-3.293h-.001Z" fill="url(#c)"/><path d="m42.879 38.322.04.03a3.567 3.567 0 0 0-.608-.795c-2.038-2.038-.534-4.418-.28-4.54l.002-.004c-1.647.965-2.206 2.75-2.257 3.642.077-.005.153-.011.23-.011a3.308 3.308 0 0 1 2.873 1.677Z" fill="url(#d)"/><path d="M40.01 38.73c-.01.162-.587.725-.788.725-1.864 0-2.167 1.127-2.167 1.127.082.95.744 1.733 1.544 2.145.036.02.074.036.11.053.065.029.129.055.193.079.275.097.562.152.853.164 3.268.154 3.9-3.907 1.543-5.086a2.263 2.263 0 0 1 1.58.384 3.309 3.309 0 0 0-2.872-1.678c-.078 0-.154.007-.23.012a3.28 3.28 0 0 0-1.805.695c.1.085.213.198.45.432.445.439 1.586.893 1.589.946v.001Z" fill="url(#e)"/><path d="M40.01 38.73c-.01.162-.587.725-.788.725-1.864 0-2.167 1.127-2.167 1.127.082.95.744 1.733 1.544 2.145.036.02.074.036.11.053.065.029.129.055.193.079.275.097.562.152.853.164 3.268.154 3.9-3.907 1.543-5.086a2.263 2.263 0 0 1 1.58.384 3.309 3.309 0 0 0-2.872-1.678c-.078 0-.154.007-.23.012a3.28 3.28 0 0 0-1.805.695c.1.085.213.198.45.432.445.439 1.586.893 1.589.946v.001Z" fill="url(#f)"/><path d="M37.666 37.134c.053.034.096.063.135.09a3.04 3.04 0 0 1-.019-1.602 4.854 4.854 0 0 0-1.578 1.22c.032-.002.983-.019 1.462.292Z" fill="url(#g)"/><path d="M33.503 40.145c.506 2.989 3.216 5.272 6.291 5.359 2.847.08 4.665-1.572 5.416-3.184a5.937 5.937 0 0 0 .204-4.425v-.012l.002.01c.232 1.52-.54 2.99-1.748 3.986l-.004.008c-2.352 1.917-4.604 1.156-5.059.846a3.524 3.524 0 0 1-.095-.047c-1.372-.656-1.939-1.905-1.817-2.977a1.684 1.684 0 0 1-1.553-.977 2.474 2.474 0 0 1 2.41-.097c.777.352 1.66.387 2.462.097-.003-.054-1.144-.508-1.589-.946-.237-.234-.35-.347-.45-.432a1.973 1.973 0 0 0-.17-.128 9.602 9.602 0 0 0-.135-.09c-.478-.31-1.429-.294-1.46-.293h-.003c-.26-.33-.242-1.415-.227-1.642-.077.03-.15.07-.219.116-.23.164-.444.348-.64.55a5.72 5.72 0 0 0-.616.733 5.538 5.538 0 0 0-.88 1.986c-.003.013-.236 1.031-.121 1.56l.001-.001Z" fill="url(#h)"/><path d="M42.31 37.557c.24.235.445.503.61.795.035.027.07.054.098.08 1.486 1.37.707 3.307.65 3.444 1.207-.994 1.978-2.466 1.747-3.985-.742-1.849-2-2.595-3.025-4.217a7.809 7.809 0 0 1-.154-.25 2.078 2.078 0 0 1-.072-.136 1.193 1.193 0 0 1-.102-.271.017.017 0 0 0-.011-.006.023.023 0 0 0-.013 0l-.003.002-.004.003c-.254.12-1.758 2.501.28 4.538v.003Z" fill="url(#i)"/><path d="M43.018 38.433a1.351 1.351 0 0 0-.099-.08l-.04-.03a2.263 2.263 0 0 0-1.581-.384c2.358 1.179 1.725 5.239-1.543 5.086a2.916 2.916 0 0 1-.853-.164 3.497 3.497 0 0 1-.192-.08c-.037-.016-.074-.033-.11-.052l.004.003c.455.311 2.706 1.071 5.06-.846l.003-.008c.058-.137.837-2.074-.65-3.444Z" fill="url(#j)"/><path d="M37.055 40.581s.302-1.127 2.167-1.127c.201 0 .778-.563.788-.726a3.265 3.265 0 0 1-2.461-.097 2.471 2.471 0 0 0-2.41.097 1.684 1.684 0 0 0 1.552.977c-.121 1.072.446 2.32 1.817 2.977l.091.045c-.8-.414-1.462-1.196-1.544-2.145Z" fill="url(#k)"/><path d="M46.066 37.552c-.285-.686-.863-1.426-1.316-1.66a6.81 6.81 0 0 1 .664 1.99l.002.01c-.742-1.847-1.998-2.593-3.025-4.215a8.23 8.23 0 0 1-.154-.25 2.078 2.078 0 0 1-.073-.136 1.193 1.193 0 0 1-.102-.271.017.017 0 0 0-.01-.006.023.023 0 0 0-.013 0l-.003.002-.005.003.003-.005c-1.647.964-2.206 2.749-2.256 3.642.076-.005.152-.011.23-.011a3.307 3.307 0 0 1 2.872 1.677 2.263 2.263 0 0 0-1.58-.384c2.357 1.18 1.725 5.239-1.543 5.087a2.916 2.916 0 0 1-.853-.165 3.495 3.495 0 0 1-.193-.079c-.037-.017-.074-.033-.11-.053l.004.003a3.524 3.524 0 0 1-.095-.047l.09.044c-.8-.413-1.461-1.195-1.544-2.144 0 0 .303-1.128 2.167-1.128.202 0 .779-.563.789-.726-.003-.053-1.144-.507-1.589-.945-.237-.234-.35-.347-.45-.432a1.988 1.988 0 0 0-.17-.128 3.04 3.04 0 0 1-.018-1.603 4.854 4.854 0 0 0-1.578 1.22h-.003c-.26-.33-.241-1.415-.226-1.642-.077.03-.15.07-.22.116-.229.164-.443.347-.64.549-.224.227-.43.473-.613.735v.001-.001a5.538 5.538 0 0 0-.88 1.986l-.008.043c-.013.058-.068.35-.076.414-.05.302-.083.607-.097.914v.034a6.557 6.557 0 0 0 13.017 1.108l.03-.253a6.742 6.742 0 0 0-.426-3.294Zm-.65.337v.006-.007Z" fill="url(#l)"/><defs><radialGradient id="b" cx="0" cy="0" r="1" gradientUnits="userSpaceOnUse" gradientTransform="translate(44.777 34.536) scale(13.6677)"><stop offset=".129" stop-color="#FFBD4F"/><stop offset=".186" stop-color="#FFAC31"/><stop offset=".247" stop-color="#FF9D17"/><stop offset=".283" stop-color="#FF980E"/><stop offset=".403" stop-color="#FF563B"/><stop offset=".467" stop-color="#FF3750"/><stop offset=".71" stop-color="#F5156C"/><stop offset=".782" stop-color="#EB0878"/><stop offset=".86" stop-color="#E50080"/></radialGradient><radialGradient id="c" cx="0" cy="0" r="1" gradientUnits="userSpaceOnUse" gradientTransform="translate(39.702 40.118) scale(13.6677)"><stop offset=".3" stop-color="#960E18"/><stop offset=".351" stop-color="#B11927" stop-opacity=".74"/><stop offset=".435" stop-color="#DB293D" stop-opacity=".343"/><stop offset=".497" stop-color="#F5334B" stop-opacity=".094"/><stop offset=".53" stop-color="#FF3750" stop-opacity="0"/></radialGradient><radialGradient id="d" cx="0" cy="0" r="1" gradientUnits="userSpaceOnUse" gradientTransform="translate(41.394 31.491) scale(9.90066)"><stop offset=".132" stop-color="#FFF44F"/><stop offset=".252" stop-color="#FFDC3E"/><stop offset=".506" stop-color="#FF9D12"/><stop offset=".526" stop-color="#FF980E"/></radialGradient><radialGradient id="e" cx="0" cy="0" r="1" gradientUnits="userSpaceOnUse" gradientTransform="translate(38.18 43.67) scale(6.50741)"><stop offset=".353" stop-color="#3A8EE6"/><stop offset=".472" stop-color="#5C79F0"/><stop offset=".669" stop-color="#9059FF"/><stop offset="1" stop-color="#C139E6"/></radialGradient><radialGradient id="f" cx="0" cy="0" r="1" gradientUnits="userSpaceOnUse" gradientTransform="matrix(3.35414 -.81093 .9494 3.92687 40.363 38.945)"><stop offset=".206" stop-color="#9059FF" stop-opacity="0"/><stop offset=".278" stop-color="#8C4FF3" stop-opacity=".064"/><stop offset=".747" stop-color="#7716A8" stop-opacity=".45"/><stop offset=".975" stop-color="#6E008B" stop-opacity=".6"/></radialGradient><radialGradient id="g" cx="0" cy="0" r="1" gradientUnits="userSpaceOnUse" gradientTransform="translate(39.533 34.028) scale(4.68221)"><stop stop-color="#FFE226"/><stop offset=".121" stop-color="#FFDB27"/><stop offset=".295" stop-color="#FFC82A"/><stop offset=".502" stop-color="#FFA930"/><stop offset=".732" stop-color="#FF7E37"/><stop offset=".792" stop-color="#FF7139"/></radialGradient><radialGradient id="h" cx="0" cy="0" r="1" gradientUnits="userSpaceOnUse" gradientTransform="translate(43.254 30.983) scale(19.9772)"><stop offset=".113" stop-color="#FFF44F"/><stop offset=".456" stop-color="#FF980E"/><stop offset=".622" stop-color="#FF5634"/><stop offset=".716" stop-color="#FF3647"/><stop offset=".904" stop-color="#E31587"/></radialGradient><radialGradient id="i" cx="0" cy="0" r="1" gradientUnits="userSpaceOnUse" gradientTransform="matrix(1.53635 14.55876 -9.55479 1.0083 41.594 32.091)"><stop stop-color="#FFF44F"/><stop offset=".06" stop-color="#FFE847"/><stop offset=".168" stop-color="#FFC830"/><stop offset=".304" stop-color="#FF980E"/><stop offset=".356" stop-color="#FF8B16"/><stop offset=".455" stop-color="#FF672A"/><stop offset=".57" stop-color="#FF3647"/><stop offset=".737" stop-color="#E31587"/></radialGradient><radialGradient id="j" cx="0" cy="0" r="1" gradientUnits="userSpaceOnUse" gradientTransform="translate(39.533 35.72) scale(12.4701)"><stop offset=".137" stop-color="#FFF44F"/><stop offset=".48" stop-color="#FF980E"/><stop offset=".592" stop-color="#FF5634"/><stop offset=".655" stop-color="#FF3647"/><stop offset=".904" stop-color="#E31587"/></radialGradient><radialGradient id="k" cx="0" cy="0" r="1" gradientUnits="userSpaceOnUse" gradientTransform="translate(42.747 36.397) scale(13.6491)"><stop offset=".094" stop-color="#FFF44F"/><stop offset=".231" stop-color="#FFE141"/><stop offset=".509" stop-color="#FFAF1E"/><stop offset=".626" stop-color="#FF980E"/></radialGradient><linearGradient id="a" x1="45.198" y1="35.108" x2="34.314" y2="45.609" gradientUnits="userSpaceOnUse"><stop offset=".048" stop-color="#FFF44F"/><stop offset=".111" stop-color="#FFE847"/><stop offset=".225" stop-color="#FFC830"/><stop offset=".368" stop-color="#FF980E"/><stop offset=".401" stop-color="#FF8B16"/><stop offset=".462" stop-color="#FF672A"/><stop offset=".534" stop-color="#FF3647"/><stop offset=".705" stop-color="#E31587"/></linearGradient><linearGradient id="l" x1="45.066" y1="35.053" x2="35.806" y2="44.314" gradientUnits="userSpaceOnUse"><stop offset=".167" stop-color="#FFF44F" stop-opacity=".8"/><stop offset=".266" stop-color="#FFF44F" stop-opacity=".634"/><stop offset=".489" stop-color="#FFF44F" stop-opacity=".217"/><stop offset=".6" stop-color="#FFF44F" stop-opacity="0"/></linearGradient></defs></svg>
		`- \ No newline at end of file`
		`- diff --git a/browser/components/preferences/moreFromMozilla.js b/browser/components/preferences/moreFromMozilla.js`
		`- index 1208a5dbcd..ff91f7421e 100644`
		`- --- a/browser/components/preferences/moreFromMozilla.js`
		`- +++ b/browser/components/preferences/moreFromMozilla.js`
		`- @@ -81,38 +81,7 @@ var gMoreFromMozillaPane = {`
		`- },`
		`-`
		`- renderProducts() {`
		`- - let products = [`
		`- - {`
		`- - id: "firefox-mobile",`
		`- - title_string_id: "more-from-moz-firefox-mobile-title",`
		`- - description_string_id: "more-from-moz-firefox-mobile-description",`
		`- - region: "global",`
		`- - button: {`
		`- - id: "fxMobile",`
		`- - type: "link",`
		`- - label_string_id: "more-from-moz-learn-more-link",`
		`- - actionURL: AppConstants.isChinaRepack()`
		`- - ? "https://www.firefox.com.cn/browsers/mobile/"`
		`- - : "https://www.mozilla.org/firefox/browsers/mobile/",`
		`- - },`
		`- - qrcode: {`
		`- - title: {`
		`- - string_id: "more-from-moz-qr-code-box-firefox-mobile-title",`
		`- - },`
		`- - image_src_prefix:`
		`- - "chrome://browser/content/preferences/more-from-mozilla-qr-code",`
		`- - button: {`
		`- - id: "qr-code-send-email",`
		`- - label: {`
		`- - string_id: "more-from-moz-qr-code-box-firefox-mobile-button",`
		`- - },`
		`- - actionURL: AppConstants.isChinaRepack()`
		`- - ? "https://www.firefox.com.cn/mobile/get-app/"`
		`- - : "https://www.mozilla.org/firefox/mobile/get-app/?v=mfm",`
		`- - },`
		`- - },`
		`- - },`
		`- - ];`
		`- + let products = [];`
		`-`
		`- if (BrowserUtils.shouldShowVPNPromo()) {`
		`- const vpn = {`
		`- diff --git a/browser/components/preferences/preferences.js b/browser/components/preferences/preferences.js`
		`- index f6dc2b3781..34c7d8c528 100644`
		`- --- a/browser/components/preferences/preferences.js`
		`- +++ b/browser/components/preferences/preferences.js`
		`- @@ -10,7 +10,6 @@`
		`- /* import-globals-from privacy.js */`
		`- /* import-globals-from sync.js */`
		`- /* import-globals-from experimental.js */`
		`- -/* import-globals-from moreFromMozilla.js */`
		`- /* import-globals-from findInPage.js */`
		`- /* import-globals-from /browser/base/content/utilityOverlay.js */`
		`- /* import-globals-from /toolkit/content/preferencesBindings.js */`
		`- @@ -203,14 +202,6 @@ function init_all() {`
		`- register_module("paneExperimental", gExperimentalPane);`
		`- }`
		`-`
		`- - NimbusFeatures.moreFromMozilla.recordExposureEvent({ once: true });`
		`- - if (NimbusFeatures.moreFromMozilla.getVariable("enabled")) {`
		`- - document.getElementById("category-more-from-mozilla").hidden = false;`
		`- - gMoreFromMozillaPane.option = NimbusFeatures.moreFromMozilla.getVariable(`
		`- - "template"`
		`- - );`
		`- - register_module("paneMoreFromMozilla", gMoreFromMozillaPane);`
		`- - }`
		`- // The Sync category needs to be the last of the "real" categories`
		`- // registered and inititalized since many tests wait for the`
		`- // "sync-pane-loaded" observer notification before starting the test.`
		`- diff --git a/browser/components/preferences/preferences.xhtml b/browser/components/preferences/preferences.xhtml`
		`- index 81059f3d2e..be23729276 100644`
		`- --- a/browser/components/preferences/preferences.xhtml`
		`- +++ b/browser/components/preferences/preferences.xhtml`
		`- @@ -33,7 +33,6 @@`
		`- <link rel="localization" href="browser/branding/sync-brand.ftl"/>`
		`- <link rel="localization" href="browser/browser.ftl"/>`
		`- <link rel="localization" href="browser/preferences/preferences.ftl"/>`
		`- - <link rel="localization" href="browser/preferences/moreFromMozilla.ftl"/>`
		`- <!-- Used by fontbuilder.js -->`
		`- <link rel="localization" href="browser/preferences/fonts.ftl"/>`
		`- <link rel="localization" href="toolkit/featuregates/features.ftl"/>`
		`- @@ -152,16 +151,6 @@`
		`- <image class="category-icon"/>`
		`- <label class="category-name" flex="1" data-l10n-id="pane-experimental-title"></label>`
		`- </richlistitem>`
		`- - <richlistitem id="category-more-from-mozilla"`
		`- - class="category"`
		`- - hidden="true"`
		`- - data-l10n-id="more-from-moz-category"`
		`- - data-l10n-attrs="tooltiptext"`
		`- - value="paneMoreFromMozilla"`
		`- - align="center">`
		`- - <image class="category-icon"/>`
		`- - <label class="category-name" flex="1" data-l10n-id="more-from-moz-title"></label>`
		`- - </richlistitem>`
		`- </richlistbox>`
		`-`
		`- <spacer flex="1"/>`
		`- @@ -214,7 +203,6 @@`
		`- #include containers.inc.xhtml`
		`- #include sync.inc.xhtml`
		`- #include experimental.inc.xhtml`
		`- -#include moreFromMozilla.inc.xhtml`
		`- </vbox>`
		`- </vbox>`
		`- </vbox>`
		`- --`
		`- 2.36.0`
		`-`
		`-`
		`- From 66dec07e773e35b82aa42120441dea0fb185986d Mon Sep 17 00:00:00 2001`
		`- From: grizzlyuser <grizzlyuser@protonmail.com>`
		`- Date: Sat, 7 May 2022 21:51:06 +0200`
		`- Subject: [PATCH] Remove promos of Firefox Focus and Klar from Private`
		`- Browsing`
		`-`
		`- Please correct me if I'm wrong, but these are not compatible with FSDG`
		`- for the same reasons as the original Firefox.`
		`- ---`
		`- browser/app/profile/firefox.js \| 2 +-`
		`- .../static/browser_all_files_referenced.js \| 2 -`
		`- .../newtab/lib/OnboardingMessageProvider.jsm \| 215 ------------------`
		`- .../newtab/lib/PanelTestProvider.jsm \| 84 -------`
		`- .../content/assets/focus-qr-code.svg \| 114 ----------`
		`- .../content/assets/klar-qr-code.svg \| 114 ----------`
		`- 6 files changed, 1 insertion(+), 530 deletions(-)`
		`- delete mode 100644 browser/components/privatebrowsing/content/assets/focus-qr-code.svg`
		`- delete mode 100644 browser/components/privatebrowsing/content/assets/klar-qr-code.svg`
		`-`
		`- diff --git a/browser/app/profile/firefox.js b/browser/app/profile/firefox.js`
		`- index d0c2b98b11..54cc9de7e6 100644`
		`- --- a/browser/app/profile/firefox.js`
		`- +++ b/browser/app/profile/firefox.js`
		`- @@ -1907,7 +1907,7 @@ pref("browser.contentblocking.report.vpn_regions", "as,at,be,ca,ch,de,es,fi,fr,g`
		`- pref("browser.promo.focus.disallowed_regions", "cn");`
		`-`
		`- // Default to enabling focus promos to be shown where allowed.`
		`- -pref("browser.promo.focus.enabled", true);`
		`- +pref("browser.promo.focus.enabled", false);`
		`-`
		`- // Comma separated string of mozilla vpn supported platforms.`
		`- pref("browser.contentblocking.report.vpn_platforms", "win,mac,linux");`
		`- diff --git a/browser/base/content/test/static/browser_all_files_referenced.js b/browser/base/content/test/static/browser_all_files_referenced.js`
		`- index 44d36d3b28..6823855d56 100644`
		`- --- a/browser/base/content/test/static/browser_all_files_referenced.js`
		`- +++ b/browser/base/content/test/static/browser_all_files_referenced.js`
		`- @@ -32,8 +32,6 @@ var gExceptionPaths = [`
		`- "chrome://activity-stream/content/data/content/assets/remote/",`
		`- "chrome://browser/content/assets/moz-vpn.svg",`
		`- "chrome://browser/content/assets/vpn-logo.svg",`
		`- - "chrome://browser/content/assets/focus-promo.png",`
		`- - "chrome://browser/content/assets/klar-qr-code.svg",`
		`-`
		`- // These app marketplace icons are referenced based on the user's locale`
		`- // in browser/components/newtab/content-src/aboutwelcome/components/MobileDownloads.jsx`
		`- diff --git a/browser/components/newtab/lib/OnboardingMessageProvider.jsm b/browser/components/newtab/lib/OnboardingMessageProvider.jsm`
		`- index 940332f27f..1f7378bbae 100644`
		`- --- a/browser/components/newtab/lib/OnboardingMessageProvider.jsm`
		`- +++ b/browser/components/newtab/lib/OnboardingMessageProvider.jsm`
		`- @@ -95,220 +95,6 @@ const ONBOARDING_MESSAGES = () => [`
		`- ],`
		`- },`
		`- },`
		`- - {`
		`- - id: "PB_NEWTAB_FOCUS_PROMO",`
		`- - type: "default",`
		`- - template: "pb_newtab",`
		`- - groups: ["pbNewtab"],`
		`- - content: {`
		`- - infoBody: "fluent:about-private-browsing-info-description-simplified",`
		`- - infoEnabled: true,`
		`- - infoIcon: "chrome://global/skin/icons/indicator-private-browsing.svg",`
		`- - infoLinkText: "fluent:about-private-browsing-learn-more-link",`
		`- - infoTitle: "",`
		`- - infoTitleEnabled: false,`
		`- - promoEnabled: true,`
		`- - promoType: "FOCUS",`
		`- - promoHeader: "fluent:about-private-browsing-focus-promo-header-c",`
		`- - promoImageLarge: "chrome://browser/content/assets/focus-promo.png",`
		`- - promoLinkText: "fluent:about-private-browsing-focus-promo-cta",`
		`- - promoLinkType: "button",`
		`- - promoSectionStyle: "below-search",`
		`- - promoTitle: "fluent:about-private-browsing-focus-promo-text-c",`
		`- - promoTitleEnabled: true,`
		`- - promoButton: {`
		`- - action: {`
		`- - type: "SHOW_SPOTLIGHT",`
		`- - data: {`
		`- - content: {`
		`- - id: "FOCUS_PROMO",`
		`- - template: "multistage",`
		`- - modal: "tab",`
		`- - backdrop: "transparent",`
		`- - screens: [`
		`- - {`
		`- - id: "DEFAULT_MODAL_UI",`
		`- - content: {`
		`- - logo: {`
		`- - imageURL:`
		`- - "chrome://browser/content/assets/focus-logo.svg",`
		`- - height: "48px",`
		`- - },`
		`- - title: {`
		`- - string_id: "spotlight-focus-promo-title",`
		`- - },`
		`- - subtitle: {`
		`- - string_id: "spotlight-focus-promo-subtitle",`
		`- - },`
		`- - dismiss_button: {`
		`- - action: {`
		`- - navigate: true,`
		`- - },`
		`- - },`
		`- - ios: {`
		`- - action: {`
		`- - data: {`
		`- - args:`
		`- - "https://app.adjust.com/167k4ih?campaign=firefox-desktop&adgroup=pb&creative=focus-omc172&redirect=https%3A%2F%2Fapps.apple.com%2Fus%2Fapp%2Ffirefox-focus-privacy-browser%2Fid1055677337",`
		`- - where: "tabshifted",`
		`- - },`
		`- - type: "OPEN_URL",`
		`- - navigate: true,`
		`- - },`
		`- - },`
		`- - android: {`
		`- - action: {`
		`- - data: {`
		`- - args:`
		`- - "https://app.adjust.com/167k4ih?campaign=firefox-desktop&adgroup=pb&creative=focus-omc172&redirect=https%3A%2F%2Fplay.google.com%2Fstore%2Fapps%2Fdetails%3Fid%3Dorg.mozilla.focus",`
		`- - where: "tabshifted",`
		`- - },`
		`- - type: "OPEN_URL",`
		`- - navigate: true,`
		`- - },`
		`- - },`
		`- - tiles: {`
		`- - type: "mobile_downloads",`
		`- - data: {`
		`- - QR_code: {`
		`- - image_url:`
		`- - "chrome://browser/content/assets/focus-qr-code.svg",`
		`- - alt_text: {`
		`- - string_id: "spotlight-focus-promo-qr-code",`
		`- - },`
		`- - image_overrides: {`
		`- - de:`
		`- - "chrome://browser/content/assets/klar-qr-code.svg",`
		`- - },`
		`- - },`
		`- - marketplace_buttons: ["ios", "android"],`
		`- - },`
		`- - },`
		`- - },`
		`- - },`
		`- - ],`
		`- - },`
		`- - },`
		`- - },`
		`- - },`
		`- - },`
		`- - priority: 2,`
		`- - frequency: {`
		`- - custom: [`
		`- - {`
		`- - cap: 3,`
		`- - period: 604800000, // Max 3 per week`
		`- - },`
		`- - ],`
		`- - lifetime: 12,`
		`- - },`
		`- - targeting: "!(region in [ 'DE', 'AT', 'CH'] && localeLanguageCode == 'en')",`
		`- - },`
		`- - {`
		`- - id: "PB_NEWTAB_KLAR_PROMO",`
		`- - type: "default",`
		`- - template: "pb_newtab",`
		`- - groups: ["pbNewtab"],`
		`- - content: {`
		`- - infoBody: "fluent:about-private-browsing-info-description-simplified",`
		`- - infoEnabled: true,`
		`- - infoIcon: "chrome://global/skin/icons/indicator-private-browsing.svg",`
		`- - infoLinkText: "fluent:about-private-browsing-learn-more-link",`
		`- - infoTitle: "",`
		`- - infoTitleEnabled: false,`
		`- - promoEnabled: true,`
		`- - promoType: "FOCUS",`
		`- - promoHeader: "fluent:about-private-browsing-focus-promo-header-c",`
		`- - promoImageLarge: "chrome://browser/content/assets/focus-promo.png",`
		`- - promoLinkText: "Download Firefox Klar",`
		`- - promoLinkType: "button",`
		`- - promoSectionStyle: "below-search",`
		`- - promoTitle:`
		`- - "Firefox Klar clears your history every time while blocking ads and trackers.",`
		`- - promoTitleEnabled: true,`
		`- - promoButton: {`
		`- - action: {`
		`- - type: "SHOW_SPOTLIGHT",`
		`- - data: {`
		`- - content: {`
		`- - id: "KLAR_PROMO",`
		`- - template: "multistage",`
		`- - modal: "tab",`
		`- - backdrop: "transparent",`
		`- - screens: [`
		`- - {`
		`- - id: "DEFAULT_MODAL_UI",`
		`- - order: 0,`
		`- - content: {`
		`- - logo: {`
		`- - imageURL:`
		`- - "chrome://browser/content/assets/focus-logo.svg",`
		`- - height: "48px",`
		`- - },`
		`- - title: "Get Firefox Klar",`
		`- - subtitle: {`
		`- - string_id: "spotlight-focus-promo-subtitle",`
		`- - },`
		`- - dismiss_button: {`
		`- - action: {`
		`- - navigate: true,`
		`- - },`
		`- - },`
		`- - ios: {`
		`- - action: {`
		`- - data: {`
		`- - args:`
		`- - "https://app.adjust.com/a8bxj8j?campaign=firefox-desktop&adgroup=pb&creative=focus-omc172&redirect=https%3A%2F%2Fapps.apple.com%2Fde%2Fapp%2Fklar-by-firefox%2Fid1073435754",`
		`- - where: "tabshifted",`
		`- - },`
		`- - type: "OPEN_URL",`
		`- - navigate: true,`
		`- - },`
		`- - },`
		`- - android: {`
		`- - action: {`
		`- - data: {`
		`- - args:`
		`- - "https://app.adjust.com/a8bxj8j?campaign=firefox-desktop&adgroup=pb&creative=focus-omc172&redirect=https%3A%2F%2Fplay.google.com%2Fstore%2Fapps%2Fdetails%3Fid%3Dorg.mozilla.klar",`
		`- - where: "tabshifted",`
		`- - },`
		`- - type: "OPEN_URL",`
		`- - navigate: true,`
		`- - },`
		`- - },`
		`- - tiles: {`
		`- - type: "mobile_downloads",`
		`- - data: {`
		`- - QR_code: {`
		`- - image_url:`
		`- - "chrome://browser/content/assets/klar-qr-code.svg",`
		`- - alt_text: {`
		`- - string_id: "spotlight-focus-promo-qr-code",`
		`- - },`
		`- - },`
		`- - marketplace_buttons: ["ios", "android"],`
		`- - },`
		`- - },`
		`- - },`
		`- - },`
		`- - ],`
		`- - },`
		`- - },`
		`- - },`
		`- - },`
		`- - },`
		`- - priority: 2,`
		`- - frequency: {`
		`- - custom: [`
		`- - {`
		`- - cap: 3,`
		`- - period: 604800000, // Max 3 per week`
		`- - },`
		`- - ],`
		`- - lifetime: 12,`
		`- - },`
		`- - targeting: "region in [ 'DE', 'AT', 'CH'] && localeLanguageCode == 'en'",`
		`- - },`
		`- {`
		`- id: "PB_NEWTAB_INFO_SECTION",`
		`- template: "pb_newtab",`
		`-`
		`- diff --git a/browser/components/newtab/lib/PanelTestProvider.jsm b/browser/components/newtab/lib/PanelTestProvider.jsm`
		`- index a991581f7b..af57c3eea8 100644`
		`- --- a/browser/components/newtab/lib/PanelTestProvider.jsm`
		`- +++ b/browser/components/newtab/lib/PanelTestProvider.jsm`
		`- @@ -558,90 +558,6 @@ const MESSAGES = () => [`
		`- frequency: { lifetime: 3 },`
		`- trigger: { id: "defaultBrowserCheck" },`
		`- },`
		`- - {`
		`- - id: "PB_FOCUS_PROMO",`
		`- - groups: ["panel-test-provider"],`
		`- - template: "spotlight",`
		`- - content: {`
		`- - template: "multistage",`
		`- - backdrop: "transparent",`
		`- - screens: [`
		`- - {`
		`- - id: "PBM_FIREFOX_FOCUS",`
		`- - order: 0,`
		`- - content: {`
		`- - logo: {`
		`- - imageURL: "chrome://browser/content/assets/focus-logo.svg",`
		`- - height: "48px",`
		`- - },`
		`- - title: {`
		`- - string_id: "spotlight-focus-promo-title",`
		`- - },`
		`- - subtitle: {`
		`- - string_id: "spotlight-focus-promo-subtitle",`
		`- - },`
		`- - dismiss_button: {`
		`- - action: {`
		`- - navigate: true,`
		`- - },`
		`- - },`
		`- - ios: {`
		`- - action: {`
		`- - data: {`
		`- - args:`
		`- - "https://app.adjust.com/167k4ih?campaign=firefox-desktop&adgroup=pb&creative=focus-omc172&redirect=https%3A%2F%2Fapps.apple.com%2Fus%2Fapp%2Ffirefox-focus-privacy-browser%2Fid1055677337",`
		`- - where: "tabshifted",`
		`- - },`
		`- - type: "OPEN_URL",`
		`- - navigate: true,`
		`- - },`
		`- - },`
		`- - android: {`
		`- - action: {`
		`- - data: {`
		`- - args:`
		`- - "https://app.adjust.com/167k4ih?campaign=firefox-desktop&adgroup=pb&creative=focus-omc172&redirect=https%3A%2F%2Fplay.google.com%2Fstore%2Fapps%2Fdetails%3Fid%3Dorg.mozilla.focus",`
		`- - where: "tabshifted",`
		`- - },`
		`- - type: "OPEN_URL",`
		`- - navigate: true,`
		`- - },`
		`- - },`
		`- - email_link: {`
		`- - action: {`
		`- - data: {`
		`- - args: "https://mozilla.org",`
		`- - where: "tabshifted",`
		`- - },`
		`- - type: "OPEN_URL",`
		`- - navigate: true,`
		`- - },`
		`- - },`
		`- - tiles: {`
		`- - type: "mobile_downloads",`
		`- - data: {`
		`- - QR_code: {`
		`- - image_url:`
		`- - "chrome://browser/content/assets/focus-qr-code.svg",`
		`- - alt_text: {`
		`- - string_id: "spotlight-focus-promo-qr-code",`
		`- - },`
		`- - image_overrides: {`
		`- - de: "chrome://browser/content/assets/klar-qr-code.svg",`
		`- - },`
		`- - },`
		`- - email: {`
		`- - link_text: "Email yourself a link",`
		`- - },`
		`- - marketplace_buttons: ["ios", "android"],`
		`- - },`
		`- - },`
		`- - },`
		`- - },`
		`- - ],`
		`- - },`
		`- - trigger: { id: "defaultBrowserCheck" },`
		`- - },`
		`- {`
		`- id: "PB_NEWTAB_VPN_PROMO",`
		`- template: "pb_newtab",`
		`- diff --git a/browser/components/privatebrowsing/content/assets/focus-qr-code.svg b/browser/components/privatebrowsing/content/assets/focus-qr-code.svg`
		`- deleted file mode 100644`
		`- index f182567314..0000000000`
		`- --- a/browser/components/privatebrowsing/content/assets/focus-qr-code.svg`
		`- +++ /dev/null`
		`- @@ -1,114 +0,0 @@`
		`- -<!-- This Source Code Form is subject to the terms of the Mozilla Public`
		`- - - License, v. 2.0. If a copy of the MPL was not distributed with this`
		`- - - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->`
		`- -<svg width="113" height="113" viewBox="0 0 113 113" fill="none" xmlns="http://www.w3.org/2000/svg">`
		`- -<rect width="113" height="113" rx="4" fill="white"/>`
		- -<path fill-rule="evenodd" clip-rule="evenodd" d="M4 2H109C110.105 2 111 2.89543 111 4V109C111 110.105 110.105 111 109 111H4C2.89543 111 2 110.105 2 109V4C2 2.89543 2.89543 2 4 2ZM0 4C0 1.79086 1.79086 0 4 0H109C111.209 0 113 1.79086 113 4V109C113 111.209 111.209 113 109 113H4C1.79086 113 0 111.209 0 109V4ZM103 10H99.7931H96.5862H93.3793H90.1724H86.9655H83.7586H80.5517V13.2069V16.4138V19.6207V22.8276V26.0345V29.2414V32.4483H83.7586H86.9655H90.1724H93.3793H96.5862H99.7931H103V29.2414V26.0345V22.8276V19.6207V16.4138V13.2069V10ZM96.5862 13.2069H99.7931V16.4138V19.6207V22.8276V26.0345V29.2414H96.5862H93.3793H90.1724H86.9655H83.7586V26.0345V22.8276V19.6207V16.4138V13.2069H86.9655H90.1724H93.3793H96.5862ZM77.3448 10H74.1379H70.931H67.7241V13.2069H64.5172H61.3103V16.4138V19.6207H58.1034H54.8966V16.4138V13.2069V10H51.6897V13.2069H48.4828V10H45.2759H42.069V13.2069H38.8621V10H35.6552V13.2069H38.8621V16.4138H35.6552V19.6207H38.8621V22.8276H35.6552V26.0345H38.8621H42.069V29.2414V32.4483H38.8621V29.2414H35.6552V32.4483H38.8621V35.6552V38.8621H42.069H45.2759V35.6552H42.069V32.4483H45.2759V29.2414V26.0345V22.8276H48.4828V26.0345H51.6897V22.8276H54.8966H58.1034H61.3103V26.0345H58.1034V29.2414H54.8966V32.4483H51.6897V29.2414H48.4828V32.4483V35.6552V38.8621H51.6897V42.069H54.8966V38.8621H58.1034H61.3103V35.6552H64.5172V38.8621V42.069H67.7241V45.2759H70.931H74.1379V42.069H77.3448H80.5517V45.2759H83.7586V48.4828H80.5517V51.6897H83.7586V54.8966H80.5517H77.3448H74.1379V51.6897V48.4828H70.931V51.6897V54.8966V58.1034H74.1379V61.3103H77.3448V64.5172V67.7241H74.1379V70.931H70.931V67.7241H67.7241V70.931H64.5172V74.1379H67.7241V70.931H70.931V74.1379H74.1379V77.3448H70.931H67.7241V80.5517H64.5172V83.7586H61.3103V86.9655H58.1034V83.7586H54.8966V86.9655H58.1034V90.1724H54.8966V93.3793H51.6897V90.1724V86.9655V83.7586V80.5517V77.3448H48.4828V74.1379H51.6897V70.931H48.4828V74.1379H45.2759V70.931V67.7241H42.069V64.5172V61.3103H38.8621V58.1034V54.8966H42.069V51.6897H38.8621V48.4828H35.6552V45.2759H38.8621V42.069H35.6552V38.8621V35.6552H32.4483H29.2414H26.0345V38.8621H22.8276V42.069H19.6207V45.2759H22.8276V48.4828H26.0345V51.6897H22.8276H19.6207V48.4828H16.4138V45.2759H13.2069V48.4828H10V51.6897V54.8966H13.2069H16.4138V51.6897H19.6207V54.8966H22.8276H26.0345V58.1034H22.8276H19.6207V61.3103H16.4138V58.1034H13.2069V61.3103H10V64.5172V67.7241H13.2069H16.4138V70.931H13.2069H10V74.1379H13.2069H16.4138V77.3448H13.2069H10V80.5517H13.2069H16.4138V77.3448H19.6207V80.5517H22.8276V83.7586H19.6207V86.9655H16.4138V83.7586H13.2069H10V86.9655V90.1724H13.2069V86.9655H16.4138V90.1724H19.6207H22.8276H26.0345V93.3793H22.8276H19.6207H16.4138H13.2069V96.5862V99.7931H16.4138V96.5862H19.6207V99.7931H22.8276V103H26.0345V99.7931V96.5862H29.2414H32.4483V99.7931H29.2414V103H32.4483V99.7931H35.6552H38.8621V103H42.069H45.2759V99.7931H48.4828V103H51.6897V99.7931H54.8966H58.1034V103H61.3103H64.5172V99.7931H67.7241V103H70.931V99.7931H74.1379V96.5862H77.3448V93.3793V90.1724V86.9655H74.1379V83.7586V80.5517H77.3448V77.3448V74.1379H80.5517V77.3448H83.7586H86.9655H90.1724H93.3793V74.1379H96.5862V70.931V67.7241H93.3793V64.5172H90.1724V61.3103H93.3793H96.5862V64.5172H99.7931V67.7241V70.931V74.1379V77.3448H103V74.1379V70.931V67.7241V64.5172H99.7931V61.3103H96.5862V58.1034H99.7931V54.8966H103V51.6897H99.7931V54.8966H96.5862V58.1034H93.3793V54.8966H90.1724V58.1034V61.3103H86.9655V58.1034H83.7586V54.8966H86.9655V51.6897H90.1724H93.3793H96.5862V48.4828H93.3793V45.2759V42.069H96.5862V45.2759H99.7931V42.069H103V38.8621H99.7931V42.069H96.5862V38.8621V35.6552H93.3793H90.1724H86.9655V38.8621H90.1724V42.069V45.2759V48.4828H86.9655V45.2759V42.069H83.7586H80.5517V38.8621H83.7586V35.6552H80.5517V38.8621H77.3448V35.6552V32.4483V29.2414V26.0345H74.1379V22.8276H70.931V26.0345H74.1379V29.2414V32.4483V35.6552V38.8621H70.931H67.7241V35.6552H70.931V32.4483V29.2414H67.7241V26.0345V22.8276H64.5172V19.6207V16.4138H67.7241H70.931V19.6207H74.1379H77.3448V16.4138V13.2069V10ZM64.5172 29.2414H67.7241V32.4483H64.5172V29.2414ZM61.3103 29.2414V32.4483H58.1034V29.2414H61.3103ZM61.3103 29.2414H64.5172V26.0345H61.3103V29.2414ZM83.7586 58.1034V61.3103H80.5517V58.1034H83.7586ZM90.1724 64.5172V67.7241V70.931H93.3793V74.1379H90.1724H86.9655V70.931V67.7241H83.7586H80.5517V64.5172H83.7586H86.9655H90.1724ZM80.5517 74.1379V70.931H83.7586V74.1379H80.5517ZM70.931 90.1724V93.3793H74.1379V96.5862H70.931H67.7241V93.3793V90.1724H70.931ZM64.5172 90.1724V86.9655H67.7241V90.1724H64.5172ZM61.3103 93.3793V90.1724H64.5172V93.3793H61.3103ZM61.3103 93.3793V96.5862H64.5172V99.7931H61.3103H58.1034V96.5862V93.3793H61.3103ZM70.931 90.1724V86.9655H74.1379V90.1724H70.931ZM45.2759 99.7931H42.069H38.8621V96.5862H42.069V93.3793H45.2759H48.4828V96.5862H45.2759V99.7931ZM16.4138 74.1379V70.931H19.6207H22.8276H26.0345V74.1379H22.8276H19.6207H16.4138ZM13.2069 61.3103H16.4138V64.5172H13.2069V61.3103ZM29.2414 51.6897V54.8966H26.0345V51.6897H29.2414ZM29.2414 51.6897V48.4828H32.4483V51.6897H29.2414ZM22.8276 45.2759V42.069H26.0345V45.2759H22.8276ZM26.0345 58.1034H29.2414V61.3103H32.4483V58.1034H35.6552V61.3103H38.8621V64.5172H35.6552H32.4483H29.2414H26.0345H22.8276V61.3103H26.0345V58.1034ZM42.069 80.5517H38.8621V77.3448V74.1379V70.931H35.6552V74.1379H32.4483V70.931V67.7241H35.6552H38.8621H42.069V70.931V74.1379V77.3448V80.5517ZM42.069 86.9655V83.7586V80.5517H45.2759V77.3448H48.4828V80.5517V83.7586V86.9655V90.1724H45.2759V86.9655H42.069ZM42.069 86.9655V90.1724H38.8621V86.9655H42.069ZM54.8966 38.8621H51.6897V35.6552H54.8966V38.8621ZM42.069 13.2069V16.4138H45.2759V19.6207H48.4828V16.4138V13.2069H45.2759H42.069ZM58.1034 74.1379V70.931H61.3103V74.1379H58.1034ZM32.4483 10H29.2414H26.0345H22.8276H19.6207H16.4138H13.2069H10V13.2069V16.4138V19.6207V22.8276V26.0345V29.2414V32.4483H13.2069H16.4138H19.6207H22.8276H26.0345H29.2414H32.4483V29.2414V26.0345V22.8276V19.6207V16.4138V13.2069V10ZM26.0345 13.2069H29.2414V16.4138V19.6207V22.8276V26.0345V29.2414H26.0345H22.8276H19.6207H16.4138H13.2069V26.0345V22.8276V19.6207V16.4138V13.2069H16.4138H19.6207H22.8276H26.0345ZM96.5862 16.4138H93.3793H90.1724H86.9655V19.6207V22.8276V26.0345H90.1724H93.3793H96.5862V22.8276V19.6207V16.4138ZM26.0345 16.4138H22.8276H19.6207H16.4138V19.6207V22.8276V26.0345H19.6207H22.8276H26.0345V22.8276V19.6207V16.4138ZM19.6207 35.6552H16.4138H13.2069H10V38.8621V42.069H13.2069V38.8621H16.4138H19.6207V35.6552ZM32.4483 77.3448H35.6552V80.5517V83.7586V86.9655H32.4483H29.2414H26.0345V83.7586V80.5517V77.3448H29.2414H32.4483ZM61.3103 77.3448H58.1034V80.5517H61.3103V77.3448ZM103 80.5517H99.7931H96.5862H93.3793H90.1724H86.9655H83.7586H80.5517V83.7586V86.9655V90.1724V93.3793V96.5862V99.7931V103H83.7586H86.9655H90.1724H93.3793H96.5862H99.7931H103V99.7931V96.5862V93.3793V90.1724V86.9655V83.7586V80.5517ZM96.5862 83.7586H99.7931V86.9655V90.1724V93.3793V96.5862V99.7931H96.5862H93.3793H90.1724H86.9655H83.7586V96.5862V93.3793V90.1724V86.9655V83.7586H86.9655H90.1724H93.3793H96.5862ZM32.4483 80.5517H29.2414V83.7586H32.4483V80.5517ZM96.5862 86.9655H93.3793H90.1724H86.9655V90.1724V93.3793V96.5862H90.1724H93.3793H96.5862V93.3793V90.1724V86.9655ZM29.2414 90.1724H32.4483V93.3793H29.2414V90.1724Z" fill="#1C1B22"/>
		- -<path d="M66.2056 52.7475C65.7266 51.5785 64.7572 50.3139 63.9959 49.9148C64.6155 51.1492 64.9742 52.3872 65.1112 53.3113C65.1112 53.3113 65.1112 53.3177 65.1112 53.3299C63.8657 50.1757 61.7537 48.9037 60.0292 46.1343C59.9419 45.994 59.8551 45.8537 59.7678 45.7055C59.7192 45.621 59.6805 45.546 59.6465 45.4738C59.575 45.3332 59.5199 45.1847 59.4823 45.0312C59.4825 45.0239 59.48 45.0169 59.4754 45.0114C59.4707 45.0059 59.4643 45.0023 59.4572 45.0014C59.4503 44.9995 59.4431 44.9995 59.4363 45.0014L59.431 45.0046C59.4283 45.0057 59.4256 45.0071 59.4232 45.0088L59.4274 45.0025C56.6608 46.6497 55.7222 49.6954 55.6359 51.2193C54.5305 51.2961 53.4736 51.7098 52.6032 52.4064C52.512 52.3282 52.4167 52.2551 52.3177 52.1875C52.0667 51.2949 52.0561 50.3502 52.2868 49.452C51.1553 49.9754 50.2753 50.8033 49.6358 51.5339H49.6379C49.2012 50.9722 49.2321 49.1183 49.2567 48.731C49.2514 48.7071 48.9309 48.9 48.8906 48.9292C48.5053 49.2088 48.145 49.5224 47.814 49.8665C47.4375 50.2545 47.0935 50.6738 46.7855 51.12C46.0764 52.1399 45.5731 53.2924 45.3047 54.5111C45.2994 54.535 45.2947 54.5605 45.29 54.5849C45.2691 54.6832 45.1943 55.1763 45.1813 55.2837C45.1813 55.2916 45.1813 55.2996 45.1813 55.3081C45.0847 55.8177 45.0249 56.3338 45.0024 56.8522C45.0024 56.8714 45.0024 56.89 45.0024 56.9091C45.0024 63.0898 49.9338 68.1 56.0166 68.1C61.464 68.1 65.9876 64.0813 66.8728 58.8012C66.8916 58.6583 66.9063 58.5143 66.9251 58.3698C67.139 56.4516 66.8932 54.434 66.2056 52.7475ZM53.5109 61.5074C53.5632 61.5324 53.6108 61.5606 53.6636 61.5834L53.6709 61.5882C53.6176 61.5622 53.5642 61.5351 53.5109 61.5074ZM65.1154 53.3331V53.3219C65.1151 53.326 65.1151 53.3301 65.1154 53.3341V53.3331Z" fill="url(#paint0_linear_1186_7637)"/>
		- -<path d="M66.2063 52.7477C65.7273 51.5787 64.7579 50.3141 63.9966 49.915C64.6162 51.1494 64.9749 52.3874 65.1119 53.3115C65.1119 53.3088 65.1119 53.3115 65.1119 53.3221C65.1116 53.3262 65.1116 53.3302 65.1119 53.3343C66.1509 56.1973 65.5825 59.108 64.7689 60.887C63.5066 63.6394 60.4509 66.4604 55.6706 66.3228C50.5029 66.174 45.9506 62.2776 45.1009 57.1744C44.9441 56.3699 45.1009 55.9608 45.1788 55.3078C45.0837 55.8115 45.0476 55.9571 45 56.8519C45 56.871 45 56.8896 45 56.9087C45 63.0895 49.9314 68.0996 56.0141 68.0996C61.4616 68.0996 65.9851 64.081 66.8704 58.8009C66.8892 58.658 66.9038 58.514 66.9227 58.3694C67.1397 56.4518 66.8939 54.4342 66.2063 52.7477Z" fill="url(#paint1_radial_1186_7637)"/>
		- -<path d="M66.2063 52.7477C65.7273 51.5787 64.7579 50.3141 63.9966 49.915C64.6162 51.1494 64.9749 52.3874 65.1119 53.3115C65.1119 53.3088 65.1119 53.3115 65.1119 53.3221C65.1116 53.3262 65.1116 53.3302 65.1119 53.3343C66.1509 56.1973 65.5825 59.108 64.7689 60.887C63.5066 63.6394 60.4509 66.4604 55.6706 66.3228C50.5029 66.174 45.9506 62.2776 45.1009 57.1744C44.9441 56.3699 45.1009 55.9608 45.1788 55.3078C45.0837 55.8115 45.0476 55.9571 45 56.8519C45 56.871 45 56.8896 45 56.9087C45 63.0895 49.9314 68.0996 56.0141 68.0996C61.4616 68.0996 65.9851 64.081 66.8704 58.8009C66.8892 58.658 66.9038 58.514 66.9227 58.3694C67.1397 56.4518 66.8939 54.4342 66.2063 52.7477Z" fill="url(#paint2_radial_1186_7637)"/>
		`- -<path d="M60.854 54.0624C60.878 54.0794 60.9 54.0964 60.9225 54.1155C60.6463 53.6162 60.3021 53.159 59.9002 52.7574C56.4763 49.2786 59.0024 45.2121 59.4296 45.0081L59.4338 45.0017C56.6672 46.6489 55.7286 49.6946 55.6423 51.2186C55.7704 51.2095 55.8986 51.1984 56.0293 51.1984C58.0926 51.1989 59.8913 52.3525 60.854 54.0624Z" fill="url(#paint3_radial_1186_7637)"/>`
		- -<path d="M56.0574 54.7568C56.0396 55.0352 55.0717 55.9954 54.7329 55.9954C51.6008 55.9954 51.0925 57.9205 51.0925 57.9205C51.2311 59.5422 52.3417 60.8769 53.6871 61.5836C53.7483 61.616 53.8105 61.6453 53.8727 61.674C53.9804 61.7223 54.0882 61.7675 54.1964 61.8084C54.6575 61.9743 55.1404 62.0688 55.6291 62.089C61.1195 62.3509 62.1825 55.4194 58.2206 53.4066C59.2355 53.227 60.2886 53.642 60.8763 54.0618C59.9137 52.3519 58.1155 51.1978 56.0506 51.1978C55.9198 51.1978 55.7891 51.2089 55.6636 51.2179C54.5582 51.2947 53.5013 51.7084 52.6309 52.405C52.7987 52.5495 52.988 52.7424 53.3875 53.1425C54.1357 53.8907 56.0532 54.6654 56.0574 54.7568Z" fill="url(#paint4_radial_1186_7637)"/>
		- -<path d="M56.0574 54.7568C56.0396 55.0352 55.0717 55.9954 54.7329 55.9954C51.6008 55.9954 51.0925 57.9205 51.0925 57.9205C51.2311 59.5422 52.3417 60.8769 53.6871 61.5836C53.7483 61.616 53.8105 61.6453 53.8727 61.674C53.9804 61.7223 54.0882 61.7675 54.1964 61.8084C54.6575 61.9743 55.1404 62.0688 55.6291 62.089C61.1195 62.3509 62.1825 55.4194 58.2206 53.4066C59.2355 53.227 60.2886 53.642 60.8763 54.0618C59.9137 52.3519 58.1155 51.1978 56.0506 51.1978C55.9198 51.1978 55.7891 51.2089 55.6636 51.2179C54.5582 51.2947 53.5013 51.7084 52.6309 52.405C52.7987 52.5495 52.988 52.7424 53.3875 53.1425C54.1357 53.8907 56.0532 54.6654 56.0574 54.7568Z" fill="url(#paint5_radial_1186_7637)"/>
		`- -<path d="M52.0962 52.0338C52.1856 52.0927 52.2594 52.14 52.3247 52.1873C52.0738 51.2947 52.0631 50.3501 52.2939 49.4519C51.1623 49.9753 50.2823 50.8031 49.6428 51.5338C49.6951 51.5353 51.2925 51.5029 52.0962 52.0338Z" fill="url(#paint6_radial_1186_7637)"/>`
		- -<path d="M45.1022 57.1743C45.9519 62.2753 50.5041 66.1738 55.6719 66.3226C60.4547 66.4602 63.5105 63.6393 64.7701 60.8868C65.5858 59.1079 66.1521 56.1971 65.1132 53.3341V53.323C65.1132 53.315 65.1132 53.3097 65.1132 53.3124C65.1132 53.315 65.1132 53.3187 65.1132 53.331C65.5038 55.9234 64.2059 58.432 62.1777 60.1323L62.1714 60.1467C58.2189 63.4172 54.4368 62.1201 53.6708 61.5888C53.6185 61.5627 53.5662 61.5356 53.5108 61.508C51.2059 60.3884 50.2542 58.255 50.4581 56.4256C48.5125 56.4256 47.8489 54.7576 47.8489 54.7576C47.8489 54.7576 49.5959 53.492 51.8982 54.5929C54.031 55.6126 56.0337 54.7582 56.0337 54.7582C56.0295 54.6668 54.1126 53.8921 53.367 53.1439C52.9675 52.7443 52.7782 52.5515 52.6103 52.4069C52.5192 52.3287 52.4239 52.2557 52.3248 52.188C52.2595 52.1423 52.1858 52.0934 52.0963 52.0344C51.2932 51.5031 49.6958 51.5334 49.6429 51.5344H49.6388C49.2022 50.9728 49.233 49.1189 49.2576 48.7315C49.2524 48.7076 48.9318 48.9005 48.8916 48.9297C48.5062 49.2093 48.1459 49.523 47.8149 49.867C47.4384 50.2551 47.0944 50.6744 46.7864 51.1205C46.0774 52.1403 45.5741 53.2927 45.3056 54.5111C45.2988 54.5345 44.9092 56.2725 45.1022 57.1743Z" fill="url(#paint7_radial_1186_7637)"/>
		- -<path d="M59.9009 52.7576C60.3027 53.1586 60.6468 53.6151 60.9232 54.1136C60.9839 54.1599 61.0403 54.2061 61.0884 54.2507C63.5858 56.5887 62.2775 59.8958 62.1797 60.1312C64.208 58.4309 65.5058 55.9218 65.1152 53.3299C63.8697 50.1757 61.7577 48.9037 60.0332 46.1343C59.9459 45.994 59.8591 45.8537 59.7718 45.7055C59.7232 45.621 59.6845 45.546 59.6505 45.4738C59.579 45.3332 59.5239 45.1847 59.4863 45.0312C59.4865 45.0239 59.484 45.0169 59.4794 45.0114C59.4747 45.0059 59.4683 45.0023 59.4612 45.0014C59.4543 44.9995 59.4471 44.9995 59.4403 45.0014L59.4351 45.0046C59.4323 45.0057 59.4296 45.0071 59.4272 45.0088C59.0031 45.215 56.4771 49.2793 59.9009 52.7576Z" fill="url(#paint8_radial_1186_7637)"/>
		- -<path d="M61.0892 54.251C61.0411 54.2064 60.9846 54.1601 60.924 54.1139C60.9015 54.0964 60.8795 54.0794 60.8555 54.0608C60.2677 53.641 59.2146 53.2265 58.1997 53.4056C62.1616 55.4184 61.0981 62.3488 55.6083 62.0869C55.1194 62.067 54.6362 61.9724 54.175 61.8063C54.0673 61.7654 53.9596 61.7203 53.8519 61.6719C53.7897 61.6432 53.7274 61.614 53.6663 61.5816L53.6736 61.5864C54.4396 62.1177 58.2227 63.4148 62.1742 60.1443L62.1805 60.1299C62.2756 59.8961 63.5839 56.589 61.0892 54.251Z" fill="url(#paint9_radial_1186_7637)"/>
		`- -<path d="M51.07 57.9207C51.07 57.9207 51.5783 55.9956 54.7104 55.9956C55.0492 55.9956 56.0176 55.036 56.0349 54.7576C56.0349 54.7576 54.0322 55.612 51.8994 54.5923C49.5986 53.4913 47.8501 54.757 47.8501 54.757C47.8501 54.757 48.5136 56.425 50.4593 56.425C50.2554 58.2544 51.207 60.3878 53.5119 61.5074C53.5642 61.5324 53.6118 61.5605 53.6646 61.5834C52.3192 60.8772 51.2076 59.5419 51.07 57.9207Z" fill="url(#paint10_radial_1186_7637)"/>`
		- -<path d="M66.2057 52.7475C65.7268 51.5785 64.7573 50.3139 63.996 49.9148C64.6156 51.1492 64.9743 52.3872 65.1113 53.3113C65.1113 53.3113 65.1113 53.3177 65.1113 53.3299C63.8658 50.1757 61.7539 48.9037 60.0294 46.1343C59.942 45.994 59.8552 45.8537 59.7679 45.7055C59.7193 45.621 59.6806 45.546 59.6466 45.4738C59.5751 45.3332 59.52 45.1847 59.4824 45.0312C59.4826 45.0239 59.4802 45.0169 59.4755 45.0114C59.4709 45.0059 59.4644 45.0023 59.4573 45.0014C59.4505 44.9995 59.4433 44.9995 59.4364 45.0014L59.4312 45.0046C59.4284 45.0057 59.4258 45.0071 59.4233 45.0088L59.4275 45.0025C56.6609 46.6497 55.7223 49.6954 55.6361 51.2193C55.7642 51.2103 55.8923 51.1991 56.023 51.1991C58.0874 51.1991 59.8861 52.3527 60.8487 54.0626C60.261 53.6428 59.2079 53.2284 58.193 53.4074C62.1549 55.4202 61.0914 62.3507 55.6015 62.0887C55.1126 62.0688 54.6295 61.9743 54.1683 61.8082C54.0606 61.7673 53.9529 61.7221 53.8452 61.6738C53.7829 61.6451 53.7207 61.6158 53.6595 61.5834L53.6669 61.5882C53.6146 61.5622 53.5623 61.5351 53.5069 61.5074C53.5591 61.5324 53.6067 61.5606 53.6595 61.5834C52.3141 60.8772 51.202 59.542 51.065 57.9208C51.065 57.9208 51.5732 55.9957 54.7053 55.9957C55.0441 55.9957 56.0125 55.0361 56.0298 54.7576C56.0256 54.6662 54.1087 53.8915 53.3631 53.1434C52.9636 52.7438 52.7743 52.5509 52.6064 52.4064C52.5153 52.3282 52.42 52.2551 52.3209 52.1875C52.07 51.2949 52.0593 50.3502 52.2901 49.452C51.1586 49.9754 50.2785 50.8033 49.639 51.5339H49.638C49.2014 50.9722 49.2322 49.1183 49.2568 48.731C49.2516 48.7071 48.931 48.9 48.8908 48.9292C48.5054 49.2088 48.1451 49.5224 47.8142 49.8665C47.4376 50.2545 47.0936 50.6738 46.7856 51.12C46.0766 52.1399 45.5733 53.2924 45.3048 54.5111C45.2996 54.535 45.2949 54.5605 45.2902 54.5849C45.2693 54.6832 45.1762 55.1832 45.1631 55.2906C45.078 55.8073 45.0237 56.3288 45.0005 56.8522C45.0005 56.8714 45.0005 56.89 45.0005 56.9091C45.0005 63.0898 49.9319 68.1 56.0146 68.1C61.4621 68.1 65.9856 64.0813 66.8709 58.8012C66.8897 58.6583 66.9043 58.5143 66.9231 58.3698C67.1391 56.4516 66.8933 54.434 66.2057 52.7475ZM65.1155 53.3219C65.1153 53.326 65.1153 53.3301 65.1155 53.3341V53.3219Z" fill="url(#paint11_linear_1186_7637)"/>
		`- -<defs>`
		`- -<linearGradient id="paint0_linear_1186_7637" x1="65.8887" y1="50.9308" x2="46.6588" y2="62.8511" gradientUnits="userSpaceOnUse">`
		`- -<stop stop-color="#9658F9"/>`
		`- -<stop offset="0.13" stop-color="#9356F4"/>`
		`- -<stop offset="0.29" stop-color="#8951E5"/>`
		`- -<stop offset="0.46" stop-color="#7A49CD"/>`
		`- -<stop offset="0.64" stop-color="#643DAB"/>`
		`- -<stop offset="0.82" stop-color="#492E81"/>`
		`- -<stop offset="1" stop-color="#291D4F"/>`
		`- -</linearGradient>`
		`- -<radialGradient id="paint1_radial_1186_7637" cx="0" cy="0" r="1" gradientUnits="userSpaceOnUse" gradientTransform="translate(63.1519 48.6778) rotate(112.511) scale(23.2839 24.3126)">`
		`- -<stop stop-color="#9658F9"/>`
		`- -<stop offset="0.65" stop-color="#291D4F"/>`
		`- -</radialGradient>`
		`- -<radialGradient id="paint2_radial_1186_7637" cx="0" cy="0" r="1" gradientUnits="userSpaceOnUse" gradientTransform="translate(57.8824 59.334) scale(22.9415 23.3129)">`
		`- -<stop offset="0.25" stop-color="#AB71FF" stop-opacity="0"/>`
		`- -<stop offset="0.42" stop-color="#9462E0" stop-opacity="0.18"/>`
		`- -<stop offset="0.73" stop-color="#573B8D" stop-opacity="0.65"/>`
		`- -<stop offset="0.94" stop-color="#291D4F"/>`
		`- -</radialGradient>`
		`- -<radialGradient id="paint3_radial_1186_7637" cx="0" cy="0" r="1" gradientUnits="userSpaceOnUse" gradientTransform="translate(60.6484 44.5148) scale(16.5843 16.8528)">`
		`- -<stop offset="0.18" stop-color="#9658F9"/>`
		`- -<stop offset="0.33" stop-color="#7E48EA"/>`
		`- -<stop offset="0.37" stop-color="#7542E5"/>`
		`- -<stop offset="0.41" stop-color="#6A3DD0"/>`
		`- -<stop offset="0.48" stop-color="#5332A2"/>`
		`- -<stop offset="0.56" stop-color="#41297E"/>`
		`- -<stop offset="0.63" stop-color="#342264"/>`
		`- -<stop offset="0.69" stop-color="#2C1E54"/>`
		`- -<stop offset="0.74" stop-color="#291D4F"/>`
		`- -</radialGradient>`
		`- -<radialGradient id="paint4_radial_1186_7637" cx="0" cy="0" r="1" gradientUnits="userSpaceOnUse" gradientTransform="translate(52.8479 62.089) scale(10.9331 11.1101)">`
		`- -<stop offset="0.07" stop-color="#9358FC"/>`
		`- -<stop offset="0.13" stop-color="#9857F8"/>`
		`- -<stop offset="0.21" stop-color="#A755EB"/>`
		`- -<stop offset="0.3" stop-color="#BF52D7"/>`
		`- -<stop offset="0.39" stop-color="#E14EBA"/>`
		`- -<stop offset="0.42" stop-color="#EF4CAF"/>`
		`- -<stop offset="0.74" stop-color="#FF7583"/>`
		`- -<stop offset="0.97" stop-color="#FFB753"/>`
		`- -</radialGradient>`
		`- -<radialGradient id="paint5_radial_1186_7637" cx="0" cy="0" r="1" gradientUnits="userSpaceOnUse" gradientTransform="translate(55.4787 54.1254) rotate(-14.1133) scale(5.79733 6.90775)">`
		`- -<stop offset="0.22" stop-color="#FFB653" stop-opacity="0.3"/>`
		`- -<stop offset="0.34" stop-color="#FF807A" stop-opacity="0.5"/>`
		`- -<stop offset="0.44" stop-color="#FF7781" stop-opacity="0.48"/>`
		`- -<stop offset="0.57" stop-color="#FF5C94" stop-opacity="0.43"/>`
		`- -<stop offset="0.64" stop-color="#FF4AA2" stop-opacity="0.4"/>`
		`- -<stop offset="0.86" stop-color="#9658F9" stop-opacity="0.3"/>`
		`- -</radialGradient>`
		`- -<radialGradient id="paint6_radial_1186_7637" cx="0" cy="0" r="1" gradientUnits="userSpaceOnUse" gradientTransform="translate(57.5929 48.8515) scale(7.85915 7.9864)">`
		`- -<stop offset="0.03" stop-color="#9658F9"/>`
		`- -<stop offset="0.62" stop-color="#7542E5"/>`
		`- -<stop offset="0.72" stop-color="#6339C2"/>`
		`- -<stop offset="0.93" stop-color="#37246B"/>`
		`- -<stop offset="1" stop-color="#291D4F"/>`
		`- -</radialGradient>`
		`- -<radialGradient id="paint7_radial_1186_7637" cx="0" cy="0" r="1" gradientUnits="userSpaceOnUse" gradientTransform="translate(58.8404 39.1507) rotate(102.662) scale(32.7229 25.3152)">`
		`- -<stop offset="0.2" stop-color="#AB71FF"/>`
		`- -<stop offset="0.29" stop-color="#A46BFC"/>`
		`- -<stop offset="0.41" stop-color="#9059F2"/>`
		`- -<stop offset="0.54" stop-color="#7542E5"/>`
		`- -<stop offset="0.64" stop-color="#6239BF"/>`
		`- -<stop offset="0.94" stop-color="#291D4F"/>`
		`- -</radialGradient>`
		`- -<radialGradient id="paint8_radial_1186_7637" cx="0" cy="0" r="1" gradientUnits="userSpaceOnUse" gradientTransform="translate(59.5059 49.1947) rotate(84.0697) scale(24.9532 16.1464)">`
		`- -<stop offset="0.09" stop-color="#9658F9"/>`
		`- -<stop offset="0.14" stop-color="#8C51F3"/>`
		`- -<stop offset="0.26" stop-color="#7542E5"/>`
		`- -<stop offset="0.29" stop-color="#6E3ED6"/>`
		`- -<stop offset="0.4" stop-color="#5533A6"/>`
		`- -<stop offset="0.5" stop-color="#422980"/>`
		`- -<stop offset="0.59" stop-color="#342365"/>`
		`- -<stop offset="0.67" stop-color="#2C1E55"/>`
		`- -<stop offset="0.74" stop-color="#291D4F"/>`
		`- -</radialGradient>`
		`- -<radialGradient id="paint9_radial_1186_7637" cx="0" cy="0" r="1" gradientUnits="userSpaceOnUse" gradientTransform="translate(57.4076 51.8087) scale(20.9312 21.2702)">`
		`- -<stop stop-color="#9658F9"/>`
		`- -<stop offset="0.12" stop-color="#9155F6"/>`
		`- -<stop offset="0.25" stop-color="#834CEE"/>`
		`- -<stop offset="0.34" stop-color="#7542E5"/>`
		`- -<stop offset="0.78" stop-color="#291D4F"/>`
		`- -</radialGradient>`
		`- -<radialGradient id="paint10_radial_1186_7637" cx="0" cy="0" r="1" gradientUnits="userSpaceOnUse" gradientTransform="translate(62.9339 53.0525) scale(22.862 23.2321)">`
		`- -<stop offset="0.19" stop-color="#9658F9"/>`
		`- -<stop offset="0.49" stop-color="#834BED"/>`
		`- -<stop offset="0.66" stop-color="#7542E5"/>`
		`- -<stop offset="0.7" stop-color="#6B3DD2"/>`
		`- -<stop offset="0.79" stop-color="#52319F"/>`
		`- -<stop offset="0.91" stop-color="#291D4F"/>`
		`- -</radialGradient>`
		`- -<linearGradient id="paint11_linear_1186_7637" x1="64.5267" y1="48.4823" x2="48.7204" y2="64.0368" gradientUnits="userSpaceOnUse">`
		`- -<stop stop-color="#9059FF" stop-opacity="0.9"/>`
		`- -<stop offset="0.61" stop-color="#291D4F" stop-opacity="0"/>`
		`- -</linearGradient>`
		`- -</defs>`
		`- -</svg>`
		`- diff --git a/browser/components/privatebrowsing/content/assets/klar-qr-code.svg b/browser/components/privatebrowsing/content/assets/klar-qr-code.svg`
		`- deleted file mode 100644`
		`- index 2217ca055c..0000000000`
		`- --- a/browser/components/privatebrowsing/content/assets/klar-qr-code.svg`
		`- +++ /dev/null`
		`- @@ -1,114 +0,0 @@`
		`- -<!-- This Source Code Form is subject to the terms of the Mozilla Public`
		`- - - License, v. 2.0. If a copy of the MPL was not distributed with this`
		`- - - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->`
		`- -<svg width="113" height="113" viewBox="0 0 113 113" fill="none" xmlns="http://www.w3.org/2000/svg">`
		`- -<rect width="113" height="113" rx="4" fill="white"/>`
		- -<path fill-rule="evenodd" clip-rule="evenodd" d="M4 2H109C110.105 2 111 2.89543 111 4V109C111 110.105 110.105 111 109 111H4C2.89543 111 2 110.105 2 109V4C2 2.89543 2.89543 2 4 2ZM0 4C0 1.79086 1.79086 0 4 0H109C111.209 0 113 1.79086 113 4V109C113 111.209 111.209 113 109 113H4C1.79086 113 0 111.209 0 109V4ZM103 10H99.7931H96.5862H93.3793H90.1724H86.9655H83.7586H80.5517V13.2069V16.4138V19.6207V22.8276V26.0345V29.2414V32.4483H83.7586H86.9655H90.1724H93.3793H96.5862H99.7931H103V29.2414V26.0345V22.8276V19.6207V16.4138V13.2069V10ZM96.5862 13.2069H99.7931V16.4138V19.6207V22.8276V26.0345V29.2414H96.5862H93.3793H90.1724H86.9655H83.7586V26.0345V22.8276V19.6207V16.4138V13.2069H86.9655H90.1724H93.3793H96.5862ZM70.931 10H67.7241V13.2069H64.5172V10H61.3103H58.1034V13.2069H54.8966V10H51.6897H48.4828H45.2759H42.069H38.8621V13.2069H35.6552V16.4138V19.6207H38.8621V22.8276H42.069V26.0345H38.8621H35.6552V29.2414V32.4483H38.8621V35.6552H35.6552V38.8621V42.069H32.4483V38.8621V35.6552H29.2414H26.0345V38.8621H22.8276H19.6207H16.4138V35.6552H13.2069V38.8621H10V42.069V45.2759V48.4828V51.6897V54.8966V58.1034V61.3103V64.5172V67.7241V70.931H13.2069V74.1379V77.3448H10V80.5517V83.7586H13.2069V86.9655H10V90.1724H13.2069V93.3793H10V96.5862V99.7931H13.2069V103H16.4138V99.7931V96.5862H19.6207V99.7931H22.8276V103H26.0345V99.7931H29.2414H32.4483V103H35.6552H38.8621H42.069H45.2759V99.7931V96.5862H48.4828H51.6897V99.7931H48.4828V103H51.6897H54.8966H58.1034V99.7931V96.5862V93.3793V90.1724H54.8966V86.9655H51.6897V90.1724H48.4828H45.2759V86.9655H48.4828V83.7586H45.2759V80.5517H48.4828H51.6897H54.8966V83.7586H58.1034V80.5517H61.3103V83.7586H64.5172V80.5517H61.3103V77.3448V74.1379H64.5172H67.7241H70.931V77.3448H67.7241V80.5517V83.7586V86.9655V90.1724V93.3793V96.5862H70.931V99.7931H67.7241V103H70.931H74.1379V99.7931V96.5862H70.931V93.3793V90.1724V86.9655H74.1379V90.1724H77.3448V86.9655V83.7586V80.5517V77.3448H80.5517H83.7586H86.9655H90.1724V74.1379V70.931V67.7241H86.9655V70.931V74.1379H83.7586H80.5517V70.931H83.7586V67.7241H80.5517V64.5172H83.7586H86.9655V61.3103H90.1724V64.5172H93.3793H96.5862V67.7241H99.7931H103V64.5172H99.7931H96.5862V61.3103V58.1034H99.7931V61.3103H103V58.1034H99.7931V54.8966H103V51.6897H99.7931V48.4828H103V45.2759V42.069V38.8621H99.7931H96.5862H93.3793V42.069H90.1724H86.9655V45.2759V48.4828H83.7586H80.5517V51.6897H77.3448V48.4828H74.1379V51.6897H70.931V54.8966V58.1034H74.1379V61.3103H70.931V64.5172V67.7241H74.1379V64.5172H77.3448V67.7241V70.931H74.1379H70.931H67.7241H64.5172H61.3103H58.1034V74.1379H54.8966V70.931H51.6897V74.1379H54.8966V77.3448H51.6897H48.4828V74.1379V70.931H45.2759V74.1379H42.069H38.8621H35.6552H32.4483H29.2414V70.931V67.7241V64.5172H26.0345H22.8276V67.7241H19.6207H16.4138V70.931H13.2069V67.7241V64.5172H16.4138V61.3103V58.1034H13.2069V54.8966V51.6897V48.4828H16.4138V45.2759H13.2069V42.069H16.4138H19.6207V45.2759H22.8276V42.069H26.0345H29.2414H32.4483V45.2759V48.4828H35.6552H38.8621V51.6897H42.069V48.4828V45.2759H45.2759V42.069H42.069V38.8621H45.2759V35.6552H48.4828V32.4483H51.6897V35.6552V38.8621V42.069H54.8966H58.1034H61.3103V38.8621H58.1034V35.6552H61.3103V32.4483H64.5172V29.2414H67.7241V32.4483H70.931V35.6552H74.1379H77.3448V38.8621H80.5517H83.7586H86.9655H90.1724V35.6552H86.9655H83.7586H80.5517H77.3448V32.4483V29.2414V26.0345H74.1379V22.8276H70.931V19.6207H74.1379V16.4138H77.3448V13.2069H74.1379V16.4138H70.931V13.2069V10ZM70.931 26.0345V22.8276H67.7241V19.6207H64.5172V16.4138H61.3103H58.1034H54.8966V19.6207H58.1034H61.3103V22.8276H64.5172H67.7241V26.0345H70.931ZM70.931 26.0345V29.2414V32.4483H74.1379V29.2414V26.0345H70.931ZM64.5172 29.2414V26.0345H61.3103H58.1034V29.2414V32.4483H61.3103V29.2414H64.5172ZM51.6897 29.2414H54.8966V32.4483H51.6897V29.2414ZM51.6897 29.2414V26.0345H48.4828V22.8276H51.6897V19.6207H48.4828H45.2759V16.4138H48.4828V13.2069H45.2759H42.069H38.8621V16.4138H42.069V19.6207V22.8276H45.2759V26.0345V29.2414V32.4483H48.4828V29.2414H51.6897ZM42.069 42.069H38.8621V45.2759H42.069V42.069ZM22.8276 90.1724H19.6207H16.4138V86.9655V83.7586H13.2069V80.5517V77.3448H16.4138V80.5517H19.6207V77.3448H16.4138V74.1379V70.931H19.6207H22.8276H26.0345V74.1379H22.8276V77.3448V80.5517V83.7586H19.6207V86.9655H22.8276V90.1724ZM80.5517 61.3103V64.5172H77.3448V61.3103H80.5517ZM86.9655 58.1034V61.3103H83.7586H80.5517V58.1034H83.7586H86.9655ZM86.9655 58.1034V54.8966H90.1724V58.1034H86.9655ZM80.5517 51.6897V54.8966H83.7586V51.6897H80.5517ZM96.5862 45.2759H99.7931V48.4828H96.5862V45.2759ZM93.3793 45.2759V42.069H96.5862V45.2759H93.3793ZM93.3793 45.2759V48.4828V51.6897H90.1724V48.4828V45.2759H93.3793ZM96.5862 58.1034V54.8966H93.3793V58.1034H96.5862ZM77.3448 77.3448V74.1379H74.1379V77.3448H77.3448ZM45.2759 83.7586V86.9655H42.069V83.7586H45.2759ZM32.4483 96.5862H29.2414H26.0345V99.7931H22.8276V96.5862V93.3793V90.1724H26.0345V93.3793H29.2414V90.1724H32.4483H35.6552H38.8621H42.069H45.2759V93.3793H42.069H38.8621H35.6552H32.4483V96.5862ZM51.6897 90.1724V93.3793V96.5862H54.8966V93.3793V90.1724H51.6897ZM32.4483 96.5862V99.7931H35.6552V96.5862H32.4483ZM42.069 38.8621H38.8621V35.6552H42.069V38.8621ZM38.8621 32.4483V29.2414H42.069V32.4483H38.8621ZM64.5172 38.8621V42.069H67.7241V38.8621V35.6552H64.5172V38.8621ZM32.4483 10H29.2414H26.0345H22.8276H19.6207H16.4138H13.2069H10V13.2069V16.4138V19.6207V22.8276V26.0345V29.2414V32.4483H13.2069H16.4138H19.6207H22.8276H26.0345H29.2414H32.4483V29.2414V26.0345V22.8276V19.6207V16.4138V13.2069V10ZM26.0345 13.2069H29.2414V16.4138V19.6207V22.8276V26.0345V29.2414H26.0345H22.8276H19.6207H16.4138H13.2069V26.0345V22.8276V19.6207V16.4138V13.2069H16.4138H19.6207H22.8276H26.0345ZM96.5862 16.4138H93.3793H90.1724H86.9655V19.6207V22.8276V26.0345H90.1724H93.3793H96.5862V22.8276V19.6207V16.4138ZM26.0345 16.4138H22.8276H19.6207H16.4138V19.6207V22.8276V26.0345H19.6207H22.8276H26.0345V22.8276V19.6207V16.4138ZM83.7586 42.069H80.5517V45.2759H83.7586V42.069ZM74.1379 42.069H70.931V45.2759H74.1379V42.069ZM29.2414 45.2759H26.0345V48.4828V51.6897H22.8276V48.4828H19.6207V51.6897H16.4138V54.8966H19.6207V51.6897H22.8276V54.8966V58.1034H19.6207V61.3103H22.8276V58.1034H26.0345V61.3103H29.2414V58.1034H32.4483H35.6552V61.3103H32.4483V64.5172V67.7241H35.6552V70.931H38.8621V67.7241V64.5172H35.6552V61.3103H38.8621V58.1034V54.8966H35.6552H32.4483V51.6897H29.2414V48.4828V45.2759ZM29.2414 51.6897V54.8966V58.1034H26.0345V54.8966V51.6897H29.2414ZM96.5862 70.931H93.3793V74.1379H96.5862V77.3448H99.7931H103V74.1379H99.7931H96.5862V70.931ZM32.4483 77.3448H35.6552V80.5517V83.7586V86.9655H32.4483H29.2414H26.0345V83.7586V80.5517V77.3448H29.2414H32.4483ZM70.931 80.5517H74.1379V83.7586H70.931V80.5517ZM103 80.5517H99.7931H96.5862H93.3793H90.1724H86.9655H83.7586H80.5517V83.7586V86.9655V90.1724V93.3793V96.5862V99.7931V103H83.7586H86.9655H90.1724H93.3793H96.5862H99.7931H103V99.7931V96.5862V93.3793V90.1724V86.9655V83.7586V80.5517ZM96.5862 83.7586H99.7931V86.9655V90.1724V93.3793V96.5862V99.7931H96.5862H93.3793H90.1724H86.9655H83.7586V96.5862V93.3793V90.1724V86.9655V83.7586H86.9655H90.1724H93.3793H96.5862ZM32.4483 80.5517H29.2414V83.7586H32.4483V80.5517ZM96.5862 86.9655H93.3793H90.1724H86.9655V90.1724V93.3793V96.5862H90.1724H93.3793H96.5862V93.3793V90.1724V86.9655ZM64.5172 90.1724H61.3103V93.3793V96.5862V99.7931V103H64.5172V99.7931V96.5862V93.3793V90.1724Z" fill="#1C1B22"/>
		- -<path d="M66.2056 52.7475C65.7266 51.5785 64.7572 50.3139 63.9959 49.9148C64.6155 51.1492 64.9742 52.3872 65.1112 53.3113C65.1112 53.3113 65.1112 53.3177 65.1112 53.3299C63.8657 50.1757 61.7537 48.9037 60.0292 46.1343C59.9419 45.994 59.8551 45.8537 59.7678 45.7055C59.7192 45.621 59.6805 45.546 59.6465 45.4738C59.575 45.3332 59.5199 45.1847 59.4823 45.0312C59.4825 45.0239 59.48 45.0169 59.4754 45.0114C59.4707 45.0059 59.4643 45.0023 59.4572 45.0014C59.4503 44.9995 59.4431 44.9995 59.4363 45.0014L59.431 45.0046C59.4283 45.0057 59.4256 45.0071 59.4232 45.0088L59.4274 45.0025C56.6608 46.6497 55.7222 49.6954 55.6359 51.2193C54.5305 51.2961 53.4736 51.7098 52.6032 52.4064C52.512 52.3282 52.4167 52.2551 52.3177 52.1875C52.0667 51.2949 52.0561 50.3502 52.2868 49.452C51.1553 49.9754 50.2753 50.8033 49.6358 51.5339H49.6379C49.2012 50.9722 49.2321 49.1183 49.2567 48.731C49.2514 48.7071 48.9309 48.9 48.8906 48.9292C48.5053 49.2088 48.145 49.5224 47.814 49.8665C47.4375 50.2545 47.0935 50.6738 46.7855 51.12C46.0764 52.1399 45.5731 53.2924 45.3047 54.5111C45.2994 54.535 45.2947 54.5605 45.29 54.5849C45.2691 54.6832 45.1943 55.1763 45.1813 55.2837C45.1813 55.2916 45.1813 55.2996 45.1813 55.3081C45.0847 55.8177 45.0249 56.3338 45.0024 56.8522C45.0024 56.8714 45.0024 56.89 45.0024 56.9091C45.0024 63.0898 49.9338 68.1 56.0166 68.1C61.464 68.1 65.9876 64.0813 66.8728 58.8012C66.8916 58.6583 66.9063 58.5143 66.9251 58.3698C67.139 56.4516 66.8932 54.434 66.2056 52.7475ZM53.5109 61.5074C53.5632 61.5324 53.6108 61.5606 53.6636 61.5834L53.6709 61.5882C53.6176 61.5622 53.5642 61.5351 53.5109 61.5074ZM65.1154 53.3331V53.3219C65.1151 53.326 65.1151 53.3301 65.1154 53.3341V53.3331Z" fill="url(#paint0_linear_1186_7637)"/>
		- -<path d="M66.2063 52.7477C65.7273 51.5787 64.7579 50.3141 63.9966 49.915C64.6162 51.1494 64.9749 52.3874 65.1119 53.3115C65.1119 53.3088 65.1119 53.3115 65.1119 53.3221C65.1116 53.3262 65.1116 53.3302 65.1119 53.3343C66.1509 56.1973 65.5825 59.108 64.7689 60.887C63.5066 63.6394 60.4509 66.4604 55.6706 66.3228C50.5029 66.174 45.9506 62.2776 45.1009 57.1744C44.9441 56.3699 45.1009 55.9608 45.1788 55.3078C45.0837 55.8115 45.0476 55.9571 45 56.8519C45 56.871 45 56.8896 45 56.9087C45 63.0895 49.9314 68.0996 56.0141 68.0996C61.4616 68.0996 65.9851 64.081 66.8704 58.8009C66.8892 58.658 66.9038 58.514 66.9227 58.3694C67.1397 56.4518 66.8939 54.4342 66.2063 52.7477Z" fill="url(#paint1_radial_1186_7637)"/>
		- -<path d="M66.2063 52.7477C65.7273 51.5787 64.7579 50.3141 63.9966 49.915C64.6162 51.1494 64.9749 52.3874 65.1119 53.3115C65.1119 53.3088 65.1119 53.3115 65.1119 53.3221C65.1116 53.3262 65.1116 53.3302 65.1119 53.3343C66.1509 56.1973 65.5825 59.108 64.7689 60.887C63.5066 63.6394 60.4509 66.4604 55.6706 66.3228C50.5029 66.174 45.9506 62.2776 45.1009 57.1744C44.9441 56.3699 45.1009 55.9608 45.1788 55.3078C45.0837 55.8115 45.0476 55.9571 45 56.8519C45 56.871 45 56.8896 45 56.9087C45 63.0895 49.9314 68.0996 56.0141 68.0996C61.4616 68.0996 65.9851 64.081 66.8704 58.8009C66.8892 58.658 66.9038 58.514 66.9227 58.3694C67.1397 56.4518 66.8939 54.4342 66.2063 52.7477Z" fill="url(#paint2_radial_1186_7637)"/>
		`- -<path d="M60.854 54.0624C60.878 54.0794 60.9 54.0964 60.9225 54.1155C60.6463 53.6162 60.3021 53.159 59.9002 52.7574C56.4763 49.2786 59.0024 45.2121 59.4296 45.0081L59.4338 45.0017C56.6672 46.6489 55.7286 49.6946 55.6423 51.2186C55.7704 51.2095 55.8986 51.1984 56.0293 51.1984C58.0926 51.1989 59.8913 52.3525 60.854 54.0624Z" fill="url(#paint3_radial_1186_7637)"/>`
		- -<path d="M56.0574 54.7568C56.0396 55.0352 55.0717 55.9954 54.7329 55.9954C51.6008 55.9954 51.0925 57.9205 51.0925 57.9205C51.2311 59.5422 52.3417 60.8769 53.6871 61.5836C53.7483 61.616 53.8105 61.6453 53.8727 61.674C53.9804 61.7223 54.0882 61.7675 54.1964 61.8084C54.6575 61.9743 55.1404 62.0688 55.6291 62.089C61.1195 62.3509 62.1825 55.4194 58.2206 53.4066C59.2355 53.227 60.2886 53.642 60.8763 54.0618C59.9137 52.3519 58.1155 51.1978 56.0506 51.1978C55.9198 51.1978 55.7891 51.2089 55.6636 51.2179C54.5582 51.2947 53.5013 51.7084 52.6309 52.405C52.7987 52.5495 52.988 52.7424 53.3875 53.1425C54.1357 53.8907 56.0532 54.6654 56.0574 54.7568Z" fill="url(#paint4_radial_1186_7637)"/>
		- -<path d="M56.0574 54.7568C56.0396 55.0352 55.0717 55.9954 54.7329 55.9954C51.6008 55.9954 51.0925 57.9205 51.0925 57.9205C51.2311 59.5422 52.3417 60.8769 53.6871 61.5836C53.7483 61.616 53.8105 61.6453 53.8727 61.674C53.9804 61.7223 54.0882 61.7675 54.1964 61.8084C54.6575 61.9743 55.1404 62.0688 55.6291 62.089C61.1195 62.3509 62.1825 55.4194 58.2206 53.4066C59.2355 53.227 60.2886 53.642 60.8763 54.0618C59.9137 52.3519 58.1155 51.1978 56.0506 51.1978C55.9198 51.1978 55.7891 51.2089 55.6636 51.2179C54.5582 51.2947 53.5013 51.7084 52.6309 52.405C52.7987 52.5495 52.988 52.7424 53.3875 53.1425C54.1357 53.8907 56.0532 54.6654 56.0574 54.7568Z" fill="url(#paint5_radial_1186_7637)"/>
		`- -<path d="M52.0962 52.0338C52.1856 52.0927 52.2594 52.14 52.3247 52.1873C52.0738 51.2947 52.0631 50.3501 52.2939 49.4519C51.1623 49.9753 50.2823 50.8031 49.6428 51.5338C49.6951 51.5353 51.2925 51.5029 52.0962 52.0338Z" fill="url(#paint6_radial_1186_7637)"/>`
		- -<path d="M45.1022 57.1743C45.9519 62.2753 50.5041 66.1738 55.6719 66.3226C60.4547 66.4602 63.5105 63.6393 64.7701 60.8868C65.5858 59.1079 66.1521 56.1971 65.1132 53.3341V53.323C65.1132 53.315 65.1132 53.3097 65.1132 53.3124C65.1132 53.315 65.1132 53.3187 65.1132 53.331C65.5038 55.9234 64.2059 58.432 62.1777 60.1323L62.1714 60.1467C58.2189 63.4172 54.4368 62.1201 53.6708 61.5888C53.6185 61.5627 53.5662 61.5356 53.5108 61.508C51.2059 60.3884 50.2542 58.255 50.4581 56.4256C48.5125 56.4256 47.8489 54.7576 47.8489 54.7576C47.8489 54.7576 49.5959 53.492 51.8982 54.5929C54.031 55.6126 56.0337 54.7582 56.0337 54.7582C56.0295 54.6668 54.1126 53.8921 53.367 53.1439C52.9675 52.7443 52.7782 52.5515 52.6103 52.4069C52.5192 52.3287 52.4239 52.2557 52.3248 52.188C52.2595 52.1423 52.1858 52.0934 52.0963 52.0344C51.2932 51.5031 49.6958 51.5334 49.6429 51.5344H49.6388C49.2022 50.9728 49.233 49.1189 49.2576 48.7315C49.2524 48.7076 48.9318 48.9005 48.8916 48.9297C48.5062 49.2093 48.1459 49.523 47.8149 49.867C47.4384 50.2551 47.0944 50.6744 46.7864 51.1205C46.0774 52.1403 45.5741 53.2927 45.3056 54.5111C45.2988 54.5345 44.9092 56.2725 45.1022 57.1743Z" fill="url(#paint7_radial_1186_7637)"/>
		- -<path d="M59.9009 52.7576C60.3027 53.1586 60.6468 53.6151 60.9232 54.1136C60.9839 54.1599 61.0403 54.2061 61.0884 54.2507C63.5858 56.5887 62.2775 59.8958 62.1797 60.1312C64.208 58.4309 65.5058 55.9218 65.1152 53.3299C63.8697 50.1757 61.7577 48.9037 60.0332 46.1343C59.9459 45.994 59.8591 45.8537 59.7718 45.7055C59.7232 45.621 59.6845 45.546 59.6505 45.4738C59.579 45.3332 59.5239 45.1847 59.4863 45.0312C59.4865 45.0239 59.484 45.0169 59.4794 45.0114C59.4747 45.0059 59.4683 45.0023 59.4612 45.0014C59.4543 44.9995 59.4471 44.9995 59.4403 45.0014L59.4351 45.0046C59.4323 45.0057 59.4296 45.0071 59.4272 45.0088C59.0031 45.215 56.4771 49.2793 59.9009 52.7576Z" fill="url(#paint8_radial_1186_7637)"/>
		- -<path d="M61.0892 54.251C61.0411 54.2064 60.9846 54.1601 60.924 54.1139C60.9015 54.0964 60.8795 54.0794 60.8555 54.0608C60.2677 53.641 59.2146 53.2265 58.1997 53.4056C62.1616 55.4184 61.0981 62.3488 55.6083 62.0869C55.1194 62.067 54.6362 61.9724 54.175 61.8063C54.0673 61.7654 53.9596 61.7203 53.8519 61.6719C53.7897 61.6432 53.7274 61.614 53.6663 61.5816L53.6736 61.5864C54.4396 62.1177 58.2227 63.4148 62.1742 60.1443L62.1805 60.1299C62.2756 59.8961 63.5839 56.589 61.0892 54.251Z" fill="url(#paint9_radial_1186_7637)"/>
		`- -<path d="M51.07 57.9207C51.07 57.9207 51.5783 55.9956 54.7104 55.9956C55.0492 55.9956 56.0176 55.036 56.0349 54.7576C56.0349 54.7576 54.0322 55.612 51.8994 54.5923C49.5986 53.4913 47.8501 54.757 47.8501 54.757C47.8501 54.757 48.5136 56.425 50.4593 56.425C50.2554 58.2544 51.207 60.3878 53.5119 61.5074C53.5642 61.5324 53.6118 61.5605 53.6646 61.5834C52.3192 60.8772 51.2076 59.5419 51.07 57.9207Z" fill="url(#paint10_radial_1186_7637)"/>`
		- -<path d="M66.2057 52.7475C65.7268 51.5785 64.7573 50.3139 63.996 49.9148C64.6156 51.1492 64.9743 52.3872 65.1113 53.3113C65.1113 53.3113 65.1113 53.3177 65.1113 53.3299C63.8658 50.1757 61.7539 48.9037 60.0294 46.1343C59.942 45.994 59.8552 45.8537 59.7679 45.7055C59.7193 45.621 59.6806 45.546 59.6466 45.4738C59.5751 45.3332 59.52 45.1847 59.4824 45.0312C59.4826 45.0239 59.4802 45.0169 59.4755 45.0114C59.4709 45.0059 59.4644 45.0023 59.4573 45.0014C59.4505 44.9995 59.4433 44.9995 59.4364 45.0014L59.4312 45.0046C59.4284 45.0057 59.4258 45.0071 59.4233 45.0088L59.4275 45.0025C56.6609 46.6497 55.7223 49.6954 55.6361 51.2193C55.7642 51.2103 55.8923 51.1991 56.023 51.1991C58.0874 51.1991 59.8861 52.3527 60.8487 54.0626C60.261 53.6428 59.2079 53.2284 58.193 53.4074C62.1549 55.4202 61.0914 62.3507 55.6015 62.0887C55.1126 62.0688 54.6295 61.9743 54.1683 61.8082C54.0606 61.7673 53.9529 61.7221 53.8452 61.6738C53.7829 61.6451 53.7207 61.6158 53.6595 61.5834L53.6669 61.5882C53.6146 61.5622 53.5623 61.5351 53.5069 61.5074C53.5591 61.5324 53.6067 61.5606 53.6595 61.5834C52.3141 60.8772 51.202 59.542 51.065 57.9208C51.065 57.9208 51.5732 55.9957 54.7053 55.9957C55.0441 55.9957 56.0125 55.0361 56.0298 54.7576C56.0256 54.6662 54.1087 53.8915 53.3631 53.1434C52.9636 52.7438 52.7743 52.5509 52.6064 52.4064C52.5153 52.3282 52.42 52.2551 52.3209 52.1875C52.07 51.2949 52.0593 50.3502 52.2901 49.452C51.1586 49.9754 50.2785 50.8033 49.639 51.5339H49.638C49.2014 50.9722 49.2322 49.1183 49.2568 48.731C49.2516 48.7071 48.931 48.9 48.8908 48.9292C48.5054 49.2088 48.1451 49.5224 47.8142 49.8665C47.4376 50.2545 47.0936 50.6738 46.7856 51.12C46.0766 52.1399 45.5733 53.2924 45.3048 54.5111C45.2996 54.535 45.2949 54.5605 45.2902 54.5849C45.2693 54.6832 45.1762 55.1832 45.1631 55.2906C45.078 55.8073 45.0237 56.3288 45.0005 56.8522C45.0005 56.8714 45.0005 56.89 45.0005 56.9091C45.0005 63.0898 49.9319 68.1 56.0146 68.1C61.4621 68.1 65.9856 64.0813 66.8709 58.8012C66.8897 58.6583 66.9043 58.5143 66.9231 58.3698C67.1391 56.4516 66.8933 54.434 66.2057 52.7475ZM65.1155 53.3219C65.1153 53.326 65.1153 53.3301 65.1155 53.3341V53.3219Z" fill="url(#paint11_linear_1186_7637)"/>
		`- -<defs>`
		`- -<linearGradient id="paint0_linear_1186_7637" x1="65.8887" y1="50.9308" x2="46.6588" y2="62.8511" gradientUnits="userSpaceOnUse">`
		`- -<stop stop-color="#9658F9"/>`
		`- -<stop offset="0.13" stop-color="#9356F4"/>`
		`- -<stop offset="0.29" stop-color="#8951E5"/>`
		`- -<stop offset="0.46" stop-color="#7A49CD"/>`
		`- -<stop offset="0.64" stop-color="#643DAB"/>`
		`- -<stop offset="0.82" stop-color="#492E81"/>`
		`- -<stop offset="1" stop-color="#291D4F"/>`
		`- -</linearGradient>`
		`- -<radialGradient id="paint1_radial_1186_7637" cx="0" cy="0" r="1" gradientUnits="userSpaceOnUse" gradientTransform="translate(63.1519 48.6778) rotate(112.511) scale(23.2839 24.3126)">`
		`- -<stop stop-color="#9658F9"/>`
		`- -<stop offset="0.65" stop-color="#291D4F"/>`
		`- -</radialGradient>`
		`- -<radialGradient id="paint2_radial_1186_7637" cx="0" cy="0" r="1" gradientUnits="userSpaceOnUse" gradientTransform="translate(57.8824 59.334) scale(22.9415 23.3129)">`
		`- -<stop offset="0.25" stop-color="#AB71FF" stop-opacity="0"/>`
		`- -<stop offset="0.42" stop-color="#9462E0" stop-opacity="0.18"/>`
		`- -<stop offset="0.73" stop-color="#573B8D" stop-opacity="0.65"/>`
		`- -<stop offset="0.94" stop-color="#291D4F"/>`
		`- -</radialGradient>`
		`- -<radialGradient id="paint3_radial_1186_7637" cx="0" cy="0" r="1" gradientUnits="userSpaceOnUse" gradientTransform="translate(60.6484 44.5148) scale(16.5843 16.8528)">`
		`- -<stop offset="0.18" stop-color="#9658F9"/>`
		`- -<stop offset="0.33" stop-color="#7E48EA"/>`
		`- -<stop offset="0.37" stop-color="#7542E5"/>`
		`- -<stop offset="0.41" stop-color="#6A3DD0"/>`
		`- -<stop offset="0.48" stop-color="#5332A2"/>`
		`- -<stop offset="0.56" stop-color="#41297E"/>`
		`- -<stop offset="0.63" stop-color="#342264"/>`
		`- -<stop offset="0.69" stop-color="#2C1E54"/>`
		`- -<stop offset="0.74" stop-color="#291D4F"/>`
		`- -</radialGradient>`
		`- -<radialGradient id="paint4_radial_1186_7637" cx="0" cy="0" r="1" gradientUnits="userSpaceOnUse" gradientTransform="translate(52.8479 62.089) scale(10.9331 11.1101)">`
		`- -<stop offset="0.07" stop-color="#9358FC"/>`
		`- -<stop offset="0.13" stop-color="#9857F8"/>`
		`- -<stop offset="0.21" stop-color="#A755EB"/>`
		`- -<stop offset="0.3" stop-color="#BF52D7"/>`
		`- -<stop offset="0.39" stop-color="#E14EBA"/>`
		`- -<stop offset="0.42" stop-color="#EF4CAF"/>`
		`- -<stop offset="0.74" stop-color="#FF7583"/>`
		`- -<stop offset="0.97" stop-color="#FFB753"/>`
		`- -</radialGradient>`
		`- -<radialGradient id="paint5_radial_1186_7637" cx="0" cy="0" r="1" gradientUnits="userSpaceOnUse" gradientTransform="translate(55.4787 54.1254) rotate(-14.1133) scale(5.79733 6.90775)">`
		`- -<stop offset="0.22" stop-color="#FFB653" stop-opacity="0.3"/>`
		`- -<stop offset="0.34" stop-color="#FF807A" stop-opacity="0.5"/>`
		`- -<stop offset="0.44" stop-color="#FF7781" stop-opacity="0.48"/>`
		`- -<stop offset="0.57" stop-color="#FF5C94" stop-opacity="0.43"/>`
		`- -<stop offset="0.64" stop-color="#FF4AA2" stop-opacity="0.4"/>`
		`- -<stop offset="0.86" stop-color="#9658F9" stop-opacity="0.3"/>`
		`- -</radialGradient>`
		`- -<radialGradient id="paint6_radial_1186_7637" cx="0" cy="0" r="1" gradientUnits="userSpaceOnUse" gradientTransform="translate(57.5929 48.8515) scale(7.85915 7.9864)">`
		`- -<stop offset="0.03" stop-color="#9658F9"/>`
		`- -<stop offset="0.62" stop-color="#7542E5"/>`
		`- -<stop offset="0.72" stop-color="#6339C2"/>`
		`- -<stop offset="0.93" stop-color="#37246B"/>`
		`- -<stop offset="1" stop-color="#291D4F"/>`
		`- -</radialGradient>`
		`- -<radialGradient id="paint7_radial_1186_7637" cx="0" cy="0" r="1" gradientUnits="userSpaceOnUse" gradientTransform="translate(58.8404 39.1507) rotate(102.662) scale(32.7229 25.3152)">`
		`- -<stop offset="0.2" stop-color="#AB71FF"/>`
		`- -<stop offset="0.29" stop-color="#A46BFC"/>`
		`- -<stop offset="0.41" stop-color="#9059F2"/>`
		`- -<stop offset="0.54" stop-color="#7542E5"/>`
		`- -<stop offset="0.64" stop-color="#6239BF"/>`
		`- -<stop offset="0.94" stop-color="#291D4F"/>`
		`- -</radialGradient>`
		`- -<radialGradient id="paint8_radial_1186_7637" cx="0" cy="0" r="1" gradientUnits="userSpaceOnUse" gradientTransform="translate(59.5059 49.1947) rotate(84.0697) scale(24.9532 16.1464)">`
		`- -<stop offset="0.09" stop-color="#9658F9"/>`
		`- -<stop offset="0.14" stop-color="#8C51F3"/>`
		`- -<stop offset="0.26" stop-color="#7542E5"/>`
		`- -<stop offset="0.29" stop-color="#6E3ED6"/>`
		`- -<stop offset="0.4" stop-color="#5533A6"/>`
		`- -<stop offset="0.5" stop-color="#422980"/>`
		`- -<stop offset="0.59" stop-color="#342365"/>`
		`- -<stop offset="0.67" stop-color="#2C1E55"/>`
		`- -<stop offset="0.74" stop-color="#291D4F"/>`
		`- -</radialGradient>`
		`- -<radialGradient id="paint9_radial_1186_7637" cx="0" cy="0" r="1" gradientUnits="userSpaceOnUse" gradientTransform="translate(57.4076 51.8087) scale(20.9312 21.2702)">`
		`- -<stop stop-color="#9658F9"/>`
		`- -<stop offset="0.12" stop-color="#9155F6"/>`
		`- -<stop offset="0.25" stop-color="#834CEE"/>`
		`- -<stop offset="0.34" stop-color="#7542E5"/>`
		`- -<stop offset="0.78" stop-color="#291D4F"/>`
		`- -</radialGradient>`
		`- -<radialGradient id="paint10_radial_1186_7637" cx="0" cy="0" r="1" gradientUnits="userSpaceOnUse" gradientTransform="translate(62.9339 53.0525) scale(22.862 23.2321)">`
		`- -<stop offset="0.19" stop-color="#9658F9"/>`
		`- -<stop offset="0.49" stop-color="#834BED"/>`
		`- -<stop offset="0.66" stop-color="#7542E5"/>`
		`- -<stop offset="0.7" stop-color="#6B3DD2"/>`
		`- -<stop offset="0.79" stop-color="#52319F"/>`
		`- -<stop offset="0.91" stop-color="#291D4F"/>`
		`- -</radialGradient>`
		`- -<linearGradient id="paint11_linear_1186_7637" x1="64.5267" y1="48.4823" x2="48.7204" y2="64.0368" gradientUnits="userSpaceOnUse">`
		`- -<stop stop-color="#9059FF" stop-opacity="0.9"/>`
		`- -<stop offset="0.61" stop-color="#291D4F" stop-opacity="0"/>`
		`- -</linearGradient>`
		`- -</defs>`
		`- -</svg>`
		`- --`
		`- 2.36.0`
		`-`
		`- diff --git a/browser/app/permissions b/browser/app/permissions`
		`- index 991284081d..888cc811ce 100644`
		`- --- a/browser/app/permissions`
		`- +++ b/browser/app/permissions`
		`- @@ -15,11 +15,5 @@ origin uitour 1 https://support.mozilla.org`
		`- origin uitour 1 about:home`
		`- origin uitour 1 about:newtab`
		`-`
		`- -# XPInstall`
		`- -origin install 1 https://addons.mozilla.org`
		`- -`
		`- # Remote troubleshooting`
		`- origin remote-troubleshooting 1 https://support.mozilla.org`
		`- -`
		`- -# addon install`
		`- -origin install 1 https://fpn.firefox.com`
		`- diff --git a/browser/components/preferences/sync.inc.xhtml b/browser/components/preferences/sync.inc.xhtml`
		`- index 7d37d26..4ebbc06 100644`
		`- --- a/browser/components/preferences/sync.inc.xhtml`
		`- +++ b/browser/components/preferences/sync.inc.xhtml`
		`- @@ -35,22 +35,6 @@`
		`- </hbox>`
		`- </vbox>`
		`- </hbox>`
		`- - <label class="fxaMobilePromo" data-l10n-id="sync-mobile-promo">`
		`- - <html:img`
		`- - src="chrome://browser/skin/logo-android.svg"`
		`- - data-l10n-name="android-icon"`
		`- - class="androidIcon"/>`
		`- - <html:a`
		`- - data-l10n-name="android-link"`
		`- - class="fxaMobilePromo-android text-link" target="_blank"/>`
		`- - <html:img`
		`- - src="chrome://browser/skin/logo-ios.svg"`
		`- - data-l10n-name="ios-icon"`
		`- - class="iOSIcon"/>`
		`- - <html:a`
		`- - data-l10n-name="ios-link"`
		`- - class="fxaMobilePromo-ios text-link" target="_blank"/>`
		`- - </label>`
		`- </groupbox>`
		`-`
		`- <vbox id="hasFxaAccount">`
		`- diff --git a/browser/locales/en-US/browser/policies/policies-descriptions.ftl b/browser/locales/en-US/browser/policies/policies-descriptions.ftl`
		`- index dabfadc..3ce732e 100644`
		`- --- a/browser/locales/en-US/browser/policies/policies-descriptions.ftl`
		`- +++ b/browser/locales/en-US/browser/policies/policies-descriptions.ftl`
		`- @@ -96,7 +96,7 @@ policy-ExtensionSettings = Manage all aspects of extension installation.`
		`-`
		`- policy-ExtensionUpdate = Enable or disable automatic extension updates.`
		`-`
		`- -policy-FirefoxHome = Configure Firefox Home.`
		`- +policy-FirefoxHome = Configure Iceweasel Home.`
		`-`
		`- policy-FlashPlugin = Allow or deny usage of the Flash plugin.`
		`-`
		`- diff --git a/browser/locales/en-US/browser/preferences/preferences.ftl b/browser/locales/en-US/browser/preferences/preferences.ftl`
		`- index 1b29e8d..6f7566c 100644`
		`- --- a/browser/locales/en-US/browser/preferences/preferences.ftl`
		`- +++ b/browser/locales/en-US/browser/preferences/preferences.ftl`
		`- @@ -550,7 +550,7 @@ home-restore-defaults =`
		`- # "Firefox" should be treated as a brand and kept in English,`
		`- # while "Home" and "(Default)" can be localized.`
		`- home-mode-choice-default =`
		`- - .label = Firefox Home (Default)`
		`- + .label = Iceweasel Home (Default)`
		`-`
		`- home-mode-choice-custom =`
		`- .label = Custom URLs…`
		`- @@ -577,10 +577,10 @@ choose-bookmark =`
		`- .label = Use Bookmark…`
		`- .accesskey = B`
		`-`
		`- -## Home Section - Firefox Home Content Customization`
		`- +## Home Section - Iceweasel Home Content Customization`
		`-`
		`- -home-prefs-content-header = Firefox Home Content`
		`- -home-prefs-content-description = Choose what content you want on your Firefox Home screen.`
		`- +home-prefs-content-header = Iceweasel Home Content`
		`- +home-prefs-content-description = Choose what content you want on your Iceweasel Home screen.`
		`-`
		`- home-prefs-search-header =`
		`- .label = Web Search`
		`- @@ -714,16 +714,6 @@ sync-signedout-account-signin2 =`
		`- .label = Sign in to { -sync-brand-short-name }…`
		`- .accesskey = i`
		`-`
		`- -# This message contains two links and two icon images.`
		- -# `<img data-l10n-name="android-icon"/>` - Android logo icon
		- -# `<a data-l10n-name="android-link">` - Link to Android Download
		- -# `<img data-l10n-name="ios-icon">` - iOS logo icon
		- -# `<a data-l10n-name="ios-link">` - Link to iOS Download
		`- -#`
		`- -# They can be moved within the sentence as needed to adapt`
		`- -# to your language, but should not be changed or translated.`
		`- -sync-mobile-promo = Download Firefox for <img data-l10n-name="android-icon"/> <a data-l10n-name="android-link">Android</a> or <img data-l10n-name="ios-icon"/> <a data-l10n-name="ios-link">iOS</a> to sync with your mobile device.`
		`- -`
		`- ## Firefox Account - Signed in`
		`-`
		`- sync-profile-picture =`
		`- diff --git a/toolkit/locales/en-US/toolkit/about/aboutAddons.ftl b/toolkit/locales/en-US/toolkit/about/aboutAddons.ftl`
		`- index edd871b..77870fe 100644`
		`- --- a/toolkit/locales/en-US/toolkit/about/aboutAddons.ftl`
		`- +++ b/toolkit/locales/en-US/toolkit/about/aboutAddons.ftl`
		`- @@ -7,7 +7,7 @@ addons-window =`
		`- addons-page-title = Add-ons Manager`
		`-`
		`- search-header =`
		`- - .placeholder = Search addons.mozilla.org`
		`- + .placeholder = Search www.parabola.nu/packages`
		`- .searchbuttonlabel = Search`
		`-`
		`- search-header-shortcut =`
		`- @@ -482,7 +482,7 @@ theme-heading-search-label = Find more themes`
		`-`
		`- default-heading-search-label = Find more add-ons`
		`- addons-heading-search-input =`
		`- - .placeholder = Search addons.mozilla.org`
		`- + .placeholder = Search www.parabola.nu/packages`
		`-`
		`- addon-page-options-button =`
		`- .title = Tools for all add-ons`
		`- diff --git a/browser/components/protections/content/protections.ftl b/browser/components/protections/content/protections.ftl`
		`- index 5ac8a7b08c..fec81698e3 100644`
		`- --- a/browser/components/protections/content/protections.ftl`
		`- +++ b/browser/components/protections/content/protections.ftl`
		`- @@ -18,7 +18,7 @@ get-vpn-link = Get { -mozilla-vpn-brand-name }`
		`-`
		`- vpn-title-subscribed = VPN: Subscribed`
		`- # Note This text is not being translated, and the <br> will need to be removed if or when it does get translated`
		`- -vpn-header-content-subscribed = Using the { -mozilla-vpn-brand-name } encrypts all your traffic and hides your location — on up to 5 devices. Get the most from your subscription — add it from <br> the <a data-l10n-name="vpn-google-playstore-link">Google Play Store</a> or <a data-l10n-name="vpn-app-store-link">Apple App Store</a>.`
		`- +vpn-header-content-subscribed = Using the { -mozilla-vpn-brand-name } encrypts all your traffic and hides your location — on up to 5 devices.`
		`-`
		`- vpn-banner-header = Protection that extends beyond the browser`
		`- # Note This text is not being translated, and the <br> will need to be removed if or when it does get translated`
		`- diff --git a/browser/components/protections/content/protections.html b/browser/components/protections/content/protections.html`
		`- index e33c814f62..5698f2b3e9 100644`
		`- --- a/browser/components/protections/content/protections.html`
		`- +++ b/browser/components/protections/content/protections.html`
		`- @@ -303,8 +303,6 @@`
		`- </div>`
		`- <p class="content" data-l10n-id="vpn-header-content"></p>`
		`- <p class="content subscribed" data-l10n-id="vpn-header-content-subscribed">`
		`- - <a target="_blank" id="vpn-google-playstore-link" data-l10n-name="vpn-google-playstore-link"></a>`
		`- - <a target="_blank" id="vpn-app-store-link" data-l10n-name="vpn-app-store-link"></a>`
		`- </p>`
		`- </div>`
		`- <a target="_blank" id="get-vpn-link" data-l10n-id="get-vpn-link"></a>`
		`- diff --git a/browser/components/protections/content/vpn-card.js b/browser/components/protections/content/vpn-card.js`
		`- index 2417f1a641..698c48ccc3 100644`
		`- --- a/browser/components/protections/content/vpn-card.js`
		`- +++ b/browser/components/protections/content/vpn-card.js`
		`- @@ -23,22 +23,6 @@ export default class VPNCard {`
		`- vpnLink.addEventListener("click", () => {`
		`- this.doc.sendTelemetryEvent("click", "vpn_card_link");`
		`- });`
		`- - let androidVPNAppLink = document.getElementById(`
		`- - "vpn-google-playstore-link"`
		`- - );`
		`- - androidVPNAppLink.href = RPMGetStringPref(`
		`- - "browser.contentblocking.report.vpn-android.url"`
		`- - );`
		`- - androidVPNAppLink.addEventListener("click", () => {`
		`- - document.sendTelemetryEvent("click", "vpn_app_link_android");`
		`- - });`
		`- - let iosVPNAppLink = document.getElementById("vpn-app-store-link");`
		`- - iosVPNAppLink.href = RPMGetStringPref(`
		`- - "browser.contentblocking.report.vpn-ios.url"`
		`- - );`
		`- - iosVPNAppLink.addEventListener("click", () => {`
		`- - document.sendTelemetryEvent("click", "vpn_app_link_ios");`
		`- - });`
		`-`
		`- const vpnBanner = this.doc.querySelector(".vpn-banner");`
		`- const exitIcon = vpnBanner.querySelector(".exit-icon");`

libre/icecat/PKGBUILD

file modified

+297 -163

		`@@ -1,31 +1,53 @@`
		`- # Maintainer (arch): Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>`
		`+ # Maintainer (arch): Jan Alexander Steffens (heftig) <heftig@archlinux.org>`
		`# Contributor: Ionut Biru <ibiru@archlinux.org>`
		`# Contributor: Jakub Schmidtke <sjakub@gmail.com>`
		`- # Contributor: Figue <ffigue at gmail>`
		`+ # Contributor: Henry Jensen <hjensen@connochaetos.org>`
		`+ # Maintainer (archarm): Kevin Mihelich <kevin@archlinuxarm.org>`
		`+ # Maintainer (arch32): Andreas Baumann <mail@andreasbaumann.cc>`
		`+ # Contributor: Erich Eckner <git@eckner.net>`
		`+ # Contributor: Andreas Grapentin <andreas@grapentin.org>`
		`+ # Contributor: Luke Shumaker <lukeshu@parabola.nu>`
		`+ # Contributor: André Silva <emulatorman@hyperbola.info>`
		`+ # Contributor: Márcio Silva <coadde@hyperbola.info>`
		`# Contributor: fauno <fauno@kiwwwi.com.ar>`
		`+ # Contributor: vando <facundo@esdebian.org>`
		`+ # Contributor: Figue <ffigue at gmail>`
		`# Contributor: evr <evanroman at gmail>`
		`# Contributor: Muhammad 'MJ' Jassim <UnbreakableMJ@gmail.com>`
		`# Contributor: vando <facundo@esdebian.org>`
		`- # Contributor: André Silva <emulatorman@hyperbola.info>`
		`- # Contributor: Henry Jensen <hjensen@connochaetos.org>`
		`- # Contributor: Luke Shumaker <lukeshu@parabola.nu>`
		`- # Contributor: Márcio Silva <coadde@hyperbola.info>`
		`- # Maintainer: Andreas Grapentin <andreas@grapentin.org>`
		`+ # Contributor: taro-k <taro-k@movasense_com>`
		`+ # Contributor: Michał Masłowski <mtjm@mtjm.eu>`
		`+ # Contributor: Luke R. <g4jc@openmailbox.org>`
		`+ # Contributor: Isaac David <isacdaavid@isacdaavid.info>`
		`# Contributor: bill-auger <bill-auger@programmer.net>`
		`# Contributor: grizzlyuser <grizzlyuser@protonmail.com>`


		`+ # parabola changes and rationale`
		`+ # NOTE: This PKGBUILD is kept in-sync, as closely as possible,`
		`+ # with arch{,arm,32} (firefox), and parabola {iceweasel,icecat},`
		`+ # for the sake of documentation and cleaner diffs.`
		`+ # That also helps to identify which changes were made by Parabola vs upstream.`
		`+ # Therefore, this PKGBUILD may declare blacklisted dependencies, non-free sources,`
		`+ # or include code for anti-features; but those will be filtered-out subsequently.`
		`+ # Any code which implements an anti-feature should be commented-out;`
		`+ # and include an 'anti-feature' comment, for clarity.`
		`+ # Any blacklisted dependencies and non-free sources should be filtered,`
		`+ # and include a 'non-free' comment, for clarity.`
		`+ # Without those over-rides, the resulting program may not be FSDG-fit.`
		`+ # Do not circumvent those over-rides, if compiling for the Parabola repos.`
		`+`
		`# NOTE: icecat (60.7 < V <= current) are not complete upstream releases`
		`# upstream releases normally have $_upstream_ver ending in '-gnu<N>'`
		`# this build is based on gnuzilla VCS developement sources`
		`- # rev: 65a61287a5142a9403ec00d973cb5e5d658a3c71`
		`- # with parabola patches applied`
		`+ # rev: e77a1fa25ac66250e88d5d9901a2ba670edb94cc`
		`+ # with parabola patches applied (offered upstream)`
		`# https://git.parabola.nu/~bill-auger/icecat.git/log/?h=parabola`


		`pkgname=icecat`
		`- _upstream_ver=91.11.0-gnu1`
		`- _upstream_ver=${_upstream_ver/-gnu1/-pre1} # parabola pre-release`
		`+ _upstream_ver=102.2.0-gnu1`
		`+ _upstream_ver=${_upstream_ver/-gnu1/-gnu0-pre1} # parabola pre-release`
		`pkgver=${_upstream_ver//-/_}`
		`pkgrel=1`
		`pkgdesc="the GNU web browser, based on Mozilla Firefox ESR"`
		`@@ -34,10 +56,9 @@`
		`url=http://www.gnu.org/software/gnuzilla/`
		`depends=(gtk3 libxt mime-types dbus-glib ffmpeg nss ttf-font libpulse)`
		`makedepends=(unzip zip diffutils yasm mesa imake inetutils xorg-server-xvfb`
		`- autoconf2.13 rust clang llvm jack nodejs cbindgen nasm`
		`- python-setuptools python-psutil python-zstandard lld dump_syms)`
		`- makedepends+=(jq python-jsonschema)`
		`- makedepends_i686=(gcc10)`
		`+ autoconf2.13 rust clang llvm jack nodejs cbindgen nasm python`
		`+ lld dump_syms wasi-compiler-rt wasi-libc wasi-libc++ wasi-libc++abi`
		`+ )`
		`optdepends=('networkmanager: Location detection via available WiFi networks'`
		`'libnotify: Notification integration'`
		`'pulseaudio: Audio support'`
		`@@ -47,35 +68,76 @@`
		`options=(!emptydirs !makeflags !strip !lto !debug)`
		`source=(https://repo.parabola.nu/other/${pkgname}/${pkgname}-${_upstream_ver}.tar.bz2{,.sig}`
		`icecat.desktop icecat-safe.desktop`
		`- 0001-Use-remoting-name-for-GDK-application-names.patch`
		`)`
		`- source_armv7h=(arm.patch`
		`- build-arm-libopus.patch)`
		`+ source+=(vendor.js.in`
		`+ arc4random.diff)`
		`+ source_armv7h=(build-arm-libopus.patch)`
		`source_i686=(avoid-libxul-OOM-python-check.patch`
		`- rust-static-disable-network-test-on-static-libraries.patch)`
		`- sha256sums=('f2a149d562b0b441f4df1e395d00a36717f56001acf7f05d40ebab0088069661'`
		`+ rust-static-disable-network-test-on-static-libraries.patch`
		`+ firefox-99.0.1-fdlibm-double.patch)`
		`+ sha256sums=('0a5edd6adcc3de32adfc9452d89e0144cfb9a7dceacef3202e716fb4d5a8fb9e'`
		`'SKIP'`
		`'e00dbf01803cdd36fd9e1c0c018c19bb6f97e43016ea87062e6134bdc172bc7d'`
		`'33dd309eeb99ec730c97ba844bf6ce6c7840f7d27da19c82389cdefee8c20208'`
		`- 'a7f5ae9f018678a391739365329a5a5b527b536bc9aac441c73ae811d2fa530d'`
		`)`
		`- sha256sums_armv7h=('bc00516032330760444939c516a60c78f868631e1b37f075f0fe71a53737b966'`
		`- '2d4d91f7e35d0860225084e37ec320ca6cae669f6c9c8fe7735cdbd542e3a7c9')`
		`+ sha256sums+=('e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855'`
		`+ '714ca50b2ce0cac470dbd5a60e9a0101b28072f08a5e7a9bba94fef2058321c4')`
		`+ sha256sums_armv7h=('2d4d91f7e35d0860225084e37ec320ca6cae669f6c9c8fe7735cdbd542e3a7c9')`
		`sha256sums_i686=('2f0c81a38c4578f68f5456b618fe84a78974072821488173eb55e0e72287e353'`
		`- '10c5276eab2e87f400a6ec15d7ffbef3b0407ee888dea36f1128927ca55b9041')`
		`+ '10c5276eab2e87f400a6ec15d7ffbef3b0407ee888dea36f1128927ca55b9041'`
		`+ '62695e56daf8c0b8bb921980d475b3fd169b9134188ad9ffaeb9cd660589c23d')`
		`validpgpkeys+=('3954A7AB837D0EA9CFA9798925DB7D9B5A8D4B40') # bill-auger (VCS builds)`


		`+ ## dependency tweaks ##`
		`+`
		`# disable PGO for 32-bit arches`
		`- _should_skip_pgo=0 # for x86_64`
		`- [[ "${CARCH}" != 'armv7h' && "${CARCH}" != 'i686' ]] \|\| _should_skip_pgo=1`
		`+ _should_skip_pgo=0 # for x86_64 (try '1' if the build hangs indefinitely)`
		`+`

		`+ makedepends+=( python-setuptools python-zstandard )`
		`+ makedepends+=( python-psutil )`
		`+ makedepends+=(jq python-jsonschema)`
		`+ makedepends+=( ${makedepends[*]/python-zstandard/python-zstandard=0.17.0} ) # \| zstandard<=0.17.0,>=0.11.1: Installed with unexpected version "0.18.0"`
		`+ makedepends+=( ${makedepends[*]/python-psutil/python-psutil=5.8.0} ) # \| psutil<=5.8.0,>=5.4.2: Installed with unexpected version "5.9.1"`
		`+`
		`+ case "${CARCH}" in`
		`+ armv7h)`
		`+ _should_skip_pgo=1`
		`+`
		`+ depends+=( icu=71.1 ) # ld.lld: error: undefined hidden symbol: std::type_info::operator==(std::type_info const&) const`
		`+`
		`+ makedepends=( ${makedepends[]/wasi/} ) # armv7h has no wasi compiler`
		`+ ;;`
		`+ i686)`
		`+ _should_skip_pgo=1`
		`+`
		`+ makedepends=( ${makedepends[*]/wasi-compiler-rt/wasi-compiler-rt=13.0.1-1.0} ) # dustbin`
		`+ makedepends=( ${makedepends[]/wasi-libc++/} )`
		`+ makedepends+=( wasi-libc++=13.0.1-1.0 wasi-libc++abi=13.0.1-1.0 ) # dustbin`
		`+ makedepends+=( llvm13 ) # rustup: error while loading shared libraries: libLLVM-13.so: cannot open shared object file: No such file or directory`
		`+ ;;`
		`+ esac`
		`+`
		`+`
		`+ ## helpers ##`

		`_check_build_config() {`
		`- pushd "${srcdir}"/${pkgname}-${pkgver%_*} > /dev/null`
		`+ pushd "${srcdir}"/${pkgname}-${pkgver%%_*} > /dev/null`

		`echo "Checking build configuration..."`

		`+ # Each of the [ARCH-SPECIFIC CONFIG] branches in prepare(), should have prepared a`
		`+ # $srcdir/mozconfig file with any arch-specific changes to the Arch x86_64 PKGBUILD.`
		`+ # Finally, that file should have been copied to $srcdir/firefox-$pkgver/.mozconfig`
		`+ grep '^ac_add_options --with-distribution-id=nu.parabola' .mozconfig &> /dev/null \|\| \`
		`+ ! echo "cannot continue without a .mozconfig file" \|\| return 1`
		`+`
		`+ if ! [[ "${CARCH}" =~ ^(aarch64\|armv7h)$ ]] # ARM has no --disable-eme option`
		`+ then grep '^ac_add_options --disable-eme' .mozconfig &> /dev/null \|\| \`
		`+ ! echo ".mozconfig file was not properly treated per the FSDG" \|\| return 1`
		`+ fi`
		`+`
		`# Configure produces mozinfo.json that reflects current configuration.`
		`# See build/docs/mozinfo.rst`
		`./mach configure`
		`@@ -87,32 +149,55 @@`
		`local obj_directory=$(./mach environment \| sed -En '/object directory:/{n;s/^\s+//;p;}')`
		`local antifeature_keys=(.crashreporter .datareporting .healthreport .normandy .telemetry .updater)`
		`local antifeatures=()`
		`-`
		`echo "obj_directory is: ${obj_directory}"`
		`for key in ${antifeature_keys[@]}`
		`- do jq -e "${key} != false" "${obj_directory}/mozinfo.json" &> /dev/null && antifeatures+=(${key})`
		`+ do if jq -e "${key} != false" "${obj_directory}"/mozinfo.json &> /dev/null`
		`+ then antifeatures+=(${key})`
		`+ fi`
		`done`
		`if (( ${#antifeatures[@]} ))`
		`then echo "Some anti-features are not disabled in build configuration files, aborting:"`
		`for key in ${antifeatures[@]} ; do echo " - ${key} is enabled" ; done ;`

		`- [[ -z "${ar[*]/.datareporting/}" ]] && return 0 # FIXME: .datareporting is detected`
		`-`
		`+ [[ -z "${antifeatures[*]/.datareporting/}" ]] && return 0 \|\| # FIXME: (icecat) .datareporting is detected`
		`return 1`
		`fi`

		`popd > /dev/null`
		`}`

		`+ _check_patching() {`
		`+ return 0 # let's assume that icecat is already FSDG-fit upstream`
		`+ }`
		`+`
		`+`
		`+ ## business ##`
		`+`
		`prepare() {`
		`- mkdir -p mozbuild`
		`- cd "$srcdir/$pkgname-${pkgver%_*}"`
		`+ mkdir mozbuild`
		`+ cd "$srcdir/$pkgname-${pkgver%%_*}"`

		`- # https://bugzilla.mozilla.org/show_bug.cgi?id=1530052`
		`- patch -Np1 -i ../0001-Use-remoting-name-for-GDK-application-names.patch`

		`- # # https://bugzilla.mozilla.org/show_bug.cgi?id=1667736`
		`- # patch -Np1 -i ../rust_1.48.patch`
		`+ ## technical patching ##`
		`+`
		`+ # FIXME: FTBS with cbindgen > 0.23 (currently 0.24)`
		`+ # https://bugzilla.mozilla.org/show_bug.cgi?id=1773259`
		`+ sed -i '/const uint64_t ROOT_CLIP_CHAIN = ~0;/d' gfx/webrender_bindings/webrender_ffi.h`
		`+`
		`+ case ${CARCH} in`
		`+ aarch64\|armv7h)`
		`+ ;;`
		`+ i686\|x86_64)`
		`+ # Unbreak build with glibc 2.36`
		`+ patch -Np1 -i ../arc4random.diff`
		`+ ;;`
		`+ esac`
		`+`
		`+`
		`+ ## general configuration ##`
		`+`
		`+ # echo -n "$_google_api_key" >google-api-key # anti-feature`
		`+ # echo -n "$_mozilla_api_key" >mozilla-api-key # anti-feature`

		`cat >../mozconfig <<END`
		`ac_add_options --enable-application=browser`
		`@@ -126,20 +211,27 @@`
		`ac_add_options --enable-linker=lld`
		`ac_add_options --disable-elf-hack`
		`ac_add_options --disable-bootstrap`
		`+ ac_add_options --with-wasi-sysroot=/usr/share/wasi-sysroot`

		`# Branding`
		`- ac_add_options --enable-official-branding`
		`+ ac_add_options --enable-official-branding # branding (icecat)`
		`ac_add_options --enable-update-channel=release`
		`- ac_add_options --with-distribution-id=nu.parabola`
		`- ac_add_options --with-app-name=${pkgname}`
		`- ac_add_options --with-app-basename=${pkgname}`
		`+ ac_add_options --with-distribution-id=nu.parabola # branding over-ride`
		`+ ac_add_options --with-app-name=${pkgname} # branding over-ride`
		`+ ac_add_options --with-app-basename=${pkgname} # branding over-ride`
		`ac_add_options --with-unsigned-addon-scopes=app,system`
		`ac_add_options --allow-addon-sideload`
		`+ # export MOZILLA_OFFICIAL=1 # branding (icecat)`
		`export MOZ_APP_NAME=$pkgname # TODO: probably do not need this (per --with-app-name=)`
		`export MOZ_APP_REMOTINGNAME=${pkgname}`
		`export MOZ_TELEMETRY_REPORTING=`
		`export MOZ_REQUIRE_SIGNING=`

		`+ # Keys`
		`+ # ac_add_options --with-google-location-service-api-keyfile=${PWD@Q}/google-api-key # anti-feature`
		`+ # ac_add_options --with-google-safebrowsing-api-keyfile=${PWD@Q}/google-api-key # anti-feature`
		`+ # ac_add_options --with-mozilla-api-keyfile=${PWD@Q}/mozilla-api-key # anti-feature`
		`+`
		`# System libraries`
		`ac_add_options --with-system-nspr`
		`ac_add_options --with-system-nss`
		`@@ -147,78 +239,111 @@`
		`# Features`
		`ac_add_options --enable-alsa`
		`ac_add_options --enable-jack`
		`- ac_add_options --disable-crashreporter`
		`+ ac_add_options --disable-crashreporter # anti-feature`
		`ac_add_options --disable-updater`
		`ac_add_options --disable-tests`
		`- ac_add_options --disable-eme`
		`+ ac_add_options --disable-eme # anti-feature`
		`END`


		`- # FIXME: FTBS with cbindgen > 0.23 (currently 0.24)`
		`- # https://bugzilla.mozilla.org/show_bug.cgi?id=1773259`
		`- sed -i '/const uint64_t ROOT_CLIP_CHAIN = ~0;/d' gfx/webrender_bindings/webrender_ffi.h`
		`-`
		`-`
		`## [ARCH-SPECIFIC CONFIG] ##`

		`case ${CARCH} in`
		`- armv7h)`
		`- sed -i '`
		`- /--enable-hardening/d`
		`- /--enable-optimize/d`
		`- /--enable-rust-simd/d`
		`- ' ../mozconfig`
		`-`
		`- cat >>../mozconfig <<END`
		`- export CC=clang`
		`- export CXX=clang++`
		`- ac_add_options --disable-webrtc`
		`- ac_add_options --disable-elf-hack`
		`+ aarch64\|armv7h)`
		`+ # version-specific hacks`
		`+ cat >> ../mozconfig <<EOF`
		`+ export CC=gcc`
		`+ export CXX=g++`
		`+ export AR=gcc-ar`
		`+ export NM=gcc-nm`
		`+ export RANLIB=gcc-ranlib`
		`+ EOF`
		`+ echo 'ac_add_options --with-system-icu' >> ../mozconfig # ld.lld: error: undefined hidden symbol: std::type_info::operator==(std::type_info const&) const`
		`+`
		`+ # archarm has these differences in ## general configuration ## above`
		`+ sed -i '`
		`+ /--enable-hardening/d`
		`+ /--enable-optimize/d`
		`+ /--enable-rust-simd/d`
		`+ s\| --with-wasi-sysroot=.*\| --without-wasm-sandboxed-libraries\|`
		`+ /--disable-eme/d`
		`+ ' ../mozconfig`
		`+`
		`+ if [[ $CARCH == "armv7h" ]]; then`
		`+ echo "ac_add_options --disable-elf-hack" >> .mozconfig`
		`+ # https://bugzilla.redhat.com/show_bug.cgi?id=1641623`
		`+ echo "ac_add_options --disable-av1" >> .mozconfig`
		`+ # reduce jobs due to RAM constraints`
		`+ MAKEFLAGS="-j4"`
		`+ # disable hard-coded LTO`
		`+ sed -i '/cargo_rustc_flags += -Clto/d' config/makefiles/rust.mk`
		`+ sed -i '/RUSTFLAGS += -Cembed-bitcode=yes/d' config/makefiles/rust.mk`
		`+ # increase codegen-units due to RAM constraints`
		`+ sed -i 's/codegen-units=1/codegen-units=16/' config/makefiles/rust.mk`
		`+ # webrtc on ARMv7 implies android, so disable it`
		`+ echo "ac_add_options --disable-webrtc" >> .mozconfig`
		`+ elif [[ $CARCH == "aarch64" ]]; then`
		`+ echo 'ac_add_options --enable-rust-simd' >> .mozconfig`
		`+ fi`
		`+ echo 'ac_add_options --enable-optimize="-g0 -O2"' >> .mozconfig`
		`+ echo "mk_add_options MOZ_MAKE_FLAGS=\"${MAKEFLAGS}\"" >> .mozconfig`

		`- # https://bugzilla.redhat.com/show_bug.cgi?id=1641623`
		`- ac_add_options --disable-av1`
		`- ac_add_options --enable-optimize="-g0 -O2"`
		`- mk_add_options MOZ_MAKE_FLAGS='-j2'`
		`- END`
		+ # archarm `export` commands are under the '[ARCH-SPECIFIC BUILD ENV]' section

		`- # mozbuild.configure.options.InvalidOptionError: --disable-eme is not available in this configuration`
		`- # EME is disabled anyway in the built package, but better check if it exists for ARM each new release.`
		`- sed -i 's\|ac_add_options --disable-eme\|\|' ../mozconfig`
		`+ patch -p1 -i ../build-arm-libopus.patch`

		`- echo "applying arm.patch"`
		`- patch -p1 -i ../arm.patch`
		`- echo "applying build-arm-libopus.patch"`
		`- patch -p1 -i ../build-arm-libopus.patch`
		`+ # At this point in the script, the arch, arch32, and parabola PKGBUILDs`
		`+ # have prepared a temporary ${srcdir}/mozconfig; but the archarm PKGBUILD`
		`+ # writes directly to the final firefox-$pkgver/.mozconfig.`
		`+ # We allowed .mozconfig to be written above, only to minimize the diff against archarm.`
		`+ # For consistency across arches, we move it to ${srcdir}/mozconfig now.`
		`+ # ${srcdir}/mozconfig will clobber firefox-$pkgver/.mozconfig later, in build().`
		`+ cat .mozconfig >> ../mozconfig`
		`;;`
		`- i686)`
		`- # disable LTO and use gcc toolchain (clang has issues on IA32)`
		`- # disable SIMD (SSE2 for i686)`
		`- export MOZ_SOURCE_CHANGESET="DEVEDITION_${pkgver//./_}_RELEASE"`
		`- cat >>../mozconfig <<END`
		`+ i686)`
		`+ export MOZ_SOURCE_CHANGESET="DEVEDITION_${pkgver//./_}_RELEASE"`
		`+`
		`+ # disable LTO as it has little benefit and uses too many resources`
		`+ # don't compile with clang, use gcc toolchain (clang has issues on IA32)`
		`+ # disable SIMD (SSE2 for i686)`
		`+ # set correct compiler and toochain tools`
		`+ cat >>../mozconfig <<END`
		`ac_add_options --disable-linker=lld`
		`ac_add_options --enable-linker=bfd`
		`ac_add_options --disable-lto`
		`ac_add_options --disable-rust-simd`
		`- export CC=gcc-10`
		`- export CXX=g++-10`
		`- export AR=gcc-ar-10`
		`- export NM=gcc-nm-10`
		`- export RANLIB=gcc-ranlib-10`
		`+ ac_add_options --enable-strip`
		`+ ac_add_options --disable-debug`
		`+ ac_add_options --disable-debug-symbols`
		`+ export CC=gcc`
		`+ export CXX=g++`
		`+ export AR=gcc-ar`
		`+ export NM=gcc-nm`
		`+ export RANLIB=gcc-ranlib`
		`export STRIP=strip`
		`END`

		`- # readelf: Error: Unable to seek to 0x801db328 for section headers`
		`- echo "applying avoid-libxul-OOM-python-check.patch"`
		`- patch -p1 -i ../avoid-libxul-OOM-python-check.patch`
		`-`
		`- # test failure in rust code (complaining about network functions) when PGO is used,`
		`- # see https://bugzilla.mozilla.org/show_bug.cgi?id=1565757`
		`- echo "applying rust-static-disable-network-test-on-static-libraries.patch"`
		`- patch -p1 -i ../rust-static-disable-network-test-on-static-libraries.patch`
		`+ # readelf: Error: Unable to seek to 0x801db328 for section headers`
		`+ echo "applying avoid-libxul-OOM-python-check.patch"`
		`+ patch -p1 -i ../avoid-libxul-OOM-python-check.patch`
		`+`
		`+ # test failure in rust code (complaining about network functions) when PGO is used,`
		`+ # see https://bugzilla.mozilla.org/show_bug.cgi?id=1565757`
		`+ echo "applying rust-static-disable-network-test-on-static-libraries.patch"`
		`+ patch -p1 -i ../rust-static-disable-network-test-on-static-libraries.patch`
		`+`
		`+ # FIXME: this patch is probably temporary - it comes from mozilla`
		`+ # https://bugzilla.mozilla.org/show_bug.cgi?id=1729459`
		`+ # /build/iceweasel/src/firefox-96.0.1/modules/fdlibm/src/math_private.h:34:21:`
		`+ # error: conflicting declaration ‘typedef __double_t double_t’`
		`+ # /usr/include/math.h:156:21: note: previous declaration as ‘typedef long double double_t’`
		`+ echo "applying firefox-99.0.1-fdlibm-double.patch"`
		`+ patch -p1 -i "$srcdir/firefox-99.0.1-fdlibm-double.patch"`
		`;;`
		`- x86_64)`
		`+ x86_64)`
		`+ sed -i '/--enable-rust-simd/d' ../mozconfig`
		`;;`
		`- *) echo "no [ARCH-SPECIFIC CONFIG] for arch: ${CARCH}" ; return 1 ;`
		`+ *) echo "no [ARCH-SPECIFIC CONFIG] for arch: ${CARCH}" ; return 1 ;`
		`;;`
		`esac`

		`@@ -231,54 +356,56 @@`
		`## libre patching ##`

		`# let's assume that icecat is already FSDG-fit upstream`
		`+`
		`+`
		`+ ## patching sanity checks ##`
		`+`
		`+ _check_patching`
		`}`

		`build() {`
		`- cd "$srcdir/$pkgname-${pkgver%_*}"`
		`+ cd "$srcdir/$pkgname-${pkgver%%_*}"`

		`## build env ##`

		`export MOZ_NOSPAM=1`
		`export MOZBUILD_STATE_PATH="$srcdir/mozbuild"`
		`- export MACH_USE_SYSTEM_PYTHON=1`
		`+ # export MOZ_ENABLE_FULL_SYMBOLS=1 # anti-feature`
		`+ export MACH_BUILD_PYTHON_NATIVE_PACKAGE_SOURCE=system # parabola policy`

		`# LTO needs more open files`
		`ulimit -n 4096`

		`- # clang-{9,10,11} -> error: unknown argument: '-fvar-tracking-assignments'`
		`- CFLAGS="${CFLAGS/-fvar-tracking-assignments/}"`
		`- CXXFLAGS="${CXXFLAGS/-fvar-tracking-assignments/}"`
		`-`

		`## [ARCH-SPECIFIC BUILD ENV] ##`

		`case ${CARCH} in`
		`- armv7h)`
		`- export MOZ_DEBUG_FLAGS=" "`
		`- export CFLAGS+=" -g0"`
		`- export CXXFLAGS+=" -g0"`
		`- export LDFLAGS+=" -Wl,--no-keep-memory"`
		`- export RUSTFLAGS="-Cdebuginfo=0"`
		`+ aarch64\|armv7h)`
		`+ export MOZ_DEBUG_FLAGS=" "`
		`+ export CFLAGS+=" -g0"`
		`+ export CXXFLAGS+=" -g0"`
		`+ export LDFLAGS+=" -Wl,--no-keep-memory"`
		`+ export RUSTFLAGS="-Cdebuginfo=0"`
		`;;`
		`- i686)`
		`- # -fno-plt with cross-LTO -> LLVM ERROR: Function Import: link error`
		`- CFLAGS="${CFLAGS/-fno-plt/}"`
		`- CXXFLAGS="${CXXFLAGS/-fno-plt/}"`
		`-`
		`- # disable LTO (clang has issues on IA32)`
		`- export RUSTFLAGS+=" -Cdebuginfo=0 -Clto=off"`
		`- export LDFLAGS+=" -Wl,--no-keep-memory -Wl,--reduce-memory-overheads"`
		`-`
		`- # libvpx has some hard-coded compiler flags for MMX, SSE, SSE2, use the correct one`
		`- # per CARCH (75.0 uses an intrisic _mm_empty now, which required the corresponding`
		`- # architecture flag to be preset - before it was merely embedding some assembly`
		`- # code with EMMS`
		`- export CFLAGS+=" -mmmx"`
		`- export CXXFLAGS+=" -mmmx"`
		`+ i686)`
		`+ # -fno-plt with cross-LTO -> LLVM ERROR: Function Import: link error`
		`+ CFLAGS="${CFLAGS/-fno-plt/}"`
		`+ CXXFLAGS="${CXXFLAGS/-fno-plt/}"`
		`+`
		`+ # try hard to tell ld and rust not to use too much memory (no lto, no debug info, etc.)`
		`+ export RUSTFLAGS+=" -Cdebuginfo=0 -Clto=off"`
		`+ export LDFLAGS+=" -Wl,--no-keep-memory -Wl,--reduce-memory-overheads"`
		`+`
		`+ # libvpx has some hard-coded compiler flags for MMX, SSE, SSE2, use the correct one`
		`+ # per CARCH (75.0 uses an intrisic _mm_empty now, which required the corresponding`
		`+ # architecture flag to be preset - before it was merely embedding some assembly`
		`+ # code with EMMS`
		`+ export CFLAGS+=" -mmmx"`
		`+ export CXXFLAGS+=" -mmmx"`
		`;;`
		`- x86_64)`
		`+ x86_64)`
		`;;`
		`- *) echo "no [ARCH-SPECIFIC BUILD ENV] for arch: ${CARCH}" ; return 1 ;`
		`+ *) echo "no [ARCH-SPECIFIC BUILD ENV] for arch: ${CARCH}" ; return 1 ;`
		`;;`
		`esac`
		`export CFLAGS`
		`@@ -288,16 +415,16 @@`
		`## [ARCH-SPECIFIC BUILD CONFIG] ##`

		`case ${CARCH} in`
		`- armv7h)`
		`+ aarch64\|armv7h)`
		`;;`
		`- i686)`
		`- # /usr/bin/ld.bfd: error: libxul.so(.debug_info) is too large (0x54c5369a bytes)`
		`- options=( ${options[*]/\!strip/} )`
		`+ i686)`
		`+ # /usr/bin/ld.bfd: error: libxul.so(.debug_info) is too large (0x54c5369a bytes)`
		`+ options=( ${options[*]/\!strip/} )`

		`- # avoid excessive debug symbols in rust leading to out-of-memory situations`
		`- sed -i "s/debug_info = '\''2'\''/debug_info = '\''0'\''/" build/moz.configure/toolchain.configure`
		`+ # avoid excessive debug symbols in rust leading to out-of-memory situations`
		`+ sed -i "s/debug_info = '\''2'\''/debug_info = '\''0'\''/" build/moz.configure/toolchain.configure`
		`;;`
		`- x86_64)`
		`+ x86_64)`
		`;;`
		`*) echo "no [ARCH-SPECIFIC BUILD CONFIG] for arch: ${CARCH}" ; return 1 ;`
		`;;`
		`@@ -308,8 +435,7 @@`

		`if (( $_should_skip_pgo ))`
		`then`
		`- # skipping "3-tier PGO" "instrumented browser", to avoid OOM problems;`
		`- # so we have the final .mozconfig now`
		`+ # skipping "3-tier PGO" "instrumented browser"; so the final .mozconfig is ready now`
		`cp ../mozconfig .mozconfig`
		`else`
		`# Do 3-tier PGO`
		`@@ -327,15 +453,11 @@`
		`xvfb-run -s "-screen 0 1920x1080x24 -nolisten local" \`
		`./mach python build/pgo/profileserver.py`

		`- if [[ ! -s merged.profdata ]]; then`
		`- echo "No profile data produced."`
		`- return 1`
		`- fi`
		`+ stat -c "Profile data found (%s bytes)" merged.profdata`
		`+ test -s merged.profdata`

		`- if [[ ! -s jarlog ]]; then`
		`- echo "No jar log produced."`
		`- return 1`
		`- fi`
		`+ stat -c "Jar log found (%s bytes)" jarlog`
		`+ test -s jarlog`

		`echo "Removing instrumented browser..."`
		`./mach clobber`
		`@@ -351,8 +473,6 @@`

		`## sanity checks ##`

		`- # each of the [ARCH-SPECIFIC BUILD CONFIG] branches above should have created .mozconfig`
		`- [[ -f .mozconfig ]] \|\| ! echo "cannot continue without a .mozconfig file" \|\| return 1`
		`_check_build_config`


		`@@ -360,10 +480,16 @@`

		`echo "Building optimized browser..."`
		`./mach build`
		`+`
		`+ # echo "Building symbol archive..." # anti-feature`
		`+ # ./mach buildsymbols # anti-feature`
		`}`

		`package() {`
		`- cd "$srcdir/$pkgname-${pkgver%_*}"`
		+ export MOZBUILD_STATE_PATH="$srcdir/mozbuild" # needed for `libremakepkg -R`
		+ export MACH_BUILD_PYTHON_NATIVE_PACKAGE_SOURCE=system # needed for `libremakepkg -R`
		`+`
		`+ cd "$srcdir/$pkgname-${pkgver%%_*}"`
		`DESTDIR="$pkgdir" ./mach install`

		`local vendorjs="$pkgdir/usr/lib/$pkgname/browser/defaults/preferences/vendor.js"`
		`@@ -381,17 +507,20 @@`
		`pref("extensions.autoDisableScopes", 11);`
		`END`

		`+ # Parabola additions to vendor.js`
		`+ cat "${srcdir}"/vendor.js.in >> "${vendorjs}"`
		`+`
		`local distini="$pkgdir/usr/lib/$pkgname/distribution/distribution.ini"`
		`install -Dvm644 /dev/stdin "$distini" <<END`
		`[Global]`
		`id=parabola`
		`- version=1.0`
		`- about=Icecat for Parabola GNU/Linux-libre`
		`- about.en-US=Icecat for Parabola GNU/Linux-libre`
		`- about.eo=Icecat por Parabola GNU/Linux-libre`
		`- about.es-ES=Icecat para Parabola GNU/Linux-libre`
		`- about.gl=Icecat para Parabola GNU/Linux-libre`
		`- about.pt-BR=Icecat para Parabola GNU/Linux-libre`
		`+ version=${_upstream_ver}`
		`+ about=${pkgname^} for Parabola GNU/Linux-libre`
		`+ about.en-US=${pkgname^} for Parabola GNU/Linux-libre`
		`+ about.eo=${pkgname^} por Parabola GNU/Linux-libre`
		`+ about.es-ES=${pkgname^} para Parabola GNU/Linux-libre`
		`+ about.gl=${pkgname^} para Parabola GNU/Linux-libre`
		`+ about.pt-BR=${pkgname^} para Parabola GNU/Linux-libre`

		`[Preferences]`
		`app.distributor=parabola`
		`@@ -415,10 +544,8 @@`
		`install -Dvm644 browser/branding/official/default48.png \`
		`"$pkgdir/usr/share/pixmaps/icecat.png"`

		`- install -Dvm644 "${srcdir}"/icecat.desktop \`
		`- "$pkgdir/usr/share/applications/icecat.desktop"`
		`- install -Dvm644 "${srcdir}"/icecat-safe.desktop \`
		`- "$pkgdir/usr/share/applications/icecat-safe.desktop"`
		`+ install -Dvm644 ../$pkgname.desktop \`
		`+ "$pkgdir/usr/share/applications/$pkgname.desktop"`

		`# Install a wrapper to avoid confusion about binary path`
		`install -Dvm755 /dev/stdin "$pkgdir/usr/bin/$pkgname" <<END`
		`@@ -430,19 +557,19 @@`
		`## [ARCH-SPECIFIC INSTALL] ##`

		`case ${CARCH} in`
		`- armv7h)`
		`+ aarch64\|armv7h)`
		`;;`
		`- i686)`
		`- # libxul.so cannot find it's libraries`
		`- install -dm 755 "${pkgdir}"/etc/ld.so.conf.d`
		`- echo "/usr/lib/${pkgname}" > "${pkgdir}"/etc/ld.so.conf.d/${pkgname}.conf`
		`-`
		`- # disable stripping in mozconfig.<arch> (insists to use llvm-strip which runs`
		`- # out of memory on libxul.so). Now 2.5 GB can be stripped to 166 MB, so we do`
		`- # that with the normal 'strip' from binutils after 'mach install'`
		`- strip "$pkgdir/usr/lib/$pkgname/libxul.so"`
		`+ i686)`
		`+ # libxul.so cannot find it's libraries`
		`+ install -dm 755 "${pkgdir}/etc/ld.so.conf.d"`
		`+ echo "/usr/lib/${pkgname}" > "${pkgdir}"/etc/ld.so.conf.d/${pkgname}.conf`
		`+`
		`+ # disable stripping in mozconfig.<arch> (insists to use llvm-strip which runs`
		`+ # out of memory on libxul.so). Now 2.5 GB can be stripped to 166 MB, so we do`
		`+ # that with the normal 'strip' from binutils after 'mach install'`
		`+ strip "$pkgdir/usr/lib/$pkgname/libxul.so"`
		`;;`
		`- x86_64)`
		`+ x86_64)`
		`;;`
		`*) echo "no [ARCH-SPECIFIC INSTALL] for arch: ${CARCH}" ; return 1 ;`
		`;;`
		`@@ -457,4 +584,11 @@`
		`if [[ -e $nssckbi ]]; then`
		`ln -srfv "$pkgdir/usr/lib/libnssckbi.so" "$nssckbi"`
		`fi`
		`+`
		`+ # export SOCORRO_SYMBOL_UPLOAD_TOKEN_FILE="$startdir/.crash-stats-api.token" # anti-feature`
		`+ # if [[ -f $SOCORRO_SYMBOL_UPLOAD_TOKEN_FILE ]]; then # anti-feature`
		`+ # make -C obj uploadsymbols # anti-feature`
		`+ # else # anti-feature`
		`+ # cp -fvt "$startdir" obj/dist/*crashreporter-symbols-full.tar.zst # anti-feature`
		`+ # fi`
		`}`

libre/icecat/vendor.js.in ~~libre/uboot-omap3_beagle/uEnv.txt~~

file renamed

file was moved with no change to the file

libre/icedove-extension-enigmail/PKGBUILD

file modified

+9 -9

		`@@ -1,12 +1,12 @@`
		`- # Maintainer (Arch): Eli Schwartz <eschwartz@archlinux.org>`
		`- # Maintainer (Arch): Jonas Witschel <diabonas@archlinux.org>`
		`- # Contributor (Arch): Daniel Landau <daniel.landau@iki.fi>`
		`- # Contributor (Arch): Einhard Leichtfuß <alguien@respiranto.de>`
		`- # Contributor (Arch): Xyne`
		`- # Contributor (Arch): David Manouchehri <d@32t.ca>`
		`- # Contributor (Arch): Alexander Fehr <pizzapunk gmail com>`
		`- # Contributor (Arch): Thomas Jost <schnouki schnouki net>`
		`- # Contributor (Arch): Hinrich Harms <arch hinrich de>`
		`+ # Maintainer (arch): Eli Schwartz <eschwartz@archlinux.org>`
		`+ # Maintainer (arch): Jonas Witschel <diabonas@archlinux.org>`
		`+ # Contributor: Daniel Landau <daniel.landau@iki.fi>`
		`+ # Contributor: Einhard Leichtfuß <alguien@respiranto.de>`
		`+ # Contributor: Xyne`
		`+ # Contributor: David Manouchehri <d@32t.ca>`
		`+ # Contributor: Alexander Fehr <pizzapunk gmail com>`
		`+ # Contributor: Thomas Jost <schnouki schnouki net>`
		`+ # Contributor: Hinrich Harms <arch hinrich de>`
		`# Maintainer: Omar Vega Ramos <ovruni@gnu.org.pe>`

libre/icedove-l10n/PKGBUILD

file modified

+4 -4

		`@@ -1,7 +1,7 @@`
		`# Maintainer (arch): Levente Polyak <anthraxx[at]archlinux[dot]org>`
		`# Maintainer (arch): Jan de Groot <jgc@archlinux.org>`
		`- # Contributor (arch): Andrea Scarpino <andrea@archlinux.org>`
		`- # Contributor (arch): Thomas Baechler <thomas@archlinux.org>`
		`+ # Contributor: Andrea Scarpino <andrea@archlinux.org>`
		`+ # Contributor: Thomas Baechler <thomas@archlinux.org>`
		`# Maintainer: Andreas Grapentin <andreas@grapentin.org>`
		`# Contributor: André Silva <emulatorman@hyperbola.info>`
		`# Contributor: Márcio Silva <coadde@hyperbola.info>`
		`@@ -42,8 +42,8 @@`
		`sha512sums.${CARCH})`

		`# load languages list and .xpi checksums`
		`- source languages.${CARCH} # sets $_languages`
		`- source sha512sums.${CARCH} # sets $_sha512sums`
		`+ source languages.${CARCH} &> /dev/null # sets $_languages`
		`+ source sha512sums.${CARCH} &> /dev/null # sets $_sha512sums`

		`# compile package names and .xpi sources`
		`# NOTE: there is currently no localization for Iceowl:`

libre/icedtea-web/PKGBUILD

file modified

+3 -3

		`@@ -1,6 +1,6 @@`
		`- # Maintainer (Arch): Levente Polyak <anthraxx[at]archlinux[dot]org>`
		`- # Maintainer (Arch): Guillaume ALAUX <guillaume@archlinux.org>`
		`- # Contributor (Arch): Andreas Radke <andyrtr@archlinux.org>`
		`+ # Maintainer (arch): Levente Polyak <anthraxx[at]archlinux[dot]org>`
		`+ # Maintainer (arch): Guillaume ALAUX <guillaume@archlinux.org>`
		`+ # Contributor: Andreas Radke <andyrtr@archlinux.org>`
		`# Maintainer: Isaac David <isacdaavid () isacdaavid!info>`
		`# Contributor: Omar Vega Ramos <ovruni@gnu.org.pe>`

libre/iceweasel-https-everywhere/PKGBUILD

file modified

+2 -2

		`@@ -1,5 +1,5 @@`
		`- # Maintainer (Arch): Eli Schwartz <eschwartz@archlinux.org>`
		`- # Contributor (Arch): Hyacinthe Cartiaux <hyacinthe.cartiaux@free.fr>`
		`+ # Maintainer (arch): Eli Schwartz <eschwartz@archlinux.org>`
		`+ # Contributor: Hyacinthe Cartiaux <hyacinthe.cartiaux@free.fr>`
		`# Maintainer: Freemor <freemor@freemor.ca>`
		`# Contributor: Theo von Arx <theova@member.fsf.org>`

libre/iceweasel-l10n/PKGBUILD

file modified

+2 -2

		`@@ -43,8 +43,8 @@`
		`sha512sums.${CARCH})`

		`# load languages list and .xpi checksums`
		`- source languages.${CARCH} # sets $_languages`
		`- source sha512sums.${CARCH} # sets $_sha512sums`
		`+ source languages.${CARCH} &> /dev/null # sets $_languages`
		`+ source sha512sums.${CARCH} &> /dev/null # sets $_sha512sums`

		`# compile package names and .xpi sources`
		`_src_url=https://ftp.mozilla.org/pub/firefox/releases/${pkgver}/linux-x86_64/xpi`

libre/iceweasel-noscript/PKGBUILD

file modified

+2 -2

		`@@ -1,6 +1,6 @@`
		`# Maintainer: Andreas Grapentin <andreas@grapentin.org>`
		`- # Maintainer (Arch): Sergej Pupykin <pupykin.s+arch@gmail.com>`
		`- # Maintainer (Arch): Eli schwartz <eschwartz@archlinux.org>`
		`+ # Maintainer (arch): Sergej Pupykin <pupykin.s+arch@gmail.com>`
		`+ # Maintainer (arch): Eli schwartz <eschwartz@archlinux.org>`
		`# Contributor: André Silva <emulatorman@hyperbola.info>`
		`# Contributor: jc_gargma <jc_gargma@iserlohn-fortress.net>`

libre/iceweasel-ublock-origin/PKGBUILD

file modified

+1 -1

		`@@ -1,5 +1,5 @@`
		`# Maintainer: Andreas Grapentin <andreas@grapentin.org>`
		`- # Maintainer (Arch): Daniel M. Capella <polyzen@archlinux.org>`
		`+ # Maintainer (arch): Daniel M. Capella <polyzen@archlinux.org>`
		`# Contributor: André Silva <emulatorman@hyperbola.info>`
		`# Contributor: jc_gargma <jc_gargma@iserlohn-fortress.net>`

libre/iceweasel/0001-libwebrtc-screen-cast-sync.patch

file added

+5941

The added file is too large to be shown here, see it at: libre/iceweasel/0001-libwebrtc-screen-cast-sync.patch

libre/iceweasel/9001-FSDG-sync-remote-settings-with-local-dump.patch

file modified

+164 -144

		`@@ -1,4 +1,4 @@`
		`- From e2e22a52ee5e5cf9f7c55854b828bb65a919b563 Mon Sep 17 00:00:00 2001`
		`+ From 07801d1961effd9182c80a990a23f338e3972efb Mon Sep 17 00:00:00 2001`
		`From: grizzlyuser <grizzlyuser@protonmail.com>`
		`Date: Wed, 30 Dec 2020 17:20:39 +0200`
		`Subject: [PATCH 01/13] Point to local omni.ja files, not remote server`
		`@@ -26,18 +26,19 @@`
		`.../newtab/data/content/activity-stream.bundle.js \| 2 +-`
		`services/settings/Utils.jsm \| 2 +-`
		`.../periodic-updates/scripts/periodic_file_updates.sh \| 2 +-`
		`- toolkit/components/search/SearchUtils.jsm \| 8 ++++----`
		`+ .../components/backgroundtasks/BackgroundTask_message.sys.mjs \| 4 ++--`
		`+ toolkit/components/search/SearchUtils.sys.mjs \| 8 ++++----`
		`toolkit/components/search/docs/DefaultSearchEngines.rst \| 2 +-`
		`.../components/search/docs/SearchEngineConfiguration.rst \| 2 +-`
		`- toolkit/modules/AppConstants.jsm \| 4 ++--`
		`+ toolkit/modules/AppConstants.sys.mjs \| 4 ++--`
		`toolkit/mozapps/defaultagent/RemoteSettings.cpp \| 2 +-`
		`- 9 files changed, 13 insertions(+), 13 deletions(-)`
		`+ 10 files changed, 15 insertions(+), 15 deletions(-)`

		`diff --git a/browser/components/newtab/content-src/components/ASRouterAdmin/ASRouterAdmin.jsx b/browser/components/newtab/content-src/components/ASRouterAdmin/ASRouterAdmin.jsx`
		`- index 0a9da8d804..fdc387aa63 100644`
		`+ index e663fbd32b..a7b7a1994f 100644`
		`--- a/browser/components/newtab/content-src/components/ASRouterAdmin/ASRouterAdmin.jsx`
		`+++ b/browser/components/newtab/content-src/components/ASRouterAdmin/ASRouterAdmin.jsx`
		`- @@ -1226,7 +1226,7 @@ export class ASRouterAdminInner extends React.PureComponent {`
		`+ @@ -1116,7 +1116,7 @@ export class ASRouterAdminInner extends React.PureComponent {`
		`<a`
		`className="providerUrl"`
		`target="_blank"`
		`@@ -47,10 +48,10 @@`
		`>`
		`nimbus-desktop-experiments`
		`diff --git a/browser/components/newtab/data/content/activity-stream.bundle.js b/browser/components/newtab/data/content/activity-stream.bundle.js`
		`- index 3439547610..e4b170454c 100644`
		`+ index 938b44f87b..cdfd5b8589 100644`
		`--- a/browser/components/newtab/data/content/activity-stream.bundle.js`
		`+++ b/browser/components/newtab/data/content/activity-stream.bundle.js`
		`- @@ -1577,7 +1577,7 @@ class ASRouterAdminInner extends (external_React_default()).PureComponent {`
		`+ @@ -1487,7 +1487,7 @@ class ASRouterAdminInner extends (external_React_default()).PureComponent {`
		`label = /#__PURE__/external_React_default().createElement("span", null, "remote settings (", /#__PURE__/external_React_default().createElement("a", {`
		`className: "providerUrl",`
		`target: "_blank",`
		`@@ -60,10 +61,10 @@`
		`}, "nimbus-desktop-experiments"), ")");`
		`}`
		`diff --git a/services/settings/Utils.jsm b/services/settings/Utils.jsm`
		`- index 31ad77d286..9f2e97f14c 100644`
		`+ index a8b0c67ce1..9761486718 100644`
		`--- a/services/settings/Utils.jsm`
		`+++ b/services/settings/Utils.jsm`
		`- @@ -106,7 +106,7 @@ var Utils = {`
		`+ @@ -107,7 +107,7 @@ var Utils = {`
		`: AppConstants.REMOTE_SETTINGS_SERVER_URL;`
		`},`

		`@@ -73,7 +74,7 @@`
		`/**`
		`* Logger instance.`
		`diff --git a/taskcluster/docker/periodic-updates/scripts/periodic_file_updates.sh b/taskcluster/docker/periodic-updates/scripts/periodic_file_updates.sh`
		`- index 3bc70462c4..dc9592c9fa 100755`
		`+ index f177a1440c..c41b0beece 100755`
		`--- a/taskcluster/docker/periodic-updates/scripts/periodic_file_updates.sh`
		`+++ b/taskcluster/docker/periodic-updates/scripts/periodic_file_updates.sh`
		`@@ -285,7 +285,7 @@ function compare_suffix_lists {`
		`@@ -85,11 +86,26 @@`

		`# 1. List remote settings collections from server.`
		`echo "INFO: fetch remote settings list from server"`
		`- diff --git a/toolkit/components/search/SearchUtils.jsm b/toolkit/components/search/SearchUtils.jsm`
		`- index 0bf60e5f16..5561b885f6 100644`
		`- --- a/toolkit/components/search/SearchUtils.jsm`
		`- +++ b/toolkit/components/search/SearchUtils.jsm`
		`- @@ -158,13 +158,13 @@ var SearchUtils = {`
		`+ diff --git a/toolkit/components/backgroundtasks/BackgroundTask_message.sys.mjs b/toolkit/components/backgroundtasks/BackgroundTask_message.sys.mjs`
		`+ index 55e8f70e77..2b5167b36b 100644`
		`+ --- a/toolkit/components/backgroundtasks/BackgroundTask_message.sys.mjs`
		`+ +++ b/toolkit/components/backgroundtasks/BackgroundTask_message.sys.mjs`
		`+ @@ -19,8 +19,8 @@`
		`+ // environment variables still apply.`
		`+ //`
		`+ // --stage: use stage Remote Settings`
		+ -// (`https://settings-cdn.stage.mozaws.net/v1`) rather than production
		+ -// (`https://firefox.settings.services.mozilla.com/v1`)
		+ +// (`resource://app/defaults/settings/`) rather than production
		+ +// (`resource://app/defaults/settings/`)
		`+ //`
		`+ // --preview: enable Remote Settings and Experiment previews.`
		`+ //`
		`+ diff --git a/toolkit/components/search/SearchUtils.sys.mjs b/toolkit/components/search/SearchUtils.sys.mjs`
		`+ index a3072d19b3..d24df38913 100644`
		`+ --- a/toolkit/components/search/SearchUtils.sys.mjs`
		`+ +++ b/toolkit/components/search/SearchUtils.sys.mjs`
		`+ @@ -154,13 +154,13 @@ export var SearchUtils = {`

		`ENGINES_URLS: {`
		`"prod-main":`
		`@@ -128,11 +144,11 @@`
		`-.. _viewed live: https://firefox.settings.services.mozilla.com/v1/buckets/main/collections/search-config/records`
		`+.. _viewed live: resource://app/defaults/settings/main/search-config.json`
		`.. _Normandy: /toolkit/components/normandy/normandy/services.html`
		`- diff --git a/toolkit/modules/AppConstants.jsm b/toolkit/modules/AppConstants.jsm`
		`- index 7f8ac95dd9..fc34169ea5 100644`
		`- --- a/toolkit/modules/AppConstants.jsm`
		`- +++ b/toolkit/modules/AppConstants.jsm`
		`- @@ -420,9 +420,9 @@ this.AppConstants = Object.freeze({`
		`+ diff --git a/toolkit/modules/AppConstants.sys.mjs b/toolkit/modules/AppConstants.sys.mjs`
		`+ index 15125bcca0..1b3e502730 100644`
		`+ --- a/toolkit/modules/AppConstants.sys.mjs`
		`+ +++ b/toolkit/modules/AppConstants.sys.mjs`
		`+ @@ -420,9 +420,9 @@ var AppConstants = Object.freeze({`

		`REMOTE_SETTINGS_SERVER_URL:`
		`#ifdef MOZ_THUNDERBIRD`
		`@@ -158,10 +174,10 @@`
		`#define PROD_CID "windows-default-browser-agent"`
		`#define PROD_ID "state"`
		`--`
		`- 2.37.0`
		`+ 2.37.2`


		`- From 9329ba8b85b542759a089818d70ba86d0a5b9a60 Mon Sep 17 00:00:00 2001`
		`+ From 70b74406d004aa6a4da38d179495f767ec583e58 Mon Sep 17 00:00:00 2001`
		`From: grizzlyuser <grizzlyuser@protonmail.com>`
		`Date: Wed, 30 Dec 2020 17:34:08 +0200`
		`Subject: [PATCH 02/13] Remove polling triggered by push broadcasts`
		`@@ -173,14 +189,14 @@`
		`the user profile, so that it doesn't get picked up by push broadcast`
		`service.`
		`---`
		`- dom/push/PushBroadcastService.jsm \| 13 +++++++++++++`
		`- services/settings/remote-settings.js \| 7 ++-----`
		`- 2 files changed, 15 insertions(+), 5 deletions(-)`
		`-`
		`- diff --git a/dom/push/PushBroadcastService.jsm b/dom/push/PushBroadcastService.jsm`
		`- index 1ee7986f6a..db73413b1a 100644`
		`- --- a/dom/push/PushBroadcastService.jsm`
		`- +++ b/dom/push/PushBroadcastService.jsm`
		`+ dom/push/PushBroadcastService.sys.mjs \| 13 +++++++++++++`
		`+ services/settings/remote-settings.js \| 11 ++---------`
		`+ 2 files changed, 15 insertions(+), 9 deletions(-)`
		`+`
		`+ diff --git a/dom/push/PushBroadcastService.sys.mjs b/dom/push/PushBroadcastService.sys.mjs`
		`+ index 80df53ee49..109d602d4a 100644`
		`+ --- a/dom/push/PushBroadcastService.sys.mjs`
		`+ +++ b/dom/push/PushBroadcastService.sys.mjs`
		`@@ -179,6 +179,19 @@ var BroadcastService = class {`
		`}`
		`}`
		`@@ -202,19 +218,23 @@`
		`* Call the listeners of the specified broadcasts.`
		`*`
		`diff --git a/services/settings/remote-settings.js b/services/settings/remote-settings.js`
		`- index f7e8e24748..57d11d71b3 100644`
		`+ index 44727dfc0e..ece21d09bc 100644`
		`--- a/services/settings/remote-settings.js`
		`+++ b/services/settings/remote-settings.js`
		`- @@ -533,7 +533,7 @@ function remoteSettingsFunction() {`
		`+ @@ -582,11 +582,7 @@ function remoteSettingsFunction() {`
		`moduleURI: __URI__,`
		`symbolName: "remoteSettingsBroadcastHandler",`
		`};`
		`- - pushBroadcastService.addListener(BROADCAST_ID, currentVersion, moduleInfo);`
		`- + pushBroadcastService.deleteListener(BROADCAST_ID);`
		`+ - lazy.pushBroadcastService.addListener(`
		`+ - BROADCAST_ID,`
		`+ - currentVersion,`
		`+ - moduleInfo`
		`+ - );`
		`+ + lazy.pushBroadcastService.deleteListener(BROADCAST_ID);`
		`};`

		`return remoteSettings;`
		`- @@ -553,9 +553,6 @@ var remoteSettingsBroadcastHandler = {`
		`+ @@ -606,9 +602,6 @@ var remoteSettingsBroadcastHandler = {`
		`Push notification received (version=${version} phase=${phase})`
		`);`

		`@@ -226,10 +246,10 @@`
		`},`
		`};`
		`--`
		`- 2.37.0`
		`+ 2.37.2`


		`- From 11631dd36d3eeecc5f22171d5e059fbe7662c77c Mon Sep 17 00:00:00 2001`
		`+ From 9f91207a91cb895a67f90f5e2e4e3968e8bd7b0e Mon Sep 17 00:00:00 2001`
		`From: grizzlyuser <grizzlyuser@protonmail.com>`
		`Date: Wed, 30 Dec 2020 17:41:54 +0200`
		`Subject: [PATCH 03/13] Remove timer that triggers polling for changes`
		`@@ -270,10 +290,10 @@`
		`-# see syntax https://searchfox.org/mozilla-central/rev/cc280c4be94ff8cf64a27cc9b3d6831ffa49fa45/toolkit/components/timermanager/UpdateTimerManager.jsm#155`
		`-category update-timer RemoteSettingsComponents @mozilla.org/services/settings;1,getService,services-settings-poll-changes,services.settings.poll_interval,86400,259200`
		`--`
		`- 2.37.0`
		`+ 2.37.2`


		`- From d720d5680fa97ad53998b6050bc28df4503f0c39 Mon Sep 17 00:00:00 2001`
		`+ From 8f0541899626807c4cb11996b5763463f3b9dc6f Mon Sep 17 00:00:00 2001`
		`From: grizzlyuser <grizzlyuser@protonmail.com>`
		`Date: Wed, 30 Dec 2020 17:47:41 +0200`
		`Subject: [PATCH 04/13] Utils: fetch timestamps of each collection locally`
		`@@ -292,10 +312,10 @@`
		`create mode 100644 services/settings/dumps/monitor/moz.build`

		`diff --git a/browser/installer/package-manifest.in b/browser/installer/package-manifest.in`
		`- index 73a41dc25b..04c2a3fb6a 100644`
		`+ index 14e582fc61..821b1e2167 100644`
		`--- a/browser/installer/package-manifest.in`
		`+++ b/browser/installer/package-manifest.in`
		`- @@ -275,6 +275,7 @@`
		`+ @@ -259,6 +259,7 @@`
		`@RESPATH@/browser/defaults/settings/last_modified.json`
		`@RESPATH@/browser/defaults/settings/blocklists`
		`@RESPATH@/browser/defaults/settings/main`
		`@@ -304,10 +324,10 @@`

		`; Warning: changing the path to channel-prefs.js can cause bugs (Bug 756325)`
		`diff --git a/services/settings/Utils.jsm b/services/settings/Utils.jsm`
		`- index 9f2e97f14c..4e140f0fdd 100644`
		`+ index 9761486718..da55d60201 100644`
		`--- a/services/settings/Utils.jsm`
		`+++ b/services/settings/Utils.jsm`
		`- @@ -377,7 +377,7 @@ var Utils = {`
		`+ @@ -379,7 +379,7 @@ var Utils = {`
		`async fetchLatestChanges(serverUrl, options = {}) {`
		`const { expectedTimestamp, lastEtag = "", filters = {} } = options;`

		`@@ -316,7 +336,7 @@`
		`const params = {`
		`...filters,`
		`_expected: expectedTimestamp ?? 0,`
		`- @@ -392,7 +392,11 @@ var Utils = {`
		`+ @@ -394,7 +394,11 @@ var Utils = {`
		.map(([k, v]) => `${k}=${encodeURIComponent(v)}`)
		`.join("&");`
		`}`
		`@@ -329,7 +349,7 @@`

		`if (response.status >= 500) {`
		throw new Error(`Server error ${response.status} ${response.statusText}`);
		`- @@ -427,7 +431,15 @@ var Utils = {`
		`+ @@ -429,7 +433,15 @@ var Utils = {`
		`}`
		`}`

		`@@ -373,10 +393,10 @@`
		`]`

		`--`
		`- 2.37.0`
		`+ 2.37.2`


		`- From 98496943d01589201771f69e14ba6b3cb7395e48 Mon Sep 17 00:00:00 2001`
		`+ From dca0c5d7c983a24d742c45705a899430afed41bd Mon Sep 17 00:00:00 2001`
		`From: grizzlyuser <grizzlyuser@protonmail.com>`
		`Date: Wed, 30 Dec 2020 17:52:10 +0200`
		`Subject: [PATCH 05/13] Utils: disable offline checking`
		`@@ -384,22 +404,23 @@`
		`Since only local data is read now, it should always return false for the`
		`current and any future code that relies on it.`
		`---`
		`- services/settings/Utils.jsm \| 9 ---------`
		`- 1 file changed, 9 deletions(-)`
		`+ services/settings/Utils.jsm \| 10 ----------`
		`+ 1 file changed, 10 deletions(-)`

		`diff --git a/services/settings/Utils.jsm b/services/settings/Utils.jsm`
		`- index 4e140f0fdd..5d448da54c 100644`
		`+ index da55d60201..ff45380ff8 100644`
		`--- a/services/settings/Utils.jsm`
		`+++ b/services/settings/Utils.jsm`
		`- @@ -192,15 +192,6 @@ var Utils = {`
		`+ @@ -193,16 +193,6 @@ var Utils = {`
		`* @return {bool} Whether network is down or not.`
		`*/`
		`get isOffline() {`
		`- try {`
		`- return (`
		`- Services.io.offline \|\|`
		`- - CaptivePortalService.state == CaptivePortalService.LOCKED_PORTAL \|\|`
		`- - !gNetworkLinkService.isLinkUp`
		`+ - lazy.CaptivePortalService.state ==`
		`+ - lazy.CaptivePortalService.LOCKED_PORTAL \|\|`
		`+ - !lazy.gNetworkLinkService.isLinkUp`
		`- );`
		`- } catch (ex) {`
		`- log.warn("Could not determine network status.", ex);`
		`@@ -408,10 +429,10 @@`
		`},`

		`--`
		`- 2.37.0`
		`+ 2.37.2`


		`- From 738c1836a53ead5253ab3e0f9750aec94192dff0 Mon Sep 17 00:00:00 2001`
		`+ From 1e29854983d5fcc360a6b407b4cd11f6af8d993e Mon Sep 17 00:00:00 2001`
		`From: grizzlyuser <grizzlyuser@protonmail.com>`
		`Date: Wed, 30 Dec 2020 17:56:02 +0200`
		`Subject: [PATCH 06/13] Refactor hashing logic to a separate function`
		`@@ -424,25 +445,25 @@`
		`2 files changed, 11 insertions(+), 2 deletions(-)`

		`diff --git a/services/settings/RemoteSettingsWorker.jsm b/services/settings/RemoteSettingsWorker.jsm`
		`- index 147ebb6b13..c86e218fd3 100644`
		`+ index 2e8073271b..24b4ce2af8 100644`
		`--- a/services/settings/RemoteSettingsWorker.jsm`
		`+++ b/services/settings/RemoteSettingsWorker.jsm`
		`- @@ -189,6 +189,10 @@ class Worker {`
		`+ @@ -191,6 +191,10 @@ class Worker {`
		`// task on the current thread instead of the worker thread.`
		`- return SharedUtils.checkContentHash(buffer, size, hash);`
		`+ return lazy.SharedUtils.checkContentHash(buffer, size, hash);`
		`}`
		`+`
		`+ async getContentHash(bytes) {`
		`- + return SharedUtils.getContentHash(bytes);`
		`+ + return lazy.SharedUtils.getContentHash(bytes);`
		`+ }`
		`}`

		`// Now, first add a shutdown blocker. If that fails, we must have`
		`diff --git a/services/settings/SharedUtils.jsm b/services/settings/SharedUtils.jsm`
		`- index 5d32fb38bd..753a1b1393 100644`
		`+ index 9804e80c91..de67b0fb6f 100644`
		`--- a/services/settings/SharedUtils.jsm`
		`+++ b/services/settings/SharedUtils.jsm`
		`- @@ -28,11 +28,16 @@ var SharedUtils = {`
		`+ @@ -23,11 +23,16 @@ var SharedUtils = {`
		`return false;`
		`}`
		`// Has expected content?`
		`@@ -462,10 +483,10 @@`

		`/**`
		`--`
		`- 2.37.0`
		`+ 2.37.2`


		`- From fa07a0a3fbd62a0d973a4ca07fdc3a5cf2209841 Mon Sep 17 00:00:00 2001`
		`+ From 49543366ee33ad44a5577d082e51a11a2e7b4b7f Mon Sep 17 00:00:00 2001`
		`From: grizzlyuser <grizzlyuser@protonmail.com>`
		`Date: Wed, 30 Dec 2020 18:05:02 +0200`
		`Subject: [PATCH 07/13] Client: Fetch and hash records from local dump`
		`@@ -500,16 +521,16 @@`
		`1 file changed, 27 insertions(+), 36 deletions(-)`

		`diff --git a/services/settings/RemoteSettingsClient.jsm b/services/settings/RemoteSettingsClient.jsm`
		`- index eee1487491..90e82772c4 100644`
		`+ index ae94f272d8..75589ff02e 100644`
		`--- a/services/settings/RemoteSettingsClient.jsm`
		`+++ b/services/settings/RemoteSettingsClient.jsm`
		`- @@ -592,11 +592,9 @@ class RemoteSettingsClient extends EventEmitter {`
		`+ @@ -678,11 +678,9 @@ class RemoteSettingsClient extends EventEmitter {`

		`// If the data is up-to-date but don't have metadata (records loaded from dump),`
		`// we fetch them and validate the signature immediately.`
		`- - if (this.verifySignature && ObjectUtils.isEmpty(localMetadata)) {`
		`- + if (this.verifySignature && ObjectUtils.isEmpty(localMetadata?.json_dump_metadata)) {`
		- console.debug(`${this.identifier} pull collection metadata`);
		`+ - if (this.verifySignature && lazy.ObjectUtils.isEmpty(localMetadata)) {`
		`+ + if (this.verifySignature && lazy.ObjectUtils.isEmpty(localMetadata?.json_dump_metadata)) {`
		+ lazy.console.debug(`${this.identifier} pull collection metadata`);
		`- const metadata = await this.httpClient().getData({`
		`- query: { _expected: expectedTimestamp },`
		`- });`
		`@@ -517,7 +538,7 @@`
		`await this.db.importChanges(metadata);`
		`// We don't bother validating the signature if the dump was just loaded. We do`
		`// if the dump was loaded at some other point (eg. from .get()).`
		`- @@ -825,33 +823,23 @@ class RemoteSettingsClient extends EventEmitter {`
		`+ @@ -945,33 +943,23 @@ class RemoteSettingsClient extends EventEmitter {`
		`* @returns {Promise}`
		`*/`
		`async _validateCollectionSignature(records, timestamp, metadata) {`
		`@@ -537,9 +558,9 @@`
		`- signature: { x5u, signature },`
		`+ json_dump_metadata: { hash, size },`
		`} = metadata;`
		`- - const certChain = await (await Utils.fetch(x5u)).text();`
		`+ - const certChain = await (await lazy.Utils.fetch(x5u)).text();`
		`// Merge remote records with local ones and serialize as canonical JSON.`
		`- const serialized = await RemoteSettingsWorker.canonicalStringify(`
		`+ const serialized = await lazy.RemoteSettingsWorker.canonicalStringify(`
		`records,`
		`timestamp`
		`);`
		`@@ -549,15 +570,15 @@`
		`- "p384ecdsa=" + signature,`
		`- certChain,`
		`- this.signerName,`
		`- - Utils.CERT_CHAIN_ROOT_IDENTIFIER`
		`- + !(await RemoteSettingsWorker.checkContentHash(`
		`+ - lazy.Utils.CERT_CHAIN_ROOT_IDENTIFIER`
		`+ + !(await lazy.RemoteSettingsWorker.checkContentHash(`
		`+ new TextEncoder().encode(serialized),`
		`+ size,`
		`+ hash`
		`))`
		`) {`
		`throw new InvalidSignatureError(this.identifier);`
		`- @@ -1024,24 +1012,27 @@ class RemoteSettingsClient extends EventEmitter {`
		`+ @@ -1144,24 +1132,27 @@ class RemoteSettingsClient extends EventEmitter {`
		`* @param since timestamp of last sync (optional)`
		`*/`
		`async _fetchChangeset(expectedTimestamp, since) {`
		`@@ -576,21 +597,21 @@`
		`- _since: since,`
		`- },`
		`- }`
		`- + const { data } = await SharedUtils.loadJSONDump(`
		`+ + const { data } = await lazy.SharedUtils.loadJSONDump(`
		`+ this.bucketName,`
		`+ this.collectionName`
		`- );`
		`+ + );`
		`+ const remoteRecords = data ?? [];`
		`+`
		`- + const serialized = await RemoteSettingsWorker.canonicalStringify(`
		`+ + const serialized = await lazy.RemoteSettingsWorker.canonicalStringify(`
		`+ remoteRecords,`
		`+ expectedTimestamp`
		`- + );`
		`+ );`
		`+ const bytes = new TextEncoder().encode(serialized);`
		`+ const metadata = {`
		`+ app_build_id: Services.appinfo.appBuildID,`
		`+ json_dump_metadata: {`
		`- + hash: await RemoteSettingsWorker.getContentHash(bytes),`
		`+ + hash: await lazy.RemoteSettingsWorker.getContentHash(bytes),`
		`+ size: bytes.length,`
		`+ },`
		`+ }`
		`@@ -602,10 +623,10 @@`
		`remoteRecords,`
		`};`
		`--`
		`- 2.37.0`
		`+ 2.37.2`


		`- From 9e4840347d561c7dc98ab6f84e3c3a195297c29e Mon Sep 17 00:00:00 2001`
		`+ From b6ce5faacf9bdf97066c7182399b58d5ef91a445 Mon Sep 17 00:00:00 2001`
		`From: grizzlyuser <grizzlyuser@protonmail.com>`
		`Date: Wed, 30 Dec 2020 18:42:56 +0200`
		`Subject: [PATCH 08/13] Client: start deferred sync on get() or on()`
		`@@ -623,45 +644,42 @@`
		`correctly synchronized with the dump, so that no metadata checking`
		`occurs during the session.`
		`---`
		`- services/settings/RemoteSettingsClient.jsm \| 30 +++++++++++++++++++++-`
		`- 1 file changed, 29 insertions(+), 1 deletion(-)`
		`+ services/settings/RemoteSettingsClient.jsm \| 27 +++++++++++++++++++++-`
		`+ 1 file changed, 26 insertions(+), 1 deletion(-)`

		`diff --git a/services/settings/RemoteSettingsClient.jsm b/services/settings/RemoteSettingsClient.jsm`
		`- index 90e82772c4..2a009eca7c 100644`
		`+ index 75589ff02e..90280fc848 100644`
		`--- a/services/settings/RemoteSettingsClient.jsm`
		`+++ b/services/settings/RemoteSettingsClient.jsm`
		`- @@ -16,6 +16,7 @@ XPCOMUtils.defineLazyModuleGetters(this, {`
		`+ @@ -22,6 +22,7 @@ XPCOMUtils.defineLazyModuleGetters(lazy, {`
		`ClientEnvironmentBase:`
		`"resource://gre/modules/components-utils/ClientEnvironment.jsm",`
		`Database: "resource://services-settings/Database.jsm",`
		`+ DeferredTask: "resource://gre/modules/DeferredTask.jsm",`
		`- Downloader: "resource://services-settings/Attachments.jsm",`
		`IDBHelpers: "resource://services-settings/IDBHelpers.jsm",`
		`KintoHttpClient: "resource://services-common/kinto-http-client.js",`
		`- @@ -27,6 +28,7 @@ XPCOMUtils.defineLazyModuleGetters(this, {`
		`+ ObjectUtils: "resource://gre/modules/ObjectUtils.jsm",`
		`+ @@ -32,6 +33,7 @@ XPCOMUtils.defineLazyModuleGetters(lazy, {`
		`});`

		`const TELEMETRY_COMPONENT = "remotesettings";`
		`+const DEFERRED_SYNC_DELAY_MILLISECONDS = 1000;`

		`- XPCOMUtils.defineLazyGetter(this, "console", () => Utils.log);`
		`+ XPCOMUtils.defineLazyGetter(lazy, "console", () => lazy.Utils.log);`

		`- @@ -249,6 +251,14 @@ class RemoteSettingsClient extends EventEmitter {`
		`+ @@ -319,6 +321,11 @@ class RemoteSettingsClient extends EventEmitter {`
		`this._lastCheckTimePref = lastCheckTimePref;`
		`this._verifier = null;`
		`this._syncRunning = false;`
		`- + this._deferredSync = new DeferredTask(`
		`- + async () => {`
		`- + if (!this._syncRunning && !(await this._isSynced())) {`
		`- + await this.sync();`
		`- + }`
		`- + },`
		`- + DEFERRED_SYNC_DELAY_MILLISECONDS`
		`- + );`
		`+ + this._deferredSync = new lazy.DeferredTask(async () => {`
		`+ + if (!this._syncRunning && !(await this._isSynced())) {`
		`+ + await this.sync();`
		`+ + }`
		`+ + }, DEFERRED_SYNC_DELAY_MILLISECONDS);`

		`// This attribute allows signature verification to be disabled, when running tests`
		`// or when pulling data from a dev server.`
		`- @@ -278,6 +288,11 @@ class RemoteSettingsClient extends EventEmitter {`
		`+ @@ -348,6 +355,11 @@ class RemoteSettingsClient extends EventEmitter {`
		`this.db.identifier = this.identifier;`
		`}`

		`@@ -673,18 +691,18 @@`
		`get identifier() {`
		return `${this.bucketName}/${this.collectionName}`;
		`}`
		`- @@ -346,6 +361,10 @@ class RemoteSettingsClient extends EventEmitter {`
		`- let lastModified = await this.db.getLastModified();`
		`+ @@ -419,6 +431,10 @@ class RemoteSettingsClient extends EventEmitter {`
		`+ let lastModified = forceSync ? null : await this.db.getLastModified();`
		`let hasLocalData = lastModified !== null;`

		`+ if (!(await this._isSynced())) {`
		`+ throw new MissingSignatureError(this.identifier);`
		`+ }`
		`+`
		`- if (syncIfEmpty && !hasLocalData) {`
		`- // .get() was called before we had the chance to synchronize the local database.`
		`- // We'll try to avoid returning an empty list.`
		`- @@ -444,7 +463,10 @@ class RemoteSettingsClient extends EventEmitter {`
		`+ if (forceSync) {`
		`+ if (!this._importingPromise) {`
		`+ this._importingPromise = (async () => {`
		`+ @@ -527,7 +543,10 @@ class RemoteSettingsClient extends EventEmitter {`
		`// No need to verify signature on JSON dumps.`
		`// If local DB cannot be read, then we don't even try to do anything,`
		`// we return results early.`
		`@@ -695,14 +713,14 @@`
		`+ return filtered;`
		`}`

		`- console.debug(`
		`- @@ -484,6 +506,12 @@ class RemoteSettingsClient extends EventEmitter {`
		`+ lazy.console.debug(`
		`+ @@ -567,6 +586,12 @@ class RemoteSettingsClient extends EventEmitter {`
		`return final;`
		`}`

		`+ async _isSynced() {`
		`+ this._synced \|\|=`
		`- + Services.appinfo.appBuildID === (await this.db.getMetadata())?.app_build_id;`
		`+ + Services.appinfo.appBuildID === (await this.db?.getMetadata())?.app_build_id;`
		`+ return this._synced;`
		`+ }`
		`+`
		`@@ -710,10 +728,10 @@`
		`* Synchronize the local database with the remote server.`
		`*`
		`--`
		`- 2.37.0`
		`+ 2.37.2`


		`- From 72de3dbe162430638a58838b714f1872c2dd8195 Mon Sep 17 00:00:00 2001`
		`+ From 617d90b265e5d82aa964247f3bd68eb92ebd2cf0 Mon Sep 17 00:00:00 2001`
		`From: grizzlyuser <grizzlyuser@protonmail.com>`
		`Date: Wed, 30 Dec 2020 18:53:51 +0200`
		`Subject: [PATCH 09/13] Client: deep compare records if timestamps match`
		`@@ -735,34 +753,34 @@`
		`1 file changed, 5 insertions(+), 1 deletion(-)`

		`diff --git a/services/settings/RemoteSettingsClient.jsm b/services/settings/RemoteSettingsClient.jsm`
		`- index 2a009eca7c..dbcdb559df 100644`
		`+ index 90280fc848..3d9f04696f 100644`
		`--- a/services/settings/RemoteSettingsClient.jsm`
		`+++ b/services/settings/RemoteSettingsClient.jsm`
		`- @@ -13,6 +13,7 @@ const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");`
		`+ @@ -19,6 +19,7 @@ const { Downloader } = ChromeUtils.import(`
		`+ const lazy = {};`

		`- XPCOMUtils.defineLazyModuleGetters(this, {`
		`- AppConstants: "resource://gre/modules/AppConstants.jsm",`
		`+ XPCOMUtils.defineLazyModuleGetters(lazy, {`
		`+ CanonicalJSON: "resource://gre/modules/CanonicalJSON.jsm",`
		`ClientEnvironmentBase:`
		`"resource://gre/modules/components-utils/ClientEnvironment.jsm",`
		`Database: "resource://services-settings/Database.jsm",`
		`- @@ -1015,7 +1016,10 @@ class RemoteSettingsClient extends EventEmitter {`
		`+ @@ -1132,7 +1133,10 @@ class RemoteSettingsClient extends EventEmitter {`
		`const old = oldById.get(r.id);`
		`if (old) {`
		`oldById.delete(r.id);`
		`- if (r.last_modified != old.last_modified) {`
		`+ if (`
		`+ r.last_modified != old.last_modified \|\|`
		`- + CanonicalJSON.stringify(r) != CanonicalJSON.stringify(old)`
		`+ + lazy.CanonicalJSON.stringify(r) != lazy.CanonicalJSON.stringify(old)`
		`+ ) {`
		`syncResult.updated.push({ old, new: r });`
		`}`
		`} else {`
		`--`
		`- 2.37.0`
		`+ 2.37.2`


		`- From 0ddc970c40569ca7b20ec67a413519589e7c52f6 Mon Sep 17 00:00:00 2001`
		`+ From 66122f118e859c33f1d972b658340dfc43b4b875 Mon Sep 17 00:00:00 2001`
		`From: grizzlyuser <grizzlyuser@protonmail.com>`
		`Date: Wed, 30 Dec 2020 19:01:39 +0200`
		`Subject: [PATCH 10/13] Client: delete more data on cleanup`
		`@@ -780,10 +798,10 @@`
		`1 file changed, 9 insertions(+), 3 deletions(-)`

		`diff --git a/services/settings/RemoteSettingsClient.jsm b/services/settings/RemoteSettingsClient.jsm`
		`- index dbcdb559df..c20ce412b2 100644`
		`+ index 3d9f04696f..e102c8b89d 100644`
		`--- a/services/settings/RemoteSettingsClient.jsm`
		`+++ b/services/settings/RemoteSettingsClient.jsm`
		`- @@ -207,7 +207,7 @@ class AttachmentDownloader extends Downloader {`
		`+ @@ -256,7 +256,7 @@ class AttachmentDownloader extends Downloader {`
		`allRecords`
		`.filter(r => !!r.attachment)`
		`.map(r =>`
		`@@ -792,16 +810,16 @@`
		`)`
		`);`
		`}`
		`- @@ -975,7 +975,7 @@ class RemoteSettingsClient extends EventEmitter {`
		`+ @@ -1092,7 +1092,7 @@ class RemoteSettingsClient extends EventEmitter {`
		`// Signature failed, clear local DB because it contains`
		`// bad data (local + remote changes).`
		- console.debug(`${this.identifier} clear local data`);
		+ lazy.console.debug(`${this.identifier} clear local data`);
		`- await this.db.clear();`
		`+ await this._clearAll();`
		`// Local data was tampered, throw and it will retry from empty DB.`
		- console.error(`${this.identifier} local data was corrupted`);
		+ lazy.console.error(`${this.identifier} local data was corrupted`);
		`throw new CorruptedDataError(this.identifier);`
		`- @@ -997,7 +997,7 @@ class RemoteSettingsClient extends EventEmitter {`
		`+ @@ -1114,7 +1114,7 @@ class RemoteSettingsClient extends EventEmitter {`
		`// _importJSONDump() only clears DB if dump is available,`
		`// therefore do it here!`
		`if (imported < 0) {`
		`@@ -810,7 +828,7 @@`
		`}`
		`}`
		`}`
		`- @@ -1037,6 +1037,12 @@ class RemoteSettingsClient extends EventEmitter {`
		`+ @@ -1154,6 +1154,12 @@ class RemoteSettingsClient extends EventEmitter {`
		`return syncResult;`
		`}`

		`@@ -824,10 +842,10 @@`
		`* Fetch information from changeset endpoint.`
		`*`
		`--`
		`- 2.37.0`
		`+ 2.37.2`


		`- From 00e45ee5b33b5e6030fa2d3b589cce5418822a3e Mon Sep 17 00:00:00 2001`
		`+ From 3ef189a633dfbe5a95cf5b290808b0003e8ba5c1 Mon Sep 17 00:00:00 2001`
		`From: grizzlyuser <grizzlyuser@protonmail.com>`
		`Date: Wed, 30 Dec 2020 19:07:56 +0200`
		`Subject: [PATCH 11/13] Client: remove comparison of collection timestamps`
		`@@ -842,16 +860,16 @@`
		`1 file changed, 5 deletions(-)`

		`diff --git a/services/settings/RemoteSettingsClient.jsm b/services/settings/RemoteSettingsClient.jsm`
		`- index c20ce412b2..79ec40ee9e 100644`
		`+ index e102c8b89d..9cb3455aaf 100644`
		`--- a/services/settings/RemoteSettingsClient.jsm`
		`+++ b/services/settings/RemoteSettingsClient.jsm`
		`- @@ -917,14 +917,9 @@ class RemoteSettingsClient extends EventEmitter {`
		`+ @@ -1034,14 +1034,9 @@ class RemoteSettingsClient extends EventEmitter {`
		`updated: [],`
		`deleted: [],`
		`};`
		`- // If data wasn't changed, return empty sync result.`
		`- // This can happen when we update the signature but not the data.`
		`- console.debug(`
		`+ lazy.console.debug(`
		`${this.identifier} local timestamp: ${localTimestamp}, remote: ${remoteTimestamp}`
		`);`
		`- if (localTimestamp && remoteTimestamp < localTimestamp) {`
		`@@ -861,20 +879,20 @@`
		`await this.db.importChanges(metadata, remoteTimestamp, remoteRecords, {`
		`clear: retry,`
		`--`
		`- 2.37.0`
		`+ 2.37.2`


		`- From 37d74c55d8c1d852666f179fe6ea45fd99ff83ca Mon Sep 17 00:00:00 2001`
		`+ From 3d8d5ef12ab1c06cff841a9cca15a575750fc48d Mon Sep 17 00:00:00 2001`
		`From: grizzlyuser <grizzlyuser@protonmail.com>`
		`Date: Wed, 30 Dec 2020 19:15:44 +0200`
		`Subject: [PATCH 12/13] Attachments: load only from dump and drop cached`

		`---`
		`- services/settings/Attachments.jsm \| 35 +++++++------------------------`
		`- 1 file changed, 8 insertions(+), 27 deletions(-)`
		`+ services/settings/Attachments.jsm \| 37 +++++++------------------------`
		`+ 1 file changed, 8 insertions(+), 29 deletions(-)`

		`diff --git a/services/settings/Attachments.jsm b/services/settings/Attachments.jsm`
		`- index 2bf846e4e1..542f34f97e 100644`
		`+ index 00bf059d55..979e22c06a 100644`
		`--- a/services/settings/Attachments.jsm`
		`+++ b/services/settings/Attachments.jsm`
		`@@ -151,9 +151,10 @@ class Downloader {`
		`@@ -915,7 +933,7 @@`
		`const {`
		`attachment: { filename, size, hash },`
		`} = record;`
		`- @@ -357,31 +359,10 @@ class Downloader {`
		`+ @@ -359,33 +361,10 @@ class Downloader {`
		`*/`
		`async downloadAsBytes(record, options = {}) {`
		`const {`
		`@@ -934,7 +952,9 @@`
		`- if (!checkHash) {`
		`- return buffer;`
		`- }`
		`- - if (await RemoteSettingsWorker.checkContentHash(buffer, size, hash)) {`
		`+ - if (`
		`+ - await lazy.RemoteSettingsWorker.checkContentHash(buffer, size, hash)`
		`+ - ) {`
		`- return buffer;`
		`- }`
		`- // Content is corrupted.`
		`@@ -951,10 +971,10 @@`

		`/**`
		`--`
		`- 2.37.0`
		`+ 2.37.2`


		`- From 5f475d79389de681e2eac63527a6d497b0b0da77 Mon Sep 17 00:00:00 2001`
		`+ From 0ba5c3f95dd3c8a468d49c73b5067bd78deb1442 Mon Sep 17 00:00:00 2001`
		`From: grizzlyuser <grizzlyuser@protonmail.com>`
		`Date: Wed, 30 Dec 2020 19:22:20 +0200`
		`Subject: [PATCH 13/13] Disable CRLite entirely for now`
		`@@ -979,10 +999,10 @@`
		`2 files changed, 2 insertions(+), 1 deletion(-)`

		`diff --git a/modules/libpref/init/StaticPrefList.yaml b/modules/libpref/init/StaticPrefList.yaml`
		`- index c487b04a35..b0808338ef 100644`
		`+ index 192915c16f..307f983896 100644`
		`--- a/modules/libpref/init/StaticPrefList.yaml`
		`+++ b/modules/libpref/init/StaticPrefList.yaml`
		`- @@ -12269,7 +12269,7 @@`
		`+ @@ -12540,7 +12540,7 @@`
		`# 3: Consult CRLite and enforce "Not Revoked" results, but defer to OCSP for "Revoked".`
		`- name: security.pki.crlite_mode`
		`type: RelaxedAtomicUint32`
		`@@ -992,10 +1012,10 @@`

		`- name: security.tls.version.min`
		`diff --git a/security/manager/ssl/nsNSSComponent.cpp b/security/manager/ssl/nsNSSComponent.cpp`
		`- index 12da07c56f..39f85cf5b3 100644`
		`+ index aab4319651..f21432a7e3 100644`
		`--- a/security/manager/ssl/nsNSSComponent.cpp`
		`+++ b/security/manager/ssl/nsNSSComponent.cpp`
		`- @@ -1453,6 +1453,7 @@ void nsNSSComponent::setValidationOptions(`
		`+ @@ -1434,6 +1434,7 @@ void nsNSSComponent::setValidationOptions(`
		`CRLiteMode defaultCRLiteMode = CRLiteMode::Disabled;`
		`CRLiteMode crliteMode =`
		`static_cast<CRLiteMode>(StaticPrefs::security_pki_crlite_mode());`
		`@@ -1004,5 +1024,5 @@`
		`case CRLiteMode::Disabled:`
		`case CRLiteMode::TelemetryOnly:`
		`--`
		`- 2.37.0`
		`+ 2.37.2`

libre/iceweasel/9003-FSDG-urihandlers.patch

file modified

+3 -3

		`@@ -1,7 +1,7 @@`
		`- diff --git a/uriloader/exthandler/HandlerList.jsm b/uriloader/exthandler/HandlerList.jsm`
		`+ diff --git a/uriloader/exthandler/HandlerList.sys.mjs b/uriloader/exthandler/HandlerList.sys.mjs`
		`index 04b9205..ff3aec5 100644`
		`- --- a/uriloader/exthandler/HandlerList.jsm`
		`- +++ b/uriloader/exthandler/HandlerList.jsm`
		`+ --- a/uriloader/exthandler/HandlerList.sys.mjs`
		`+ +++ b/uriloader/exthandler/HandlerList.sys.mjs`
		`@@ -11,229 +11,25 @@ this.kHandlerListVersion = 1;`
		`this.kHandlerList = {`
		`default: {`

libre/iceweasel/9004-FSDG-misc.patch

file modified

+164 -79

		`@@ -122,14 +122,6 @@`
		`index 4c59b84a7c..44d36d3b28 100644`
		`--- a/browser/base/content/test/static/browser_all_files_referenced.js`
		`+++ b/browser/base/content/test/static/browser_all_files_referenced.js`
		`- @@ -33,7 +33,6 @@ var gExceptionPaths = [`
		`- "chrome://browser/content/assets/moz-vpn.svg",`
		`- "chrome://browser/content/assets/vpn-logo.svg",`
		`- "chrome://browser/content/assets/focus-promo.png",`
		`- - "chrome://browser/content/preferences/more-from-mozilla-qr-code-advanced.svg",`
		`- "chrome://browser/content/assets/klar-qr-code.svg",`
		`-`
		`- // These app marketplace icons are referenced based on the user's locale`
		`@@ -136,17 +135,6 @@ var whitelist = [`
		`// extensions/pref/autoconfig/src/nsReadConfig.cpp`
		`{ file: "resource://gre/defaults/autoconfig/prefcalls.js" },`
		`@@ -149,10 +141,10 @@`

		`// layout/mathml/nsMathMLChar.cpp`
		`diff --git a/browser/components/preferences/jar.mn b/browser/components/preferences/jar.mn`
		`- index 912d9edf08..dd4697a368 100644`
		`+ index 2131a15cee..dd4697a368 100644`
		`--- a/browser/components/preferences/jar.mn`
		`+++ b/browser/components/preferences/jar.mn`
		`- @@ -14,12 +14,8 @@ browser.jar:`
		`+ @@ -14,11 +14,8 @@ browser.jar:`
		`content/browser/preferences/containers.js`
		`content/browser/preferences/sync.js`
		`content/browser/preferences/experimental.js`
		`@@ -162,20 +154,8 @@`
		`content/browser/preferences/findInPage.js`
		`- content/browser/preferences/more-from-mozilla-qr-code-simple.svg`
		`- content/browser/preferences/more-from-mozilla-qr-code-simple-cn.svg`
		`- - content/browser/preferences/more-from-mozilla-qr-code-advanced.svg`
		`content/browser/preferences/web-appearance-dark.svg`
		`content/browser/preferences/web-appearance-light.svg`
		`- diff --git a/browser/components/preferences/more-from-mozilla-qr-code-advanced.svg b/browser/components/preferences/more-from-mozilla-qr-code-advanced.svg`
		`- deleted file mode 100644`
		`- index 4848d3e20c..0000000000`
		`- --- a/browser/components/preferences/more-from-mozilla-qr-code-advanced.svg`
		`- +++ /dev/null`
		`- @@ -1,4 +0,0 @@`
		`- -<!-- This Source Code Form is subject to the terms of the Mozilla Public`
		`- - - License, v. 2.0. If a copy of the MPL was not distributed with this`
		`- - - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->`
		- -<svg width="113" height="113" fill="content" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" clip-rule="evenodd" d="M4 2h105a2 2 0 0 1 2 2v105a2 2 0 0 1-2 2H4a2 2 0 0 1-2-2V4a2 2 0 0 1 2-2ZM0 4a4 4 0 0 1 4-4h105a4 4 0 0 1 4 4v105a4 4 0 0 1-4 4H4a4 4 0 0 1-4-4V4Zm10 6h22.448v22.448H10V10Zm6.414 3.207h-3.207V29.24H29.24V13.207H16.414ZM38.862 10h6.414v3.207h3.207v3.207h-3.207v3.207h3.207v-3.207h3.207V10h6.413v3.207h3.207V10h3.207v6.414h-9.62v6.414h3.206v3.207h3.207v-3.207h3.207V19.62h3.207v-3.207h3.207v3.207h3.207v-6.414h3.207V22.828h-3.207v3.207H70.93v6.413h-3.207v-3.207h-3.207v6.414H61.31v-6.414h-3.207v3.207h-3.206v-6.413h-6.414v-3.207h-6.414v3.207h-3.207v-3.207h-3.207v-6.414h6.414v-3.207h-3.207V10Zm6.414 22.448h-3.207v-6.413h3.207v6.413Zm-9.62 9.621h6.413v-3.207h-3.207v-3.207h6.414v-3.207h3.207v-3.207h3.207v3.207h3.207v6.414H51.69v-3.207h-3.207v3.207h3.207v3.207h-6.414v3.207h-3.207V54.897h-3.207v3.206h-3.207v-3.206h-3.207V51.69h-3.207v-3.207h3.207v-3.207h3.207v3.207h3.207v-3.207h-3.207v-3.207Zm-3.208 0v3.207h-3.207v-3.207h3.207Zm-3.207-3.207v-3.207h6.414v6.414h-3.207v-3.207h-3.207Zm-9.62 0v-3.207h6.414v3.207h3.206v3.207h-6.413v-3.207H19.62Zm0 0v3.207h-3.207v3.207h-3.207v-3.207H10v-3.207H19.621Zm6.414 19.241V51.69h3.206v3.207h3.207v3.206h-6.413Zm0 3.207v-3.207h-3.207V48.483h3.207v-3.207H19.62v3.207h-6.414v6.414h6.414v3.206h3.207v3.207h-6.414v-3.207H10v19.242h12.828v-3.207H19.62V70.93h6.414v6.414h6.413v-3.207h3.207V83.759h3.207v-3.207h3.207v16.034h16.034v3.207H48.483V103h9.62v-3.207h3.207V103h16.035v-3.207H67.724v-3.207H61.31V93.38H70.931v-3.207h12.828v6.414h-3.207V93.38h-6.414v3.207h6.414V103H93.379v-3.207h3.207v-3.207h3.207v3.207H103V93.38h-3.207v-3.207H90.172v-3.206h3.207v-3.207h3.207V70.93h-9.62v-3.207H96.586v-3.207H93.38V61.31h3.207v-3.207H93.38v-3.206h3.207V51.69h3.207V64.517H103V51.69h-3.207v-3.207H103v-3.207h-3.207v3.207h-3.207v3.207H93.38v-3.207h-3.207v3.207h-3.206v3.207h-3.207v-6.414h3.207v-3.207H96.586v-3.207h3.207v-3.207h-3.207v-3.207h-6.414v3.207H83.76v3.207h-6.414v-3.207h-3.207v6.414H70.93v3.207h3.207v-3.207H83.759v3.207h-6.414v3.207h3.207v3.207H70.93v3.206H80.552v3.207h3.207v-3.207h3.207v3.207h3.206v3.207h-3.206v3.207h-3.207v-3.207h-6.414V61.31H70.93v3.207h3.207v3.207h-6.414v6.414h-3.207V70.93H61.31v3.207h-3.207V70.93h-3.206v3.207H51.69V83.759h-3.207v3.207h-3.207v-6.414h-3.207v-3.207h3.207v-3.207h-3.207v3.207h-3.207V70.93h-3.207v-6.414h3.207v3.207h3.207V61.31h-6.414v-3.207h-3.207v3.207h-6.413Zm0 3.207V61.31h-3.207v3.207H19.62v3.207h3.207v-3.207h3.207Zm3.206 6.414h3.207v3.207h-3.207V70.93Zm0 0v-3.207h3.207v-3.207h-6.413v6.414h3.206Zm25.656 16.035h-6.414v3.206h-3.207v3.207H58.103v-3.207h3.207v-3.206h3.207v-3.207h3.207v6.413h3.207V83.76h-3.207v-3.207h-3.207v-3.207H61.31v3.207h-3.207v3.207h-3.206v3.207Zm3.206 0h3.207v-3.207h3.207v-3.207H61.31v3.207h-3.207v3.207Zm0 0h-3.206v3.206h3.206v-3.206Zm-3.206-12.828v3.207h3.206v-3.207h-3.206Zm28.862-3.207v-3.207h-6.414v3.207H70.93v3.207h6.414V70.93h6.414Zm0 0v3.207h3.207V70.93h-3.207Zm6.413-16.034h-3.206v3.206h3.206v-3.206Zm-6.413 3.206v-3.206h-3.207v3.206h3.207Zm6.413-19.24v3.206h3.207v-3.207h-3.207Zm0 16.034V51.69h3.207v3.207h-3.207Zm3.207 28.862v-3.207h-3.207v3.207h3.207Zm-3.207 9.62v6.414h3.207V93.38h-3.207Zm0 0v-3.207h-3.206v3.207h3.206Zm-6.413 3.207v3.207h3.207v-3.207h-3.207ZM54.897 38.862H64.517v3.207h-9.62v-3.207Zm19.24-25.655h-6.413V10h6.414v3.207Zm-12.827 9.62h-3.207v-3.206h3.207v3.207ZM80.552 10H103v22.448H80.552V10Zm6.413 3.207H83.76V29.24H99.793V13.207H86.966Zm-70.551 3.207H26.035V26.035H16.414V16.414Zm70.552 0H96.586V26.035h-9.62V16.414ZM35.656 29.24h3.206v3.207h-3.207v-3.207Zm38.482 0h3.207v6.414h-3.207v-6.414Zm-6.414 6.414h3.207v3.207h-3.207v-3.207Zm32.07 32.07H103V77.344h-3.207V67.724Zm-6.415 6.413h-3.207v3.207h3.207v-3.207Zm-19.241 3.207H70.93v3.207h3.207v-3.207Zm6.414 0h-3.207V86.966H86.966V77.345h-6.414ZM10 80.552h22.448V103H10V80.552Zm6.414 3.207h-3.207V99.793H29.24V83.76H16.414Zm64.138-3.207h3.207v3.207h-3.207v-3.207Zm-64.138 6.413H26.035V96.587H16.414v-9.62Zm19.241 0h3.207v6.414h-3.207v-6.413Zm6.414 12.828h3.207V103h-3.207v-3.207Z" fill="#141422"/><path d="M65.068 53.042c-.403-.968-1.219-2.014-1.858-2.344.456.882.772 1.83.938 2.81l.002.015c-1.048-2.609-2.822-3.663-4.273-5.954a11.08 11.08 0 0 1-.218-.355 2.928 2.928 0 0 1-.102-.19 1.685 1.685 0 0 1-.144-.383.024.024 0 0 0-.015-.008.032.032 0 0 0-.017 0l-.005.002-.007.004.004-.006c-2.326 1.361-3.116 3.882-3.187 5.144a4.633 4.633 0 0 0-2.55.982 2.782 2.782 0 0 0-.239-.181 4.295 4.295 0 0 1-.026-2.264c-.854.414-1.613 1-2.229 1.723h-.004c-.367-.465-.341-1.999-.32-2.32a1.656 1.656 0 0 0-.31.165c-.323.231-.626.49-.904.775a8.089 8.089 0 0 0-.866 1.039v.001-.002a7.821 7.821 0 0 0-1.242 2.806l-.013.06c-.017.082-.08.49-.091.579l-.002.02a8.82 8.82 0 0 0-.15 1.277v.048a9.26 9.26 0 0 0 18.385 1.566c.016-.12.029-.238.042-.359a9.523 9.523 0 0 0-.6-4.652v.002ZM54.395 60.29c.043.02.083.043.128.063l.006.004a5.116 5.116 0 0 1-.134-.067Zm9.755-6.765v-.01l.001.01h-.001Z" fill="url(#a)"/><path d="M65.068 53.042c-.403-.968-1.219-2.014-1.858-2.344.456.883.772 1.83.938 2.81v.009l.002.01a8.387 8.387 0 0 1-.289 6.25c-1.061 2.277-3.629 4.611-7.65 4.497-4.344-.123-8.172-3.348-8.886-7.57-.13-.666 0-1.003.065-1.544-.089.42-.139.848-.148 1.277v.048a9.26 9.26 0 0 0 18.385 1.566c.016-.12.029-.238.042-.358a9.525 9.525 0 0 0-.6-4.652h-.001Z" fill="url(#b)"/><path d="M65.068 53.042c-.403-.968-1.219-2.014-1.858-2.344.456.883.772 1.83.938 2.81v.009l.002.01a8.387 8.387 0 0 1-.289 6.25c-1.061 2.277-3.629 4.611-7.65 4.497-4.344-.123-8.172-3.348-8.886-7.57-.13-.666 0-1.003.065-1.544-.089.42-.139.848-.148 1.277v.048a9.26 9.26 0 0 0 18.385 1.566c.016-.12.029-.238.042-.358a9.525 9.525 0 0 0-.6-4.652h-.001Z" fill="url(#c)"/><path d="m60.566 54.129.058.042a5.043 5.043 0 0 0-.86-1.121c-2.88-2.88-.755-6.241-.397-6.413l.004-.006c-2.326 1.362-3.116 3.883-3.187 5.145.108-.008.215-.017.325-.017a4.673 4.673 0 0 1 4.057 2.37Z" fill="url(#d)"/><path d="M56.514 54.705c-.015.23-.83 1.025-1.114 1.025-2.633 0-3.06 1.593-3.06 1.593.116 1.341 1.05 2.446 2.18 3.03.052.026.105.05.157.074.09.04.181.077.272.111a4.12 4.12 0 0 0 1.205.233c4.616.216 5.51-5.52 2.179-7.185a3.196 3.196 0 0 1 2.233.542 4.673 4.673 0 0 0-4.058-2.37c-.11 0-.217.01-.325.017a4.633 4.633 0 0 0-2.55.982c.142.12.301.28.637.61.628.62 2.24 1.26 2.243 1.336l.001.002Z" fill="url(#e)"/><path d="M56.514 54.705c-.015.23-.83 1.025-1.114 1.025-2.633 0-3.06 1.593-3.06 1.593.116 1.341 1.05 2.446 2.18 3.03.052.026.105.05.157.074.09.04.181.077.272.111a4.12 4.12 0 0 0 1.205.233c4.616.216 5.51-5.52 2.179-7.185a3.196 3.196 0 0 1 2.233.542 4.673 4.673 0 0 0-4.058-2.37c-.11 0-.217.01-.325.017a4.633 4.633 0 0 0-2.55.982c.142.12.301.28.637.61.628.62 2.24 1.26 2.243 1.336l.001.002Z" fill="url(#f)"/><path d="M53.202 52.452c.075.047.137.09.192.127a4.295 4.295 0 0 1-.026-2.264c-.855.414-1.614 1-2.23 1.723.046-.001 1.389-.025 2.064.414Z" fill="url(#g)"/><path d="M47.323 56.705c.715 4.222 4.542 7.447 8.886 7.57 4.021.113 6.59-2.222 7.65-4.498a8.387 8.387 0 0 0 .289-6.25v-.009c0-.007-.002-.01 0-.009l.002.016c.328 2.145-.763 4.222-2.469 5.629l-.005.012c-3.324 2.707-6.504 1.633-7.146 1.195a4.961 4.961 0 0 1-.135-.067c-1.938-.927-2.738-2.69-2.566-4.206a2.379 2.379 0 0 1-2.194-1.38 3.493 3.493 0 0 1 3.405-.136 4.611 4.611 0 0 0 3.476.136c-.003-.075-1.615-.716-2.243-1.335-.336-.331-.495-.49-.637-.61a2.78 2.78 0 0 0-.238-.181c-.055-.038-.117-.078-.192-.127-.675-.44-2.018-.415-2.063-.414h-.004c-.367-.465-.341-2-.32-2.32a1.66 1.66 0 0 0-.31.165c-.323.23-.626.49-.904.775-.319.32-.61.667-.87 1.036v.002-.002a7.82 7.82 0 0 0-1.242 2.805c-.005.019-.334 1.457-.172 2.203h.002Z" fill="url(#h)"/><path d="M59.763 53.05c.339.331.628.71.86 1.122.052.039.099.077.14.114 2.099 1.935.999 4.67.917 4.864 1.705-1.405 2.795-3.483 2.468-5.629-1.047-2.611-2.824-3.665-4.272-5.956a11.265 11.265 0 0 1-.218-.355 2.923 2.923 0 0 1-.102-.191 1.686 1.686 0 0 1-.144-.383.024.024 0 0 0-.015-.008.035.035 0 0 0-.018 0l-.004.003-.007.004c-.358.17-2.483 3.533.397 6.41l-.002.004Z" fill="url(#i)"/><path d="M60.762 54.287a1.93 1.93 0 0 0-.139-.114l-.057-.042a3.196 3.196 0 0 0-2.233-.542c3.33 1.665 2.437 7.4-2.179 7.184a4.12 4.12 0 0 1-1.205-.232 4.906 4.906 0 0 1-.428-.186l.007.004c.643.44 3.822 1.513 7.146-1.195l.005-.012c.083-.193 1.183-2.929-.917-4.864v-.001Z" fill="url(#j)"/><path d="M52.34 57.321s.427-1.593 3.06-1.593c.285 0 1.1-.794 1.114-1.025a4.612 4.612 0 0 1-3.476-.136 3.492 3.492 0 0 0-3.405.136 2.378 2.378 0 0 0 2.194 1.38c-.172 1.514.629 3.278 2.566 4.206.043.02.084.043.128.063-1.13-.585-2.065-1.69-2.181-3.03Z" fill="url(#k)"/><path d="M65.068 53.042c-.403-.968-1.219-2.014-1.858-2.344.456.882.772 1.83.938 2.81l.002.015c-1.048-2.609-2.822-3.663-4.273-5.954a11.265 11.265 0 0 1-.218-.355 2.923 2.923 0 0 1-.102-.19 1.685 1.685 0 0 1-.144-.383.024.024 0 0 0-.015-.008.033.033 0 0 0-.017 0l-.005.002-.007.004.004-.006c-2.326 1.361-3.116 3.882-3.187 5.144.108-.008.215-.017.325-.017a4.673 4.673 0 0 1 4.057 2.37 3.197 3.197 0 0 0-2.233-.542c3.331 1.665 2.437 7.4-2.178 7.184a4.117 4.117 0 0 1-1.205-.232 4.828 4.828 0 0 1-.429-.186l.007.004a4.825 4.825 0 0 1-.135-.067c.043.02.084.043.128.063-1.13-.584-2.064-1.69-2.18-3.03 0 0 .427-1.593 3.06-1.593.285 0 1.099-.794 1.114-1.024-.004-.076-1.616-.717-2.244-1.336-.336-.331-.495-.49-.636-.61a2.765 2.765 0 0 0-.24-.181 4.293 4.293 0 0 1-.025-2.264c-.855.414-1.614 1-2.23 1.723h-.004c-.366-.465-.34-1.999-.32-2.32a1.653 1.653 0 0 0-.309.165 6.75 6.75 0 0 0-.905.775 8.08 8.08 0 0 0-.866 1.039v.001-.002a7.82 7.82 0 0 0-1.242 2.805l-.013.062c-.017.081-.095.495-.106.584-.072.427-.117.858-.137 1.29v.049a9.261 9.261 0 0 0 18.386 1.566l.042-.359a9.525 9.525 0 0 0-.6-4.652Zm-.919.475.002.01-.002-.01Z" fill="url(#l)"/><defs><radialGradient id="b" cx="0" cy="0" r="1" gradientUnits="userSpaceOnUse" gradientTransform="translate(63.247 48.782) scale(19.3057)"><stop offset=".129" stop-color="#FFBD4F"/><stop offset=".186" stop-color="#FFAC31"/><stop offset=".247" stop-color="#FF9D17"/><stop offset=".283" stop-color="#FF980E"/><stop offset=".403" stop-color="#FF563B"/><stop offset=".467" stop-color="#FF3750"/><stop offset=".71" stop-color="#F5156C"/><stop offset=".782" stop-color="#EB0878"/><stop offset=".86" stop-color="#E50080"/></radialGradient><radialGradient id="c" cx="0" cy="0" r="1" gradientUnits="userSpaceOnUse" gradientTransform="translate(56.08 56.666) scale(19.3057)"><stop offset=".3" stop-color="#960E18"/><stop offset=".351" stop-color="#B11927" stop-opacity=".74"/><stop offset=".435" stop-color="#DB293D" stop-opacity=".343"/><stop offset=".497" stop-color="#F5334B" stop-opacity=".094"/><stop offset=".53" stop-color="#FF3750" stop-opacity="0"/></radialGradient><radialGradient id="d" cx="0" cy="0" r="1" gradientUnits="userSpaceOnUse" gradientTransform="translate(58.468 44.481) scale(13.9847)"><stop offset=".132" stop-color="#FFF44F"/><stop offset=".252" stop-color="#FFDC3E"/><stop offset=".506" stop-color="#FF9D12"/><stop offset=".526" stop-color="#FF980E"/></radialGradient><radialGradient id="e" cx="0" cy="0" r="1" gradientUnits="userSpaceOnUse" gradientTransform="translate(53.929 61.684) scale(9.19171)"><stop offset=".353" stop-color="#3A8EE6"/><stop offset=".472" stop-color="#5C79F0"/><stop offset=".669" stop-color="#9059FF"/><stop offset="1" stop-color="#C139E6"/></radialGradient><radialGradient id="f" cx="0" cy="0" r="1" gradientUnits="userSpaceOnUse" gradientTransform="matrix(4.73773 -1.14544 1.34103 5.5467 57.013 55.01)"><stop offset=".206" stop-color="#9059FF" stop-opacity="0"/><stop offset=".278" stop-color="#8C4FF3" stop-opacity=".064"/><stop offset=".747" stop-color="#7716A8" stop-opacity=".45"/><stop offset=".975" stop-color="#6E008B" stop-opacity=".6"/></radialGradient><radialGradient id="g" cx="0" cy="0" r="1" gradientUnits="userSpaceOnUse" gradientTransform="translate(55.84 48.065) scale(6.61363)"><stop stop-color="#FFE226"/><stop offset=".121" stop-color="#FFDB27"/><stop offset=".295" stop-color="#FFC82A"/><stop offset=".502" stop-color="#FFA930"/><stop offset=".732" stop-color="#FF7E37"/><stop offset=".792" stop-color="#FF7139"/></radialGradient><radialGradient id="h" cx="0" cy="0" r="1" gradientUnits="userSpaceOnUse" gradientTransform="translate(61.097 43.764) scale(28.2178)"><stop offset=".113" stop-color="#FFF44F"/><stop offset=".456" stop-color="#FF980E"/><stop offset=".622" stop-color="#FF5634"/><stop offset=".716" stop-color="#FF3647"/><stop offset=".904" stop-color="#E31587"/></radialGradient><radialGradient id="i" cx="0" cy="0" r="1" gradientUnits="userSpaceOnUse" gradientTransform="matrix(2.1701 20.56421 -13.49616 1.42422 58.751 45.329)"><stop stop-color="#FFF44F"/><stop offset=".06" stop-color="#FFE847"/><stop offset=".168" stop-color="#FFC830"/><stop offset=".304" stop-color="#FF980E"/><stop offset=".356" stop-color="#FF8B16"/><stop offset=".455" stop-color="#FF672A"/><stop offset=".57" stop-color="#FF3647"/><stop offset=".737" stop-color="#E31587"/></radialGradient><radialGradient id="j" cx="0" cy="0" r="1" gradientUnits="userSpaceOnUse" gradientTransform="translate(55.84 50.454) scale(17.614)"><stop offset=".137" stop-color="#FFF44F"/><stop offset=".48" stop-color="#FF980E"/><stop offset=".592" stop-color="#FF5634"/><stop offset=".655" stop-color="#FF3647"/><stop offset=".904" stop-color="#E31587"/></radialGradient><radialGradient id="k" cx="0" cy="0" r="1" gradientUnits="userSpaceOnUse" gradientTransform="translate(60.38 51.41) scale(19.2794)"><stop offset=".094" stop-color="#FFF44F"/><stop offset=".231" stop-color="#FFE141"/><stop offset=".509" stop-color="#FFAF1E"/><stop offset=".626" stop-color="#FF980E"/></radialGradient><linearGradient id="a" x1="63.842" y1="49.59" x2="48.468" y2="64.423" gradientUnits="userSpaceOnUse"><stop offset=".048" stop-color="#FFF44F"/><stop offset=".111" stop-color="#FFE847"/><stop offset=".225" stop-color="#FFC830"/><stop offset=".368" stop-color="#FF980E"/><stop offset=".401" stop-color="#FF8B16"/><stop offset=".462" stop-color="#FF672A"/><stop offset=".534" stop-color="#FF3647"/><stop offset=".705" stop-color="#E31587"/></linearGradient><linearGradient id="l" x1="63.656" y1="49.512" x2="50.577" y2="62.593" gradientUnits="userSpaceOnUse"><stop offset=".167" stop-color="#FFF44F" stop-opacity=".8"/><stop offset=".266" stop-color="#FFF44F" stop-opacity=".634"/><stop offset=".489" stop-color="#FFF44F" stop-opacity=".217"/><stop offset=".6" stop-color="#FFF44F" stop-opacity="0"/></linearGradient></defs></svg>
		`- \ No newline at end of file`
		`diff --git a/browser/components/preferences/more-from-mozilla-qr-code-simple-cn.svg b/browser/components/preferences/more-from-mozilla-qr-code-simple-cn.svg`
		`deleted file mode 100644`
		`index 5052db9702..0000000000`
		`@@ -354,15 +334,13 @@`

		`// These app marketplace icons are referenced based on the user's locale`
		`// in browser/components/newtab/content-src/aboutwelcome/components/MobileDownloads.jsx`
		`- diff --git a/browser/components/newtab/lib/OnboardingMessageProvider.jsm b/browser/components/newtab/lib/OnboardingMessageProvider.jsm`
		`- index 940332f27f..1f7378bbae 100644`
		`+ diff -u a/browser/components/newtab/lib/OnboardingMessageProvider.jsm b/browser/components/newtab/lib/OnboardingMessageProvider.jsm`
		`--- a/browser/components/newtab/lib/OnboardingMessageProvider.jsm`
		`+++ b/browser/components/newtab/lib/OnboardingMessageProvider.jsm`
		`- @@ -95,220 +95,6 @@ const ONBOARDING_MESSAGES = () => [`
		`- ],`
		`+ @@ -649,321 +649,6 @@`
		`},`
		`},`
		`- - {`
		`+ {`
		`- id: "PB_NEWTAB_FOCUS_PROMO",`
		`- type: "default",`
		`- template: "pb_newtab",`
		`@@ -443,10 +421,6 @@`
		`- alt_text: {`
		`- string_id: "spotlight-focus-promo-qr-code",`
		`- },`
		`- - image_overrides: {`
		`- - de:`
		`- - "chrome://browser/content/assets/klar-qr-code.svg",`
		`- - },`
		`- },`
		`- marketplace_buttons: ["ios", "android"],`
		`- },`
		`@@ -469,7 +443,9 @@`
		`- ],`
		`- lifetime: 12,`
		`- },`
		`- - targeting: "!(region in [ 'DE', 'AT', 'CH'] && localeLanguageCode == 'en')",`
		`+ - // Exclude the next 2 messages: 1) Klar for en 2) Klar for de`
		`+ - targeting:`
		`+ - "!(region in [ 'DE', 'AT', 'CH'] && localeLanguageCode == 'en') && localeLanguageCode != 'de'",`
		`- },`
		`- {`
		`- id: "PB_NEWTAB_KLAR_PROMO",`
		`@@ -549,6 +525,109 @@`
		`- QR_code: {`
		`- image_url:`
		`- "chrome://browser/content/assets/klar-qr-code.svg",`
		`+ - alt_text: "Scan the QR code to get Firefox Klar",`
		`+ - },`
		`+ - marketplace_buttons: ["ios", "android"],`
		`+ - },`
		`+ - },`
		`+ - },`
		`+ - },`
		`+ - ],`
		`+ - },`
		`+ - },`
		`+ - },`
		`+ - },`
		`+ - },`
		`+ - priority: 2,`
		`+ - frequency: {`
		`+ - custom: [`
		`+ - {`
		`+ - cap: 3,`
		`+ - period: 604800000, // Max 3 per week`
		`+ - },`
		`+ - ],`
		`+ - lifetime: 12,`
		`+ - },`
		`+ - targeting: "region in [ 'DE', 'AT', 'CH'] && localeLanguageCode == 'en'",`
		`+ - },`
		`+ - {`
		`+ - id: "PB_NEWTAB_KLAR_PROMO_DE",`
		`+ - type: "default",`
		`+ - template: "pb_newtab",`
		`+ - groups: ["pbNewtab"],`
		`+ - content: {`
		`+ - infoBody: "fluent:about-private-browsing-info-description-simplified",`
		`+ - infoEnabled: true,`
		`+ - infoIcon: "chrome://global/skin/icons/indicator-private-browsing.svg",`
		`+ - infoLinkText: "fluent:about-private-browsing-learn-more-link",`
		`+ - infoTitle: "",`
		`+ - infoTitleEnabled: false,`
		`+ - promoEnabled: true,`
		`+ - promoType: "FOCUS",`
		`+ - promoHeader: "fluent:about-private-browsing-focus-promo-header-c",`
		`+ - promoImageLarge: "chrome://browser/content/assets/focus-promo.png",`
		`+ - promoLinkText: "fluent:about-private-browsing-focus-promo-cta",`
		`+ - promoLinkType: "button",`
		`+ - promoSectionStyle: "below-search",`
		`+ - promoTitle: "fluent:about-private-browsing-focus-promo-text-c",`
		`+ - promoTitleEnabled: true,`
		`+ - promoButton: {`
		`+ - action: {`
		`+ - type: "SHOW_SPOTLIGHT",`
		`+ - data: {`
		`+ - content: {`
		`+ - id: "FOCUS_PROMO",`
		`+ - template: "multistage",`
		`+ - modal: "tab",`
		`+ - backdrop: "transparent",`
		`+ - screens: [`
		`+ - {`
		`+ - id: "DEFAULT_MODAL_UI",`
		`+ - content: {`
		`+ - logo: {`
		`+ - imageURL:`
		`+ - "chrome://browser/content/assets/focus-logo.svg",`
		`+ - height: "48px",`
		`+ - },`
		`+ - title: {`
		`+ - string_id: "spotlight-focus-promo-title",`
		`+ - },`
		`+ - subtitle: {`
		`+ - string_id: "spotlight-focus-promo-subtitle",`
		`+ - },`
		`+ - dismiss_button: {`
		`+ - action: {`
		`+ - navigate: true,`
		`+ - },`
		`+ - },`
		`+ - ios: {`
		`+ - action: {`
		`+ - data: {`
		`+ - args:`
		`+ - "https://app.adjust.com/a8bxj8j?campaign=firefox-desktop&adgroup=pb&creative=focus-omc172&redirect=https%3A%2F%2Fapps.apple.com%2Fde%2Fapp%2Fklar-by-firefox%2Fid1073435754",`
		`+ - where: "tabshifted",`
		`+ - },`
		`+ - type: "OPEN_URL",`
		`+ - navigate: true,`
		`+ - },`
		`+ - },`
		`+ - android: {`
		`+ - action: {`
		`+ - data: {`
		`+ - args:`
		`+ - "https://app.adjust.com/a8bxj8j?campaign=firefox-desktop&adgroup=pb&creative=focus-omc172&redirect=https%3A%2F%2Fplay.google.com%2Fstore%2Fapps%2Fdetails%3Fid%3Dorg.mozilla.klar",`
		`+ - where: "tabshifted",`
		`+ - },`
		`+ - type: "OPEN_URL",`
		`+ - navigate: true,`
		`+ - },`
		`+ - },`
		`+ - tiles: {`
		`+ - type: "mobile_downloads",`
		`+ - data: {`
		`+ - QR_code: {`
		`+ - image_url:`
		`+ - "chrome://browser/content/assets/klar-qr-code.svg",`
		`- alt_text: {`
		`- string_id: "spotlight-focus-promo-qr-code",`
		`- },`
		`@@ -574,21 +653,19 @@`
		`- ],`
		`- lifetime: 12,`
		`- },`
		`- - targeting: "region in [ 'DE', 'AT', 'CH'] && localeLanguageCode == 'en'",`
		`+ - targeting: "localeLanguageCode == 'de'",`
		`- },`
		`- {`
		`+ - {`
		`id: "PB_NEWTAB_INFO_SECTION",`
		`template: "pb_newtab",`
		`-`
		`- diff --git a/browser/components/newtab/lib/PanelTestProvider.jsm b/browser/components/newtab/lib/PanelTestProvider.jsm`
		`- index a991581f7b..af57c3eea8 100644`
		`+ content: {`
		`+ diff -u a/browser/components/newtab/lib/PanelTestProvider.jsm b/browser/components/newtab/lib/PanelTestProvider.jsm`
		`--- a/browser/components/newtab/lib/PanelTestProvider.jsm`
		`+++ b/browser/components/newtab/lib/PanelTestProvider.jsm`
		`- @@ -558,90 +558,6 @@ const MESSAGES = () => [`
		`- frequency: { lifetime: 3 },`
		`+ @@ -557,87 +557,6 @@`
		`trigger: { id: "defaultBrowserCheck" },`
		`},`
		`- - {`
		`+ {`
		`- id: "PB_FOCUS_PROMO",`
		`- groups: ["panel-test-provider"],`
		`- template: "spotlight",`
		`@@ -656,9 +733,6 @@`
		`- alt_text: {`
		`- string_id: "spotlight-focus-promo-qr-code",`
		`- },`
		`- - image_overrides: {`
		`- - de: "chrome://browser/content/assets/klar-qr-code.svg",`
		`- - },`
		`- },`
		`- email: {`
		`- link_text: "Email yourself a link",`
		`@@ -672,9 +746,10 @@`
		`- },`
		`- trigger: { id: "defaultBrowserCheck" },`
		`- },`
		`- {`
		`+ - {`
		`id: "PB_NEWTAB_VPN_PROMO",`
		`template: "pb_newtab",`
		`+ content: {`
		`diff --git a/browser/components/privatebrowsing/content/assets/focus-qr-code.svg b/browser/components/privatebrowsing/content/assets/focus-qr-code.svg`
		`deleted file mode 100644`
		`index f182567314..0000000000`
		`@@ -961,46 +1036,56 @@`
		`</groupbox>`

		`<vbox id="hasFxaAccount">`
		`- diff --git a/browser/locales/en-US/browser/policies/policies-descriptions.ftl b/browser/locales/en-US/browser/policies/policies-descriptions.ftl`
		`- index dabfadc..3ce732e 100644`
		`- --- a/browser/locales/en-US/browser/policies/policies-descriptions.ftl`
		`- +++ b/browser/locales/en-US/browser/policies/policies-descriptions.ftl`
		`- @@ -96,7 +96,7 @@ policy-ExtensionSettings = Manage all aspects of extension installation.`
		`+ diff --git a/browser/locales/en-US/browser/branding/brandings.ftl b/browser/locales/en-US/browser/branding/brandings.ftl`
		`+ index efba683d66..9fe12b80fa 100644`
		`+ --- a/browser/locales/en-US/browser/branding/brandings.ftl`
		`+ +++ b/browser/locales/en-US/browser/branding/brandings.ftl`
		`+ @@ -15,28 +15,28 @@`
		`+ ## https://mozilla-l10n.github.io/styleguides/mozilla_general/#brands-copyright-and-trademark`

		`- policy-ExtensionUpdate = Enable or disable automatic extension updates.`
		`+ -facebook-container-brand-name = Facebook Container`
		`+ --lockwise-brand-name = Firefox Lockwise`
		`+ +-lockwise-brand-name = Iceweasel Lockwise`
		`+ -lockwise-brand-short-name = Lockwise`
		`+ --monitor-brand-name = Firefox Monitor`
		`+ +-monitor-brand-name = Iceweasel Monitor`
		`+ -monitor-brand-short-name = Monitor`
		`+ -pocket-brand-name = Pocket`
		`+ --send-brand-name = Firefox Send`
		`+ --screenshots-brand-name = Firefox Screenshots`
		`+ +-send-brand-name = Iceweasel Send`
		`+ +-screenshots-brand-name = Iceweasel Screenshots`
		`+ -mozilla-vpn-brand-name = Mozilla VPN`
		`+ --profiler-brand-name = Firefox Profiler`
		`+ --translations-brand-name = Firefox Translations`
		`+ +-profiler-brand-name = Iceweasel Profiler`
		`+ +-translations-brand-name = Iceweasel Translations`
		`+ -rally-brand-name = Mozilla Rally`
		`+ -rally-short-name = Rally`
		`+ --focus-brand-name = Firefox Focus`
		`+ +-focus-brand-name = Iceweasel Focus`

		`- -policy-FirefoxHome = Configure Firefox Home.`
		`- +policy-FirefoxHome = Configure Iceweasel Home.`
		`+ -# “Suggest” can be localized, “Firefox” must be treated as a brand`
		`+ +# “Suggest” can be localized, “Iceweasel” must be treated as a brand`
		`+ # and kept in English.`
		`+ --firefox-suggest-brand-name = Firefox Suggest`
		`+ +-firefox-suggest-brand-name = Iceweasel Suggest`

		`- policy-FlashPlugin = Allow or deny usage of the Flash plugin.`
		`+ -# ”Home" can be localized, “Firefox” must be treated as a brand`
		`+ +# ”Home" can be localized, “Iceweasel” must be treated as a brand`
		`+ # and kept in English.`
		`+ --firefox-home-brand-name = Firefox Home`
		`+ +-firefox-home-brand-name = Iceweasel Home`

		`+ -# View" can be localized, “Firefox” must be treated as a brand`
		`+ +# View" can be localized, “Iceweasel” must be treated as a brand`
		`+ # and kept in English.`
		`+ --firefoxview-brand-name = Firefox View`
		`+ +-firefoxview-brand-name = Iceweasel View`
		`diff --git a/browser/locales/en-US/browser/preferences/preferences.ftl b/browser/locales/en-US/browser/preferences/preferences.ftl`
		`index 1b29e8d..6f7566c 100644`
		`--- a/browser/locales/en-US/browser/preferences/preferences.ftl`
		`+++ b/browser/locales/en-US/browser/preferences/preferences.ftl`
		`- @@ -550,7 +550,7 @@ home-restore-defaults =`
		`- # "Firefox" should be treated as a brand and kept in English,`
		`- # while "Home" and "(Default)" can be localized.`
		`- home-mode-choice-default =`
		`- - .label = Firefox Home (Default)`
		`- + .label = Iceweasel Home (Default)`
		`-`
		`- home-mode-choice-custom =`
		`- .label = Custom URLs…`
		`- @@ -577,10 +577,10 @@ choose-bookmark =`
		`- .label = Use Bookmark…`
		`- .accesskey = B`
		`-`
		`- -## Home Section - Firefox Home Content Customization`
		`- +## Home Section - Iceweasel Home Content Customization`
		`-`
		`- -home-prefs-content-header = Firefox Home Content`
		`- -home-prefs-content-description = Choose what content you want on your Firefox Home screen.`
		`- +home-prefs-content-header = Iceweasel Home Content`
		`- +home-prefs-content-description = Choose what content you want on your Iceweasel Home screen.`
		`-`
		`- home-prefs-search-header =`
		`- .label = Web Search`
		`@@ -714,16 +714,6 @@ sync-signedout-account-signin2 =`
		`.label = Sign in to { -sync-brand-short-name }…`
		`.accesskey = i`
		`@@ -1066,10 +1151,10 @@`
		`</p>`
		`</div>`
		`<a target="_blank" id="get-vpn-link" data-l10n-id="get-vpn-link"></a>`
		`- diff --git a/browser/components/protections/content/vpn-card.js b/browser/components/protections/content/vpn-card.js`
		`+ diff --git a/browser/components/protections/content/vpn-card.mjs b/browser/components/protections/content/vpn-card.mjs`
		`index 2417f1a641..698c48ccc3 100644`
		`- --- a/browser/components/protections/content/vpn-card.js`
		`- +++ b/browser/components/protections/content/vpn-card.js`
		`+ --- a/browser/components/protections/content/vpn-card.mjs`
		`+ +++ b/browser/components/protections/content/vpn-card.mjs`
		`@@ -23,22 +23,6 @@ export default class VPNCard {`
		`vpnLink.addEventListener("click", () => {`
		`this.doc.sendTelemetryEvent("click", "vpn_card_link");`

libre/iceweasel/PKGBUILD

file modified

+383 -185

		`@@ -14,6 +14,7 @@`
		`# Contributor: Figue <ffigue at gmail>`
		`# Contributor: evr <evanroman at gmail>`
		`# Contributor: Muhammad 'MJ' Jassim <UnbreakableMJ@gmail.com>`
		`+ # Contributor: vando <facundo@esdebian.org>`
		`# Contributor: taro-k <taro-k@movasense_com>`
		`# Contributor: Michał Masłowski <mtjm@mtjm.eu>`
		`# Contributor: Luke R. <g4jc@openmailbox.org>`
		`@@ -23,18 +24,25 @@`


		`# parabola changes and rationale`
		`- # FSDG:`
		`+ # libre:`
		`# - Modify the addons pages to use GNU IceCat plugins sources, rather`
		`# than addons.mozilla.org, which hosts non-free addons`
		`# - Disable EME, which is implemented via the non-free libWideVine CDM`
		`# - Disable Normandy that let Mozilla push messages with recommendations`
		`# of nonfree software`
		`# - Make Remote Settings work completely offline using local data`
		`+ # - Use system python libs. The arch package uses 'pip' to download`
		`+ # dependencies from the internet at build-time, despite that those needed`
		`+ # dependencies are already packaged in the arch repos. So strictly-speaking,`
		`+ # the package is not built from source, as some sources will be missing`
		`+ # from the published source package, and will not be required as makedepends.`
		`#`
		`# technical:`
		`# - build i686 with GCC instead of clang`
		`# - disable rust-SIMD, LTO, PGO, and skip profiling build for armv7h and i686`
		`- # - allow skipping profiling build for x86_64 (_x86_64_skip_pgo)`
		`+ # - allow skipping profiling build for x86_64 (_x86_64_skip_pgo).`
		`+ # this is to avoid OOM problems, and occasional deadlocks in some versions,`
		`+ # which expect active netwokring or internet access at build time.`
		`# - prefer as many system libs as possible, over their vendored couterparts`
		`# - Rebrand to Iceweasel, per the mozilla trademark policy, due to the FSDG changes`
		`# - set user profile directory to ~/.mozilla/iceweasel`
		`@@ -46,78 +54,168 @@`
		`# - do not compile/upload remote debug symbols`


		`- # NOTE: This PKGBUILD is kept in-sync with arch{,arm,32}, as closely as possible,`
		`+ # NOTE: This PKGBUILD is kept in-sync, as closely as possible,`
		`+ # with arch{,arm,32} (firefox), and parabola {iceweasel,icecat},`
		`# for the sake of documentation and cleaner diffs.`
		`# That also helps to identify which changes were made by Parabola vs upstream.`
		`# Therefore, this PKGBUILD may declare blacklisted dependencies, non-free sources,`
		`# or include code for anti-features; but those will be filtered-out subsequently.`
		`# Any code which implements an anti-feature should be commented-out;`
		`# and include an 'anti-feature' comment, for clarity.`
		`- # Any blacklisted dependencies and non-free sources should be filtered.`
		`+ # Any blacklisted dependencies and non-free sources should be filtered,`
		`+ # and include a 'non-free' comment, for clarity.`
		`# Without those over-rides, the resulting program may not be FSDG-fit.`
		`# Do not circumvent those over-rides, if compiling for the Parabola repos.`


		`pkgname=iceweasel`
		`epoch=1`
		`- pkgver=102.0`
		`+ pkgver=108.0`
		`pkgrel=1`
		`pkgrel+=.parabola1`
		`_brandingver=102.0-1`
		`pkgdesc="Standalone web browser derived from Mozilla Firefox"`
		`+ url=https://wiki.parabola.nu/Iceweasel`
		`arch=(x86_64)`
		`- arch+=(armv7h i686)`
		`- license=(MPL GPL LGPL)`
		`- url="https://wiki.parabola.nu/Iceweasel"`
		`- depends=(gtk3 libxt mime-types dbus-glib ffmpeg nss ttf-font libpulse)`
		`- makedepends=(unzip zip diffutils yasm mesa imake inetutils xorg-server-xvfb`
		`- autoconf2.13 rust clang llvm jack nodejs cbindgen nasm`
		`- python-setuptools python-zstandard lld dump_syms`
		`- wasi-compiler-rt wasi-libc wasi-libc++ wasi-libc++abi)`
		`- makedepends+=(quilt libxslt imagemagick git jq python-jsonschema)`
		`- makedepends_i686=(gcc10)`
		`- optdepends=('networkmanager: Location detection via available WiFi networks'`
		`- 'libnotify: Notification integration'`
		`- 'pulseaudio: Audio support'`
		`- 'speech-dispatcher: Text-to-Speech'`
		`- 'hunspell-en_US: Spell checking, American English'`
		`- 'xdg-desktop-portal: Screensharing with Wayland')`
		`+ arch+=(`
		`+ armv7h`
		`+ i686)`
		`+ license=(`
		`+ GPL`
		`+ LGPL`
		`+ MPL`
		`+ )`
		`+ depends=(`
		`+ dbus-glib`
		`+ ffmpeg`
		`+ gtk3`
		`+ libpulse`
		`+ libxt`
		`+ mime-types`
		`+ nss`
		`+ ttf-font`
		`+ )`
		`+ makedepends=(`
		`+ cbindgen`
		`+ clang`
		`+ diffutils`
		`+ dump_syms`
		`+ imake`
		`+ inetutils`
		`+ jack`
		`+ lld`
		`+ llvm`
		`+ mesa`
		`+ nasm`
		`+ nodejs`
		`+ python`
		`+ rust`
		`+ unzip`
		`+ wasi-compiler-rt`
		`+ wasi-libc`
		`+ wasi-libc++`
		`+ wasi-libc++abi`
		`+ xorg-server-xvfb`
		`+ yasm`
		`+ zip`
		`+ )`
		`+ makedepends+=(`
		`+ git`
		`+ imagemagick`
		`+ jq`
		`+ libxslt`
		`+ python-jsonschema`
		`+ python-setuptools`
		`+ python-typing-extensions`
		`+ python-zstandard`
		`+ quilt`
		`+ )`
		`+ optdepends=(`
		`+ 'hunspell-en_US: Spell checking, American English'`
		`+ 'libnotify: Notification integration'`
		`+ 'networkmanager: Location detection via available WiFi networks'`
		`+ 'pulseaudio: Audio support'`
		`+ 'speech-dispatcher: Text-to-Speech'`
		`+ 'xdg-desktop-portal: Screensharing with Wayland'`
		`+ )`
		`+ # provides=('firefox') # TODO: redmine #2164 - currently conflicts with 'your-freedom'`
		`replaces=('firefox')`
		`- options=(!emptydirs !makeflags !strip !lto !debug) # FIXME: can we still make debug package?`
		`- source=(https://archive.mozilla.org/pub/firefox/releases/$pkgver/source/firefox-$pkgver.source.tar.xz{,.asc}`
		`- zstandard-0.18.0.diff`
		`- $pkgname.desktop identity-icons-brand.svg)`
		`+ options=(`
		`+ !debug`
		`+ !emptydirs`
		`+ !lto`
		`+ !makeflags`
		`+ !strip`
		`+ )`
		`+ source=(`
		`+ https://archive.mozilla.org/pub/firefox/releases/$pkgver/source/firefox-$pkgver.source.tar.xz{,.asc}`
		`+ $pkgname.desktop`
		`+ identity-icons-brand.svg`
		`+ 0001-libwebrtc-screen-cast-sync.patch`
		`+ )`
		`source=(${source[*]/identity-icons-brand.svg/})`
		`- source+=(https://repo.parabola.nu/other/iceweasel/${pkgname}_${_brandingver}.branding.tar.xz{,.sig}`
		`- 9001-FSDG-sync-remote-settings-with-local-dump.patch`
		`- 9002-FSDG-preference-defaults.patch`
		`- 9003-FSDG-urihandlers.patch`
		`- 9004-FSDG-misc.patch`
		`- process-json-files.py`
		`- vendor.js.in)`
		`+ source+=(`
		`+ https://repo.parabola.nu/other/iceweasel/${pkgname}_${_brandingver}.branding.tar.xz{,.sig}`
		`+ 9001-FSDG-sync-remote-settings-with-local-dump.patch`
		`+ 9002-FSDG-preference-defaults.patch`
		`+ 9003-FSDG-urihandlers.patch`
		`+ 9004-FSDG-misc.patch`
		`+ process-json-files.py`
		`+ vendor.js.in`
		`+ zstandard-0.19.0.diff`
		`+ )`
		`source_armv7h=(build-arm-libopus.patch)`
		`- source_i686=('avoid-libxul-OOM-python-check.patch'`
		`- 'rust-static-disable-network-test-on-static-libraries.patch'`
		`- 'firefox-99.0.1-fdlibm-double.patch')`
		`- sha256sums=('01797f04bd8d65f4c7f628d7ce832bf52a0874433886e4d0d78ef33c1ca66abf'`
		`+ source_i686=(`
		`+ avoid-libxul-OOM-python-check.patch`
		`+ rust-static-disable-network-test-on-static-libraries.patch`
		`+ firefox-107.0-fdlibm.patch`
		`+ fix-i686-build-moz-1792159.patch`
		`+ )`
		`+ validpgpkeys=(`
		`+ '14F26682D0916CDD81E37B6D61B7B526D98F0353' # Mozilla Software Releases <release@mozilla.com>`
		`+ )`
		`+ validpgpkeys+=(`
		`+ 'BFA8008A8265677063B11BF47171986E4B745536' # Andreas Grapentin`
		`+ '3954A7AB837D0EA9CFA9798925DB7D9B5A8D4B40' # bill-auger`
		`+ )`
		`+ sha256sums=('ce0d31f89111fcce9e2dd490d810b6a704f7214ba0186fa2d2ec960099808e63'`
		`'SKIP'`
		`- 'a6857ad2f2e2091c6c4fdcde21a59fbeb0138914c0e126df64b50a5af5ff63be'`
		`- '9cdc2602661717712092d28bb494e5b48e518cb930898aca85eaf21f91f7ef58')`
		`+ '9cdc2602661717712092d28bb494e5b48e518cb930898aca85eaf21f91f7ef58'`
		`+ '5c164f6dfdf2d97f3f317e417aaa2e6ae46a9b3a160c3162d5073fe39d203286')`
		`sha256sums+=('d29c194ed7b3b4fa0f511866723118938c2be40077b4e9aadf8b3e6bfff91049'`
		`'SKIP'`
		`- '77b79ce95a560d371b08925a4f8c005b38e45936f61c8e4a4378d5ac56313cba'`
		`+ '29117bc6311dcd05c9427877fde4ec491f328b758526edf8da534f68054097b9'`
		`'a2c71759290dd48c87bf8aacb681040dcaefdabe0d57317de361d2d2d509664b'`
		`- 'e192458a2a9878483984e1400bb3c66df369adfbf6f144b90445f80973c32ed1'`
		`- 'a6a0bf8296d42a0ea2664efd45e9131df1f19fc6199724ec78d66119589850dd'`
		`+ '13b701372b6fb35b96a1d58853db64643feb9be061ebc461b41ceca5de8eea62'`
		`+ '0c5333c4fc28ba9ca5b4d00127918d662fe8c570d4ebc0a64e5174e0ef41ae01'`
		`'6a0250c20a6f4cbf0ff1320c194342fe691ece56959d87de41be8f82a8feca65'`
		`- 'c93ce98e1cb64033079343ff1f3037fab6a3bc6d3eb5bc14c5edb70e2d45965d')`
		`+ '5095942e37c4d9814788b7ac5a48661fbcf1d2ced56a02b74e5a58e7e8a5bd45'`
		`+ '8f5ae64094170978ff97f2c14a14a3ef5e69083aa8b513630725aeaa7e892e8f')`
		`sha256sums_armv7h=('2d4d91f7e35d0860225084e37ec320ca6cae669f6c9c8fe7735cdbd542e3a7c9')`
		`sha256sums_i686=('2f0c81a38c4578f68f5456b618fe84a78974072821488173eb55e0e72287e353'`
		`'10c5276eab2e87f400a6ec15d7ffbef3b0407ee888dea36f1128927ca55b9041'`
		`- '62695e56daf8c0b8bb921980d475b3fd169b9134188ad9ffaeb9cd660589c23d')`
		`- validpgpkeys=('14F26682D0916CDD81E37B6D61B7B526D98F0353') # Mozilla Software Releases <release@mozilla.com>`
		`- validpgpkeys+=('BFA8008A8265677063B11BF47171986E4B745536') # Andreas Grapentin`
		`- validpgpkeys+=('3954A7AB837D0EA9CFA9798925DB7D9B5A8D4B40') # bill-auger`
		`+ '1c2015e9f59c2c3bc898e04c6c6d33523f835638fd314d24944a8063cbce79d8'`
		`+ '2fb39374fd3d80eea9e346032a2a4b2bc2e357dee7380855b24bcf19b1335d06')`
		`+ b2sums=('ac8e5d613899df4634d7126735b219938b48f49c9306c09eb1669fadcc362f6d492ec3cb6d8a8113eced73fc3351c54d6e5d4ce70b1c77a3a87db22adb76ce81'`
		`+ 'SKIP'`
		`+ 'f86353bbba05d8994db34c6abb66094aa61d2c37c8599930dbe9d215413f0f718a1ce55a8f2d07a65074c3947e28fc80d44c925bd9be239a870f82d2a1803635'`
		`+ '28a22a11572fba86bf8412f86a2eca8dc34ce42e790d9c9b1e0b1a66959b2b0240353e0aef22741d6d2baa08bc7ff35ddfd3770b706654ffa8089a26495e4ee3')`
		`+ b2sums+=('c2a2ead1b44c563583abb5cd3579e8f2724ea79e12aba1b315f201a09547d611b4a3c98de12f063b25826fd1520562d411ab917780bab4d78a1240fe56096b1b'`
		`+ 'SKIP'`
		`+ 'f4c439b01302f2db242656fce1b15de483ef146ae9d7783809386f4295ce09eb1f5629335f2c1c296d8afde46e01e10fc01c97b1ea7d8c6c8c48d15e41e8fdc8'`
		`+ '2eaacb9fb15391557a36cae10ec6d70b5a4ab6f71c4b24d268f5c0df78b272f0d88c9c7498ae92c60f1436dff82dc8c49e94b0a535535329a2419302aee7b7a8'`
		`+ '9e4ccfb8850d9f9a5222f5186b35f2ae7986b6c6d435de024b109a6fa01e65a1362664cfb6ea81621387cf33364cc8d3d466fae1bee24ab5fc7e23c4cb17bf2c'`
		`+ '42e08d0872dffa94ec73d29c08b60ce4d966be2f785e07a01ec3ef2ac05bbe895675655b60e85f9c705878291df7ead69e7ef9d7bce8c95a47b6a124231f889c'`
		`+ '2a746251ffdbe91bc8933c798242a32dfda7f9621d26924a752e5fa9b5f97a1b8cd83fbb0e9063d62fc36e08f8222371ac7873202c2ce5f8498c12024b4ccdc4'`
		`+ '5f0bb717734f94594e146d72a95e65bf631716affca84c5cdd1d3777f2c9ddd1a9ec243c806f7a846a5cfcaa5793d8f84b0e0720d4f868ae6368857a69506427'`
		`+ '1b8ace4e8fc6ebc99d527c33781182218c4b8c640914cc8e800616a1e370cb1ea6da890bcf45fb753a4594513755585290141fe9c12fbc039c00f56ade6cf0c4'`
		`+ 'dfce473a5492e79faf9120ff4026861623cfb89d39046f96ea52ef83e01d1288ec0bf46b5bde4a68b24c9562493e66028621555f69a783e5f89cb2d0897bb4aa')`
		`+ b2sums_armv7h=('6e5980e56343a23bce4fcda58f6abc8f2debca0c278c87b09e53abb17ff15849c26e8df3bbff2388985f8fe5a4e9be9982c602ef7159546f0ae335fca1000a41')`
		`+ b2sums_i686=('97035e44cd1deae7bb2422c81eec7294feb51f43f460b4d7ddba083e1d8a48d265a36ca43cf1d9dee49b01ee6df0c76e0f6916cc73cb7ad9caa1c235a59da0e4'`
		`+ '009789d3bb93ba418929019135804fc3de7de161e5be8efba7fc75646fbde395720be5b7a7d3f5d1671f459fdd2944dd14aca306bbf1c975436d4f7765d62d15'`
		`+ 'e4851eaa9030d9b8811f505f8f1569a41f8dc7cf586269108ebe370ac91896f69d36fc6d2e1937f427656fe4fca63031ca5e11d39a3667205a4b0a6f935cd548'`
		`+ 'd20ce3eff595f85df86eaa0dfb665fc356f8987117a771f76adc4ac12046a7e82b0af182fa99f87ea1362a5026c9d0216c7b714649fef0c7294c61c8e8f4d790')`
		`+`

		`# Google API keys (see http://www.chromium.org/developers/how-tos/api-keys) # anti-feature`
		`# Note: These are for Arch Linux use ONLY. For your own distribution, please # anti-feature`
		`@@ -132,9 +230,25 @@`
		`# _mozilla_api_key=e05d56db0a694edc8b5aaebda3f2db6a # anti-feature`


		`+ ## dependency tweaks ##`
		`+`
		`# disable PGO for 32-bit arches`
		`- _should_skip_pgo=0 # for x86_64`
		`- [[ "${CARCH}" != 'armv7h' && "${CARCH}" != 'i686' ]] \|\| _should_skip_pgo=1`
		`+ _should_skip_pgo=0 # for x86_64 (try '1' if the build hangs indefinitely)`
		`+`
		`+ case "${CARCH}" in`
		`+ armv7h)`
		`+ _should_skip_pgo=1`
		`+`
		`+ makedepends=( ${makedepends[]/wasi/} ) # armv7h has no wasi compiler`
		`+`
		`+ depends+=( icu=72.1 ) # --with-system-icu`
		`+`
		`+ makedepends+=( python-pydantic=1.9.2 ) # dustbin - configure error: "pydantic 1.10.2 has requirement typing-extensions>=4.1.0, but you have typing-extensions`
		`+ ;;`
		`+ i686)`
		`+ _should_skip_pgo=1`
		`+ ;;`
		`+ esac`


		`## helpers ##`
		`@@ -144,6 +258,17 @@`

		`echo "Checking build configuration..."`

		`+ # Each of the [ARCH-SPECIFIC CONFIG] branches in prepare(), should have prepared a`
		`+ # $srcdir/mozconfig file with any arch-specific changes to the Arch x86_64 PKGBUILD.`
		`+ # Finally, that file should have been copied to $srcdir/firefox-$pkgver/.mozconfig`
		`+ grep '^ac_add_options --with-distribution-id=nu.parabola' .mozconfig &> /dev/null \|\| \`
		`+ ! echo "cannot continue without a .mozconfig file" \|\| return 1`
		`+`
		`+ if ! [[ "${CARCH}" =~ ^(aarch64\|armv7h)$ ]] # ARM has no --disable-eme option`
		`+ then grep '^ac_add_options --disable-eme' .mozconfig &> /dev/null \|\| \`
		`+ ! echo ".mozconfig file was not properly treated per the FSDG" \|\| return 1`
		`+ fi`
		`+`
		`# Configure produces mozinfo.json that reflects current configuration.`
		`# See build/docs/mozinfo.rst`
		`./mach configure`
		`@@ -157,7 +282,9 @@`
		`local antifeatures=()`
		`echo "obj_directory is: ${obj_directory}"`
		`for key in ${antifeature_keys[@]}`
		`- do jq -e "${key} != false" "${obj_directory}"/mozinfo.json && antifeatures+=(${key})`
		`+ do if jq -e "${key} != false" "${obj_directory}"/mozinfo.json &> /dev/null`
		`+ then antifeatures+=(${key})`
		`+ fi`
		`done`
		`if (( ${#antifeatures[@]} ))`
		`then echo "Some anti-features are not disabled in build configuration files, aborting:"`
		`@@ -171,8 +298,10 @@`
		`_check_patching() {`
		`pushd "${srcdir}"/firefox-${pkgver} > /dev/null`

		`+ echo "verifying libre patching"`
		`+`
		`# URI protocol handlers`
		`- local uri_handlers=uriloader/exthandler/HandlerList.jsm`
		`+ local uri_handlers=uriloader/exthandler/HandlerList.sys.mjs`
		`local webmails='google\|yahoo'`
		`grep 'name:' $uri_handlers \| grep '"KiwiIRC",' &> /dev/null && \`
		`! grep 'name:' $uri_handlers \| grep -v '"KiwiIRC",' &> /dev/null && \`
		`@@ -196,8 +325,32 @@`
		`mkdir mozbuild`
		`cd firefox-$pkgver`

		`- # Unbreak build with python-zstandard 0.18.0`
		`- patch -Np1 -i ../zstandard-0.18.0.diff`
		`+ # https://bugs.archlinux.org/task/76231`
		`+ # https://bugzilla.mozilla.org/show_bug.cgi?id=1790496`
		`+ # https://src.fedoraproject.org/rpms/firefox/blob/rawhide/f/libwebrtc-screen-cast-sync.patch`
		`+ patch -Np1 -i ../0001-libwebrtc-screen-cast-sync.patch`
		`+`
		`+ ## technical patching ##`
		`+`
		`+ # Unbreak build with python-zstandard 0.19.0`
		`+ echo "applying zstandard-0.19.0.diff"`
		`+ patch -Np1 -i ../zstandard-0.19.0.diff`
		`+`
		`+ case ${CARCH} in`
		`+ aarch64\|armv7h)`
		+ # Error: immediate expression requires a # prefix -- `pld [r0,1792]'
		`+ # mozilla #1787405 and #1791267`
		`+ sed -i "s\|# 'LIBYUV_DISABLE_NEON',\|'LIBYUV_DISABLE_NEON',\|" media/libyuv/libyuv/libyuv.gyp`
		`+ ! grep "# 'LIBYUV_DISABLE_NEON'," media/libyuv/libyuv/libyuv.gyp \|\| ! echo "error patching media/libyuv/libyuv/libyuv.gyp" \|\| exit 1`
		`+ ;;`
		`+ i686)`
		`+ ;;`
		`+ x86_64)`
		`+ ;;`
		`+ esac`
		`+`
		`+`
		`+ ## general configuration ##`

		`# echo -n "$_google_api_key" >google-api-key # anti-feature`
		`# echo -n "$_mozilla_api_key" >mozilla-api-key # anti-feature`
		`@@ -217,15 +370,15 @@`
		`ac_add_options --with-wasi-sysroot=/usr/share/wasi-sysroot`

		`# Branding`
		`- ac_add_options --disable-official-branding`
		`+ ac_add_options --disable-official-branding # branding over-ride`
		`ac_add_options --enable-update-channel=release`
		`- ac_add_options --with-distribution-id=nu.parabola`
		`- ac_add_options --with-branding=browser/branding/${pkgname}`
		`- ac_add_options --with-app-name=${pkgname}`
		`- ac_add_options --with-app-basename=${pkgname}`
		`+ ac_add_options --with-distribution-id=nu.parabola # branding over-ride`
		`+ ac_add_options --with-branding=browser/branding/${pkgname} # branding over-ride`
		`+ ac_add_options --with-app-name=${pkgname} # branding over-ride`
		`+ ac_add_options --with-app-basename=${pkgname} # branding over-ride`
		`ac_add_options --with-unsigned-addon-scopes=app,system`
		`ac_add_options --allow-addon-sideload`
		`- # export MOZILLA_OFFICIAL=1 # branding over-ride`
		`+ # export MOZILLA_OFFICIAL=1 # branding over-ride`
		`export MOZ_APP_REMOTINGNAME=${pkgname//-/}`
		`export MOZ_TELEMETRY_REPORTING=`
		`export MOZ_REQUIRE_SIGNING=`
		`@@ -242,90 +395,135 @@`
		`# Features`
		`ac_add_options --enable-alsa`
		`ac_add_options --enable-jack`
		`- ac_add_options --disable-crashreporter`
		`+ ac_add_options --disable-crashreporter # anti-feature`
		`ac_add_options --disable-updater`
		`ac_add_options --disable-tests`
		`- ac_add_options --disable-eme`
		`+ ac_add_options --disable-eme # anti-feature`
		`END`


		`- # FIXME: FTBS with cbindgen > 0.23 (currently 0.24)`
		`- # https://bugzilla.mozilla.org/show_bug.cgi?id=1773259`
		`- sed -i '/const uint64_t ROOT_CLIP_CHAIN = ~0;/d' gfx/webrender_bindings/webrender_ffi.h`
		`-`
		`-`
		`## [ARCH-SPECIFIC CONFIG] ##`

		`case ${CARCH} in`
		`- armv7h)`
		`- sed -i '`
		`- /--enable-hardening/d`
		`- /--enable-optimize/d`
		`- /--enable-rust-simd/d`
		`- s\|--with-wasi-sysroot=/usr/share/wasi-sysroot\|--without-wasm-sandboxed-libraries\|`
		`- ' ../mozconfig`
		`-`
		`- cat >>../mozconfig <<END`
		`- export CC=clang`
		`- export CXX=clang++`
		`- ac_add_options --disable-elf-hack`
		`-`
		`- # https://bugzilla.redhat.com/show_bug.cgi?id=1641623`
		`- ac_add_options --disable-av1`
		`- ac_add_options --enable-optimize="-g0 -O2"`
		`- mk_add_options MOZ_MAKE_FLAGS='-j1'`
		`+ aarch64\|armv7h)`
		`+ # experimental/version-specific hacks #`
		`+`
		`+ # use GCC vs LLVM`
		`+ cat >> ../mozconfig <<EOF`
		`+ export CC=gcc`
		`+ export CXX=g++`
		`+ export AR=gcc-ar`
		`+ export NM=gcc-nm`
		`+ export RANLIB=gcc-ranlib`
		`+ EOF`
		`+`
		`+ # ld.lld: error: undefined hidden symbol: std::type_info::operator==(std::type_info const&) const`
		`+ echo 'ac_add_options --with-system-icu' >> ../mozconfig`
		`+`
		`+`
		`+ # upstream #`
		`+`
		`+ # archarm has these differences in ## general configuration ## above`
		`+ sed -i '`
		`+ /--enable-hardening/d`
		`+ /--enable-optimize/d`
		`+ /--enable-rust-simd/d`
		`+ s\| --with-wasi-sysroot=.*\| --without-wasm-sandboxed-libraries\|`
		`+ /--disable-eme/d`
		`+ ' ../mozconfig`
		`+`
		`+ if [[ $CARCH == "armv7h" ]]; then`
		`+ echo "ac_add_options --disable-elf-hack" >> .mozconfig`
		`+ # https://bugzilla.redhat.com/show_bug.cgi?id=1641623`
		`+ echo "ac_add_options --disable-av1" >> .mozconfig`
		`+ # reduce jobs due to RAM constraints`
		`+ MAKEFLAGS="-j4"`
		`+ # disable hard-coded LTO`
		`+ sed -i '/cargo_rustc_flags += -Clto/d' config/makefiles/rust.mk`
		`+ sed -i '/RUSTFLAGS += -Cembed-bitcode=yes/d' config/makefiles/rust.mk`
		`+ # increase codegen-units due to RAM constraints`
		`+ sed -i 's/codegen-units=1/codegen-units=16/' config/makefiles/rust.mk`
		`+ # webrtc on ARMv7 implies android, so disable it`
		`+ echo "ac_add_options --disable-webrtc" >> .mozconfig`
		`+ elif [[ $CARCH == "aarch64" ]]; then`
		`+ echo 'ac_add_options --enable-rust-simd' >> .mozconfig`
		`+ fi`
		`+ echo 'ac_add_options --enable-optimize="-g0 -O2"' >> .mozconfig`
		`+ echo "mk_add_options MOZ_MAKE_FLAGS=\"${MAKEFLAGS}\"" >> .mozconfig`
		`+`
		+ # archarm `export` commands are under the '[ARCH-SPECIFIC BUILD ENV]' section
		`+`
		`+ patch -p1 -i ../build-arm-libopus.patch`
		`+`
		`+ # At this point in the script, the arch, arch32, and parabola PKGBUILDs`
		`+ # have prepared a temporary ${srcdir}/mozconfig; but the archarm PKGBUILD`
		`+ # writes directly to the final firefox-$pkgver/.mozconfig.`
		`+ # We allowed .mozconfig to be written above, only to minimize the diff against archarm.`
		`+ # For consistency across arches, we move it to ${srcdir}/mozconfig now.`
		`+ # ${srcdir}/mozconfig will clobber firefox-$pkgver/.mozconfig later, in build().`
		`+ cat .mozconfig >> ../mozconfig`
		`+ ;;`
		`+ i686)`
		`+ # experimental/version-specific hacks #`
		`+`
		`+ # use GCC vs LLVM`
		`+ cat >>../mozconfig <<END`
		`+ #export CC=gcc`
		`+ #export CXX=g++`
		`+ #export AR=gcc-ar`
		`+ #export NM=gcc-nm`
		`+ #export RANLIB=gcc-ranlib`
		`END`

		`- # mozbuild.configure.options.InvalidOptionError: --disable-eme is not available in this configuration`
		`- # EME is disabled anyway in the built package, but better check if it exists for ARM each new release.`
		`- sed -i 's\|ac_add_options --disable-eme\|\|' ../mozconfig`

		`- echo "applying build-arm-libopus.patch"`
		`- patch -p1 -i ../build-arm-libopus.patch`
		`- ;;`
		`- i686)`
		`- export MOZ_SOURCE_CHANGESET="DEVEDITION_${pkgver//./_}_RELEASE"`
		`-`
		`- # disable LTO as it has little benefit and uses too many resources`
		`- # don't compile with clang, use gcc toolchain (clang has issues on IA32)`
		`- # disable SIMD (SSE2 for i686)`
		`- # set correct compiler and toochain tools`
		`- cat >>../mozconfig <<END`
		`- ac_add_options --disable-linker=lld`
		`- ac_add_options --enable-linker=bfd`
		`+ # upstream #`
		`+`
		`+ export MOZ_SOURCE_CHANGESET="DEVEDITION_${pkgver//./_}_RELEASE"`
		`+ # export MOZ_MAKE_FLAGS=-j2`
		`+`
		`+ # disable LTO as it has little benefit and uses too many resources`
		`+ # don't compile with clang, use gcc toolchain (clang has issues on IA32)`
		`+ # disable SIMD (SSE2 for i686)`
		`+ # set correct compiler and toochain tools`
		`+ cat >>../mozconfig <<END`
		`+ #ac_add_options --disable-linker=lld`
		`+ #ac_add_options --enable-linker=bfd`
		`ac_add_options --disable-lto`
		`ac_add_options --disable-rust-simd`
		`- ac_add_options --enable-strip`
		`ac_add_options --disable-debug`
		`ac_add_options --disable-debug-symbols`
		`- export CC=gcc-10`
		`- export CXX=g++-10`
		`- export AR=gcc-ar-10`
		`- export NM=gcc-nm-10`
		`- export RANLIB=gcc-ranlib-10`
		`- export STRIP=strip`
		`END`

		`- # readelf: Error: Unable to seek to 0x801db328 for section headers`
		`- echo "applying avoid-libxul-OOM-python-check.patch"`
		`- patch -p1 -i ../avoid-libxul-OOM-python-check.patch`
		`-`
		`- # test failure in rust code (complaining about network functions) when PGO is used,`
		`- # see https://bugzilla.mozilla.org/show_bug.cgi?id=1565757`
		`- echo "applying rust-static-disable-network-test-on-static-libraries.patch"`
		`- patch -p1 -i ../rust-static-disable-network-test-on-static-libraries.patch`
		`-`
		`- # FIXME: this patch is probably temporary - it comes from mozilla`
		`- # https://bugzilla.mozilla.org/show_bug.cgi?id=1729459`
		`- # /build/iceweasel/src/firefox-96.0.1/modules/fdlibm/src/math_private.h:34:21:`
		`- # error: conflicting declaration ‘typedef __double_t double_t’`
		`- # /usr/include/math.h:156:21: note: previous declaration as ‘typedef long double double_t’`
		`- echo "applying firefox-99.0.1-fdlibm-double.patch"`
		`- patch -p1 -i "$srcdir/firefox-99.0.1-fdlibm-double.patch"`
		`+ # FIXME GCC: /usr/lib/gcc/i686-pc-linux-gnu/12.1.0/include/xmmintrin.h:208:1: error: inlining failed in call to ‘always_inline’ ‘__m128 _mm_sqrt_ps(__m128)’: target specific option mismatch`
		`+ # FIXME LLVM: /build/iceweasel/src/firefox-106.0.1/third_party/libwebrtc/modules/audio_processing/aec3/adaptive_fir_filter.cc:110:27: error: always_inline function '_mm_loadu_ps' requires target feature 'sse', but would be inlined into function 'ComputeFrequencyResponse_Sse2' that is compiled without support for 'sse'`
		`+ echo "ac_add_options --disable-webrtc" >> ../mozconfig`
		`+`
		`+ sed -i '/cargo_rustc_flags += -Clto/d' config/makefiles/rust.mk # FIXME: is this needed?`
		`+`
		`+ # readelf: Error: Unable to seek to 0x801db328 for section headers`
		`+ echo "applying avoid-libxul-OOM-python-check.patch"`
		`+ patch -p1 -i ../avoid-libxul-OOM-python-check.patch`
		`+`
		`+ # test failure in rust code (complaining about network functions) when PGO is used,`
		`+ # see https://bugzilla.mozilla.org/show_bug.cgi?id=1565757`
		`+ echo "applying rust-static-disable-network-test-on-static-libraries.patch"`
		`+ patch -p1 -i ../rust-static-disable-network-test-on-static-libraries.patch`
		`+`
		`+ # FIXME: this patch is probably temporary - it comes from mozilla`
		`+ # https://bugzilla.mozilla.org/show_bug.cgi?id=1729459`
		`+ # /build/iceweasel/src/firefox-96.0.1/modules/fdlibm/src/math_private.h:34:21:`
		`+ # error: conflicting declaration ‘typedef __double_t double_t’`
		`+ # /usr/include/math.h:156:21: note: previous declaration as ‘typedef long double double_t’`
		`+ echo "applying firefox-107.0-fdlibm.patch"`
		`+ patch -p1 -i "$srcdir/firefox-107.0-fdlibm.patch"`
		`+`
		`+ # js/src/jit/shared/AtomicOperations-shared-jit.cpp:88:9: error: ‘AtomicCopyByteUnsynchronized’ was not declared in this scope; did you mean ‘AtomicMemcpyUpUnsynchronized’?`
		`+ echo "applying fix-i686-build-moz-1792159.patch"`
		`+ patch -p1 -i "$srcdir/fix-i686-build-moz-1792159.patch"`
		`;;`
		`- x86_64)`
		`+ x86_64)`
		`;;`
		`- *) echo "no [ARCH-SPECIFIC CONFIG] for arch: ${CARCH}" ; return 1 ;`
		`+ *) echo "no [ARCH-SPECIFIC CONFIG] for arch: ${CARCH}" ; return 1 ;`
		`;;`
		`esac`

		`@@ -346,10 +544,13 @@`
		`for size in 16 22 24 32 48 64 128 256`
		`do rsvg-convert -w ${size} -h ${size} iceweasel_icon.svg -o default${size}.png`
		`done`
		`- cp iceweasel_logo.svg content/aboutlogins.svg`
		`- cp iceweasel_logo.svg content/about-logo.svg`
		`- rsvg-convert -w 192 --keep-aspect-ratio iceweasel_logo.svg -o content/about-logo.png`
		`- rsvg-convert -w 384 --keep-aspect-ratio iceweasel_logo.svg -o content/about-logo@2x.png`
		`+ cp iceweasel_logo.svg content/aboutlogins.svg`
		`+ cp iceweasel_logo.svg content/about-logo.svg`
		`+ # cp iceweasel_logo.svg content/about-logo.svg # RuntimeError: File "about-logo.svg" not found in browser/branding/iceweasel/content`
		`+ rsvg-convert -w 192 --keep-aspect-ratio iceweasel_logo.svg -o content/about-logo.png`
		`+ rsvg-convert -w 384 --keep-aspect-ratio iceweasel_logo.svg -o content/about-logo@2x.png`
		`+ cp content/about-logo.png content/about-logo-private.png`
		`+ cp content/about-logo@2x.png content/about-logo-private@2x.png`
		`echo ${blank_svg} > content/blank.svg`

		`popd > /dev/null`
		`@@ -466,7 +667,10 @@`
		`# Remove remaining non-free bits`
		`echo "applying 9004-FSDG-misc.patch"`
		`patch -Np1 --no-backup-if-mismatch -i "${srcdir}"/9004-FSDG-misc.patch`
		`- rm toolkit/crashreporter/tools/upload_symbols.py`
		`+`
		`+ echo "removing remaining non-free bits"`
		`+ rm -v toolkit/crashreporter/tools/upload_symbols.py`
		`+ rm -frv third_party/rust/winapi-{i686,x86_64}-pc-windows-gnu/*/.a`


		`## patching sanity checks ##`
		`@@ -481,8 +685,8 @@`

		`export MOZ_NOSPAM=1`
		`export MOZBUILD_STATE_PATH="$srcdir/mozbuild"`
		`- # export MOZ_ENABLE_FULL_SYMBOLS=1 # anti-feature`
		`- export MACH_BUILD_PYTHON_NATIVE_PACKAGE_SOURCE=system`
		`+ # export MOZ_ENABLE_FULL_SYMBOLS=1 # anti-feature`
		`+ export MACH_BUILD_PYTHON_NATIVE_PACKAGE_SOURCE=system # parabola policy`

		`# LTO needs more open files`
		`ulimit -n 4096`
		`@@ -491,32 +695,33 @@`
		`## [ARCH-SPECIFIC BUILD ENV] ##`

		`case ${CARCH} in`
		`- armv7h)`
		`- export MOZ_DEBUG_FLAGS=" "`
		`- export CFLAGS+=" -g0"`
		`- export CXXFLAGS+=" -g0"`
		`- export LDFLAGS+=" -Wl,--no-keep-memory"`
		`- export RUSTFLAGS="-Cdebuginfo=0"`
		`+ aarch64\|armv7h)`
		`+ export MOZ_DEBUG_FLAGS=" "`
		`+ export CFLAGS+=" -g0"`
		`+ export CXXFLAGS+=" -g0"`
		`+ export LDFLAGS+=" -Wl,--no-keep-memory"`
		`+ export RUSTFLAGS="-Cdebuginfo=0"`
		`;;`
		`- i686)`
		`- # -fno-plt with cross-LTO -> LLVM ERROR: Function Import: link error`
		`- CFLAGS="${CFLAGS/-fno-plt/}"`
		`- CXXFLAGS="${CXXFLAGS/-fno-plt/}"`
		`-`
		`- # try hard to tell ld and rust not to use too much memory (no lto, no debug info, etc.)`
		`- export RUSTFLAGS+=" -Cdebuginfo=0 -Clto=off"`
		`- export LDFLAGS+=" -Wl,--no-keep-memory -Wl,--reduce-memory-overheads"`
		`-`
		`- # libvpx has some hard-coded compiler flags for MMX, SSE, SSE2, use the correct one`
		`- # per CARCH (75.0 uses an intrisic _mm_empty now, which required the corresponding`
		`- # architecture flag to be preset - before it was merely embedding some assembly`
		`- # code with EMMS`
		`- export CFLAGS+=" -mmmx"`
		`- export CXXFLAGS+=" -mmmx"`
		`+ i686)`
		`+ # -fno-plt with cross-LTO -> LLVM ERROR: Function Import: link error`
		`+ CFLAGS="${CFLAGS/-fno-plt/}"`
		`+ CXXFLAGS="${CXXFLAGS/-fno-plt/}"`
		`+`
		`+ # try hard to tell ld and rust not to use too much memory (no lto, no debug info, etc.)`
		`+ export RUSTFLAGS+=" -Cdebuginfo=0 -Clto=off"`
		`+ # export LDFLAGS+=" -Wl,--no-keep-memory -Wl,--reduce-memory-overheads" # with GCC`
		`+ export LDFLAGS+=" -Wl,--no-keep-memory " # without GCC`
		`+`
		`+ # libvpx has some hard-coded compiler flags for MMX, SSE, SSE2, use the correct one`
		`+ # per CARCH (75.0 uses an intrisic _mm_empty now, which required the corresponding`
		`+ # architecture flag to be preset - before it was merely embedding some assembly`
		`+ # code with EMMS`
		`+ export CFLAGS+=" -mmmx"`
		`+ export CXXFLAGS+=" -mmmx"`
		`;;`
		`- x86_64)`
		`+ x86_64)`
		`;;`
		`- *) echo "no [ARCH-SPECIFIC BUILD ENV] for arch: ${CARCH}" ; return 1 ;`
		`+ *) echo "no [ARCH-SPECIFIC BUILD ENV] for arch: ${CARCH}" ; return 1 ;`
		`;;`
		`esac`
		`export CFLAGS`
		`@@ -526,18 +731,15 @@`
		`## [ARCH-SPECIFIC BUILD CONFIG] ##`

		`case ${CARCH} in`
		`- armv7h)`
		`+ aarch64\|armv7h)`
		`;;`
		`- i686)`
		`- # /usr/bin/ld.bfd: error: libxul.so(.debug_info) is too large (0x54c5369a bytes)`
		`- options=( ${options[*]/\!strip/} )`
		`-`
		`- # avoid excessive debug symbols in rust leading to out-of-memory situations`
		`- sed -i "s/debug_info = '\''2'\''/debug_info = '\''0'\''/" build/moz.configure/toolchain.configure`
		`+ i686)`
		`+ # avoid excessive debug symbols in rust leading to out-of-memory situations`
		`+ sed -i "s/debug_info = '\''2'\''/debug_info = '\''0'\''/" build/moz.configure/toolchain.configure`
		`;;`
		`- x86_64)`
		`+ x86_64)`
		`;;`
		`- *) echo "no [ARCH-SPECIFIC BUILD CONFIG] for arch: ${CARCH}" ; return 1 ;`
		`+ *) echo "no [ARCH-SPECIFIC BUILD CONFIG] for arch: ${CARCH}" ; return 1 ;`
		`;;`
		`esac`

		`@@ -546,8 +748,7 @@`

		`if (( $_should_skip_pgo ))`
		`then`
		`- # skipping "3-tier PGO" "instrumented browser", to avoid OOM problems;`
		`- # so we have the final .mozconfig now`
		`+ # skipping "3-tier PGO" "instrumented browser"; so the final .mozconfig is ready now`
		`cp ../mozconfig .mozconfig`
		`else`
		`# Do 3-tier PGO`
		`@@ -586,13 +787,12 @@`

		`## sanity checks ##`

		`- # each of the [ARCH-SPECIFIC BUILD CONFIG] branches above should have created .mozconfig`
		`- [[ -f .mozconfig ]] \|\| ! echo "cannot continue without a .mozconfig file" \|\| return 1`
		`_check_build_config`


		`## main build ##`

		`+ (( ! $_should_skip_pgo )) \|\| echo "Building optimized browser..."`
		`./mach build`

		`# echo "Building symbol archive..." # anti-feature`
		`@@ -600,6 +800,9 @@`
		`}`

		`package() {`
		+ export MOZBUILD_STATE_PATH="$srcdir/mozbuild" # needed for `libremakepkg -R`
		+ export MACH_BUILD_PYTHON_NATIVE_PACKAGE_SOURCE=system # needed for `libremakepkg -R`
		`+`
		`cd firefox-$pkgver`
		`DESTDIR="$pkgdir" ./mach install`

		`@@ -626,12 +829,12 @@`
		`[Global]`
		`id=parabola`
		`version=(${_brandingver} branding)`
		`- about=Iceweasel for Parabola GNU/Linux-libre`
		`- about.en-US=Iceweasel for Parabola GNU/Linux-libre`
		`- about.eo=Iceweasel por Parabola GNU/Linux-libre`
		`- about.es-ES=Iceweasel para Parabola GNU/Linux-libre`
		`- about.gl=Iceweasel para Parabola GNU/Linux-libre`
		`- about.pt-BR=Iceweasel para Parabola GNU/Linux-libre`
		`+ about=${pkgname^} for Parabola GNU/Linux-libre`
		`+ about.en-US=${pkgname^} for Parabola GNU/Linux-libre`
		`+ about.eo=${pkgname^} por Parabola GNU/Linux-libre`
		`+ about.es-ES=${pkgname^} para Parabola GNU/Linux-libre`
		`+ about.gl=${pkgname^} para Parabola GNU/Linux-libre`
		`+ about.pt-BR=${pkgname^} para Parabola GNU/Linux-libre`

		`[Preferences]`
		`app.distributor=parabola`
		`@@ -639,7 +842,7 @@`
		`app.partner.parabola=parabola`
		`END`

		`- # NOTE: browser/branding/$theme is $brandingdestdir in configure()`
		`+ # NOTE: browser/branding/$theme is $brandingdestdir in prepare()`
		`local i theme=$pkgname`
		`for i in 16 22 24 32 48 64 128 256; do`
		`install -Dvm644 browser/branding/$theme/default$i.png \`
		`@@ -667,21 +870,16 @@`
		`## [ARCH-SPECIFIC INSTALL] ##`

		`case ${CARCH} in`
		`- armv7h)`
		`+ aarch64\|armv7h)`
		`;;`
		`- i686)`
		`- # libxul.so cannot find it's libraries`
		`- install -dm 755 "${pkgdir}/etc/ld.so.conf.d"`
		`- echo "/usr/lib/${pkgname}" > "${pkgdir}"/etc/ld.so.conf.d/${pkgname}.conf`
		`-`
		`- # disable stripping in mozconfig.<arch> (insists to use llvm-strip which runs`
		`- # out of memory on libxul.so. Now 2.5 GB can be strupped to 166 MB, so we do`
		`- # that with the normal 'strip' from binutils after 'mach install'`
		`- strip "$pkgdir/usr/lib/$pkgname/libxul.so"`
		`+ i686)`
		`+ # libxul.so cannot find it's libraries`
		`+ install -dm 755 "${pkgdir}/etc/ld.so.conf.d"`
		`+ echo "/usr/lib/${pkgname}" > "${pkgdir}"/etc/ld.so.conf.d/${pkgname}.conf`
		`;;`
		`- x86_64)`
		`+ x86_64)`
		`;;`
		`- *) echo "no [ARCH-SPECIFIC INSTALL] for arch: ${CARCH}" ; return 1 ;`
		`+ *) echo "no [ARCH-SPECIFIC INSTALL] for arch: ${CARCH}" ; return 1 ;`
		`;;`
		`esac`

libre/iceweasel/firefox-107.0-fdlibm.patch ~~libre/iceweasel/firefox-99.0.1-fdlibm-double.patch~~

file renamed

+5 -4

		`@@ -1,6 +1,7 @@`
		`- diff -rauN firefox-99.0.1/modules/fdlibm/src/math_private.h firefox-99.0.1-fdlibm-double-patch/modules/fdlibm/src/math_private.h`
		`- --- firefox-99.0.1/modules/fdlibm/src/math_private.h 2022-04-12 00:00:09.000000000 +0200`
		`- +++ firefox-99.0.1-fdlibm-double-patch/modules/fdlibm/src/math_private.h 2022-04-25 16:47:00.697715429 +0200`
		`+ diff --git a/modules/fdlibm/src/math_private.h b/modules/fdlibm/src/math_private.h`
		`+ index 165260f00f..1fa2937cae 100644`
		`+ --- a/modules/fdlibm/src/math_private.h`
		`+ +++ b/modules/fdlibm/src/math_private.h`
		`@@ -30,7 +30,11 @@`
		`* Adapted from https://github.com/freebsd/freebsd-src/search?q=__double_t`
		`*/`
		`@@ -11,5 +12,5 @@`
		`typedef double __double_t;`
		`+#endif`
		`typedef __double_t double_t;`
		`+ typedef float __float_t;`

		`- /*`

libre/iceweasel/fix-i686-build-moz-1792159.patch

file added

+18

		`@@ -0,0 +1,18 @@`
		`+ --- a/js/src/jit/shared/AtomicOperations-shared-jit.cpp`
		`+ +++ b/js/src/jit/shared/AtomicOperations-shared-jit.cpp`
		`+ @@ -5,4 +5,9 @@`
		`+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */`
		`+`
		`+ +// bug 1792159`
		`+ +#if defined(__i386__) && defined(__GNUC__) && !defined(__clang__)`
		`+ +# include "../../../mfbt/Attributes.h"`
		`+ +#endif`
		`+ +`
		`+ #include "jit/AtomicOperations.h"`
		`+`
		`+ --- a/config/check_spidermonkey_style.py`
		`+ +++ b/config/check_spidermonkey_style.py`
		`+ @@ -68,2 +68,3 @@`
		`+ "jit/AtomicOperationsGenerated.h", # generated in $OBJDIR`
		`+ + "../../../mfbt/Attributes.h", # unrecognized path`
		`+ "jit/CacheIROpsGenerated.h", # generated in $OBJDIR`

libre/iceweasel/simd_avx2.patch

file added

+11

		`@@ -0,0 +1,11 @@`
		`+ diff -rauN a/mozglue/misc/SIMD_avx2.cpp b/mozglue/misc/SIMD_avx2.cpp`
		`+ --- a/mozglue/misc/SIMD_avx2.cpp 2022-10-24 18:34:51.028779452 +0200`
		`+ +++ b/mozglue/misc/SIMD_avx2.cpp 2022-10-24 18:35:07.818868490 +0200`
		`+ @@ -8,6 +8,7 @@`
		`+ #include "mozilla/SSE.h"`
		`+ #include "mozilla/Assertions.h"`
		`+`
		`+ +#undef MOZILLA_MAY_SUPPORT_AVX2`
		`+ #ifdef MOZILLA_MAY_SUPPORT_AVX2`
		`+`
		`+ # include <cstring>`

libre/iceweasel/vendor.js.in

file modified

		`@@ -310,3 +310,6 @@`
		`// Setting these preferences just in case and to not frustrate users.`
		`pref("app.normandy.api_url", "http://127.0.0.1/");`
		`pref("app.normandy.enabled", false);`
		`+`
		`+ // enable "sync" feature`
		`+ pref("webchannel.allowObject.urlWhitelist", "https://content.cdn.mozilla.net https://support.mozilla.org https://install.mozilla.org https://accounts.firefox.com");`

libre/iceweasel/zstandard-0.19.0.diff ~~libre/iceweasel/zstandard-0.18.0.diff~~

file renamed

+1 -1

		`@@ -7,4 +7,4 @@`
		`# support down to the oldest locally-installed version (5.4.2).`
		`pypi-optional:psutil>=5.4.2,<=5.8.0:telemetry will be missing some data`
		`-pypi-optional:zstandard>=0.11.1,<=0.17.0:zstd archives will not be possible to extract`
		`- +pypi-optional:zstandard>=0.11.1,<=0.18.0:zstd archives will not be possible to extract`
		`+ +pypi-optional:zstandard>=0.11.1,<=0.19.0:zstd archives will not be possible to extract`

libre/icu-compat-65/PKGBUILD

file modified

+4 -4

		`@@ -3,6 +3,7 @@`
		`# Contributor: Denis 'GNUtoo' Carikli <GNUtoo@cyberdimension.org>`
		`# Contributor: Eli Schwartz <eschwartz@archlinux.org>`
		`# Contributor: bill-auger <bill-auger@programmer.net>`
		`+ # Maintainer: Parabola Hackers <dev@lists.parabola.nu>`


		`# parabola changes and rationale:`
		`@@ -75,7 +76,6 @@`
		`# installed by the icu package.`


		`- _pkgname=icu`
		`pkgname=icu-compat-65`
		`pkgver=65.1`
		`pkgrel=3`
		`@@ -87,13 +87,13 @@`
		`url="https://icu.unicode.org"`
		`license=('custom:icu')`
		`depends=('gcc-libs' 'sh')`
		`- depends+=("icu>${pkgver}") # core/icu should always be ahead`
		`- conflicts=("icu<=${pkgver}") # core/icu should always be ahead`
		`+ depends+=("icu>${pkgver}")`
		`+ conflicts=("icu<=${pkgver}")`
		`replaces+=('icu-65-compat') # this rebuild (parabola3) is simply to rename the package`
		`conflicts+=('icu-65-compat') # this rebuild (parabola3) is simply to rename the package`
		`makedepends=('python')`
		`provides=(libicu{data,i18n,io,test,tu,uc}.so)`
		`- source=(https://github.com/unicode-org/icu/releases/download/release-${pkgver//./-}/${_pkgname}4c-${pkgver//./_}-src.tgz{,.asc}`
		`+ source=(https://github.com/unicode-org/icu/releases/download/release-${pkgver//./-}/icu4c-${pkgver//./_}-src.tgz{,.asc}`
		`icu-65.1-initialized-buffer-uloc_getKeywordValue.patch::https://github.com/unicode-org/icu/commit/fab4c3c719.patch`
		`icu-65.1-prevent-SEGV_MAPERR-in-append.patch::https://github.com/unicode-org/icu/commit/b7d08bc04a.patch)`
		`# https://github.com/unicode-org/icu/releases/download/release-65-1/SHASUM512.txt - no checksum file for v67 release`

libre/icu-compat-67/PKGBUILD

file modified

+5 -5

		`@@ -3,6 +3,7 @@`
		`# Contributor: Denis 'GNUtoo' Carikli <GNUtoo@cyberdimension.org>`
		`# Contributor: Eli Schwartz <eschwartz@archlinux.org>`
		`# Contributor: bill-auger <bill-auger@programmer.net>`
		`+ # Maintainer: Parabola Hackers <dev@lists.parabola.nu>`


		`# parabola changes and rationale:`
		`@@ -75,8 +76,7 @@`
		`# installed by the icu package.`


		`- _pkgname=icu`
		`- pkgname=${_pkgname}-compat-67`
		`+ pkgname=icu-compat-67`
		`pkgver=67.1`
		`pkgrel=1`
		`pkgrel+=.parabola1`
		`@@ -87,11 +87,11 @@`
		`url="https://icu.unicode.org"`
		`license=('custom:icu')`
		`depends=('gcc-libs' 'sh')`
		`- depends+=("icu>${pkgver}") # core/icu should always be ahead`
		`- conflicts=("icu<=${pkgver}") # core/icu should always be ahead`
		`+ depends+=("icu>${pkgver}")`
		`+ conflicts=("icu<=${pkgver}")`
		`makedepends=('python')`
		`provides=(libicu{data,i18n,io,test,tu,uc}.so)`
		`- source=(https://github.com/unicode-org/icu/releases/download/release-${pkgver//./-}/${_pkgname}4c-${pkgver//./_}-src.tgz{,.asc})`
		`+ source=(https://github.com/unicode-org/icu/releases/download/release-${pkgver//./-}/icu4c-${pkgver//./_}-src.tgz{,.asc})`
		`# https://github.com/unicode-org/icu/releases/download/release-65-1/SHASUM512.txt - no checksum file for v67 release`
		`sha512sums=('4779f1ce1ca7976f6fad6768853ea8c540da54d11509e3b6cfd864a04b5f2db1c3d4b546387f91ad02fb90804525bc37d2543173f0d705d6ca11dc6f2b7640a8'`
		`'SKIP')`

libre/icu-compat-68/PKGBUILD

file added

+130

		`@@ -0,0 +1,130 @@`
		`+ # Maintainer (arch): Andreas Radke <andyrtr@archlinux.org>`
		`+ # Contributor: Art Gramlich <art@gramlich-net.com>`
		`+ # Contributor: Denis 'GNUtoo' Carikli <GNUtoo@cyberdimension.org>`
		`+ # Contributor: Eli Schwartz <eschwartz@archlinux.org>`
		`+ # Contributor: bill-auger <bill-auger@programmer.net>`
		`+ # Maintainer: Parabola Hackers <dev@lists.parabola.nu>`
		`+`
		`+`
		`+ # parabola changes and rationale:`
		`+ #`
		`+ # Several Parabola packages depends on ICU, and the ICU soname changes often.`
		`+ # This means that if we don't rebuild all the Parabola packages which depend`
		`+ # on ICU, as soon as the new ArchLinux, ArchLinux32, and ArchLinuxARM ICU`
		`+ # packages are synchronized into the Parabola repositories, we have a problem.`
		`+ # The repo server synchronizes with the upstream repos un-attended; so this`
		`+ # is a wonderful surprise each time; and we hustle frantucally to get the`
		`+ # system sane again. We could watch the testing and staging repos of each`
		`+ # upstream, and start re-building everything in a Parabola staging repo;`
		`+ # but that could result in discarded work, if those exact versions are not the`
		`+ # ones which are eventually released into [core].`
		`+ #`
		`+ # At first nothing was done to fix or workaround that issue. In practice,`
		`+ # once a new ICU was synchronized, many users were upgrading before the`
		`+ # Parabola packages had the time to be rebuilt. For such users, it`
		`+ # broke all the installed Parabola packages that were depending on the old ICU.`
		`+ # This means that users had to find a way to downgrade packages manually or wait`
		`+ # until developers would finally have rebuilt all the packages that were broken.`
		`+ #`
		`+ # Then such packages were modified to make them depend on the exact version of`
		`+ # the ICU packages they were built against. This way, once the new ICU package`
		`+ # was synchronized, users could not upgrade if they had packages that were not`
		`+ # rebuilt yet against the new ICU package. However this workaround also prevents`
		`+ # installing packages that depends on the new ICU.`
		`+ #`
		`+ # The correct fix would probably be to automatically build all the Packages`
		`+ # instead of relying on Arch Linux Packages. Still, a staging repo would be`
		`+ # required to hold the new packages, until they all can be released together sanely.`
		`+ # However we don't have the code, configuration and/or infrastructure to run`
		`+ # an automatic builder for all packages yet even if there is work in this`
		`+ # direction.`
		`+ #`
		`+ # In the meantime, this version of ICU exists for Parabola packages to link against`
		`+ # at runtime. In this way, Parabola packages can depend only on the "sodeps" exposed`
		`+ # by ICU, which is usually provided by the upstream distribution's ICU; but may be`
		`+ # this ICU, if the Parabola package has yet to be rebuilt agianst the upgraded ICU.`
		`+ #`
		`+ # It is inspired by the admittedly awkward hack of versioned library`
		`+ # dependencies more commonly seen (e.g. in the AUR as 'icu65') on which`
		`+ # proprietary binaries built against Debian's ICU will depend. It is awkward,`
		`+ # in the eyes of the beholder and this elegantly scales to Parabola's needs,`
		`+ # without consuming increasing resources, which is the best definition of "not`
		`+ # awkward".`
		`+ #`
		`+ # To use it, simply add the following dependency to any package which parabola`
		`+ # has built or rebuilt:`
		`+ #`
		`+ # depends=('libicui18n.so')`
		`+ #`
		`+ # or whichever shared library is reported by readelf -d /path/to/compiled/ELF/file`
		`+ # and, every time the upstream distribution upgrades ICU, update this package`
		`+ # as well, to ensure it always stays exactly one version behind.`
		`+ #`
		`+ # This works well for ICU, even for packages which link to both the older and`
		`+ # newer versions of libicu*.so, since ICU uses versioned symbols as reported by`
		`+ #`
		`+ # nm -D --demangle --with-symbol-versions /path/to/library`
		`+ #`
		`+ # However, caution must be taken before implementing the same idea for other`
		`+ # libraries. So the idea is to only use it for libraries that often have this`
		`+ # issue.`
		`+ #`
		`+ # Changes:`
		`+ # - remove all files other than libicu.so.`
		`+ # - depend on icu; this is needed because if the package is installed on its`
		`+ # own, ldconfig will create untracked symlinks which were supposed to be`
		`+ # installed by the icu package.`
		`+`
		`+`
		`+ pkgname=icu-compat-68`
		`+ pkgver=68.2`
		`+ pkgrel=1`
		`+ pkgrel+=.parabola1`
		`+ pkgdesc="International Components for Unicode library"`
		`+ pkgdesc+=" (compatibility libraries for the previous release)"`
		`+ arch=(x86_64)`
		`+ arch+=(armv7h i686)`
		`+ url="https://icu.unicode.org"`
		`+ license=('custom:icu')`
		`+ depends=('gcc-libs' 'sh')`
		`+ depends+=("icu>${pkgver}")`
		`+ conflicts=("icu<=${pkgver}")`
		`+ makedepends=('python')`
		`+ provides=(libicu{data,i18n,io,test,tu,uc}.so)`
		`+ source=(https://github.com/unicode-org/icu/releases/download/release-${pkgver//./-}/icu4c-${pkgver//./_}-src.tgz{,.asc})`
		`+ # https://github.com/unicode-org/icu/releases/download/release-68-2/SHASUM512.txt`
		`+ sha512sums=('24f3b7981667b37df58118f56ae76a09b719358c1efa8d6f044d28ef8df1c722a894957acadfb3c37aee39ac845893924fc3370d6bbe09875aec8d937059f84b'`
		`+ 'SKIP')`
		`+ #validpgpkeys=('BA90283A60D67BA0DD910A893932080F4FB419E3') # "Steven R. Loomis (filfla-signing) <srloomis@us.ibm.com>"`
		`+ #validpgpkeys+=('9731166CD8E23A83BEE7C6D3ACA5DBE1FD8FABF1') # "Steven R. Loomis (ICU Project) <srl@icu-project.org>"`
		`+ #validpgpkeys+=('FFA9129A180D765B7A5BEA1C9B432B27D1BA20D7') # "Fredrik Roubert <fredrik@roubert.name>"`
		`+ #validpgpkeys+=('E4098B78AFC94394F3F49AA903996C7C83F12F11') # "keybase.io/srl295 <srl295@keybase.io>"`
		`+ #validpgpkeys+=('4569BBC09DA846FC91CBD21CE1BBA44593CF2AE0') # "Steven R. Loomis (codesign-qormi) <srloomis@us.ibm.com>"`
		`+ validpgpkeys=('0E51E7F06EF719FBD072782A5F56E5AFA63CCD33') #"Craig Cornelius (For use with ICU releases) <ccornelius@google.com>"`
		`+`
		`+ build() {`
		`+ cd icu/source`
		`+ ./configure --prefix=/usr \`
		`+ --sysconfdir=/etc \`
		`+ --mandir=/usr/share/man \`
		`+ --sbindir=/usr/bin`
		`+ make`
		`+ }`
		`+`
		`+ check() {`
		`+ cd icu/source`
		`+ make -k check`
		`+ }`
		`+`
		`+ package() {`
		`+ cd icu/source`
		`+ make -j1 DESTDIR="${pkgdir}" install`
		`+`
		`+ # Install license`
		`+ install -Dm644 "${srcdir}"/icu/LICENSE "${pkgdir}"/usr/share/licenses/"${pkgname}"/LICENSE`
		`+`
		`+ # to avoid conflicts against the preferred 'icu' package, we remove all files`
		`+ # except the actual shared libraries`
		`+ rm -r "${pkgdir}"/usr/{bin,include,lib/{icu,pkgconfig},share}`
		`+ rm "${pkgdir}"/usr/lib/*.so`
		`+ }`

libre/icu-compat-69/PKGBUILD

file added

+130

		`@@ -0,0 +1,130 @@`
		`+ # Maintainer (arch): Andreas Radke <andyrtr@archlinux.org>`
		`+ # Contributor: Art Gramlich <art@gramlich-net.com>`
		`+ # Contributor: Denis 'GNUtoo' Carikli <GNUtoo@cyberdimension.org>`
		`+ # Contributor: Eli Schwartz <eschwartz@archlinux.org>`
		`+ # Contributor: bill-auger <bill-auger@programmer.net>`
		`+ # Maintainer: Parabola Hackers <dev@lists.parabola.nu>`
		`+`
		`+`
		`+ # parabola changes and rationale:`
		`+ #`
		`+ # Several Parabola packages depends on ICU, and the ICU soname changes often.`
		`+ # This means that if we don't rebuild all the Parabola packages which depend`
		`+ # on ICU, as soon as the new ArchLinux, ArchLinux32, and ArchLinuxARM ICU`
		`+ # packages are synchronized into the Parabola repositories, we have a problem.`
		`+ # The repo server synchronizes with the upstream repos un-attended; so this`
		`+ # is a wonderful surprise each time; and we hustle frantucally to get the`
		`+ # system sane again. We could watch the testing and staging repos of each`
		`+ # upstream, and start re-building everything in a Parabola staging repo;`
		`+ # but that could result in discarded work, if those exact versions are not the`
		`+ # ones which are eventually released into [core].`
		`+ #`
		`+ # At first nothing was done to fix or workaround that issue. In practice,`
		`+ # once a new ICU was synchronized, many users were upgrading before the`
		`+ # Parabola packages had the time to be rebuilt. For such users, it`
		`+ # broke all the installed Parabola packages that were depending on the old ICU.`
		`+ # This means that users had to find a way to downgrade packages manually or wait`
		`+ # until developers would finally have rebuilt all the packages that were broken.`
		`+ #`
		`+ # Then such packages were modified to make them depend on the exact version of`
		`+ # the ICU packages they were built against. This way, once the new ICU package`
		`+ # was synchronized, users could not upgrade if they had packages that were not`
		`+ # rebuilt yet against the new ICU package. However this workaround also prevents`
		`+ # installing packages that depends on the new ICU.`
		`+ #`
		`+ # The correct fix would probably be to automatically build all the Packages`
		`+ # instead of relying on Arch Linux Packages. Still, a staging repo would be`
		`+ # required to hold the new packages, until they all can be released together sanely.`
		`+ # However we don't have the code, configuration and/or infrastructure to run`
		`+ # an automatic builder for all packages yet even if there is work in this`
		`+ # direction.`
		`+ #`
		`+ # In the meantime, this version of ICU exists for Parabola packages to link against`
		`+ # at runtime. In this way, Parabola packages can depend only on the "sodeps" exposed`
		`+ # by ICU, which is usually provided by the upstream distribution's ICU; but may be`
		`+ # this ICU, if the Parabola package has yet to be rebuilt agianst the upgraded ICU.`
		`+ #`
		`+ # It is inspired by the admittedly awkward hack of versioned library`
		`+ # dependencies more commonly seen (e.g. in the AUR as 'icu65') on which`
		`+ # proprietary binaries built against Debian's ICU will depend. It is awkward,`
		`+ # in the eyes of the beholder and this elegantly scales to Parabola's needs,`
		`+ # without consuming increasing resources, which is the best definition of "not`
		`+ # awkward".`
		`+ #`
		`+ # To use it, simply add the following dependency to any package which parabola`
		`+ # has built or rebuilt:`
		`+ #`
		`+ # depends=('libicui18n.so')`
		`+ #`
		`+ # or whichever shared library is reported by readelf -d /path/to/compiled/ELF/file`
		`+ # and, every time the upstream distribution upgrades ICU, update this package`
		`+ # as well, to ensure it always stays exactly one version behind.`
		`+ #`
		`+ # This works well for ICU, even for packages which link to both the older and`
		`+ # newer versions of libicu*.so, since ICU uses versioned symbols as reported by`
		`+ #`
		`+ # nm -D --demangle --with-symbol-versions /path/to/library`
		`+ #`
		`+ # However, caution must be taken before implementing the same idea for other`
		`+ # libraries. So the idea is to only use it for libraries that often have this`
		`+ # issue.`
		`+ #`
		`+ # Changes:`
		`+ # - remove all files other than libicu.so.`
		`+ # - depend on icu; this is needed because if the package is installed on its`
		`+ # own, ldconfig will create untracked symlinks which were supposed to be`
		`+ # installed by the icu package.`
		`+`
		`+`
		`+ pkgname=icu-compat-69`
		`+ pkgver=69.1`
		`+ pkgrel=1`
		`+ pkgrel+=.parabola1`
		`+ pkgdesc="International Components for Unicode library"`
		`+ pkgdesc+=" (compatibility libraries for the previous release)"`
		`+ arch=(x86_64)`
		`+ arch+=(armv7h i686)`
		`+ url="https://icu.unicode.org"`
		`+ license=('custom:icu')`
		`+ depends=('gcc-libs' 'sh')`
		`+ depends+=("icu>${pkgver}")`
		`+ conflicts=("icu<=${pkgver}")`
		`+ makedepends=('python')`
		`+ provides=(libicu{data,i18n,io,test,tu,uc}.so)`
		`+ source=(https://github.com/unicode-org/icu/releases/download/release-${pkgver//./-}/icu4c-${pkgver//./_}-src.tgz{,.asc})`
		`+ # https://github.com/unicode-org/icu/releases/download/release-69-1/SHASUM512.txt`
		`+ sha512sums=('d4aeb781715144ea6e3c6b98df5bbe0490bfa3175221a1d667f3e6851b7bd4a638fa4a37d4a921ccb31f02b5d15a6dded9464d98051964a86f7b1cde0ff0aab7'`
		`+ 'SKIP')`
		`+ #validpgpkeys=('BA90283A60D67BA0DD910A893932080F4FB419E3') # "Steven R. Loomis (filfla-signing) <srloomis@us.ibm.com>"`
		`+ #validpgpkeys+=('9731166CD8E23A83BEE7C6D3ACA5DBE1FD8FABF1') # "Steven R. Loomis (ICU Project) <srl@icu-project.org>"`
		`+ #validpgpkeys+=('FFA9129A180D765B7A5BEA1C9B432B27D1BA20D7') # "Fredrik Roubert <fredrik@roubert.name>"`
		`+ #validpgpkeys+=('E4098B78AFC94394F3F49AA903996C7C83F12F11') # "keybase.io/srl295 <srl295@keybase.io>"`
		`+ #validpgpkeys+=('4569BBC09DA846FC91CBD21CE1BBA44593CF2AE0') # "Steven R. Loomis (codesign-qormi) <srloomis@us.ibm.com>"`
		`+ validpgpkeys=('0E51E7F06EF719FBD072782A5F56E5AFA63CCD33') #"Craig Cornelius (For use with ICU releases) <ccornelius@google.com>"`
		`+`
		`+ build() {`
		`+ cd icu/source`
		`+ ./configure --prefix=/usr \`
		`+ --sysconfdir=/etc \`
		`+ --mandir=/usr/share/man \`
		`+ --sbindir=/usr/bin`
		`+ make`
		`+ }`
		`+`
		`+ check() {`
		`+ cd icu/source`
		`+ make -k check`
		`+ }`
		`+`
		`+ package() {`
		`+ cd icu/source`
		`+ make -j1 DESTDIR="${pkgdir}" install`
		`+`
		`+ # Install license`
		`+ install -Dm644 "${srcdir}"/icu/LICENSE "${pkgdir}"/usr/share/licenses/"${pkgname}"/LICENSE`
		`+`
		`+ # to avoid conflicts against the preferred 'icu' package, we remove all files`
		`+ # except the actual shared libraries`
		`+ rm -r "${pkgdir}"/usr/{bin,include,lib/{icu,pkgconfig},share}`
		`+ rm "${pkgdir}"/usr/lib/*.so`
		`+ }`

libre/icu-compat-70/PKGBUILD

file modified

+90 -59

		`@@ -1,82 +1,96 @@`
		`- # Maintainer (Arch): Andreas Radke <andyrtr@archlinux.org>`
		`- # Contributor (Arch): Art Gramlich <art@gramlich-net.com>`
		`+ # Maintainer (arch): Andreas Radke <andyrtr@archlinux.org>`
		`+ # Contributor: Art Gramlich <art@gramlich-net.com>`
		`# Contributor: Denis 'GNUtoo' Carikli <GNUtoo@cyberdimension.org>`
		`# Contributor: Eli Schwartz <eschwartz@archlinux.org>`
		`# Contributor: bill-auger <bill-auger@programmer.net>`
		`+ # Maintainer: Parabola Hackers <dev@lists.parabola.nu>`


		`# parabola changes and rationale:`
		`#`
		`- # Several Parabola packages depends on ICU, and the ICU soname changes often.`
		`- # This means that if we don't rebuild all the Parabola packages which depend`
		`- # on ICU, as soon as the new ArchLinux, ArchLinux32, and ArchLinuxARM ICU`
		`+ # Several Parabola packages depends on 'icu', and the 'icu' "sonames" change`
		`+ # frequently. If we don't rebuild all the Parabola packages which depend on`
		`+ # 'icu', as soon as the new ArchLinux, ArchLinux32, and ArchLinuxARM 'icu'`
		`# packages are synchronized into the Parabola repositories, we have a problem.`
		`- # The repo server synchronizes with the upstream repos un-attended; so this`
		`- # is a wonderful surprise each time; and we hustle frantucally to get the`
		`- # system sane again. We could watch the testing and staging repos of each`
		`- # upstream, and start re-building everything in a Parabola staging repo;`
		`- # but that could result in discarded work, if those exact versions are not the`
		`- # ones which are eventually released into [core].`
		`- #`
		`- # At first nothing was done to fix or workaround that issue. In practice,`
		`- # once a new ICU was synchronized, many users were upgrading before the`
		`- # Parabola packages had the time to be rebuilt. For such users, it`
		`- # broke all the installed Parabola packages that were depending on the old ICU.`
		`- # This means that users had to find a way to downgrade packages manually or wait`
		`- # until developers would finally have rebuilt all the packages that were broken.`
		`+ # The repo server synchronizes with the upstream repos un-attended; so this is`
		`+ # a wonderful surprise each time; and we must hustle to get the system sane`
		`+ # again. We could watch the upstream testing and staging repos of each upstream,`
		`+ # and start re-building everything in a Parabola staging repo; but that could`
		`+ # result in discarded work, if those exact versions are not the ones which are`
		`+ # eventually released into the main repos.`
		`+ #`
		`+ # At first nothing was done to fix or workaround that issue. In practice, once`
		`+ # a new 'icu' was synchronized, many users were upgrading before the Parabola`
		`+ # packages had the time to be rebuilt. For such users, it broke all the`
		`+ # installed Parabola packages that were depending on the old 'icu'. This means`
		`+ # that users had to find a way to downgrade packages manually or wait until`
		`+ # the package maintainers would finally have rebuilt all of the broken packages.`
		`#`
		`# Then such packages were modified to make them depend on the exact version of`
		`- # the ICU packages they were built against. This way, once the new ICU package`
		`- # was synchronized, users could not upgrade if they had packages that were not`
		`- # rebuilt yet against the new ICU package. However this workaround also prevents`
		`- # installing packages that depends on the new ICU.`
		`- #`
		`- # The correct fix would probably be to automatically build all the Packages`
		`- # instead of relying on Arch Linux Packages. Still, a staging repo would be`
		`- # required to hold the new packages, until they all can be released together sanely.`
		`- # However we don't have the code, configuration and/or infrastructure to run`
		`- # an automatic builder for all packages yet even if there is work in this`
		`- # direction.`
		`- #`
		`- # In the meantime, this version of ICU exists for Parabola packages to link against`
		`- # at runtime. In this way, Parabola packages can depend only on the "sodeps" exposed`
		`- # by ICU, which is usually provided by the upstream distribution's ICU; but may be`
		`- # this ICU, if the Parabola package has yet to be rebuilt agianst the upgraded ICU.`
		`- #`
		`- # It is inspired by the admittedly awkward hack of versioned library`
		`- # dependencies more commonly seen (e.g. in the AUR as 'icu65') on which`
		`- # proprietary binaries built against Debian's ICU will depend. It is awkward,`
		`- # in the eyes of the beholder and this elegantly scales to Parabola's needs,`
		`- # without consuming increasing resources, which is the best definition of "not`
		`- # awkward".`
		`- #`
		`- # To use it, simply add the following dependency to any package which parabola`
		`- # has built or rebuilt:`
		`+ # the 'icu' packages they were built against. This way, once the new 'icu'`
		`+ # package was synchronized, users could not upgrade if they had packages that`
		`+ # were not rebuilt yet against the new 'icu' package. However this workaround`
		`+ # also prevents installing packages that depends on the new 'icu'.`
		`+ #`
		`+ # The correct fix would be to automatically build/re-build all Packages instead`
		`+ # of relying on ArchLinux. Still, a new staging repo would be required to hold`
		`+ # the new packages, until they all can be released together sanely. However we`
		`+ # don't have the tooling to run an automatic builder for all packages yet, even`
		`+ # if there is work in this direction.`
		`+ #`
		`+ # In the meantime, this version of 'icu' exists for Parabola packages to link`
		`+ # against at runtime. In this way, Parabola packages can depend only on the`
		`+ # shared-object dependencies (aka: "sodeps", eg: libicu*.so) exposed by 'icu',`
		`+ # which is usually provided by the upstream distribution's 'icu'; but may be`
		`+ # this package, if the dependent package has yet to be rebuilt against the`
		`+ # upgraded 'icu'.`
		`+ #`
		`+ # It is inspired by the awkward hack of versioned library dependencies, commonly`
		`+ # used temporarily, for extraordinary cases (e.g. in ArchLinux32 and the AUR as`
		`+ # 'icu65', in ArchLinux as 'electronNN', etc). The awkwardness is superficial`
		`+ # though. This scales elegantly to Parabola's needs, without consuming`
		`+ # increasing resources, which is the best definition of "not awkward".`
		`+ #`
		`+ # 'icu-compat' will usually be one major version behind core/icu. Dependent`
		`+ # PKGBUILDs of 'icu' can simply add the following "sodep" dependency:`
		`#`
		`# depends=('libicui18n.so')`
		`#`
		`- # or whichever shared library is reported by readelf -d /path/to/compiled/ELF/file`
		`- # and, every time the upstream distribution upgrades ICU, update this package`
		`- # as well, to ensure it always stays exactly one version behind.`
		`+ # or whichever libicu.so. linkage is reported by:`
		`+ #`
		`+ # $ readelf -d /path/to/compiled/ELF/file \| grep libicu`
		`#`
		`- # This works well for ICU, even for packages which link to both the older and`
		`- # newer versions of libicu*.so, since ICU uses versioned symbols as reported by`
		`+ # Then, each time the upstream distribution upgrades 'icu', upgrade this package`
		`+ # as well, ensuring that it is always at the immediately preceding upstream`
		`+ # version. If some dependent is not yet re-built when it's 'icu' sodep becomes`
		`+ # more than one version behind upstream, this PKGBUILD could be renamed/re-built`
		`+ # as 'icu-compat-NN'. Of course, it would still be better to rebuild the`
		`+ # dependent(s) instead; but sometimes (especially for i686) the dependent may`
		`+ # have other problems, preventing rebuild.`
		`#`
		`- # nm -D --demangle --with-symbol-versions /path/to/library`
		`+ # Though pacman will pull in the appropriate package automatically as needed,`
		`+ # the general recommendation is for all Parabola users to keep this package`
		`+ # installed always, as a catch-all for any dependent lacking the appropriate`
		`+ # sodep.`
		`#`
		`- # However, caution must be taken before implementing the same idea for other`
		`- # libraries. So the idea is to only use it for libraries that often have this`
		`- # issue.`
		`+ # This works well for 'icu', even for packages which link to both the older and`
		`+ # newer versions of libicu*.so, since 'icu' uses versioned symbols as reported`
		`+ # by:`
		`+ #`
		`+ # $ nm -D --demangle --with-symbol-versions /path/to/library`
		`+ #`
		`+ # However, caution must be taken before implementing the same hack for other`
		`+ # libraries. Currently, 'icu' is the only one which changes so often, has so`
		`+ # many dependents, _and_ supports this hack robustly.`
		`#`
		`# Changes:`
		`# - remove all files other than libicu.so.`
		`# - depend on icu; this is needed because if the package is installed on its`
		`- # own, ldconfig will create untracked symlinks which were supposed to be`
		`+ # own, ldconfig will create un-tracked symlinks which were supposed to be`
		`# installed by the icu package.`


		`- _pkgname=icu # 'pkgver' should always be one major version behind core/icu`
		`- pkgname=${_pkgname}-compat`
		`+ pkgname=icu-compat-70`
		`pkgver=70.1`
		`pkgrel=1`
		`pkgrel+=.parabola1`
		`@@ -87,14 +101,16 @@`
		`url="https://icu.unicode.org"`
		`license=('custom:icu')`
		`depends=('gcc-libs' 'sh')`
		`- depends+=("icu>${pkgver}") # core/icu should always be one major version ahead`
		`- conflicts=("icu<=${pkgver}") # core/icu should always be one major version ahead`
		`+ depends+=("icu>${pkgver}")`
		`+ conflicts=("icu<=${pkgver}")`
		`makedepends=('python')`
		`provides=(libicu{data,i18n,io,test,tu,uc}.so)`
		`- source=(https://github.com/unicode-org/icu/releases/download/release-${pkgver//./-}/${_pkgname}4c-${pkgver//./_}-src.tgz{,.asc})`
		`+ source=(https://github.com/unicode-org/icu/releases/download/release-${pkgver//./-}/icu4c-${pkgver//./_}-src.tgz{,.asc})`
		`+ source_armv7h=(icudata-stdlibs.patch)`
		`# https://github.com/unicode-org/icu/releases/download/release-70-1/SHASUM512.txt`
		`sha512sums=('0b26ae7207155cb65a8fdb25f7b2fa4431e74b12bccbed0884a17feaae3c96833d12451064dd152197fd6ea5fd3adfd95594284a463e66c82e0d860f645880c9'`
		`'SKIP')`
		`+ sha512sums_armv7h=('8f13898c2b2d69ef516ee0831a73e5865676795716e7becac4457e208642bfdffb42f2a9280e99dcc10303ad721f5dc2e10ef83c633bd723044e98cc72c6bc7b')`
		`#validpgpkeys=('BA90283A60D67BA0DD910A893932080F4FB419E3') # "Steven R. Loomis (filfla-signing) <srloomis@us.ibm.com>"`
		`#validpgpkeys+=('9731166CD8E23A83BEE7C6D3ACA5DBE1FD8FABF1') # "Steven R. Loomis (ICU Project) <srl@icu-project.org>"`
		`#validpgpkeys+=('FFA9129A180D765B7A5BEA1C9B432B27D1BA20D7') # "Fredrik Roubert <fredrik@roubert.name>"`
		`@@ -102,6 +118,18 @@`
		`#validpgpkeys+=('4569BBC09DA846FC91CBD21CE1BBA44593CF2AE0') # "Steven R. Loomis (codesign-qormi) <srloomis@us.ibm.com>"`
		`validpgpkeys=('0E51E7F06EF719FBD072782A5F56E5AFA63CCD33') #"Craig Cornelius (For use with ICU releases) <ccornelius@google.com>"`

		`+`
		`+ prepare() {`
		`+ case "${CARCH}" in`
		`+ armv7h)`
		`+ # ../../bin/genrb: error while loading shared libraries: ../../lib/libicudata.so.70: internal error`
		`+ cd icu/source`
		`+ patch -p2 -i ${srcdir}/icudata-stdlibs.patch`
		`+ sed -r -i 's/(for ac_prog in )clang(\+\+)? /\1/g' configure`
		`+ ;;`
		`+ esac`
		`+ }`
		`+`
		`build() {`
		`cd icu/source`
		`./configure --prefix=/usr \`
		`@@ -112,6 +140,9 @@`
		`}`

		`check() {`
		`+ # one of the 'iotest' tests fails on armv7h`
		`+ [[ "${CARCH}" != armv7h ]] \|\| return 0`
		`+`
		`cd icu/source`
		`make -k check`
		`}`

libre/icu-compat-70/icudata-stdlibs.patch

file added

+15

		`@@ -0,0 +1,15 @@`
		`+ Index: icu-52~m1/source/config/mh-linux`
		`+ ===================================================================`
		`+ --- icu-52~m1.orig/source/config/mh-linux 2013-09-14 18:53:23.284040467 -0400`
		`+ +++ icu-52~m1/source/config/mh-linux 2013-09-14 18:53:23.284040467 -0400`
		`+ @@ -21,7 +21,9 @@`
		`+ LD_RPATH_PRE = -Wl,-rpath,`
		`+`
		`+ ## These are the library specific LDFLAGS`
		`+ -LDFLAGSICUDT=-nodefaultlibs -nostdlib`
		`+ +#LDFLAGSICUDT=-nodefaultlibs -nostdlib`
		`+ +# Debian change: linking icudata as data only causes too many problems.`
		`+ +LDFLAGSICUDT=`
		`+`
		`+ ## Compiler switch to embed a library name`
		`+ # The initial tab in the next line is to prevent icu-config from reading it.`

libre/icu-compat/PKGBUILD

file modified

+97 -67

		`@@ -3,81 +3,95 @@`
		`# Contributor: Denis 'GNUtoo' Carikli <GNUtoo@cyberdimension.org>`
		`# Contributor: Eli Schwartz <eschwartz@archlinux.org>`
		`# Contributor: bill-auger <bill-auger@programmer.net>`
		`+ # Maintainer: Parabola Hackers <dev@lists.parabola.nu>`


		`# parabola changes and rationale:`
		`#`
		`- # Several Parabola packages depends on ICU, and the ICU soname changes often.`
		`- # This means that if we don't rebuild all the Parabola packages which depend`
		`- # on ICU, as soon as the new ArchLinux, ArchLinux32, and ArchLinuxARM ICU`
		`+ # Several Parabola packages depends on 'icu', and the 'icu' "sonames" change`
		`+ # frequently. If we don't rebuild all the Parabola packages which depend on`
		`+ # 'icu', as soon as the new ArchLinux, ArchLinux32, and ArchLinuxARM 'icu'`
		`# packages are synchronized into the Parabola repositories, we have a problem.`
		`- # The repo server synchronizes with the upstream repos un-attended; so this`
		`- # is a wonderful surprise each time; and we hustle frantucally to get the`
		`- # system sane again. We could watch the testing and staging repos of each`
		`- # upstream, and start re-building everything in a Parabola staging repo;`
		`- # but that could result in discarded work, if those exact versions are not the`
		`- # ones which are eventually released into [core].`
		`- #`
		`- # At first nothing was done to fix or workaround that issue. In practice,`
		`- # once a new ICU was synchronized, many users were upgrading before the`
		`- # Parabola packages had the time to be rebuilt. For such users, it`
		`- # broke all the installed Parabola packages that were depending on the old ICU.`
		`- # This means that users had to find a way to downgrade packages manually or wait`
		`- # until developers would finally have rebuilt all the packages that were broken.`
		`+ # The repo server synchronizes with the upstream repos un-attended; so this is`
		`+ # a wonderful surprise each time; and we must hustle to get the system sane`
		`+ # again. We could watch the upstream testing and staging repos of each upstream,`
		`+ # and start re-building everything in a Parabola staging repo; but that could`
		`+ # result in discarded work, if those exact versions are not the ones which are`
		`+ # eventually released into the main repos.`
		`+ #`
		`+ # At first nothing was done to fix or workaround that issue. In practice, once`
		`+ # a new 'icu' was synchronized, many users were upgrading before the Parabola`
		`+ # packages had the time to be rebuilt. For such users, it broke all the`
		`+ # installed Parabola packages that were depending on the old 'icu'. This means`
		`+ # that users had to find a way to downgrade packages manually or wait until`
		`+ # the package maintainers would finally have rebuilt all of the broken packages.`
		`#`
		`# Then such packages were modified to make them depend on the exact version of`
		`- # the ICU packages they were built against. This way, once the new ICU package`
		`- # was synchronized, users could not upgrade if they had packages that were not`
		`- # rebuilt yet against the new ICU package. However this workaround also prevents`
		`- # installing packages that depends on the new ICU.`
		`- #`
		`- # The correct fix would probably be to automatically build all the Packages`
		`- # instead of relying on Arch Linux Packages. Still, a staging repo would be`
		`- # required to hold the new packages, until they all can be released together sanely.`
		`- # However we don't have the code, configuration and/or infrastructure to run`
		`- # an automatic builder for all packages yet even if there is work in this`
		`- # direction.`
		`- #`
		`- # In the meantime, this version of ICU exists for Parabola packages to link against`
		`- # at runtime. In this way, Parabola packages can depend only on the "sodeps" exposed`
		`- # by ICU, which is usually provided by the upstream distribution's ICU; but may be`
		`- # this ICU, if the Parabola package has yet to be rebuilt agianst the upgraded ICU.`
		`- #`
		`- # It is inspired by the admittedly awkward hack of versioned library`
		`- # dependencies more commonly seen (e.g. in the AUR as 'icu65') on which`
		`- # proprietary binaries built against Debian's ICU will depend. It is awkward,`
		`- # in the eyes of the beholder and this elegantly scales to Parabola's needs,`
		`- # without consuming increasing resources, which is the best definition of "not`
		`- # awkward".`
		`- #`
		`- # To use it, simply add the following dependency to any package which parabola`
		`- # has built or rebuilt:`
		`+ # the 'icu' packages they were built against. This way, once the new 'icu'`
		`+ # package was synchronized, users could not upgrade if they had packages that`
		`+ # were not rebuilt yet against the new 'icu' package. However this workaround`
		`+ # also prevents installing packages that depends on the new 'icu'.`
		`+ #`
		`+ # The correct fix would be to automatically build/re-build all Packages instead`
		`+ # of relying on ArchLinux. Still, a new staging repo would be required to hold`
		`+ # the new packages, until they all can be released together sanely. However we`
		`+ # don't have the tooling to run an automatic builder for all packages yet, even`
		`+ # if there is work in this direction.`
		`+ #`
		`+ # In the meantime, this version of 'icu' exists for Parabola packages to link`
		`+ # against at runtime. In this way, Parabola packages can depend only on the`
		`+ # shared-object dependencies (aka: "sodeps", eg: libicu*.so) exposed by 'icu',`
		`+ # which is usually provided by the upstream distribution's 'icu'; but may be`
		`+ # this package, if the dependent package has yet to be rebuilt against the`
		`+ # upgraded 'icu'.`
		`+ #`
		`+ # It is inspired by the awkward hack of versioned library dependencies, commonly`
		`+ # used temporarily, for extraordinary cases (e.g. in ArchLinux32 and the AUR as`
		`+ # 'icu65', in ArchLinux as 'electronNN', etc). The awkwardness is superficial`
		`+ # though. This scales elegantly to Parabola's needs, without consuming`
		`+ # increasing resources, which is the best definition of "not awkward".`
		`+ #`
		`+ # 'icu-compat' will usually be one major version behind core/icu. Dependent`
		`+ # PKGBUILDs of 'icu' can simply add the following "sodep" dependency:`
		`#`
		`# depends=('libicui18n.so')`
		`#`
		`- # or whichever shared library is reported by readelf -d /path/to/compiled/ELF/file`
		`- # and, every time the upstream distribution upgrades ICU, update this package`
		`- # as well, to ensure it always stays exactly one version behind.`
		`+ # or whichever libicu.so. linkage is reported by:`
		`+ #`
		`+ # $ readelf -d /path/to/compiled/ELF/file \| grep libicu`
		`#`
		`- # This works well for ICU, even for packages which link to both the older and`
		`- # newer versions of libicu*.so, since ICU uses versioned symbols as reported by`
		`+ # Then, each time the upstream distribution upgrades 'icu', upgrade this package`
		`+ # as well, ensuring that it is always at the immediately preceding upstream`
		`+ # version. If some dependent is not yet re-built when it's 'icu' sodep becomes`
		`+ # more than one version behind upstream, this PKGBUILD could be renamed/re-built`
		`+ # as 'icu-compat-NN'. Of course, it would still be better to rebuild the`
		`+ # dependent(s) instead; but sometimes (especially for i686) the dependent may`
		`+ # have other problems, preventing rebuild.`
		`#`
		`- # nm -D --demangle --with-symbol-versions /path/to/library`
		`+ # Though pacman will pull in the appropriate package automatically as needed,`
		`+ # the general recommendation is for all Parabola users to keep this package`
		`+ # installed always, as a catch-all for any dependent lacking the appropriate`
		`+ # sodep.`
		`#`
		`- # However, caution must be taken before implementing the same idea for other`
		`- # libraries. So the idea is to only use it for libraries that often have this`
		`- # issue.`
		`+ # This works well for 'icu', even for packages which link to both the older and`
		`+ # newer versions of libicu*.so, since 'icu' uses versioned symbols as reported`
		`+ # by:`
		`+ #`
		`+ # $ nm -D --demangle --with-symbol-versions /path/to/library`
		`+ #`
		`+ # However, caution must be taken before implementing the same hack for other`
		`+ # libraries. Currently, 'icu' is the only one which changes so often, has so`
		`+ # many dependents, _and_ supports this hack robustly.`
		`#`
		`# Changes:`
		`# - remove all files other than libicu.so.`
		`# - depend on icu; this is needed because if the package is installed on its`
		`- # own, ldconfig will create untracked symlinks which were supposed to be`
		`+ # own, ldconfig will create un-tracked symlinks which were supposed to be`
		`# installed by the icu package.`


		`- _pkgname=icu # 'pkgver' should always be one major version behind core/icu`
		`- pkgname=${_pkgname}-compat`
		`- pkgver=69.1`
		`+ pkgname=icu-compat`
		`+ pkgver=71.1`
		`pkgrel=1`
		`pkgrel+=.parabola1`
		`pkgdesc="International Components for Unicode library"`
		`@@ -87,22 +101,35 @@`
		`url="https://icu.unicode.org"`
		`license=('custom:icu')`
		`depends=('gcc-libs' 'sh')`
		`- depends+=("icu>${pkgver}") # core/icu should always be one major version ahead`
		`- conflicts=("icu<=${pkgver}") # core/icu should always be one major version ahead`
		`+ depends+=("icu>${pkgver}")`
		`+ conflicts=("icu<=${pkgver}")`
		`makedepends=('python')`
		`provides=(libicu{data,i18n,io,test,tu,uc}.so)`
		`- source=(https://github.com/unicode-org/icu/releases/download/release-${pkgver//./-}/${_pkgname}4c-${pkgver//./_}-src.tgz{,.asc})`
		`- # https://github.com/unicode-org/icu/releases/download/release-69-1/SHASUM512.txt`
		`- sha512sums=('d4aeb781715144ea6e3c6b98df5bbe0490bfa3175221a1d667f3e6851b7bd4a638fa4a37d4a921ccb31f02b5d15a6dded9464d98051964a86f7b1cde0ff0aab7'`
		`+ source=(https://github.com/unicode-org/icu/releases/download/release-${pkgver//./-}/icu4c-${pkgver//./_}-src.tgz{,.asc})`
		`+ source_armv7h=(icudata-stdlibs.patch)`
		`+ # https://github.com/unicode-org/icu/releases/download/release-71-1/SHASUM512.txt`
		`+ sha512sums=('1fd2a20aef48369d1f06e2bb74584877b8ad0eb529320b976264ec2db87420bae242715795f372dbc513ea80047bc49077a064e78205cd5e8b33d746fd2a2912'`
		`'SKIP')`
		`- validpgpkeys=('BA90283A60D67BA0DD910A893932080F4FB419E3') # "Steven R. Loomis (filfla-signing) <srloomis@us.ibm.com>"`
		`- validpgpkeys+=('9731166CD8E23A83BEE7C6D3ACA5DBE1FD8FABF1') # "Steven R. Loomis (ICU Project) <srl@icu-project.org>"`
		`- validpgpkeys+=('FFA9129A180D765B7A5BEA1C9B432B27D1BA20D7') # "Fredrik Roubert <fredrik@roubert.name>"`
		`- validpgpkeys+=('E4098B78AFC94394F3F49AA903996C7C83F12F11') # "keybase.io/srl295 <srl295@keybase.io>"`
		`- validpgpkeys+=('4569BBC09DA846FC91CBD21CE1BBA44593CF2AE0') # "Steven R. Loomis (codesign-qormi) <srloomis@us.ibm.com>"`
		`- validpgpkeys+=('0E51E7F06EF719FBD072782A5F56E5AFA63CCD33') # "Craig Cornelius (For use with ICU releases) <ccornelius@google.com>"`
		`+ sha512sums_armv7h=('8f13898c2b2d69ef516ee0831a73e5865676795716e7becac4457e208642bfdffb42f2a9280e99dcc10303ad721f5dc2e10ef83c633bd723044e98cc72c6bc7b')`
		`+ #validpgpkeys=('BA90283A60D67BA0DD910A893932080F4FB419E3') # "Steven R. Loomis (filfla-signing) <srloomis@us.ibm.com>"`
		`+ #validpgpkeys+=('9731166CD8E23A83BEE7C6D3ACA5DBE1FD8FABF1') # "Steven R. Loomis (ICU Project) <srl@icu-project.org>"`
		`+ #validpgpkeys+=('FFA9129A180D765B7A5BEA1C9B432B27D1BA20D7') # "Fredrik Roubert <fredrik@roubert.name>"`
		`+ #validpgpkeys+=('E4098B78AFC94394F3F49AA903996C7C83F12F11') # "keybase.io/srl295 <srl295@keybase.io>"`
		`+ #validpgpkeys+=('4569BBC09DA846FC91CBD21CE1BBA44593CF2AE0') # "Steven R. Loomis (codesign-qormi) <srloomis@us.ibm.com>"`
		`+ validpgpkeys=('0E51E7F06EF719FBD072782A5F56E5AFA63CCD33') #"Craig Cornelius (For use with ICU releases) <ccornelius@google.com>"`


		`+ prepare() {`
		`+ case "${CARCH}" in`
		`+ armv7h)`
		`+ # ../../bin/genrb: error while loading shared libraries: ../../lib/libicudata.so.70: internal error`
		`+ cd icu/source`
		`+ patch -p2 -i ${srcdir}/icudata-stdlibs.patch`
		`+ sed -r -i 's/(for ac_prog in )clang(\+\+)? /\1/g' configure`
		`+ ;;`
		`+ esac`
		`+ }`
		`+`
		`build() {`
		`cd icu/source`
		`./configure --prefix=/usr \`
		`@@ -113,6 +140,9 @@`
		`}`

		`check() {`
		`+ # one of the 'iotest' tests fails on armv7h`
		`+ [[ "${CARCH}" != armv7h ]] \|\| return 0`
		`+`
		`cd icu/source`
		`make -k check`
		`}`
		`@@ -122,7 +152,7 @@`
		`make -j1 DESTDIR="${pkgdir}" install`

		`# Install license`
		`- install -Dm644 "${srcdir}"/icu/LICENSE "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"`
		`+ install -Dm644 "${srcdir}"/icu/LICENSE "${pkgdir}"/usr/share/licenses/"${pkgname}"/LICENSE`

		`# to avoid conflicts against the preferred 'icu' package, we remove all files`
		`# except the actual shared libraries`

libre/icu-compat/icudata-stdlibs.patch

file added

+15

		`@@ -0,0 +1,15 @@`
		`+ Index: icu-52~m1/source/config/mh-linux`
		`+ ===================================================================`
		`+ --- icu-52~m1.orig/source/config/mh-linux 2013-09-14 18:53:23.284040467 -0400`
		`+ +++ icu-52~m1/source/config/mh-linux 2013-09-14 18:53:23.284040467 -0400`
		`+ @@ -21,7 +21,9 @@`
		`+ LD_RPATH_PRE = -Wl,-rpath,`
		`+`
		`+ ## These are the library specific LDFLAGS`
		`+ -LDFLAGSICUDT=-nodefaultlibs -nostdlib`
		`+ +#LDFLAGSICUDT=-nodefaultlibs -nostdlib`
		`+ +# Debian change: linking icudata as data only causes too many problems.`
		`+ +LDFLAGSICUDT=`
		`+`
		`+ ## Compiler switch to embed a library name`
		`+ # The initial tab in the next line is to prevent icu-config from reading it.`

libre/jakarta-oro/PKGBUILD

file modified

+1 -1

		`@@ -1,5 +1,5 @@`
		`# Maintainer: Luke Shumaker <lukeshu@sbcglobal.net>`
		`- # Maintainer (AUR): Xiao-Long Chen <chenxiaolong@cxl.epac.to>`
		`+ # Maintainer (aur): Xiao-Long Chen <chenxiaolong@cxl.epac.to>`
		`# Rationale: Build dependency of apache-ant`

		`pkgname=jakarta-oro`

libre/java-assertj/PKGBUILD

file modified

+1 -1

		`@@ -1,7 +1,7 @@`
		`# Copyright (C) 2022 Denis 'GNUtoo' Carikli <GNUtoo@cyberdimension.org>`
		`# This program is free software: you can redistribute it and/or modify`
		`# it under the terms of the CC0 1.0 License.`
		`- # Maintainers: Parabola hackers <dev@lists.parabola.nu>`
		`+ # Maintainer: Parabola Hackers <dev@lists.parabola.nu>`

		`pkgname=java-assertj`
		`pkgver=3.8.0`

libre/java-batik/PKGBUILD

file modified

+1 -21

		`@@ -43,25 +43,5 @@`
		`_dir=$(dirname $artifact)`
		`_artifact=$(basename $artifact)`

		`- jh mvn-install "org.apache.xmlgraphics" ${_artifact} $pkgver \`
		`- "../${_artifact}/pom.xml" \`
		`- "${_dir}/${_artifact}-$pkgver.jar" \`
		`- "${_artifact}-$pkgver.jar"`
		`-`
		`- # Symlink them to /usr/share/java`
		`- ln -s "/usr/share/java/${_artifact}-$pkgver.jar" \`
		`- "$pkgdir/usr/share/java/${_artifact}.jar"`
		`- done`
		`-`
		`- # Install batik-all.jar and batik-libs.jar`
		`- install -d "$pkgdir/usr/share/java/batik"`
		`- install -m644 "lib/batik-all-$pkgver.jar" \`
		`- "$pkgdir/usr/share/java/batik/"`
		`- install -m644 "lib/batik-libs-$pkgver.jar" \`
		`- "$pkgdir/usr/share/java/batik/"`
		`-`
		`- ln -s "/usr/share/java/batik/batik-all-$pkgver.jar" \`
		`- "$pkgdir/usr/share/java/batik/batik-all.jar"`
		`- ln -s "/usr/share/java/batik/batik-libs-$pkgver.jar" \`
		`- "$pkgdir/usr/share/java/batik/batik-libs.jar"`
		`+ cp --no-preserve=ownership "$srcdir/batik-$pkgver/lib"/*.jar "$pkgdir"/usr/share/java/batik/`
		`}`

libre/java-bcel/PKGBUILD

file removed

-47

		`@@ -1,47 +0,0 @@`
		`- # Maintainer: Omar Vega Ramos <ovruni@gnu.org.pe>`
		`- _libname=bcel`
		`- pkgname=java-${_libname}`
		`- pkgver=6.0`
		`- pkgrel=1.parabola1`
		`- pkgdesc="Java library to analyze, create, and manipulate (binary) Java class files"`
		`- arch=('any')`
		`- url='https://commons.apache.org/proper/commons-bcel/'`
		`- license=('APACHE')`
		`- depends=('java-runtime')`
		`- makedepends=('java-environment' 'jh')`
		`- source=("http://archive.apache.org/dist/jakarta/${_libname}/source/${_libname}-$pkgver-src.tar.gz")`
		`- sha256sums=('b963b9f0614f17de40da1de265e44476b80a8cc8a36c07a3acfe48f603306958')`
		`-`
		`- prepare() {`
		`- cd "$srcdir/${_libname}-$pkgver-src"`
		`- mkdir -p build/classes`
		`- }`
		`-`
		`- build() {`
		`- cd "$srcdir/${_libname}-$pkgver-src"`
		`- javac -d build/classes -encoding UTF-8 \`
		`- $(find src/main/java -name \*.java)`
		`- javadoc -sourcepath src/main/java -d build/javadoc \`
		`- -encoding UTF-8 -subpackages org`
		`-`
		`- jar -cvf "${_libname}.jar" -C build/classes .`
		`- }`
		`-`
		`- package() {`
		`- cd "$srcdir/${_libname}-$pkgver-src"`
		`-`
		`- # Install license file`
		`- install -Dm644 LICENSE.txt "$pkgdir/usr/share/licenses/$pkgname/LICENSE.txt"`
		`-`
		`- # Install documentation`
		`- install -d "$pkgdir/usr/share/doc/$pkgname"`
		`- cp -r build/javadoc "$pkgdir/usr/share/doc/$pkgname"`
		`-`
		`- # Install Maven artifacts`
		`- export DESTDIR=$pkgdir`
		`- jh mvn-install "org.apache.${_libname}" ${_libname} $pkgver \`
		`- pom.xml "${_libname}.jar" "${_libname}.jar"`
		`-`
		`- ln -s "/usr/share/java/${_libname}.jar" \`
		`- "$pkgdir/usr/share/java/${_libname}-$pkgver.jar"`
		`- }`

libre/java-common/PKGBUILD

file modified

+2 -2

		`@@ -1,5 +1,5 @@`
		`- # Maintainer (Arch): Guillaume ALAUX <guillaume@archlinux.org>`
		`- # Maintainer (Hyperbola): André Silva <emulatorman@hyperbola.info>`
		`+ # Maintainer (arch): Guillaume ALAUX <guillaume@archlinux.org>`
		`+ # Contributor: André Silva <emulatorman@hyperbola.info>`
		`# Maintainer: Omar Vega Ramos <ovruni@gnu.org.pe>`
		`pkgname=java-runtime-common`
		`pkgbase=java-common`

libre/java-commons-io/PKGBUILD

file modified

+3 -3

		`@@ -1,6 +1,6 @@`
		`- # Maintainer (Arch): Lukas Fleischer <archlinux at cryptocrack dot de>`
		`- # Contributor (Arch): Stefan Husmann <stefan-husmann@t-online.de>`
		`- # Contributor (Arch): Simon Lipp <sloonz+aur@gmail.com>`
		`+ # Maintainer (arch): Lukas Fleischer <archlinux at cryptocrack dot de>`
		`+ # Contributor: Stefan Husmann <stefan-husmann@t-online.de>`
		`+ # Contributor: Simon Lipp <sloonz+aur@gmail.com>`
		`# Maintainer: Omar Vega Ramos <ovruni@gnu.org.pe>`

		`_pkgname=commons-io`

libre/java-commons-net1/PKGBUILD

file removed

-41

		`@@ -1,41 +0,0 @@`
		`- # Maintainer (Arch): Guillaume ALAUX <guillaume@archlinux.org>`
		`- # Maintainer: Omar Vega Ramos <ovruni@gnu.org.pe>`
		`-`
		`- _libname=commons-net`
		`- pkgname=java-${_libname}1`
		`- pkgver=1.4.1`
		`- pkgrel=3.parabola1`
		`- pkgdesc="Apache library that implements the client side of many basic Internet protocols"`
		`- arch=('any')`
		`- url="http://commons.apache.org/net/"`
		`- license=('APACHE')`
		`- depends=('java-runtime-headless')`
		`- makedepends=('apache-ant' 'jakarta-oro' 'jh')`
		`- source=("https://archive.apache.org/dist/commons/net/source/${_libname}-${pkgver}-src.tar.gz")`
		`- sha512sums=('6ac697536eff947cd0aa828c887e9cc4046c49a593c760bbc59db7e04cf0d7456e84d22504cfa2f6915315dc061e3499382f05bd7740bf79a532a4d9d42c0da8')`
		`-`
		`- build() {`
		`- cd "${srcdir}/${_libname}-${pkgver}"`
		`- ant dist -Dnoget=true -lib "/usr/share/java/jakarta-oro.jar"`
		`- }`
		`-`
		`- package() {`
		`- cd "${srcdir}/${_libname}-${pkgver}"`
		`-`
		`- # Install license file`
		`- install -Dm644 LICENSE.txt "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE.txt"`
		`-`
		`- # Install documentation`
		`- install -d "${pkgdir}/usr/share/doc/${pkgname}"`
		`- cp -r "dist/docs/api" "${pkgdir}/usr/share/doc/${pkgname}"`
		`- cp -r "src/java/examples" "${pkgdir}/usr/share/doc/${pkgname}/examples"`
		`-`
		`- # Install Maven artifacts`
		`- export DESTDIR=${pkgdir}`
		`- jh mvn-install ${_libname} ${_libname} ${pkgver} \`
		`- "${srcdir}/${_libname}-${pkgver}/project.xml" \`
		`- "${srcdir}/${_libname}-${pkgver}/target/${_libname}-${pkgver}.jar" \`
		`- "${_libname}.jar"`
		`- ln -s "/usr/share/java/${_libname}.jar" \`
		`- "${pkgdir}/usr/share/java/${_libname}-${pkgver}.jar"`
		`- }`

libre/jedit/PKGBUILD

file removed

-87

		`@@ -1,87 +0,0 @@`
		`- # Maintainer: Omar Vega Ramos <ovruni@gnu.org.pe>`
		`-`
		`- pkgname=jedit`
		`- pkgver=5.4.0`
		`- pkgrel=5.parabola1`
		`- pkgdesc='Editor for programmers'`
		`- arch=('any')`
		`- url='http://jedit.org/'`
		`- license=('GPL')`
		`- depends=('java-runtime>=8')`
		`- makedepends=('java-environment=8' 'apache-ant' 'apache-ant-contrib' 'apache-ivy' 'beanshell' 'docbook-xsl-saxon'`
		`- 'gendesk' 'java-hamcrest' 'jsr305' 'junit' 'xerces2-java')`
		`- optdepends=('noto-fonts: usable font')`
		`- options=('!emptydirs')`
		`- source=("http://sourceforge.net/projects/$pkgname/files/$pkgname/$pkgver/jedit${pkgver}source.tar.bz2"`
		`- 'jedit.sh' 'jeditbg.sh' 'jedit.props' 'jedit-fix_build.patch')`
		`- sha256sums=('b42dec6c81936b8974308f03c8f356487586cec782d79659b8ae67953c8edf71'`
		`- '91d9b4b0c4855c9624ceea8c6b40c90b53fb15a020b6d954f4bb6b4b934e0348'`
		`- '5cf267b6ee1f908ee7e9a830dc98f03a3a4a53db2822fce6a2cb5ed02d444c69'`
		`- 'dc5fe0050321d4f34bce556895fbc39cc6f7df194e14eb4f6ea53166a4d82347'`
		`- '1d747fb3d4b0d4af3d3e752d92858067e02e8160d4d22cf820bd9f45c0fff90b')`
		`-`
		`- prepare() {`
		`- gendesk -f -n \`
		`- --pkgname "$pkgname" \`
		`- --pkgdesc "$pkgdesc" \`
		`- --exec 'jeditbg %U' \`
		`- --name jEdit \`
		`- --genericname Editor`
		`-`
		`- cd jEdit`
		`- mkdir -p lib/{ant-contrib,compile,docbook,ivy,default-plugins,scripting,test}`
		`- ln -sf /usr/share/java/ant-contrib.jar lib/ant-contrib/ant-contrib.jar`
		`- ln -sf /usr/share/java/apache-ivy/ivy.jar lib/ivy/ivy.jar`
		`- ln -sf /usr/share/java/bsh.jar lib/ant-contrib/bsh.jar`
		`- ln -sf /usr/share/java/docbook-xsl-saxon.jar lib/docbook/docbook-xsl-saxon.jar`
		`- ln -sf /usr/share/java/saxon.jar lib/docbook/saxon.jar`
		`- ln -sf /usr/share/java/xercesImpl.jar lib/docbook/xercesImpl.jar`
		`- ln -sf /usr/share/java/hamcrest-core.jar lib/test/hamcrest-core.jar`
		`- ln -sf /usr/share/java/hamcrest-library.jar lib/test/hamcrest-library.jar`
		`- ln -sf /usr/share/java/jsr305.jar lib/compile/jsr305.jar`
		`- ln -sf /usr/share/java/junit.jar lib/test/junit.jar`
		`- patch -Np1 -i "${srcdir}/jedit-fix_build.patch"`
		`- }`
		`-`
		`- build() {`
		`- cd jEdit`
		`- export JAVA_HOME=/usr/lib/jvm/java-8-openjdk`
		`- ant build docs-html \`
		`- -Divy.done=true`
		`- }`
		`-`
		`- package() {`
		`- cd jEdit`
		`-`
		`- # Install documentation`
		`- install -d "$pkgdir/usr/share/java/$pkgname"`
		`- cp -r build/doc "$pkgdir/usr/share/java/$pkgname"`
		`-`
		`- # Install jars`
		`- install -D -m644 build/$pkgname.jar "$pkgdir/usr/share/java/$pkgname/$pkgname.jar"`
		`-`
		`- # Install keymaps`
		`- cp -r build/keymaps "${pkgdir}/usr/share/java/${pkgname}"`
		`-`
		`- # Install macros`
		`- cp -r build/macros "${pkgdir}/usr/share/java/${pkgname}"`
		`-`
		`- # Install modes`
		`- cp -r build/modes "${pkgdir}/usr/share/java/${pkgname}"`
		`-`
		`- # Install properties`
		`- cp -r build/properties "${pkgdir}/usr/share/java/${pkgname}"`
		`-`
		`- # Install startup`
		`- cp -r build/startup "${pkgdir}/usr/share/java/${pkgname}"`
		`-`
		`- # Man pages`
		`- install -Dm644 package-files/linux/$pkgname.1 "$pkgdir/usr/share/man/man1/$pkgname.1"`
		`-`
		`- install -d "$pkgdir/usr/bin"`
		`- install -Dm755 "$srcdir/$pkgname.sh" "$pkgdir/usr/bin/$pkgname"`
		`- install -Dm755 "$srcdir/${pkgname}bg.sh" "$pkgdir/usr/bin/${pkgname}bg"`
		`- install -Dm644 "$srcdir/$pkgname.props" "$pkgdir/usr/share/$pkgname/default.props"`
		`- install -Dm644 doc/$pkgname.png "$pkgdir/usr/share/pixmaps/$pkgname.png"`
		`- install -Dm644 "$srcdir/$pkgname.desktop" "$pkgdir/usr/share/applications/$pkgname.desktop"`
		`- }`

libre/jedit/jedit-fix_build.patch

file removed

-32

		`@@ -1,32 +0,0 @@`
		`- --- jEdit.orig/build.xml 2015-10-20 12:56:08.000000000 -0500`
		`- +++ jEdit/build.xml 2016-07-02 10:14:37.488512109 -0500`
		`- @@ -119,7 +119,7 @@`
		`-`
		`- <target name="retrieve"`
		`- description="retrieve the dependencies"`
		`- - depends="init,init-ivy"`
		`- + depends="init"`
		`- unless="ivy.done">`
		`- <ivy:retrieve sync="true"/>`
		`- <ivy:retrieve pattern="${lib.dir}/ivy/[artifact]-[revision].[ext]"`
		`- @@ -629,8 +629,6 @@`
		`-`
		`- <target name="unpack-docbook-xsl"`
		`- depends="init,retrieve">`
		`- - <unzip src="${lib.dir}/docbook/docbook-xsl-resources.zip"`
		`- - dest="${build.dir}/docbook-xsl/"/>`
		`- </target>`
		`-`
		`- <presetdef name="dependset.build">`
		`- @@ -660,9 +657,9 @@`
		`- <factory name="com.icl.saxon.TransformerFactoryImpl"/>`
		`- <xmlcatalog>`
		`- <entity publicid="http://docbook.sourceforge.net/release/xsl/current/html/chunk.xsl"`
		`- - location="${build.dir}/docbook-xsl/docbook/html/chunk.xsl"/>`
		`- + location="/usr/share/xml/docbook/xsl-stylesheets-1.79.2/html/chunk.xsl"/>`
		`- <entity publicid="http://docbook.sourceforge.net/release/xsl/current/fo/docbook.xsl"`
		`- - location="${build.dir}/docbook-xsl/docbook/fo/docbook.xsl"/>`
		`- + location="/usr/share/xml/docbook/xsl-stylesheets-1.79.2/fo/docbook.xsl"/>`
		`- </xmlcatalog>`
		`- <sysproperty key="javax.xml.parsers.DocumentBuilderFactory"`
		`- value="org.apache.xerces.jaxp.DocumentBuilderFactoryImpl"/>`

libre/jedit/jedit.props

file removed

-63

		`@@ -1,63 +0,0 @@`
		`- # --- Arch Linux defaults for jEdit ---`
		`- #`
		`- # Just remove this file (~/.jedit/properties) to use the original jEdit defaults.`
		`- #`
		`- # startup`
		`- firstTime=false`
		`- tip.show=false`
		`- # buffers`
		`- buffer.tabSize=4`
		`- buffer.indentSize=4`
		`- buffer.encoding=UTF-8`
		`- buffer.maxLineLen=99`
		`- # look and feel, fonts and colors`
		`- icon-theme=tango`
		`- lookAndFeel=com.sun.java.swing.plaf.gtk.GTKLookAndFeel`
		`- view.fontsize=14`
		`- view.font=Noto Mono`
		`- view.selectionFg=false`
		`- view.antiAlias=standard`
		`- view.caretColor=\#333333`
		`- view.lineHighlightColor=\#deebfb`
		`- view.thickCaret=false`
		`- view.selectionFgColor=\#000000`
		`- view.extendedState=0`
		`- view.wrapGuideColor=\#dedede`
		`- view.structureHighlightColor=\#3d9bc4`
		`- view.selectionColor=\#cccccc`
		`- view.status.show-caret-virtual=true`
		`- view.status.foreground=\#000000`
		`- view.status.show-caret-linenumber=true`
		`- view.status.show-caret-bufferlength=true`
		`- view.status.background=\#ffffff`
		`- view.status.show-caret-dot=true`
		`- view.status.memory.background=\#66699a`
		`- view.status.show-caret-offset=true`
		`- view.style.invalid=color\:\#ff1e00 bgColor\:\#ffffcc`
		`- view.style.digit=color\:\#330066`
		`- view.style.literal4=color\:\#0182bc`
		`- view.style.literal3=color\:\#0700cc`
		`- view.style.literal2=color\:\#760000`
		`- view.style.literal1=color\:\#90001c`
		`- view.style.comment4=color\:\#a2a2a2`
		`- view.style.label=color\:\#009500`
		`- view.style.comment3=color\:\#868686`
		`- view.style.comment2=color\:\#383838`
		`- view.style.comment1=color\:\#434343`
		`- view.style.keyword4=color\:\#00a228`
		`- view.style.keyword3=color\:\#0b2700`
		`- view.style.keyword2=color\:\#000066`
		`- view.style.keyword1=color\:\#0033cc`
		`- view.style.function=color\:\#006600`
		`- view.style.operator=color\:\#000000`
		`- view.gutter.fontsize=14`
		`- view.gutter.font=Courier 10 Pitch`
		`- view.gutter.highlightColor=\#660000`
		`- view.gutter.selectionAreaBgColor=\#f0f0f0`
		`- view.gutter.highlightInterval=10`
		`- view.gutter.focusBorderColor=\#ececec`
		`- view.gutter.highlightCurrentLine=false`
		`- view.gutter.bgColor=\#f0f0f0`
		`- view.gutter.currentLineColor=\#006699`
		`- view.gutter.fgColor=\#3c3c3c`
		`- view.gutter.selectionAreaWidth=12`

libre/jedit/jedit.sh

file removed

-18

		`@@ -1,18 +0,0 @@`
		`- #!/bin/bash`
		`-`
		`- # Runs jEdit - Programmer's Text Editor`
		`-`
		`- # If both $HOME/.jedit and $HOME/.jedit/properties doesn't exist,`
		`- # copy in a default property file.`
		`- if [ ! -e $HOME/.jedit ]; then`
		`- if [ ! -e $HOME/.jedit/properties ]; then`
		`- mkdir -p "$HOME/.jedit"`
		`- cp "/usr/share/jedit/default.prop"s "$HOME/.jedit/properties"`
		`- fi`
		`- fi`
		`-`
		`- # Set the initial and maximum JVM heap size`
		`- JAVA_HEAP_MAX_SIZE=192`
		`-`
		`- # Start jEdit`
		`- exec java -Xmx${JAVA_HEAP_MAX_SIZE}M -Dawt.useSystemAAFontSettings=lcd -jar "/usr/share/java/jedit/jedit.jar" "$@"`

libre/jedit/jeditbg.sh

file removed

-3

		`@@ -1,3 +0,0 @@`
		`- #!/bin/bash`
		`- # Runs jEdit in background-mode, ready to reuse the running instance`
		`- jedit -background -reuseview "$@"`

libre/jmol/PKGBUILD

file modified

+2 -2

		`@@ -1,6 +1,6 @@`
		`# Maintainer: Omar Vega Ramos <ovruni@gnu.org.pe>`
		`- # Maintainer (Arch): Antonio Rojas <arojas@archlinux.org>`
		`- # Contributor (Arch): James Spencer <james.s.spencer@gmail.com>`
		`+ # Maintainer (arch): Antonio Rojas <arojas@archlinux.org>`
		`+ # Contributor: James Spencer <james.s.spencer@gmail.com>`

		`# parabola changes and rationale:`
		`# - arch package not built from source`

libre/junit/PKGBUILD

file modified

+1 -1

		`@@ -1,4 +1,4 @@`
		`- # Maintainer (Arch): Guillaume ALAUX <Guillaume at Arch Linux dot org>`
		`+ # Maintainer (arch): Guillaume ALAUX <Guillaume at Arch Linux dot org>`
		`# Rationale: Arch version isn't built from source.`
		`# Maintainer: Omar Vega Ramos <ovruni@gnu.org.pe>`

libre/kde-development-environment-meta/PKGBUILD

file modified

+1 -1

		`@@ -1,7 +1,7 @@`
		`# Note: This PKGBUILD is automatically generated by the scripts at https://cgit.kde.org/kdesdk-devenv-dependencies.git/`
		`# Don't manually edit the PKGBUILD, edit the upstream template instead`
		`# See README file for instructions`
		`- # Maintainer: Parabola hackers <dev@lists.parabola.nu>`
		`+ # Maintainer: Parabola Hackers <dev@lists.parabola.nu>`


		`# parabola changes and rationale:`

libre/kdevelop/PKGBUILD

file modified

+3 -3

		`@@ -1,6 +1,6 @@`
		`- # Maintainer (Arch): Antonio Rojas <arojas@archlinux.org>`
		`- # Contributor (Arch): Andrea Scarpino <andrea@archlinux.org>`
		`- # Contributor (Arch): Giovanni Scafora <giovanni@archlinux.org>`
		`+ # Maintainer (arch): Antonio Rojas <arojas@archlinux.org>`
		`+ # Contributor: Andrea Scarpino <andrea@archlinux.org>`
		`+ # Contributor: Giovanni Scafora <giovanni@archlinux.org>`

		`# parabola changes and rationale:`
		`# - arch package links to qt5-webengine`

libre/khotkeys/PKGBUILD

file modified

+3 -3

		`@@ -1,6 +1,6 @@`
		`- # Maintainer (Arch): Felix Yan <felixonmars@archlinux.org>`
		`- # Maintainer (Arch): Antonio Rojas <arojas@archlinux.org>`
		`- # Contributor (Arch): Andrea Scarpino <andrea@archlinux.org>`
		`+ # Maintainer (arch): Felix Yan <felixonmars@archlinux.org>`
		`+ # Maintainer (arch): Antonio Rojas <arojas@archlinux.org>`
		`+ # Contributor: Andrea Scarpino <andrea@archlinux.org>`
		`# Maintainer: Andreas Grapentin <andreas@grapentin.org>`
		`# Contributor: André Silva <emulatorman@hyperbola.info>`
		`# Contributor: jc_gargma <jc_gargma@iserlohn-fortress.net>`

libre/kile/PKGBUILD

file modified

+2 -2

		`@@ -1,8 +1,8 @@`
		`# Maintainer: Andreas Grapentin <andreas@grapentin.org>`
		`- # Maintainer (Arch): Ronald van Haren <ronald.archlinux.org>`
		`+ # Maintainer (arch): Ronald van Haren <ronald.archlinux.org>`
		`# Contributor: Michał Masłowski <mtjm@mtjm.eu>`
		`# Contributor: André Silva <emulatorman@hyperbola.info>`
		`- # Contributor (Arch): Damir Perisa <damir.perisa@bluewin.ch>`
		`+ # Contributor: Damir Perisa <damir.perisa@bluewin.ch>`

		`pkgname=kile`

libre/kinfocenter/PKGBUILD

file added

+35

		`@@ -0,0 +1,35 @@`
		`+ # Maintainer: Felix Yan <felixonmars@archlinux.org>`
		`+ # Maintainer: Antonio Rojas <arojas@archlinux.org>`
		`+ # Contributor: Andrea Scarpino <andrea@archlinux.org>`
		`+`
		`+ pkgname=kinfocenter`
		`+ pkgver=5.25.4`
		`+ pkgrel=1`
		`+ pkgrel+=.parabola1`
		`+ pkgdesc='A utility that provides information about a computer system'`
		`+ arch=(x86_64)`
		`+ arch+=(armv7h i686)`
		`+ url='https://kde.org/plasma-desktop/'`
		`+ license=(LGPL)`
		`+ depends=(systemsettings glu vulkan-tools wayland-utils xorg-xdpyinfo mesa-utils fwupd aha dmidecode)`
		`+ depends=( ${depends[*]/fwupd/} )`
		`+ makedepends=(extra-cmake-modules plasma-framework kdoctools)`
		`+ groups=(plasma)`
		`+ source=(https://download.kde.org/stable/plasma/$pkgver/$pkgname-$pkgver.tar.xz{,.sig})`
		`+ sha256sums=('a2ad2f4f841d14ae2ed03bd4798ed10f08388337a5f08367248f3ef8b0ee425b'`
		`+ 'SKIP')`
		`+ validpgpkeys=('E0A3EB202F8E57528E13E72FD7574483BB57B18D' # Jonathan Esk-Riddell <jr@jriddell.org>`
		`+ '0AAC775BB6437A8D9AF7A3ACFE0784117FBCE11D' # Bhushan Shah <bshah@kde.org>`
		`+ 'D07BD8662C56CB291B316EB2F5675605C74E02CF' # David Edmundson <davidedmundson@kde.org>`
		`+ '1FA881591C26B276D7A5518EEAAF29B42A678C20') # Marco Martin <notmart@gmail.com>`
		`+ options=(debug)`
		`+`
		`+ build() {`
		`+ cmake -B build -S $pkgname-$pkgver \`
		`+ -DBUILD_TESTING=OFF`
		`+ cmake --build build`
		`+ }`
		`+`
		`+ package() {`
		`+ DESTDIR="$pkgdir" cmake --install build`
		`+ }`

libre/kinfocenter/keys/pgp/0AAC775BB6437A8D9AF7A3ACFE0784117FBCE11D.asc

file added

+75

		`@@ -0,0 +1,75 @@`
		`+ -----BEGIN PGP PUBLIC KEY BLOCK-----`
		`+`
		`+ mQENBFaTa+4BCACxyJ3oTNhz5oJOCu70mrxFqj/uqDfNm2K8Prr0CQ2I7yXijfTZ`
		`+ GVIjURIzp+Zhmc1LhZYlNwwI9ivFFvLoS9kH2rkx9EaIuP3ljtxQskRFrX4BepR9`
		`+ /EvIoi7tUuOEqCy2pRy/y7Rc7s3Qbu/sPQ17wvRQqzTKsvoh9wxat6990l1MFjlF`
		`+ /xBOD4Qb9LJGzc6Y8SLEEs7l/vAesL0viOME1hVQk+fG0KFosI32aeNnnLHPZbLi`
		`+ Z2YETvI5nROMhleSDusqUpVxXzkIBcVLbCyeJooRsZAhJ6AB8qvhOXx2xTBBgMpw`
		`+ aE/DHF6ZkvmsVB6lRNqMLjGeLOkmqx1vjZynABEBAAG0IEJodXNoYW4gU2hhaCA8`
		`+ Ymh1c2g5NEBnbWFpbC5jb20+iQE3BBMBCAAhBQJWk2vuAhsDBQsJCAcCBhUICQoL`
		`+ AgQWAgMBAh4BAheAAAoJEP4HhBF/vOEdwkIIAJkj1i/lgYs4+ViHEmdjsdYwjZwn`
		`+ Ge9yvOLO2UnfN5qun4IuDuPyaqGQjAlNmMzLqOwrP4dVD15AEYH/2zxYu1yrxMrU`
		`+ HdJTklErm59u3nXq131LoVKORTZ3osmAV/UYtUYzj7+aBN3JmFjN+F75fzurnESd`
		`+ vLPGfRrlhujQoW2x3ZAyIbpQs1lojLSEFxu8xlkXY3KkSLRlUoxGgnclhC+ov/+Z`
		`+ 9E4jPjz4nZhTuAOem5Swh6yHujD1v3wIlgc1qU8U1KZ+ulwtwDAVnS0/+WQjXmta`
		`+ l2PiP0wcCIgZdZihTdY/eOY9tepp19SBwUkdNcqzMbAZyfh8d4t9jsYRH460IkJo`
		`+ dXNoYW4gU2hhaCAoa2RlKSA8YnNoYWhAa2RlLm9yZz6JATcEEwEIACEFAld3rtIC`
		`+ GwMFCwkIBwIGFQgJCgsCBBYCAwECHgECF4AACgkQ/geEEX+84R1tfwf9GSACMGPF`
		`+ i9AArBwFhaYUKB4BJqNgCSRvQJ7gtG6YAaW+o919AtmpO+nq0JtvrSXQVLbJ1jxE`
		`+ MXsNJnvZByiACm91u8z/LzMoI5C6RK13eGTTBr57LAE8lXI0xhkiSwQUAPQWJXum`
		`+ E1evoHExHrAi+z6aLa6QXwyqmP5amwked6S6R9GxGI2c+UPm9sVh4Lb1L/pEzeCd`
		`+ t7/1R1baAQ+weI1cVbfd4b9Qc5r/baq41CesZKz29UgorqiLyBXlWLUCClAXB/nr`
		`+ bAh7hR4pDhSsIExSTp8gBnBTpKc2NAzGZTxopcvi/SOAxkdFlfkBewXuvHOxg0S8`
		`+ s8z7Owaeckbj7bQyQmh1c2hhbiBTaGFoIChteWtvbGFiIGFkZHJlc3MpIDxic2hh`
		`+ aEBteWtvbGFiLmNvbT6JAU4EEwEIADgWIQQKrHdbtkN6jZr3o6z+B4QRf7zhHQUC`
		`+ W4T3zwIbAwULCQgHAgYVCgkICwIEFgIDAQIeAQIXgAAKCRD+B4QRf7zhHa3OB/0Q`
		`+ BQ8tc6WukC9ubRd5A1vEe5tSWvzJEB25mc+YfXj3eha9ZhGWSNF7iHQ278aKgyn4`
		`+ HS/Mve+A+w7ZQWtGK1sjxC1E7qn1U1Xx5BoadbvEfN8E9Vun0NPLa/FXtz6gTnGP`
		`+ OkgJ6NjQuEy6aKT9lGbHuxXBLPfGfEQrT16ny0+Nc3Is1cSIWsmyF59vZTH9Z8uJ`
		`+ u2C04lyMkE6huTdbLm6YAFzN3U2B/96ZG/9GWr1EImuVg9z7vUIlENbG/ARHbdGd`
		`+ TqwKzjLPMhMRmSQt9pjOA0K2/o9y7t6JgQiMC1DPl21INZHmYES9dlfyEiaLjVYk`
		`+ VunL/tJHXO9RIoqWx5nPuQENBFaTa+4BCAC8D6XyewOHX+nTc4mBQfLmrmNJu6RX`
		`+ 7kY/cwvAsskevOTNPzgJJtnUJQI1iABWI7U88afjAvU1wzYrBfEfQ43h1cPw6NMY`
		`+ 4/cmHe8YimCgk8cNYKGS0sM3+YJ8hNTSGxKJa7Y3RDxDLK9fSqG1xa6URcctNT57`
		`+ rau7xUtVExFpN0qGeTtMAOLDp36wY+jSYBpVZ7/Z/j0SDQf9ShU0G2OZMKsZvcH1`
		`+ KadOVW4kT27ISHN7EJbjdMPCmZytJ+5Sxi9PFHYCr/nR1qBY/j0ouKS71uShzcss`
		`+ z5WgnkmP87fvsfpfCQJl5SkiPavddodZoBCRRKwqQnV7ns3JFmh7U2+lABEBAAGJ`
		`+ AR8EGAEIAAkFAlaTa+4CGwwACgkQ/geEEX+84R040gf9G+I/AM1ub7UAhPAQPZ25`
		`+ SdIaTH96MV5cmWsucTnGUy1XDh8I0hZaEB/kkWHOrmbKyqhg/NtgEqXtP/kqJX5r`
		`+ uTt9AN3TSlxJ+IrCywCm33kS7yPRADgwNshoCf/HH3VujccN4KfDjIuijLSZbfIb`
		`+ G6cGo2bgqz6t4p9NaZofcQhFfPwAgfv3IL1DNFqZvUohDPy/j5eU7IdDjytLnhGU`
		`+ ZTfSrzhWXkCZybKROW05zScMRd5uL3b+in/Zu8rgeE/lLF8nmD42YJ058n+72LjR`
		`+ 7P5DqrblbAhLiQg8CBbrIFJozQUyUDnTzwsGRFuQAx7brypsOSqWfYcVEqXxiJwd`
		`+ rLkBDQRaK92CAQgAuuXV+Yh0qYO6WQZLnE+X0BivPlRY1vH4B2zDgDBY0qrbIdPl`
		`+ 4/pvbwQLk/Vo2yVZqHfoGhbqnBkXZFpzV9QMOnEdrrMo8unm/02f7buEZ56XkkKT`
		`+ pelsl63Qu0qu2/ISpfxCxRFLGZdj+VLA0SWhe0ecwgR+91ZvcKE1byfzG9+sbVY0`
		`+ v8WQq9Zfx0hUo/0Jf7+FAiUWIgmS6XHuCn+DYBTHrGcGEf+CU64+lfH5CbGz42AK`
		`+ qsYzZwYWV4RarwNBVDuM6XdqlC9m4WcROos5qyV0XQ5sE/SByuHO1a5ZazFFPbrn`
		`+ qiBtg1POQs4uQw4wU2RsEM+bGUIRNTFoIpjHsQARAQABiQJsBBgBCAAgFiEECqx3`
		`+ W7ZDeo2a96Os/geEEX+84R0FAlor3YICGwIBQAkQ/geEEX+84R3AdCAEGQEIAB0W`
		`+ IQSzyzZlUlQL4G7prZcRloxEkoyu/AUCWivdggAKCRARloxEkoyu/GVJB/90wdV5`
		`+ Bsb53X/ai1HdScE7dP+clhDjVEgU87601F7cntzeo9EASso2YLdkXnNE4Gq8THUp`
		`+ XLk/PLTlum5z2OrOYbcfrzWU1kLRguDgVciqcyI+4ev5P5wchTrLrROX7uyEGq5f`
		`+ THYi7xEmolRGXFUEAcsWRGwS6DOq28sDSbho+LRLXyPBFVE6lTmXzjIaw5pxPgMX`
		`+ HGPjb2vuHP3hcFS38CkbKgFgnvlCzeCea3y6rVs86xVUi/l1C/tAdTFHkxbQQzyo`
		`+ bNWOF55ujh12iWOPFqlaLXSJcSgRb6JBumPS3X4g3DEOeWLKOXgqXXWdTz9n925G`
		`+ 1s9Zz5EqRGOPg5tUNpoH/iDhWtorPX9ypuWLPmJzq/e/6l7d1YY5p1FP88fG+33L`
		`+ DOxP69pCqfIoS4h3xtIBtq6ZOD8veVhb4GXSX3o1/rHEur1wj8JdIKTiyLQcc0bE`
		`+ /qqkU1z2wtPDnpDMiSp+K0XzuerrOkTR3Nvbjq1N3eAT7cp9u+t9jINBe4L36+Dz`
		`+ QZdwUGvi7ojMPTY2vKM6VZSHEKDmw1C4Ifp9oSEVAlQk2AslldLA/8huA3V752+C`
		`+ osVz4kO0g/fi1LqkTskFfRVO7Y1Zbs5N4qb/2rdXp4cYEmKNe/II+y9xoCxyobBE`
		`+ ZBECLHCZfIdO2sB4nt72Y+0/G52cW2Gz2yjbP0MaZp25AQ0EWivdvQEIALOgPIfa`
		`+ CxMoYYORHfLJsJ56uOGP6YchINfy7wGVvtNPvnbC4Xp6q8UPSijoukjafw5ZPZFu`
		`+ BZ7E3Qq4Vx/eRTcHoYq40CahxFDmUvt6bnDCFlsMXNXCSOUtnhej5clMjCtm7awt`
		`+ kOD25JQry3AmmxAeQv807LBciYy+/idRlav1sQyUOgchiS/nsSQX+lktjwXKks7Q`
		`+ j/3Oplu+D8jTig2qGdNUredkbgZhsVsdvitmuJuBq3Iaw2ilX4l69g9ioxBi7481`
		`+ bmaLV1P2BtHsqUpmE7wpw4JdQ+NTBiAPuM+Oqo28mWTVoov5SH9QHOevgVJKCfM7`
		`+ RfBj8zGVJ3H/DcsAEQEAAYkBNgQYAQgAIBYhBAqsd1u2Q3qNmvejrP4HhBF/vOEd`
		`+ BQJaK929AhsgAAoJEP4HhBF/vOEd33QIAIV/Wuhv+KHYKkKzwzJYqEZEKReFqSk9`
		`+ 1W+etHDf72mPB3J+IfokNYCSgEm4R/570p9uIBBccxLPwTvbJU7v9Utvc0kFcu9t`
		`+ xNWOge0W046qquRoWIwFZxbLwcSl8Xwlhitrt1TAZPrsIRxyzXzHeE9VTIAWQftn`
		`+ jvRGp8KfdCXoLglMkb4KRF65pzMPf51hPSQ57b2VhmwZoh9Y4b5FM4cgKdoug2Ch`
		`+ /gPFWTd0KGWuSRs8xKnUugk3X0j089po81j1DTcMezAz9QZbSs1qM1Phxl/SaJEE`
		`+ wb/SP6PaGS9MPvfMpshuzz/St5LWesGCOJHMG6cWIm/QAFIuV7WWKpg=`
		`+ =K6Sr`
		`+ -----END PGP PUBLIC KEY BLOCK-----`

libre/kinfocenter/keys/pgp/1FA881591C26B276D7A5518EEAAF29B42A678C20.asc

file added

+23

		`@@ -0,0 +1,23 @@`
		`+ -----BEGIN PGP PUBLIC KEY BLOCK-----`
		`+`
		`+ mQGiBEa0sssRBACshV1hJ9qHhy2NIoQ/Pj5c4BLkoU3pn+V2sgLHNdxxyHoFlO9a`
		`+ YJxFAdFBZOLGcIExHNeQcrkOg1SDHYZkjcuKdmtlHL30fvozzrvjaQA1S2Pk2A5H`
		`+ fhVPH9pHTzeRUAutGSLKTc+tKfHxgJGaoyFwoTYMgFObDVJZK4obGAyHAwCglJFf`
		`+ GEuwhFnGR9PC/i2/fOSjvWMD/3j9zl4LUqSjjm9HbMaPt0Ibd0mg7V5QFF0edrIt`
		`+ YhgtADYAGB2oOezA71w2DYYDFqQ5LqFaRO1E1sJuc3CULJ8f1c/DMcCpeAsj6uWj`
		`+ s5oqu7RppWOXPMB+lW9Bf6TpvBGLSxMb7W3Hl7oqhcxex97KXoGY+WldH9Koqw/r`
		`+ PHvHBACpVdpR4XMKFhiNdByjaXzGbRa8lrk/xzM39IH8exiu/AJIYnsESubpOUb8`
		`+ lKYhpzd03BhJwyufaJ3s7TYgzS5YmDoJExFxrUADxLGyaQsm2IgNJo2fJMDIehfK`
		`+ Q13FJtYoM/a6QR/GRBPjEgKmb5aiy3draNafw5sNW6E4zVccdbQgTWFyY28gTWFy`
		`+ dGluIDxub3RtYXJ0QGdtYWlsLmNvbT6IYAQTEQIAIAUCRrSyywIbIwYLCQgHAwIE`
		`+ FQIIAwQWAgMBAh4BAheAAAoJEOqvKbQqZ4wg7/EAnAnWRJ9flgZaD8jz71Hp28w2`
		`+ PCrQAJsF89uKsYkfgRIgvmActqhuYiGSprkBDQRGtLLMEAQAqCFioBCqRazmB87L`
		`+ Vec8ai7CT18rvwCpPkrfEM5xUkDiFuT9zmh5cE1GT1RxCh3XZ1S63n+z5LBwta7y`
		`+ WqoUP1HSoVJ4hI5TKdJ7T/VCkqRkmcUXnHV0hEo7fsVt6t/z5mJzWhvRRbKgBB0w`
		`+ 7GUOfnknz8SSc5sAmH4uDbwadZsAAwUD/3eG6/F3BeemcuWDQ0bX3aG0VTcnxnlG`
		`+ iv0CxEiuQASVCTK9EwwTStbTfO0Qf0v/YgxL43jX2miPSHMlqyK59LBlRr6HgpgF`
		`+ +YbD9Ev9eJag4ePIpN+zVhkAKyL8u4sdYszozcuww7y5wHUkZIkbW4oEaaj8f3PU`
		`+ 076ZnMOh63YPiEkEGBECAAkFAka0sswCGwwACgkQ6q8ptCpnjCBmlQCfStiAzALE`
		`+ kDokmj/K+gzQQXH3UAMAn1eVX5gG0IvFYJFSKBQ25OjbtIe0`
		`+ =R1D6`
		`+ -----END PGP PUBLIC KEY BLOCK-----`

libre/kinfocenter/keys/pgp/D07BD8662C56CB291B316EB2F5675605C74E02CF.asc

file added

+30

		`@@ -0,0 +1,30 @@`
		`+ -----BEGIN PGP PUBLIC KEY BLOCK-----`
		`+`
		`+ mQENBFG1+bQBCAC3p+fdi9+55LFuKPqW0XrQkQQ2CRfXcM5lqb6B4xQewLorsdX7`
		`+ SRDmLzpdDZ9bCpqxMsiFbB+9lxljHNTzx9BIEO9w6aYtVgPsG4L9ZxwBXUTlgtIA`
		`+ UoOy4lTQnUR0QDFlJQx8c4Cy82htOSCiWO4iaEvMbo+BGe8g4f2/N0tJOrnAc/xl`
		`+ sdA64GTWId4NB12F+QeRgWWNQs/W/j/kyy37+L0juD06RMKth0uRMN37wEa9KcLa`
		`+ lOBEUETrImZfx74wagt6WDnJknLf0ceqzfojk82po0C46BJAu49tLehYYKgo0HKZ`
		`+ fK7CDw53y9SjkI8cU8g48AyUw8Uk/FyJeW1bABEBAAG0N0RhdmlkIEVkbXVuZHNv`
		`+ biAoRGF2aWQgYXQgS0RFKSA8ZGF2aWRlZG11bmRzb25Aa2RlLm9yZz6JATgEEwEC`
		`+ ACIFAlG1+bQCGwMGCwkIBwMCBhUIAgkKCwQWAgMBAh4BAheAAAoJEPVnVgXHTgLP`
		`+ KD0H/0Cnj1bM6MYV5nKXJhLpd8as2OHFlhdtaU7QG3QcMVqdtP3rdOp1RgjmkYsB`
		`+ xgwrxvDTLz0L/PH9UTCXjQeZgNR0hG8iy4IBC9ay0PDdkNpjnHoAiUMRstcDODUZ`
		`+ QdLEOXCbPbRG3q0OlSaOvETL7YkSY8c2N6yqmWaJvudpJ0VVPyIWa2xT53JTXgAD`
		`+ 4m1w8MThAZBZpJi852nQCByCsRC+3cofA7bQd60XLiFWgmnq+rlqryMlWvUmMmat`
		`+ e7U1NC5UsfH6ToXf/ZNZG+fMGE+ntYiHWRFr2tZMyXfUOrgHsAVMAE8v/xVtwS5e`
		`+ VCAdM21GNG4d6XiF7T32GDzrEQm5AQ0EUbX5tAEIAL0uLkPxHbg9boIuVdahyy6F`
		`+ BOcUf8xj3qj8FUGpRkcSSsoyvFTHZRTR+wwTPTaZzzzTFSITRGVv7vdKyl/A+SMw`
		`+ /nlUVfB9xGvvCgzPGesUk9lmxX2DRVpoq9CyVIw0XXJQtNkC3O1yEws4zuDzHe99`
		`+ sfDvXpA1ikfN+Hgn3oLjCHHtWuTyXGKXUimzToDMqWentVkP1rzKPlin9XJ0KDT/`
		`+ axrrD9L5s4KCjHdWEQwG3miJDxQnlsAFDBj7Bs8DZZE+xdzx/l8qBKOxmXD9ohFp`
		`+ 4q0wXVV4QJMHtjhvhId9EN965drlYmMfusMCwavklBOWdR1MdSSBIYPS5eISmj0A`
		`+ EQEAAYkBHwQYAQIACQUCUbX5tAIbDAAKCRD1Z1YFx04Cz4CzCACpN1l39Yzoniqx`
		`+ laabcOrEbFjhKXlFXPm5TC+nj2iO8BieJLoltTcQL1nbxBHcxMkxUUJAVKBSmlh3`
		`+ BPjYJhXBNRvW/gamjaO+LoStXI+0vO4aOhkR0tLqA9/zQFM9uVPu6InS0N98oMaL`
		`+ azyxnXuqEanCN7yWfKHKxmkKiVMB1RMaE+2TYQBKPfFukiX2vv3qByVez8qYGa98`
		`+ 80x6fkrqFbPoJ2oDXEGGD0W7fkv1pZV/1XCuXV/qKz3htD3AQDuLijqt6sM9Oe7Y`
		`+ Lsv5lqTb5DK6g2N9xvhTz64Z+j9bf44fbMReg3ub3GXlf9rFT8eDYfyYLJgWJ/1h`
		`+ YZximth9`
		`+ =QnRI`
		`+ -----END PGP PUBLIC KEY BLOCK-----`

libre/kinfocenter/keys/pgp/E0A3EB202F8E57528E13E72FD7574483BB57B18D.asc

file added

+52

		`@@ -0,0 +1,52 @@`
		`+ -----BEGIN PGP PUBLIC KEY BLOCK-----`
		`+`
		`+ mQINBGFVmzkBEAC9robLj4ZMjZ/EhHbiYpr2/i/uW38T6qP5mwpAGela3/NWhjzp`
		`+ 2a6rfuLTb6OtXkomcMiwzVXBm2VCoF5z7f23c5yCk4qPFnTNcYxmql1MaRrI4x9Z`
		`+ b/iV6jit/FkiNPCc/89kvfWVMywCb/0uOGRbzw9lGNQH+2bJkHLDS38PfrABikOK`
		`+ di75Ux1pOl64GVnKxqfXSB63d9eDtLELEbjvbPRdZJSuFTFLlR+uZKivsCx7LPhp`
		`+ S/EPyW1SnV9Jy8ZAgMHz0VZnkZnC2W15uM8FP6ARUtxlYMptUuU79iERYKd0xwCH`
		`+ JT4GI3PFMjAML/XHzkzzXJgkZm1YMjy2dNHKc07glA6efqrb82BzqWp6mfuUnYBl`
		`+ nO54yDUwUeDWuRvZJwNxv0j31eADYlZoPkkPX6UWqayeAcPEBPofiasxUw5mIfP/`
		`+ 3HAsJcDjf3Oj5tYyE7ELypqTWPvS2fBYCWwvipfxsOQmA9xvlCY2MGhAtTNceJcb`
		`+ 324bOLpuwA2GWmsyHw+c3bvLD7PDaeLZ7kjqu1NBqgwDESgO7sPrWKM4Gaclgr9s`
		`+ Atvfr/vlkHRCTZhpluZuW/JIuiprc9O/ZigT9A9lxbQe1Cm0VPNHk+zDl/wPTv7J`
		`+ EC5OGPAY7G6s7bQLxp7C7FulOZcjKWmnEBWVV1O7iee8YZQ5vZTmTNI2VQARAQAB`
		`+ tCZKb25hdGhhbiBFc2stUmlkZGVsbCA8anJAanJpZGRlbGwub3JnPokCTgQTAQoA`
		`+ OBYhBOCj6yAvjldSjhPnL9dXRIO7V7GNBQJhVZs5AhsDBQsJCAcCBhUKCQgLAgQW`
		`+ AgMBAh4BAheAAAoJENdXRIO7V7GNcZEP/RhsneV30lQg4Qj7Jd/uFhhrvMHTatw8`
		`+ F18bMWr7g/sbQ0z7cewT8YM+2W29FC4k3gZHA8Lwfq8g5LAM8Gbvaggn7LrTvglL`
		`+ i+hX/U4iU7LoqyH1tpyZEPD08qqUkjER8bfLflBElISjGb7xeJMbhS+10vt8QQQl`
		`+ W7MqRQQo0bYB6foLrmW3avzZz/mb2IL3RAWgowQJ9rxG+oW+3lFCjSGvxXaq/BGc`
		`+ Dajkq9UeDGCR3RHOjkDVEX6xuS7D76K0Y32bgYbsDzHkDHRm5vR0LXxQKUC59OQE`
		`+ oNLCdOdFlX4m1Lm2sUa/vXnjrpOPAJvij+LwDt/SB1GygJ/qitO+riTtgSbmyTY8`
		`+ 4xX4dAh4Nenmk1JF3phfwa3nmJzVu7oiCvKTsVrf8gnJUPq8MsgUuWgQ9qu0UXWR`
		`+ bFnnckVsj6xBGuPIgrlGk2V9RTqiReJTsU/RdypVzO6rshEyLWS0TCzygHrZk3IS`
		`+ 4pORUt6itUlJSCdvZRDa3AhPUkQt3Iso0S8oZWzP+zlXMvYFvF1pgtzi9cPqbgJJ`
		`+ 4uQJ858uqw0jwjFM3CYyrVrLWNY2kPIPVbeTH6Bh6nQp4Q0KXnDubcUbbpd2xMHl`
		`+ tHEI6gma9ATha+u/OMjYgXpkAP8UECcF1CD+wIC4c4pbSFnOmhRai92MjbMkb905`
		`+ kYzU/1S3qZ9nuQINBGFVmzkBEACU19R68g6TnrnpUCywwCTVZJkY2JVpSlQGYXjd`
		`+ gC61Kt0vjMCA7sdckSqfE0qTIjxHmDB78F2cpSfDmKEgd8GYdxMuUqTWS7UWRD3R`
		`+ bvDUBRLG/KMig+6HGe+NzxOv+vwCcnvM3LAZP/k/UMbVAOYQFARvm136UOaTnq1B`
		`+ vsnDAMoO+US72OWVXzTWcgbJLoLq0HKfCrA0fDKnnh0HPGQ+58qPfoWuatZwg+O6`
		`+ 0oIE2d5qLrSxAPuUJjaWD1ylNlSbunQNbgHmM1eKK36RUNOc1fDGPWQ1E0+eZuZY`
		`+ 5HfnHFDliZ5rsJsKrqOFhANcRu7BpOWGVSBqms+NjkCUOGwU7ir9jgIBDxdju38u`
		`+ ri3BCDSYPrDrsuFPSLIab/BuaEcbzLsgAAooMbMHFy2WBqw1WtJatGhg+naoJjha`
		`+ xbecaOgU140ObnqQdRd2PpLmIRAze5oFvj9TL6NEvkkhWoOW3MUHbV/sgilvN4pu`
		`+ L+J+ligowbwhny+yfk0XtXZk9nU0/en9UYUFvyQgxi9l+KE6wyl1N74RHvELtPOp`
		`+ 60lOMCB/CAF+q5D3XI4g9LNv3kyCBp40Fq5XiVcMOMamNxq7vc8+2IaSzRiySeQ6`
		`+ 9hddhKf7Rm7x4ZjW3bVxFu0DAQi4CSAsz3A+/g0z4GDrZDqZyNy0VxcXTE9ZZrih`
		`+ NvoTvQARAQABiQI2BBgBCgAgFiEE4KPrIC+OV1KOE+cv11dEg7tXsY0FAmFVmzkC`
		`+ GwwACgkQ11dEg7tXsY0EZRAAh9MbJCBdbVa5h2m3AAbYG+BMZsOeSESQCuy0bM7z`
		`+ 7WShfSafeGE/KhJuAKZtBHopLA1VCF74h3vNwwDxAG+8qbzGxuuzV+Tx18vyiY3d`
		`+ Wlf30L1ypq6fO53fuZSgPB0gzjCoDcJeSDg7FdTcqMzjumys3ThvOBTHB1gwzQWu`
		`+ eZ8CSxKvd34J7CQ7bUpxjDvgZpI3gbdW37F11KUgLF+HtD1bO9SzTs9rdpGpFesS`
		`+ joF2pl2C0plzlB40xgb+CW4GL7T253x1xKejCeas2E4ImmD2ONuOqp7Q31x456cQ`
		`+ r/WqJe7A4lIDRVza2/Nd0qGBCEILmMlIMD+YpZdQv+WO/d6Gv65wt4O+ufjudKcI`
		`+ sIryz7bVC28zOiAwmVmnDhOkAakAkIJVTMa9xyFVtquBfj9z9mg6W7LLw96tAVXT`
		`+ 6yKkQRHkQ2/36uBgsrl2z+k+mFWm4IS2RGgDfTtrq4nl/LGwyb9T0MDuFZ8FUPUN`
		`+ PK28Z1iYWb0tTda5Qc5aCraZcFr0aR4PYToBvt5mvrV+TGvfdVzva/JjcRwtFnwo`
		`+ RUqSlBSJqC4WqZmkB73i16MljvT0+4v2upmud4JKw2KTowhZjbGLlBgrAMxuDYNv`
		`+ 953PoIbKKuD9uwdPkCrkuL1XQsBDWsHgW9DQ4q0bObr0ZBxJWUzLj/5Ew1iFLz5O`
		`+ oS4=`
		`+ =yOFv`
		`+ -----END PGP PUBLIC KEY BLOCK-----`

libre/kodi/PKGBUILD

file modified

+12 -12

		`@@ -1,17 +1,17 @@`
		`# Maintainer (arch): Sergej Pupykin <pupykin.s+arch@gmail.com>`
		`# Maintainer (arch): BlackIkeEagle < ike DOT devolder AT gmail DOT com >`
		`- # Contributor (arch): graysky <graysky AT archlinux DOT us>`
		`- # Contributor (arch): DonVla <donvla@users.sourceforge.net>`
		`- # Contributor (arch): Ulf Winkelvos <ulf [at] winkelvos [dot] de>`
		`- # Contributor (arch): Ralf Barth <archlinux dot org at haggy dot org>`
		`- # Contributor (arch): B & monty - Thanks for your hints :)`
		`- # Contributor (arch): marzoul`
		`- # Contributor (arch): Sergej Pupykin <pupykin.s+arch@gmail.com>`
		`- # Contributor (arch): Brad Fanella <bradfanella@archlinux.us>`
		`- # Contributor (arch): [vEX] <niechift.dot.vex.at.gmail.dot.com>`
		`- # Contributor (arch): Zeqadious <zeqadious.at.gmail.dot.com>`
		`- # Contributor (arch): Bartłomiej Piotrowski <bpiotrowski@archlinux.org>`
		`- # Contributor (arch): Maxime Gauduin <alucryd@gmail.com>`
		`+ # Contributor: graysky <graysky AT archlinux DOT us>`
		`+ # Contributor: DonVla <donvla@users.sourceforge.net>`
		`+ # Contributor: Ulf Winkelvos <ulf [at] winkelvos [dot] de>`
		`+ # Contributor: Ralf Barth <archlinux dot org at haggy dot org>`
		`+ # Contributor: B & monty - Thanks for your hints :)`
		`+ # Contributor: marzoul`
		`+ # Contributor: Sergej Pupykin <pupykin.s+arch@gmail.com>`
		`+ # Contributor: Brad Fanella <bradfanella@archlinux.us>`
		`+ # Contributor: [vEX] <niechift.dot.vex.at.gmail.dot.com>`
		`+ # Contributor: Zeqadious <zeqadious.at.gmail.dot.com>`
		`+ # Contributor: Bartłomiej Piotrowski <bpiotrowski@archlinux.org>`
		`+ # Contributor: Maxime Gauduin <alucryd@gmail.com>`
		`# Contributor: André Silva <emulatorman@hyperbola.info>`
		`# Maintainer: Omar Vega Ramos <ovruni@gnu.org.pe>`
		`# Contributor: Isaac David <isacdaavid () isacdaavid!info>`

libre/kopete/PKGBUILD

file modified

+4 -4

		`@@ -1,8 +1,8 @@`
		`- # Maintainer (Arch): Felix Yan <felixonmars@archlinux.org>`
		`- # Maintainer (Arch): Antonio Rojas <arojas@archlinux.org>`
		`- # Contributor (Arch): Andrea Scarpino <andrea@archlinux.org>`
		`+ # Maintainer (arch): Felix Yan <felixonmars@archlinux.org>`
		`+ # Maintainer (arch): Antonio Rojas <arojas@archlinux.org>`
		`+ # Contributor: Andrea Scarpino <andrea@archlinux.org>`
		`# Maintainer: Andreas Grapentin <andreas@grapentin.org>`
		`- # Contributor (Hyperbola): André Silva <emulatorman@hyperbola.info>`
		`+ # Contributor: André Silva <emulatorman@hyperbola.info>`
		`# Contributor: jc_gargma <jc_gargma@iserlohn-fortress.net>`

		`pkgname=kopete`

libre/lesspipe/PKGBUILD

file modified

+3 -3

		`@@ -1,7 +1,7 @@`
		`# $Id: PKGBUILD 138775 2015-08-26 07:05:31Z spupykin $`
		`- # Maintainer (Arch): Angel 'angvp' Velasquez <angvp[at]archlinux.com.ve>`
		`- # Contributor (Arch): solsTiCe d'Hiver <solstice.dhiver@gmail.com>`
		`- # Maintainer (Hyperbola): André Silva <emulatorman@hyperbola.info>`
		`+ # Maintainer (arch): Angel 'angvp' Velasquez <angvp[at]archlinux.com.ve>`
		`+ # Contributor: solsTiCe d'Hiver <solstice.dhiver@gmail.com>`
		`+ # Contributor: André Silva <emulatorman@hyperbola.info>`
		`# Maintainer: Omar Vega Ramos <ovruni@gnu.org.pe>`

		`pkgname=lesspipe`

libre/libosinfo/PKGBUILD

file modified

+3 -3

		`@@ -1,6 +1,6 @@`
		`- # Maintainer (Arch): Balló György <ballogyor+arch at gmail dot com>`
		`- # Contributor (Arch): Stefano Facchini <stefano.facchini@gmail.com>`
		`- # Maintainer (Hyperbola): André Silva <emulatorman@hyperbola.info>`
		`+ # Maintainer (arch): Balló György <ballogyor+arch at gmail dot com>`
		`+ # Contributor: Stefano Facchini <stefano.facchini@gmail.com>`
		`+ # Contributor: André Silva <emulatorman@hyperbola.info>`
		`# Maintainer: Omar Vega Ramos <ovruni@gnu.org.pe>`
		`# Contributor: Daniel Milewski <niitotantei@gmail.com>`

libre/libquicktime/PKGBUILD

file removed

-96

		`@@ -1,96 +0,0 @@`
		`- # Maintainer (Arch): David Runge <dvzrv@archlinux.org>`
		`- # Contributor (Arch): Federico Cinelli <cinelli@aur.archlinux.org>`
		`- # Contributor (Arch): Mateusz Herych <heniekk@gmail.com>`
		`- # Maintainer: Omar Vega Ramos <ovruni@gnu.org.pe>`
		`- # Contributor: Jorge Lopez <jorginho@lavabit.com>`
		`-`
		`- pkgname=libquicktime`
		`- pkgver=1.2.4`
		`- pkgrel=22`
		`- pkgrel+=.parabola1`
		`- pkgdesc="A library for reading and writing quicktime files"`
		`- pkgdesc+=", without nonfree faac support"`
		`- arch=('x86_64')`
		`- arch+=('i686' 'armv7h')`
		`- license=('LGPL2.1')`
		`- url="http://libquicktime.sourceforge.net/"`
		`- depends=('glib2' 'glibc' 'zlib')`
		`- makedepends=('alsa-lib' 'faad2' 'ffmpeg' 'gtk2' 'lame' 'libdv'`
		`- 'libglvnd' 'libjpeg-turbo' 'libvorbis' 'libx11' 'libxaw' 'libxext' 'libxt'`
		`- 'libxv' 'schroedinger' 'sndio' 'x264')`
		`- optdepends=('alsa-lib: for lqtplay'`
		`- 'ffmpeg: for lqt_ffmpeg plugin'`
		`- 'gtk2: for libquicktime_config'`
		`- 'lame: for lqt_lame plugin'`
		`- 'libdv: for lqt_dv plugin'`
		`- 'libglvnd: for lqtplay'`
		`- 'libjpeg-turbo: for lqt_mjpeg plugin'`
		`- 'libpng: for lqt_png plugin'`
		`- 'libvorbis: for lqt_lame and lqt_vorbis plugin'`
		`- 'libx11: for lqtplay'`
		`- 'libxaw: for lqtplay'`
		`- 'libxext: for lqtplay'`
		`- 'libxt: for lqtplay'`
		`- 'libxv: for lqtplay'`
		`- 'schroedinger: for lqt_schroedinger plugin'`
		`- 'sndio: for lqtplay'`
		`- 'x264: for lqt_x264 plugin')`
		`- provides=('libquicktime.so')`
		`- source=("https://downloads.sourceforge.net/sourceforge/$pkgname/$pkgname-$pkgver.tar.gz"`
		`- "${pkgname}-1.2.4-CVE-2016-2399.patch"`
		`- "${pkgname}-1.2.4-CVE-2017-9122_et_al.patch"`
		`- "${pkgname}-1.2.4-faad2.patch"`
		`- "${pkgname}-1.2.4-ffmpeg2.patch"`
		`- "${pkgname}-1.2.4-ffmpeg29.patch"`
		`- "${pkgname}-1.2.4-ffmpeg4.patch"`
		`- "${pkgname}-1.2.4-ffmpeg-codecs.patch"`
		`- "${pkgname}-1.2.4-libavutil.patch")`
		`- sha512sums=('6ab6cd62ae2361bb3ad73725e9e8baa2b03361bc23e9e34b24f90c0e2bec4337de950ed7f30a6a1d2e67ab33e8f0c43538369fd07e417f54b84583a3c331f8dd'`
		`- '759fee13bc96db036063efcd8288c0e467ce811b597cf6c0ceed1c8927593963174f4f3324512db0e773e936a4b9fe5c8d8fc9e0f00b2ce59110661175986f9c'`
		`- '93639d3fe12eefddd1b457be702ec0a4a64a73c44fce6b3134e50bb9a4e7e5f25d256d3ace6ec5e774f2db4c0d68725f3e35e901f7d932a4be9cba566eab528e'`
		`- '3e751330ebbc4026363efd45b21c60c313ea169a57a5cdfa46125e126aab34c2dea3629ce92e7b0b5f14693db4f11723177fd28611e2e979cc8fcd506077509e'`
		`- '32ddf394aad4ed80e89ec72a534e0466268ab0061b991815e905b78eae55a7d935117b0915faf6f7f51bd7e2d9fbaa4b0e07bfcef1ef1e2f4a7e2061c489122d'`
		`- '2a7e06c03b0f64f02b923c1a0e7121f4e1ea735f19a6df8ce8daf18177ead132d1ae921c64f3770042db3bbf29f15a7fcceece835d475e052c4c3bb7139c9e2e'`
		`- '1b11a82d694654976a5f79cd8feb27eec3810e09a66dc58ca576eaf1f96e4948abd4dae7955a7da6cf99ae6ffef9e183b39090d96cc6b5fe216b4c4f4faff7a8'`
		`- '20c535444de1f3e9a68c35ee4eb409f150e6340fd43dda4544791454f42c031b24c08f651e0351f5a22dcb59459ac372aa70d82a1d20482b2d997589e19087fd'`
		`- '691110dc18f6646e2e17f40c6a42911a6b8eaa8cea20b5595f20d218d51da11d11923a3001b7ad7c3ad6bd0d90e712b95ccee5526fa1bec176cd27813e4a775e')`
		`-`
		`- replaces=("${pkgname}-libre" "${pkgname}-parabola")`
		`- conflicts=("${pkgname}-libre" "${pkgname}-parabola")`
		`-`
		`- prepare() {`
		`- cd "$pkgname-$pkgver"`
		`- # boatload of CVEs: http://cve.mitre.org/cgi-bin/cvekey.cgi?keyword=libquicktime`
		`- patch -Np1 -i "../${pkgname}-1.2.4-CVE-2016-2399.patch"`
		`- patch -Np1 -i "../${pkgname}-1.2.4-CVE-2017-9122_et_al.patch"`
		`- # checks for faad2 are broken in configure.ac`
		`- patch -Np1 -i "../${pkgname}-1.2.4-faad2.patch"`
		`- # ffmpeg compatibility is very ancient`
		`- patch -Np1 -i "../${pkgname}-1.2.4-ffmpeg2.patch"`
		`- patch -Np1 -i "../${pkgname}-1.2.4-ffmpeg29.patch"`
		`- patch -Np1 -i "../${pkgname}-1.2.4-ffmpeg4.patch"`
		`- patch -Np1 -i "../${pkgname}-1.2.4-libavutil.patch"`
		`- patch -Np1 -i "../${pkgname}-1.2.4-ffmpeg-codecs.patch"`
		`- autoreconf -vfi`
		`- }`
		`-`
		`- build() {`
		`- cd $pkgname-$pkgver`
		`- ./configure \`
		`- --prefix=/usr \`
		`- --enable-gpl \`
		`- --with-ffmpeg \`
		`- --with-libdv \`
		`- --with-x264 \`
		`- --without-doxygen \`
		`- --without-faac`
		`- make`
		`- }`
		`-`
		`- package() {`
		`- depends+=('libfaad.so')`
		`- cd $pkgname-$pkgver`
		`- make DESTDIR="$pkgdir" install`
		`- install -vDm 644 {AUTHORS,ChangeLog,README,TODO} \`
		`- -t "${pkgdir}/usr/share/doc/${pkgname}"`
		`- }`

libre/libquicktime/libquicktime-1.2.4-CVE-2016-2399.patch

file removed

-25

		`@@ -1,25 +0,0 @@`
		`- https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=855099`
		`- https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2016-2399`
		`-`
		`- diff --git a/src/util.c b/src/util.c`
		`- index d8dc3c3..9422fc5 100644`
		`- --- a/src/util.c`
		`- +++ b/src/util.c`
		`- @@ -340,9 +340,14 @@ int64_t quicktime_byte_position(quicktime_t *file)`
		`-`
		`- void quicktime_read_pascal(quicktime_t file, char data)`
		`- {`
		`- - char len = quicktime_read_char(file);`
		`- - quicktime_read_data(file, (uint8_t*)data, len);`
		`- - data[(int)len] = 0;`
		`- + int len = quicktime_read_char(file);`
		`- + if ((len > 0) && (len < 256)) {`
		`- + /* data[] is expected to be 256 bytes long */`
		`- + quicktime_read_data(file, (uint8_t*)data, len);`
		`- + data[len] = 0;`
		`- + } else {`
		`- + data[0] = 0;`
		`- + }`
		`- }`
		`-`
		`- void quicktime_write_pascal(quicktime_t file, char data)`

libre/libquicktime/libquicktime-1.2.4-CVE-2017-9122_et_al.patch

file removed

-151

		`@@ -1,151 +0,0 @@`
		`- From: Burkhard Plaum <plaum@ipf.uni-stuttgart.de>`
		`- Origin: https://sourceforge.net/p/libquicktime/mailman/libquicktime-devel/?viewmonth=201706`
		`-`
		`- Hi,`
		`-`
		`- I committed some (mostly trivial) updates to CVS. The following CVE's`
		`- are fixed and/or no longer reproducible:`
		`-`
		`- CVE-2017-9122`
		`- CVE-2017-9123`
		`- CVE-2017-9124`
		`- CVE-2017-9125`
		`- CVE-2017-9126`
		`- CVE-2017-9127`
		`- CVE-2017-9128`
		`-`
		`- I was a bit surprised that one simple sanity check fixes a whole bunch of files.`
		`-`
		`- So it could be, that the problems are still there, but better hidden since the`
		`- critical code isn't executed anymore with the sample files I got.`
		`-`
		`- If someone encounters more crashes, feel free to report them.`
		`-`
		`- Burkhard`
		`-`
		`- --- a/include/lqt_funcprotos.h`
		`- +++ b/include/lqt_funcprotos.h`
		`- @@ -1345,9 +1345,9 @@ int quicktime_write_int32_le(quicktime_t`
		`- int quicktime_write_char32(quicktime_t file, char string);`
		`- float quicktime_read_fixed16(quicktime_t *file);`
		`- int quicktime_write_fixed16(quicktime_t *file, float number);`
		`- -unsigned long quicktime_read_uint32(quicktime_t *file);`
		`- -long quicktime_read_int32(quicktime_t *file);`
		`- -long quicktime_read_int32_le(quicktime_t *file);`
		`- +uint32_t quicktime_read_uint32(quicktime_t *file);`
		`- +int32_t quicktime_read_int32(quicktime_t *file);`
		`- +int32_t quicktime_read_int32_le(quicktime_t *file);`
		`- int64_t quicktime_read_int64(quicktime_t *file);`
		`- int64_t quicktime_read_int64_le(quicktime_t *file);`
		`- long quicktime_read_int24(quicktime_t *file);`
		`- --- a/src/atom.c`
		`- +++ b/src/atom.c`
		`- @@ -131,6 +131,9 @@ int quicktime_atom_read_header(quicktime`
		`- atom->size = read_size64(header);`
		`- atom->end = atom->start + atom->size;`
		`- }`
		`- +/* Avoid broken files */`
		`- + if(atom->end > file->total_length)`
		`- + result = 1;`
		`- }`
		`-`
		`-`
		`- --- a/src/lqt_quicktime.c`
		`- +++ b/src/lqt_quicktime.c`
		`- @@ -1788,8 +1788,8 @@ int quicktime_read_info(quicktime_t *fil`
		`- quicktime_set_position(file, start_position);`
		`- free(temp);`
		`-`
		`- - quicktime_read_moov(file, &file->moov, &leaf_atom);`
		`- - got_header = 1;`
		`- + if(!quicktime_read_moov(file, &file->moov, &leaf_atom))`
		`- + got_header = 1;`
		`- }`
		`- else`
		`- quicktime_atom_skip(file, &leaf_atom);`
		`- --- a/src/moov.c`
		`- +++ b/src/moov.c`
		`- @@ -218,7 +218,8 @@ int quicktime_read_moov(quicktime_t *fil`
		`- if(quicktime_atom_is(&leaf_atom, "trak"))`
		`- {`
		`- quicktime_trak_t *trak = quicktime_add_trak(file);`
		`- - quicktime_read_trak(file, trak, &leaf_atom);`
		`- + if(quicktime_read_trak(file, trak, &leaf_atom))`
		`- + return 1;`
		`- }`
		`- else`
		`- if(quicktime_atom_is(&leaf_atom, "udta"))`
		`- --- a/src/trak.c`
		`- +++ b/src/trak.c`
		`- @@ -269,6 +269,14 @@ int quicktime_read_trak(quicktime_t *fil`
		`- else quicktime_atom_skip(file, &leaf_atom);`
		`- } while(quicktime_position(file) < trak_atom->end);`
		`-`
		`- + /* Do some sanity checks to prevent later crashes */`
		`- + if(trak->mdia.minf.is_video \|\| trak->mdia.minf.is_video)`
		`- + {`
		`- + if(!trak->mdia.minf.stbl.stsc.table \|\|`
		`- + !trak->mdia.minf.stbl.stco.table)`
		`- + return 1;`
		`- + }`
		`- +`
		`- #if 1`
		`- if(trak->mdia.minf.is_video &&`
		`- quicktime_match_32(trak->mdia.minf.stbl.stsd.table[0].format, "drac"))`
		`- --- a/src/util.c`
		`- +++ b/src/util.c`
		`- @@ -647,10 +647,10 @@ int quicktime_write_fixed16(quicktime_t`
		`- return quicktime_write_data(file, data, 2);`
		`- }`
		`-`
		`- -unsigned long quicktime_read_uint32(quicktime_t *file)`
		`- +uint32_t quicktime_read_uint32(quicktime_t *file)`
		`- {`
		`- - unsigned long result;`
		`- - unsigned long a, b, c, d;`
		`- + uint32_t result;`
		`- + uint32_t a, b, c, d;`
		`- uint8_t data[4];`
		`-`
		`- quicktime_read_data(file, data, 4);`
		`- @@ -663,10 +663,10 @@ unsigned long quicktime_read_uint32(quic`
		`- return result;`
		`- }`
		`-`
		`- -long quicktime_read_int32(quicktime_t *file)`
		`- +int32_t quicktime_read_int32(quicktime_t *file)`
		`- {`
		`- - unsigned long result;`
		`- - unsigned long a, b, c, d;`
		`- + uint32_t result;`
		`- + uint32_t a, b, c, d;`
		`- uint8_t data[4];`
		`-`
		`- quicktime_read_data(file, data, 4);`
		`- @@ -676,13 +676,13 @@ long quicktime_read_int32(quicktime_t *f`
		`- d = data[3];`
		`-`
		`- result = (a << 24) \| (b << 16) \| (c << 8) \| d;`
		`- - return (long)result;`
		`- + return (int32_t)result;`
		`- }`
		`-`
		`- -long quicktime_read_int32_le(quicktime_t *file)`
		`- +int32_t quicktime_read_int32_le(quicktime_t *file)`
		`- {`
		`- - unsigned long result;`
		`- - unsigned long a, b, c, d;`
		`- + uint32_t result;`
		`- + uint32_t a, b, c, d;`
		`- uint8_t data[4];`
		`-`
		`- quicktime_read_data(file, data, 4);`
		`- @@ -692,7 +692,7 @@ long quicktime_read_int32_le(quicktime_t`
		`- d = data[3];`
		`-`
		`- result = (d << 24) \| (c << 16) \| (b << 8) \| a;`
		`- - return (long)result;`
		`- + return (int32_t)result;`
		`- }`
		`-`
		`- int64_t quicktime_read_int64(quicktime_t *file)`

libre/libquicktime/libquicktime-1.2.4-faad2.patch

file removed

-86

		`@@ -1,86 +0,0 @@`
		`- diff -ruN a/configure.ac b/configure.ac`
		`- --- a/configure.ac 2012-03-29 21:44:28.000000000 +0200`
		`- +++ b/configure.ac 2020-02-09 18:27:31.599127781 +0100`
		`- @@ -728,82 +728,9 @@`
		`-`
		`- if test "x$with_faad2" != "xno"; then`
		`-`
		`- -OLD_CFLAGS=$CFLAGS`
		`- -OLD_LIBS=$LIBS`
		`- -`
		`- CFLAGS="$CFLAGS"`
		`- LIBS="$LIBS -lfaad -lm"`
		`-`
		`- -AC_MSG_CHECKING(for neaacdec.h usability for faad2)`
		`- -`
		`- -`
		`- -AC_TRY_RUN([`
		`- - #include <neaacdec.h>`
		`- - #include <stdio.h>`
		`- - main()`
		`- - {`
		`- - int faad_major;`
		`- - int faad_minor;`
		`- - faacDecHandle dec;`
		`- -`
		`- - if(sscanf(FAAD2_VERSION, "%d.%d", &faad_major, &faad_minor) < 2)`
		`- - return -1;`
		`- - dec = faacDecOpen();`
		`- - if(!dec)`
		`- - return -1;`
		`- - return 0;`
		`- - }`
		`- - ],`
		`- - [`
		`- - # program could be run`
		`- - have_faad2="true"`
		`- - AC_MSG_RESULT(yes)`
		`- - FAAD2_CFLAGS=$CFLAGS`
		`- - FAAD2_LIBS=$LIBS`
		`- - AC_DEFINE(HAVE_NEAACDEC_H)`
		`- - ],`
		`- - # program could not be run`
		`- - AC_MSG_RESULT(no)`
		`- -)`
		`- -`
		`- -if test "x$have_faad2" != "xtrue"; then`
		`- -`
		`- -AC_MSG_CHECKING(for faad.h usability for faad2)`
		`- -`
		`- -AC_TRY_RUN([`
		`- - #include <faad.h>`
		`- - #include <stdio.h>`
		`- - main()`
		`- - {`
		`- - int faad_major;`
		`- - int faad_minor;`
		`- - faacDecHandle dec;`
		`- -`
		`- - if(sscanf(FAAD2_VERSION, "%d.%d", &faad_major, &faad_minor) < 2)`
		`- - return -1;`
		`- - dec = faacDecOpen();`
		`- - if(!dec)`
		`- - return -1;`
		`- - return 0;`
		`- - }`
		`- - ],`
		`- - [`
		`- - # program could be run`
		`- - have_faad2="true"`
		`- - AC_MSG_RESULT(yes)`
		`- - FAAD2_CFLAGS=$CFLAGS`
		`- - FAAD2_LIBS=$LIBS`
		`- -`
		`- -`
		`- - ],`
		`- - # program could not be run`
		`- - AC_MSG_RESULT(no)`
		`- -)`
		`- -`
		`- -fi`
		`- -`
		`- -CFLAGS=$OLD_CFLAGS`
		`- -LIBS=$OLD_LIBS`
		`-`
		`- fi`
		`-`

libre/libquicktime/libquicktime-1.2.4-ffmpeg-codecs.patch

file removed

-651

		`@@ -1,651 +0,0 @@`
		`- diff -ruN a/plugins/ffmpeg/audio.c b/plugins/ffmpeg/audio.c`
		`- --- a/plugins/ffmpeg/audio.c 2012-03-29 21:44:28.000000000 +0200`
		`- +++ b/plugins/ffmpeg/audio.c 2020-02-09 19:08:03.716063846 +0100`
		`- @@ -626,7 +626,7 @@`
		`- {`
		`- /* If the codec is mp3, make sure to decode the very last frame */`
		`-`
		`- - if((codec->avctx->codec_id == CODEC_ID_MP3) &&`
		`- + if((codec->avctx->codec_id == AV_CODEC_ID_MP3) &&`
		`- (codec->bytes_in_chunk_buffer >= 4))`
		`- {`
		`- if(!mpa_decode_header(&mph, codec->chunk_buffer, (const mpa_header*)0))`
		`- @@ -695,7 +695,7 @@`
		`-`
		`- /* Some really broken mp3 files have the header bytes split across 2 chunks */`
		`-`
		`- - if(codec->avctx->codec_id == CODEC_ID_MP3)`
		`- + if(codec->avctx->codec_id == AV_CODEC_ID_MP3)`
		`- {`
		`- if(codec->bytes_in_chunk_buffer < 4)`
		`- {`
		`- @@ -806,7 +806,7 @@`
		`-`
		`- if(bytes_decoded < 0)`
		`- {`
		`- - if(codec->avctx->codec_id == CODEC_ID_MP3)`
		`- + if(codec->avctx->codec_id == AV_CODEC_ID_MP3)`
		`- {`
		`- /* For mp3, bytes_decoded < 0 means, that the frame should be muted */`
		`- memset(&codec->sample_buffer[track_map->channels * (codec->sample_buffer_end -`
		`- @@ -866,8 +866,8 @@`
		`- quicktime_audio_map_t *track_map = &file->atracks[track];`
		`- quicktime_ffmpeg_audio_codec_t *codec = track_map->codec->priv;`
		`-`
		`- - if((codec->decoder->id == CODEC_ID_MP2) \|\|`
		`- - (codec->decoder->id == CODEC_ID_MP3))`
		`- + if((codec->decoder->id == AV_CODEC_ID_MP2) \|\|`
		`- + (codec->decoder->id == AV_CODEC_ID_MP3))`
		`- {`
		`- mpa_header h;`
		`- uint32_t header;`
		`- @@ -909,7 +909,7 @@`
		`- else`
		`- track_map->ci.bitrate = h.bitrate;`
		`- }`
		`- - else if(codec->decoder->id == CODEC_ID_AC3)`
		`- + else if(codec->decoder->id == AV_CODEC_ID_AC3)`
		`- {`
		`- a52_header h;`
		`- uint8_t * ptr;`
		`- @@ -986,7 +986,7 @@`
		`- #endif`
		`- /* Some codecs need extra stuff */`
		`-`
		`- - if(codec->decoder->id == CODEC_ID_ALAC)`
		`- + if(codec->decoder->id == AV_CODEC_ID_ALAC)`
		`- {`
		`- header = quicktime_wave_get_user_atom(track_map->track, "alac", &header_len);`
		`- if(header)`
		`- @@ -995,7 +995,7 @@`
		`- codec->avctx->extradata_size = header_len;`
		`- }`
		`- }`
		`- - if(codec->decoder->id == CODEC_ID_QDM2)`
		`- + if(codec->decoder->id == AV_CODEC_ID_QDM2)`
		`- {`
		`- header = quicktime_wave_get_user_atom(track_map->track, "QDCA", &header_len);`
		`- if(header)`
		`- @@ -1495,9 +1495,9 @@`
		`- codec_base->decode_audio = lqt_ffmpeg_decode_audio;`
		`- codec_base->set_parameter = set_parameter;`
		`-`
		`- - if((decoder->id == CODEC_ID_MP3) \|\| (decoder->id == CODEC_ID_MP2))`
		`- + if((decoder->id == AV_CODEC_ID_MP3) \|\| (decoder->id == AV_CODEC_ID_MP2))`
		`- codec_base->read_packet = read_packet_mpa;`
		`- - else if(decoder->id == CODEC_ID_AC3)`
		`- + else if(decoder->id == AV_CODEC_ID_AC3)`
		`- {`
		`- codec_base->write_packet = write_packet_ac3;`
		`- codec_base->read_packet = read_packet_ac3;`
		`- diff -ruN a/plugins/ffmpeg/lqt_ffmpeg.c b/plugins/ffmpeg/lqt_ffmpeg.c`
		`- --- a/plugins/ffmpeg/lqt_ffmpeg.c 2012-02-15 20:48:30.000000000 +0100`
		`- +++ b/plugins/ffmpeg/lqt_ffmpeg.c 2020-02-09 19:07:17.929831925 +0100`
		`- @@ -386,7 +386,7 @@`
		`- struct CODECIDMAP codecidmap_v[] =`
		`- {`
		`- {`
		`- - .id = CODEC_ID_MPEG1VIDEO,`
		`- + .id = AV_CODEC_ID_MPEG1VIDEO,`
		`- .index = -1,`
		`- .encoder = NULL,`
		`- .decoder = NULL,`
		`- @@ -397,7 +397,7 @@`
		`- .wav_ids = { LQT_WAV_ID_NONE }`
		`- },`
		`- {`
		`- - .id = CODEC_ID_MPEG4,`
		`- + .id = AV_CODEC_ID_MPEG4,`
		`- .index = -1,`
		`- .encoder = NULL,`
		`- .decoder = NULL,`
		`- @@ -415,7 +415,7 @@`
		`- .compression_id = LQT_COMPRESSION_MPEG4_ASP,`
		`- },`
		`- {`
		`- - .id = CODEC_ID_MSMPEG4V1,`
		`- + .id = AV_CODEC_ID_MSMPEG4V1,`
		`- .index = -1,`
		`- .encoder = NULL,`
		`- .decoder = NULL,`
		`- @@ -426,7 +426,7 @@`
		`- .wav_ids = { LQT_WAV_ID_NONE },`
		`- },`
		`- {`
		`- - .id = CODEC_ID_MSMPEG4V2,`
		`- + .id = AV_CODEC_ID_MSMPEG4V2,`
		`- .index = -1,`
		`- .encoder = NULL,`
		`- .decoder = NULL,`
		`- @@ -437,7 +437,7 @@`
		`- .wav_ids = { LQT_WAV_ID_NONE },`
		`- },`
		`- {`
		`- - .id = CODEC_ID_MSMPEG4V3,`
		`- + .id = AV_CODEC_ID_MSMPEG4V3,`
		`- .index = -1,`
		`- .encoder = NULL,`
		`- .decoder = NULL,`
		`- @@ -453,7 +453,7 @@`
		`- .do_encode = 1,`
		`- },`
		`- {`
		`- - .id = CODEC_ID_MSMPEG4V3,`
		`- + .id = AV_CODEC_ID_MSMPEG4V3,`
		`- .index = -1,`
		`- .encoder = NULL,`
		`- .decoder = NULL,`
		`- @@ -468,7 +468,7 @@`
		`- },`
		`- #if 0`
		`- {`
		`- - .id = CODEC_ID_WMV1,`
		`- + .id = AV_CODEC_ID_WMV1,`
		`- .index = -1,`
		`- .encoder = NULL,`
		`- .decoder = NULL,`
		`- @@ -481,7 +481,7 @@`
		`- },`
		`- #endif`
		`- {`
		`- - .id = CODEC_ID_H263,`
		`- + .id = AV_CODEC_ID_H263,`
		`- .index = -1,`
		`- .encoder = NULL,`
		`- .decoder = NULL,`
		`- @@ -493,7 +493,7 @@`
		`- .compatibility_flags = LQT_FILE_QT_OLD \| LQT_FILE_QT \| LQT_FILE_MP4 \| LQT_FILE_3GP,`
		`- },`
		`- {`
		`- - .id = CODEC_ID_H263,`
		`- + .id = AV_CODEC_ID_H263,`
		`- .index = -1,`
		`- .encoder = NULL,`
		`- .decoder = NULL,`
		`- @@ -508,7 +508,7 @@`
		`- .do_encode = 1,`
		`- },`
		`- {`
		`- - .id = CODEC_ID_H264,`
		`- + .id = AV_CODEC_ID_H264,`
		`- .index = -1,`
		`- .encoder = NULL,`
		`- .decoder = NULL,`
		`- @@ -519,7 +519,7 @@`
		`- .wav_ids = { LQT_WAV_ID_NONE },`
		`- },`
		`- {`
		`- - .id = CODEC_ID_H263P,`
		`- + .id = AV_CODEC_ID_H263P,`
		`- .index = -1,`
		`- .encoder = NULL,`
		`- .decoder = NULL,`
		`- @@ -533,7 +533,7 @@`
		`- .do_encode = 1,`
		`- },`
		`- {`
		`- - .id = CODEC_ID_H263I,`
		`- + .id = AV_CODEC_ID_H263I,`
		`- .index = -1,`
		`- .encoder = NULL,`
		`- .decoder = NULL,`
		`- @@ -544,7 +544,7 @@`
		`- .wav_ids = { LQT_WAV_ID_NONE },`
		`- },`
		`- {`
		`- - .id = CODEC_ID_SVQ1,`
		`- + .id = AV_CODEC_ID_SVQ1,`
		`- .index = -1,`
		`- .encoder = NULL,`
		`- .decoder = NULL,`
		`- @@ -555,7 +555,7 @@`
		`- .wav_ids = { LQT_WAV_ID_NONE },`
		`- },`
		`- {`
		`- - .id = CODEC_ID_SVQ3,`
		`- + .id = AV_CODEC_ID_SVQ3,`
		`- .index = -1,`
		`- .encoder = NULL,`
		`- .decoder = NULL,`
		`- @@ -566,7 +566,7 @@`
		`- .wav_ids = { LQT_WAV_ID_NONE },`
		`- },`
		`- {`
		`- - .id = CODEC_ID_MJPEG,`
		`- + .id = AV_CODEC_ID_MJPEG,`
		`- .index = -1,`
		`- .encoder = NULL,`
		`- .decoder = NULL,`
		`- @@ -580,7 +580,7 @@`
		`- .do_encode = 1,`
		`- },`
		`- {`
		`- - .id = CODEC_ID_MJPEGB,`
		`- + .id = AV_CODEC_ID_MJPEGB,`
		`- .index = -1,`
		`- .encoder = NULL,`
		`- .decoder = NULL,`
		`- @@ -594,7 +594,7 @@`
		`- },`
		`- #if LIBAVCODEC_BUILD >= 3346688`
		`- {`
		`- - .id = CODEC_ID_TARGA,`
		`- + .id = AV_CODEC_ID_TARGA,`
		`- .index = -1,`
		`- .encoder = NULL,`
		`- .decoder = NULL,`
		`- @@ -606,7 +606,7 @@`
		`- #endif`
		`- #if LIBAVCODEC_BUILD >= 3347456`
		`- {`
		`- - .id = CODEC_ID_TIFF,`
		`- + .id = AV_CODEC_ID_TIFF,`
		`- .index = -1,`
		`- .encoder = NULL,`
		`- .decoder = NULL,`
		`- @@ -617,7 +617,7 @@`
		`- },`
		`- #endif`
		`- {`
		`- - .id = CODEC_ID_8BPS,`
		`- + .id = AV_CODEC_ID_8BPS,`
		`- .index = -1,`
		`- .encoder = NULL,`
		`- .decoder = NULL,`
		`- @@ -627,7 +627,7 @@`
		`- .wav_ids = { LQT_WAV_ID_NONE },`
		`- },`
		`- {`
		`- - .id = CODEC_ID_INDEO3,`
		`- + .id = AV_CODEC_ID_INDEO3,`
		`- .index = -1,`
		`- .encoder = NULL,`
		`- .decoder = NULL,`
		`- @@ -638,7 +638,7 @@`
		`- .wav_ids = { LQT_WAV_ID_NONE },`
		`- },`
		`- {`
		`- - .id = CODEC_ID_RPZA,`
		`- + .id = AV_CODEC_ID_RPZA,`
		`- .index = -1,`
		`- .encoder = NULL,`
		`- .decoder = NULL,`
		`- @@ -648,7 +648,7 @@`
		`- .wav_ids = { LQT_WAV_ID_NONE },`
		`- },`
		`- {`
		`- - .id = CODEC_ID_SMC,`
		`- + .id = AV_CODEC_ID_SMC,`
		`- .index = -1,`
		`- .encoder = NULL,`
		`- .decoder = NULL,`
		`- @@ -658,7 +658,7 @@`
		`- .wav_ids = { LQT_WAV_ID_NONE },`
		`- },`
		`- {`
		`- - .id = CODEC_ID_CINEPAK,`
		`- + .id = AV_CODEC_ID_CINEPAK,`
		`- .index = -1,`
		`- .encoder = NULL,`
		`- .decoder = NULL,`
		`- @@ -669,7 +669,7 @@`
		`- .wav_ids = { LQT_WAV_ID_NONE },`
		`- },`
		`- {`
		`- - .id = CODEC_ID_CYUV,`
		`- + .id = AV_CODEC_ID_CYUV,`
		`- .index = -1,`
		`- .encoder = NULL,`
		`- .decoder = NULL,`
		`- @@ -680,7 +680,7 @@`
		`- .wav_ids = { LQT_WAV_ID_NONE },`
		`- },`
		`- {`
		`- - .id = CODEC_ID_QTRLE,`
		`- + .id = AV_CODEC_ID_QTRLE,`
		`- .index = -1,`
		`- .encoder = NULL,`
		`- .decoder = NULL,`
		`- @@ -693,7 +693,7 @@`
		`- .encoding_colormodels = (int[]){ BC_RGB888, BC_RGBA8888, LQT_COLORMODEL_NONE },`
		`- },`
		`- {`
		`- - .id = CODEC_ID_MSRLE,`
		`- + .id = AV_CODEC_ID_MSRLE,`
		`- .index = -1,`
		`- .encoder = NULL,`
		`- .decoder = NULL,`
		`- @@ -703,7 +703,7 @@`
		`- .wav_ids = { LQT_WAV_ID_NONE },`
		`- },`
		`- {`
		`- - .id = CODEC_ID_DVVIDEO,`
		`- + .id = AV_CODEC_ID_DVVIDEO,`
		`- .index = -1,`
		`- .encoder = NULL,`
		`- .decoder = NULL,`
		`- @@ -719,7 +719,7 @@`
		`- .image_sizes = image_sizes_dv,`
		`- },`
		`- {`
		`- - .id = CODEC_ID_DVVIDEO,`
		`- + .id = AV_CODEC_ID_DVVIDEO,`
		`- .index = -1,`
		`- .encoder = NULL,`
		`- .decoder = NULL,`
		`- @@ -735,7 +735,7 @@`
		`- .image_sizes = image_sizes_dv,`
		`- },`
		`- {`
		`- - .id = CODEC_ID_DVVIDEO,`
		`- + .id = AV_CODEC_ID_DVVIDEO,`
		`- .index = -1,`
		`- .encoder = NULL,`
		`- .decoder = NULL,`
		`- @@ -751,7 +751,7 @@`
		`- },`
		`- /* DVCPRO HD (decoding only for now) */`
		`- {`
		`- - .id = CODEC_ID_DVVIDEO,`
		`- + .id = AV_CODEC_ID_DVVIDEO,`
		`- .index = -1,`
		`- .encoder = NULL,`
		`- .decoder = NULL,`
		`- @@ -772,7 +772,7 @@`
		`- // .do_encode = 1`
		`- },`
		`- {`
		`- - .id = CODEC_ID_FFVHUFF,`
		`- + .id = AV_CODEC_ID_FFVHUFF,`
		`- .index = -1,`
		`- .encoder = NULL,`
		`- .decoder = NULL,`
		`- @@ -785,7 +785,7 @@`
		`- .do_encode = 1`
		`- },`
		`- {`
		`- - .id = CODEC_ID_FFV1,`
		`- + .id = AV_CODEC_ID_FFV1,`
		`- .index = -1,`
		`- .encoder = NULL,`
		`- .decoder = NULL,`
		`- @@ -801,7 +801,7 @@`
		`- },`
		`- #if LIBAVCODEC_BUILD >= 3352576`
		`- {`
		`- - .id = CODEC_ID_DNXHD,`
		`- + .id = AV_CODEC_ID_DNXHD,`
		`- .index = -1,`
		`- .encoder = NULL,`
		`- .decoder = NULL,`
		`- @@ -817,7 +817,7 @@`
		`- },`
		`- #endif`
		`- {`
		`- - .id = CODEC_ID_MPEG2VIDEO,`
		`- + .id = AV_CODEC_ID_MPEG2VIDEO,`
		`- .index = -1,`
		`- .encoder = NULL,`
		`- .decoder = NULL,`
		`- @@ -839,7 +839,7 @@`
		`- struct CODECIDMAP codecidmap_a[] =`
		`- {`
		`- {`
		`- - .id = CODEC_ID_MP3,`
		`- + .id = AV_CODEC_ID_MP3,`
		`- .index = -1,`
		`- .encoder = NULL,`
		`- .decoder = NULL,`
		`- @@ -851,7 +851,7 @@`
		`- .wav_ids = { 0x50, 0x55, LQT_WAV_ID_NONE },`
		`- },`
		`- {`
		`- - .id = CODEC_ID_MP2,`
		`- + .id = AV_CODEC_ID_MP2,`
		`- .index = -1,`
		`- .encoder = NULL,`
		`- .decoder = NULL,`
		`- @@ -866,7 +866,7 @@`
		`- .compression_id = LQT_COMPRESSION_MP2,`
		`- },`
		`- {`
		`- - .id = CODEC_ID_AC3,`
		`- + .id = AV_CODEC_ID_AC3,`
		`- .index = -1,`
		`- .encoder = NULL,`
		`- .decoder = NULL,`
		`- @@ -881,7 +881,7 @@`
		`- .compression_id = LQT_COMPRESSION_AC3,`
		`- },`
		`- {`
		`- - .id = CODEC_ID_QDM2,`
		`- + .id = AV_CODEC_ID_QDM2,`
		`- .index = -1,`
		`- .encoder = NULL,`
		`- .decoder = NULL,`
		`- @@ -896,7 +896,7 @@`
		`- #if 1`
		`- /* Doesn't work as long as audio chunks are not split into VBR "Samples" */`
		`- {`
		`- - .id = CODEC_ID_ALAC,`
		`- + .id = AV_CODEC_ID_ALAC,`
		`- .index = -1,`
		`- .encoder = NULL,`
		`- .decoder = NULL,`
		`- @@ -909,7 +909,7 @@`
		`- #if 1`
		`- /* Sounds ugly */`
		`- {`
		`- - .id = CODEC_ID_ADPCM_MS,`
		`- + .id = AV_CODEC_ID_ADPCM_MS,`
		`- .index = -1,`
		`- .encoder = NULL,`
		`- .decoder = NULL,`
		`- @@ -922,7 +922,7 @@`
		`- #if 1`
		`- /* Sounds ugly */`
		`- {`
		`- - .id = CODEC_ID_ADPCM_IMA_WAV,`
		`- + .id = AV_CODEC_ID_ADPCM_IMA_WAV,`
		`- .index = -1,`
		`- .encoder = NULL,`
		`- .decoder = NULL,`
		`- diff -ruN a/plugins/ffmpeg/video.c b/plugins/ffmpeg/video.c`
		`- --- a/plugins/ffmpeg/video.c 2012-02-25 20:46:56.000000000 +0100`
		`- +++ b/plugins/ffmpeg/video.c 2020-02-09 19:07:44.399580606 +0100`
		`- @@ -400,7 +400,7 @@`
		`- codec->reinterpret_pix_fmt = codec->avctx->pix_fmt;`
		`-`
		`- /* First we try codec-specific colormodel matching. */`
		`- - if(codec->decoder->id == CODEC_ID_DNXHD)`
		`- + if(codec->decoder->id == AV_CODEC_ID_DNXHD)`
		`- {`
		`- /* FFMpeg supports PIX_FMT_YUV422P and PIX_FMT_YUV422P10 for DNxHD, which`
		`- we sometimes interpret as PIX_FMT_YUVJ422P and PIX_FMT_YUVJ422P10. */`
		`- @@ -438,7 +438,7 @@`
		`- quicktime_ffmpeg_video_codec_t *codec = vtrack->codec->priv;`
		`- codec->avctx->pix_fmt = lqt_ffmpeg_get_ffmpeg_colormodel(vtrack->stream_cmodel);`
		`-`
		`- - if (codec->encoder->id == CODEC_ID_DNXHD)`
		`- + if (codec->encoder->id == AV_CODEC_ID_DNXHD)`
		`- {`
		`- /* FFMpeg's DNxHD encoder only supports PIX_FMT_YUV422P and PIX_FMT_YUV422P10`
		`- and doesn't know anything about PIX_FMT_YUVJ422P and PIX_FMT_YUVJ422P10`
		`- @@ -728,13 +728,13 @@`
		`-`
		`- /* Set extradata: It's done differently for each codec */`
		`-`
		`- - if(codec->decoder->id == CODEC_ID_SVQ3)`
		`- + if(codec->decoder->id == AV_CODEC_ID_SVQ3)`
		`- {`
		`- extradata = trak->mdia.minf.stbl.stsd.table[0].table_raw + 4;`
		`- extradata_size = trak->mdia.minf.stbl.stsd.table[0].table_raw_size - 4;`
		`-`
		`- }`
		`- - else if(codec->decoder->id == CODEC_ID_H264)`
		`- + else if(codec->decoder->id == AV_CODEC_ID_H264)`
		`- {`
		`- user_atom = quicktime_stsd_get_user_atom(trak, "avcC", &user_atom_len);`
		`-`
		`- @@ -753,7 +753,7 @@`
		`- }`
		`-`
		`- }`
		`- - else if(codec->decoder->id == CODEC_ID_MPEG4)`
		`- + else if(codec->decoder->id == AV_CODEC_ID_MPEG4)`
		`- {`
		`- if(trak->mdia.minf.stbl.stsd.table[0].has_esds)`
		`- {`
		`- @@ -947,15 +947,15 @@`
		`- }`
		`- #endif`
		`- }`
		`- - if(codec->decoder->id == CODEC_ID_DVVIDEO)`
		`- + if(codec->decoder->id == AV_CODEC_ID_DVVIDEO)`
		`- {`
		`- if(vtrack->stream_cmodel == BC_YUV420P)`
		`- vtrack->chroma_placement = LQT_CHROMA_PLACEMENT_DVPAL;`
		`- vtrack->interlace_mode = LQT_INTERLACE_BOTTOM_FIRST;`
		`- vtrack->ci.id = LQT_COMPRESSION_DV;`
		`- }`
		`- - else if((codec->decoder->id == CODEC_ID_MPEG4) \|\|`
		`- - (codec->decoder->id == CODEC_ID_H264))`
		`- + else if((codec->decoder->id == AV_CODEC_ID_MPEG4) \|\|`
		`- + (codec->decoder->id == AV_CODEC_ID_H264))`
		`- {`
		`- if(vtrack->stream_cmodel == BC_YUV420P)`
		`- vtrack->chroma_placement = LQT_CHROMA_PLACEMENT_MPEG2;`
		`- @@ -1299,13 +1299,13 @@`
		`- {`
		`- if(vtrack->stream_cmodel == BC_YUV420P)`
		`- {`
		`- - if(codec->encoder->id == CODEC_ID_MPEG4)`
		`- + if(codec->encoder->id == AV_CODEC_ID_MPEG4)`
		`- {`
		`- vtrack->chroma_placement = LQT_CHROMA_PLACEMENT_MPEG2;`
		`- /* enable interlaced encoding */`
		`- vtrack->interlace_mode = LQT_INTERLACE_NONE;`
		`- }`
		`- - else if(codec->encoder->id == CODEC_ID_DVVIDEO)`
		`- + else if(codec->encoder->id == AV_CODEC_ID_DVVIDEO)`
		`- {`
		`- vtrack->chroma_placement = LQT_CHROMA_PLACEMENT_DVPAL;`
		`- }`
		`- @@ -1340,7 +1340,7 @@`
		`- codec->avctx->sample_aspect_ratio.num = pixel_width;`
		`- codec->avctx->sample_aspect_ratio.den = pixel_height;`
		`- /* Use global headers for mp4v */`
		`- - if(codec->encoder->id == CODEC_ID_MPEG4)`
		`- + if(codec->encoder->id == AV_CODEC_ID_MPEG4)`
		`- {`
		`- if(!(file->file_type & (LQT_FILE_AVI\|LQT_FILE_AVI_ODML)))`
		`- {`
		`- @@ -1364,12 +1364,12 @@`
		`- }`
		`- #endif`
		`- }`
		`- - else if((codec->encoder->id == CODEC_ID_MSMPEG4V3) && (trak->strl) &&`
		`- + else if((codec->encoder->id == AV_CODEC_ID_MSMPEG4V3) && (trak->strl) &&`
		`- !strncmp(trak->strl->strf.bh.biCompression, "DIV3", 4))`
		`- {`
		`- strncpy(trak->strl->strh.fccHandler, "div3", 4);`
		`- }`
		`- - else if((codec->encoder->id == CODEC_ID_H263) &&`
		`- + else if((codec->encoder->id == AV_CODEC_ID_H263) &&`
		`- (file->file_type & (LQT_FILE_MP4\|LQT_FILE_3GP)))`
		`- {`
		`- uint8_t d263_data[] =`
		`- @@ -1383,7 +1383,7 @@`
		`- strncpy(trak->mdia.minf.stbl.stsd.table[0].format,`
		`- "s263", 4);`
		`- }`
		`- - else if(codec->encoder->id == CODEC_ID_FFVHUFF)`
		`- + else if(codec->encoder->id == AV_CODEC_ID_FFVHUFF)`
		`- {`
		`- if(!(file->file_type & (LQT_FILE_AVI\|LQT_FILE_AVI_ODML)))`
		`- {`
		`- @@ -1391,7 +1391,7 @@`
		`- codec->write_global_header = 1;`
		`- }`
		`- }`
		`- - else if(codec->encoder->id == CODEC_ID_QTRLE)`
		`- + else if(codec->encoder->id == AV_CODEC_ID_QTRLE)`
		`- {`
		`- if(vtrack->stream_cmodel == BC_RGBA8888)`
		`- {`
		`- @@ -1402,11 +1402,11 @@`
		`- vtrack->track->mdia.minf.stbl.stsd.table[0].depth = 32;`
		`- }`
		`- }`
		`- - else if(codec->encoder->id == CODEC_ID_DVVIDEO)`
		`- + else if(codec->encoder->id == AV_CODEC_ID_DVVIDEO)`
		`- {`
		`- set_dv_fourcc(width, height, vtrack->stream_cmodel, trak);`
		`- }`
		`- - else if(codec->encoder->id == CODEC_ID_DNXHD)`
		`- + else if(codec->encoder->id == AV_CODEC_ID_DNXHD)`
		`- {`
		`- if(vtrack->interlace_mode != LQT_INTERLACE_NONE)`
		`- {`
		`- @@ -1558,12 +1558,12 @@`
		`-`
		`- #endif`
		`-`
		`- - if(!was_initialized && codec->encoder->id == CODEC_ID_DNXHD)`
		`- + if(!was_initialized && codec->encoder->id == AV_CODEC_ID_DNXHD)`
		`- setup_avid_atoms(file, vtrack, codec->buffer, bytes_encoded);`
		`-`
		`- if(bytes_encoded)`
		`- {`
		`- - if (pts == AV_NOPTS_VALUE \|\| (codec->encoder->id == CODEC_ID_DNXHD && pts == 0))`
		`- + if (pts == AV_NOPTS_VALUE \|\| (codec->encoder->id == AV_CODEC_ID_DNXHD && pts == 0))`
		`- {`
		`- /* Some codecs don't bother generating presentation timestamps.`
		`- FFMpeg's DNxHD encoder doesn't even bother to set it to AV_NOPTS_VALUE. */`
		`- @@ -1590,13 +1590,13 @@`
		`-`
		`- if(codec->write_global_header && !codec->global_header_written)`
		`- {`
		`- - if(codec->encoder->id == CODEC_ID_FFVHUFF)`
		`- + if(codec->encoder->id == AV_CODEC_ID_FFVHUFF)`
		`- {`
		`- quicktime_user_atoms_add_atom(&trak->mdia.minf.stbl.stsd.table[0].user_atoms,`
		`- "glbl",`
		`- codec->avctx->extradata, codec->avctx->extradata_size );`
		`- }`
		`- - else if(codec->encoder->id == CODEC_ID_MPEG4)`
		`- + else if(codec->encoder->id == AV_CODEC_ID_MPEG4)`
		`- {`
		`- int advanced = 0;`
		`- if(codec->avctx->max_b_frames \|\|`
		`- @@ -1903,18 +1903,18 @@`
		`- codec_base->encode_video = lqt_ffmpeg_encode_video;`
		`- codec_base->set_pass = set_pass_ffmpeg;`
		`-`
		`- - if(encoder->id == CODEC_ID_MPEG4)`
		`- + if(encoder->id == AV_CODEC_ID_MPEG4)`
		`- {`
		`- codec_base->writes_compressed = writes_compressed_mpeg4;`
		`- codec_base->init_compressed = init_compressed_mpeg4;`
		`- codec_base->write_packet = write_packet_mpeg4;`
		`- }`
		`- - else if(encoder->id == CODEC_ID_MPEG2VIDEO)`
		`- + else if(encoder->id == AV_CODEC_ID_MPEG2VIDEO)`
		`- {`
		`- codec_base->writes_compressed = writes_compressed_imx;`
		`- codec_base->init_compressed = init_compressed_imx;`
		`- }`
		`- - else if(encoder->id == CODEC_ID_DVVIDEO)`
		`- + else if(encoder->id == AV_CODEC_ID_DVVIDEO)`
		`- {`
		`- codec_base->init_compressed = init_compressed_dv;`
		`- }`
		`- @@ -1922,7 +1922,7 @@`
		`- }`
		`- if(decoder)`
		`- {`
		`- - if(decoder->id == CODEC_ID_H264)`
		`- + if(decoder->id == AV_CODEC_ID_H264)`
		`- codec_base->read_packet = read_packet_h264;`
		`- codec_base->decode_video = lqt_ffmpeg_decode_video;`
		`- }`

libre/libquicktime/libquicktime-1.2.4-ffmpeg2.patch

file removed

-98

		`@@ -1,98 +0,0 @@`
		`- Extracted from upstream CVS.`
		`- https://bugs.gentoo.org/show_bug.cgi?id=476498`
		`-`
		`- Index: libquicktime-1.2.4/plugins/ffmpeg/audio.c`
		`- ===================================================================`
		`- --- libquicktime-1.2.4.orig/plugins/ffmpeg/audio.c`
		`- +++ libquicktime-1.2.4/plugins/ffmpeg/audio.c`
		`- @@ -45,6 +45,11 @@`
		`- #define ENCODE_AUDIO 1`
		`- #endif`
		`-`
		`- +#ifndef AVCODEC_MAX_AUDIO_FRAME_SIZE`
		`- +/* from libavcodec/avcodec.h dated Dec 23 2012 */`
		`- +#define AVCODEC_MAX_AUDIO_FRAME_SIZE 192000 // 1 second of 48khz 32bit audio`
		`- +#endif`
		`- +`
		`- /* The following code was ported from gmerlin_avdecoder (http://gmerlin.sourceforge.net) */`
		`-`
		`- /* MPEG Audio header parsing code */`
		`- Index: libquicktime-1.2.4/plugins/ffmpeg/params.c`
		`- ===================================================================`
		`- --- libquicktime-1.2.4.orig/plugins/ffmpeg/params.c`
		`- +++ libquicktime-1.2.4/plugins/ffmpeg/params.c`
		`- @@ -101,6 +101,17 @@ typedef struct`
		`- } \`
		`- }`
		`-`
		`- +#define PARAM_DICT_INT(name, dict_name) \`
		`- + { \`
		`- + if(!strcasecmp(name, key)) \`
		`- + { \`
		`- + char buf[128]; \`
		`- + snprintf(buf, sizeof(buf), "%d", (int)value); \`
		`- + av_dict_set(options, dict_name, buf, 0); \`
		`- + found = 1; \`
		`- + } \`
		`- + }`
		`- +`
		`- #define PARAM_DICT_FLAG(name, dict_name) \`
		`- { \`
		`- if(!strcasecmp(name, key)) \`
		`- @@ -202,8 +213,15 @@ void lqt_ffmpeg_set_parameter(AVCodecCon`
		`- PARAM_INT("ff_max_b_frames",max_b_frames);`
		`- PARAM_FLOAT("ff_b_quant_factor",b_quant_factor);`
		`- PARAM_INT("ff_b_frame_strategy",b_frame_strategy);`
		`- +`
		`- +#if LIBAVCODEC_VERSION_MAJOR >= 55`
		`- + PARAM_DICT_INT("ff_luma_elim_threshold","luma_elim_threshold");`
		`- + PARAM_DICT_INT("ff_chroma_elim_threshold","chroma_elim_threshold");`
		`- +#else`
		`- PARAM_INT("ff_luma_elim_threshold",luma_elim_threshold);`
		`- PARAM_INT("ff_chroma_elim_threshold",chroma_elim_threshold);`
		`- +#endif`
		`- +`
		`- PARAM_INT("ff_strict_std_compliance",strict_std_compliance);`
		`- PARAM_QP2LAMBDA("ff_b_quant_offset",b_quant_offset);`
		`- PARAM_INT("ff_rc_min_rate",rc_min_rate);`
		`- @@ -241,8 +259,15 @@ void lqt_ffmpeg_set_parameter(AVCodecCon`
		`- PARAM_QP2LAMBDA("ff_lmax", lmax);`
		`- PARAM_INT("ff_noise_reduction",noise_reduction);`
		`- PARAM_INT_SCALE("ff_rc_initial_buffer_occupancy",rc_initial_buffer_occupancy,1000);`
		`- +`
		`- +#if LIBAVCODEC_VERSION_MAJOR >= 55`
		`- + PARAM_DICT_INT("ff_inter_threshold","inter_threshold");`
		`- + PARAM_DICT_INT("ff_quantizer_noise_shaping","quantizer_noise_shaping");`
		`- +#else`
		`- PARAM_INT("ff_inter_threshold",inter_threshold);`
		`- PARAM_INT("ff_quantizer_noise_shaping",quantizer_noise_shaping);`
		`- +#endif`
		`- +`
		`- PARAM_INT("ff_thread_count",thread_count);`
		`- PARAM_INT("ff_me_threshold",me_threshold);`
		`- PARAM_INT("ff_mb_threshold",mb_threshold);`
		`- @@ -272,8 +297,16 @@ void lqt_ffmpeg_set_parameter(AVCodecCon`
		`- PARAM_FLAG("ff_flag_bitexact",CODEC_FLAG_BITEXACT);`
		`- PARAM_FLAG("ff_flag_ac_pred",CODEC_FLAG_AC_PRED);`
		`- // PARAM_FLAG("ff_flag_h263p_umv",CODEC_FLAG_H263P_UMV); // Unused`
		`- +`
		`- +#if LIBAVCODEC_VERSION_MAJOR >= 55`
		`- + PARAM_DICT_FLAG("ff_flag_cbp_rd","cbp_rd");`
		`- + PARAM_DICT_FLAG("ff_flag_qp_rd","qp_rd");`
		`- + PARAM_DICT_FLAG("ff_flag2_strict_gop","strict_gop");`
		`- +#else`
		`- PARAM_FLAG("ff_flag_cbp_rd",CODEC_FLAG_CBP_RD);`
		`- PARAM_FLAG("ff_flag_qp_rd",CODEC_FLAG_QP_RD);`
		`- + PARAM_FLAG2("ff_flag2_strict_gop",CODEC_FLAG2_STRICT_GOP);`
		`- +#endif`
		`-`
		`- #if LIBAVCODEC_VERSION_MAJOR >= 54`
		`- PARAM_DICT_FLAG("ff_flag_h263p_aiv", "aiv");`
		`- @@ -288,7 +321,6 @@ void lqt_ffmpeg_set_parameter(AVCodecCon`
		`- PARAM_FLAG("ff_flag_loop_filter",CODEC_FLAG_LOOP_FILTER);`
		`- PARAM_FLAG("ff_flag_closed_gop",CODEC_FLAG_CLOSED_GOP);`
		`- PARAM_FLAG2("ff_flag2_fast",CODEC_FLAG2_FAST);`
		`- - PARAM_FLAG2("ff_flag2_strict_gop",CODEC_FLAG2_STRICT_GOP);`
		`- PARAM_ENUM("ff_coder_type",coder_type,coder_type);`
		`-`
		`- }`

libre/libquicktime/libquicktime-1.2.4-ffmpeg29.patch

file removed

-287

		`@@ -1,287 +0,0 @@`
		`- Index: libquicktime-1.2.4/plugins/ffmpeg/video.c`
		`- ===================================================================`
		`- --- libquicktime-1.2.4.orig/plugins/ffmpeg/video.c`
		`- +++ libquicktime-1.2.4/plugins/ffmpeg/video.c`
		`- @@ -37,10 +37,10 @@`
		`- #endif`
		`-`
		`-`
		`- -#ifdef PIX_FMT_YUV422P10`
		`- -#define PIX_FMT_YUV422P10_OR_DUMMY PIX_FMT_YUV422P10`
		`- +#ifdef AV_PIX_FMT_YUV422P10`
		`- +#define AV_PIX_FMT_YUV422P10_OR_DUMMY AV_PIX_FMT_YUV422P10`
		`- #else`
		`- -#define PIX_FMT_YUV422P10_OR_DUMMY -1234`
		`- +#define AV_PIX_FMT_YUV422P10_OR_DUMMY -1234`
		`- #endif`
		`-`
		`- #if LIBAVCODEC_VERSION_INT >= ((54<<16)\|(1<<8)\|0)`
		`- @@ -90,9 +90,9 @@ typedef struct`
		`- int imx_bitrate;`
		`- int imx_strip_vbi;`
		`-`
		`- - /* In some cases FFMpeg would report something like PIX_FMT_YUV422P, while`
		`- - we would like to treat it as PIX_FMT_YUVJ422P. It's only used for decoding */`
		`- - enum PixelFormat reinterpret_pix_fmt;`
		`- + /* In some cases FFMpeg would report something like AV_PIX_FMT_YUV422P, while`
		`- + we would like to treat it as AV_PIX_FMT_YUVJ422P. It's only used for decoding */`
		`- + enum AVPixelFormat reinterpret_pix_fmt;`
		`-`
		`- int is_imx;`
		`- int y_offset;`
		`- @@ -137,42 +137,42 @@ typedef struct`
		`-`
		`- static const struct`
		`- {`
		`- - enum PixelFormat ffmpeg_id;`
		`- + enum AVPixelFormat ffmpeg_id;`
		`- int lqt_id;`
		`- int exact;`
		`- }`
		`- colormodels[] =`
		`- {`
		`- - { PIX_FMT_YUV420P, BC_YUV420P, 1 }, ///< Planar YUV 4:2:0 (1 Cr & Cb sample per 2x2 Y samples)`
		`- + { AV_PIX_FMT_YUV420P, BC_YUV420P, 1 }, ///< Planar YUV 4:2:0 (1 Cr & Cb sample per 2x2 Y samples)`
		`- #if LIBAVUTIL_VERSION_INT < (50<<16)`
		`- - { PIX_FMT_YUV422, BC_YUV422, 1 },`
		`- + { AV_PIX_FMT_YUV422, BC_YUV422, 1 },`
		`- #else`
		`- - { PIX_FMT_YUYV422, BC_YUV422, 1 },`
		`- + { AV_PIX_FMT_YUYV422, BC_YUV422, 1 },`
		`- #endif`
		`- - { PIX_FMT_RGB24, BC_RGB888, 1 }, ///< Packed pixel, 3 bytes per pixel, RGBRGB...`
		`- - { PIX_FMT_BGR24, BC_BGR888, 1 }, ///< Packed pixel, 3 bytes per pixel, BGRBGR...`
		`- - { PIX_FMT_YUV422P, BC_YUV422P, 1 }, ///< Planar YUV 4:2:2 (1 Cr & Cb sample per 2x1 Y samples)`
		`- - { PIX_FMT_YUV444P, BC_YUV444P, 1 }, ///< Planar YUV 4:4:4 (1 Cr & Cb sample per 1x1 Y samples)`
		`- - { PIX_FMT_YUV411P, BC_YUV411P, 1 }, ///< Planar YUV 4:1:1 (1 Cr & Cb sample per 4x1 Y samples)`
		`- - { PIX_FMT_YUV422P16, BC_YUV422P16, 1 }, ///< Planar 16 bit YUV 4:2:2 (1 Cr & Cb sample per 2x1 Y samples)`
		`- -#ifdef PIX_FMT_YUV422P10`
		`- - { PIX_FMT_YUV422P10, BC_YUV422P10, 1 }, ///< 10 bit samples in uint16_t containers, planar 4:2:2`
		`- -#endif`
		`- - { PIX_FMT_RGB565, BC_RGB565, 1 }, ///< always stored in cpu endianness`
		`- - { PIX_FMT_YUVJ420P, BC_YUVJ420P, 1 }, ///< Planar YUV 4:2:0 full scale (jpeg)`
		`- - { PIX_FMT_YUVJ422P, BC_YUVJ422P, 1 }, ///< Planar YUV 4:2:2 full scale (jpeg)`
		`- - { PIX_FMT_YUVJ444P, BC_YUVJ444P, 1 }, ///< Planar YUV 4:4:4 full scale (jpeg)`
		`- + { AV_PIX_FMT_RGB24, BC_RGB888, 1 }, ///< Packed pixel, 3 bytes per pixel, RGBRGB...`
		`- + { AV_PIX_FMT_BGR24, BC_BGR888, 1 }, ///< Packed pixel, 3 bytes per pixel, BGRBGR...`
		`- + { AV_PIX_FMT_YUV422P, BC_YUV422P, 1 }, ///< Planar YUV 4:2:2 (1 Cr & Cb sample per 2x1 Y samples)`
		`- + { AV_PIX_FMT_YUV444P, BC_YUV444P, 1 }, ///< Planar YUV 4:4:4 (1 Cr & Cb sample per 1x1 Y samples)`
		`- + { AV_PIX_FMT_YUV411P, BC_YUV411P, 1 }, ///< Planar YUV 4:1:1 (1 Cr & Cb sample per 4x1 Y samples)`
		`- + { AV_PIX_FMT_YUV422P16, BC_YUV422P16, 1 }, ///< Planar 16 bit YUV 4:2:2 (1 Cr & Cb sample per 2x1 Y samples)`
		`- +#ifdef AV_PIX_FMT_YUV422P10`
		`- + { AV_PIX_FMT_YUV422P10, BC_YUV422P10, 1 }, ///< 10 bit samples in uint16_t containers, planar 4:2:2`
		`- +#endif`
		`- + { AV_PIX_FMT_RGB565, BC_RGB565, 1 }, ///< always stored in cpu endianness`
		`- + { AV_PIX_FMT_YUVJ420P, BC_YUVJ420P, 1 }, ///< Planar YUV 4:2:0 full scale (jpeg)`
		`- + { AV_PIX_FMT_YUVJ422P, BC_YUVJ422P, 1 }, ///< Planar YUV 4:2:2 full scale (jpeg)`
		`- + { AV_PIX_FMT_YUVJ444P, BC_YUVJ444P, 1 }, ///< Planar YUV 4:4:4 full scale (jpeg)`
		`- #if LIBAVUTIL_VERSION_INT < (50<<16)`
		`- - { PIX_FMT_RGBA32, BC_RGBA8888, 0 }, ///< Packed pixel, 4 bytes per pixel, BGRABGRA...`
		`- + { AV_PIX_FMT_RGBA32, BC_RGBA8888, 0 }, ///< Packed pixel, 4 bytes per pixel, BGRABGRA...`
		`- #else`
		`- - { PIX_FMT_RGB32, BC_RGBA8888, 0 }, ///< Packed pixel, 4 bytes per pixel, BGRABGRA...`
		`- + { AV_PIX_FMT_RGB32, BC_RGBA8888, 0 }, ///< Packed pixel, 4 bytes per pixel, BGRABGRA...`
		`- #endif`
		`- - { PIX_FMT_RGB555, BC_RGB888, 0 }, ///< always stored in cpu endianness, most significant bit to 1`
		`- - { PIX_FMT_GRAY8, BC_RGB888, 0 },`
		`- - { PIX_FMT_MONOWHITE, BC_RGB888, 0 }, ///< 0 is white`
		`- - { PIX_FMT_MONOBLACK, BC_RGB888, 0 }, ///< 0 is black`
		`- - { PIX_FMT_PAL8, BC_RGB888, 0 }, ///< 8 bit with RGBA palette`
		`- - { PIX_FMT_YUV410P, BC_YUV420P, 0 }, ///< Planar YUV 4:1:0 (1 Cr & Cb sample per 4x4 Y samples)`
		`- + { AV_PIX_FMT_RGB555, BC_RGB888, 0 }, ///< always stored in cpu endianness, most significant bit to 1`
		`- + { AV_PIX_FMT_GRAY8, BC_RGB888, 0 },`
		`- + { AV_PIX_FMT_MONOWHITE, BC_RGB888, 0 }, ///< 0 is white`
		`- + { AV_PIX_FMT_MONOBLACK, BC_RGB888, 0 }, ///< 0 is black`
		`- + { AV_PIX_FMT_PAL8, BC_RGB888, 0 }, ///< 8 bit with RGBA palette`
		`- + { AV_PIX_FMT_YUV410P, BC_YUV420P, 0 }, ///< Planar YUV 4:1:0 (1 Cr & Cb sample per 4x4 Y samples)`
		`- };`
		`-`
		`- static const struct`
		`- @@ -343,16 +343,16 @@ static int lqt_tenbit_dnxhd_supported(AV`
		`- if (!codec->pix_fmts)`
		`- return 0;`
		`-`
		`- - for (i = 0; codec->pix_fmts[i] != PIX_FMT_NONE; ++i)`
		`- + for (i = 0; codec->pix_fmts[i] != AV_PIX_FMT_NONE; ++i)`
		`- {`
		`- - if (codec->pix_fmts[i] == PIX_FMT_YUV422P10_OR_DUMMY)`
		`- + if (codec->pix_fmts[i] == AV_PIX_FMT_YUV422P10_OR_DUMMY)`
		`- return 1;`
		`- }`
		`-`
		`- return 0;`
		`- }`
		`-`
		`- -static enum PixelFormat lqt_ffmpeg_get_ffmpeg_colormodel(int id)`
		`- +static enum AVPixelFormat lqt_ffmpeg_get_ffmpeg_colormodel(int id)`
		`- {`
		`- int i;`
		`-`
		`- @@ -361,10 +361,10 @@ static enum PixelFormat lqt_ffmpeg_get_f`
		`- if(colormodels[i].lqt_id == id)`
		`- return colormodels[i].ffmpeg_id;`
		`- }`
		`- - return PIX_FMT_NB;`
		`- + return AV_PIX_FMT_NB;`
		`- }`
		`-`
		`- -static int lqt_ffmpeg_get_lqt_colormodel(enum PixelFormat id, int * exact)`
		`- +static int lqt_ffmpeg_get_lqt_colormodel(enum AVPixelFormat id, int * exact)`
		`- {`
		`- int i;`
		`-`
		`- @@ -402,24 +402,24 @@ static void lqt_ffmpeg_setup_decoding_co`
		`- /* First we try codec-specific colormodel matching. */`
		`- if(codec->decoder->id == AV_CODEC_ID_DNXHD)`
		`- {`
		`- - /* FFMpeg supports PIX_FMT_YUV422P and PIX_FMT_YUV422P10 for DNxHD, which`
		`- - we sometimes interpret as PIX_FMT_YUVJ422P and PIX_FMT_YUVJ422P10. */`
		`- - if (codec->avctx->pix_fmt == PIX_FMT_YUV422P \|\| codec->avctx->pix_fmt == PIX_FMT_YUV422P10_OR_DUMMY)`
		`- + /* FFMpeg supports AV_PIX_FMT_YUV422P and AV_PIX_FMT_YUV422P10 for DNxHD, which`
		`- + we sometimes interpret as AV_PIX_FMT_YUVJ422P and AV_PIX_FMT_YUVJ422P10. */`
		`- + if (codec->avctx->pix_fmt == AV_PIX_FMT_YUV422P \|\| codec->avctx->pix_fmt == AV_PIX_FMT_YUV422P10_OR_DUMMY)`
		`- {`
		`- - int p10 = (codec->avctx->pix_fmt == PIX_FMT_YUV422P10_OR_DUMMY);`
		`- + int p10 = (codec->avctx->pix_fmt == AV_PIX_FMT_YUV422P10_OR_DUMMY);`
		`- *exact = 1;`
		`- if (lqt_ffmpeg_get_avid_yuv_range(vtrack->track) == AVID_FULL_YUV_RANGE)`
		`- {`
		`- vtrack->stream_cmodel = p10 ? BC_YUVJ422P10 : BC_YUVJ422P;`
		`- - codec->reinterpret_pix_fmt = p10 ? PIX_FMT_YUV422P10_OR_DUMMY : PIX_FMT_YUVJ422P;`
		`- - // Note: reinterpret_pix_fmt should really be PIX_FMT_YUVJ422P10, except`
		`- + codec->reinterpret_pix_fmt = p10 ? AV_PIX_FMT_YUV422P10_OR_DUMMY : AV_PIX_FMT_YUVJ422P;`
		`- + // Note: reinterpret_pix_fmt should really be AV_PIX_FMT_YUVJ422P10, except`
		`- // there is no such colormodel in FFMpeg. Fortunately, it's not a problem`
		`- // in this case, as reinterpret_pix_fmt is only used when *exact == 0.`
		`- }`
		`- else`
		`- {`
		`- vtrack->stream_cmodel = p10 ? BC_YUV422P10 : BC_YUV422P;`
		`- - codec->reinterpret_pix_fmt = p10 ? PIX_FMT_YUV422P10_OR_DUMMY : PIX_FMT_YUV422P;`
		`- + codec->reinterpret_pix_fmt = p10 ? AV_PIX_FMT_YUV422P10_OR_DUMMY : AV_PIX_FMT_YUV422P;`
		`- }`
		`- return;`
		`- }`
		`- @@ -440,14 +440,14 @@ static void lqt_ffmpeg_setup_encoding_co`
		`-`
		`- if (codec->encoder->id == AV_CODEC_ID_DNXHD)`
		`- {`
		`- - /* FFMpeg's DNxHD encoder only supports PIX_FMT_YUV422P and PIX_FMT_YUV422P10`
		`- - and doesn't know anything about PIX_FMT_YUVJ422P and PIX_FMT_YUVJ422P10`
		`- + /* FFMpeg's DNxHD encoder only supports AV_PIX_FMT_YUV422P and AV_PIX_FMT_YUV422P10`
		`- + and doesn't know anything about AV_PIX_FMT_YUVJ422P and AV_PIX_FMT_YUVJ422P10`
		`- (in fact, the latter doesn't even exist) */`
		`- - codec->avctx->pix_fmt = PIX_FMT_YUV422P;`
		`- + codec->avctx->pix_fmt = AV_PIX_FMT_YUV422P;`
		`- if (vtrack->stream_cmodel == BC_YUV422P10 \|\| vtrack->stream_cmodel == BC_YUVJ422P10)`
		`- {`
		`- if (lqt_tenbit_dnxhd_supported(codec->encoder))`
		`- - codec->avctx->pix_fmt = PIX_FMT_YUV422P10_OR_DUMMY;`
		`- + codec->avctx->pix_fmt = AV_PIX_FMT_YUV422P10_OR_DUMMY;`
		`- }`
		`- }`
		`- }`
		`- @@ -458,7 +458,7 @@ static void lqt_ffmpeg_setup_encoding_co`
		`- /* From avcodec.h: */`
		`-`
		`- /*`
		`- - * PIX_FMT_RGBA32 is handled in an endian-specific manner. A RGBA`
		`- + * AV_PIX_FMT_RGBA32 is handled in an endian-specific manner. A RGBA`
		`- * color is put together as:`
		`- * (A << 24) \| (R << 16) \| (G << 8) \| B`
		`- * This is stored as BGRA on little endian CPU architectures and ARGB on`
		`- @@ -530,7 +530,7 @@ static void convert_rgba_to_argb(uint8_t`
		`- */`
		`-`
		`- static void convert_image_decode(quicktime_ffmpeg_video_codec_t *codec,`
		`- - AVFrame * in_frame, enum PixelFormat in_format,`
		`- + AVFrame * in_frame, enum AVPixelFormat in_format,`
		`- unsigned char ** out_frame, int out_format,`
		`- int width, int height, int row_span, int row_span_uv)`
		`- {`
		`- @@ -547,9 +547,9 @@ static void convert_image_decode(quickti`
		`- * RGBA format like in ffmpeg??`
		`- */`
		`- #if LIBAVUTIL_VERSION_INT < (50<<16)`
		`- - if((in_format == PIX_FMT_RGBA32) && (out_format == BC_RGBA8888))`
		`- + if((in_format == AV_PIX_FMT_RGBA32) && (out_format == BC_RGBA8888))`
		`- #else`
		`- - if((in_format == PIX_FMT_RGB32) && (out_format == BC_RGBA8888))`
		`- + if((in_format == AV_PIX_FMT_RGB32) && (out_format == BC_RGBA8888))`
		`- #endif`
		`- {`
		`- convert_image_decode_rgba(in_frame, out_frame, width, height, codec->y_offset);`
		`- @@ -829,7 +829,7 @@ static int lqt_ffmpeg_decode_video(quick`
		`- if(avcodec_open2(codec->avctx, codec->decoder, NULL) != 0)`
		`- return -1;`
		`- #endif`
		`- - codec->frame = avcodec_alloc_frame();`
		`- + codec->frame = av_frame_alloc();`
		`- vtrack->stream_cmodel = LQT_COLORMODEL_NONE;`
		`- codec->initialized = 1;`
		`- }`
		`- @@ -929,10 +929,10 @@ static int lqt_ffmpeg_decode_video(quick`
		`- #ifdef HAVE_LIBSWSCALE`
		`-`
		`- #if LIBAVUTIL_VERSION_INT < (50<<16)`
		`- - if(!((codec->avctx->pix_fmt == PIX_FMT_RGBA32) &&`
		`- + if(!((codec->avctx->pix_fmt == AV_PIX_FMT_RGBA32) &&`
		`- (vtrack->stream_cmodel == BC_RGBA8888)))`
		`- #else`
		`- - if(!((codec->avctx->pix_fmt == PIX_FMT_RGB32) &&`
		`- + if(!((codec->avctx->pix_fmt == AV_PIX_FMT_RGB32) &&`
		`- (vtrack->stream_cmodel == BC_RGBA8888)))`
		`- #endif`
		`- {`
		`- @@ -1318,7 +1318,7 @@ static int lqt_ffmpeg_encode_video(quick`
		`-`
		`- if(!codec->initialized)`
		`- {`
		`- - codec->frame = avcodec_alloc_frame();`
		`- + codec->frame = av_frame_alloc();`
		`-`
		`- /* time_base is 1/framerate for constant framerate */`
		`-`
		`- @@ -1396,9 +1396,9 @@ static int lqt_ffmpeg_encode_video(quick`
		`- if(vtrack->stream_cmodel == BC_RGBA8888)`
		`- {`
		`- /* Libquicktime doesn't natively support a color model equivalent`
		`- - to PIX_FMT_ARGB, which is required for QTRLE with alpha channel.`
		`- + to AV_PIX_FMT_ARGB, which is required for QTRLE with alpha channel.`
		`- So, we use BC_RGBA8888 and do ad hoc conversion below. */`
		`- - codec->avctx->pix_fmt = PIX_FMT_ARGB;`
		`- + codec->avctx->pix_fmt = AV_PIX_FMT_ARGB;`
		`- vtrack->track->mdia.minf.stbl.stsd.table[0].depth = 32;`
		`- }`
		`- }`
		`- @@ -1467,7 +1467,7 @@ static int lqt_ffmpeg_encode_video(quick`
		`- }`
		`- // codec->lqt_colormodel = ffmepg_2_lqt(codec->com.ffcodec_enc);`
		`-`
		`- - if(codec->y_offset != 0 \|\| codec->avctx->pix_fmt == PIX_FMT_ARGB)`
		`- + if(codec->y_offset != 0 \|\| codec->avctx->pix_fmt == AV_PIX_FMT_ARGB)`
		`- {`
		`- if(!codec->tmp_rows)`
		`- {`
		`- @@ -1492,7 +1492,7 @@ static int lqt_ffmpeg_encode_video(quick`
		`- vtrack->stream_cmodel,`
		`- 0, 0, 0, codec->y_offset);`
		`- }`
		`- - else if(codec->avctx->pix_fmt == PIX_FMT_ARGB)`
		`- + else if(codec->avctx->pix_fmt == AV_PIX_FMT_ARGB)`
		`- {`
		`- convert_rgba_to_argb(row_pointers[0], vtrack->stream_row_span,`
		`- codec->tmp_rows[0], codec->tmp_row_span,`
		`- Index: libquicktime-1.2.4/plugins/ffmpeg/audio.c`
		`- ===================================================================`
		`- --- libquicktime-1.2.4.orig/plugins/ffmpeg/audio.c`
		`- +++ libquicktime-1.2.4/plugins/ffmpeg/audio.c`
		`- @@ -1266,7 +1266,7 @@ static int lqt_ffmpeg_encode_audio(quick`
		`- pkt.data = codec->chunk_buffer;`
		`- pkt.size = codec->chunk_buffer_alloc;`
		`-`
		`- - avcodec_get_frame_defaults(&f);`
		`- + av_frame_unref(&f);`
		`- f.nb_samples = codec->avctx->frame_size;`
		`-`
		`- avcodec_fill_audio_frame(&f, channels, codec->avctx->sample_fmt,`

libre/libquicktime/libquicktime-1.2.4-ffmpeg4.patch

file removed

-342

		`@@ -1,342 +0,0 @@`
		`- Index: libquicktime-1.2.4/plugins/ffmpeg/audio.c`
		`- ===================================================================`
		`- --- libquicktime-1.2.4.orig/plugins/ffmpeg/audio.c`
		`- +++ libquicktime-1.2.4/plugins/ffmpeg/audio.c`
		`- @@ -545,7 +545,7 @@ static int decode_chunk_vbr(quicktime_t`
		`-`
		`- #if DECODE_AUDIO3 \|\| DECODE_AUDIO4`
		`- codec->pkt.data = codec->chunk_buffer;`
		`- - codec->pkt.size = packet_size + FF_INPUT_BUFFER_PADDING_SIZE;`
		`- + codec->pkt.size = packet_size + AV_INPUT_BUFFER_PADDING_SIZE;`
		`-`
		`- #if DECODE_AUDIO4`
		`- frame_bytes = avcodec_decode_audio4(codec->avctx, &f,`
		`- @@ -583,7 +583,7 @@ static int decode_chunk_vbr(quicktime_t`
		`- (codec->sample_buffer_end - codec->sample_buffer_start)],`
		`- &bytes_decoded,`
		`- codec->chunk_buffer,`
		`- - packet_size + FF_INPUT_BUFFER_PADDING_SIZE);`
		`- + packet_size + AV_INPUT_BUFFER_PADDING_SIZE);`
		`- if(frame_bytes < 0)`
		`- {`
		`- lqt_log(file, LQT_LOG_ERROR, LOG_DOMAIN, "avcodec_decode_audio2 error");`
		`- @@ -645,13 +645,13 @@ static int decode_chunk(quicktime_t * fi`
		`- return 0;`
		`- }`
		`-`
		`- - if(codec->chunk_buffer_alloc < mph.frame_bytes + FF_INPUT_BUFFER_PADDING_SIZE)`
		`- + if(codec->chunk_buffer_alloc < mph.frame_bytes + AV_INPUT_BUFFER_PADDING_SIZE)`
		`- {`
		`- - codec->chunk_buffer_alloc = mph.frame_bytes + FF_INPUT_BUFFER_PADDING_SIZE;`
		`- + codec->chunk_buffer_alloc = mph.frame_bytes + AV_INPUT_BUFFER_PADDING_SIZE;`
		`- codec->chunk_buffer = realloc(codec->chunk_buffer, codec->chunk_buffer_alloc);`
		`- }`
		`- memset(codec->chunk_buffer + codec->bytes_in_chunk_buffer, 0,`
		`- - mph.frame_bytes - codec->bytes_in_chunk_buffer + FF_INPUT_BUFFER_PADDING_SIZE);`
		`- + mph.frame_bytes - codec->bytes_in_chunk_buffer + AV_INPUT_BUFFER_PADDING_SIZE);`
		`- num_samples = mph.samples_per_frame;`
		`- codec->bytes_in_chunk_buffer = mph.frame_bytes;`
		`- }`
		`- @@ -695,7 +695,7 @@ static int decode_chunk(quicktime_t * fi`
		`- {`
		`-`
		`-`
		`- - /* BIG NOTE: We pass extra FF_INPUT_BUFFER_PADDING_SIZE for the buffer size`
		`- + /* BIG NOTE: We pass extra AV_INPUT_BUFFER_PADDING_SIZE for the buffer size`
		`- because we know, that lqt_read_audio_chunk allocates 16 extra bytes for us */`
		`-`
		`- /* Some really broken mp3 files have the header bytes split across 2 chunks */`
		`- @@ -761,7 +761,7 @@ static int decode_chunk(quicktime_t * fi`
		`-`
		`- #if DECODE_AUDIO3 \|\| DECODE_AUDIO4`
		`- codec->pkt.data = &codec->chunk_buffer[bytes_used];`
		`- - codec->pkt.size = codec->bytes_in_chunk_buffer + FF_INPUT_BUFFER_PADDING_SIZE;`
		`- + codec->pkt.size = codec->bytes_in_chunk_buffer + AV_INPUT_BUFFER_PADDING_SIZE;`
		`-`
		`- #if DECODE_AUDIO4`
		`-`
		`- @@ -798,7 +798,7 @@ static int decode_chunk(quicktime_t * fi`
		`- (codec->sample_buffer_end - codec->sample_buffer_start)],`
		`- &bytes_decoded,`
		`- &codec->chunk_buffer[bytes_used],`
		`- - codec->bytes_in_chunk_buffer + FF_INPUT_BUFFER_PADDING_SIZE);`
		`- + codec->bytes_in_chunk_buffer + AV_INPUT_BUFFER_PADDING_SIZE);`
		`- #endif`
		`- if(frame_bytes < 0)`
		`- {`
		`- @@ -838,7 +838,7 @@ static int decode_chunk(quicktime_t * fi`
		`- }`
		`- }`
		`-`
		`- - /* This happens because ffmpeg adds FF_INPUT_BUFFER_PADDING_SIZE to the bytes returned */`
		`- + /* This happens because ffmpeg adds AV_INPUT_BUFFER_PADDING_SIZE to the bytes returned */`
		`-`
		`- if(codec->bytes_in_chunk_buffer < 0)`
		`- codec->bytes_in_chunk_buffer = 0;`
		`- Index: libquicktime-1.2.4/plugins/ffmpeg/params.c`
		`- ===================================================================`
		`- --- libquicktime-1.2.4.orig/plugins/ffmpeg/params.c`
		`- +++ libquicktime-1.2.4/plugins/ffmpeg/params.c`
		`- @@ -124,16 +124,6 @@ typedef struct`
		`- }`
		`-`
		`-`
		`- -enum_t me_method[] =`
		`- - {`
		`- - { "Zero", ME_ZERO },`
		`- - { "Phods", ME_PHODS },`
		`- - { "Log", ME_LOG },`
		`- - { "X1", ME_X1 },`
		`- - { "Epzs", ME_EPZS },`
		`- - { "Full", ME_FULL }`
		`- - };`
		`- -`
		`- enum_t prediction_method[] =`
		`- {`
		`- { "Left", FF_PRED_LEFT },`
		`- @@ -163,15 +153,6 @@ enum_t mb_decision[] =`
		`- { "Rate distoration", FF_MB_DECISION_RD }`
		`- };`
		`-`
		`- -enum_t coder_type[] =`
		`- - {`
		`- - { "VLC", FF_CODER_TYPE_VLC },`
		`- - { "Arithmetic", FF_CODER_TYPE_AC },`
		`- - { "Raw", FF_CODER_TYPE_RAW },`
		`- - { "RLE", FF_CODER_TYPE_RLE },`
		`- - { "Deflate", FF_CODER_TYPE_DEFLATE },`
		`- - };`
		`- -`
		`- #define PARAM_ENUM(name, var, arr) \`
		`- if(!strcasecmp(key, name)) \`
		`- { \`
		`- @@ -203,7 +184,7 @@ void lqt_ffmpeg_set_parameter(AVCodecCon`
		`- PARAM_INT_SCALE("ff_bit_rate_audio",bit_rate,1000);`
		`- PARAM_INT_SCALE("ff_bit_rate_video",bit_rate,1000);`
		`- PARAM_INT_SCALE("ff_bit_rate_tolerance",bit_rate_tolerance,1000);`
		`- - PARAM_ENUM("ff_me_method",me_method,me_method);`
		`- + PARAM_DICT_INT("ff_me_method","motion-est");`
		`- PARAM_INT("ff_gop_size",gop_size);`
		`- PARAM_FLOAT("ff_qcompress",qcompress);`
		`- PARAM_FLOAT("ff_qblur",qblur);`
		`- @@ -227,10 +208,9 @@ void lqt_ffmpeg_set_parameter(AVCodecCon`
		`- PARAM_INT("ff_rc_min_rate",rc_min_rate);`
		`- PARAM_INT("ff_rc_max_rate",rc_max_rate);`
		`- PARAM_INT_SCALE("ff_rc_buffer_size",rc_buffer_size,1000);`
		`- - PARAM_FLOAT("ff_rc_buffer_aggressivity",rc_buffer_aggressivity);`
		`- PARAM_FLOAT("ff_i_quant_factor",i_quant_factor);`
		`- PARAM_QP2LAMBDA("ff_i_quant_offset",i_quant_offset);`
		`- - PARAM_FLOAT("ff_rc_initial_cplx",rc_initial_cplx);`
		`- + PARAM_DICT_INT("ff_rc_initial_cplx","rc_init_cplx");`
		`- PARAM_FLOAT("ff_lumi_masking",lumi_masking);`
		`- PARAM_FLOAT("ff_temporal_cplx_masking",temporal_cplx_masking);`
		`- PARAM_FLOAT("ff_spatial_cplx_masking",spatial_cplx_masking);`
		`- @@ -255,8 +235,8 @@ void lqt_ffmpeg_set_parameter(AVCodecCon`
		`- PARAM_INT("ff_me_range",me_range);`
		`- PARAM_ENUM("ff_mb_decision",mb_decision,mb_decision);`
		`- PARAM_INT("ff_scenechange_threshold",scenechange_threshold);`
		`- - PARAM_QP2LAMBDA("ff_lmin", lmin);`
		`- - PARAM_QP2LAMBDA("ff_lmax", lmax);`
		`- + PARAM_DICT_INT("ff_lmin", "lmin");`
		`- + PARAM_DICT_INT("ff_lmax", "lmax");`
		`- PARAM_INT("ff_noise_reduction",noise_reduction);`
		`- PARAM_INT_SCALE("ff_rc_initial_buffer_occupancy",rc_initial_buffer_occupancy,1000);`
		`-`
		`- @@ -269,33 +249,29 @@ void lqt_ffmpeg_set_parameter(AVCodecCon`
		`- #endif`
		`-`
		`- PARAM_INT("ff_thread_count",thread_count);`
		`- - PARAM_INT("ff_me_threshold",me_threshold);`
		`- - PARAM_INT("ff_mb_threshold",mb_threshold);`
		`- PARAM_INT("ff_nsse_weight",nsse_weight);`
		`- - PARAM_FLOAT("ff_border_masking",border_masking);`
		`- + PARAM_DICT_INT("ff_border_masking","border_mask");`
		`- PARAM_QP2LAMBDA("ff_mb_lmin", mb_lmin);`
		`- PARAM_QP2LAMBDA("ff_mb_lmax", mb_lmax);`
		`- PARAM_INT("ff_me_penalty_compensation",me_penalty_compensation);`
		`- PARAM_INT("ff_bidir_refine",bidir_refine);`
		`- PARAM_INT("ff_brd_scale",brd_scale);`
		`- - PARAM_INT("ff_scenechange_factor",scenechange_factor);`
		`- - PARAM_FLAG("ff_flag_qscale",CODEC_FLAG_QSCALE);`
		`- - PARAM_FLAG("ff_flag_4mv",CODEC_FLAG_4MV);`
		`- - PARAM_FLAG("ff_flag_qpel",CODEC_FLAG_QPEL);`
		`- - PARAM_FLAG("ff_flag_gmc",CODEC_FLAG_GMC);`
		`- - PARAM_FLAG("ff_flag_mv0",CODEC_FLAG_MV0);`
		`- + PARAM_FLAG("ff_flag_qscale",AV_CODEC_FLAG_QSCALE);`
		`- + PARAM_FLAG("ff_flag_4mv",AV_CODEC_FLAG_4MV);`
		`- + PARAM_FLAG("ff_flag_qpel",AV_CODEC_FLAG_QPEL);`
		`- + PARAM_DICT_FLAG("ff_flag_gmc","gmc");`
		`- + PARAM_DICT_FLAG("ff_flag_mv0","mpv_flags");`
		`- // PARAM_FLAG("ff_flag_part",CODEC_FLAG_PART); // Unused`
		`- - PARAM_FLAG("ff_flag_gray",CODEC_FLAG_GRAY);`
		`- - PARAM_FLAG("ff_flag_emu_edge",CODEC_FLAG_EMU_EDGE);`
		`- - PARAM_FLAG("ff_flag_normalize_aqp",CODEC_FLAG_NORMALIZE_AQP);`
		`- + PARAM_FLAG("ff_flag_gray",AV_CODEC_FLAG_GRAY);`
		`- + PARAM_DICT_FLAG("ff_flag_normalize_aqp","naq");`
		`- // PARAM_FLAG("ff_flag_alt_scan",CODEC_FLAG_ALT_SCAN); // Unused`
		`- #if LIBAVCODEC_VERSION_INT < ((52<<16)+(0<<8)+0)`
		`- PARAM_FLAG("ff_flag_trellis_quant",CODEC_FLAG_TRELLIS_QUANT);`
		`- #else`
		`- PARAM_INT("ff_trellis",trellis);`
		`- #endif`
		`- - PARAM_FLAG("ff_flag_bitexact",CODEC_FLAG_BITEXACT);`
		`- - PARAM_FLAG("ff_flag_ac_pred",CODEC_FLAG_AC_PRED);`
		`- + PARAM_FLAG("ff_flag_bitexact",AV_CODEC_FLAG_BITEXACT);`
		`- + PARAM_FLAG("ff_flag_ac_pred",AV_CODEC_FLAG_AC_PRED);`
		`- // PARAM_FLAG("ff_flag_h263p_umv",CODEC_FLAG_H263P_UMV); // Unused`
		`-`
		`- #if LIBAVCODEC_VERSION_MAJOR >= 55`
		`- @@ -303,9 +279,9 @@ void lqt_ffmpeg_set_parameter(AVCodecCon`
		`- PARAM_DICT_FLAG("ff_flag_qp_rd","qp_rd");`
		`- PARAM_DICT_FLAG("ff_flag2_strict_gop","strict_gop");`
		`- #else`
		`- - PARAM_FLAG("ff_flag_cbp_rd",CODEC_FLAG_CBP_RD);`
		`- - PARAM_FLAG("ff_flag_qp_rd",CODEC_FLAG_QP_RD);`
		`- - PARAM_FLAG2("ff_flag2_strict_gop",CODEC_FLAG2_STRICT_GOP);`
		`- + PARAM_FLAG("ff_flag_cbp_rd",AV_CODEC_FLAG_CBP_RD);`
		`- + PARAM_FLAG("ff_flag_qp_rd",AV_CODEC_FLAG_QP_RD);`
		`- + PARAM_FLAG2("ff_flag2_strict_gop",AV_CODEC_FLAG2_STRICT_GOP);`
		`- #endif`
		`-`
		`- #if LIBAVCODEC_VERSION_MAJOR >= 54`
		`- @@ -313,14 +289,14 @@ void lqt_ffmpeg_set_parameter(AVCodecCon`
		`- PARAM_DICT_FLAG("ff_flag_obmc","obmc");`
		`- PARAM_DICT_FLAG("ff_flag_h263p_slice_struct","structured_slices");`
		`- #else`
		`- - PARAM_FLAG("ff_flag_h263p_aiv",CODEC_FLAG_H263P_AIV);`
		`- - PARAM_FLAG("ff_flag_obmc",CODEC_FLAG_OBMC);`
		`- - PARAM_FLAG("ff_flag_h263p_slice_struct",CODEC_FLAG_H263P_SLICE_STRUCT);`
		`- + PARAM_FLAG("ff_flag_h263p_aiv",AV_CODEC_FLAG_H263P_AIV);`
		`- + PARAM_FLAG("ff_flag_obmc",AV_CODEC_FLAG_OBMC);`
		`- + PARAM_FLAG("ff_flag_h263p_slice_struct",AV_CODEC_FLAG_H263P_SLICE_STRUCT);`
		`- #endif`
		`-`
		`- - PARAM_FLAG("ff_flag_loop_filter",CODEC_FLAG_LOOP_FILTER);`
		`- - PARAM_FLAG("ff_flag_closed_gop",CODEC_FLAG_CLOSED_GOP);`
		`- - PARAM_FLAG2("ff_flag2_fast",CODEC_FLAG2_FAST);`
		`- - PARAM_ENUM("ff_coder_type",coder_type,coder_type);`
		`- + PARAM_FLAG("ff_flag_loop_filter",AV_CODEC_FLAG_LOOP_FILTER);`
		`- + PARAM_FLAG("ff_flag_closed_gop",AV_CODEC_FLAG_CLOSED_GOP);`
		`- + PARAM_FLAG2("ff_flag2_fast",AV_CODEC_FLAG2_FAST);`
		`- + PARAM_DICT_INT("ff_coder_type","coder");`
		`-`
		`- }`
		`- Index: libquicktime-1.2.4/plugins/ffmpeg/params.h`
		`- ===================================================================`
		`- --- libquicktime-1.2.4.orig/plugins/ffmpeg/params.h`
		`- +++ libquicktime-1.2.4/plugins/ffmpeg/params.h`
		`- @@ -149,7 +149,7 @@ the reference. Unused for constant quant`
		`- .type = LQT_PARAMETER_INT, \`
		`- .val_default = { .val_int = 0 }, \`
		`- .val_min = { .val_int = 0 }, \`
		`- - .val_max = { .val_int = FF_MAX_B_FRAMES }, \`
		`- + .val_max = { .val_int = 16 }, \`
		`- .help_string = TRS("Maximum number of B-frames between non B-frames") \`
		`- }`
		`-`
		`- Index: libquicktime-1.2.4/plugins/ffmpeg/video.c`
		`- ===================================================================`
		`- --- libquicktime-1.2.4.orig/plugins/ffmpeg/video.c`
		`- +++ libquicktime-1.2.4/plugins/ffmpeg/video.c`
		`- @@ -781,7 +781,7 @@ static int lqt_ffmpeg_decode_video(quick`
		`- if(extradata)`
		`- {`
		`- codec->extradata =`
		`- - calloc(1, extradata_size + FF_INPUT_BUFFER_PADDING_SIZE);`
		`- + calloc(1, extradata_size + AV_INPUT_BUFFER_PADDING_SIZE);`
		`- memcpy(codec->extradata, extradata, extradata_size);`
		`- codec->avctx->extradata_size = extradata_size;`
		`- codec->avctx->extradata = codec->extradata;`
		`- @@ -1140,8 +1140,8 @@ static int init_imx_encoder(quicktime_t`
		`- codec->avctx->qmin = 1;`
		`- codec->avctx->qmax = 3;`
		`- codec->avctx->rtp_payload_size = 1; // ??`
		`- - codec->avctx->rc_buffer_aggressivity = 0.25;`
		`- - codec->avctx->flags \|= CODEC_FLAG_INTERLACED_DCT\|CODEC_FLAG_LOW_DELAY;`
		`- + av_dict_set(&codec->options, "rc_buf_aggressivity", "0.25", 0);`
		`- + codec->avctx->flags \|= AV_CODEC_FLAG_INTERLACED_DCT\|AV_CODEC_FLAG_LOW_DELAY;`
		`-`
		`- #if (LIBAVCODEC_VERSION_MAJOR < 54)`
		`- codec->avctx->flags2 \|= CODEC_FLAG2_INTRA_VLC\|CODEC_FLAG2_NON_LINEAR_QUANT;`
		`- @@ -1328,7 +1328,7 @@ static int lqt_ffmpeg_encode_video(quick`
		`- // codec->avctx->time_base.den = 1;`
		`- // codec->avctx->time_base.num = lqt_video_time_scale(file, track);`
		`-`
		`- - if(codec->avctx->flags & CODEC_FLAG_QSCALE)`
		`- + if(codec->avctx->flags & AV_CODEC_FLAG_QSCALE)`
		`- codec->avctx->global_quality = codec->qscale;`
		`-`
		`- codec->avctx->width = width;`
		`- @@ -1344,7 +1344,7 @@ static int lqt_ffmpeg_encode_video(quick`
		`- {`
		`- if(!(file->file_type & (LQT_FILE_AVI\|LQT_FILE_AVI_ODML)))`
		`- {`
		`- - codec->avctx->flags \|= CODEC_FLAG_GLOBAL_HEADER;`
		`- + codec->avctx->flags \|= AV_CODEC_FLAG_GLOBAL_HEADER;`
		`- codec->write_global_header = 1;`
		`- }`
		`-`
		`- @@ -1360,7 +1360,7 @@ static int lqt_ffmpeg_encode_video(quick`
		`- {`
		`- lqt_log(file, LQT_LOG_INFO, LOG_DOMAIN, "Enabling interlaced encoding");`
		`- codec->avctx->flags \|=`
		`- - (CODEC_FLAG_INTERLACED_DCT\|CODEC_FLAG_INTERLACED_ME\|CODEC_FLAG_ALT_SCAN);`
		`- + (AV_CODEC_FLAG_INTERLACED_DCT\|AV_CODEC_FLAG_INTERLACED_ME\|AV_CODEC_FLAG_ALT_SCAN);`
		`- }`
		`- #endif`
		`- }`
		`- @@ -1387,7 +1387,7 @@ static int lqt_ffmpeg_encode_video(quick`
		`- {`
		`- if(!(file->file_type & (LQT_FILE_AVI\|LQT_FILE_AVI_ODML)))`
		`- {`
		`- - codec->avctx->flags \|= CODEC_FLAG_GLOBAL_HEADER;`
		`- + codec->avctx->flags \|= AV_CODEC_FLAG_GLOBAL_HEADER;`
		`- codec->write_global_header = 1;`
		`- }`
		`- }`
		`- @@ -1410,7 +1410,7 @@ static int lqt_ffmpeg_encode_video(quick`
		`- {`
		`- if(vtrack->interlace_mode != LQT_INTERLACE_NONE)`
		`- {`
		`- - codec->avctx->flags \|= CODEC_FLAG_INTERLACED_DCT;`
		`- + codec->avctx->flags \|= AV_CODEC_FLAG_INTERLACED_DCT;`
		`- }`
		`- }`
		`- else if(codec->is_imx)`
		`- @@ -1422,7 +1422,7 @@ static int lqt_ffmpeg_encode_video(quick`
		`- if(codec->pass == 1)`
		`- {`
		`- codec->stats_file = fopen(codec->stats_filename, "w");`
		`- - codec->avctx->flags \|= CODEC_FLAG_PASS1;`
		`- + codec->avctx->flags \|= AV_CODEC_FLAG_PASS1;`
		`- }`
		`- else if(codec->pass == codec->total_passes)`
		`- {`
		`- @@ -1438,7 +1438,7 @@ static int lqt_ffmpeg_encode_video(quick`
		`- fclose(codec->stats_file);`
		`- codec->stats_file = (FILE*)0;`
		`-`
		`- - codec->avctx->flags \|= CODEC_FLAG_PASS2;`
		`- + codec->avctx->flags \|= AV_CODEC_FLAG_PASS2;`
		`- }`
		`- }`
		`- /* Open codec */`
		`- @@ -1516,7 +1516,7 @@ static int lqt_ffmpeg_encode_video(quick`
		`- }`
		`-`
		`- codec->frame->pts = vtrack->timestamp;`
		`- - if(codec->avctx->flags & CODEC_FLAG_QSCALE)`
		`- + if(codec->avctx->flags & AV_CODEC_FLAG_QSCALE)`
		`- codec->frame->quality = codec->qscale;`
		`- #ifdef DO_INTERLACE`
		`- if(vtrack->interlace_mode != LQT_INTERLACE_NONE)`
		`- @@ -1599,8 +1599,7 @@ static int lqt_ffmpeg_encode_video(quick`
		`- else if(codec->encoder->id == AV_CODEC_ID_MPEG4)`
		`- {`
		`- int advanced = 0;`
		`- - if(codec->avctx->max_b_frames \|\|`
		`- - (codec->avctx->flags & (CODEC_FLAG_QPEL\|CODEC_FLAG_GMC)))`
		`- + if(codec->avctx->max_b_frames)`
		`- advanced = 1;`
		`-`
		`- setup_header_mpeg4(file, track, codec->avctx->extradata,`

libre/libquicktime/libquicktime-1.2.4-libavutil.patch

file removed

-12

		`@@ -1,12 +0,0 @@`
		`- Index: libquicktime-1.2.4/plugins/ffmpeg/ffmpeg.h`
		`- ===================================================================`
		`- --- libquicktime-1.2.4.orig/plugins/ffmpeg/ffmpeg.h`
		`- +++ libquicktime-1.2.4/plugins/ffmpeg/ffmpeg.h`
		`- @@ -27,6 +27,7 @@`
		`-`
		`- #include <quicktime/qtprivate.h>`
		`- #include AVCODEC_HEADER`
		`- +#include <libavutil/mem.h>`
		`-`
		`- void quicktime_init_video_codec_ffmpeg(quicktime_codec_t * codec,`
		`- quicktime_video_map_t *vtrack,`

libre/libretools/PKGBUILD

file modified

+6 -3

		`@@ -12,15 +12,17 @@`
		`pkgver=20220118`
		`source=(https://repo.parabola.nu/other/$pkgname/$pkgname-$pkgver.tar.gz{,.sig}`
		`0001-libremakepkg-rw-startdir.patch`
		`- 0002-libremakepkg-pacman_5_2.patch)`
		`+ 0002-libremakepkg-pacman_5_2.patch`
		`+ librefetch-pkgext.patch)`
		`sha256sums=('033fe25cd972296b7fc8b5c05ef048fac296194a3b24e4cf6459544616ada49c'`
		`'SKIP'`
		`'19ed0fd21c9c789dd336b63b22094c45363b6ac5d7d1ab0eecd852d7f00d1883'`
		`- '8986adf14a81b979b2ff4c4e3e76483115c146782e4ba30640649299f98355df')`
		`+ '8986adf14a81b979b2ff4c4e3e76483115c146782e4ba30640649299f98355df'`
		`+ 'SKIP')`
		`validpgpkeys=('99195DD3BB6FE10A2F36ED8445698744D4FFBFC9' # Luke Shumaker`
		`'BFA8008A8265677063B11BF47171986E4B745536') # Andreas Grapentin`

		`- pkgrel=6.2`
		`+ pkgrel=6.3`
		`arch=('any')`
		`makedepends=(ruby-ronn)`
		`checkdepends=(`
		`@@ -36,6 +38,7 @@`
		`cd "$srcdir/$pkgbase-$pkgver"`
		`patch -N -p1 -i $srcdir/0001-libremakepkg-rw-startdir.patch`
		`patch -N -p1 -i $srcdir/0002-libremakepkg-pacman_5_2.patch`
		`+ patch -N -p1 -i $srcdir/librefetch-pkgext.patch`
		`}`

		`build() {`

libre/libretools/librefetch-pkgext.patch

file added

+12

		`@@ -0,0 +1,12 @@`
		`+ Index: libretools-20220118/src/librefetch/librefetch`
		`+ ===================================================================`
		`+ --- libretools-20220118.orig/src/librefetch/librefetch`
		`+ +++ libretools-20220118/src/librefetch/librefetch`
		`+ @@ -221,7 +221,6 @@ doit() {`
		`+ mv -f "$base_dst" "$dst"`
		`+ fi`
		`+ else`
		`+ - export PKGEXT=${base_dst##*/}`
		`+ export PKGDEST=${dst%/*}`
		`+ export pkg_file=$dst`
		`+`

libre/libxfce4ui/PKGBUILD

file modified

+2 -2

		`@@ -1,5 +1,5 @@`
		`- # Maintainer (Arch): Evangelos Foutras <evangelos@foutrelis.com>`
		`- # Contributor (Arch): Xavier Devlamynck <magicrhesus@ouranos.be>`
		`+ # Maintainer (arch): Evangelos Foutras <evangelos@foutrelis.com>`
		`+ # Contributor: Xavier Devlamynck <magicrhesus@ouranos.be>`
		`# Maintainer: André Silva <emulatorman@hyperbola.info>`
		`# Maintainer: Omar Vega Ramos <ovruni@gnu.org.pe>`

libre/licenses/PKGBUILD

file modified

+3 -3

		`@@ -1,6 +1,6 @@`
		`- # Maintainer (Arch): David Runge <dvzrv@archlinux.org>`
		`- # Contributor (Arch): Levente Polyak <anthraxx[at]archlinux[dot]org>`
		`- # Contributor (Arch): Dan McGee <dan@archlinux.org>`
		`+ # Maintainer (arch): David Runge <dvzrv@archlinux.org>`
		`+ # Contributor: Levente Polyak <anthraxx[at]archlinux[dot]org>`
		`+ # Contributor: Dan McGee <dan@archlinux.org>`
		`# Maintainer: Omar Vega Ramos <ovruni@gnu.org.pe>`
		`# Contributor: fauno <fauno@kiwwwi.com.ar>`
		`# Contributor: Luke Shumaker <lukeshu@parabola.nu>`

libre/linux-libre-64/PKGBUILD

file modified

+50

		`@@ -1,5 +1,55 @@`
		`# Maintainers: Parabola hackers <dev@lists.parabola.nu>`

		`+ # Rationale: This package enables to run 64bit kernels with 32bit rootfs.`
		`+ #`
		`+ # For armv7k/aarch64, we have no aarch64 port yet, and the 32bit`
		`+ # kernels don't work for 64bit computers (for instance the dtb for`
		`+ # 64bit computers are not shipped).`
		`+ #`
		`+ # In turn if we can boot Parabola on these computers, it enables`
		`+ # people to work on an aarch64 port more easily as chrooting in 64bit`
		`+ # rootfs from 32bit rootfs work when we have a 64bit kernel (tested on`
		`+ # an x86_64 computer with a Parabola i686 rootfs and a Parabola x86_64`
		`+ # chroot).`
		`+ #`
		`+ # This enable to make rootfs that work on both 64bit and 32bit`
		`+ # computers. In that case the user will still need to select the right`
		`+ # kernel at boot.`
		`+ #`
		`+ # Generally speaking it also enable users to benefit from many of the`
		`+ # improvements of 64bit kernels (ability to chroot in 64bit rootfs,`
		`+ # better security, 4GiB address space per process instead of 3GiB for`
		`+ # 32bit rootfs, etc) without having to reinstall everything. In`
		`+ # addition, there was and is still no conversion guide to convert a`
		`+ # 32bit Parabola installation to 64bit), and in some cases (lot of`
		`+ # self-built software in /usr/local, PostgreSQL database, etc) the`
		`+ # migration to 64bit requires some work.`
		`+ #`
		`+ # As for using i686 for new installation on x86_64 computers, it can`
		`+ # enable people doing that to find and fix bugs on Parabola i686 to`
		`+ # enable people with 32bit-only computers (like Libreboot compatible`
		`+ # I945 Thinkpads) to still be able to use Parabola.`
		`+ #`
		`+ # Having both architectures (arm and x86) in the same PKGBUILD enables`
		`+ # to more widely test this package (if we find issues on x86, they'll`
		`+ # most likely apply to arm as well). Though it can become a problem if`
		`+ # we need different kernel versions for both architectures.`
		`+ #`
		`+ # Status:`
		`+ # - Tested on both arm and x86.`
		`+ # - The build is currently broken on ARM due to a missing cross`
		`+ # compiler for armv7h (it was accidentally removed and it doesn't`
		`+ # build anymore).`
		`+ # - External modules (like Wireguard or tp_smapi) also need to be`
		`+ # cross compiled. So modules for linux-libre-64 need to be added`
		`+ # (like tp_smapi-64) and dkms packages need to be adapted to also`
		`+ # work for this kernel.`
		`+ # - Some software (like building Guix) break with 32bit rootfs and`
		`+ # 64bit kernels due to wrong assumption about the number of bits,`
		`+ # through other software (like building rust with mrustc) work`
		`+ # better (here because we have 3GiB instead of 3GiB of memory per`
		`+ # process). Most software is not affected though.`
		`+`
		`# Based on the linux-libre package`

		`_replacesarchkernel=('linux%') # '%' gets replaced with kernel suffix`

libre/linux-libre-hardened/PKGBUILD

file modified

+5 -8

		`@@ -9,7 +9,7 @@`
		`_replacesoldmodules=() # '%' gets replaced with kernel suffix`

		`pkgbase=linux-libre-hardened`
		`- pkgver=5.18.5.hardened1`
		`+ pkgver=5.18.12.hardened1`
		`pkgrel=1`
		`pkgdesc='Security-Hardened Linux-libre'`
		`url='https://linux-libre.fsfla.org/'`
		`@@ -27,7 +27,6 @@`
		`"https://linux-libre.fsfla.org/pub/linux-libre/releases/${pkgver%.}-gnu/patch-${_srcname##-}-gnu-${pkgver%.*}-gnu.xz"{,.sign}`
		`"https://github.com/anthraxx/linux-hardened/releases/download/${_srctag}/linux-hardened-${_srctag}.patch"{,.sig}`
		`"https://repo.parabola.nu/other/linux-libre/logos/logo_linux_"{clut224.ppm,vga16.ppm,mono.pbm}{,.sig}`
		`- ALSA-memalloc-Drop-x86-specific-hack-for-WC-allocations.patch::https://lore.kernel.org/all/87bkur1nil.wl-tiwai@suse.de/raw`
		`config # the main kernel config file`

		`# maintain the TTY over USB disconnects`
		`@@ -46,9 +45,9 @@`
		`)`
		`sha512sums=('13be3762fffd74c63eeb23b0d34b994a3e5198bfdbda4f013b38f8d3edd24b9bbebe5a4bfde0f5191aa1cf2678e4517f3b5540a40b30ebc05da1f6708cbb98bb'`
		`'SKIP'`
		`- '9355c0f22606c0401e8a01d6e22f0fa6e97b69a9fce6d991235da6430907fb6a788fca30bd48e5cbb743cc4a211a40806c896f660db7432e7bc85ba7634b5d06'`
		`+ '8093255d5508830de397707ad492cdb90c205d8a2eebb3f9b5a2eb32a51493dbfaf27f8fb546faa1bee41b3632c635e9e24b702f54ad4a28ebb10c0b4a7cb196'`
		`'SKIP'`
		`- 'f871eb1e68a382e183951f8e3ddc59b7cf09ddc44e1506282404dc2de11885dca6e21ef998d16cb1b3dd829e0da9096b0d02524939e7290591b52695879f6e0d'`
		`+ '1bd6ae6b24bdabe56c37cc6fac7c6d43bcb2c62acaa8b80710482a94251528e91f6c85ab177f7a49fb7c3e591c64cc2976312e1ba9cd37c6139bd4f44ef1d53e'`
		`'SKIP'`
		`'13cb5bc42542e7b8bb104d5f68253f6609e463b6799800418af33eb0272cc269aaa36163c3e6f0aacbdaaa1d05e2827a4a7c4a08a029238439ed08b89c564bb3'`
		`'SKIP'`
		`@@ -56,8 +55,7 @@`
		`'SKIP'`
		`'267295aa0cea65684968420c68b32f1a66a22d018b9d2b2c1ef14267bcf4cb68aaf7099d073cbfefe6c25c8608bdcbbd45f7ac8893fdcecbf1e621abdfe9ecc1'`
		`'SKIP'`
		`- 'd52c195b0d2ca63238e61f019b392840ad6c163223897e781056f5ac4f78eb8587bed30494729b54329313da525fd4f605b367da420c4a2ef1aaaa1aef5efdbb'`
		`- '903228a7ddb6b504a91125e1af2d89ef3264803731cdd1bc16adab809ac39a42b99c14e360b912cbcc8a61c02a02c5b589aa37d1a8d611adb8c488f4dd1a5fd4'`
		`+ 'db147db1f15f82a365275e9042a47617bb32d4bf9c25575d1151d478a90668b604c26ab415c5438c11a32777d2f63f7fc63ab9d61148b13751470a9971223896'`
		`'02af4dd2a007e41db0c63822c8ab3b80b5d25646af1906dc85d0ad9bb8bbf5236f8e381d7f91cf99ed4b0978c50aee37cb9567cdeef65b7ec3d91b882852b1af'`
		`'b8fe56e14006ab866970ddbd501c054ae37186ddc065bb869cf7d18db8c0d455118d5bda3255fb66a0dde38b544655cfe9040ffe46e41d19830b47959b2fb168')`

		`@@ -108,8 +106,7 @@`

		`build() {`
		`cd $_srcname`
		`- make all`
		`- make htmldocs`
		`+ make htmldocs all`
		`}`

		`_package() {`

libre/linux-libre-hardened/config

file modified

+4 -1

		`@@ -1,6 +1,6 @@`
		`#`
		`# Automatically generated file; DO NOT EDIT.`
		`- # Linux/x86 5.18.5-gnu-hardened1 Kernel Configuration`
		`+ # Linux/x86 5.18.12-gnu-hardened1 Kernel Configuration`
		`#`
		`CONFIG_CC_VERSION_TEXT="gcc (GCC) 12.1.0"`
		`CONFIG_CC_IS_GCC=y`
		`@@ -194,6 +194,8 @@`
		`CONFIG_ARCH_WANT_BATCHED_UNMAP_TLB_FLUSH=y`
		`CONFIG_CC_HAS_INT128=y`
		`CONFIG_CC_IMPLICIT_FALLTHROUGH="-Wimplicit-fallthrough=5"`
		`+ CONFIG_GCC12_NO_ARRAY_BOUNDS=y`
		`+ CONFIG_CC_NO_ARRAY_BOUNDS=y`
		`CONFIG_ARCH_SUPPORTS_INT128=y`
		`CONFIG_NUMA_BALANCING=y`
		`CONFIG_NUMA_BALANCING_DEFAULT_ENABLED=y`
		`@@ -10314,6 +10316,7 @@`
		`CONFIG_CRYPTO_LIB_SM4=m`
		`# end of Crypto library routines`

		`+ CONFIG_LIB_MEMNEQ=y`
		`CONFIG_CRC_CCITT=y`
		`CONFIG_CRC16=m`
		`CONFIG_CRC_T10DIF=y`

libre/linux-libre-lts/0001-ZEN-Add-sysctl-and-CONFIG-to-disallow-unprivileged-C.patch

file modified

+9 -9

		`@@ -1,4 +1,4 @@`
		`- From 0948f6ce6d898c598f8fe88240954e578fdc8387 Mon Sep 17 00:00:00 2001`
		`+ From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001`
		`From: "Jan Alexander Steffens (heftig)" <jan.steffens@gmail.com>`
		`Date: Mon, 16 Sep 2019 04:53:20 +0200`
		`Subject: [PATCH] ZEN: Add sysctl and CONFIG to disallow unprivileged`
		`@@ -14,7 +14,7 @@`
		`5 files changed, 53 insertions(+)`

		`diff --git a/include/linux/user_namespace.h b/include/linux/user_namespace.h`
		`- index 33a4240e6a6f1..82213f9c4c17f 100644`
		`+ index 33a4240e6a6f..82213f9c4c17 100644`
		`--- a/include/linux/user_namespace.h`
		`+++ b/include/linux/user_namespace.h`
		`@@ -139,6 +139,8 @@ static inline void set_rlimit_ucount_max(struct user_namespace *ns,`
		`@@ -36,10 +36,10 @@`
		`{`
		`return &init_user_ns;`
		`diff --git a/init/Kconfig b/init/Kconfig`
		`- index 11f8a845f259d..02b7a0e455a5d 100644`
		`+ index d19ed66aba3b..a67689ca1929 100644`
		`--- a/init/Kconfig`
		`+++ b/init/Kconfig`
		`- @@ -1226,6 +1226,22 @@ config USER_NS`
		`+ @@ -1231,6 +1231,22 @@ config USER_NS`

		`If unsure, say N.`

		`@@ -63,7 +63,7 @@`
		`bool "PID Namespaces"`
		`default y`
		`diff --git a/kernel/fork.c b/kernel/fork.c`
		`- index 10885c649ca42..e0fe98e1afbdb 100644`
		`+ index 89475c994ca9..a00b3f26f241 100644`
		`--- a/kernel/fork.c`
		`+++ b/kernel/fork.c`
		`@@ -98,6 +98,10 @@`
		`@@ -88,7 +88,7 @@`
		`/*`
		`* Thread groups must share signals as well, and detached threads`
		`* can only be started up within the thread group.`
		`- @@ -3056,6 +3064,12 @@ int ksys_unshare(unsigned long unshare_flags)`
		`+ @@ -3066,6 +3074,12 @@ int ksys_unshare(unsigned long unshare_flags)`
		`if (unshare_flags & CLONE_NEWNS)`
		`unshare_flags \|= CLONE_FS;`

		`@@ -102,7 +102,7 @@`
		`if (err)`
		`goto bad_unshare_out;`
		`diff --git a/kernel/sysctl.c b/kernel/sysctl.c`
		`- index 083be6af29d70..42aa3c7835b96 100644`
		`+ index 23c08bf3db58..63ab60778e5d 100644`
		`--- a/kernel/sysctl.c`
		`+++ b/kernel/sysctl.c`
		`@@ -105,6 +105,9 @@`
		`@@ -115,7 +115,7 @@`

		`#if defined(CONFIG_SYSCTL)`

		`- @@ -1949,6 +1952,15 @@ static struct ctl_table kern_table[] = {`
		`+ @@ -1953,6 +1956,15 @@ static struct ctl_table kern_table[] = {`
		`.proc_handler = proc_dointvec,`
		`},`
		`#endif`
		`@@ -132,7 +132,7 @@`
		`{`
		`.procname = "tainted",`
		`diff --git a/kernel/user_namespace.c b/kernel/user_namespace.c`
		`- index 6b2e3ca7ee993..0253002184f1d 100644`
		`+ index 5481ba44a8d6..423ab2563ad7 100644`
		`--- a/kernel/user_namespace.c`
		`+++ b/kernel/user_namespace.c`
		`@@ -21,6 +21,13 @@`

libre/linux-libre-lts/0002-PCI-Add-more-NVIDIA-controllers-to-the-MSI-masking-q.patch ~~libre/linux-libre-lts/0002-PCI_Add_more_NVIDIA_controllers_to_the_MSI_masking_quirk.patch~~

file renamed

+3 -3

		`@@ -1,4 +1,4 @@`
		`- From 0bb6e4f104167b1e283269b46f3bbd30b2d979a7 Mon Sep 17 00:00:00 2001`
		`+ From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001`
		`From: "Jan Alexander Steffens (heftig)" <heftig@archlinux.org>`
		`Date: Thu, 18 Nov 2021 22:53:31 +0100`
		`Subject: [PATCH] PCI: Add more NVIDIA controllers to the MSI masking quirk`
		`@@ -10,10 +10,10 @@`
		`1 file changed, 2 insertions(+)`

		`diff --git a/drivers/pci/quirks.c b/drivers/pci/quirks.c`
		`- index 208fa03acdda0..7fdb7e9c2e12c 100644`
		`+ index 4893b1e82403..6ac303124b69 100644`
		`--- a/drivers/pci/quirks.c`
		`+++ b/drivers/pci/quirks.c`
		`- @@ -5802,3 +5802,5 @@ static void nvidia_ion_ahci_fixup(struct pci_dev *pdev)`
		`+ @@ -5821,3 +5821,5 @@ static void nvidia_ion_ahci_fixup(struct pci_dev *pdev)`
		`pdev->dev_flags \|= PCI_DEV_FLAGS_HAS_MSI_MASKING;`
		`}`
		`DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_NVIDIA, 0x0ab8, nvidia_ion_ahci_fixup);`

libre/linux-libre-lts/0003-iommu-intel-do-deep-dma-unmapping-to-avoid-kernel-fl.patch ~~libre/linux-libre-lts/0003-iommu_intel_do_deep_dma-unmapping_to_avoid_kernel-flooding.patch~~

file renamed

+3 -3

		`@@ -1,4 +1,4 @@`
		`- From 32803dc7c2ffc29db15a46034d818f6e6c5775ef Mon Sep 17 00:00:00 2001`
		`+ From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001`
		`From: Ajay Garg <ajaygargnsit@gmail.com>`
		`Date: Tue, 12 Oct 2021 19:26:53 +0530`
		`Subject: [PATCH] iommu: intel: do deep dma-unmapping, to avoid`
		`@@ -71,10 +71,10 @@`
		`1 file changed, 2 insertions(+)`

		`diff --git a/drivers/iommu/intel/iommu.c b/drivers/iommu/intel/iommu.c`
		`- index 78f8c8e6803e9..d8da48a91ba3b 100644`
		`+ index a1ffb3d6d901..c41788ea1a03 100644`
		`--- a/drivers/iommu/intel/iommu.c`
		`+++ b/drivers/iommu/intel/iommu.c`
		`- @@ -5092,6 +5092,8 @@ static size_t intel_iommu_unmap(struct iommu_domain *domain,`
		`+ @@ -5113,6 +5113,8 @@ static size_t intel_iommu_unmap(struct iommu_domain *domain,`
		`gather->freelist = domain_unmap(dmar_domain, start_pfn,`
		`last_pfn, gather->freelist);`

libre/linux-libre-lts/0004-Bluetooth-btintel-Fix-bdaddress-comparison-with-garb.patch ~~libre/linux-libre-lts/0004-Bluetooth_btintel_Fix_bdaddress_comparison_with_garbage_value.patch~~

file renamed

+3 -3

		`@@ -1,4 +1,4 @@`
		`- From a6d4fb4f5e7fe795d9e3b28b261a0f86f1026d03 Mon Sep 17 00:00:00 2001`
		`+ From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001`
		`From: Kiran K <kiran.k@intel.com>`
		`Date: Wed, 13 Oct 2021 13:35:11 +0530`
		`Subject: [PATCH] Bluetooth: btintel: Fix bdaddress comparison with garbage`
		`@@ -16,7 +16,7 @@`
		`1 file changed, 14 insertions(+), 8 deletions(-)`

		`diff --git a/drivers/bluetooth/btintel.c b/drivers/bluetooth/btintel.c`
		`- index f1705b46fc889..b9055a3e61ed7 100644`
		`+ index d122cc973917..a828fcd05d83 100644`
		`--- a/drivers/bluetooth/btintel.c`
		`+++ b/drivers/bluetooth/btintel.c`
		`@@ -2006,14 +2006,16 @@ static int btintel_prepare_fw_download_tlv(struct hci_dev *hdev,`
		`@@ -44,7 +44,7 @@`
		`}`

		`btintel_get_fw_name_tlv(ver, fwname, sizeof(fwname), "sfi");`
		`- @@ -2303,6 +2305,10 @@ static int btintel_setup_combined(struct hci_dev *hdev)`
		`+ @@ -2309,6 +2311,10 @@ static int btintel_setup_combined(struct hci_dev *hdev)`
		`goto exit_error;`
		`}`

libre/linux-libre-lts/0005-lg-laptop-Recognize-more-models.patch ~~libre/linux-libre-lts/0005-lg-laptop_Recognize_more_models.patch~~

file renamed

+2 -2

		`@@ -1,4 +1,4 @@`
		`- From 72edf8c167268bb68d701f46006ccfdfa5490db8 Mon Sep 17 00:00:00 2001`
		`+ From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001`
		`From: Matan Ziv-Av <matan@svgalib.org>`
		`Date: Tue, 23 Nov 2021 22:14:55 +0200`
		`Subject: [PATCH] lg-laptop: Recognize more models`
		`@@ -12,7 +12,7 @@`
		`1 file changed, 12 insertions(+)`

		`diff --git a/drivers/platform/x86/lg-laptop.c b/drivers/platform/x86/lg-laptop.c`
		`- index 88b551caeaaf4..d6f74d3a7605e 100644`
		`+ index 88b551caeaaf..d6f74d3a7605 100644`
		`--- a/drivers/platform/x86/lg-laptop.c`
		`+++ b/drivers/platform/x86/lg-laptop.c`
		`@@ -658,6 +658,18 @@ static int acpi_add(struct acpi_device *device)`

libre/linux-libre-lts/0006-Fix-NFSv4-mount-regression.patch

file added

+238

		`@@ -0,0 +1,238 @@`
		`+ From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001`
		`+ From: "Jan Alexander Steffens (heftig)" <heftig@archlinux.org>`
		`+ Date: Sat, 6 Aug 2022 22:54:33 +0200`
		`+ Subject: [PATCH] Fix NFSv4 mount regression`
		`+`
		`+ This reverts commit 6f2836341d8a (NFSv4.1 query for fs_location attr on`
		`+ a new file system, 2022-01-12).`
		`+`
		`+ For: https://bugs.archlinux.org/task/73838`
		`+ For: https://bugs.archlinux.org/task/73860`
		`+ ---`
		`+ fs/nfs/client.c \| 7 ----`
		`+ fs/nfs/nfs4_fs.h \| 9 +++--`
		`+ fs/nfs/nfs4proc.c \| 76 ++++++-----------------------------------`
		`+ fs/nfs/nfs4state.c \| 3 +-`
		`+ include/linux/nfs_xdr.h \| 1 -`
		`+ 5 files changed, 15 insertions(+), 81 deletions(-)`
		`+`
		`+ diff --git a/fs/nfs/client.c b/fs/nfs/client.c`
		`+ index 090b16890e3d..551833862171 100644`
		`+ --- a/fs/nfs/client.c`
		`+ +++ b/fs/nfs/client.c`
		`+ @@ -860,13 +860,6 @@ int nfs_probe_fsinfo(struct nfs_server server, struct nfs_fh mntfh, struct nfs`
		`+ server->namelen = pathinfo.max_namelen;`
		`+ }`
		`+`
		`+ - if (clp->rpc_ops->discover_trunking != NULL &&`
		`+ - (server->caps & NFS_CAP_FS_LOCATIONS)) {`
		`+ - error = clp->rpc_ops->discover_trunking(server, mntfh);`
		`+ - if (error < 0)`
		`+ - return error;`
		`+ - }`
		`+ -`
		`+ return 0;`
		`+ }`
		`+ EXPORT_SYMBOL_GPL(nfs_probe_fsinfo);`
		`+ diff --git a/fs/nfs/nfs4_fs.h b/fs/nfs/nfs4_fs.h`
		`+ index f8672a34fd63..36471dd0e82b 100644`
		`+ --- a/fs/nfs/nfs4_fs.h`
		`+ +++ b/fs/nfs/nfs4_fs.h`
		`+ @@ -261,8 +261,8 @@ struct nfs4_state_maintenance_ops {`
		`+ };`
		`+`
		`+ struct nfs4_mig_recovery_ops {`
		`+ - int (get_locations)(struct nfs_server , struct nfs_fh *,`
		`+ - struct nfs4_fs_locations , struct page , const struct cred *);`
		`+ + int (get_locations)(struct inode , struct nfs4_fs_locations *,`
		`+ + struct page , const struct cred );`
		`+ int (fsid_present)(struct inode , const struct cred *);`
		`+ };`
		`+`
		`+ @@ -304,9 +304,8 @@ extern int nfs4_do_close(struct nfs4_state *state, gfp_t gfp_mask, int wait);`
		`+ extern int nfs4_server_capabilities(struct nfs_server server, struct nfs_fh fhandle);`
		`+ extern int nfs4_proc_fs_locations(struct rpc_clnt , struct inode , const struct qstr *,`
		`+ struct nfs4_fs_locations , struct page );`
		`+ -extern int nfs4_proc_get_locations(struct nfs_server , struct nfs_fh ,`
		`+ - struct nfs4_fs_locations *,`
		`+ - struct page page, const struct cred );`
		`+ +extern int nfs4_proc_get_locations(struct inode , struct nfs4_fs_locations ,`
		`+ + struct page page, const struct cred );`
		`+ extern int nfs4_proc_fsid_present(struct inode , const struct cred );`
		`+ extern struct rpc_clnt nfs4_proc_lookup_mountpoint(struct inode ,`
		`+ struct dentry *,`
		`+ diff --git a/fs/nfs/nfs4proc.c b/fs/nfs/nfs4proc.c`
		`+ index cbb39aff8182..3d4dee10cb11 100644`
		`+ --- a/fs/nfs/nfs4proc.c`
		`+ +++ b/fs/nfs/nfs4proc.c`
		`+ @@ -3963,60 +3963,6 @@ int nfs4_server_capabilities(struct nfs_server server, struct nfs_fh fhandle)`
		`+ return err;`
		`+ }`
		`+`
		`+ -static int _nfs4_discover_trunking(struct nfs_server *server,`
		`+ - struct nfs_fh *fhandle)`
		`+ -{`
		`+ - struct nfs4_fs_locations *locations = NULL;`
		`+ - struct page *page;`
		`+ - const struct cred *cred;`
		`+ - struct nfs_client *clp = server->nfs_client;`
		`+ - const struct nfs4_state_maintenance_ops *ops =`
		`+ - clp->cl_mvops->state_renewal_ops;`
		`+ - int status = -ENOMEM;`
		`+ -`
		`+ - cred = ops->get_state_renewal_cred(clp);`
		`+ - if (cred == NULL) {`
		`+ - cred = nfs4_get_clid_cred(clp);`
		`+ - if (cred == NULL)`
		`+ - return -ENOKEY;`
		`+ - }`
		`+ -`
		`+ - page = alloc_page(GFP_KERNEL);`
		`+ - locations = kmalloc(sizeof(struct nfs4_fs_locations), GFP_KERNEL);`
		`+ - if (page == NULL \|\| locations == NULL)`
		`+ - goto out;`
		`+ -`
		`+ - status = nfs4_proc_get_locations(server, fhandle, locations, page,`
		`+ - cred);`
		`+ - if (status)`
		`+ - goto out;`
		`+ -out:`
		`+ - if (page)`
		`+ - __free_page(page);`
		`+ - kfree(locations);`
		`+ - return status;`
		`+ -}`
		`+ -`
		`+ -static int nfs4_discover_trunking(struct nfs_server *server,`
		`+ - struct nfs_fh *fhandle)`
		`+ -{`
		`+ - struct nfs4_exception exception = {`
		`+ - .interruptible = true,`
		`+ - };`
		`+ - struct nfs_client *clp = server->nfs_client;`
		`+ - int err = 0;`
		`+ -`
		`+ - if (!nfs4_has_session(clp))`
		`+ - goto out;`
		`+ - do {`
		`+ - err = nfs4_handle_exception(server,`
		`+ - _nfs4_discover_trunking(server, fhandle),`
		`+ - &exception);`
		`+ - } while (exception.retry);`
		`+ -out:`
		`+ - return err;`
		`+ -}`
		`+ -`
		`+ static int _nfs4_lookup_root(struct nfs_server server, struct nfs_fh fhandle,`
		`+ struct nfs_fsinfo *info)`
		`+ {`
		`+ @@ -7952,18 +7898,18 @@ int nfs4_proc_fs_locations(struct rpc_clnt client, struct inode dir,`
		`+ * appended to this compound to identify the client ID which is`
		`+ * performing recovery.`
		`+ */`
		`+ -static int _nfs40_proc_get_locations(struct nfs_server *server,`
		`+ - struct nfs_fh *fhandle,`
		`+ +static int _nfs40_proc_get_locations(struct inode *inode,`
		`+ struct nfs4_fs_locations *locations,`
		`+ struct page page, const struct cred cred)`
		`+ {`
		`+ + struct nfs_server *server = NFS_SERVER(inode);`
		`+ struct rpc_clnt *clnt = server->client;`
		`+ u32 bitmask[2] = {`
		`+ [0] = FATTR4_WORD0_FSID \| FATTR4_WORD0_FS_LOCATIONS,`
		`+ };`
		`+ struct nfs4_fs_locations_arg args = {`
		`+ .clientid = server->nfs_client->cl_clientid,`
		`+ - .fh = fhandle,`
		`+ + .fh = NFS_FH(inode),`
		`+ .page = page,`
		`+ .bitmask = bitmask,`
		`+ .migration = 1, /* skip LOOKUP */`
		`+ @@ -8009,17 +7955,17 @@ static int _nfs40_proc_get_locations(struct nfs_server *server,`
		`+ * When the client supports GETATTR(fs_locations_info), it can`
		`+ * be plumbed in here.`
		`+ */`
		`+ -static int _nfs41_proc_get_locations(struct nfs_server *server,`
		`+ - struct nfs_fh *fhandle,`
		`+ +static int _nfs41_proc_get_locations(struct inode *inode,`
		`+ struct nfs4_fs_locations *locations,`
		`+ struct page page, const struct cred cred)`
		`+ {`
		`+ + struct nfs_server *server = NFS_SERVER(inode);`
		`+ struct rpc_clnt *clnt = server->client;`
		`+ u32 bitmask[2] = {`
		`+ [0] = FATTR4_WORD0_FSID \| FATTR4_WORD0_FS_LOCATIONS,`
		`+ };`
		`+ struct nfs4_fs_locations_arg args = {`
		`+ - .fh = fhandle,`
		`+ + .fh = NFS_FH(inode),`
		`+ .page = page,`
		`+ .bitmask = bitmask,`
		`+ .migration = 1, /* skip LOOKUP */`
		`+ @@ -8068,28 +8014,27 @@ static int _nfs41_proc_get_locations(struct nfs_server *server,`
		`+ * -NFS4ERR_LEASE_MOVED is returned if the server still has leases`
		`+ * from this client that require migration recovery.`
		`+ */`
		`+ -int nfs4_proc_get_locations(struct nfs_server *server,`
		`+ - struct nfs_fh *fhandle,`
		`+ +int nfs4_proc_get_locations(struct inode *inode,`
		`+ struct nfs4_fs_locations *locations,`
		`+ struct page page, const struct cred cred)`
		`+ {`
		`+ + struct nfs_server *server = NFS_SERVER(inode);`
		`+ struct nfs_client *clp = server->nfs_client;`
		`+ const struct nfs4_mig_recovery_ops *ops =`
		`+ clp->cl_mvops->mig_recovery_ops;`
		`+ struct nfs4_exception exception = {`
		`+ .interruptible = true,`
		`+ };`
		`+ int status;`
		`+`
		`+ dprintk("%s: FSID %llx:%llx on \"%s\"\n", __func__,`
		`+ (unsigned long long)server->fsid.major,`
		`+ (unsigned long long)server->fsid.minor,`
		`+ clp->cl_hostname);`
		`+ - nfs_display_fhandle(fhandle, __func__);`
		`+ + nfs_display_fhandle(NFS_FH(inode), __func__);`
		`+`
		`+ do {`
		`+ - status = ops->get_locations(server, fhandle, locations, page,`
		`+ - cred);`
		`+ + status = ops->get_locations(inode, locations, page, cred);`
		`+ if (status != -NFS4ERR_DELAY)`
		`+ break;`
		`+ nfs4_handle_exception(server, status, &exception);`
		`+ @@ -10586,7 +10531,6 @@ const struct nfs_rpc_ops nfs_v4_clientops = {`
		`+ .free_client = nfs4_free_client,`
		`+ .create_server = nfs4_create_server,`
		`+ .clone_server = nfs_clone_server,`
		`+ - .discover_trunking = nfs4_discover_trunking,`
		`+ };`
		`+`
		`+ static const struct xattr_handler nfs4_xattr_nfs4_acl_handler = {`
		`+ diff --git a/fs/nfs/nfs4state.c b/fs/nfs/nfs4state.c`
		`+ index 83c88b54d712..42707e12d35c 100644`
		`+ --- a/fs/nfs/nfs4state.c`
		`+ +++ b/fs/nfs/nfs4state.c`
		`+ @@ -2098,8 +2098,7 @@ static int nfs4_try_migration(struct nfs_server server, const struct cred cred`
		`+ }`
		`+`
		`+ inode = d_inode(server->super->s_root);`
		`+ - result = nfs4_proc_get_locations(server, NFS_FH(inode), locations,`
		`+ - page, cred);`
		`+ + result = nfs4_proc_get_locations(inode, locations, page, cred);`
		`+ if (result) {`
		`+ dprintk("<-- %s: failed to retrieve fs_locations: %d\n",`
		`+ __func__, result);`
		`+ diff --git a/include/linux/nfs_xdr.h b/include/linux/nfs_xdr.h`
		`+ index ecd74cc34797..e9698b6278a5 100644`
		`+ --- a/include/linux/nfs_xdr.h`
		`+ +++ b/include/linux/nfs_xdr.h`
		`+ @@ -1805,7 +1805,6 @@ struct nfs_rpc_ops {`
		`+ struct nfs_server (create_server)(struct fs_context *);`
		`+ struct nfs_server (clone_server)(struct nfs_server , struct nfs_fh ,`
		`+ struct nfs_fattr *, rpc_authflavor_t);`
		`+ - int (discover_trunking)(struct nfs_server , struct nfs_fh *);`
		`+ };`
		`+`
		`+ /*`

libre/linux-libre-lts/0006_fix_NFSv4_mount_regression.diff

file removed

-243

		`@@ -1,243 +0,0 @@`
		`- From 6f2836341d8a39e1e000572b10959347d7e61fd9 Mon Sep 17 00:00:00 2001`
		`- From: Olga Kornievskaia <kolga@netapp.com>`
		`- Date: Wed, 12 Jan 2022 10:27:38 -0500`
		`- Subject: NFSv4.1 query for fs_location attr on a new file system`
		`-`
		`- [ Upstream commit 1976b2b31462151403c9fc110204fcc2a77bdfd1 ]`
		`-`
		`- Query the server for other possible trunkable locations for a given`
		`- file system on a 4.1+ mount.`
		`-`
		`- v2:`
		`- -- added missing static to nfs4_discover_trunking,`
		`- reported by the kernel test robot`
		`-`
		`- Signed-off-by: Olga Kornievskaia <kolga@netapp.com>`
		`- Signed-off-by: Anna Schumaker <Anna.Schumaker@Netapp.com>`
		`- Signed-off-by: Sasha Levin <sashal@kernel.org>`
		`- ---`
		`- fs/nfs/client.c \| 7 +++++`
		`- fs/nfs/nfs4_fs.h \| 9 +++---`
		`- fs/nfs/nfs4proc.c \| 76 ++++++++++++++++++++++++++++++++++++++++++-------`
		`- fs/nfs/nfs4state.c \| 3 +-`
		`- include/linux/nfs_xdr.h \| 1 +`
		`- 5 files changed, 81 insertions(+), 15 deletions(-)`
		`-`
		`- diff --git a/fs/nfs/client.c b/fs/nfs/client.c`
		`- index 551833862171f..090b16890e3d6 100644`
		`- --- a/fs/nfs/client.c`
		`- +++ b/fs/nfs/client.c`
		`- @@ -860,6 +860,13 @@ int nfs_probe_fsinfo(struct nfs_server server, struct nfs_fh mntfh, struct nfs`
		`- server->namelen = pathinfo.max_namelen;`
		`- }`
		`-`
		`- + if (clp->rpc_ops->discover_trunking != NULL &&`
		`- + (server->caps & NFS_CAP_FS_LOCATIONS)) {`
		`- + error = clp->rpc_ops->discover_trunking(server, mntfh);`
		`- + if (error < 0)`
		`- + return error;`
		`- + }`
		`- +`
		`- return 0;`
		`- }`
		`- EXPORT_SYMBOL_GPL(nfs_probe_fsinfo);`
		`- diff --git a/fs/nfs/nfs4_fs.h b/fs/nfs/nfs4_fs.h`
		`- index ba78df4b13d94..1a048ee653a11 100644`
		`- --- a/fs/nfs/nfs4_fs.h`
		`- +++ b/fs/nfs/nfs4_fs.h`
		`- @@ -261,8 +261,8 @@ struct nfs4_state_maintenance_ops {`
		`- };`
		`-`
		`- struct nfs4_mig_recovery_ops {`
		`- - int (get_locations)(struct inode , struct nfs4_fs_locations *,`
		`- - struct page , const struct cred );`
		`- + int (get_locations)(struct nfs_server , struct nfs_fh *,`
		`- + struct nfs4_fs_locations , struct page , const struct cred *);`
		`- int (fsid_present)(struct inode , const struct cred *);`
		`- };`
		`-`
		`- @@ -303,8 +303,9 @@ extern int nfs4_do_close(struct nfs4_state *state, gfp_t gfp_mask, int wait);`
		`- extern int nfs4_server_capabilities(struct nfs_server server, struct nfs_fh fhandle);`
		`- extern int nfs4_proc_fs_locations(struct rpc_clnt , struct inode , const struct qstr *,`
		`- struct nfs4_fs_locations , struct page );`
		`- -extern int nfs4_proc_get_locations(struct inode , struct nfs4_fs_locations ,`
		`- - struct page page, const struct cred );`
		`- +extern int nfs4_proc_get_locations(struct nfs_server , struct nfs_fh ,`
		`- + struct nfs4_fs_locations *,`
		`- + struct page page, const struct cred );`
		`- extern int nfs4_proc_fsid_present(struct inode , const struct cred );`
		`- extern struct rpc_clnt nfs4_proc_lookup_mountpoint(struct inode ,`
		`- struct dentry *,`
		`- diff --git a/fs/nfs/nfs4proc.c b/fs/nfs/nfs4proc.c`
		`- index 367a1b99b7550..389fa72d4ca98 100644`
		`- --- a/fs/nfs/nfs4proc.c`
		`- +++ b/fs/nfs/nfs4proc.c`
		`- @@ -3952,6 +3952,60 @@ int nfs4_server_capabilities(struct nfs_server server, struct nfs_fh fhandle)`
		`- return err;`
		`- }`
		`-`
		`- +static int _nfs4_discover_trunking(struct nfs_server *server,`
		`- + struct nfs_fh *fhandle)`
		`- +{`
		`- + struct nfs4_fs_locations *locations = NULL;`
		`- + struct page *page;`
		`- + const struct cred *cred;`
		`- + struct nfs_client *clp = server->nfs_client;`
		`- + const struct nfs4_state_maintenance_ops *ops =`
		`- + clp->cl_mvops->state_renewal_ops;`
		`- + int status = -ENOMEM;`
		`- +`
		`- + cred = ops->get_state_renewal_cred(clp);`
		`- + if (cred == NULL) {`
		`- + cred = nfs4_get_clid_cred(clp);`
		`- + if (cred == NULL)`
		`- + return -ENOKEY;`
		`- + }`
		`- +`
		`- + page = alloc_page(GFP_KERNEL);`
		`- + locations = kmalloc(sizeof(struct nfs4_fs_locations), GFP_KERNEL);`
		`- + if (page == NULL \|\| locations == NULL)`
		`- + goto out;`
		`- +`
		`- + status = nfs4_proc_get_locations(server, fhandle, locations, page,`
		`- + cred);`
		`- + if (status)`
		`- + goto out;`
		`- +out:`
		`- + if (page)`
		`- + __free_page(page);`
		`- + kfree(locations);`
		`- + return status;`
		`- +}`
		`- +`
		`- +static int nfs4_discover_trunking(struct nfs_server *server,`
		`- + struct nfs_fh *fhandle)`
		`- +{`
		`- + struct nfs4_exception exception = {`
		`- + .interruptible = true,`
		`- + };`
		`- + struct nfs_client *clp = server->nfs_client;`
		`- + int err = 0;`
		`- +`
		`- + if (!nfs4_has_session(clp))`
		`- + goto out;`
		`- + do {`
		`- + err = nfs4_handle_exception(server,`
		`- + _nfs4_discover_trunking(server, fhandle),`
		`- + &exception);`
		`- + } while (exception.retry);`
		`- +out:`
		`- + return err;`
		`- +}`
		`- +`
		`- static int _nfs4_lookup_root(struct nfs_server server, struct nfs_fh fhandle,`
		`- struct nfs_fsinfo *info)`
		`- {`
		`- @@ -7886,18 +7940,18 @@ int nfs4_proc_fs_locations(struct rpc_clnt client, struct inode dir,`
		`- * appended to this compound to identify the client ID which is`
		`- * performing recovery.`
		`- */`
		`- -static int _nfs40_proc_get_locations(struct inode *inode,`
		`- +static int _nfs40_proc_get_locations(struct nfs_server *server,`
		`- + struct nfs_fh *fhandle,`
		`- struct nfs4_fs_locations *locations,`
		`- struct page page, const struct cred cred)`
		`- {`
		`- - struct nfs_server *server = NFS_SERVER(inode);`
		`- struct rpc_clnt *clnt = server->client;`
		`- u32 bitmask[2] = {`
		`- [0] = FATTR4_WORD0_FSID \| FATTR4_WORD0_FS_LOCATIONS,`
		`- };`
		`- struct nfs4_fs_locations_arg args = {`
		`- .clientid = server->nfs_client->cl_clientid,`
		`- - .fh = NFS_FH(inode),`
		`- + .fh = fhandle,`
		`- .page = page,`
		`- .bitmask = bitmask,`
		`- .migration = 1, /* skip LOOKUP */`
		`- @@ -7943,17 +7997,17 @@ static int _nfs40_proc_get_locations(struct inode *inode,`
		`- * When the client supports GETATTR(fs_locations_info), it can`
		`- * be plumbed in here.`
		`- */`
		`- -static int _nfs41_proc_get_locations(struct inode *inode,`
		`- +static int _nfs41_proc_get_locations(struct nfs_server *server,`
		`- + struct nfs_fh *fhandle,`
		`- struct nfs4_fs_locations *locations,`
		`- struct page page, const struct cred cred)`
		`- {`
		`- - struct nfs_server *server = NFS_SERVER(inode);`
		`- struct rpc_clnt *clnt = server->client;`
		`- u32 bitmask[2] = {`
		`- [0] = FATTR4_WORD0_FSID \| FATTR4_WORD0_FS_LOCATIONS,`
		`- };`
		`- struct nfs4_fs_locations_arg args = {`
		`- - .fh = NFS_FH(inode),`
		`- + .fh = fhandle,`
		`- .page = page,`
		`- .bitmask = bitmask,`
		`- .migration = 1, /* skip LOOKUP */`
		`- @@ -8002,11 +8056,11 @@ static int _nfs41_proc_get_locations(struct inode *inode,`
		`- * -NFS4ERR_LEASE_MOVED is returned if the server still has leases`
		`- * from this client that require migration recovery.`
		`- */`
		`- -int nfs4_proc_get_locations(struct inode *inode,`
		`- +int nfs4_proc_get_locations(struct nfs_server *server,`
		`- + struct nfs_fh *fhandle,`
		`- struct nfs4_fs_locations *locations,`
		`- struct page page, const struct cred cred)`
		`- {`
		`- - struct nfs_server *server = NFS_SERVER(inode);`
		`- struct nfs_client *clp = server->nfs_client;`
		`- const struct nfs4_mig_recovery_ops *ops =`
		`- clp->cl_mvops->mig_recovery_ops;`
		`- @@ -8019,10 +8073,11 @@ int nfs4_proc_get_locations(struct inode *inode,`
		`- (unsigned long long)server->fsid.major,`
		`- (unsigned long long)server->fsid.minor,`
		`- clp->cl_hostname);`
		`- - nfs_display_fhandle(NFS_FH(inode), __func__);`
		`- + nfs_display_fhandle(fhandle, __func__);`
		`-`
		`- do {`
		`- - status = ops->get_locations(inode, locations, page, cred);`
		`- + status = ops->get_locations(server, fhandle, locations, page,`
		`- + cred);`
		`- if (status != -NFS4ERR_DELAY)`
		`- break;`
		`- nfs4_handle_exception(server, status, &exception);`
		`- @@ -10516,6 +10571,7 @@ const struct nfs_rpc_ops nfs_v4_clientops = {`
		`- .free_client = nfs4_free_client,`
		`- .create_server = nfs4_create_server,`
		`- .clone_server = nfs_clone_server,`
		`- + .discover_trunking = nfs4_discover_trunking,`
		`- };`
		`-`
		`- static const struct xattr_handler nfs4_xattr_nfs4_acl_handler = {`
		`- diff --git a/fs/nfs/nfs4state.c b/fs/nfs/nfs4state.c`
		`- index acc1cd3e63a48..51f5cb41e87a4 100644`
		`- --- a/fs/nfs/nfs4state.c`
		`- +++ b/fs/nfs/nfs4state.c`
		`- @@ -2097,7 +2097,8 @@ static int nfs4_try_migration(struct nfs_server server, const struct cred cred`
		`- }`
		`-`
		`- inode = d_inode(server->super->s_root);`
		`- - result = nfs4_proc_get_locations(inode, locations, page, cred);`
		`- + result = nfs4_proc_get_locations(server, NFS_FH(inode), locations,`
		`- + page, cred);`
		`- if (result) {`
		`- dprintk("<-- %s: failed to retrieve fs_locations: %d\n",`
		`- __func__, result);`
		`- diff --git a/include/linux/nfs_xdr.h b/include/linux/nfs_xdr.h`
		`- index e9698b6278a52..ecd74cc347974 100644`
		`- --- a/include/linux/nfs_xdr.h`
		`- +++ b/include/linux/nfs_xdr.h`
		`- @@ -1805,6 +1805,7 @@ struct nfs_rpc_ops {`
		`- struct nfs_server (create_server)(struct fs_context *);`
		`- struct nfs_server (clone_server)(struct nfs_server , struct nfs_fh ,`
		`- struct nfs_fattr *, rpc_authflavor_t);`
		`- + int (discover_trunking)(struct nfs_server , struct nfs_fh *);`
		`- };`
		`-`
		`- /*`
		`- --`
		`- cgit`
		`-`

libre/linux-libre-lts/PKGBUILD

file modified

+27 -30

		`@@ -14,11 +14,11 @@`
		`_replacesoldmodules=() # '%' gets replaced with kernel suffix`

		`pkgbase=linux-libre-lts`
		`- pkgver=5.15.41`
		`+ pkgver=5.15.72`
		`pkgrel=1`
		`pkgdesc='LTS Linux-libre'`
		`- rcnver=5.15.32`
		`- rcnrel=armv7-x23-parabola1`
		`+ rcnver=5.15.65`
		`+ rcnrel=armv7-x30-parabola1`
		`url='https://linux-libre.fsfla.org/'`
		`arch=(i686 x86_64 armv7h)`
		`license=(GPL2)`
		`@@ -44,11 +44,11 @@`
		`0002-fix-Atmel-maXTouch-touchscreen-support.patch`
		`# Arch Linux patches`
		`0001-ZEN-Add-sysctl-and-CONFIG-to-disallow-unprivileged-C.patch`
		`- 0002-PCI_Add_more_NVIDIA_controllers_to_the_MSI_masking_quirk.patch`
		`- 0003-iommu_intel_do_deep_dma-unmapping_to_avoid_kernel-flooding.patch`
		`- 0004-Bluetooth_btintel_Fix_bdaddress_comparison_with_garbage_value.patch`
		`- 0005-lg-laptop_Recognize_more_models.patch`
		`- 0006_fix_NFSv4_mount_regression.diff`
		`+ 0002-PCI-Add-more-NVIDIA-controllers-to-the-MSI-masking-q.patch`
		`+ 0003-iommu-intel-do-deep-dma-unmapping-to-avoid-kernel-fl.patch`
		`+ 0004-Bluetooth-btintel-Fix-bdaddress-comparison-with-garb.patch`
		`+ 0005-lg-laptop-Recognize-more-models.patch`
		`+ 0006-Fix-NFSv4-mount-regression.patch`
		`)`
		`source_i686=(`
		`# avoid using zstd compression in ultra mode (exhausts virtual memory)`
		`@@ -64,7 +64,7 @@`
		`)`
		`sha512sums=('3c586054285ea0cb4d1a1ff257757d092db80c2413dcec6e58c63b22490d42b8f2c441cee62839603599d5ad75fbd7560bf51ec6c2f3ab9354adae0c2c7234e5'`
		`'SKIP'`
		`- '1e3c1db11bb929aad451f471a76a9b6b2df57bf9406bc0e9c21843710cf044cd8fc69c188f828170217a59babebc11fb009be6285408c6191c7ba07bb4d99703'`
		`+ '1206352595a73ab89215042a17c79acddd36cd9d2137e5e7b1b17b386583fdd2e3f4d4249779f8f487969d538ee42fdb773caccfa85dfe70c84f4530770705fb'`
		`'SKIP'`
		`'13cb5bc42542e7b8bb104d5f68253f6609e463b6799800418af33eb0272cc269aaa36163c3e6f0aacbdaaa1d05e2827a4a7c4a08a029238439ed08b89c564bb3'`
		`'SKIP'`
		`@@ -72,20 +72,20 @@`
		`'SKIP'`
		`'267295aa0cea65684968420c68b32f1a66a22d018b9d2b2c1ef14267bcf4cb68aaf7099d073cbfefe6c25c8608bdcbbd45f7ac8893fdcecbf1e621abdfe9ecc1'`
		`'SKIP'`
		`- '77c635568092ced8298b17ee03dc084ad926b2d9b29b595acacc09df887cbd1d57bff988f095b1b618dcc39e511b044d129de19a45b3b38398c5f432733b9b09'`
		`- 'f37400fd78d966e5ac698de2187f8ad1982a7916cd8cf385a27341db49900e1cb8853275a5f768026af5ae92036ee63f6252688ab2c9d5560b923fee113471e8'`
		`+ '512bf43e4da8d49aa0d3d7ea1fa58eb85957a090dffed0a0a50dcbc38d9707d27ac0fc1ab736d9897127e66c02b6d4e4ea34734f89cea31025ffd8bc49f984be'`
		`+ '08ede2ff85770b2a84c571dca1b95f5af57794c0db4697a1a3c6521394df08498a549e369756e68be4dc945fde515fe04e156af9fc1e48890da003253dadcb51'`
		`'f3e5a4e1a8f335570427acc08ee16e834312c6df91ef872533d34d299a6ea1ce46dae4151d9e3e1b1728d8c6d0210276c3d6743a92728dc7a6e00db5b8b5640e'`
		`'53103bf55b957b657039510527df0df01279dec59cda115a4d6454e4135025d4546167fa30bdc99107f232561c1e096d8328609ab5a876cf7017176f92ad3e0b'`
		`'02af4dd2a007e41db0c63822c8ab3b80b5d25646af1906dc85d0ad9bb8bbf5236f8e381d7f91cf99ed4b0978c50aee37cb9567cdeef65b7ec3d91b882852b1af'`
		`'b8fe56e14006ab866970ddbd501c054ae37186ddc065bb869cf7d18db8c0d455118d5bda3255fb66a0dde38b544655cfe9040ffe46e41d19830b47959b2fb168'`
		`- '71de593fa8673e06b90284ea1fe337dff64f0b49477aa2da35d3026457e566c0e08090ae5412b711037cbd66ebc34d9c656ff6d3bbc8ecfd13956b166d2fe589'`
		`- '93b7328fea9046c61f22e4d2a9ac59b5c2181d603ba02024e40cbd2b3970f7c716726f46e789a77185302c10d09fbe35db5333bfc8f20a9f540d49439c6bd69b'`
		`- 'c6ce8e2214cd6a2c664e5e28aea29aea5ccdc07cf73239c5f06dec36121c503543a122cf7455ab6932f3d3c4dd97d0d3f03cc12f660c2541efe7a737dd38883a'`
		`- '606af0fd746e6a31463bcc561bc24a5595334fdb59cb6658095a9724f2645f53e8c36c6a353f8c46f3731544ea296ceacf093e077499589b49e7765682fd32ff'`
		`- '670843b65e762602785f6906d55af47ad4fc04f9a0d229fe59fcd0c9c6fd219e55b484c1be4e0989aaf1efa4e00136a38d4b3f354b5bd1dabe41efbefd9dc6e4'`
		`- 'f7c051fb8e334ab5f6aa40a381c8626e1f5dae5ce311c27b4a1737fa75a4b17e05c243833f2af5322cef7e9fe3f3fa46cb91be1cff8ebfc787f5c27444b3d1f4')`
		`+ '744c520d22757c3a74918c9757062ced9abaad2e928258cd8c05e2a34568a971cd4eb7b90c659bf11d8d02a55fddb12b588c3705c5deb93523650092d5414a23'`
		`+ '3f10461af76d9a9e18ee7ef65a0fc77fab6a5ab3191052e121d6137011a5a6c0c64e27d4c4bc84cd90957ef8339675ec002b887ed6f7b180c8907830d82200f6'`
		`+ 'c9faafa40273cce206eb62b0d6bc6fb8212849e44b2469b6a550ad63a7ccc6ca5b210c070736e501c6ed022be768177d17e86b4a6c998d52550aaa30c0245149'`
		`+ '3cbd384d580c5e7ffebd87a60b392bca1529111e61f1a04b9d929ce6ccd19bef633374bd99c52cd30b409647401dd700d5c666baeacc84c4e4dac26d589287c4'`
		`+ 'db407291aa5bd0e9077f63fcf87037167e5c5a668a41a3d54c9e85479763f31e949a6424d13157dc6a3acff2d3a43f9711dfaaf557db7e80e829cd7aa4cf7cb8'`
		`+ '41b558d89a8e75b35015bfa2a9f485e79a4a5842b9d0b5722c3e93aabda007b48e42250d578ed0962cd7d9c7cabe98983b4a50782ff826efb2cd62fe81e634d7')`
		`sha512sums_i686=('3a346ff5e0fdefafd28bc3dd0e4b6cd68e3f0014e59d1611d99f2edb8d074fd32649eeb0894a7e340e4f907b5cfc0e08e0753e0427a68dc113bb22835a892968')`
		`- sha512sums_armv7h=('c7f8995a741181de687b96ef959a3d16df06d2892e3d25811f0c8691d5cb168af8a89ad903c1511fe859b1efbf84870b3445a42c805de772ed5bcef8543d960b'`
		`+ sha512sums_armv7h=('2e88d23c4b9a7df98e14784341ca1a8aafafb4407d6feba144809a3239ac3ef37c3bee93bbd3f94ee9d642e3b42faf8a5f1fa4abafb3d16f119105e4d23e252c'`
		`'SKIP')`

		`_replacesarchkernel=("${_replacesarchkernel[@]/\%/${pkgbase#linux-libre}}")`
		`@@ -113,10 +113,6 @@`
		`install -m644 -t drivers/video/logo \`
		`../logo_linux_{clut224.ppm,vga16.ppm,mono.pbm}`

		`- # fix NFSv4 mounting issue regression - FS#73838 / FS#73860`
		`- # https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/patch/?id=6f2836341d8a39e1e000572b10959347d7e61fd9`
		`- patch -Rp1 -i ../0006_fix_NFSv4_mount_regression.diff`
		`-`
		`echo "Setting version..."`
		`scripts/setlocalversion --save-scmversion`
		`echo "-$pkgrel" > localversion.10-pkgrel`
		`@@ -156,16 +152,15 @@`
		`echo "Setting config..."`
		`cp ../config.$CARCH .config`
		`make olddefconfig`
		`- # diff -u ../config .config \|\| :`
		`- #return 1`
		`+ diff -u ../config.$CARCH .config \|\| :`
		`+`
		`make -s kernelrelease > version`
		`echo "Prepared $pkgbase version $(<version)"`
		`}`

		`build() {`
		`cd $_srcname`
		`- make all`
		`- make htmldocs`
		`+ make htmldocs all`
		`}`

		`_package() {`
		`@@ -173,7 +168,7 @@`
		`depends=(coreutils kmod initramfs)`
		`optdepends=('wireless-regdb: to set the correct wireless channels of your country'`
		`'linux-libre-firmware: firmware images needed for some devices')`
		`- provides=(VIRTUALBOX-GUEST-MODULES WIREGUARD-MODULE)`
		`+ provides=(VIRTUALBOX-GUEST-MODULES WIREGUARD-MODULE KSMBD-MODULE)`
		`replaces=(wireguard-lts)`
		`provides+=("${_replacesarchkernel[@]/%/=$pkgver}" "LINUX-ABI_VERSION=$pkgver")`
		`conflicts+=("${_replacesarchkernel[@]}" "${_replacesoldkernels[@]}" "${_replacesoldmodules[@]}")`
		`@@ -230,13 +225,15 @@`
		`fi`
		`cp -t "$builddir" -a scripts`

		`- # add objtool for external module building and enabled VALIDATION_STACK option`
		`+ # required when STACK_VALIDATION is enabled`
		`if [[ -e tools/objtool/objtool ]]; then`
		`install -Dt "$builddir/tools/objtool" tools/objtool/objtool`
		`fi`

		`- # add xfs and shmem for aufs building`
		`- mkdir -p "$builddir"/{fs/xfs,mm}`
		`+ # required when DEBUG_INFO_BTF_MODULES is enabled`
		`+ if [[ -e tools/bpf/resolve_btfids/resolve_btfids ]]; then`
		`+ install -Dt "$builddir/tools/bpf/resolve_btfids" tools/bpf/resolve_btfids/resolve_btfids`
		`+ fi`

		`echo "Installing headers..."`
		`cp -t "$builddir" -a include`

libre/linux-libre-lts/config.i686

file modified

+148 -83

		`@@ -1,20 +1,21 @@`
		`#`
		`# Automatically generated file; DO NOT EDIT.`
		`- # Linux/x86 5.15.41-gnu Kernel Configuration`
		`+ # Linux/x86 5.15.72-gnu Kernel Configuration`
		`#`
		`- CONFIG_CC_VERSION_TEXT="gcc (GCC) 12.1.0"`
		`+ CONFIG_CC_VERSION_TEXT="gcc (GCC) 12.2.0"`
		`CONFIG_CC_IS_GCC=y`
		`- CONFIG_GCC_VERSION=120100`
		`+ CONFIG_GCC_VERSION=120200`
		`CONFIG_CLANG_VERSION=0`
		`CONFIG_AS_IS_GNU=y`
		`- CONFIG_AS_VERSION=23800`
		`+ CONFIG_AS_VERSION=23900`
		`CONFIG_LD_IS_BFD=y`
		`- CONFIG_LD_VERSION=23800`
		`+ CONFIG_LD_VERSION=23900`
		`CONFIG_LLD_VERSION=0`
		`CONFIG_CC_CAN_LINK=y`
		`CONFIG_CC_CAN_LINK_STATIC=y`
		`CONFIG_CC_HAS_ASM_GOTO=y`
		`CONFIG_CC_HAS_ASM_GOTO_OUTPUT=y`
		`+ CONFIG_CC_HAS_ASM_GOTO_TIED_OUTPUT=y`
		`CONFIG_CC_HAS_ASM_INLINE=y`
		`CONFIG_CC_HAS_NO_PROFILE_FN_ATTR=y`
		`CONFIG_IRQ_WORK=y`
		`@@ -114,7 +115,7 @@`
		`CONFIG_BPF_JIT=y`
		`CONFIG_BPF_JIT_ALWAYS_ON=y`
		`CONFIG_BPF_JIT_DEFAULT_ON=y`
		`- # CONFIG_BPF_UNPRIV_DEFAULT_OFF is not set`
		`+ CONFIG_BPF_UNPRIV_DEFAULT_OFF=y`
		`# CONFIG_BPF_PRELOAD is not set`
		`CONFIG_BPF_LSM=y`
		`# end of BPF subsystem`
		`@@ -122,7 +123,7 @@`
		`CONFIG_PREEMPT_NONE=y`
		`# CONFIG_PREEMPT_VOLUNTARY is not set`
		`# CONFIG_PREEMPT is not set`
		`- # CONFIG_SCHED_CORE is not set`
		`+ CONFIG_SCHED_CORE=y`

		`#`
		`# CPU/Task time and stats accounting`
		`@@ -328,8 +329,6 @@`
		`CONFIG_X86_FEATURE_NAMES=y`
		`CONFIG_X86_MPPARSE=y`
		`# CONFIG_GOLDFISH is not set`
		`- CONFIG_RETPOLINE=y`
		`- CONFIG_CC_HAS_SLS=y`
		`CONFIG_X86_CPU_RESCTRL=y`
		`# CONFIG_X86_BIGSMP is not set`
		`# CONFIG_X86_EXTENDED_PLATFORM is not set`
		`@@ -486,6 +485,11 @@`
		`CONFIG_MODIFY_LDT_SYSCALL=y`
		`# end of Processor type and features`

		`+ CONFIG_CC_HAS_SLS=y`
		`+ CONFIG_CC_HAS_RETURN_THUNK=y`
		`+ CONFIG_SPECULATION_MITIGATIONS=y`
		`+ CONFIG_RETPOLINE=y`
		`+ CONFIG_RETHUNK=y`
		`CONFIG_ARCH_MHP_MEMMAP_ON_MEMORY_ENABLE=y`

		`#`
		`@@ -727,6 +731,7 @@`
		`CONFIG_HAVE_FUNCTION_ERROR_INJECTION=y`
		`CONFIG_HAVE_NMI=y`
		`CONFIG_TRACE_IRQFLAGS_SUPPORT=y`
		`+ CONFIG_TRACE_IRQFLAGS_NMI_SUPPORT=y`
		`CONFIG_HAVE_ARCH_TRACEHOOK=y`
		`CONFIG_HAVE_DMA_CONTIGUOUS=y`
		`CONFIG_GENERIC_SMP_IDLE_THREAD=y`
		`@@ -1010,7 +1015,9 @@`
		`#`
		`# Data Access Monitoring`
		`#`
		`- # CONFIG_DAMON is not set`
		`+ CONFIG_DAMON=y`
		`+ CONFIG_DAMON_VADDR=y`
		`+ CONFIG_DAMON_DBGFS=y`
		`# end of Data Access Monitoring`
		`# end of Memory Management options`

		`@@ -2889,7 +2896,7 @@`
		`CONFIG_DM_FLAKEY=m`
		`CONFIG_DM_VERITY=m`
		`CONFIG_DM_VERITY_VERIFY_ROOTHASH_SIG=y`
		`- # CONFIG_DM_VERITY_VERIFY_ROOTHASH_SIG_SECONDARY_KEYRING is not set`
		`+ CONFIG_DM_VERITY_VERIFY_ROOTHASH_SIG_SECONDARY_KEYRING=y`
		`CONFIG_DM_VERITY_FEC=y`
		`CONFIG_DM_SWITCH=m`
		`CONFIG_DM_LOG_WRITES=m`
		`@@ -5998,6 +6005,7 @@`
		`CONFIG_VIDEO_V4L2_TPG=m`
		`CONFIG_V4L_PLATFORM_DRIVERS=y`
		`CONFIG_VIDEO_CAFE_CCIC=m`
		`+ # CONFIG_VIDEO_VIA_CAMERA is not set`
		`CONFIG_VIDEO_CADENCE=y`
		`CONFIG_VIDEO_CADENCE_CSI2RX=m`
		`CONFIG_VIDEO_CADENCE_CSI2TX=m`
		`@@ -6617,7 +6625,14 @@`
		`CONFIG_DRM_VBOXVIDEO=m`
		`CONFIG_DRM_GUD=m`
		`CONFIG_DRM_HYPERV=m`
		`- # CONFIG_DRM_LEGACY is not set`
		`+ CONFIG_DRM_LEGACY=y`
		`+ CONFIG_DRM_TDFX=m`
		`+ CONFIG_DRM_R128=m`
		`+ CONFIG_DRM_I810=m`
		`+ CONFIG_DRM_MGA=m`
		`+ CONFIG_DRM_SIS=m`
		`+ CONFIG_DRM_VIA=m`
		`+ CONFIG_DRM_SAVAGE=m`
		`CONFIG_DRM_PANEL_ORIENTATION_QUIRKS=y`

		`#`
		`@@ -6638,61 +6653,102 @@`
		`# CONFIG_FB_FOREIGN_ENDIAN is not set`
		`CONFIG_FB_SYS_FOPS=y`
		`CONFIG_FB_DEFERRED_IO=y`
		`+ CONFIG_FB_HECUBA=m`
		`+ CONFIG_FB_SVGALIB=m`
		`+ CONFIG_FB_BACKLIGHT=m`
		`CONFIG_FB_MODE_HELPERS=y`
		`CONFIG_FB_TILEBLITTING=y`

		`#`
		`# Frame buffer hardware drivers`
		`#`
		`- # CONFIG_FB_CIRRUS is not set`
		`- # CONFIG_FB_PM2 is not set`
		`- # CONFIG_FB_CYBER2000 is not set`
		`- # CONFIG_FB_ARC is not set`
		`- # CONFIG_FB_ASILIANT is not set`
		`- # CONFIG_FB_IMSTT is not set`
		`- # CONFIG_FB_VGA16 is not set`
		`- # CONFIG_FB_UVESA is not set`
		`+ CONFIG_FB_CIRRUS=m`
		`+ CONFIG_FB_PM2=m`
		`+ # CONFIG_FB_PM2_FIFO_DISCONNECT is not set`
		`+ CONFIG_FB_CYBER2000=m`
		`+ CONFIG_FB_CYBER2000_DDC=y`
		`+ CONFIG_FB_ARC=m`
		`+ CONFIG_FB_ASILIANT=y`
		`+ CONFIG_FB_IMSTT=y`
		`+ CONFIG_FB_VGA16=m`
		`+ CONFIG_FB_UVESA=m`
		`CONFIG_FB_VESA=y`
		`CONFIG_FB_EFI=y`
		`- # CONFIG_FB_N411 is not set`
		`- # CONFIG_FB_HGA is not set`
		`- # CONFIG_FB_OPENCORES is not set`
		`- # CONFIG_FB_S1D13XXX is not set`
		`- # CONFIG_FB_NVIDIA is not set`
		`- # CONFIG_FB_RIVA is not set`
		`- # CONFIG_FB_I740 is not set`
		`+ CONFIG_FB_N411=m`
		`+ CONFIG_FB_HGA=m`
		`+ CONFIG_FB_OPENCORES=m`
		`+ CONFIG_FB_S1D13XXX=m`
		`+ CONFIG_FB_NVIDIA=m`
		`+ CONFIG_FB_NVIDIA_I2C=y`
		`+ # CONFIG_FB_NVIDIA_DEBUG is not set`
		`+ CONFIG_FB_NVIDIA_BACKLIGHT=y`
		`+ CONFIG_FB_RIVA=m`
		`+ CONFIG_FB_RIVA_I2C=y`
		`+ # CONFIG_FB_RIVA_DEBUG is not set`
		`+ CONFIG_FB_RIVA_BACKLIGHT=y`
		`+ CONFIG_FB_I740=m`
		`CONFIG_FB_I810=m`
		`CONFIG_FB_I810_GTF=y`
		`CONFIG_FB_I810_I2C=y`
		`- # CONFIG_FB_LE80578 is not set`
		`- # CONFIG_FB_MATROX is not set`
		`- # CONFIG_FB_RADEON is not set`
		`- # CONFIG_FB_ATY128 is not set`
		`- # CONFIG_FB_ATY is not set`
		`- # CONFIG_FB_S3 is not set`
		`- # CONFIG_FB_SAVAGE is not set`
		`- # CONFIG_FB_SIS is not set`
		`- # CONFIG_FB_VIA is not set`
		`- # CONFIG_FB_NEOMAGIC is not set`
		`- # CONFIG_FB_KYRO is not set`
		`- # CONFIG_FB_3DFX is not set`
		`- # CONFIG_FB_VOODOO1 is not set`
		`- # CONFIG_FB_VT8623 is not set`
		`- # CONFIG_FB_TRIDENT is not set`
		`- # CONFIG_FB_ARK is not set`
		`- # CONFIG_FB_PM3 is not set`
		`- # CONFIG_FB_CARMINE is not set`
		`- # CONFIG_FB_GEODE is not set`
		`- # CONFIG_FB_SM501 is not set`
		`- # CONFIG_FB_SMSCUFX is not set`
		`- # CONFIG_FB_UDL is not set`
		`- # CONFIG_FB_IBM_GXT4500 is not set`
		`+ CONFIG_FB_LE80578=m`
		`+ CONFIG_FB_CARILLO_RANCH=m`
		`+ CONFIG_FB_MATROX=m`
		`+ CONFIG_FB_MATROX_MILLENIUM=y`
		`+ CONFIG_FB_MATROX_MYSTIQUE=y`
		`+ CONFIG_FB_MATROX_G=y`
		`+ CONFIG_FB_MATROX_I2C=m`
		`+ CONFIG_FB_MATROX_MAVEN=m`
		`+ CONFIG_FB_RADEON=m`
		`+ CONFIG_FB_RADEON_I2C=y`
		`+ CONFIG_FB_RADEON_BACKLIGHT=y`
		`+ # CONFIG_FB_RADEON_DEBUG is not set`
		`+ CONFIG_FB_ATY128=m`
		`+ CONFIG_FB_ATY128_BACKLIGHT=y`
		`+ CONFIG_FB_ATY=m`
		`+ CONFIG_FB_ATY_CT=y`
		`+ CONFIG_FB_ATY_GENERIC_LCD=y`
		`+ CONFIG_FB_ATY_GX=y`
		`+ CONFIG_FB_ATY_BACKLIGHT=y`
		`+ CONFIG_FB_S3=m`
		`+ CONFIG_FB_S3_DDC=y`
		`+ CONFIG_FB_SAVAGE=m`
		`+ CONFIG_FB_SAVAGE_I2C=y`
		`+ CONFIG_FB_SAVAGE_ACCEL=y`
		`+ CONFIG_FB_SIS=m`
		`+ CONFIG_FB_SIS_300=y`
		`+ CONFIG_FB_SIS_315=y`
		`+ CONFIG_FB_VIA=m`
		`+ # CONFIG_FB_VIA_DIRECT_PROCFS is not set`
		`+ CONFIG_FB_VIA_X_COMPATIBILITY=y`
		`+ CONFIG_FB_NEOMAGIC=m`
		`+ CONFIG_FB_KYRO=m`
		`+ CONFIG_FB_3DFX=m`
		`+ CONFIG_FB_3DFX_ACCEL=y`
		`+ CONFIG_FB_3DFX_I2C=y`
		`+ CONFIG_FB_VOODOO1=m`
		`+ CONFIG_FB_VT8623=m`
		`+ CONFIG_FB_TRIDENT=m`
		`+ CONFIG_FB_ARK=m`
		`+ CONFIG_FB_PM3=m`
		`+ CONFIG_FB_CARMINE=m`
		`+ CONFIG_FB_CARMINE_DRAM_EVAL=y`
		`+ # CONFIG_CARMINE_DRAM_CUSTOM is not set`
		`+ CONFIG_FB_GEODE=y`
		`+ CONFIG_FB_GEODE_LX=m`
		`+ CONFIG_FB_GEODE_GX=m`
		`+ CONFIG_FB_GEODE_GX1=m`
		`+ CONFIG_FB_SM501=m`
		`+ CONFIG_FB_SMSCUFX=m`
		`+ CONFIG_FB_UDL=m`
		`+ CONFIG_FB_IBM_GXT4500=m`
		`# CONFIG_FB_VIRTUAL is not set`
		`- # CONFIG_FB_METRONOME is not set`
		`- # CONFIG_FB_MB862XX is not set`
		`- # CONFIG_FB_HYPERV is not set`
		`- # CONFIG_FB_SSD1307 is not set`
		`- # CONFIG_FB_SM712 is not set`
		`+ CONFIG_FB_METRONOME=m`
		`+ CONFIG_FB_MB862XX=m`
		`+ CONFIG_FB_MB862XX_PCI_GDC=y`
		`+ CONFIG_FB_MB862XX_I2C=y`
		`+ CONFIG_FB_HYPERV=m`
		`+ CONFIG_FB_SSD1307=m`
		`+ CONFIG_FB_SM712=m`
		`# end of Frame buffer Devices`

		`#`
		`@@ -6714,6 +6770,7 @@`
		`CONFIG_BACKLIGHT_CLASS_DEVICE=y`
		`CONFIG_BACKLIGHT_KTD253=m`
		`CONFIG_BACKLIGHT_LM3533=m`
		`+ # CONFIG_BACKLIGHT_CARILLO_RANCH is not set`
		`CONFIG_BACKLIGHT_PWM=m`
		`CONFIG_BACKLIGHT_DA903X=m`
		`CONFIG_BACKLIGHT_DA9052=m`
		`@@ -10170,19 +10227,27 @@`
		`# CONFIG_LOCK_DOWN_KERNEL_FORCE_INTEGRITY is not set`
		`# CONFIG_LOCK_DOWN_KERNEL_FORCE_CONFIDENTIALITY is not set`
		`CONFIG_SECURITY_LANDLOCK=y`
		`- # CONFIG_INTEGRITY is not set`
		`+ CONFIG_INTEGRITY=y`
		`+ CONFIG_INTEGRITY_SIGNATURE=y`
		`+ CONFIG_INTEGRITY_ASYMMETRIC_KEYS=y`
		`+ CONFIG_INTEGRITY_TRUSTED_KEYRING=y`
		`+ CONFIG_INTEGRITY_PLATFORM_KEYRING=y`
		`+ CONFIG_LOAD_UEFI_KEYS=y`
		`+ CONFIG_INTEGRITY_AUDIT=y`
		`+ # CONFIG_IMA is not set`
		`+ # CONFIG_IMA_KEYRINGS_PERMIT_SIGNED_BY_BUILTIN_OR_SECONDARY is not set`
		`# CONFIG_IMA_SECURE_AND_OR_TRUSTED_BOOT is not set`
		`+ # CONFIG_EVM is not set`
		`# CONFIG_DEFAULT_SECURITY_SELINUX is not set`
		`# CONFIG_DEFAULT_SECURITY_SMACK is not set`
		`# CONFIG_DEFAULT_SECURITY_TOMOYO is not set`
		`# CONFIG_DEFAULT_SECURITY_APPARMOR is not set`
		`CONFIG_DEFAULT_SECURITY_DAC=y`
		`- CONFIG_LSM="landlock,lockdown,yama,bpf"`
		`+ CONFIG_LSM="landlock,lockdown,yama,integrity,bpf"`

		`#`
		`# Kernel hardening options`
		`#`
		`- CONFIG_GCC_PLUGIN_STRUCTLEAK=y`

		`#`
		`# Memory initialization`
		`@@ -10192,10 +10257,9 @@`
		`# CONFIG_INIT_STACK_NONE is not set`
		`# CONFIG_GCC_PLUGIN_STRUCTLEAK_USER is not set`
		`# CONFIG_GCC_PLUGIN_STRUCTLEAK_BYREF is not set`
		`- CONFIG_GCC_PLUGIN_STRUCTLEAK_BYREF_ALL=y`
		`+ # CONFIG_GCC_PLUGIN_STRUCTLEAK_BYREF_ALL is not set`
		`# CONFIG_INIT_STACK_ALL_PATTERN is not set`
		`- # CONFIG_INIT_STACK_ALL_ZERO is not set`
		`- # CONFIG_GCC_PLUGIN_STRUCTLEAK_VERBOSE is not set`
		`+ CONFIG_INIT_STACK_ALL_ZERO=y`
		`# CONFIG_GCC_PLUGIN_STACKLEAK is not set`
		`CONFIG_INIT_ON_ALLOC_DEFAULT_ON=y`
		`# CONFIG_INIT_ON_FREE_DEFAULT_ON is not set`
		`@@ -10302,7 +10366,6 @@`
		`CONFIG_CRYPTO_CRC32_PCLMUL=m`
		`CONFIG_CRYPTO_XXHASH=m`
		`CONFIG_CRYPTO_BLAKE2B=m`
		`- CONFIG_CRYPTO_BLAKE2S=m`
		`CONFIG_CRYPTO_CRCT10DIF=y`
		`CONFIG_CRYPTO_GHASH=m`
		`CONFIG_CRYPTO_POLY1305=m`
		`@@ -10369,25 +10432,6 @@`
		`# CONFIG_CRYPTO_USER_API_ENABLE_OBSOLETE is not set`
		`CONFIG_CRYPTO_STATS=y`
		`CONFIG_CRYPTO_HASH_INFO=y`
		`-`
		`- #`
		`- # Crypto library routines`
		`- #`
		`- CONFIG_CRYPTO_LIB_AES=y`
		`- CONFIG_CRYPTO_LIB_ARC4=m`
		`- CONFIG_CRYPTO_LIB_BLAKE2S_GENERIC=m`
		`- CONFIG_CRYPTO_LIB_BLAKE2S=m`
		`- CONFIG_CRYPTO_LIB_CHACHA_GENERIC=m`
		`- CONFIG_CRYPTO_LIB_CHACHA=m`
		`- CONFIG_CRYPTO_LIB_CURVE25519_GENERIC=m`
		`- CONFIG_CRYPTO_LIB_CURVE25519=m`
		`- CONFIG_CRYPTO_LIB_DES=m`
		`- CONFIG_CRYPTO_LIB_POLY1305_RSIZE=1`
		`- CONFIG_CRYPTO_LIB_POLY1305_GENERIC=m`
		`- CONFIG_CRYPTO_LIB_POLY1305=m`
		`- CONFIG_CRYPTO_LIB_CHACHA20POLY1305=m`
		`- CONFIG_CRYPTO_LIB_SHA256=y`
		`- CONFIG_CRYPTO_LIB_SM4=m`
		`CONFIG_CRYPTO_HW=y`
		`CONFIG_CRYPTO_DEV_PADLOCK=m`
		`CONFIG_CRYPTO_DEV_PADLOCK_AES=m`
		`@@ -10464,6 +10508,27 @@`
		`CONFIG_GENERIC_IOMAP=y`
		`CONFIG_ARCH_HAS_FAST_MULTIPLIER=y`
		`CONFIG_ARCH_USE_SYM_ANNOTATIONS=y`
		`+`
		`+ #`
		`+ # Crypto library routines`
		`+ #`
		`+ CONFIG_CRYPTO_LIB_AES=y`
		`+ CONFIG_CRYPTO_LIB_ARC4=m`
		`+ CONFIG_CRYPTO_LIB_BLAKE2S_GENERIC=y`
		`+ CONFIG_CRYPTO_LIB_CHACHA_GENERIC=m`
		`+ CONFIG_CRYPTO_LIB_CHACHA=m`
		`+ CONFIG_CRYPTO_LIB_CURVE25519_GENERIC=m`
		`+ CONFIG_CRYPTO_LIB_CURVE25519=m`
		`+ CONFIG_CRYPTO_LIB_DES=m`
		`+ CONFIG_CRYPTO_LIB_POLY1305_RSIZE=1`
		`+ CONFIG_CRYPTO_LIB_POLY1305_GENERIC=m`
		`+ CONFIG_CRYPTO_LIB_POLY1305=m`
		`+ CONFIG_CRYPTO_LIB_CHACHA20POLY1305=m`
		`+ CONFIG_CRYPTO_LIB_SHA256=y`
		`+ CONFIG_CRYPTO_LIB_SM4=m`
		`+ # end of Crypto library routines`
		`+`
		`+ CONFIG_LIB_MEMNEQ=y`
		`CONFIG_CRC_CCITT=y`
		`CONFIG_CRC16=m`
		`CONFIG_CRC_T10DIF=y`
		`@@ -10554,6 +10619,7 @@`
		`CONFIG_CLZ_TAB=y`
		`CONFIG_IRQ_POLL=y`
		`CONFIG_MPILIB=y`
		`+ CONFIG_SIGNATURE=y`
		`CONFIG_DIMLIB=y`
		`CONFIG_OID_REGISTRY=y`
		`CONFIG_UCS2_STRING=y`
		`@@ -10851,7 +10917,6 @@`
		`#`
		`# x86 Debugging`
		`#`
		`- CONFIG_TRACE_IRQFLAGS_NMI_SUPPORT=y`
		`CONFIG_EARLY_PRINTK_USB=y`
		`# CONFIG_X86_VERBOSE_BOOTUP is not set`
		`CONFIG_EARLY_PRINTK=y`
		`@@ -10929,7 +10994,7 @@`
		`# CONFIG_TEST_FPU is not set`
		`# CONFIG_TEST_CLOCKSOURCE_WATCHDOG is not set`
		`CONFIG_ARCH_USE_MEMTEST=y`
		`- # CONFIG_MEMTEST is not set`
		`+ CONFIG_MEMTEST=y`
		`# CONFIG_HYPERV_TESTING is not set`
		`# end of Kernel Testing and Coverage`
		`# end of Kernel hacking`

libre/linux-libre-lts/config.x86_64

file modified

+71 -51

		`@@ -1,20 +1,21 @@`
		`#`
		`# Automatically generated file; DO NOT EDIT.`
		`- # Linux/x86 5.15.41-gnu Kernel Configuration`
		`+ # Linux/x86 5.15.72-gnu Kernel Configuration`
		`#`
		`- CONFIG_CC_VERSION_TEXT="gcc (GCC) 12.1.0"`
		`+ CONFIG_CC_VERSION_TEXT="gcc (GCC) 12.2.0"`
		`CONFIG_CC_IS_GCC=y`
		`- CONFIG_GCC_VERSION=120100`
		`+ CONFIG_GCC_VERSION=120200`
		`CONFIG_CLANG_VERSION=0`
		`CONFIG_AS_IS_GNU=y`
		`- CONFIG_AS_VERSION=23800`
		`+ CONFIG_AS_VERSION=23900`
		`CONFIG_LD_IS_BFD=y`
		`- CONFIG_LD_VERSION=23800`
		`+ CONFIG_LD_VERSION=23900`
		`CONFIG_LLD_VERSION=0`
		`CONFIG_CC_CAN_LINK=y`
		`CONFIG_CC_CAN_LINK_STATIC=y`
		`CONFIG_CC_HAS_ASM_GOTO=y`
		`CONFIG_CC_HAS_ASM_GOTO_OUTPUT=y`
		`+ CONFIG_CC_HAS_ASM_GOTO_TIED_OUTPUT=y`
		`CONFIG_CC_HAS_ASM_INLINE=y`
		`CONFIG_CC_HAS_NO_PROFILE_FN_ATTR=y`
		`CONFIG_IRQ_WORK=y`
		`@@ -116,7 +117,7 @@`
		`CONFIG_BPF_JIT=y`
		`CONFIG_BPF_JIT_ALWAYS_ON=y`
		`CONFIG_BPF_JIT_DEFAULT_ON=y`
		`- # CONFIG_BPF_UNPRIV_DEFAULT_OFF is not set`
		`+ CONFIG_BPF_UNPRIV_DEFAULT_OFF=y`
		`CONFIG_USERMODE_DRIVER=y`
		`CONFIG_BPF_PRELOAD=y`
		`CONFIG_BPF_PRELOAD_UMD=m`
		`@@ -126,7 +127,7 @@`
		`CONFIG_PREEMPT_NONE=y`
		`# CONFIG_PREEMPT_VOLUNTARY is not set`
		`# CONFIG_PREEMPT is not set`
		`- # CONFIG_SCHED_CORE is not set`
		`+ CONFIG_SCHED_CORE=y`

		`#`
		`# CPU/Task time and stats accounting`
		`@@ -344,9 +345,6 @@`
		`CONFIG_X86_X2APIC=y`
		`CONFIG_X86_MPPARSE=y`
		`# CONFIG_GOLDFISH is not set`
		`- CONFIG_RETPOLINE=y`
		`- CONFIG_CC_HAS_SLS=y`
		`- # CONFIG_SLS is not set`
		`CONFIG_X86_CPU_RESCTRL=y`
		`# CONFIG_X86_EXTENDED_PLATFORM is not set`
		`CONFIG_X86_INTEL_LPSS=y`
		`@@ -488,7 +486,9 @@`
		`CONFIG_KEXEC=y`
		`CONFIG_KEXEC_FILE=y`
		`CONFIG_ARCH_HAS_KEXEC_PURGATORY=y`
		`- # CONFIG_KEXEC_SIG is not set`
		`+ CONFIG_KEXEC_SIG=y`
		`+ # CONFIG_KEXEC_SIG_FORCE is not set`
		`+ CONFIG_KEXEC_BZIMAGE_VERIFY_SIG=y`
		`CONFIG_CRASH_DUMP=y`
		`CONFIG_KEXEC_JUMP=y`
		`CONFIG_PHYSICAL_START=0x1000000`
		`@@ -512,6 +512,16 @@`
		`# CONFIG_LIVEPATCH is not set`
		`# end of Processor type and features`

		`+ CONFIG_CC_HAS_SLS=y`
		`+ CONFIG_CC_HAS_RETURN_THUNK=y`
		`+ CONFIG_SPECULATION_MITIGATIONS=y`
		`+ CONFIG_PAGE_TABLE_ISOLATION=y`
		`+ CONFIG_RETPOLINE=y`
		`+ CONFIG_RETHUNK=y`
		`+ CONFIG_CPU_UNRET_ENTRY=y`
		`+ CONFIG_CPU_IBPB_ENTRY=y`
		`+ CONFIG_CPU_IBRS_ENTRY=y`
		`+ CONFIG_SLS=y`
		`CONFIG_ARCH_HAS_ADD_PAGES=y`
		`CONFIG_ARCH_MHP_MEMMAP_ON_MEMORY_ENABLE=y`
		`CONFIG_USE_PERCPU_NUMA_NODE_ID=y`
		`@@ -704,7 +714,7 @@`
		`CONFIG_VIRTUALIZATION=y`
		`CONFIG_KVM=m`
		`CONFIG_KVM_INTEL=m`
		`- # CONFIG_X86_SGX_KVM is not set`
		`+ CONFIG_X86_SGX_KVM=y`
		`CONFIG_KVM_AMD=m`
		`CONFIG_KVM_AMD_SEV=y`
		`CONFIG_KVM_XEN=y`
		`@@ -740,6 +750,7 @@`
		`CONFIG_HAVE_FUNCTION_ERROR_INJECTION=y`
		`CONFIG_HAVE_NMI=y`
		`CONFIG_TRACE_IRQFLAGS_SUPPORT=y`
		`+ CONFIG_TRACE_IRQFLAGS_NMI_SUPPORT=y`
		`CONFIG_HAVE_ARCH_TRACEHOOK=y`
		`CONFIG_HAVE_DMA_CONTIGUOUS=y`
		`CONFIG_GENERIC_SMP_IDLE_THREAD=y`
		`@@ -1062,7 +1073,9 @@`
		`#`
		`# Data Access Monitoring`
		`#`
		`- # CONFIG_DAMON is not set`
		`+ CONFIG_DAMON=y`
		`+ CONFIG_DAMON_VADDR=y`
		`+ CONFIG_DAMON_DBGFS=y`
		`# end of Data Access Monitoring`
		`# end of Memory Management options`

		`@@ -2900,7 +2913,7 @@`
		`CONFIG_DM_FLAKEY=m`
		`CONFIG_DM_VERITY=m`
		`CONFIG_DM_VERITY_VERIFY_ROOTHASH_SIG=y`
		`- # CONFIG_DM_VERITY_VERIFY_ROOTHASH_SIG_SECONDARY_KEYRING is not set`
		`+ CONFIG_DM_VERITY_VERIFY_ROOTHASH_SIG_SECONDARY_KEYRING=y`
		`CONFIG_DM_VERITY_FEC=y`
		`CONFIG_DM_SWITCH=m`
		`CONFIG_DM_LOG_WRITES=m`
		`@@ -4390,8 +4403,8 @@`
		`CONFIG_XILLYBUS=m`
		`CONFIG_XILLYBUS_PCIE=m`
		`CONFIG_XILLYUSB=m`
		`- # CONFIG_RANDOM_TRUST_CPU is not set`
		`- # CONFIG_RANDOM_TRUST_BOOTLOADER is not set`
		`+ CONFIG_RANDOM_TRUST_CPU=y`
		`+ CONFIG_RANDOM_TRUST_BOOTLOADER=y`
		`# end of Character devices`

		`#`
		`@@ -9576,7 +9589,7 @@`
		`CONFIG_HUGETLBFS=y`
		`CONFIG_HUGETLB_PAGE=y`
		`CONFIG_HUGETLB_PAGE_FREE_VMEMMAP=y`
		`- CONFIG_HUGETLB_PAGE_FREE_VMEMMAP_DEFAULT_ON=y`
		`+ # CONFIG_HUGETLB_PAGE_FREE_VMEMMAP_DEFAULT_ON is not set`
		`CONFIG_MEMFD_CREATE=y`
		`CONFIG_ARCH_HAS_GIGANTIC_PAGE=y`
		`CONFIG_CONFIGFS_FS=y`
		`@@ -9828,7 +9841,6 @@`
		`CONFIG_SECURITY=y`
		`CONFIG_SECURITYFS=y`
		`CONFIG_SECURITY_NETWORK=y`
		`- CONFIG_PAGE_TABLE_ISOLATION=y`
		`CONFIG_SECURITY_INFINIBAND=y`
		`CONFIG_SECURITY_NETWORK_XFRM=y`
		`CONFIG_SECURITY_PATH=y`
		`@@ -9872,19 +9884,27 @@`
		`# CONFIG_LOCK_DOWN_KERNEL_FORCE_INTEGRITY is not set`
		`# CONFIG_LOCK_DOWN_KERNEL_FORCE_CONFIDENTIALITY is not set`
		`CONFIG_SECURITY_LANDLOCK=y`
		`- # CONFIG_INTEGRITY is not set`
		`+ CONFIG_INTEGRITY=y`
		`+ CONFIG_INTEGRITY_SIGNATURE=y`
		`+ CONFIG_INTEGRITY_ASYMMETRIC_KEYS=y`
		`+ CONFIG_INTEGRITY_TRUSTED_KEYRING=y`
		`+ CONFIG_INTEGRITY_PLATFORM_KEYRING=y`
		`+ CONFIG_LOAD_UEFI_KEYS=y`
		`+ CONFIG_INTEGRITY_AUDIT=y`
		`+ # CONFIG_IMA is not set`
		`+ # CONFIG_IMA_KEYRINGS_PERMIT_SIGNED_BY_BUILTIN_OR_SECONDARY is not set`
		`# CONFIG_IMA_SECURE_AND_OR_TRUSTED_BOOT is not set`
		`+ # CONFIG_EVM is not set`
		`# CONFIG_DEFAULT_SECURITY_SELINUX is not set`
		`# CONFIG_DEFAULT_SECURITY_SMACK is not set`
		`# CONFIG_DEFAULT_SECURITY_TOMOYO is not set`
		`# CONFIG_DEFAULT_SECURITY_APPARMOR is not set`
		`CONFIG_DEFAULT_SECURITY_DAC=y`
		`- CONFIG_LSM="landlock,lockdown,yama,bpf"`
		`+ CONFIG_LSM="landlock,lockdown,yama,integrity,bpf"`

		`#`
		`# Kernel hardening options`
		`#`
		`- CONFIG_GCC_PLUGIN_STRUCTLEAK=y`

		`#`
		`# Memory initialization`
		`@@ -9894,10 +9914,9 @@`
		`# CONFIG_INIT_STACK_NONE is not set`
		`# CONFIG_GCC_PLUGIN_STRUCTLEAK_USER is not set`
		`# CONFIG_GCC_PLUGIN_STRUCTLEAK_BYREF is not set`
		`- CONFIG_GCC_PLUGIN_STRUCTLEAK_BYREF_ALL=y`
		`+ # CONFIG_GCC_PLUGIN_STRUCTLEAK_BYREF_ALL is not set`
		`# CONFIG_INIT_STACK_ALL_PATTERN is not set`
		`- # CONFIG_INIT_STACK_ALL_ZERO is not set`
		`- # CONFIG_GCC_PLUGIN_STRUCTLEAK_VERBOSE is not set`
		`+ CONFIG_INIT_STACK_ALL_ZERO=y`
		`# CONFIG_GCC_PLUGIN_STACKLEAK is not set`
		`CONFIG_INIT_ON_ALLOC_DEFAULT_ON=y`
		`# CONFIG_INIT_ON_FREE_DEFAULT_ON is not set`
		`@@ -10008,8 +10027,7 @@`
		`CONFIG_CRYPTO_CRC32_PCLMUL=m`
		`CONFIG_CRYPTO_XXHASH=m`
		`CONFIG_CRYPTO_BLAKE2B=m`
		`- CONFIG_CRYPTO_BLAKE2S=m`
		`- CONFIG_CRYPTO_BLAKE2S_X86=m`
		`+ CONFIG_CRYPTO_BLAKE2S_X86=y`
		`CONFIG_CRYPTO_CRCT10DIF=y`
		`CONFIG_CRYPTO_CRCT10DIF_PCLMUL=m`
		`CONFIG_CRYPTO_GHASH=m`
		`@@ -10096,29 +10114,6 @@`
		`# CONFIG_CRYPTO_USER_API_ENABLE_OBSOLETE is not set`
		`CONFIG_CRYPTO_STATS=y`
		`CONFIG_CRYPTO_HASH_INFO=y`
		`-`
		`- #`
		`- # Crypto library routines`
		`- #`
		`- CONFIG_CRYPTO_LIB_AES=y`
		`- CONFIG_CRYPTO_LIB_ARC4=m`
		`- CONFIG_CRYPTO_ARCH_HAVE_LIB_BLAKE2S=m`
		`- CONFIG_CRYPTO_LIB_BLAKE2S_GENERIC=m`
		`- CONFIG_CRYPTO_LIB_BLAKE2S=m`
		`- CONFIG_CRYPTO_ARCH_HAVE_LIB_CHACHA=m`
		`- CONFIG_CRYPTO_LIB_CHACHA_GENERIC=m`
		`- CONFIG_CRYPTO_LIB_CHACHA=m`
		`- CONFIG_CRYPTO_ARCH_HAVE_LIB_CURVE25519=m`
		`- CONFIG_CRYPTO_LIB_CURVE25519_GENERIC=m`
		`- CONFIG_CRYPTO_LIB_CURVE25519=m`
		`- CONFIG_CRYPTO_LIB_DES=m`
		`- CONFIG_CRYPTO_LIB_POLY1305_RSIZE=11`
		`- CONFIG_CRYPTO_ARCH_HAVE_LIB_POLY1305=m`
		`- CONFIG_CRYPTO_LIB_POLY1305_GENERIC=m`
		`- CONFIG_CRYPTO_LIB_POLY1305=m`
		`- CONFIG_CRYPTO_LIB_CHACHA20POLY1305=m`
		`- CONFIG_CRYPTO_LIB_SHA256=y`
		`- CONFIG_CRYPTO_LIB_SM4=m`
		`CONFIG_CRYPTO_HW=y`
		`CONFIG_CRYPTO_DEV_PADLOCK=m`
		`CONFIG_CRYPTO_DEV_PADLOCK_AES=m`
		`@@ -10195,6 +10190,31 @@`
		`CONFIG_ARCH_USE_CMPXCHG_LOCKREF=y`
		`CONFIG_ARCH_HAS_FAST_MULTIPLIER=y`
		`CONFIG_ARCH_USE_SYM_ANNOTATIONS=y`
		`+`
		`+ #`
		`+ # Crypto library routines`
		`+ #`
		`+ CONFIG_CRYPTO_LIB_AES=y`
		`+ CONFIG_CRYPTO_LIB_ARC4=m`
		`+ CONFIG_CRYPTO_ARCH_HAVE_LIB_BLAKE2S=y`
		`+ CONFIG_CRYPTO_LIB_BLAKE2S_GENERIC=y`
		`+ CONFIG_CRYPTO_ARCH_HAVE_LIB_CHACHA=m`
		`+ CONFIG_CRYPTO_LIB_CHACHA_GENERIC=m`
		`+ CONFIG_CRYPTO_LIB_CHACHA=m`
		`+ CONFIG_CRYPTO_ARCH_HAVE_LIB_CURVE25519=m`
		`+ CONFIG_CRYPTO_LIB_CURVE25519_GENERIC=m`
		`+ CONFIG_CRYPTO_LIB_CURVE25519=m`
		`+ CONFIG_CRYPTO_LIB_DES=m`
		`+ CONFIG_CRYPTO_LIB_POLY1305_RSIZE=11`
		`+ CONFIG_CRYPTO_ARCH_HAVE_LIB_POLY1305=m`
		`+ CONFIG_CRYPTO_LIB_POLY1305_GENERIC=m`
		`+ CONFIG_CRYPTO_LIB_POLY1305=m`
		`+ CONFIG_CRYPTO_LIB_CHACHA20POLY1305=m`
		`+ CONFIG_CRYPTO_LIB_SHA256=y`
		`+ CONFIG_CRYPTO_LIB_SM4=m`
		`+ # end of Crypto library routines`
		`+`
		`+ CONFIG_LIB_MEMNEQ=y`
		`CONFIG_CRC_CCITT=y`
		`CONFIG_CRC16=m`
		`CONFIG_CRC_T10DIF=y`
		`@@ -10287,6 +10307,7 @@`
		`CONFIG_CLZ_TAB=y`
		`CONFIG_IRQ_POLL=y`
		`CONFIG_MPILIB=y`
		`+ CONFIG_SIGNATURE=y`
		`CONFIG_DIMLIB=y`
		`CONFIG_OID_REGISTRY=y`
		`CONFIG_UCS2_STRING=y`
		`@@ -10593,7 +10614,6 @@`
		`#`
		`# x86 Debugging`
		`#`
		`- CONFIG_TRACE_IRQFLAGS_NMI_SUPPORT=y`
		`CONFIG_EARLY_PRINTK_USB=y`
		`# CONFIG_X86_VERBOSE_BOOTUP is not set`
		`CONFIG_EARLY_PRINTK=y`
		`@@ -10675,7 +10695,7 @@`
		`# CONFIG_TEST_FPU is not set`
		`# CONFIG_TEST_CLOCKSOURCE_WATCHDOG is not set`
		`CONFIG_ARCH_USE_MEMTEST=y`
		`- # CONFIG_MEMTEST is not set`
		`+ CONFIG_MEMTEST=y`
		`# CONFIG_HYPERV_TESTING is not set`
		`# end of Kernel Testing and Coverage`
		`# end of Kernel hacking`

libre/linux-libre-manpages/PKGBUILD

file modified

+2 -2

		`@@ -1,6 +1,6 @@`
		`# $Id$`
		`- # Maintainer (Arch): Tobias Powalowski <tpowa@archlinux.org>`
		`- # Maintainer (Arch): Thomas Baechler <thomas@archlinux.org>`
		`+ # Maintainer (arch): Tobias Powalowski <tpowa@archlinux.org>`
		`+ # Maintainer (arch): Thomas Baechler <thomas@archlinux.org>`
		`# Contributor: André Silva <emulatorman@hyperbola.info>`

		`# parabola changes and rationale (based on extra/linux-manpages):`

libre/linux-libre-pae/0001-ZEN-Add-sysctl-and-CONFIG-to-disallow-unprivileged-C.patch

file modified

+12 -12

		`@@ -1,7 +1,7 @@`
		`- From 4f6107494a5c5840961a246d8de3c7441d75c6b1 Mon Sep 17 00:00:00 2001`
		`+ From 63cec1d1efdb31caeef17411c7560e8b0f941073 Mon Sep 17 00:00:00 2001`
		`From: "Jan Alexander Steffens (heftig)" <jan.steffens@gmail.com>`
		`Date: Mon, 16 Sep 2019 04:53:20 +0200`
		`- Subject: [PATCH 1/7] ZEN: Add sysctl and CONFIG to disallow unprivileged`
		`+ Subject: [PATCH 1/3] ZEN: Add sysctl and CONFIG to disallow unprivileged`
		`CLONE_NEWUSER`

		`Our default behavior continues to match the vanilla kernel.`
		`@@ -36,10 +36,10 @@`
		`{`
		`return &init_user_ns;`
		`diff --git a/init/Kconfig b/init/Kconfig`
		`- index e9119bf54b1f..a1a5a68aea07 100644`
		`+ index fa63cc019ebf..5aa29feccae3 100644`
		`--- a/init/Kconfig`
		`+++ b/init/Kconfig`
		`- @@ -1231,6 +1231,22 @@ config USER_NS`
		`+ @@ -1249,6 +1249,22 @@ config USER_NS`

		`If unsure, say N.`

		`@@ -63,12 +63,12 @@`
		`bool "PID Namespaces"`
		`default y`
		`diff --git a/kernel/fork.c b/kernel/fork.c`
		`- index f1e89007f228..49144b49a3d1 100644`
		`+ index 0d8abfb9e0f4..bd7c215e315f 100644`
		`--- a/kernel/fork.c`
		`+++ b/kernel/fork.c`
		`- @@ -98,6 +98,10 @@`
		`- #include <linux/io_uring.h>`
		`+ @@ -99,6 +99,10 @@`
		`#include <linux/bpf.h>`
		`+ #include <linux/sched/mm.h>`

		`+#ifdef CONFIG_USER_NS`
		`+#include <linux/user_namespace.h>`
		`@@ -77,7 +77,7 @@`
		`#include <asm/pgalloc.h>`
		`#include <linux/uaccess.h>`
		`#include <asm/mmu_context.h>`
		`- @@ -1922,6 +1926,10 @@ static __latent_entropy struct task_struct *copy_process(`
		`+ @@ -1992,6 +1996,10 @@ static __latent_entropy struct task_struct *copy_process(`
		`if ((clone_flags & (CLONE_NEWUSER\|CLONE_FS)) == (CLONE_NEWUSER\|CLONE_FS))`
		`return ERR_PTR(-EINVAL);`

		`@@ -88,7 +88,7 @@`
		`/*`
		`* Thread groups must share signals as well, and detached threads`
		`* can only be started up within the thread group.`
		`- @@ -3036,6 +3044,12 @@ int ksys_unshare(unsigned long unshare_flags)`
		`+ @@ -3128,6 +3136,12 @@ int ksys_unshare(unsigned long unshare_flags)`
		`if (unshare_flags & CLONE_NEWNS)`
		`unshare_flags \|= CLONE_FS;`

		`@@ -102,7 +102,7 @@`
		`if (err)`
		`goto bad_unshare_out;`
		`diff --git a/kernel/sysctl.c b/kernel/sysctl.c`
		`- index 730ab56d9e92..6cf4e5c36ec9 100644`
		`+ index c42ba2d669dc..a6ddbf02a809 100644`
		`--- a/kernel/sysctl.c`
		`+++ b/kernel/sysctl.c`
		`@@ -91,6 +91,9 @@`
		`@@ -115,7 +115,7 @@`

		`#if defined(CONFIG_SYSCTL)`

		`- @@ -1814,6 +1817,15 @@ static struct ctl_table kern_table[] = {`
		`+ @@ -1806,6 +1809,15 @@ static struct ctl_table kern_table[] = {`
		`.mode = 0644,`
		`.proc_handler = proc_dointvec,`
		`},`
		`@@ -150,5 +150,5 @@`
		`static DEFINE_MUTEX(userns_state_mutex);`

		`--`
		`- 2.36.1`
		`+ 2.37.1`

libre/linux-libre-pae/0002-HID-apple-Properly-handle-function-keys-on-Keychron-.patch

file added

+107

		`@@ -0,0 +1,107 @@`
		`+ From 4b81eecd4c636d953aaf4ebafd8171716f4c61fe Mon Sep 17 00:00:00 2001`
		`+ From: Bryan Cain <bryancain3@gmail.com>`
		`+ Date: Thu, 5 May 2022 13:12:21 -0600`
		`+ Subject: [PATCH 2/3] HID: apple: Properly handle function keys on Keychron`
		`+ keyboards`
		`+ MIME-Version: 1.0`
		`+ Content-Type: text/plain; charset=UTF-8`
		`+ Content-Transfer-Encoding: 8bit`
		`+`
		`+ Keychron's C-series and K-series of keyboards copy the vendor and`
		`+ product IDs of an Apple keyboard, but only behave like that device when`
		`+ set to "Mac" mode. In "Windows" mode, the Fn key doesn't generate a`
		`+ scancode, so it's impossible to use the F1-F12 keys when fnmode is set`
		`+ to its default value of 1.`
		`+`
		`+ To fix this, make fnmode default to the new value of 3, which behaves`
		`+ like fnmode=2 for Keychron keyboards and like fnmode=1 for actual Apple`
		`+ keyboards. This way, Keychron devices are fully usable in both "Windows"`
		`+ and "Mac" modes, while behavior is unchanged for everything else.`
		`+`
		`+ Signed-off-by: Bryan Cain <bryancain3@gmail.com>`
		`+ Reviewed-by: Hans de Goede <hdegoede@redhat.com>`
		`+ Tested-by: José Expósito <jose.exposito89@gmail.com>`
		`+ Signed-off-by: Jiri Kosina <jkosina@suse.cz>`
		`+ ---`
		`+ drivers/hid/hid-apple.c \| 22 ++++++++++++++++++----`
		`+ 1 file changed, 18 insertions(+), 4 deletions(-)`
		`+`
		`+ diff --git a/drivers/hid/hid-apple.c b/drivers/hid/hid-apple.c`
		`+ index 0cf35caee9fa..42a568902f49 100644`
		`+ --- a/drivers/hid/hid-apple.c`
		`+ +++ b/drivers/hid/hid-apple.c`
		`+ @@ -21,6 +21,7 @@`
		`+ #include <linux/module.h>`
		`+ #include <linux/slab.h>`
		`+ #include <linux/timer.h>`
		`+ +#include <linux/string.h>`
		`+`
		`+ #include "hid-ids.h"`
		`+`
		`+ @@ -35,16 +36,17 @@`
		`+ #define APPLE_NUMLOCK_EMULATION BIT(8)`
		`+ #define APPLE_RDESC_BATTERY BIT(9)`
		`+ #define APPLE_BACKLIGHT_CTL BIT(10)`
		`+ +#define APPLE_IS_KEYCHRON BIT(11)`
		`+`
		`+ #define APPLE_FLAG_FKEY 0x01`
		`+`
		`+ #define HID_COUNTRY_INTERNATIONAL_ISO 13`
		`+ #define APPLE_BATTERY_TIMEOUT_MS 60000`
		`+`
		`+ -static unsigned int fnmode = 1;`
		`+ +static unsigned int fnmode = 3;`
		`+ module_param(fnmode, uint, 0644);`
		`+ MODULE_PARM_DESC(fnmode, "Mode of fn key on Apple keyboards (0 = disabled, "`
		`+ - "[1] = fkeyslast, 2 = fkeysfirst)");`
		`+ + "1 = fkeyslast, 2 = fkeysfirst, [3] = auto)");`
		`+`
		`+ static int iso_layout = -1;`
		`+ module_param(iso_layout, int, 0644);`
		`+ @@ -349,6 +351,7 @@ static int hidinput_apple_event(struct hid_device hid, struct input_dev input,`
		`+ const struct apple_key_translation trans, table;`
		`+ bool do_translate;`
		`+ u16 code = 0;`
		`+ + unsigned int real_fnmode;`
		`+`
		`+ u16 fn_keycode = (swap_fn_leftctrl) ? (KEY_LEFTCTRL) : (KEY_FN);`
		`+`
		`+ @@ -359,7 +362,13 @@ static int hidinput_apple_event(struct hid_device hid, struct input_dev input,`
		`+ return 1;`
		`+ }`
		`+`
		`+ - if (fnmode) {`
		`+ + if (fnmode == 3) {`
		`+ + real_fnmode = (asc->quirks & APPLE_IS_KEYCHRON) ? 2 : 1;`
		`+ + } else {`
		`+ + real_fnmode = fnmode;`
		`+ + }`
		`+ +`
		`+ + if (real_fnmode) {`
		`+ if (hid->product == USB_DEVICE_ID_APPLE_ALU_WIRELESS_ANSI \|\|`
		`+ hid->product == USB_DEVICE_ID_APPLE_ALU_WIRELESS_ISO \|\|`
		`+ hid->product == USB_DEVICE_ID_APPLE_ALU_WIRELESS_JIS \|\|`
		`+ @@ -406,7 +415,7 @@ static int hidinput_apple_event(struct hid_device hid, struct input_dev input,`
		`+`
		`+ if (!code) {`
		`+ if (trans->flags & APPLE_FLAG_FKEY) {`
		`+ - switch (fnmode) {`
		`+ + switch (real_fnmode) {`
		`+ case 1:`
		`+ do_translate = !asc->fn_on;`
		`+ break;`
		`+ @@ -660,6 +669,11 @@ static int apple_input_configured(struct hid_device *hdev,`
		`+ asc->quirks &= ~APPLE_HAS_FN;`
		`+ }`
		`+`
		`+ + if (strncmp(hdev->name, "Keychron", 8) == 0) {`
		`+ + hid_info(hdev, "Keychron keyboard detected; function keys will default to fnmode=2 behavior\n");`
		`+ + asc->quirks \|= APPLE_IS_KEYCHRON;`
		`+ + }`
		`+ +`
		`+ return 0;`
		`+ }`
		`+`
		`+ --`
		`+ 2.37.1`
		`+`

libre/linux-libre-pae/0002-random-treat-bootloader-trust-toggle-the-same-way-as.patch

file removed

-94

		`@@ -1,94 +0,0 @@`
		`- From 5e79fc7d70e5c6e409254060066e7ab1b1d1a768 Mon Sep 17 00:00:00 2001`
		`- From: "Jason A. Donenfeld" <Jason@zx2c4.com>`
		`- Date: Wed, 23 Mar 2022 23:09:30 -0600`
		`- Subject: [PATCH 2/7] random: treat bootloader trust toggle the same way as cpu`
		`- trust toggle`
		`-`
		`- If CONFIG_RANDOM_TRUST_CPU is set, the RNG initializes using RDRAND.`
		`- But, the user can disable (or enable) this behavior by setting`
		- `random.trust_cpu=0/1` on the kernel command line. This allows system
		`- builders to do reasonable things while avoiding howls from tinfoil`
		`- hatters. (Or vice versa.)`
		`-`
		`- CONFIG_RANDOM_TRUST_BOOTLOADER is basically the same thing, but regards`
		`- the seed passed via EFI or device tree, which might come from RDRAND or`
		`- a TPM or somewhere else. In order to allow distros to more easily enable`
		`- this while avoiding those same howls (or vice versa), this commit adds`
		- the corresponding `random.trust_bootloader=0/1` toggle.
		`-`
		`- Cc: Theodore Ts'o <tytso@mit.edu>`
		`- Cc: Graham Christensen <graham@grahamc.com>`
		`- Reviewed-by: Ard Biesheuvel <ardb@kernel.org>`
		`- Reviewed-by: Dominik Brodowski <linux@dominikbrodowski.net>`
		`- Link: https://github.com/NixOS/nixpkgs/pull/165355`
		`- Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>`
		`- ---`
		`- Documentation/admin-guide/kernel-parameters.txt \| 6 ++++++`
		`- drivers/char/Kconfig \| 3 ++-`
		`- drivers/char/random.c \| 8 +++++++-`
		`- 3 files changed, 15 insertions(+), 2 deletions(-)`
		`-`
		`- diff --git a/Documentation/admin-guide/kernel-parameters.txt b/Documentation/admin-guide/kernel-parameters.txt`
		`- index 59f881f36779..bdc733c2561d 100644`
		`- --- a/Documentation/admin-guide/kernel-parameters.txt`
		`- +++ b/Documentation/admin-guide/kernel-parameters.txt`
		`- @@ -4355,6 +4355,12 @@`
		`- fully seed the kernel's CRNG. Default is controlled`
		`- by CONFIG_RANDOM_TRUST_CPU.`
		`-`
		`- + random.trust_bootloader={on,off}`
		`- + [KNL] Enable or disable trusting the use of the`
		`- + a seed passed by the bootloader (if available) to`
		`- + fully seed the kernel's CRNG. Default is controlled`
		`- + by CONFIG_RANDOM_TRUST_BOOTLOADER.`
		`- +`
		`- randomize_kstack_offset=`
		`- [KNL] Enable or disable kernel stack offset`
		`- randomization, which provides roughly 5 bits of`
		`- diff --git a/drivers/char/Kconfig b/drivers/char/Kconfig`
		`- index 740811893c57..55f48375e3fe 100644`
		`- --- a/drivers/char/Kconfig`
		`- +++ b/drivers/char/Kconfig`
		`- @@ -449,6 +449,7 @@ config RANDOM_TRUST_BOOTLOADER`
		`- device randomness. Say Y here to assume the entropy provided by the`
		`- booloader is trustworthy so it will be added to the kernel's entropy`
		`- pool. Otherwise, say N here so it will be regarded as device input that`
		`- - only mixes the entropy pool.`
		`- + only mixes the entropy pool. This can also be configured at boot with`
		`- + "random.trust_bootloader=on/off".`
		`-`
		`- endmenu`
		`- diff --git a/drivers/char/random.c b/drivers/char/random.c`
		`- index 3404a91edf29..19bf14e253f7 100644`
		`- --- a/drivers/char/random.c`
		`- +++ b/drivers/char/random.c`
		`- @@ -738,11 +738,17 @@ static void invalidate_batched_entropy(void);`
		`- static void numa_crng_init(void);`
		`-`
		`- static bool trust_cpu __ro_after_init = IS_ENABLED(CONFIG_RANDOM_TRUST_CPU);`
		`- +static bool trust_bootloader __ro_after_init = IS_ENABLED(CONFIG_RANDOM_TRUST_BOOTLOADER);`
		`- static int __init parse_trust_cpu(char *arg)`
		`- {`
		`- return kstrtobool(arg, &trust_cpu);`
		`- }`
		`- +static int __init parse_trust_bootloader(char *arg)`
		`- +{`
		`- + return kstrtobool(arg, &trust_bootloader);`
		`- +}`
		`- early_param("random.trust_cpu", parse_trust_cpu);`
		`- +early_param("random.trust_bootloader", parse_trust_bootloader);`
		`-`
		`- static bool crng_init_try_arch(struct crng_state *crng)`
		`- {`
		`- @@ -2229,7 +2235,7 @@ EXPORT_SYMBOL_GPL(add_hwgenerator_randomness);`
		`- */`
		`- void add_bootloader_randomness(const void *buf, unsigned int size)`
		`- {`
		`- - if (IS_ENABLED(CONFIG_RANDOM_TRUST_BOOTLOADER))`
		`- + if (trust_bootloader)`
		`- add_hwgenerator_randomness(buf, size, size * 8);`
		`- else`
		`- add_device_randomness(buf, size);`
		`- --`
		`- 2.36.1`
		`-`

libre/linux-libre-pae/0003-soundwire-Raise-DEFAULT_PROBE_TIMEOUT-to-10000-ms.patch

file added

+26

		`@@ -0,0 +1,26 @@`
		`+ From 2da21cf28e573b84e5a5baecc1eda7372322375d Mon Sep 17 00:00:00 2001`
		`+ From: "Jan Alexander Steffens (heftig)" <heftig@archlinux.org>`
		`+ Date: Sat, 23 Jul 2022 11:14:46 +0200`
		`+ Subject: [PATCH 3/3] soundwire: Raise DEFAULT_PROBE_TIMEOUT to 10000 ms`
		`+`
		`+ See: https://github.com/thesofproject/linux/issues/3777#issuecomment-1192655300`
		`+ ---`
		`+ drivers/soundwire/bus.h \| 2 +-`
		`+ 1 file changed, 1 insertion(+), 1 deletion(-)`
		`+`
		`+ diff --git a/drivers/soundwire/bus.h b/drivers/soundwire/bus.h`
		`+ index 7631ef5e71fb..d3ed828daac0 100644`
		`+ --- a/drivers/soundwire/bus.h`
		`+ +++ b/drivers/soundwire/bus.h`
		`+ @@ -5,7 +5,7 @@`
		`+ #define __SDW_BUS_H`
		`+`
		`+ #define DEFAULT_BANK_SWITCH_TIMEOUT 3000`
		`+ -#define DEFAULT_PROBE_TIMEOUT 2000`
		`+ +#define DEFAULT_PROBE_TIMEOUT 10000`
		`+`
		`+ u64 sdw_dmi_override_adr(struct sdw_bus *bus, u64 addr);`
		`+`
		`+ --`
		`+ 2.37.1`
		`+`

libre/linux-libre-pae/0003-tick-Detect-and-fix-jiffies-update-stall.patch

file removed

-86

		`@@ -1,86 +0,0 @@`
		`- From 03b70547975933214e3edcbb3c99e05142172266 Mon Sep 17 00:00:00 2001`
		`- From: Frederic Weisbecker <frederic@kernel.org>`
		`- Date: Wed, 2 Feb 2022 01:01:07 +0100`
		`- Subject: [PATCH 3/7] tick: Detect and fix jiffies update stall`
		`-`
		`- On some rare cases, the timekeeper CPU may be delaying its jiffies`
		`- update duty for a while. Known causes include:`
		`-`
		`- * The timekeeper is waiting on stop_machine in a MULTI_STOP_DISABLE_IRQ`
		`- or MULTI_STOP_RUN state. Disabled interrupts prevent from timekeeping`
		`- updates while waiting for the target CPU to complete its`
		`- stop_machine() callback.`
		`-`
		`- * The timekeeper vcpu has VMEXIT'ed for a long while due to some overload`
		`- on the host.`
		`-`
		`- Detect and fix these situations with emergency timekeeping catchups.`
		`-`
		`- Original-patch-by: Paul E. McKenney <paulmck@kernel.org>`
		`- Signed-off-by: Frederic Weisbecker <frederic@kernel.org>`
		`- Cc: Thomas Gleixner <tglx@linutronix.de>`
		`- ---`
		`- kernel/time/tick-sched.c \| 17 +++++++++++++++++`
		`- kernel/time/tick-sched.h \| 4 ++++`
		`- 2 files changed, 21 insertions(+)`
		`-`
		`- diff --git a/kernel/time/tick-sched.c b/kernel/time/tick-sched.c`
		`- index 5e80ee44c32a..0578c9301b17 100644`
		`- --- a/kernel/time/tick-sched.c`
		`- +++ b/kernel/time/tick-sched.c`
		`- @@ -169,6 +169,8 @@ static ktime_t tick_init_jiffy_update(void)`
		`- return period;`
		`- }`
		`-`
		`- +#define MAX_STALLED_JIFFIES 5`
		`- +`
		`- static void tick_sched_do_timer(struct tick_sched *ts, ktime_t now)`
		`- {`
		`- int cpu = smp_processor_id();`
		`- @@ -196,6 +198,21 @@ static void tick_sched_do_timer(struct tick_sched *ts, ktime_t now)`
		`- if (tick_do_timer_cpu == cpu)`
		`- tick_do_update_jiffies64(now);`
		`-`
		`- + /*`
		`- + * If jiffies update stalled for too long (timekeeper in stop_machine()`
		`- + * or VMEXIT'ed for several msecs), force an update.`
		`- + */`
		`- + if (ts->last_tick_jiffies != jiffies) {`
		`- + ts->stalled_jiffies = 0;`
		`- + ts->last_tick_jiffies = READ_ONCE(jiffies);`
		`- + } else {`
		`- + if (++ts->stalled_jiffies == MAX_STALLED_JIFFIES) {`
		`- + tick_do_update_jiffies64(now);`
		`- + ts->stalled_jiffies = 0;`
		`- + ts->last_tick_jiffies = READ_ONCE(jiffies);`
		`- + }`
		`- + }`
		`- +`
		`- if (ts->inidle)`
		`- ts->got_idle_tick = 1;`
		`- }`
		`- diff --git a/kernel/time/tick-sched.h b/kernel/time/tick-sched.h`
		`- index d952ae393423..504649513399 100644`
		`- --- a/kernel/time/tick-sched.h`
		`- +++ b/kernel/time/tick-sched.h`
		`- @@ -49,6 +49,8 @@ enum tick_nohz_mode {`
		`- * @timer_expires_base: Base time clock monotonic for @timer_expires`
		`- * @next_timer: Expiry time of next expiring timer for debugging purpose only`
		`- * @tick_dep_mask: Tick dependency mask - is set, if someone needs the tick`
		`- + * @last_tick_jiffies: Value of jiffies seen on last tick`
		`- + * @stalled_jiffies: Number of stalled jiffies detected across ticks`
		`- */`
		`- struct tick_sched {`
		`- struct hrtimer sched_timer;`
		`- @@ -77,6 +79,8 @@ struct tick_sched {`
		`- u64 next_timer;`
		`- ktime_t idle_expires;`
		`- atomic_t tick_dep_mask;`
		`- + unsigned long last_tick_jiffies;`
		`- + unsigned int stalled_jiffies;`
		`- };`
		`-`
		`- extern struct tick_sched *tick_get_tick_sched(int cpu);`
		`- --`
		`- 2.36.1`
		`-`

libre/linux-libre-pae/0004-tick-rcu-Remove-obsolete-rcu_needs_cpu-parameters.patch

file removed

-101

		`@@ -1,101 +0,0 @@`
		`- From 1f17192df29b2410380147075754e8f40dc7af5b Mon Sep 17 00:00:00 2001`
		`- From: Frederic Weisbecker <frederic@kernel.org>`
		`- Date: Tue, 8 Feb 2022 17:16:33 +0100`
		`- Subject: [PATCH 4/7] tick/rcu: Remove obsolete rcu_needs_cpu() parameters`
		`-`
		`- With the removal of CONFIG_RCU_FAST_NO_HZ, the parameters in`
		`- rcu_needs_cpu() are not necessary anymore. Simply remove them.`
		`-`
		`- Signed-off-by: Frederic Weisbecker <frederic@kernel.org>`
		`- Cc: Thomas Gleixner <tglx@linutronix.de>`
		`- Cc: Peter Zijlstra <peterz@infradead.org>`
		`- Cc: Paul E. McKenney <paulmck@kernel.org>`
		`- Cc: Paul Menzel <pmenzel@molgen.mpg.de>`
		`- ---`
		`- include/linux/rcutiny.h \| 3 +--`
		`- include/linux/rcutree.h \| 2 +-`
		`- kernel/rcu/tree.c \| 3 +--`
		`- kernel/time/tick-sched.c \| 10 ++++------`
		`- 4 files changed, 7 insertions(+), 11 deletions(-)`
		`-`
		`- diff --git a/include/linux/rcutiny.h b/include/linux/rcutiny.h`
		`- index 858f4d429946..5fed476f977f 100644`
		`- --- a/include/linux/rcutiny.h`
		`- +++ b/include/linux/rcutiny.h`
		`- @@ -64,9 +64,8 @@ static inline void rcu_softirq_qs(void)`
		`- rcu_tasks_qs(current, (preempt)); \`
		`- } while (0)`
		`-`
		`- -static inline int rcu_needs_cpu(u64 basemono, u64 *nextevt)`
		`- +static inline int rcu_needs_cpu(void)`
		`- {`
		`- - *nextevt = KTIME_MAX;`
		`- return 0;`
		`- }`
		`-`
		`- diff --git a/include/linux/rcutree.h b/include/linux/rcutree.h`
		`- index 53209d669400..6cc91291d078 100644`
		`- --- a/include/linux/rcutree.h`
		`- +++ b/include/linux/rcutree.h`
		`- @@ -19,7 +19,7 @@`
		`-`
		`- void rcu_softirq_qs(void);`
		`- void rcu_note_context_switch(bool preempt);`
		`- -int rcu_needs_cpu(u64 basem, u64 *nextevt);`
		`- +int rcu_needs_cpu(void);`
		`- void rcu_cpu_stall_reset(void);`
		`-`
		`- /*`
		`- diff --git a/kernel/rcu/tree.c b/kernel/rcu/tree.c`
		`- index 73a4c9d07b86..5dae0da879ae 100644`
		`- --- a/kernel/rcu/tree.c`
		`- +++ b/kernel/rcu/tree.c`
		`- @@ -1086,9 +1086,8 @@ void rcu_irq_enter_irqson(void)`
		`- * Just check whether or not this CPU has non-offloaded RCU callbacks`
		`- * queued.`
		`- */`
		`- -int rcu_needs_cpu(u64 basemono, u64 *nextevt)`
		`- +int rcu_needs_cpu(void)`
		`- {`
		`- - *nextevt = KTIME_MAX;`
		`- return !rcu_segcblist_empty(&this_cpu_ptr(&rcu_data)->cblist) &&`
		`- !rcu_rdp_is_offloaded(this_cpu_ptr(&rcu_data));`
		`- }`
		`- diff --git a/kernel/time/tick-sched.c b/kernel/time/tick-sched.c`
		`- index 0578c9301b17..4c62fa0f70f1 100644`
		`- --- a/kernel/time/tick-sched.c`
		`- +++ b/kernel/time/tick-sched.c`
		`- @@ -785,7 +785,7 @@ static inline bool local_timer_softirq_pending(void)`
		`-`
		`- static ktime_t tick_nohz_next_event(struct tick_sched *ts, int cpu)`
		`- {`
		`- - u64 basemono, next_tick, next_tmr, next_rcu, delta, expires;`
		`- + u64 basemono, next_tick, delta, expires;`
		`- unsigned long basejiff;`
		`- unsigned int seq;`
		`-`
		`- @@ -808,7 +808,7 @@ static ktime_t tick_nohz_next_event(struct tick_sched *ts, int cpu)`
		`- * minimal delta which brings us back to this place`
		`- * immediately. Lather, rinse and repeat...`
		`- */`
		`- - if (rcu_needs_cpu(basemono, &next_rcu) \|\| arch_needs_cpu() \|\|`
		`- + if (rcu_needs_cpu() \|\| arch_needs_cpu() \|\|`
		`- irq_work_needs_cpu() \|\| local_timer_softirq_pending()) {`
		`- next_tick = basemono + TICK_NSEC;`
		`- } else {`
		`- @@ -819,10 +819,8 @@ static ktime_t tick_nohz_next_event(struct tick_sched *ts, int cpu)`
		`- * disabled this also looks at the next expiring`
		`- * hrtimer.`
		`- */`
		`- - next_tmr = get_next_timer_interrupt(basejiff, basemono);`
		`- - ts->next_timer = next_tmr;`
		`- - /* Take the next rcu event into account */`
		`- - next_tick = next_rcu < next_tmr ? next_rcu : next_tmr;`
		`- + next_tick = get_next_timer_interrupt(basejiff, basemono);`
		`- + ts->next_timer = next_tick;`
		`- }`
		`-`
		`- /*`
		`- --`
		`- 2.36.1`
		`-`

libre/linux-libre-pae/0005-tick-rcu-Stop-allowing-RCU_SOFTIRQ-in-idle.patch

file removed

-119

		`@@ -1,119 +0,0 @@`
		`- From 68deadf9632ac7c3044f20ad630f13dc11cb66ab Mon Sep 17 00:00:00 2001`
		`- From: Frederic Weisbecker <frederic@kernel.org>`
		`- Date: Tue, 8 Feb 2022 17:16:34 +0100`
		`- Subject: [PATCH 5/7] tick/rcu: Stop allowing RCU_SOFTIRQ in idle`
		`-`
		`- RCU_SOFTIRQ used to be special in that it could be raised on purpose`
		`- within the idle path to prevent from stopping the tick. Some code still`
		`- prevents from unnecessary warnings related to this specific behaviour`
		`- while entering in dynticks-idle mode.`
		`-`
		`- However the nohz layout has changed quite a bit in ten years, and the`
		`- removal of CONFIG_RCU_FAST_NO_HZ has been the final straw to this`
		`- safe-conduct. Now the RCU_SOFTIRQ vector is expected to be raised from`
		`- sane places.`
		`-`
		`- A remaining corner case is admitted though when the vector is invoked`
		`- in fragile hotplug path.`
		`-`
		`- Signed-off-by: Frederic Weisbecker <frederic@kernel.org>`
		`- Cc: Thomas Gleixner <tglx@linutronix.de>`
		`- Cc: Peter Zijlstra <peterz@infradead.org>`
		`- Cc: Paul E. McKenney <paulmck@kernel.org>`
		`- Cc: Paul Menzel <pmenzel@molgen.mpg.de>`
		`- ---`
		`- include/linux/interrupt.h \| 8 ++++++-`
		`- kernel/time/tick-sched.c \| 50 +++++++++++++++++++++++++++++++--------`
		`- 2 files changed, 47 insertions(+), 11 deletions(-)`
		`-`
		`- diff --git a/include/linux/interrupt.h b/include/linux/interrupt.h`
		`- index 9367f1cb2e3c..9613326d2f8a 100644`
		`- --- a/include/linux/interrupt.h`
		`- +++ b/include/linux/interrupt.h`
		`- @@ -579,7 +579,13 @@ enum`
		`- NR_SOFTIRQS`
		`- };`
		`-`
		`- -#define SOFTIRQ_STOP_IDLE_MASK (~(1 << RCU_SOFTIRQ))`
		`- +/*`
		`- + * Ignoring the RCU vector after ksoftirqd is parked is fine`
		`- + * because:`
		`- + * 1) rcutree_migrate_callbacks() takes care of the queue.`
		`- + * 2) rcu_report_dead() reports the final quiescent states.`
		`- + */`
		`- +#define SOFTIRQ_HOTPLUG_SAFE_MASK (BIT(RCU_SOFTIRQ))`
		`-`
		`- /* map softirq index to softirq name. update 'softirq_to_name' in`
		`- * kernel/softirq.c when adding a new softirq.`
		`- diff --git a/kernel/time/tick-sched.c b/kernel/time/tick-sched.c`
		`- index 4c62fa0f70f1..3506f6ed790c 100644`
		`- --- a/kernel/time/tick-sched.c`
		`- +++ b/kernel/time/tick-sched.c`
		`- @@ -999,6 +999,45 @@ static void tick_nohz_full_update_tick(struct tick_sched *ts)`
		`- __tick_nohz_full_update_tick(ts, ktime_get());`
		`- }`
		`-`
		`- +/*`
		`- + * A pending softirq outside an IRQ (or softirq disabled section) context`
		`- + * should be waiting for ksoftirqd to handle it. Therefore we shouldn't`
		`- + * reach here due to the need_resched() early check in can_stop_idle_tick().`
		`- + *`
		`- + * However if we are between CPUHP_AP_SMPBOOT_THREADS and CPU_TEARDOWN_CPU on the`
		`- + * cpu_down() process, softirqs can still be raised while ksoftirqd is parked,`
		`- + * triggering the below since wakep_softirqd() is ignored.`
		`- + *`
		`- + */`
		`- +static bool report_idle_softirq(void)`
		`- +{`
		`- + static int ratelimit;`
		`- + unsigned int pending = local_softirq_pending();`
		`- +`
		`- + if (likely(!pending))`
		`- + return false;`
		`- +`
		`- + /* Some softirqs claim to be safe against hotplug and ksoftirqd parking */`
		`- + if (!cpu_active(smp_processor_id())) {`
		`- + pending &= ~SOFTIRQ_HOTPLUG_SAFE_MASK;`
		`- + if (!pending)`
		`- + return false;`
		`- + }`
		`- +`
		`- + if (ratelimit < 10)`
		`- + return false;`
		`- +`
		`- + /* On RT, softirqs handling may be waiting on some lock */`
		`- + if (!local_bh_blocked())`
		`- + return false;`
		`- +`
		`- + pr_warn("NOHZ tick-stop error: local softirq work is pending, handler #%02x!!!\n",`
		`- + pending);`
		`- + ratelimit++;`
		`- +`
		`- + return true;`
		`- +}`
		`- +`
		`- static bool can_stop_idle_tick(int cpu, struct tick_sched *ts)`
		`- {`
		`- /*`
		`- @@ -1025,17 +1064,8 @@ static bool can_stop_idle_tick(int cpu, struct tick_sched *ts)`
		`- if (need_resched())`
		`- return false;`
		`-`
		`- - if (unlikely(local_softirq_pending())) {`
		`- - static int ratelimit;`
		`- -`
		`- - if (ratelimit < 10 && !local_bh_blocked() &&`
		`- - (local_softirq_pending() & SOFTIRQ_STOP_IDLE_MASK)) {`
		`- - pr_warn("NOHZ tick-stop error: Non-RCU local softirq work is pending, handler #%02x!!!\n",`
		`- - (unsigned int) local_softirq_pending());`
		`- - ratelimit++;`
		`- - }`
		`- + if (unlikely(report_idle_softirq()))`
		`- return false;`
		`- - }`
		`-`
		`- if (tick_nohz_full_enabled()) {`
		`- /*`
		`- --`
		`- 2.36.1`
		`-`

libre/linux-libre-pae/0006-lib-irq_poll-Declare-IRQ_POLL-softirq-vector-as-ksof.patch

file removed

-55

		`@@ -1,55 +0,0 @@`
		`- From c4d817dfd4c11840db24143aa39e9e437f05bc33 Mon Sep 17 00:00:00 2001`
		`- From: Frederic Weisbecker <frederic@kernel.org>`
		`- Date: Tue, 8 Feb 2022 17:16:35 +0100`
		`- Subject: [PATCH 6/7] lib/irq_poll: Declare IRQ_POLL softirq vector as`
		`- ksoftirqd-parking safe`
		`-`
		`- The following warning may appear while setting a CPU down:`
		`-`
		`- NOHZ tick-stop error: Non-RCU local softirq work is pending, handler #20!!!`
		`-`
		`- The IRQ_POLL_SOFTIRQ vector can be raised during the hotplug cpu_down()`
		`- path after ksoftirqd is parked and before the CPU actually dies. However`
		`- this is handled afterward at the CPUHP_IRQ_POLL_DEAD stage where the`
		`- queue gets migrated.`
		`-`
		`- Hence this warning can be considered spurious and the vector can join`
		`- the "hotplug-safe" list.`
		`-`
		`- Reported-and-tested-by: Paul Menzel <pmenzel@molgen.mpg.de>`
		`- Signed-off-by: Frederic Weisbecker <frederic@kernel.org>`
		`- Cc: Thomas Gleixner <tglx@linutronix.de>`
		`- Cc: Peter Zijlstra <peterz@infradead.org>`
		`- Cc: Paul E. McKenney <paulmck@kernel.org>`
		`- Cc: Paul Menzel <pmenzel@molgen.mpg.de>`
		`- ---`
		`- include/linux/interrupt.h \| 11 +++++++----`
		`- 1 file changed, 7 insertions(+), 4 deletions(-)`
		`-`
		`- diff --git a/include/linux/interrupt.h b/include/linux/interrupt.h`
		`- index 9613326d2f8a..f40754caaefa 100644`
		`- --- a/include/linux/interrupt.h`
		`- +++ b/include/linux/interrupt.h`
		`- @@ -580,12 +580,15 @@ enum`
		`- };`
		`-`
		`- /*`
		`- - * Ignoring the RCU vector after ksoftirqd is parked is fine`
		`- - * because:`
		`- - * 1) rcutree_migrate_callbacks() takes care of the queue.`
		`- + * The following vectors can be safely ignored after ksoftirqd is parked:`
		`- + *`
		`- + * _ RCU:`
		`- + * 1) rcutree_migrate_callbacks() migrates the queue.`
		`- * 2) rcu_report_dead() reports the final quiescent states.`
		`- + *`
		`- + * _ IRQ_POLL: irq_poll_cpu_dead() migrates the queue`
		`- */`
		`- -#define SOFTIRQ_HOTPLUG_SAFE_MASK (BIT(RCU_SOFTIRQ))`
		`- +#define SOFTIRQ_HOTPLUG_SAFE_MASK (BIT(RCU_SOFTIRQ) \| BIT(IRQ_POLL_SOFTIRQ))`
		`-`
		`- /* map softirq index to softirq name. update 'softirq_to_name' in`
		`- * kernel/softirq.c when adding a new softirq.`
		`- --`
		`- 2.36.1`
		`-`

libre/linux-libre-pae/0007-NFSv4.1-provide-mount-option-to-toggle-trunking-disc.patch

file removed

-81

		`@@ -1,81 +0,0 @@`
		`- From cf8e6ac5eabd91ea2ed8eb7dbf12718bfd5cb9b8 Mon Sep 17 00:00:00 2001`
		`- From: Olga Kornievskaia <kolga@netapp.com>`
		`- Date: Wed, 16 Mar 2022 18:24:26 -0400`
		`- Subject: [PATCH 7/7] NFSv4.1 provide mount option to toggle trunking discovery`
		`-`
		`- Introduce a new mount option -- trunkdiscovery,notrunkdiscovery -- to`
		`- toggle whether or not the client will engage in actively discovery`
		`- of trunking locations.`
		`-`
		`- v2 make notrunkdiscovery default`
		`-`
		`- Signed-off-by: Olga Kornievskaia <kolga@netapp.com>`
		`- Cherry-picked-for: https://bugs.archlinux.org/task/74272`
		`- ---`
		`- fs/nfs/client.c \| 3 ++-`
		`- fs/nfs/fs_context.c \| 8 ++++++++`
		`- include/linux/nfs_fs_sb.h \| 1 +`
		`- 3 files changed, 11 insertions(+), 1 deletion(-)`
		`-`
		`- diff --git a/fs/nfs/client.c b/fs/nfs/client.c`
		`- index d1f34229e11a..e828504cc396 100644`
		`- --- a/fs/nfs/client.c`
		`- +++ b/fs/nfs/client.c`
		`- @@ -857,7 +857,8 @@ static int nfs_probe_fsinfo(struct nfs_server server, struct nfs_fh mntfh, str`
		`- }`
		`-`
		`- if (clp->rpc_ops->discover_trunking != NULL &&`
		`- - (server->caps & NFS_CAP_FS_LOCATIONS)) {`
		`- + (server->caps & NFS_CAP_FS_LOCATIONS &&`
		`- + (server->flags & NFS_MOUNT_TRUNK_DISCOVERY))) {`
		`- error = clp->rpc_ops->discover_trunking(server, mntfh);`
		`- if (error < 0)`
		`- return error;`
		`- diff --git a/fs/nfs/fs_context.c b/fs/nfs/fs_context.c`
		`- index d20891162145..9a16897e8dc6 100644`
		`- --- a/fs/nfs/fs_context.c`
		`- +++ b/fs/nfs/fs_context.c`
		`- @@ -80,6 +80,7 @@ enum nfs_param {`
		`- Opt_source,`
		`- Opt_tcp,`
		`- Opt_timeo,`
		`- + Opt_trunkdiscovery,`
		`- Opt_udp,`
		`- Opt_v,`
		`- Opt_vers,`
		`- @@ -180,6 +181,7 @@ static const struct fs_parameter_spec nfs_fs_parameters[] = {`
		`- fsparam_string("source", Opt_source),`
		`- fsparam_flag ("tcp", Opt_tcp),`
		`- fsparam_u32 ("timeo", Opt_timeo),`
		`- + fsparam_flag_no("trunkdiscovery", Opt_trunkdiscovery),`
		`- fsparam_flag ("udp", Opt_udp),`
		`- fsparam_flag ("v2", Opt_v),`
		`- fsparam_flag ("v3", Opt_v),`
		`- @@ -529,6 +531,12 @@ static int nfs_fs_context_parse_param(struct fs_context *fc,`
		`- else`
		`- ctx->flags &= ~NFS_MOUNT_NOCTO;`
		`- break;`
		`- + case Opt_trunkdiscovery:`
		`- + if (result.negated)`
		`- + ctx->flags &= ~NFS_MOUNT_TRUNK_DISCOVERY;`
		`- + else`
		`- + ctx->flags \|= NFS_MOUNT_TRUNK_DISCOVERY;`
		`- + break;`
		`- case Opt_ac:`
		`- if (result.negated)`
		`- ctx->flags \|= NFS_MOUNT_NOAC;`
		`- diff --git a/include/linux/nfs_fs_sb.h b/include/linux/nfs_fs_sb.h`
		`- index ca0959e51e81..b0e3fd550122 100644`
		`- --- a/include/linux/nfs_fs_sb.h`
		`- +++ b/include/linux/nfs_fs_sb.h`
		`- @@ -151,6 +151,7 @@ struct nfs_server {`
		`- #define NFS_MOUNT_SOFTREVAL 0x800000`
		`- #define NFS_MOUNT_WRITE_EAGER 0x01000000`
		`- #define NFS_MOUNT_WRITE_WAIT 0x02000000`
		`- +#define NFS_MOUNT_TRUNK_DISCOVERY 0x04000000`
		`-`
		`- unsigned int fattr_valid; /* Valid attributes */`
		`- unsigned int caps; /* server capabilities */`
		`- --`
		`- 2.36.1`
		`-`

libre/linux-libre-pae/PKGBUILD

file modified

+11 -20

		`@@ -9,7 +9,7 @@`
		`_replacesoldmodules=() # '%' gets replaced with kernel suffix`

		`pkgbase=linux-libre-pae`
		`- pkgver=5.17.9`
		`+ pkgver=5.18.14`
		`pkgrel=1`
		`pkgdesc='Linux-libre PAE (physical address extension)'`
		`url='https://linux-libre.fsfla.org/'`
		`@@ -20,7 +20,7 @@`
		`xmlto python-sphinx python-sphinx_rtd_theme graphviz imagemagick texlive-latexextra`
		`)`
		`options=('!strip')`
		`- _srcname=linux-5.17`
		`+ _srcname=linux-5.18`
		`source=(`
		`"https://linux-libre.fsfla.org/pub/linux-libre/releases/${_srcname##-}-gnu/linux-libre-${_srcname##-}-gnu.tar.xz"{,.sign}`
		`"https://linux-libre.fsfla.org/pub/linux-libre/releases/$pkgver-gnu/patch-${_srcname##*-}-gnu-$pkgver-gnu.xz"{,.sign}`
		`@@ -36,12 +36,8 @@`
		`0002-fix-Atmel-maXTouch-touchscreen-support.patch`
		`# Arch Linux patches`
		`0001-ZEN-Add-sysctl-and-CONFIG-to-disallow-unprivileged-C.patch`
		`- 0002-random-treat-bootloader-trust-toggle-the-same-way-as.patch`
		`- 0003-tick-Detect-and-fix-jiffies-update-stall.patch`
		`- 0004-tick-rcu-Remove-obsolete-rcu_needs_cpu-parameters.patch`
		`- 0005-tick-rcu-Stop-allowing-RCU_SOFTIRQ-in-idle.patch`
		`- 0006-lib-irq_poll-Declare-IRQ_POLL-softirq-vector-as-ksof.patch`
		`- 0007-NFSv4.1-provide-mount-option-to-toggle-trunking-disc.patch`
		`+ 0002-HID-apple-Properly-handle-function-keys-on-Keychron-.patch`
		`+ 0003-soundwire-Raise-DEFAULT_PROBE_TIMEOUT-to-10000-ms.patch`
		`# Arch Linux 32 patches`
		`no-ultra-zstd.patch`
		`)`
		`@@ -49,9 +45,9 @@`
		`'474402C8C582DAFBE389C427BCB7CF877E7D47A7' # Alexandre Oliva`
		`'6DB9C4B4F0D8C0DC432CF6E4227CA7C556B2BA78' # David P.`
		`)`
		`- sha512sums=('565de7f956e40a931858cb29b61619f25fc57ce588b8762bef806e470d20bbbdf98a6e1c55eccae61a7365c0ecaae4825d81f7eec8689911710949ba5b34ce0c'`
		`+ sha512sums=('13be3762fffd74c63eeb23b0d34b994a3e5198bfdbda4f013b38f8d3edd24b9bbebe5a4bfde0f5191aa1cf2678e4517f3b5540a40b30ebc05da1f6708cbb98bb'`
		`'SKIP'`
		`- '921c4e1eca023c3a0f756ec788188e0d8c5b0622c832516c32e87f964e90769c7072f41785f1bfde1344fcd829332834a959313fd4db69cab20227eeba4141aa'`
		`+ '9016e87060d3ddbf4bad5adee54f07cba3930a23a5c2a7ca32338a98d0c51676228f3d97405c624f2f48a67849f9b40a5dc670e10fbc02bc75cc4d47deab4c34'`
		`'SKIP'`
		`'13cb5bc42542e7b8bb104d5f68253f6609e463b6799800418af33eb0272cc269aaa36163c3e6f0aacbdaaa1d05e2827a4a7c4a08a029238439ed08b89c564bb3'`
		`'SKIP'`
		`@@ -59,16 +55,12 @@`
		`'SKIP'`
		`'267295aa0cea65684968420c68b32f1a66a22d018b9d2b2c1ef14267bcf4cb68aaf7099d073cbfefe6c25c8608bdcbbd45f7ac8893fdcecbf1e621abdfe9ecc1'`
		`'SKIP'`
		`- '55fdec0555ef18aaaba22ff6cdad477c6c80b5dd3b0477b39e7099b3838376f8c3b42e44f579758d8e764d5a4750f6fc8378e2d5b05536cdebb17c13f734c695'`
		`+ '145f8eb30125ee4bf1e2b37027ec762d2a15511dcf7eae3ad09472a682492d8f38fb606b2e81acac557de318a71b6d988b03c8680208b75c2be9bc1483b43e10'`
		`'02af4dd2a007e41db0c63822c8ab3b80b5d25646af1906dc85d0ad9bb8bbf5236f8e381d7f91cf99ed4b0978c50aee37cb9567cdeef65b7ec3d91b882852b1af'`
		`'b8fe56e14006ab866970ddbd501c054ae37186ddc065bb869cf7d18db8c0d455118d5bda3255fb66a0dde38b544655cfe9040ffe46e41d19830b47959b2fb168'`
		`- '9543379c1feba5585196396cc3ca6b9b957b967bdac29c502867ffb502743e1793c4a9ccdca4c30226120793df7bf887fb0cdf365d9304594777c16a0addd63b'`
		`- '37719ac336936ba70ef58d63e409a3df36a06f885205595ee55a20bdb6a801c698cb5412fa19398f375c111634713c4bee1619bf08429830ab02ff5fe257ef6c'`
		`- '44acd1454ad7faa4e993597bff67899a14e85e030f948db8590d12fc4eb05fb732e53e9a96bb59972ec319e54c160bbbee7c1568cdc199342afa4088b4a5eee3'`
		`- '0e1ea62e127883826655fa74c232ef3b8537fe0a1a2c7b89a710f43ce0b7b483e1b5bc14fa44cffae5aaadfd9c5b88b5e326d5feca9bf2fb922844bd6309f855'`
		`- '0c40c8a99e202dd869c54964495fd8005efbbd74679901bd976fa297b8d65554a8071345da3b171ef95d7fd2515588d05f09cf2ca6c86b0bcc9ff0468c997482'`
		`- 'b0c2bef3e76a25640539a6814bf8a120d000995d1d88c80b667b9bd1e489a452da47ee01b96cd0104f0a7627d5ff7ff916506f137f6cd6fb4df4f666bf2d92be'`
		`- '251d94b05ba7b252eef738efd8a5d75ec26df11bcd4e99b468db89cb370f56cc56e949b2fb1a7d00c61ded49fa0e0355551ea98f46662d4220cddacf5640e40b'`
		`+ '671ab29fb1858c3898792164ac49d57103ecdeff220d7b262efb0c74ee270a670cf40f746a76f400513019989d858326fb3da507a0159418215e0b645011c406'`
		`+ '2fecb2fb31981af21e17ce08c8352236f8817e6000f7e542f7479eaa7300238c4581f992b4da4d49dd2657d3e3c038eb0369954559f233b2913c382ef25b5753'`
		`+ '816ad9cb93a473376487234d4bf255f7d081c37186b1715e914c2c30dcdcfaee7b6db4eeb427969190d0cffa7499bc99c95ef58fb8c632d27e51d0350990f0ce'`
		`'bca15cc96f64c38adcd13a46752866b5b30555ac21e19b3f7afcd20fcb7ec585c9d990fe8f842f44d5f69d477d72867fe6a9102729f26f93f5a80b372e41ce85')`

		`_replacesarchkernel=("${_replacesarchkernel[@]/\%/${pkgbase#linux-libre}}")`
		`@@ -116,8 +108,7 @@`

		`build() {`
		`cd $_srcname`
		`- make all`
		`- make htmldocs`
		`+ make htmldocs all`
		`}`

		`_package() {`

libre/linux-libre-pae/config

file modified

+531 -384

		`@@ -1,6 +1,6 @@`
		`#`
		`# Automatically generated file; DO NOT EDIT.`
		`- # Linux/x86 5.17.8-gnu Kernel Configuration`
		`+ # Linux/x86 5.18.14-gnu Kernel Configuration`
		`#`
		`CONFIG_CC_VERSION_TEXT="gcc (GCC) 12.1.0"`
		`CONFIG_CC_IS_GCC=y`
		`@@ -15,8 +15,10 @@`
		`CONFIG_CC_CAN_LINK_STATIC=y`
		`CONFIG_CC_HAS_ASM_GOTO=y`
		`CONFIG_CC_HAS_ASM_GOTO_OUTPUT=y`
		`+ CONFIG_CC_HAS_ASM_GOTO_TIED_OUTPUT=y`
		`CONFIG_CC_HAS_ASM_INLINE=y`
		`CONFIG_CC_HAS_NO_PROFILE_FN_ATTR=y`
		`+ CONFIG_PAHOLE_VERSION=123`
		`CONFIG_IRQ_WORK=y`
		`CONFIG_BUILDTIME_TABLE_SORT=y`
		`CONFIG_THREAD_INFO_IN_TASK=y`
		`@@ -100,6 +102,7 @@`
		`CONFIG_NO_HZ_IDLE=y`
		`CONFIG_NO_HZ=y`
		`CONFIG_HIGH_RES_TIMERS=y`
		`+ CONFIG_CLOCKSOURCE_WATCHDOG_MAX_SKEW_US=100`
		`# end of Timers subsystem`

		`CONFIG_BPF=y`
		`@@ -179,6 +182,8 @@`

		`CONFIG_ARCH_WANT_BATCHED_UNMAP_TLB_FLUSH=y`
		`CONFIG_CC_IMPLICIT_FALLTHROUGH="-Wimplicit-fallthrough=5"`
		`+ CONFIG_GCC12_NO_ARRAY_BOUNDS=y`
		`+ CONFIG_CC_NO_ARRAY_BOUNDS=y`
		`CONFIG_CGROUPS=y`
		`CONFIG_PAGE_COUNTER=y`
		`CONFIG_MEMCG=y`
		`@@ -309,11 +314,9 @@`
		`CONFIG_ARCH_MAY_HAVE_PC_FDC=y`
		`CONFIG_GENERIC_CALIBRATE_DELAY=y`
		`CONFIG_ARCH_HAS_CPU_RELAX=y`
		`- CONFIG_ARCH_HAS_FILTER_PGPROT=y`
		`CONFIG_ARCH_HIBERNATION_POSSIBLE=y`
		`CONFIG_ARCH_NR_GPIO=512`
		`CONFIG_ARCH_SUSPEND_POSSIBLE=y`
		`- CONFIG_ARCH_WANT_GENERAL_HUGETLB=y`
		`CONFIG_HAVE_INTEL_TXT=y`
		`CONFIG_X86_32_SMP=y`
		`CONFIG_ARCH_SUPPORTS_UPROBES=y`
		`@@ -328,8 +331,6 @@`
		`CONFIG_X86_FEATURE_NAMES=y`
		`CONFIG_X86_MPPARSE=y`
		`# CONFIG_GOLDFISH is not set`
		`- CONFIG_RETPOLINE=y`
		`- CONFIG_CC_HAS_SLS=y`
		`CONFIG_X86_CPU_RESCTRL=y`
		`CONFIG_X86_BIGSMP=y`
		`# CONFIG_X86_EXTENDED_PLATFORM is not set`
		`@@ -432,7 +433,6 @@`
		`# CONFIG_X86_LEGACY_VM86 is not set`
		`CONFIG_X86_IOPL_IOPERM=y`
		`CONFIG_TOSHIBA=m`
		`- CONFIG_I8K=m`
		`CONFIG_X86_REBOOTFIXUPS=y`
		`CONFIG_MICROCODE=y`
		`# CONFIG_MICROCODE_INTEL is not set`
		`@@ -455,7 +455,6 @@`
		`CONFIG_NODES_SHIFT=3`
		`CONFIG_ARCH_SPARSEMEM_ENABLE=y`
		`CONFIG_ARCH_SPARSEMEM_DEFAULT=y`
		`- CONFIG_ARCH_SELECT_MEMORY_MODEL=y`
		`CONFIG_ILLEGAL_POINTER_VALUE=0`
		`# CONFIG_X86_PMEM_LEGACY is not set`
		`# CONFIG_HIGHPTE is not set`
		`@@ -470,6 +469,7 @@`
		`CONFIG_ARCH_RANDOM=y`
		`CONFIG_X86_SMAP=y`
		`CONFIG_X86_UMIP=y`
		`+ CONFIG_CC_HAS_IBT=y`
		`CONFIG_X86_INTEL_TSX_MODE_OFF=y`
		`# CONFIG_X86_INTEL_TSX_MODE_ON is not set`
		`# CONFIG_X86_INTEL_TSX_MODE_AUTO is not set`
		`@@ -498,6 +498,15 @@`
		`# CONFIG_STRICT_SIGALTSTACK_SIZE is not set`
		`# end of Processor type and features`

		`+ CONFIG_CC_HAS_SLS=y`
		`+ CONFIG_CC_HAS_RETURN_THUNK=y`
		`+ CONFIG_SPECULATION_MITIGATIONS=y`
		`+ CONFIG_PAGE_TABLE_ISOLATION=y`
		`+ CONFIG_RETPOLINE=y`
		`+ CONFIG_RETHUNK=y`
		`+ CONFIG_CPU_UNRET_ENTRY=y`
		`+ CONFIG_CPU_IBPB_ENTRY=y`
		`+ CONFIG_CPU_IBRS_ENTRY=y`
		`CONFIG_ARCH_MHP_MEMMAP_ON_MEMORY_ENABLE=y`

		`#`
		`@@ -711,7 +720,6 @@`
		`CONFIG_KVM_INTEL=m`
		`CONFIG_KVM_AMD=m`
		`# CONFIG_KVM_XEN is not set`
		`- CONFIG_KVM_MMU_AUDIT=y`
		`CONFIG_AS_AVX512=y`
		`CONFIG_AS_SHA1_NI=y`
		`CONFIG_AS_SHA256_NI=y`
		`@@ -734,6 +742,7 @@`
		`CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y`
		`CONFIG_ARCH_USE_BUILTIN_BSWAP=y`
		`CONFIG_KRETPROBES=y`
		`+ CONFIG_KRETPROBE_ON_RETHOOK=y`
		`CONFIG_USER_RETURN_NOTIFIER=y`
		`CONFIG_HAVE_IOREMAP_PROT=y`
		`CONFIG_HAVE_KPROBES=y`
		`@@ -808,6 +817,7 @@`
		`CONFIG_OLD_SIGACTION=y`
		`CONFIG_COMPAT_32BIT_TIME=y`
		`CONFIG_HAVE_ARCH_RANDOMIZE_KSTACK_OFFSET=y`
		`+ CONFIG_RANDOMIZE_KSTACK_OFFSET=y`
		`# CONFIG_RANDOMIZE_KSTACK_OFFSET_DEFAULT is not set`
		`CONFIG_ARCH_HAS_STRICT_KERNEL_RWX=y`
		`CONFIG_STRICT_KERNEL_RWX=y`
		`@@ -819,6 +829,7 @@`
		`CONFIG_ARCH_HAS_MEM_ENCRYPT=y`
		`CONFIG_HAVE_STATIC_CALL=y`
		`CONFIG_HAVE_PREEMPT_DYNAMIC=y`
		`+ CONFIG_HAVE_PREEMPT_DYNAMIC_CALL=y`
		`CONFIG_ARCH_WANT_LD_ORPHAN_WARN=y`
		`CONFIG_ARCH_SUPPORTS_DEBUG_PAGEALLOC=y`
		`CONFIG_ARCH_SPLIT_ARG64=y`
		`@@ -858,6 +869,7 @@`
		`# CONFIG_TRIM_UNUSED_KSYMS is not set`
		`CONFIG_MODULES_TREE_LOOKUP=y`
		`CONFIG_BLOCK=y`
		`+ CONFIG_BLOCK_LEGACY_AUTOLOAD=y`
		`CONFIG_BLK_CGROUP_RWSTAT=y`
		`CONFIG_BLK_DEV_BSG_COMMON=y`
		`CONFIG_BLK_ICQ=y`
		`@@ -909,6 +921,7 @@`
		`CONFIG_BLK_MQ_RDMA=y`
		`CONFIG_BLK_PM=y`
		`CONFIG_BLOCK_HOLDER_DEPRECATED=y`
		`+ CONFIG_BLK_MQ_STACKING=y`

		`#`
		`# IO Schedulers`
		`@@ -951,8 +964,6 @@`
		`#`
		`# Memory Management options`
		`#`
		`- CONFIG_SELECT_MEMORY_MODEL=y`
		`- CONFIG_SPARSEMEM_MANUAL=y`
		`CONFIG_SPARSEMEM=y`
		`CONFIG_SPARSEMEM_STATIC=y`
		`CONFIG_HAVE_FAST_GUP=y`
		`@@ -975,6 +986,7 @@`
		`CONFIG_TRANSPARENT_HUGEPAGE=y`
		`# CONFIG_TRANSPARENT_HUGEPAGE_ALWAYS is not set`
		`CONFIG_TRANSPARENT_HUGEPAGE_MADVISE=y`
		`+ CONFIG_ARCH_WANT_GENERAL_HUGETLB=y`
		`CONFIG_NEED_PER_CPU_EMBED_FIRST_CHUNK=y`
		`CONFIG_NEED_PER_CPU_PAGE_FIRST_CHUNK=y`
		`CONFIG_USE_PERCPU_NUMA_NODE_ID=y`
		`@@ -1006,6 +1018,8 @@`
		`CONFIG_GENERIC_EARLY_IOREMAP=y`
		`# CONFIG_IDLE_PAGE_TRACKING is not set`
		`CONFIG_ARCH_HAS_CACHE_LINE_SIZE=y`
		`+ CONFIG_ARCH_HAS_CURRENT_STACK_POINTER=y`
		`+ CONFIG_ARCH_HAS_FILTER_PGPROT=y`
		`CONFIG_ARCH_HAS_ZONE_DMA_SET=y`
		`CONFIG_ZONE_DMA=y`
		`CONFIG_HMM_MIRROR=y`
		`@@ -2045,6 +2059,7 @@`
		`CONFIG_NET_SOCK_MSG=y`
		`CONFIG_NET_DEVLINK=y`
		`CONFIG_PAGE_POOL=y`
		`+ # CONFIG_PAGE_POOL_STATS is not set`
		`CONFIG_FAILOVER=m`
		`CONFIG_ETHTOOL_NETLINK=y`

		`@@ -2088,6 +2103,8 @@`
		`# CONFIG_PCIE_BUS_SAFE is not set`
		`# CONFIG_PCIE_BUS_PERFORMANCE is not set`
		`# CONFIG_PCIE_BUS_PEER2PEER is not set`
		`+ CONFIG_VGA_ARB=y`
		`+ CONFIG_VGA_ARB_MAX_GPUS=10`
		`CONFIG_HOTPLUG_PCI=y`
		`CONFIG_HOTPLUG_PCI_COMPAQ=m`
		`# CONFIG_HOTPLUG_PCI_COMPAQ_NVRAM is not set`
		`@@ -2294,6 +2311,7 @@`
		`CONFIG_EFI_DEV_PATH_PARSER=y`
		`CONFIG_EFI_EARLYCON=y`
		`CONFIG_EFI_CUSTOM_SSDT_OVERLAYS=y`
		`+ # CONFIG_EFI_DISABLE_RUNTIME is not set`

		`#`
		`# Tegra firmware driver`
		`@@ -2461,6 +2479,7 @@`
		`CONFIG_MTD_NAND_ECC_SW_HAMMING=y`
		`# CONFIG_MTD_NAND_ECC_SW_HAMMING_SMC is not set`
		`# CONFIG_MTD_NAND_ECC_SW_BCH is not set`
		`+ CONFIG_MTD_NAND_ECC_MXIC=y`
		`# end of ECC engine support`
		`# end of NAND`

		`@@ -2476,9 +2495,6 @@`
		`# CONFIG_MTD_SPI_NOR_SWP_DISABLE is not set`
		`CONFIG_MTD_SPI_NOR_SWP_DISABLE_ON_VOLATILE=y`
		`# CONFIG_MTD_SPI_NOR_SWP_KEEP is not set`
		`- CONFIG_SPI_INTEL_SPI=m`
		`- CONFIG_SPI_INTEL_SPI_PCI=m`
		`- CONFIG_SPI_INTEL_SPI_PLATFORM=m`
		`CONFIG_MTD_UBI=m`
		`CONFIG_MTD_UBI_WL_THRESHOLD=4096`
		`CONFIG_MTD_UBI_BEB_LIMIT=20`
		`@@ -2554,6 +2570,7 @@`
		`CONFIG_NVME_CORE=y`
		`CONFIG_BLK_DEV_NVME=y`
		`CONFIG_NVME_MULTIPATH=y`
		`+ # CONFIG_NVME_VERBOSE_ERRORS is not set`
		`# CONFIG_NVME_HWMON is not set`
		`CONFIG_NVME_FABRICS=m`
		`CONFIG_NVME_RDMA=m`
		`@@ -3202,6 +3219,8 @@`
		`CONFIG_ENIC=m`
		`CONFIG_NET_VENDOR_CORTINA=y`
		`CONFIG_GEMINI_ETHERNET=m`
		`+ CONFIG_NET_VENDOR_DAVICOM=y`
		`+ # CONFIG_DM9051 is not set`
		`CONFIG_DNET=m`
		`CONFIG_NET_VENDOR_DEC=y`
		`CONFIG_NET_TULIP=y`
		`@@ -3234,6 +3253,8 @@`
		`CONFIG_EZCHIP_NPS_MANAGEMENT_ENET=m`
		`CONFIG_NET_VENDOR_FUJITSU=y`
		`CONFIG_PCMCIA_FMVJ18X=m`
		`+ CONFIG_NET_VENDOR_FUNGIBLE=y`
		`+ # CONFIG_FUN_ETH is not set`
		`CONFIG_NET_VENDOR_GOOGLE=y`
		`CONFIG_GVE=m`
		`CONFIG_NET_VENDOR_HUAWEI=y`
		`@@ -3819,6 +3840,7 @@`
		`# CONFIG_MT7915E is not set`
		`# CONFIG_MT7921E is not set`
		`# CONFIG_MT7921S is not set`
		`+ # CONFIG_MT7921U is not set`
		`CONFIG_WLAN_VENDOR_MICROCHIP=y`
		`CONFIG_WILC1000=m`
		`CONFIG_WILC1000_SDIO=m`
		`@@ -3978,6 +4000,7 @@`
		`CONFIG_INPUT_FF_MEMLESS=m`
		`CONFIG_INPUT_SPARSEKMAP=m`
		`CONFIG_INPUT_MATRIXKMAP=m`
		`+ CONFIG_INPUT_VIVALDIFMAP=m`

		`#`
		`# Userland interfaces`
		`@@ -4158,6 +4181,7 @@`
		`CONFIG_TOUCHSCREEN_MELFAS_MIP4=m`
		`# CONFIG_TOUCHSCREEN_MSG2638 is not set`
		`CONFIG_TOUCHSCREEN_MTOUCH=m`
		`+ # CONFIG_TOUCHSCREEN_IMAGIS is not set`
		`CONFIG_TOUCHSCREEN_IMX6UL_TSC=m`
		`CONFIG_TOUCHSCREEN_INEXIO=m`
		`CONFIG_TOUCHSCREEN_MK712=m`
		`@@ -4395,7 +4419,6 @@`
		`CONFIG_SERIAL_SC16IS7XX_I2C=y`
		`CONFIG_SERIAL_SC16IS7XX_SPI=y`
		`# CONFIG_SERIAL_TIMBERDALE is not set`
		`- # CONFIG_SERIAL_BCM63XX is not set`
		`CONFIG_SERIAL_ALTERA_JTAGUART=m`
		`CONFIG_SERIAL_ALTERA_UART=m`
		`CONFIG_SERIAL_ALTERA_UART_MAXPORTS=4`
		`@@ -4541,6 +4564,7 @@`
		`#`
		`# PC SMBus host controller drivers`
		`#`
		`+ CONFIG_I2C_CCGX_UCSI=m`
		`CONFIG_I2C_ALI1535=m`
		`CONFIG_I2C_ALI1563=m`
		`CONFIG_I2C_ALI15X3=m`
		`@@ -4574,6 +4598,7 @@`
		`CONFIG_I2C_DESIGNWARE_CORE=y`
		`CONFIG_I2C_DESIGNWARE_SLAVE=y`
		`CONFIG_I2C_DESIGNWARE_PLATFORM=y`
		`+ # CONFIG_I2C_DESIGNWARE_AMDPSP is not set`
		`CONFIG_I2C_DESIGNWARE_BAYTRAIL=y`
		`CONFIG_I2C_DESIGNWARE_PCI=m`
		`CONFIG_I2C_EG20T=m`
		`@@ -4649,6 +4674,8 @@`
		`CONFIG_SPI_FSI=m`
		`CONFIG_SPI_NXP_FLEXSPI=m`
		`CONFIG_SPI_GPIO=m`
		`+ # CONFIG_SPI_INTEL_PCI is not set`
		`+ # CONFIG_SPI_INTEL_PLATFORM is not set`
		`CONFIG_SPI_LM70_LLP=m`
		`CONFIG_SPI_FSL_LIB=m`
		`CONFIG_SPI_FSL_SPI=m`
		`@@ -4980,6 +5007,7 @@`
		`CONFIG_POWER_SUPPLY_HWMON=y`
		`CONFIG_PDA_POWER=m`
		`CONFIG_GENERIC_ADC_BATTERY=m`
		`+ # CONFIG_IP5XXX_POWER is not set`
		`CONFIG_MAX8925_POWER=m`
		`CONFIG_WM831X_BACKUP=m`
		`CONFIG_WM831X_POWER=m`
		`@@ -4994,6 +5022,7 @@`
		`CONFIG_BATTERY_DS2780=m`
		`CONFIG_BATTERY_DS2781=m`
		`CONFIG_BATTERY_DS2782=m`
		`+ # CONFIG_BATTERY_SAMSUNG_SDI is not set`
		`CONFIG_BATTERY_SBS=m`
		`CONFIG_CHARGER_SBS=m`
		`CONFIG_MANAGER_SBS=m`
		`@@ -5053,6 +5082,7 @@`
		`CONFIG_CHARGER_UCS1002=m`
		`# CONFIG_CHARGER_BD99954 is not set`
		`CONFIG_CHARGER_WILCO=m`
		`+ # CONFIG_BATTERY_UG3105 is not set`
		`CONFIG_HWMON=y`
		`CONFIG_HWMON_VID=m`
		`# CONFIG_HWMON_DEBUG_CHIP is not set`
		`@@ -5097,6 +5127,7 @@`
		`CONFIG_SENSORS_DS620=m`
		`CONFIG_SENSORS_DS1621=m`
		`CONFIG_SENSORS_DELL_SMM=m`
		`+ # CONFIG_I8K is not set`
		`CONFIG_SENSORS_DA9052_ADC=m`
		`CONFIG_SENSORS_DA9055=m`
		`CONFIG_SENSORS_I5K_AMB=m`
		`@@ -5199,6 +5230,7 @@`
		`CONFIG_SENSORS_IRPS5401=m`
		`CONFIG_SENSORS_ISL68137=m`
		`CONFIG_SENSORS_LM25066=m`
		`+ # CONFIG_SENSORS_LM25066_REGULATOR is not set`
		`CONFIG_SENSORS_LTC2978=m`
		`# CONFIG_SENSORS_LTC2978_REGULATOR is not set`
		`CONFIG_SENSORS_LTC3815=m`
		`@@ -5214,6 +5246,7 @@`
		`# CONFIG_SENSORS_MP2975 is not set`
		`# CONFIG_SENSORS_MP5023 is not set`
		`# CONFIG_SENSORS_PIM4328 is not set`
		`+ # CONFIG_SENSORS_PLI1209BC is not set`
		`# CONFIG_SENSORS_PM6764TR is not set`
		`CONFIG_SENSORS_PXE1610=m`
		`# CONFIG_SENSORS_Q54SJ108A2 is not set`
		`@@ -5223,6 +5256,7 @@`
		`CONFIG_SENSORS_UCD9000=m`
		`CONFIG_SENSORS_UCD9200=m`
		`CONFIG_SENSORS_XDPE122=m`
		`+ # CONFIG_SENSORS_XDPE122_REGULATOR is not set`
		`CONFIG_SENSORS_ZL6100=m`
		`CONFIG_SENSORS_PWM_FAN=m`
		`# CONFIG_SENSORS_SBTSI is not set`
		`@@ -5233,6 +5267,7 @@`
		`# CONFIG_SENSORS_SHT4x is not set`
		`CONFIG_SENSORS_SHTC1=m`
		`CONFIG_SENSORS_SIS5595=m`
		`+ # CONFIG_SENSORS_SY7636A is not set`
		`CONFIG_SENSORS_DME1737=m`
		`CONFIG_SENSORS_EMC1403=m`
		`CONFIG_SENSORS_EMC2103=m`
		`@@ -5260,6 +5295,7 @@`
		`CONFIG_SENSORS_TMP108=m`
		`CONFIG_SENSORS_TMP401=m`
		`CONFIG_SENSORS_TMP421=m`
		`+ # CONFIG_SENSORS_TMP464 is not set`
		`# CONFIG_SENSORS_TMP513 is not set`
		`CONFIG_SENSORS_VIA_CPUTEMP=m`
		`CONFIG_SENSORS_VIA686A=m`
		`@@ -5287,6 +5323,7 @@`
		`CONFIG_SENSORS_ATK0110=m`
		`# CONFIG_SENSORS_ASUS_WMI is not set`
		`# CONFIG_SENSORS_ASUS_WMI_EC is not set`
		`+ # CONFIG_SENSORS_ASUS_EC is not set`
		`CONFIG_THERMAL=y`
		`# CONFIG_THERMAL_NETLINK is not set`
		`# CONFIG_THERMAL_STATISTICS is not set`
		`@@ -5329,6 +5366,7 @@`
		`CONFIG_INTEL_PCH_THERMAL=m`
		`# CONFIG_INTEL_TCC_COOLING is not set`
		`CONFIG_INTEL_MENLOW=m`
		`+ # CONFIG_INTEL_HFI_THERMAL is not set`
		`# end of Intel thermal drivers`

		`# CONFIG_TI_SOC_THERMAL is not set`
		`@@ -5527,6 +5565,7 @@`
		`CONFIG_MFD_MAX77650=m`
		`CONFIG_MFD_MAX77686=m`
		`CONFIG_MFD_MAX77693=m`
		`+ # CONFIG_MFD_MAX77714 is not set`
		`CONFIG_MFD_MAX77843=y`
		`CONFIG_MFD_MAX8907=m`
		`CONFIG_MFD_MAX8925=y`
		`@@ -5552,6 +5591,7 @@`
		`CONFIG_MFD_RN5T618=m`
		`CONFIG_MFD_SEC_CORE=y`
		`CONFIG_MFD_SI476X_CORE=m`
		`+ # CONFIG_MFD_SIMPLE_MFD_I2C is not set`
		`CONFIG_MFD_SM501=m`
		`CONFIG_MFD_SM501_GPIO=y`
		`CONFIG_MFD_SKY81452=m`
		`@@ -5723,6 +5763,7 @@`
		`CONFIG_REGULATOR_ROHM=m`
		`# CONFIG_REGULATOR_RT4801 is not set`
		`CONFIG_REGULATOR_RT5033=m`
		`+ # CONFIG_REGULATOR_RT5190A is not set`
		`# CONFIG_REGULATOR_RT6160 is not set`
		`# CONFIG_REGULATOR_RT6245 is not set`
		`# CONFIG_REGULATOR_RTQ2134 is not set`
		`@@ -5734,12 +5775,14 @@`
		`CONFIG_REGULATOR_SKY81452=m`
		`CONFIG_REGULATOR_SLG51000=m`
		`CONFIG_REGULATOR_STPMIC1=m`
		`+ # CONFIG_REGULATOR_SY7636A is not set`
		`CONFIG_REGULATOR_SY8106A=m`
		`CONFIG_REGULATOR_SY8824X=m`
		`CONFIG_REGULATOR_SY8827N=m`
		`CONFIG_REGULATOR_TPS51632=m`
		`CONFIG_REGULATOR_TPS6105X=m`
		`CONFIG_REGULATOR_TPS62360=m`
		`+ # CONFIG_REGULATOR_TPS6286X is not set`
		`CONFIG_REGULATOR_TPS65023=m`
		`CONFIG_REGULATOR_TPS6507X=m`
		`CONFIG_REGULATOR_TPS65086=m`
		`@@ -5759,45 +5802,45 @@`
		`CONFIG_REGULATOR_WM8994=m`
		`CONFIG_REGULATOR_QCOM_LABIBB=m`
		`CONFIG_RC_CORE=m`
		`- CONFIG_RC_MAP=m`
		`CONFIG_LIRC=y`
		`+ CONFIG_RC_MAP=m`
		`CONFIG_RC_DECODERS=y`
		`+ CONFIG_IR_IMON_DECODER=m`
		`+ CONFIG_IR_JVC_DECODER=m`
		`+ CONFIG_IR_MCE_KBD_DECODER=m`
		`CONFIG_IR_NEC_DECODER=m`
		`CONFIG_IR_RC5_DECODER=m`
		`CONFIG_IR_RC6_DECODER=m`
		`- CONFIG_IR_JVC_DECODER=m`
		`- CONFIG_IR_SONY_DECODER=m`
		`+ CONFIG_IR_RCMM_DECODER=m`
		`CONFIG_IR_SANYO_DECODER=m`
		`CONFIG_IR_SHARP_DECODER=m`
		`- CONFIG_IR_MCE_KBD_DECODER=m`
		`+ CONFIG_IR_SONY_DECODER=m`
		`CONFIG_IR_XMP_DECODER=m`
		`- CONFIG_IR_IMON_DECODER=m`
		`- CONFIG_IR_RCMM_DECODER=m`
		`CONFIG_RC_DEVICES=y`
		`- CONFIG_RC_ATI_REMOTE=m`
		`CONFIG_IR_ENE=m`
		`+ CONFIG_IR_FINTEK=m`
		`+ CONFIG_IR_GPIO_CIR=m`
		`+ CONFIG_IR_GPIO_TX=m`
		`CONFIG_IR_HIX5HD2=m`
		`+ CONFIG_IR_IGORPLUGUSB=m`
		`+ CONFIG_IR_IGUANA=m`
		`CONFIG_IR_IMON=m`
		`CONFIG_IR_IMON_RAW=m`
		`- CONFIG_IR_MCEUSB=m`
		`CONFIG_IR_ITE_CIR=m`
		`- CONFIG_IR_FINTEK=m`
		`+ CONFIG_IR_MCEUSB=m`
		`CONFIG_IR_NUVOTON=m`
		`+ CONFIG_IR_PWM_TX=m`
		`CONFIG_IR_REDRAT3=m`
		`+ CONFIG_IR_SERIAL=m`
		`+ CONFIG_IR_SERIAL_TRANSMITTER=y`
		`CONFIG_IR_SPI=m`
		`CONFIG_IR_STREAMZAP=m`
		`- CONFIG_IR_WINBOND_CIR=m`
		`- CONFIG_IR_IGORPLUGUSB=m`
		`- CONFIG_IR_IGUANA=m`
		`+ CONFIG_IR_TOY=m`
		`CONFIG_IR_TTUSBIR=m`
		`+ CONFIG_IR_WINBOND_CIR=m`
		`+ CONFIG_RC_ATI_REMOTE=m`
		`CONFIG_RC_LOOPBACK=m`
		`- CONFIG_IR_GPIO_CIR=m`
		`- CONFIG_IR_GPIO_TX=m`
		`- CONFIG_IR_PWM_TX=m`
		`- CONFIG_IR_SERIAL=m`
		`- CONFIG_IR_SERIAL_TRANSMITTER=y`
		`CONFIG_RC_XBOX_DVD=m`
		`- CONFIG_IR_TOY=m`
		`CONFIG_CEC_CORE=m`
		`CONFIG_CEC_NOTIFIER=y`
		`CONFIG_CEC_PIN=y`
		`@@ -5843,7 +5886,6 @@`
		`#`
		`# Video4Linux options`
		`#`
		`- CONFIG_VIDEO_V4L2=m`
		`CONFIG_VIDEO_V4L2_I2C=y`
		`CONFIG_VIDEO_V4L2_SUBDEV_API=y`
		`# CONFIG_VIDEO_ADV_DEBUG is not set`
		`@@ -5879,17 +5921,17 @@`
		`#`
		`# Media drivers`
		`#`
		`+`
		`+ #`
		`+ # Media drivers`
		`+ #`
		`CONFIG_MEDIA_USB_SUPPORT=y`

		`#`
		`# Webcam devices`
		`#`
		`- CONFIG_USB_VIDEO_CLASS=m`
		`- CONFIG_USB_VIDEO_CLASS_INPUT_EVDEV=y`
		`+ CONFIG_VIDEO_CPIA2=m`
		`CONFIG_USB_GSPCA=m`
		`- CONFIG_USB_M5602=m`
		`- CONFIG_USB_STV06XX=m`
		`- CONFIG_USB_GL860=m`
		`CONFIG_USB_GSPCA_BENQ=m`
		`CONFIG_USB_GSPCA_CONEX=m`
		`CONFIG_USB_GSPCA_CPIA1=m`
		`@@ -5914,13 +5956,13 @@`
		`CONFIG_USB_GSPCA_SN9C20X=m`
		`CONFIG_USB_GSPCA_SONIXB=m`
		`CONFIG_USB_GSPCA_SONIXJ=m`
		`+ CONFIG_USB_GSPCA_SPCA1528=m`
		`CONFIG_USB_GSPCA_SPCA500=m`
		`CONFIG_USB_GSPCA_SPCA501=m`
		`CONFIG_USB_GSPCA_SPCA505=m`
		`CONFIG_USB_GSPCA_SPCA506=m`
		`CONFIG_USB_GSPCA_SPCA508=m`
		`CONFIG_USB_GSPCA_SPCA561=m`
		`- CONFIG_USB_GSPCA_SPCA1528=m`
		`CONFIG_USB_GSPCA_SQ905=m`
		`CONFIG_USB_GSPCA_SQ905C=m`
		`CONFIG_USB_GSPCA_SQ930X=m`
		`@@ -5936,29 +5978,33 @@`
		`CONFIG_USB_GSPCA_VICAM=m`
		`CONFIG_USB_GSPCA_XIRLINK_CIT=m`
		`CONFIG_USB_GSPCA_ZC3XX=m`
		`+ CONFIG_USB_GL860=m`
		`+ CONFIG_USB_M5602=m`
		`+ CONFIG_USB_STV06XX=m`
		`CONFIG_USB_PWC=m`
		`# CONFIG_USB_PWC_DEBUG is not set`
		`CONFIG_USB_PWC_INPUT_EVDEV=y`
		`- CONFIG_VIDEO_CPIA2=m`
		`- CONFIG_USB_ZR364XX=m`
		`- CONFIG_USB_STKWEBCAM=m`
		`CONFIG_USB_S2255=m`
		`+ CONFIG_USB_STKWEBCAM=m`
		`CONFIG_VIDEO_USBTV=m`
		`+ CONFIG_USB_VIDEO_CLASS=m`
		`+ CONFIG_USB_VIDEO_CLASS_INPUT_EVDEV=y`
		`+ CONFIG_USB_ZR364XX=m`

		`#`
		`# Analog TV USB devices`
		`#`
		`+ CONFIG_VIDEO_GO7007=m`
		`+ CONFIG_VIDEO_GO7007_USB=m`
		`+ CONFIG_VIDEO_GO7007_LOADER=m`
		`+ CONFIG_VIDEO_GO7007_USB_S2250_BOARD=m`
		`+ CONFIG_VIDEO_HDPVR=m`
		`CONFIG_VIDEO_PVRUSB2=m`
		`CONFIG_VIDEO_PVRUSB2_SYSFS=y`
		`CONFIG_VIDEO_PVRUSB2_DVB=y`
		`# CONFIG_VIDEO_PVRUSB2_DEBUGIFC is not set`
		`- CONFIG_VIDEO_HDPVR=m`
		`CONFIG_VIDEO_STK1160_COMMON=m`
		`CONFIG_VIDEO_STK1160=m`
		`- CONFIG_VIDEO_GO7007=m`
		`- CONFIG_VIDEO_GO7007_USB=m`
		`- CONFIG_VIDEO_GO7007_LOADER=m`
		`- CONFIG_VIDEO_GO7007_USB_S2250_BOARD=m`

		`#`
		`# Analog/digital TV USB devices`
		`@@ -5977,34 +6023,9 @@`
		`#`
		`# Digital TV USB devices`
		`#`
		`- CONFIG_DVB_USB=m`
		`- # CONFIG_DVB_USB_DEBUG is not set`
		`- CONFIG_DVB_USB_DIB3000MC=m`
		`- CONFIG_DVB_USB_A800=m`
		`- CONFIG_DVB_USB_DIBUSB_MB=m`
		`- CONFIG_DVB_USB_DIBUSB_MB_FAULTY=y`
		`- CONFIG_DVB_USB_DIBUSB_MC=m`
		`- CONFIG_DVB_USB_DIB0700=m`
		`- CONFIG_DVB_USB_UMT_010=m`
		`- CONFIG_DVB_USB_CXUSB=m`
		`- # CONFIG_DVB_USB_CXUSB_ANALOG is not set`
		`- CONFIG_DVB_USB_M920X=m`
		`- CONFIG_DVB_USB_DIGITV=m`
		`- CONFIG_DVB_USB_VP7045=m`
		`- CONFIG_DVB_USB_VP702X=m`
		`- CONFIG_DVB_USB_GP8PSK=m`
		`- CONFIG_DVB_USB_NOVA_T_USB2=m`
		`- CONFIG_DVB_USB_TTUSB2=m`
		`- CONFIG_DVB_USB_DTT200U=m`
		`- CONFIG_DVB_USB_OPERA1=m`
		`- CONFIG_DVB_USB_AF9005=m`
		`- CONFIG_DVB_USB_AF9005_REMOTE=m`
		`- CONFIG_DVB_USB_PCTV452E=m`
		`- CONFIG_DVB_USB_DW2102=m`
		`- CONFIG_DVB_USB_CINERGY_T2=m`
		`- CONFIG_DVB_USB_DTV5100=m`
		`- CONFIG_DVB_USB_AZ6027=m`
		`- CONFIG_DVB_USB_TECHNISAT_USB2=m`
		`+ CONFIG_DVB_AS102=m`
		`+ CONFIG_DVB_B2C2_FLEXCOP_USB=m`
		`+ # CONFIG_DVB_B2C2_FLEXCOP_USB_DEBUG is not set`
		`CONFIG_DVB_USB_V2=m`
		`CONFIG_DVB_USB_AF9015=m`
		`CONFIG_DVB_USB_AF9035=m`
		`@@ -6012,19 +6033,44 @@`
		`CONFIG_DVB_USB_AU6610=m`
		`CONFIG_DVB_USB_AZ6007=m`
		`CONFIG_DVB_USB_CE6230=m`
		`+ CONFIG_DVB_USB_DVBSKY=m`
		`CONFIG_DVB_USB_EC168=m`
		`CONFIG_DVB_USB_GL861=m`
		`CONFIG_DVB_USB_LME2510=m`
		`CONFIG_DVB_USB_MXL111SF=m`
		`CONFIG_DVB_USB_RTL28XXU=m`
		`- CONFIG_DVB_USB_DVBSKY=m`
		`CONFIG_DVB_USB_ZD1301=m`
		`+ CONFIG_DVB_USB=m`
		`+ # CONFIG_DVB_USB_DEBUG is not set`
		`+ CONFIG_DVB_USB_A800=m`
		`+ CONFIG_DVB_USB_AF9005=m`
		`+ CONFIG_DVB_USB_AF9005_REMOTE=m`
		`+ CONFIG_DVB_USB_AZ6027=m`
		`+ CONFIG_DVB_USB_CINERGY_T2=m`
		`+ CONFIG_DVB_USB_CXUSB=m`
		`+ # CONFIG_DVB_USB_CXUSB_ANALOG is not set`
		`+ CONFIG_DVB_USB_DIB0700=m`
		`+ CONFIG_DVB_USB_DIB3000MC=m`
		`+ CONFIG_DVB_USB_DIBUSB_MB=m`
		`+ CONFIG_DVB_USB_DIBUSB_MB_FAULTY=y`
		`+ CONFIG_DVB_USB_DIBUSB_MC=m`
		`+ CONFIG_DVB_USB_DIGITV=m`
		`+ CONFIG_DVB_USB_DTT200U=m`
		`+ CONFIG_DVB_USB_DTV5100=m`
		`+ CONFIG_DVB_USB_DW2102=m`
		`+ CONFIG_DVB_USB_GP8PSK=m`
		`+ CONFIG_DVB_USB_M920X=m`
		`+ CONFIG_DVB_USB_NOVA_T_USB2=m`
		`+ CONFIG_DVB_USB_OPERA1=m`
		`+ CONFIG_DVB_USB_PCTV452E=m`
		`+ CONFIG_DVB_USB_TECHNISAT_USB2=m`
		`+ CONFIG_DVB_USB_TTUSB2=m`
		`+ CONFIG_DVB_USB_UMT_010=m`
		`+ CONFIG_DVB_USB_VP702X=m`
		`+ CONFIG_DVB_USB_VP7045=m`
		`+ CONFIG_SMS_USB_DRV=m`
		`CONFIG_DVB_TTUSB_BUDGET=m`
		`CONFIG_DVB_TTUSB_DEC=m`
		`- CONFIG_SMS_USB_DRV=m`
		`- CONFIG_DVB_B2C2_FLEXCOP_USB=m`
		`- # CONFIG_DVB_B2C2_FLEXCOP_USB_DEBUG is not set`
		`- CONFIG_DVB_AS102=m`

		`#`
		`# Webcam, TV (analog/digital) USB devices`
		`@@ -6055,6 +6101,7 @@`
		`#`
		`# Media capture/analog TV support`
		`#`
		`+ CONFIG_VIDEO_DT3155=m`
		`CONFIG_VIDEO_IVTV=m`
		`CONFIG_VIDEO_IVTV_ALSA=m`
		`CONFIG_VIDEO_FB_IVTV=m`
		`@@ -6062,11 +6109,12 @@`
		`CONFIG_VIDEO_HEXIUM_GEMINI=m`
		`CONFIG_VIDEO_HEXIUM_ORION=m`
		`CONFIG_VIDEO_MXB=m`
		`- CONFIG_VIDEO_DT3155=m`

		`#`
		`# Media capture/analog/hybrid TV support`
		`#`
		`+ CONFIG_VIDEO_BT848=m`
		`+ CONFIG_DVB_BT8XX=m`
		`CONFIG_VIDEO_CX18=m`
		`CONFIG_VIDEO_CX18_ALSA=m`
		`CONFIG_VIDEO_CX23885=m`
		`@@ -6080,8 +6128,6 @@`
		`CONFIG_VIDEO_CX88_ENABLE_VP3054=y`
		`CONFIG_VIDEO_CX88_VP3054=m`
		`CONFIG_VIDEO_CX88_MPEG=m`
		`- CONFIG_VIDEO_BT848=m`
		`- CONFIG_DVB_BT8XX=m`
		`CONFIG_VIDEO_SAA7134=m`
		`CONFIG_VIDEO_SAA7134_ALSA=m`
		`CONFIG_VIDEO_SAA7134_RC=y`
		`@@ -6092,221 +6138,202 @@`
		`#`
		`# Media digital TV PCI Adapters`
		`#`
		`- CONFIG_DVB_BUDGET_CORE=m`
		`- CONFIG_DVB_BUDGET=m`
		`- CONFIG_DVB_BUDGET_CI=m`
		`- CONFIG_DVB_BUDGET_AV=m`
		`CONFIG_DVB_B2C2_FLEXCOP_PCI=m`
		`# CONFIG_DVB_B2C2_FLEXCOP_PCI_DEBUG is not set`
		`- CONFIG_DVB_PLUTO2=m`
		`+ CONFIG_DVB_DDBRIDGE=m`
		`+ # CONFIG_DVB_DDBRIDGE_MSIENABLE is not set`
		`CONFIG_DVB_DM1105=m`
		`- CONFIG_DVB_PT1=m`
		`- CONFIG_DVB_PT3=m`
		`CONFIG_MANTIS_CORE=m`
		`CONFIG_DVB_MANTIS=m`
		`CONFIG_DVB_HOPPER=m`
		`+ CONFIG_DVB_NETUP_UNIDVB=m`
		`CONFIG_DVB_NGENE=m`
		`- CONFIG_DVB_DDBRIDGE=m`
		`- # CONFIG_DVB_DDBRIDGE_MSIENABLE is not set`
		`+ CONFIG_DVB_PLUTO2=m`
		`+ CONFIG_DVB_PT1=m`
		`+ CONFIG_DVB_PT3=m`
		`CONFIG_DVB_SMIPCIE=m`
		`- CONFIG_DVB_NETUP_UNIDVB=m`
		`+ CONFIG_DVB_BUDGET_CORE=m`
		`+ CONFIG_DVB_BUDGET=m`
		`+ CONFIG_DVB_BUDGET_CI=m`
		`+ CONFIG_DVB_BUDGET_AV=m`
		`CONFIG_VIDEO_IPU3_CIO2=m`
		`# CONFIG_CIO2_BRIDGE is not set`
		`- CONFIG_RADIO_ADAPTERS=y`
		`+ CONFIG_RADIO_ADAPTERS=m`
		`+ CONFIG_RADIO_MAXIRADIO=m`
		`+ CONFIG_RADIO_SAA7706H=m`
		`+ CONFIG_RADIO_SHARK=m`
		`+ CONFIG_RADIO_SHARK2=m`
		`+ CONFIG_RADIO_SI4713=m`
		`+ CONFIG_RADIO_SI476X=m`
		`CONFIG_RADIO_TEA575X=m`
		`+ CONFIG_RADIO_TEA5764=m`
		`+ CONFIG_RADIO_TEF6862=m`
		`+ CONFIG_RADIO_WL1273=m`
		`+ CONFIG_USB_DSBR=m`
		`+ CONFIG_USB_KEENE=m`
		`+ CONFIG_USB_MA901=m`
		`+ CONFIG_USB_MR800=m`
		`+ CONFIG_USB_RAREMONO=m`
		`CONFIG_RADIO_SI470X=m`
		`CONFIG_USB_SI470X=m`
		`CONFIG_I2C_SI470X=m`
		`- CONFIG_RADIO_SI4713=m`
		`CONFIG_USB_SI4713=m`
		`CONFIG_PLATFORM_SI4713=m`
		`CONFIG_I2C_SI4713=m`
		`- CONFIG_RADIO_SI476X=m`
		`- CONFIG_USB_MR800=m`
		`- CONFIG_USB_DSBR=m`
		`- CONFIG_RADIO_MAXIRADIO=m`
		`- CONFIG_RADIO_SHARK=m`
		`- CONFIG_RADIO_SHARK2=m`
		`- CONFIG_USB_KEENE=m`
		`- CONFIG_USB_RAREMONO=m`
		`- CONFIG_USB_MA901=m`
		`- CONFIG_RADIO_TEA5764=m`
		`- CONFIG_RADIO_SAA7706H=m`
		`- CONFIG_RADIO_TEF6862=m`
		`- CONFIG_RADIO_WL1273=m`
		`CONFIG_RADIO_WL128X=m`
		`# CONFIG_V4L_RADIO_ISA_DRIVERS is not set`
		`- CONFIG_MEDIA_COMMON_OPTIONS=y`
		`-`
		`- #`
		`- # common driver options`
		`- #`
		`- CONFIG_VIDEO_CX2341X=m`
		`- CONFIG_VIDEO_TVEEPROM=m`
		`- CONFIG_TTPCI_EEPROM=m`
		`- CONFIG_CYPRESS_FIRMWARE=m`
		`- CONFIG_VIDEOBUF2_CORE=m`
		`- CONFIG_VIDEOBUF2_V4L2=m`
		`- CONFIG_VIDEOBUF2_MEMOPS=m`
		`- CONFIG_VIDEOBUF2_DMA_CONTIG=m`
		`- CONFIG_VIDEOBUF2_VMALLOC=m`
		`- CONFIG_VIDEOBUF2_DMA_SG=m`
		`- CONFIG_VIDEOBUF2_DVB=m`
		`- CONFIG_DVB_B2C2_FLEXCOP=m`
		`- CONFIG_VIDEO_SAA7146=m`
		`- CONFIG_VIDEO_SAA7146_VV=m`
		`- CONFIG_SMS_SIANO_MDTV=m`
		`- CONFIG_SMS_SIANO_RC=y`
		`- # CONFIG_SMS_SIANO_DEBUGFS is not set`
		`- CONFIG_VIDEO_V4L2_TPG=m`
		`+ CONFIG_MEDIA_PLATFORM_DRIVERS=y`
		`CONFIG_V4L_PLATFORM_DRIVERS=y`
		`- CONFIG_VIDEO_CAFE_CCIC=m`
		`- # CONFIG_VIDEO_CADENCE is not set`
		`- CONFIG_VIDEO_ASPEED=m`
		`- CONFIG_VIDEO_MUX=m`
		`- CONFIG_VIDEO_XILINX=m`
		`- CONFIG_VIDEO_XILINX_CSI2RXSS=m`
		`- CONFIG_VIDEO_XILINX_TPG=m`
		`- CONFIG_VIDEO_XILINX_VTC=m`
		`+ CONFIG_SDR_PLATFORM_DRIVERS=y`
		`+ CONFIG_DVB_PLATFORM_DRIVERS=y`
		`CONFIG_V4L_MEM2MEM_DRIVERS=y`
		`CONFIG_VIDEO_MEM2MEM_DEINTERLACE=m`
		`- CONFIG_DVB_PLATFORM_DRIVERS=y`
		`- CONFIG_SDR_PLATFORM_DRIVERS=y`
		`+ CONFIG_VIDEO_MUX=m`

		`#`
		`- # MMC/SDIO DVB adapters`
		`+ # Allegro DVT media platform drivers`
		`#`
		`- CONFIG_SMS_SDIO_DRV=m`
		`- CONFIG_V4L_TEST_DRIVERS=y`
		`- CONFIG_VIDEO_VIMC=m`
		`- CONFIG_VIDEO_VIVID=m`
		`- CONFIG_VIDEO_VIVID_CEC=y`
		`- CONFIG_VIDEO_VIVID_MAX_DEVS=64`
		`- CONFIG_VIDEO_VIM2M=m`
		`- CONFIG_VIDEO_VICODEC=m`
		`- # CONFIG_DVB_TEST_DRIVERS is not set`

		`#`
		`- # FireWire (IEEE 1394) Adapters`
		`+ # Amlogic media platform drivers`
		`#`
		`- CONFIG_DVB_FIREDTV=m`
		`- CONFIG_DVB_FIREDTV_INPUT=y`
		`- # end of Media drivers`

		`#`
		`- # Media ancillary drivers`
		`+ # Amphion drivers`
		`#`
		`- CONFIG_MEDIA_ATTACH=y`

		`#`
		`- # IR I2C driver auto-selected by 'Autoselect ancillary drivers'`
		`+ # Aspeed media platform drivers`
		`#`
		`- CONFIG_VIDEO_IR_I2C=m`
		`+ CONFIG_VIDEO_ASPEED=m`

		`#`
		`- # Audio decoders, processors and mixers`
		`+ # Atmel media platform drivers`
		`#`
		`- CONFIG_VIDEO_TVAUDIO=m`
		`- CONFIG_VIDEO_TDA7432=m`
		`- CONFIG_VIDEO_TDA9840=m`
		`- CONFIG_VIDEO_TDA1997X=m`
		`- CONFIG_VIDEO_TEA6415C=m`
		`- CONFIG_VIDEO_TEA6420=m`
		`- CONFIG_VIDEO_MSP3400=m`
		`- CONFIG_VIDEO_CS3308=m`
		`- CONFIG_VIDEO_CS5345=m`
		`- CONFIG_VIDEO_CS53L32A=m`
		`- CONFIG_VIDEO_TLV320AIC23B=m`
		`- CONFIG_VIDEO_UDA1342=m`
		`- CONFIG_VIDEO_WM8775=m`
		`- CONFIG_VIDEO_WM8739=m`
		`- CONFIG_VIDEO_VP27SMPX=m`
		`- CONFIG_VIDEO_SONY_BTF_MPX=m`
		`- # end of Audio decoders, processors and mixers`

		`#`
		`- # RDS decoders`
		`+ # Cadence media platform drivers`
		`#`
		`- CONFIG_VIDEO_SAA6588=m`
		`- # end of RDS decoders`
		`+ # CONFIG_VIDEO_CADENCE_CSI2RX is not set`
		`+ # CONFIG_VIDEO_CADENCE_CSI2TX is not set`

		`#`
		`- # Video decoders`
		`+ # Chips&Media media platform drivers`
		`#`
		`- CONFIG_VIDEO_ADV7180=m`
		`- CONFIG_VIDEO_ADV7183=m`
		`- CONFIG_VIDEO_ADV748X=m`
		`- CONFIG_VIDEO_ADV7604=m`
		`- # CONFIG_VIDEO_ADV7604_CEC is not set`
		`- CONFIG_VIDEO_ADV7842=m`
		`- # CONFIG_VIDEO_ADV7842_CEC is not set`
		`- CONFIG_VIDEO_BT819=m`
		`- CONFIG_VIDEO_BT856=m`
		`- CONFIG_VIDEO_BT866=m`
		`- CONFIG_VIDEO_KS0127=m`
		`- CONFIG_VIDEO_ML86V7667=m`
		`- CONFIG_VIDEO_SAA7110=m`
		`- CONFIG_VIDEO_SAA711X=m`
		`- CONFIG_VIDEO_TC358743=m`
		`- # CONFIG_VIDEO_TC358743_CEC is not set`
		`- CONFIG_VIDEO_TVP514X=m`
		`- CONFIG_VIDEO_TVP5150=m`
		`- CONFIG_VIDEO_TVP7002=m`
		`- CONFIG_VIDEO_TW2804=m`
		`- CONFIG_VIDEO_TW9903=m`
		`- CONFIG_VIDEO_TW9906=m`
		`- CONFIG_VIDEO_TW9910=m`
		`- CONFIG_VIDEO_VPX3220=m`
		`- CONFIG_VIDEO_MAX9286=m`

		`#`
		`- # Video and audio decoders`
		`+ # Intel media platform drivers`
		`#`
		`- CONFIG_VIDEO_SAA717X=m`
		`- CONFIG_VIDEO_CX25840=m`
		`- # end of Video decoders`

		`#`
		`- # Video encoders`
		`+ # Marvell media platform drivers`
		`#`
		`- CONFIG_VIDEO_SAA7127=m`
		`- CONFIG_VIDEO_SAA7185=m`
		`- CONFIG_VIDEO_ADV7170=m`
		`- CONFIG_VIDEO_ADV7175=m`
		`- CONFIG_VIDEO_ADV7343=m`
		`- CONFIG_VIDEO_ADV7393=m`
		`- CONFIG_VIDEO_AD9389B=m`
		`- CONFIG_VIDEO_AK881X=m`
		`- CONFIG_VIDEO_THS8200=m`
		`- # end of Video encoders`
		`+ CONFIG_VIDEO_CAFE_CCIC=m`

		`#`
		`- # Video improvement chips`
		`+ # Mediatek media platform drivers`
		`#`
		`- CONFIG_VIDEO_UPD64031A=m`
		`- CONFIG_VIDEO_UPD64083=m`
		`- # end of Video improvement chips`

		`#`
		`- # Audio/Video compression chips`
		`+ # NVidia media platform drivers`
		`#`
		`- CONFIG_VIDEO_SAA6752HS=m`
		`- # end of Audio/Video compression chips`

		`#`
		`- # SDR tuner chips`
		`+ # NXP media platform drivers`
		`#`
		`- CONFIG_SDR_MAX2175=m`
		`- # end of SDR tuner chips`

		`#`
		`- # Miscellaneous helper chips`
		`+ # Qualcomm media platform drivers`
		`#`
		`- CONFIG_VIDEO_THS7303=m`
		`- CONFIG_VIDEO_M52790=m`
		`- CONFIG_VIDEO_I2C=m`
		`- CONFIG_VIDEO_ST_MIPID02=m`
		`- # end of Miscellaneous helper chips`
		`+`
		`+ #`
		`+ # Renesas media platform drivers`
		`+ #`
		`+`
		`+ #`
		`+ # Rockchip media platform drivers`
		`+ #`
		`+`
		`+ #`
		`+ # Samsung media platform drivers`
		`+ #`
		`+`
		`+ #`
		`+ # STMicroelectronics media platform drivers`
		`+ #`
		`+`
		`+ #`
		`+ # Sunxi media platform drivers`
		`+ #`
		`+`
		`+ #`
		`+ # Texas Instruments drivers`
		`+ #`
		`+`
		`+ #`
		`+ # VIA media platform drivers`
		`+ #`
		`+`
		`+ #`
		`+ # Xilinx media platform drivers`
		`+ #`
		`+ CONFIG_VIDEO_XILINX=m`
		`+ CONFIG_VIDEO_XILINX_CSI2RXSS=m`
		`+ CONFIG_VIDEO_XILINX_TPG=m`
		`+ CONFIG_VIDEO_XILINX_VTC=m`
		`+`
		`+ #`
		`+ # MMC/SDIO DVB adapters`
		`+ #`
		`+ CONFIG_SMS_SDIO_DRV=m`
		`+ CONFIG_V4L_TEST_DRIVERS=y`
		`+ CONFIG_VIDEO_VIM2M=m`
		`+ CONFIG_VIDEO_VICODEC=m`
		`+ CONFIG_VIDEO_VIMC=m`
		`+ CONFIG_VIDEO_VIVID=m`
		`+ CONFIG_VIDEO_VIVID_CEC=y`
		`+ CONFIG_VIDEO_VIVID_MAX_DEVS=64`
		`+ # CONFIG_DVB_TEST_DRIVERS is not set`
		`+`
		`+ #`
		`+ # FireWire (IEEE 1394) Adapters`
		`+ #`
		`+ CONFIG_DVB_FIREDTV=m`
		`+ CONFIG_DVB_FIREDTV_INPUT=y`
		`+ CONFIG_MEDIA_COMMON_OPTIONS=y`
		`+`
		`+ #`
		`+ # common driver options`
		`+ #`
		`+ CONFIG_CYPRESS_FIRMWARE=m`
		`+ CONFIG_TTPCI_EEPROM=m`
		`+ CONFIG_VIDEO_CX2341X=m`
		`+ CONFIG_VIDEO_TVEEPROM=m`
		`+ CONFIG_DVB_B2C2_FLEXCOP=m`
		`+ CONFIG_VIDEO_SAA7146=m`
		`+ CONFIG_VIDEO_SAA7146_VV=m`
		`+ CONFIG_SMS_SIANO_MDTV=m`
		`+ CONFIG_SMS_SIANO_RC=y`
		`+ # CONFIG_SMS_SIANO_DEBUGFS is not set`
		`+ CONFIG_VIDEO_V4L2_TPG=m`
		`+ CONFIG_VIDEOBUF2_CORE=m`
		`+ CONFIG_VIDEOBUF2_V4L2=m`
		`+ CONFIG_VIDEOBUF2_MEMOPS=m`
		`+ CONFIG_VIDEOBUF2_DMA_CONTIG=m`
		`+ CONFIG_VIDEOBUF2_VMALLOC=m`
		`+ CONFIG_VIDEOBUF2_DMA_SG=m`
		`+ CONFIG_VIDEOBUF2_DVB=m`
		`+ # end of Media drivers`
		`+`
		`+ #`
		`+ # Media ancillary drivers`
		`+ #`
		`+ CONFIG_MEDIA_ATTACH=y`
		`+`
		`+ #`
		`+ # IR I2C driver auto-selected by 'Autoselect ancillary drivers'`
		`+ #`
		`+ CONFIG_VIDEO_IR_I2C=m`

		`#`
		`# Camera sensor devices`
		`@@ -6314,6 +6341,7 @@`
		`CONFIG_VIDEO_APTINA_PLL=m`
		`# CONFIG_VIDEO_HI556 is not set`
		`# CONFIG_VIDEO_HI846 is not set`
		`+ # CONFIG_VIDEO_HI847 is not set`
		`# CONFIG_VIDEO_IMX208 is not set`
		`CONFIG_VIDEO_IMX214=m`
		`CONFIG_VIDEO_IMX219=m`
		`@@ -6325,7 +6353,22 @@`
		`# CONFIG_VIDEO_IMX335 is not set`
		`CONFIG_VIDEO_IMX355=m`
		`# CONFIG_VIDEO_IMX412 is not set`
		`+ CONFIG_VIDEO_MAX9271_LIB=m`
		`+ CONFIG_VIDEO_MT9M001=m`
		`+ CONFIG_VIDEO_MT9M032=m`
		`+ CONFIG_VIDEO_MT9M111=m`
		`+ CONFIG_VIDEO_MT9P031=m`
		`+ CONFIG_VIDEO_MT9T001=m`
		`+ CONFIG_VIDEO_MT9T112=m`
		`+ CONFIG_VIDEO_MT9V011=m`
		`+ CONFIG_VIDEO_MT9V032=m`
		`+ CONFIG_VIDEO_MT9V111=m`
		`+ CONFIG_VIDEO_NOON010PC30=m`
		`+ # CONFIG_VIDEO_OG01A1B is not set`
		`# CONFIG_VIDEO_OV02A10 is not set`
		`+ # CONFIG_VIDEO_OV08D10 is not set`
		`+ CONFIG_VIDEO_OV13858=m`
		`+ # CONFIG_VIDEO_OV13B10 is not set`
		`CONFIG_VIDEO_OV2640=m`
		`CONFIG_VIDEO_OV2659=m`
		`CONFIG_VIDEO_OV2680=m`
		`@@ -6335,15 +6378,15 @@`
		`CONFIG_VIDEO_OV5645=m`
		`CONFIG_VIDEO_OV5647=m`
		`# CONFIG_VIDEO_OV5648 is not set`
		`- CONFIG_VIDEO_OV6650=m`
		`CONFIG_VIDEO_OV5670=m`
		`CONFIG_VIDEO_OV5675=m`
		`# CONFIG_VIDEO_OV5693 is not set`
		`CONFIG_VIDEO_OV5695=m`
		`+ CONFIG_VIDEO_OV6650=m`
		`CONFIG_VIDEO_OV7251=m`
		`- CONFIG_VIDEO_OV772X=m`
		`CONFIG_VIDEO_OV7640=m`
		`CONFIG_VIDEO_OV7670=m`
		`+ CONFIG_VIDEO_OV772X=m`
		`CONFIG_VIDEO_OV7740=m`
		`CONFIG_VIDEO_OV8856=m`
		`# CONFIG_VIDEO_OV8865 is not set`
		`@@ -6351,32 +6394,19 @@`
		`CONFIG_VIDEO_OV9640=m`
		`CONFIG_VIDEO_OV9650=m`
		`# CONFIG_VIDEO_OV9734 is not set`
		`- CONFIG_VIDEO_OV13858=m`
		`- # CONFIG_VIDEO_OV13B10 is not set`
		`- CONFIG_VIDEO_VS6624=m`
		`- CONFIG_VIDEO_MT9M001=m`
		`- CONFIG_VIDEO_MT9M032=m`
		`- CONFIG_VIDEO_MT9M111=m`
		`- CONFIG_VIDEO_MT9P031=m`
		`- CONFIG_VIDEO_MT9T001=m`
		`- CONFIG_VIDEO_MT9T112=m`
		`- CONFIG_VIDEO_MT9V011=m`
		`- CONFIG_VIDEO_MT9V032=m`
		`- CONFIG_VIDEO_MT9V111=m`
		`- CONFIG_VIDEO_SR030PC30=m`
		`- CONFIG_VIDEO_NOON010PC30=m`
		`- CONFIG_VIDEO_M5MOLS=m`
		`- CONFIG_VIDEO_MAX9271_LIB=m`
		`CONFIG_VIDEO_RDACM20=m`
		`# CONFIG_VIDEO_RDACM21 is not set`
		`CONFIG_VIDEO_RJ54N1=m`
		`- CONFIG_VIDEO_S5K6AA=m`
		`- CONFIG_VIDEO_S5K6A3=m`
		`+ CONFIG_VIDEO_S5C73M3=m`
		`CONFIG_VIDEO_S5K4ECGX=m`
		`CONFIG_VIDEO_S5K5BAF=m`
		`+ CONFIG_VIDEO_S5K6A3=m`
		`+ CONFIG_VIDEO_S5K6AA=m`
		`+ CONFIG_VIDEO_SR030PC30=m`
		`+ CONFIG_VIDEO_VS6624=m`
		`# CONFIG_VIDEO_CCS is not set`
		`CONFIG_VIDEO_ET8EK8=m`
		`- CONFIG_VIDEO_S5C73M3=m`
		`+ CONFIG_VIDEO_M5MOLS=m`
		`# end of Camera sensor devices`

		`#`
		`@@ -6398,15 +6428,116 @@`
		`# end of Flash devices`

		`#`
		`- # SPI helper chips`
		`+ # Audio decoders, processors and mixers`
		`#`
		`- CONFIG_VIDEO_GS1662=m`
		`- # end of SPI helper chips`
		`+ CONFIG_VIDEO_CS3308=m`
		`+ CONFIG_VIDEO_CS5345=m`
		`+ CONFIG_VIDEO_CS53L32A=m`
		`+ CONFIG_VIDEO_MSP3400=m`
		`+ CONFIG_VIDEO_SONY_BTF_MPX=m`
		`+ CONFIG_VIDEO_TDA1997X=m`
		`+ CONFIG_VIDEO_TDA7432=m`
		`+ CONFIG_VIDEO_TDA9840=m`
		`+ CONFIG_VIDEO_TEA6415C=m`
		`+ CONFIG_VIDEO_TEA6420=m`
		`+ CONFIG_VIDEO_TLV320AIC23B=m`
		`+ CONFIG_VIDEO_TVAUDIO=m`
		`+ CONFIG_VIDEO_UDA1342=m`
		`+ CONFIG_VIDEO_VP27SMPX=m`
		`+ CONFIG_VIDEO_WM8739=m`
		`+ CONFIG_VIDEO_WM8775=m`
		`+ # end of Audio decoders, processors and mixers`
		`+`
		`+ #`
		`+ # RDS decoders`
		`+ #`
		`+ CONFIG_VIDEO_SAA6588=m`
		`+ # end of RDS decoders`
		`+`
		`+ #`
		`+ # Video decoders`
		`+ #`
		`+ CONFIG_VIDEO_ADV7180=m`
		`+ CONFIG_VIDEO_ADV7183=m`
		`+ CONFIG_VIDEO_ADV748X=m`
		`+ CONFIG_VIDEO_ADV7604=m`
		`+ # CONFIG_VIDEO_ADV7604_CEC is not set`
		`+ CONFIG_VIDEO_ADV7842=m`
		`+ # CONFIG_VIDEO_ADV7842_CEC is not set`
		`+ CONFIG_VIDEO_BT819=m`
		`+ CONFIG_VIDEO_BT856=m`
		`+ CONFIG_VIDEO_BT866=m`
		`+ # CONFIG_VIDEO_ISL7998X is not set`
		`+ CONFIG_VIDEO_KS0127=m`
		`+ CONFIG_VIDEO_MAX9286=m`
		`+ CONFIG_VIDEO_ML86V7667=m`
		`+ CONFIG_VIDEO_SAA7110=m`
		`+ CONFIG_VIDEO_SAA711X=m`
		`+ CONFIG_VIDEO_TC358743=m`
		`+ # CONFIG_VIDEO_TC358743_CEC is not set`
		`+ CONFIG_VIDEO_TVP514X=m`
		`+ CONFIG_VIDEO_TVP5150=m`
		`+ CONFIG_VIDEO_TVP7002=m`
		`+ CONFIG_VIDEO_TW2804=m`
		`+ CONFIG_VIDEO_TW9903=m`
		`+ CONFIG_VIDEO_TW9906=m`
		`+ CONFIG_VIDEO_TW9910=m`
		`+ CONFIG_VIDEO_VPX3220=m`
		`+`
		`+ #`
		`+ # Video and audio decoders`
		`+ #`
		`+ CONFIG_VIDEO_SAA717X=m`
		`+ CONFIG_VIDEO_CX25840=m`
		`+ # end of Video decoders`
		`+`
		`+ #`
		`+ # Video encoders`
		`+ #`
		`+ CONFIG_VIDEO_AD9389B=m`
		`+ CONFIG_VIDEO_ADV7170=m`
		`+ CONFIG_VIDEO_ADV7175=m`
		`+ CONFIG_VIDEO_ADV7343=m`
		`+ CONFIG_VIDEO_ADV7393=m`
		`+ CONFIG_VIDEO_AK881X=m`
		`+ CONFIG_VIDEO_SAA7127=m`
		`+ CONFIG_VIDEO_SAA7185=m`
		`+ CONFIG_VIDEO_THS8200=m`
		`+ # end of Video encoders`
		`+`
		`+ #`
		`+ # Video improvement chips`
		`+ #`
		`+ CONFIG_VIDEO_UPD64031A=m`
		`+ CONFIG_VIDEO_UPD64083=m`
		`+ # end of Video improvement chips`
		`+`
		`+ #`
		`+ # Audio/Video compression chips`
		`+ #`
		`+ CONFIG_VIDEO_SAA6752HS=m`
		`+ # end of Audio/Video compression chips`
		`+`
		`+ #`
		`+ # SDR tuner chips`
		`+ #`
		`+ CONFIG_SDR_MAX2175=m`
		`+ # end of SDR tuner chips`
		`+`
		`+ #`
		`+ # Miscellaneous helper chips`
		`+ #`
		`+ CONFIG_VIDEO_I2C=m`
		`+ CONFIG_VIDEO_M52790=m`
		`+ CONFIG_VIDEO_ST_MIPID02=m`
		`+ CONFIG_VIDEO_THS7303=m`
		`+ # end of Miscellaneous helper chips`

		`#`
		`# Media SPI Adapters`
		`#`
		`CONFIG_CXD2880_SPI_DRV=m`
		`+ CONFIG_VIDEO_GS1662=m`
		`# end of Media SPI Adapters`

		`CONFIG_MEDIA_TUNER=m`
		`@@ -6414,43 +6545,43 @@`
		`#`
		`# Customize TV tuners`
		`#`
		`- CONFIG_MEDIA_TUNER_SIMPLE=m`
		`- CONFIG_MEDIA_TUNER_TDA18250=m`
		`- CONFIG_MEDIA_TUNER_TDA8290=m`
		`- CONFIG_MEDIA_TUNER_TDA827X=m`
		`- CONFIG_MEDIA_TUNER_TDA18271=m`
		`- CONFIG_MEDIA_TUNER_TDA9887=m`
		`- CONFIG_MEDIA_TUNER_TEA5761=m`
		`- CONFIG_MEDIA_TUNER_TEA5767=m`
		`+ CONFIG_MEDIA_TUNER_E4000=m`
		`+ CONFIG_MEDIA_TUNER_FC0011=m`
		`+ CONFIG_MEDIA_TUNER_FC0012=m`
		`+ CONFIG_MEDIA_TUNER_FC0013=m`
		`+ CONFIG_MEDIA_TUNER_FC2580=m`
		`+ CONFIG_MEDIA_TUNER_IT913X=m`
		`+ CONFIG_MEDIA_TUNER_M88RS6000T=m`
		`+ CONFIG_MEDIA_TUNER_MAX2165=m`
		`+ CONFIG_MEDIA_TUNER_MC44S803=m`
		`CONFIG_MEDIA_TUNER_MSI001=m`
		`- CONFIG_MEDIA_TUNER_MT20XX=m`
		`CONFIG_MEDIA_TUNER_MT2060=m`
		`CONFIG_MEDIA_TUNER_MT2063=m`
		`- CONFIG_MEDIA_TUNER_MT2266=m`
		`+ CONFIG_MEDIA_TUNER_MT20XX=m`
		`CONFIG_MEDIA_TUNER_MT2131=m`
		`- CONFIG_MEDIA_TUNER_QT1010=m`
		`- CONFIG_MEDIA_TUNER_XC2028=m`
		`- CONFIG_MEDIA_TUNER_XC5000=m`
		`- CONFIG_MEDIA_TUNER_XC4000=m`
		`+ CONFIG_MEDIA_TUNER_MT2266=m`
		`+ CONFIG_MEDIA_TUNER_MXL301RF=m`
		`CONFIG_MEDIA_TUNER_MXL5005S=m`
		`CONFIG_MEDIA_TUNER_MXL5007T=m`
		`- CONFIG_MEDIA_TUNER_MC44S803=m`
		`- CONFIG_MEDIA_TUNER_MAX2165=m`
		`- CONFIG_MEDIA_TUNER_TDA18218=m`
		`- CONFIG_MEDIA_TUNER_FC0011=m`
		`- CONFIG_MEDIA_TUNER_FC0012=m`
		`- CONFIG_MEDIA_TUNER_FC0013=m`
		`+ CONFIG_MEDIA_TUNER_QM1D1B0004=m`
		`+ CONFIG_MEDIA_TUNER_QM1D1C0042=m`
		`+ CONFIG_MEDIA_TUNER_QT1010=m`
		`+ CONFIG_MEDIA_TUNER_R820T=m`
		`+ CONFIG_MEDIA_TUNER_SI2157=m`
		`+ CONFIG_MEDIA_TUNER_SIMPLE=m`
		`CONFIG_MEDIA_TUNER_TDA18212=m`
		`- CONFIG_MEDIA_TUNER_E4000=m`
		`- CONFIG_MEDIA_TUNER_FC2580=m`
		`- CONFIG_MEDIA_TUNER_M88RS6000T=m`
		`+ CONFIG_MEDIA_TUNER_TDA18218=m`
		`+ CONFIG_MEDIA_TUNER_TDA18250=m`
		`+ CONFIG_MEDIA_TUNER_TDA18271=m`
		`+ CONFIG_MEDIA_TUNER_TDA827X=m`
		`+ CONFIG_MEDIA_TUNER_TDA8290=m`
		`+ CONFIG_MEDIA_TUNER_TDA9887=m`
		`+ CONFIG_MEDIA_TUNER_TEA5761=m`
		`+ CONFIG_MEDIA_TUNER_TEA5767=m`
		`CONFIG_MEDIA_TUNER_TUA9001=m`
		`- CONFIG_MEDIA_TUNER_SI2157=m`
		`- CONFIG_MEDIA_TUNER_IT913X=m`
		`- CONFIG_MEDIA_TUNER_R820T=m`
		`- CONFIG_MEDIA_TUNER_MXL301RF=m`
		`- CONFIG_MEDIA_TUNER_QM1D1C0042=m`
		`- CONFIG_MEDIA_TUNER_QM1D1B0004=m`
		`+ CONFIG_MEDIA_TUNER_XC2028=m`
		`+ CONFIG_MEDIA_TUNER_XC4000=m`
		`+ CONFIG_MEDIA_TUNER_XC5000=m`
		`# end of Customize TV tuners`

		`#`
		`@@ -6460,126 +6591,126 @@`
		`#`
		`# Multistandard (satellite) frontends`
		`#`
		`+ CONFIG_DVB_M88DS3103=m`
		`+ CONFIG_DVB_MXL5XX=m`
		`CONFIG_DVB_STB0899=m`
		`CONFIG_DVB_STB6100=m`
		`CONFIG_DVB_STV090x=m`
		`CONFIG_DVB_STV0910=m`
		`CONFIG_DVB_STV6110x=m`
		`CONFIG_DVB_STV6111=m`
		`- CONFIG_DVB_MXL5XX=m`
		`- CONFIG_DVB_M88DS3103=m`

		`#`
		`# Multistandard (cable + terrestrial) frontends`
		`#`
		`CONFIG_DVB_DRXK=m`
		`- CONFIG_DVB_TDA18271C2DD=m`
		`- CONFIG_DVB_SI2165=m`
		`CONFIG_DVB_MN88472=m`
		`CONFIG_DVB_MN88473=m`
		`+ CONFIG_DVB_SI2165=m`
		`+ CONFIG_DVB_TDA18271C2DD=m`

		`#`
		`# DVB-S (satellite) frontends`
		`#`
		`CONFIG_DVB_CX24110=m`
		`+ CONFIG_DVB_CX24116=m`
		`+ CONFIG_DVB_CX24117=m`
		`+ CONFIG_DVB_CX24120=m`
		`CONFIG_DVB_CX24123=m`
		`+ CONFIG_DVB_DS3000=m`
		`+ CONFIG_DVB_MB86A16=m`
		`CONFIG_DVB_MT312=m`
		`- CONFIG_DVB_ZL10036=m`
		`- CONFIG_DVB_ZL10039=m`
		`CONFIG_DVB_S5H1420=m`
		`- CONFIG_DVB_STV0288=m`
		`+ CONFIG_DVB_SI21XX=m`
		`CONFIG_DVB_STB6000=m`
		`+ CONFIG_DVB_STV0288=m`
		`CONFIG_DVB_STV0299=m`
		`- CONFIG_DVB_STV6110=m`
		`CONFIG_DVB_STV0900=m`
		`- CONFIG_DVB_TDA8083=m`
		`+ CONFIG_DVB_STV6110=m`
		`+ CONFIG_DVB_TDA10071=m`
		`CONFIG_DVB_TDA10086=m`
		`+ CONFIG_DVB_TDA8083=m`
		`CONFIG_DVB_TDA8261=m`
		`- CONFIG_DVB_VES1X93=m`
		`- CONFIG_DVB_TUNER_ITD1000=m`
		`- CONFIG_DVB_TUNER_CX24113=m`
		`CONFIG_DVB_TDA826X=m`
		`- CONFIG_DVB_TUA6100=m`
		`- CONFIG_DVB_CX24116=m`
		`- CONFIG_DVB_CX24117=m`
		`- CONFIG_DVB_CX24120=m`
		`- CONFIG_DVB_SI21XX=m`
		`CONFIG_DVB_TS2020=m`
		`- CONFIG_DVB_DS3000=m`
		`- CONFIG_DVB_MB86A16=m`
		`- CONFIG_DVB_TDA10071=m`
		`+ CONFIG_DVB_TUA6100=m`
		`+ CONFIG_DVB_TUNER_CX24113=m`
		`+ CONFIG_DVB_TUNER_ITD1000=m`
		`+ CONFIG_DVB_VES1X93=m`
		`+ CONFIG_DVB_ZL10036=m`
		`+ CONFIG_DVB_ZL10039=m`

		`#`
		`# DVB-T (terrestrial) frontends`
		`#`
		`- CONFIG_DVB_SP887X=m`
		`+ CONFIG_DVB_AF9013=m`
		`+ CONFIG_DVB_AS102_FE=m`
		`CONFIG_DVB_CX22700=m`
		`CONFIG_DVB_CX22702=m`
		`- CONFIG_DVB_S5H1432=m`
		`- CONFIG_DVB_DRXD=m`
		`- CONFIG_DVB_L64781=m`
		`- CONFIG_DVB_TDA1004X=m`
		`- CONFIG_DVB_NXT6000=m`
		`- CONFIG_DVB_MT352=m`
		`- CONFIG_DVB_ZL10353=m`
		`+ CONFIG_DVB_CXD2820R=m`
		`+ CONFIG_DVB_CXD2841ER=m`
		`CONFIG_DVB_DIB3000MB=m`
		`CONFIG_DVB_DIB3000MC=m`
		`CONFIG_DVB_DIB7000M=m`
		`CONFIG_DVB_DIB7000P=m`
		`CONFIG_DVB_DIB9000=m`
		`- CONFIG_DVB_TDA10048=m`
		`- CONFIG_DVB_AF9013=m`
		`+ CONFIG_DVB_DRXD=m`
		`CONFIG_DVB_EC100=m`
		`- CONFIG_DVB_STV0367=m`
		`- CONFIG_DVB_CXD2820R=m`
		`- CONFIG_DVB_CXD2841ER=m`
		`+ CONFIG_DVB_GP8PSK_FE=m`
		`+ CONFIG_DVB_L64781=m`
		`+ CONFIG_DVB_MT352=m`
		`+ CONFIG_DVB_NXT6000=m`
		`CONFIG_DVB_RTL2830=m`
		`CONFIG_DVB_RTL2832=m`
		`CONFIG_DVB_RTL2832_SDR=m`
		`+ CONFIG_DVB_S5H1432=m`
		`CONFIG_DVB_SI2168=m`
		`- CONFIG_DVB_AS102_FE=m`
		`+ CONFIG_DVB_SP887X=m`
		`+ CONFIG_DVB_STV0367=m`
		`+ CONFIG_DVB_TDA10048=m`
		`+ CONFIG_DVB_TDA1004X=m`
		`CONFIG_DVB_ZD1301_DEMOD=m`
		`- CONFIG_DVB_GP8PSK_FE=m`
		`+ CONFIG_DVB_ZL10353=m`
		`CONFIG_DVB_CXD2880=m`

		`#`
		`# DVB-C (cable) frontends`
		`#`
		`- CONFIG_DVB_VES1820=m`
		`+ CONFIG_DVB_STV0297=m`
		`CONFIG_DVB_TDA10021=m`
		`CONFIG_DVB_TDA10023=m`
		`- CONFIG_DVB_STV0297=m`
		`+ CONFIG_DVB_VES1820=m`

		`#`
		`# ATSC (North American/Korean Terrestrial/Cable DTV) frontends`
		`#`
		`- CONFIG_DVB_NXT200X=m`
		`- CONFIG_DVB_OR51211=m`
		`- CONFIG_DVB_OR51132=m`
		`+ CONFIG_DVB_AU8522=m`
		`+ CONFIG_DVB_AU8522_DTV=m`
		`+ CONFIG_DVB_AU8522_V4L=m`
		`CONFIG_DVB_BCM3510=m`
		`- CONFIG_DVB_LGDT330X=m`
		`+ CONFIG_DVB_LG2160=m`
		`CONFIG_DVB_LGDT3305=m`
		`CONFIG_DVB_LGDT3306A=m`
		`- CONFIG_DVB_LG2160=m`
		`+ CONFIG_DVB_LGDT330X=m`
		`+ CONFIG_DVB_MXL692=m`
		`+ CONFIG_DVB_NXT200X=m`
		`+ CONFIG_DVB_OR51132=m`
		`+ CONFIG_DVB_OR51211=m`
		`CONFIG_DVB_S5H1409=m`
		`- CONFIG_DVB_AU8522=m`
		`- CONFIG_DVB_AU8522_DTV=m`
		`- CONFIG_DVB_AU8522_V4L=m`
		`CONFIG_DVB_S5H1411=m`
		`- CONFIG_DVB_MXL692=m`

		`#`
		`# ISDB-T (terrestrial) frontends`
		`#`
		`- CONFIG_DVB_S921=m`
		`CONFIG_DVB_DIB8000=m`
		`CONFIG_DVB_MB86A20S=m`
		`+ CONFIG_DVB_S921=m`

		`#`
		`# ISDB-S (satellite) & ISDB-T (terrestrial) frontends`
		`#`
		`- CONFIG_DVB_TC90522=m`
		`CONFIG_DVB_MN88443X=m`
		`+ CONFIG_DVB_TC90522=m`

		`#`
		`# Digital terrestrial only tuners/PLL`
		`@@ -6591,25 +6722,25 @@`
		`#`
		`# SEC control devices for DVB-S`
		`#`
		`- CONFIG_DVB_DRX39XYJ=m`
		`- CONFIG_DVB_LNBH25=m`
		`- CONFIG_DVB_LNBH29=m`
		`- CONFIG_DVB_LNBP21=m`
		`- CONFIG_DVB_LNBP22=m`
		`+ CONFIG_DVB_A8293=m`
		`+ CONFIG_DVB_AF9033=m`
		`+ CONFIG_DVB_ASCOT2E=m`
		`+ CONFIG_DVB_ATBM8830=m`
		`+ CONFIG_DVB_HELENE=m`
		`+ CONFIG_DVB_HORUS3A=m`
		`CONFIG_DVB_ISL6405=m`
		`CONFIG_DVB_ISL6421=m`
		`CONFIG_DVB_ISL6423=m`
		`- CONFIG_DVB_A8293=m`
		`+ CONFIG_DVB_IX2505V=m`
		`CONFIG_DVB_LGS8GL5=m`
		`CONFIG_DVB_LGS8GXX=m`
		`- CONFIG_DVB_ATBM8830=m`
		`- CONFIG_DVB_TDA665x=m`
		`- CONFIG_DVB_IX2505V=m`
		`+ CONFIG_DVB_LNBH25=m`
		`+ CONFIG_DVB_LNBH29=m`
		`+ CONFIG_DVB_LNBP21=m`
		`+ CONFIG_DVB_LNBP22=m`
		`CONFIG_DVB_M88RS2000=m`
		`- CONFIG_DVB_AF9033=m`
		`- CONFIG_DVB_HORUS3A=m`
		`- CONFIG_DVB_ASCOT2E=m`
		`- CONFIG_DVB_HELENE=m`
		`+ CONFIG_DVB_TDA665x=m`
		`+ CONFIG_DVB_DRX39XYJ=m`

		`#`
		`# Common Interface (EN50221) controller drivers`
		`@@ -6639,8 +6770,6 @@`
		`CONFIG_AGP_VIA=m`
		`CONFIG_AGP_EFFICEON=m`
		`CONFIG_INTEL_GTT=m`
		`- CONFIG_VGA_ARB=y`
		`- CONFIG_VGA_ARB_MAX_GPUS=10`
		`CONFIG_VGA_SWITCHEROO=y`
		`CONFIG_DRM=m`
		`CONFIG_DRM_MIPI_DBI=m`
		`@@ -6648,6 +6777,7 @@`
		`CONFIG_DRM_DP_AUX_BUS=m`
		`CONFIG_DRM_DP_AUX_CHARDEV=y`
		`CONFIG_DRM_DEBUG_SELFTEST=m`
		`+ CONFIG_DRM_DP_HELPER=m`
		`CONFIG_DRM_KMS_HELPER=m`
		`# CONFIG_DRM_DEBUG_DP_MST_TOPOLOGY_REFS is not set`
		`# CONFIG_DRM_DEBUG_MODESET_LOCK is not set`
		`@@ -6657,6 +6787,7 @@`
		`CONFIG_DRM_LOAD_EDID_FIRMWARE=y`
		`CONFIG_DRM_DP_CEC=y`
		`CONFIG_DRM_TTM=m`
		`+ CONFIG_DRM_BUDDY=m`
		`CONFIG_DRM_VRAM_HELPER=m`
		`CONFIG_DRM_TTM_HELPER=m`
		`CONFIG_DRM_GEM_CMA_HELPER=m`
		`@@ -6790,6 +6921,7 @@`
		`CONFIG_DRM_PANEL_LG_LG4573=m`
		`CONFIG_DRM_PANEL_NEC_NL8048HL11=m`
		`CONFIG_DRM_PANEL_NOVATEK_NT35510=m`
		`+ # CONFIG_DRM_PANEL_NOVATEK_NT35560 is not set`
		`# CONFIG_DRM_PANEL_NOVATEK_NT35950 is not set`
		`# CONFIG_DRM_PANEL_NOVATEK_NT36672A is not set`
		`CONFIG_DRM_PANEL_NOVATEK_NT39016=m`
		`@@ -6822,7 +6954,6 @@`
		`CONFIG_DRM_PANEL_SITRONIX_ST7701=m`
		`CONFIG_DRM_PANEL_SITRONIX_ST7703=m`
		`CONFIG_DRM_PANEL_SITRONIX_ST7789V=m`
		`- CONFIG_DRM_PANEL_SONY_ACX424AKP=m`
		`CONFIG_DRM_PANEL_SONY_ACX565AKM=m`
		`# CONFIG_DRM_PANEL_SONY_TULIP_TRULY_NT35521 is not set`
		`# CONFIG_DRM_PANEL_TDO_TL070WSH30 is not set`
		`@@ -6846,6 +6977,7 @@`
		`# CONFIG_DRM_CHRONTEL_CH7033 is not set`
		`# CONFIG_DRM_CROS_EC_ANX7688 is not set`
		`CONFIG_DRM_DISPLAY_CONNECTOR=m`
		`+ # CONFIG_DRM_ITE_IT6505 is not set`
		`# CONFIG_DRM_LONTIUM_LT8912B is not set`
		`# CONFIG_DRM_LONTIUM_LT9611 is not set`
		`# CONFIG_DRM_LONTIUM_LT9611UXC is not set`
		`@@ -6892,6 +7024,7 @@`
		`CONFIG_DRM_BOCHS=m`
		`CONFIG_DRM_CIRRUS_QEMU=m`
		`CONFIG_DRM_GM12U320=m`
		`+ # CONFIG_DRM_PANEL_MIPI_DBI is not set`
		`# CONFIG_DRM_SIMPLEDRM is not set`
		`CONFIG_TINYDRM_HX8357D=m`
		`# CONFIG_TINYDRM_ILI9163 is not set`
		`@@ -6904,6 +7037,7 @@`
		`CONFIG_TINYDRM_ST7735R=m`
		`CONFIG_DRM_VBOXVIDEO=m`
		`# CONFIG_DRM_GUD is not set`
		`+ # CONFIG_DRM_SSD130X is not set`
		`# CONFIG_DRM_HYPERV is not set`
		`CONFIG_DRM_LEGACY=y`
		`CONFIG_DRM_TDFX=m`
		`@@ -7386,6 +7520,7 @@`
		`# CONFIG_SND_SOC_INTEL_SKYLAKE_HDAUDIO_CODEC is not set`
		`CONFIG_SND_SOC_INTEL_SKYLAKE_COMMON=m`
		`CONFIG_SND_SOC_ACPI_INTEL_MATCH=m`
		`+ # CONFIG_SND_SOC_INTEL_AVS is not set`
		`CONFIG_SND_SOC_INTEL_MACH=y`
		`# CONFIG_SND_SOC_INTEL_USER_FRIENDLY_LONG_NAMES is not set`
		`CONFIG_SND_SOC_INTEL_HDA_DSP_COMMON=m`
		`@@ -7417,7 +7552,6 @@`
		`CONFIG_SND_SOC_SOF_PCI=m`
		`CONFIG_SND_SOC_SOF_ACPI=m`
		`CONFIG_SND_SOC_SOF_OF=m`
		`- # CONFIG_SND_SOC_SOF_DEBUG_PROBES is not set`
		`# CONFIG_SND_SOC_SOF_AMD_TOPLEVEL is not set`
		`# CONFIG_SND_SOC_SOF_INTEL_TOPLEVEL is not set`

		`@@ -7457,6 +7591,7 @@`
		`CONFIG_SND_SOC_AK5386=m`
		`CONFIG_SND_SOC_AK5558=m`
		`CONFIG_SND_SOC_ALC5623=m`
		`+ # CONFIG_SND_SOC_AW8738 is not set`
		`CONFIG_SND_SOC_BD28623=m`
		`# CONFIG_SND_SOC_BT_SCO is not set`
		`CONFIG_SND_SOC_CPCAP=m`
		`@@ -7592,6 +7727,7 @@`
		`CONFIG_SND_SOC_TAS5086=m`
		`CONFIG_SND_SOC_TAS571X=m`
		`CONFIG_SND_SOC_TAS5720=m`
		`+ # CONFIG_SND_SOC_TAS5805M is not set`
		`CONFIG_SND_SOC_TAS6424=m`
		`CONFIG_SND_SOC_TDA7419=m`
		`CONFIG_SND_SOC_TFA9879=m`
		`@@ -7716,6 +7852,7 @@`
		`CONFIG_HID_GLORIOUS=m`
		`CONFIG_HID_HOLTEK=m`
		`CONFIG_HOLTEK_FF=y`
		`+ CONFIG_HID_VIVALDI_COMMON=m`
		`CONFIG_HID_GOOGLE_HAMMER=m`
		`# CONFIG_HID_VIVALDI is not set`
		`CONFIG_HID_GT683R=m`
		`@@ -7765,12 +7902,14 @@`
		`CONFIG_HID_PICOLCD_CIR=y`
		`CONFIG_HID_PLANTRONICS=m`
		`# CONFIG_HID_PLAYSTATION is not set`
		`+ # CONFIG_HID_RAZER is not set`
		`CONFIG_HID_PRIMAX=m`
		`CONFIG_HID_RETRODE=m`
		`CONFIG_HID_ROCCAT=m`
		`CONFIG_HID_SAITEK=m`
		`CONFIG_HID_SAMSUNG=m`
		`# CONFIG_HID_SEMITEK is not set`
		`+ # CONFIG_HID_SIGMAMICRO is not set`
		`CONFIG_HID_SONY=m`
		`CONFIG_SONY_FF=y`
		`CONFIG_HID_SPEEDLINK=m`
		`@@ -8209,8 +8348,10 @@`
		`CONFIG_UCSI_CCG=m`
		`CONFIG_UCSI_ACPI=m`
		`CONFIG_TYPEC_TPS6598X=m`
		`+ # CONFIG_TYPEC_RT1719 is not set`
		`# CONFIG_TYPEC_HD3SS3220 is not set`
		`# CONFIG_TYPEC_STUSB160X is not set`
		`+ # CONFIG_TYPEC_WUSB3801 is not set`

		`#`
		`# USB Type-C Multiplexer/DeMultiplexer Switch support`
		`@@ -8727,9 +8868,11 @@`
		`CONFIG_VFIO_PCI=m`
		`CONFIG_VFIO_PCI_VGA=y`
		`CONFIG_VFIO_PCI_IGD=y`
		`+ # CONFIG_MLX5_VFIO_PCI is not set`
		`CONFIG_VFIO_MDEV=m`
		`CONFIG_IRQ_BYPASS_MANAGER=m`
		`CONFIG_VIRT_DRIVERS=y`
		`+ CONFIG_VMGENID=y`
		`CONFIG_VBOXGUEST=m`
		`# CONFIG_NITRO_ENCLAVES is not set`
		`CONFIG_VIRTIO=m`
		`@@ -8944,7 +9087,6 @@`
		`# Analog to digital converters`
		`#`
		`CONFIG_AD7816=m`
		`- CONFIG_AD7280=m`
		`# end of Analog to digital converters`

		`#`
		`@@ -9000,18 +9142,11 @@`
		`CONFIG_DVB_AV7110_OSD=y`
		`CONFIG_DVB_BUDGET_PATCH=m`
		`CONFIG_DVB_SP8870=m`
		`-`
		`- #`
		`- # Android`
		`- #`
		`- # end of Android`
		`-`
		`CONFIG_STAGING_BOARD=y`
		`CONFIG_LTE_GDM724X=m`
		`CONFIG_FIREWIRE_SERIAL=m`
		`CONFIG_FWTTY_MAX_TOTAL_PORTS=64`
		`CONFIG_FWTTY_MAX_CARD_PORTS=32`
		`- CONFIG_GS_FPGABOOT=m`
		`CONFIG_UNISYSSPAR=y`
		`# CONFIG_COMMON_CLK_XLNX_CLKWZRD is not set`
		`# CONFIG_FB_TFT is not set`
		`@@ -9077,7 +9212,6 @@`
		`CONFIG_INTEL_ATOMISP2_LED=m`
		`CONFIG_INTEL_ATOMISP2_PM=m`
		`# CONFIG_INTEL_SAR_INT1092 is not set`
		`- CONFIG_INTEL_CHT_INT33FE=m`
		`# CONFIG_INTEL_SKL_INT3472 is not set`
		`CONFIG_INTEL_PMC_CORE=y`
		`CONFIG_INTEL_WMI=y`
		`@@ -9088,6 +9222,7 @@`
		`CONFIG_INTEL_INT0002_VGPIO=m`
		`CONFIG_INTEL_OAKTRAIL=m`
		`CONFIG_INTEL_CHTDC_TI_PWRBTN=m`
		`+ # CONFIG_INTEL_CHTWC_INT33FE is not set`
		`CONFIG_INTEL_PUNIT_IPC=m`
		`CONFIG_INTEL_RST=m`
		`CONFIG_INTEL_SMARTCONNECT=m`
		`@@ -9110,7 +9245,7 @@`
		`CONFIG_SONYPI_COMPAT=y`
		`# CONFIG_SYSTEM76_ACPI is not set`
		`CONFIG_TOPSTAR_LAPTOP=m`
		`- CONFIG_I2C_MULTI_INSTANTIATE=m`
		`+ # CONFIG_SERIAL_MULTI_INSTANTIATE is not set`
		`CONFIG_MLX_PLATFORM=m`
		`CONFIG_TOUCHSCREEN_DMI=y`
		`# CONFIG_X86_ANDROID_TABLETS is not set`
		`@@ -9139,6 +9274,7 @@`
		`CONFIG_CROS_EC_TYPEC=m`
		`CONFIG_CROS_USBPD_LOGGER=m`
		`CONFIG_CROS_USBPD_NOTIFY=m`
		`+ # CONFIG_CHROMEOS_PRIVACY_SCREEN is not set`
		`CONFIG_WILCO_EC=m`
		`CONFIG_WILCO_EC_DEBUGFS=m`
		`CONFIG_WILCO_EC_EVENTS=m`
		`@@ -9149,7 +9285,6 @@`
		`# CONFIG_MLXREG_LC is not set`
		`CONFIG_SURFACE_PLATFORMS=y`
		`CONFIG_SURFACE3_WMI=m`
		`- CONFIG_SURFACE_3_BUTTON=m`
		`CONFIG_SURFACE_3_POWER_OPREGION=m`
		`# CONFIG_SURFACE_GPE is not set`
		`# CONFIG_SURFACE_HOTPLUG is not set`
		`@@ -9171,12 +9306,12 @@`
		`CONFIG_COMMON_CLK_CDCE706=m`
		`CONFIG_COMMON_CLK_CDCE925=m`
		`CONFIG_COMMON_CLK_CS2000_CP=m`
		`- # CONFIG_COMMON_CLK_LAN966X is not set`
		`CONFIG_COMMON_CLK_S2MPS11=m`
		`CONFIG_CLK_TWL6040=m`
		`# CONFIG_COMMON_CLK_AXI_CLKGEN is not set`
		`CONFIG_COMMON_CLK_PALMAS=m`
		`CONFIG_COMMON_CLK_PWM=m`
		`+ # CONFIG_COMMON_CLK_RS9_PCIE is not set`
		`CONFIG_COMMON_CLK_VC5=m`
		`CONFIG_COMMON_CLK_BD718XX=m`
		`# CONFIG_COMMON_CLK_FIXED_MMIO is not set`
		`@@ -9234,6 +9369,7 @@`
		`#`
		`CONFIG_RPMSG=m`
		`CONFIG_RPMSG_CHAR=m`
		`+ # CONFIG_RPMSG_CTRL is not set`
		`CONFIG_RPMSG_NS=m`
		`CONFIG_RPMSG_QCOM_GLINK=m`
		`CONFIG_RPMSG_QCOM_GLINK_RPM=m`
		`@@ -9357,6 +9493,8 @@`
		`# CONFIG_ADXL313_SPI is not set`
		`# CONFIG_ADXL355_I2C is not set`
		`# CONFIG_ADXL355_SPI is not set`
		`+ # CONFIG_ADXL367_SPI is not set`
		`+ # CONFIG_ADXL367_I2C is not set`
		`CONFIG_ADXL372=m`
		`CONFIG_ADXL372_SPI=m`
		`CONFIG_ADXL372_I2C=m`
		`@@ -9409,6 +9547,7 @@`
		`CONFIG_AD7124=m`
		`CONFIG_AD7192=m`
		`CONFIG_AD7266=m`
		`+ CONFIG_AD7280=m`
		`CONFIG_AD7291=m`
		`# CONFIG_AD7292 is not set`
		`CONFIG_AD7298=m`
		`@@ -9499,6 +9638,7 @@`
		`# Amplifiers`
		`#`
		`CONFIG_AD8366=m`
		`+ # CONFIG_ADA4250 is not set`
		`CONFIG_HMC425=m`
		`# end of Amplifiers`

		`@@ -9575,6 +9715,7 @@`
		`CONFIG_AD5593R=m`
		`CONFIG_AD5504=m`
		`CONFIG_AD5624R_SPI=m`
		`+ # CONFIG_LTC2688 is not set`
		`CONFIG_AD5686=m`
		`CONFIG_AD5686_SPI=m`
		`CONFIG_AD5696_I2C=m`
		`@@ -9631,6 +9772,7 @@`
		`CONFIG_ADF4350=m`
		`CONFIG_ADF4371=m`
		`# CONFIG_ADMV1013 is not set`
		`+ # CONFIG_ADMV4420 is not set`
		`# CONFIG_ADRF6780 is not set`
		`# end of Phase-Locked Loop (PLL) frequency synthesizers`
		`# end of Frequency Synthesizers DDS/PLL`
		`@@ -9900,6 +10042,8 @@`
		`CONFIG_RFD77402=m`
		`CONFIG_SRF04=m`
		`# CONFIG_SX9310 is not set`
		`+ # CONFIG_SX9324 is not set`
		`+ # CONFIG_SX9360 is not set`
		`CONFIG_SX9500=m`
		`CONFIG_SRF08=m`
		`# CONFIG_VCNL3020 is not set`
		`@@ -10008,11 +10152,9 @@`

		`CONFIG_PHY_CADENCE_TORRENT=m`
		`CONFIG_PHY_CADENCE_DPHY=m`
		`+ # CONFIG_PHY_CADENCE_DPHY_RX is not set`
		`CONFIG_PHY_CADENCE_SIERRA=m`
		`# CONFIG_PHY_CADENCE_SALVO is not set`
		`- CONFIG_PHY_FSL_IMX8MQ_USB=m`
		`- CONFIG_PHY_MIXEL_MIPI_DPHY=m`
		`- # CONFIG_PHY_FSL_IMX8M_PCIE is not set`
		`CONFIG_PHY_PXA_28NM_HSIC=m`
		`CONFIG_PHY_PXA_28NM_USB2=m`
		`# CONFIG_PHY_LAN966X_SERDES is not set`
		`@@ -10143,6 +10285,7 @@`
		`CONFIG_MOST_USB_HDM=m`
		`CONFIG_MOST_CDEV=m`
		`# CONFIG_MOST_SND is not set`
		`+ # CONFIG_PECI is not set`
		`# end of Device Drivers`

		`#`
		`@@ -10206,8 +10349,8 @@`
		`# CONFIG_F2FS_FAULT_INJECTION is not set`
		`# CONFIG_F2FS_FS_COMPRESSION is not set`
		`CONFIG_F2FS_IOSTAT=y`
		`+ # CONFIG_F2FS_UNFAIR_RWSEM is not set`
		`CONFIG_ZONEFS_FS=m`
		`- CONFIG_FS_DAX=y`
		`CONFIG_FS_POSIX_ACL=y`
		`CONFIG_EXPORTFS=y`
		`CONFIG_EXPORTFS_BLOCK_OPS=y`
		`@@ -10233,7 +10376,6 @@`
		`CONFIG_FUSE_FS=m`
		`CONFIG_CUSE=m`
		`CONFIG_VIRTIO_FS=m`
		`- CONFIG_FUSE_DAX=y`
		`CONFIG_OVERLAY_FS=m`
		`CONFIG_OVERLAY_FS_REDIRECT_DIR=y`
		`# CONFIG_OVERLAY_FS_REDIRECT_ALWAYS_FOLLOW is not set`
		`@@ -10416,7 +10558,6 @@`
		`# CONFIG_NFS_V4_2_READ_PLUS is not set`
		`CONFIG_NFSD=m`
		`CONFIG_NFSD_V2_ACL=y`
		`- CONFIG_NFSD_V3=y`
		`CONFIG_NFSD_V3_ACL=y`
		`CONFIG_NFSD_V4=y`
		`CONFIG_NFSD_PNFS=y`
		`@@ -10532,19 +10673,18 @@`
		`CONFIG_PERSISTENT_KEYRINGS=y`
		`CONFIG_TRUSTED_KEYS=m`
		`CONFIG_ENCRYPTED_KEYS=m`
		`+ # CONFIG_USER_DECRYPTED_DATA is not set`
		`CONFIG_KEY_DH_OPERATIONS=y`
		`# CONFIG_SECURITY_DMESG_RESTRICT is not set`
		`CONFIG_SECURITY=y`
		`CONFIG_SECURITYFS=y`
		`CONFIG_SECURITY_NETWORK=y`
		`- CONFIG_PAGE_TABLE_ISOLATION=y`
		`CONFIG_SECURITY_INFINIBAND=y`
		`CONFIG_SECURITY_NETWORK_XFRM=y`
		`CONFIG_SECURITY_PATH=y`
		`# CONFIG_INTEL_TXT is not set`
		`CONFIG_HAVE_HARDENED_USERCOPY_ALLOCATOR=y`
		`CONFIG_HARDENED_USERCOPY=y`
		`- # CONFIG_HARDENED_USERCOPY_PAGESPAN is not set`
		`CONFIG_FORTIFY_SOURCE=y`
		`# CONFIG_STATIC_USERMODEHELPER is not set`
		`# CONFIG_SECURITY_SMACK is not set`
		`@@ -10627,6 +10767,7 @@`
		`#`
		`CONFIG_CRYPTO_RSA=y`
		`CONFIG_CRYPTO_DH=y`
		`+ # CONFIG_CRYPTO_DH_RFC7919_GROUPS is not set`
		`CONFIG_CRYPTO_ECC=m`
		`CONFIG_CRYPTO_ECDH=m`
		`# CONFIG_CRYPTO_ECDSA is not set`
		`@@ -10680,6 +10821,7 @@`
		`CONFIG_CRYPTO_BLAKE2B=m`
		`# CONFIG_CRYPTO_BLAKE2S is not set`
		`CONFIG_CRYPTO_CRCT10DIF=y`
		`+ CONFIG_CRYPTO_CRC64_ROCKSOFT=y`
		`CONFIG_CRYPTO_GHASH=y`
		`CONFIG_CRYPTO_POLY1305=m`
		`CONFIG_CRYPTO_MD4=m`
		`@@ -10779,10 +10921,8 @@`
		`# CONFIG_CRYPTO_DEV_AMLOGIC_GXL is not set`
		`CONFIG_ASYMMETRIC_KEY_TYPE=y`
		`CONFIG_ASYMMETRIC_PUBLIC_KEY_SUBTYPE=y`
		`- CONFIG_ASYMMETRIC_TPM_KEY_SUBTYPE=m`
		`CONFIG_X509_CERTIFICATE_PARSER=y`
		`CONFIG_PKCS8_PRIVATE_KEY_PARSER=m`
		`- CONFIG_TPM_KEY_PARSER=m`
		`CONFIG_PKCS7_MESSAGE_PARSER=y`
		`# CONFIG_PKCS7_TEST_KEY is not set`
		`CONFIG_SIGNED_PE_FILE_VERIFICATION=y`
		`@@ -10836,12 +10976,15 @@`
		`CONFIG_CRYPTO_LIB_POLY1305=m`
		`CONFIG_CRYPTO_LIB_CHACHA20POLY1305=m`
		`CONFIG_CRYPTO_LIB_SHA256=y`
		`+ CONFIG_CRYPTO_LIB_SM3=m`
		`CONFIG_CRYPTO_LIB_SM4=m`
		`# end of Crypto library routines`

		`+ CONFIG_LIB_MEMNEQ=y`
		`CONFIG_CRC_CCITT=y`
		`CONFIG_CRC16=m`
		`CONFIG_CRC_T10DIF=y`
		`+ CONFIG_CRC64_ROCKSOFT=y`
		`CONFIG_CRC_ITU_T=m`
		`CONFIG_CRC32=y`
		`# CONFIG_CRC32_SELFTEST is not set`
		`@@ -10849,7 +10992,7 @@`
		`# CONFIG_CRC32_SLICEBY4 is not set`
		`# CONFIG_CRC32_SARWATE is not set`
		`# CONFIG_CRC32_BIT is not set`
		`- CONFIG_CRC64=m`
		`+ CONFIG_CRC64=y`
		`CONFIG_CRC4=m`
		`CONFIG_CRC7=m`
		`CONFIG_LIBCRC32C=m`
		`@@ -10986,10 +11129,16 @@`
		`CONFIG_DEBUG_BUGVERBOSE=y`
		`# end of printk and dmesg options`

		`+ CONFIG_DEBUG_KERNEL=y`
		`+ CONFIG_DEBUG_MISC=y`
		`+`
		`#`
		`# Compile-time checks and compiler options`
		`#`
		`- # CONFIG_DEBUG_INFO is not set`
		`+ CONFIG_DEBUG_INFO_NONE=y`
		`+ # CONFIG_DEBUG_INFO_DWARF_TOOLCHAIN_DEFAULT is not set`
		`+ # CONFIG_DEBUG_INFO_DWARF4 is not set`
		`+ # CONFIG_DEBUG_INFO_DWARF5 is not set`
		`CONFIG_FRAME_WARN=1024`
		`CONFIG_STRIP_ASM_SYMS=y`
		`# CONFIG_READABLE_ASM is not set`
		`@@ -11019,9 +11168,6 @@`
		`CONFIG_HAVE_KCSAN_COMPILER=y`
		`# end of Generic Kernel Debugging Instruments`

		`- CONFIG_DEBUG_KERNEL=y`
		`- CONFIG_DEBUG_MISC=y`
		`-`
		`#`
		`# Networking Debugging`
		`#`
		`@@ -11154,6 +11300,8 @@`
		`CONFIG_LATENCYTOP=y`
		`CONFIG_USER_STACKTRACE_SUPPORT=y`
		`CONFIG_NOP_TRACER=y`
		`+ CONFIG_HAVE_RETHOOK=y`
		`+ CONFIG_RETHOOK=y`
		`CONFIG_HAVE_FUNCTION_TRACER=y`
		`CONFIG_HAVE_FUNCTION_GRAPH_TRACER=y`
		`CONFIG_HAVE_DYNAMIC_FTRACE=y`
		`@@ -11180,6 +11328,7 @@`
		`CONFIG_DYNAMIC_FTRACE=y`
		`CONFIG_DYNAMIC_FTRACE_WITH_REGS=y`
		`CONFIG_DYNAMIC_FTRACE_WITH_DIRECT_CALLS=y`
		`+ # CONFIG_FPROBE is not set`
		`CONFIG_FUNCTION_PROFILER=y`
		`CONFIG_STACK_TRACER=y`
		`# CONFIG_IRQSOFF_TRACER is not set`
		`@@ -11283,7 +11432,6 @@`
		`# CONFIG_TEST_BITMAP is not set`
		`# CONFIG_TEST_UUID is not set`
		`CONFIG_TEST_XARRAY=m`
		`- CONFIG_TEST_OVERFLOW=m`
		`# CONFIG_TEST_RHASHTABLE is not set`
		`# CONFIG_TEST_SIPHASH is not set`
		`CONFIG_TEST_IDA=m`
		`@@ -11302,7 +11450,6 @@`
		`# CONFIG_TEST_KMOD is not set`
		`CONFIG_TEST_MEMCAT_P=m`
		`CONFIG_TEST_OBJAGG=m`
		`- CONFIG_TEST_STACKINIT=m`
		`CONFIG_TEST_MEMINIT=m`
		`CONFIG_TEST_FREE_PAGES=m`
		`CONFIG_TEST_FPU=m`

libre/linux-libre-pck/0001-ARM-atags-add-support-for-Marvell-s-u-boot.patch

file added

+51

		`@@ -0,0 +1,51 @@`
		`+ From cf30569da906ee631341244693ab1affde38809d Mon Sep 17 00:00:00 2001`
		`+ From: Willy Tarreau <w@xxxxxx>`
		`+ Date: Sun, 2 Dec 2012 19:59:28 +0100`
		`+ Subject: [PATCH 1/7] ARM: atags: add support for Marvell's u-boot`
		`+`
		`+ Marvell uses a specific atag in its u-boot which includes among other`
		`+ information the MAC addresses for up to 4 network interfaces.`
		`+`
		`+ Signed-off-by: Willy Tarreau <w@xxxxxx>`
		`+ ---`
		`+ arch/arm/include/uapi/asm/setup.h \| 17 +++++++++++++++++`
		`+ 1 file changed, 17 insertions(+)`
		`+`
		`+ diff --git a/arch/arm/include/uapi/asm/setup.h b/arch/arm/include/uapi/asm/setup.h`
		`+ index 25ceda63b284..83578c54975b 100644`
		`+ --- a/arch/arm/include/uapi/asm/setup.h`
		`+ +++ b/arch/arm/include/uapi/asm/setup.h`
		`+ @@ -144,6 +144,18 @@ struct tag_memclk {`
		`+ __u32 fmemclk;`
		`+ };`
		`+`
		`+ +/* Marvell uboot parameters */`
		`+ +#define ATAG_MV_UBOOT 0x41000403`
		`+ +struct tag_mv_uboot {`
		`+ + __u32 uboot_version;`
		`+ + __u32 tclk;`
		`+ + __u32 sysclk;`
		`+ + __u32 isUsbHost;`
		`+ + __u8 macAddr[4][6];`
		`+ + __u16 mtu[4];`
		`+ + __u32 nand_ecc;`
		`+ +};`
		`+ +`
		`+ struct tag {`
		`+ struct tag_header hdr;`
		`+ union {`
		`+ @@ -166,6 +178,11 @@ struct tag {`
		`+ * DC21285 specific`
		`+ */`
		`+ struct tag_memclk memclk;`
		`+ +`
		`+ + /*`
		`+ + * Marvell specific`
		`+ + */`
		`+ + struct tag_mv_uboot mv_uboot;`
		`+ } u;`
		`+ };`
		`+`
		`+ --`
		`+ 2.35.1`
		`+`

libre/linux-libre-pck/0001-usb-serial-gadget-no-TTY-hangup-on-USB-disconnect-WI.patch

file added

+39

		`@@ -0,0 +1,39 @@`
		`+ From 716120e8010a7f400c6bed7384000e95e1465c94 Mon Sep 17 00:00:00 2001`
		`+ From: =?UTF-8?q?Ky=C3=B6sti=20M=C3=A4lkki?= <kyosti.malkki@gmail.com>`
		`+ Date: Mon, 26 Aug 2013 19:19:44 +0300`
		`+ Subject: [PATCH 1/2] usb serial gadget: no TTY hangup on USB disconnect [WIP]`
		`+ MIME-Version: 1.0`
		`+ Content-Type: text/plain; charset=UTF-8`
		`+ Content-Transfer-Encoding: 8bit`
		`+`
		`+ We may want to maintain the TTY over USB disconnects.`
		`+`
		`+ This is useful when we have a terminal console to a host which`
		`+ power-cycles or for other reasons resets the USB host controller.`
		`+`
		`+ Signed-off-by: Kyösti Mälkki <kyosti.malkki@gmail.com>`
		`+ ---`
		`+ drivers/usb/gadget/function/u_serial.c \| 5 +++++`
		`+ 1 file changed, 5 insertions(+)`
		`+`
		`+ diff --git a/drivers/usb/gadget/function/u_serial.c b/drivers/usb/gadget/function/u_serial.c`
		`+ index b369292..d156a28 100644`
		`+ --- a/drivers/usb/gadget/function/u_serial.c`
		`+ +++ b/drivers/usb/gadget/function/u_serial.c`
		`+ @@ -1258,8 +1258,13 @@ void gserial_disconnect(struct gserial *gser)`
		`+ gser->ioport = NULL;`
		`+ if (port->port.count > 0 \|\| port->openclose) {`
		`+ wake_up_interruptible(&port->drain_wait);`
		`+ +#if 0`
		`+ if (port->port.tty)`
		`+ tty_hangup(port->port.tty);`
		`+ +#else`
		`+ + if (port->port.tty)`
		`+ + stop_tty(port->port.tty);`
		`+ +#endif`
		`+ }`
		`+ spin_unlock_irqrestore(&port->port_lock, flags);`
		`+`
		`+ --`
		`+ 1.8.1.1`
		`+`

libre/linux-libre-pck/0002-ARM-atags-fdt-retrieve-MAC-addresses-from-Marvell-bo.patch

file added

+38

		`@@ -0,0 +1,38 @@`
		`+ From 9f2269dc32ec1f583bba94432ca17dcef3778677 Mon Sep 17 00:00:00 2001`
		`+ From: Willy Tarreau <w@xxxxxx>`
		`+ Date: Sun, 2 Dec 2012 19:56:58 +0100`
		`+ Subject: [PATCH 2/7] ARM: atags/fdt: retrieve MAC addresses from Marvell boot`
		`+ loader`
		`+`
		`+ The atags are parsed and if a Marvell atag is found, up to 4 MAC`
		`+ addresses are extracted there and assigned to node aliases eth0..3`
		`+ with the name "mac-address".`
		`+`
		`+ This was tested on my Mirabox and the two NICs had their correct`
		`+ address set.`
		`+`
		`+ Signed-off-by: Willy Tarreau <w@xxxxxx>`
		`+ ---`
		`+ arch/arm/boot/compressed/atags_to_fdt.c \| 6 ++++++`
		`+ 1 file changed, 6 insertions(+)`
		`+`
		`+ diff --git a/arch/arm/boot/compressed/atags_to_fdt.c b/arch/arm/boot/compressed/atags_to_fdt.c`
		`+ index 1feb6b0f7a1f..5e5cb3094b6a 100644`
		`+ --- a/arch/arm/boot/compressed/atags_to_fdt.c`
		`+ +++ b/arch/arm/boot/compressed/atags_to_fdt.c`
		`+ @@ -205,6 +205,12 @@ int atags_to_fdt(void atag_list, void fdt, int total_space)`
		`+ hex_str(serno, atag->u.serialnr.high);`
		`+ hex_str(serno+8, atag->u.serialnr.low);`
		`+ setprop_string(fdt, "/", "serial-number", serno);`
		`+ + } else if (atag->hdr.tag == ATAG_MV_UBOOT) {`
		`+ + /* This ATAG provides up to 4 MAC addresses */`
		`+ + setprop(fdt, "eth0", "mac-address", atag->u.mv_uboot.macAddr[0], 6);`
		`+ + setprop(fdt, "eth1", "mac-address", atag->u.mv_uboot.macAddr[1], 6);`
		`+ + setprop(fdt, "eth2", "mac-address", atag->u.mv_uboot.macAddr[2], 6);`
		`+ + setprop(fdt, "eth3", "mac-address", atag->u.mv_uboot.macAddr[3], 6);`
		`+ }`
		`+ }`
		`+`
		`+ --`
		`+ 2.35.1`
		`+`

libre/linux-libre-pck/0002-fix-Atmel-maXTouch-touchscreen-support.patch

file added

+37

		`@@ -0,0 +1,37 @@`
		`+ From ab8cc1b2dc1b716d5c08f72dacbe1eded269f304 Mon Sep 17 00:00:00 2001`
		`+ From: André Silva <emulatorman@parabola.nu>`
		`+ Date: Tue, 22 Mar 2016 17:58:59 -0300`
		`+ Subject: [PATCH 2/2] fix Atmel maXTouch touchscreen support`
		`+`
		`+ The Atmel maXTouch touchscreen works with Linux-libre 3.13-gnu,`
		`+ but not with the current longterm and mainline kernels in`
		`+ Parabola.`
		`+`
		`+ Now it needs to load nonfree firmware in mxt_initialize(),`
		`+ which is in drivers/input/touchscreen/atmel_mxt_ts.c, and the`
		`+ atmel_mxt_ts driver fails to work.`
		`+`
		`+ This driver works if changing reject_firmware_nowait to`
		`+ request_firmware_nowait in atmel_mxt_ts.c. This line is`
		`+ requesting the file named MXT_CFG_NAME, and it's a config file,`
		`+ not the firmware blob.`
		`+`
		`+ Signed-off-by: André Silva <emulatorman@parabola.nu>`
		`+ Signed-off-by: mytbk <mytbk920423@gmail.com>`
		`+ ---`
		`+ drivers/input/touchscreen/atmel_mxt_ts.c \| 2 +-`
		`+ 1 file changed, 1 insertion(+), 1 deletion(-)`
		`+`
		`+ diff --git a/drivers/input/touchscreen/atmel_mxt_ts.c b/drivers/input/touchscreen/atmel_mxt_ts.c`
		`+ index 726a83e..d818834 100644`
		`+ --- a/drivers/input/touchscreen/atmel_mxt_ts.c`
		`+ +++ b/drivers/input/touchscreen/atmel_mxt_ts.c`
		`+ @@ -1989,7 +1989,7 @@ static int mxt_initialize(struct mxt_data *data)`
		`+ if (error)`
		`+ goto err_free_object_table;`
		`+`
		`+ - error = reject_firmware_nowait(THIS_MODULE, true, MXT_CFG_NAME,`
		`+ + error = request_firmware_nowait(THIS_MODULE, true, MXT_CFG_NAME,`
		`+ &client->dev, GFP_KERNEL, data,`
		`+ mxt_config_cb);`
		`+ if (error) {`

libre/linux-libre-pck/0003-fix-mvsdio-eMMC-timing.patch

file added

+38

		`@@ -0,0 +1,38 @@`
		`+ From e8da1680d0273aaca806c23a10b4f3467a6b4f96 Mon Sep 17 00:00:00 2001`
		`+ From: Kevin Mihelich <kevin@archlinuxarm.org>`
		`+ Date: Fri, 5 Sep 2014 15:43:56 -0600`
		`+ Subject: [PATCH 3/7] fix mvsdio eMMC timing`
		`+`
		`+ These changes from Globalscale change the MMC timing to allow the eMMC versions`
		`+ of the Mirabox and SMILE Plug to work.`
		`+`
		`+ Signed-off-by: Kevin Mihelich <kevin@archlinuxarm.org>`
		`+ ---`
		`+ drivers/mmc/host/mvsdio.c \| 4 +++-`
		`+ 1 file changed, 3 insertions(+), 1 deletion(-)`
		`+`
		`+ diff --git a/drivers/mmc/host/mvsdio.c b/drivers/mmc/host/mvsdio.c`
		`+ index 629efbe639c4..c507c064736c 100644`
		`+ --- a/drivers/mmc/host/mvsdio.c`
		`+ +++ b/drivers/mmc/host/mvsdio.c`
		`+ @@ -90,7 +90,7 @@ static int mvsd_setup_data(struct mvsd_host host, struct mmc_data data)`
		`+ tmout_index = fls(tmout - 1) - 12;`
		`+ if (tmout_index < 0)`
		`+ tmout_index = 0;`
		`+ - if (tmout_index > MVSD_HOST_CTRL_TMOUT_MAX)`
		`+ +// if (tmout_index > MVSD_HOST_CTRL_TMOUT_MAX) //by steven, try to setup the timeout to maximum value`
		`+ tmout_index = MVSD_HOST_CTRL_TMOUT_MAX;`
		`+`
		`+ dev_dbg(host->dev, "data %s at 0x%08x: blocks=%d blksz=%d tmout=%u (%d)\n",`
		`+ @@ -613,6 +613,8 @@ static void mvsd_set_ios(struct mmc_host mmc, struct mmc_ios ios)`
		`+ u32 m = DIV_ROUND_UP(host->base_clock, ios->clock) - 1;`
		`+ if (m > MVSD_BASE_DIV_MAX)`
		`+ m = MVSD_BASE_DIV_MAX;`
		`+ + if(ios->clock==50000000 ) //by steven`
		`+ + m=1;`
		`+ mvsd_write(MVSD_CLK_DIV, m);`
		`+ host->clock = ios->clock;`
		`+ host->ns_per_clk = 1000000000 / (host->base_clock / (m+1));`
		`+ --`
		`+ 2.35.1`
		`+`

libre/linux-libre-pck/0004-net-smsc95xx-Allow-mac-address-to-be-set-as-a-parame.patch

file added

+95

		`@@ -0,0 +1,95 @@`
		`+ From f0eaedee0904275b2ed55b383dba794d53fac17d Mon Sep 17 00:00:00 2001`
		`+ From: popcornmix <popcornmix@gmail.com>`
		`+ Date: Tue, 18 Feb 2014 01:43:50 -0300`
		`+ Subject: [PATCH 4/7] net/smsc95xx: Allow mac address to be set as a parameter`
		`+`
		`+ ---`
		`+ drivers/net/usb/smsc95xx.c \| 56 ++++++++++++++++++++++++++++++++++++++`
		`+ 1 file changed, 56 insertions(+)`
		`+`
		`+ diff --git a/drivers/net/usb/smsc95xx.c b/drivers/net/usb/smsc95xx.c`
		`+ index bc1e3dd67c04..51ae8e6fec4e 100644`
		`+ --- a/drivers/net/usb/smsc95xx.c`
		`+ +++ b/drivers/net/usb/smsc95xx.c`
		`+ @@ -50,6 +50,7 @@`
		`+ #define SUSPEND_SUSPEND3 (0x08)`
		`+ #define SUSPEND_ALLMODES (SUSPEND_SUSPEND0 \| SUSPEND_SUSPEND1 \| \`
		`+ SUSPEND_SUSPEND2 \| SUSPEND_SUSPEND3)`
		`+ +#define MAC_ADDR_LEN (6)`
		`+`
		`+ struct smsc95xx_priv {`
		`+ u32 mac_cr;`
		`+ @@ -67,6 +68,10 @@ static bool turbo_mode = true;`
		`+ module_param(turbo_mode, bool, 0644);`
		`+ MODULE_PARM_DESC(turbo_mode, "Enable multiple frames per Rx transaction");`
		`+`
		`+ +static char *macaddr = ":";`
		`+ +module_param(macaddr, charp, 0);`
		`+ +MODULE_PARM_DESC(macaddr, "MAC address");`
		`+ +`
		`+ static int __must_check __smsc95xx_read_reg(struct usbnet *dev, u32 index,`
		`+ u32 *data, int in_pm)`
		`+ {`
		`+ @@ -753,8 +758,59 @@ static int smsc95xx_ioctl(struct net_device netdev, struct ifreq rq, int cmd)`
		`+ return phy_mii_ioctl(netdev->phydev, rq, cmd);`
		`+ }`
		`+`
		`+ +/* Check the macaddr module parameter for a MAC address */`
		`+ +static int smsc95xx_is_macaddr_param(struct usbnet dev, u8 dev_mac)`
		`+ +{`
		`+ + int i, j, got_num, num;`
		`+ + u8 mtbl[MAC_ADDR_LEN];`
		`+ +`
		`+ + if (macaddr[0] == ':')`
		`+ + return 0;`
		`+ +`
		`+ + i = 0;`
		`+ + j = 0;`
		`+ + num = 0;`
		`+ + got_num = 0;`
		`+ + while (j < MAC_ADDR_LEN) {`
		`+ + if (macaddr[i] && macaddr[i] != ':') {`
		`+ + got_num++;`
		`+ + if ('0' <= macaddr[i] && macaddr[i] <= '9')`
		`+ + num = num * 16 + macaddr[i] - '0';`
		`+ + else if ('A' <= macaddr[i] && macaddr[i] <= 'F')`
		`+ + num = num * 16 + 10 + macaddr[i] - 'A';`
		`+ + else if ('a' <= macaddr[i] && macaddr[i] <= 'f')`
		`+ + num = num * 16 + 10 + macaddr[i] - 'a';`
		`+ + else`
		`+ + break;`
		`+ + i++;`
		`+ + } else if (got_num == 2) {`
		`+ + mtbl[j++] = (u8) num;`
		`+ + num = 0;`
		`+ + got_num = 0;`
		`+ + i++;`
		`+ + } else {`
		`+ + break;`
		`+ + }`
		`+ + }`
		`+ +`
		`+ + if (j == MAC_ADDR_LEN) {`
		`+ + netif_dbg(dev, ifup, dev->net, "Overriding MAC address with: "`
		`+ + "%02x:%02x:%02x:%02x:%02x:%02x\n", mtbl[0], mtbl[1], mtbl[2],`
		`+ + mtbl[3], mtbl[4], mtbl[5]);`
		`+ + for (i = 0; i < MAC_ADDR_LEN; i++)`
		`+ + dev_mac[i] = mtbl[i];`
		`+ + return 1;`
		`+ + } else {`
		`+ + return 0;`
		`+ + }`
		`+ +}`
		`+ +`
		`+ static void smsc95xx_init_mac_address(struct usbnet *dev)`
		`+ {`
		`+ + /* Check module parameters */`
		`+ + if (smsc95xx_is_macaddr_param(dev, dev->net->dev_addr))`
		`+ + return;`
		`+ +`
		`+ u8 addr[ETH_ALEN];`
		`+`
		`+ /* maybe the boot loader passed the MAC address in devicetree */`
		`+ --`
		`+ 2.35.1`
		`+`

libre/linux-libre-pck/0005-set-default-cubietruck-led-triggers.patch

file added

+33

		`@@ -0,0 +1,33 @@`
		`+ From 363e156344b831978306bf95dac7859dafe61d14 Mon Sep 17 00:00:00 2001`
		`+ From: Kevin Mihelich <kevin@archlinuxarm.org>`
		`+ Date: Sat, 14 Feb 2015 12:32:27 +0100`
		`+ Subject: [PATCH 5/7] set default cubietruck led triggers`
		`+`
		`+ Signed-off-by: Kevin Mihelich <kevin@archlinuxarm.org>`
		`+ ---`
		`+ arch/arm/boot/dts/sun7i-a20-cubietruck.dts \| 2 ++`
		`+ 1 file changed, 2 insertions(+)`
		`+`
		`+ diff --git a/arch/arm/boot/dts/sun7i-a20-cubietruck.dts b/arch/arm/boot/dts/sun7i-a20-cubietruck.dts`
		`+ index 52160e368304..21c8ef94c756 100644`
		`+ --- a/arch/arm/boot/dts/sun7i-a20-cubietruck.dts`
		`+ +++ b/arch/arm/boot/dts/sun7i-a20-cubietruck.dts`
		`+ @@ -78,6 +78,7 @@ leds {`
		`+ led-0 {`
		`+ label = "cubietruck:blue:usr";`
		`+ gpios = <&pio 7 21 GPIO_ACTIVE_HIGH>;`
		`+ + linux,default-trigger = "heartbeat";`
		`+ };`
		`+`
		`+ led-1 {`
		`+ @@ -93,6 +94,7 @@ led-2 {`
		`+ led-3 {`
		`+ label = "cubietruck:green:usr";`
		`+ gpios = <&pio 7 7 GPIO_ACTIVE_HIGH>;`
		`+ + linux,default-trigger = "mmc0";`
		`+ };`
		`+ };`
		`+`
		`+ --`
		`+ 2.35.1`
		`+`

libre/linux-libre-pck/0006-exynos4412-odroid-set-higher-minimum-buck2-regulator.patch

file added

+30

		`@@ -0,0 +1,30 @@`
		`+ From b4dcf8b9c59c451b667f7cc3f20e7fe837951517 Mon Sep 17 00:00:00 2001`
		`+ From: Kevin Mihelich <kevin@archlinuxarm.org>`
		`+ Date: Thu, 11 Aug 2016 00:42:37 -0600`
		`+ Subject: [PATCH 6/7] exynos4412-odroid: set higher minimum buck2 regulator`
		`+ voltage`
		`+`
		`+ Set a higher minimum voltage to help reboot issue.`
		`+ http://www.spinics.net/lists/linux-samsung-soc/msg54434.html`
		`+`
		`+ Signed-off-by: Kevin Mihelich <kevin@archlinuxarm.org>`
		`+ ---`
		`+ arch/arm/boot/dts/exynos4412-odroid-common.dtsi \| 2 +-`
		`+ 1 file changed, 1 insertion(+), 1 deletion(-)`
		`+`
		`+ diff --git a/arch/arm/boot/dts/exynos4412-odroid-common.dtsi b/arch/arm/boot/dts/exynos4412-odroid-common.dtsi`
		`+ index 5b1d4591b35c..8a8d2c6add10 100644`
		`+ --- a/arch/arm/boot/dts/exynos4412-odroid-common.dtsi`
		`+ +++ b/arch/arm/boot/dts/exynos4412-odroid-common.dtsi`
		`+ @@ -436,7 +436,7 @@ buck1_reg: BUCK1 {`
		`+`
		`+ buck2_reg: BUCK2 {`
		`+ regulator-name = "VDD_ARM";`
		`+ - regulator-min-microvolt = <900000>;`
		`+ + regulator-min-microvolt = <1100000>;`
		`+ regulator-max-microvolt = <1350000>;`
		`+ regulator-always-on;`
		`+ regulator-boot-on;`
		`+ --`
		`+ 2.35.1`
		`+`

libre/linux-libre-pck/0007-USB-Armory-MkII-support.patch

file added

+561

		`@@ -0,0 +1,561 @@`
		`+ From 915405b2da517ee56a07e57230273ab2ff4e522d Mon Sep 17 00:00:00 2001`
		`+ From: Kevin Mihelich <kevin@archlinuxarm.org>`
		`+ Date: Sun, 11 Aug 2019 12:34:17 -0600`
		`+ Subject: [PATCH 7/7] USB Armory MkII support`
		`+`
		`+ ---`
		`+ arch/arm/boot/dts/Makefile \| 2 +`
		`+ arch/arm/boot/dts/imx6ul-usbarmory.dts \| 256 +++++++++++++++++++++++`
		`+ arch/arm/boot/dts/imx6ull-usbarmory.dts \| 257 ++++++++++++++++++++++++`
		`+ 3 files changed, 515 insertions(+)`
		`+ create mode 100644 arch/arm/boot/dts/imx6ul-usbarmory.dts`
		`+ create mode 100644 arch/arm/boot/dts/imx6ull-usbarmory.dts`
		`+`
		`+ diff --git a/arch/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile`
		`+ index 235ad559acb2..ca79830160bd 100644`
		`+ --- a/arch/arm/boot/dts/Makefile`
		`+ +++ b/arch/arm/boot/dts/Makefile`
		`+ @@ -694,6 +694,7 @@ dtb-$(CONFIG_SOC_IMX6UL) += \`
		`+ imx6ul-tx6ul-0010.dtb \`
		`+ imx6ul-tx6ul-0011.dtb \`
		`+ imx6ul-tx6ul-mainboard.dtb \`
		`+ + imx6ul-usbarmory.dtb \`
		`+ imx6ull-14x14-evk.dtb \`
		`+ imx6ull-colibri-emmc-eval-v3.dtb \`
		`+ imx6ull-colibri-eval-v3.dtb \`
		`+ @@ -704,6 +705,7 @@ dtb-$(CONFIG_SOC_IMX6UL) += \`
		`+ imx6ull-phytec-segin-ff-rdk-nand.dtb \`
		`+ imx6ull-phytec-segin-ff-rdk-emmc.dtb \`
		`+ imx6ull-phytec-segin-lc-rdk-nand.dtb \`
		`+ + imx6ull-usbarmory.dtb \`
		`+ imx6ulz-14x14-evk.dtb \`
		`+ imx6ulz-bsh-smm-m2.dtb`
		`+ dtb-$(CONFIG_SOC_IMX7D) += \`
		`+ diff --git a/arch/arm/boot/dts/imx6ul-usbarmory.dts b/arch/arm/boot/dts/imx6ul-usbarmory.dts`
		`+ new file mode 100644`
		`+ index 000000000000..1fdcd6f611d5`
		`+ --- /dev/null`
		`+ +++ b/arch/arm/boot/dts/imx6ul-usbarmory.dts`
		`+ @@ -0,0 +1,256 @@`
		`+ +/*`
		`+ + * USB armory Mk II device tree file`
		`+ + * https://github.com/inversepath/usbarmory`
		`+ + *`
		`+ + * Copyright (C) 2019, F-Secure Corporation`
		`+ + * Andrej Rosano <andrej.rosano@f-secure.com>`
		`+ + *`
		`+ + * This file is dual-licensed: you can use it either under the terms`
		`+ + * of the GPL or the X11 license, at your option. Note that this dual`
		`+ + * licensing only applies to this file, and not this project as a`
		`+ + * whole.`
		`+ + *`
		`+ + * a) This file is free software; you can redistribute it and/or`
		`+ + * modify it under the terms of the GNU General Public License as`
		`+ + * published by the Free Software Foundation; either version 2 of the`
		`+ + * License, or (at your option) any later version.`
		`+ + *`
		`+ + * This file is distributed in the hope that it will be useful,`
		`+ + * but WITHOUT ANY WARRANTY; without even the implied warranty of`
		`+ + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the`
		`+ + * GNU General Public License for more details.`
		`+ + *`
		`+ + * Or, alternatively,`
		`+ + *`
		`+ + * b) Permission is hereby granted, free of charge, to any person`
		`+ + * obtaining a copy of this software and associated documentation`
		`+ + * files (the "Software"), to deal in the Software without`
		`+ + * restriction, including without limitation the rights to use,`
		`+ + * copy, modify, merge, publish, distribute, sublicense, and/or`
		`+ + * sell copies of the Software, and to permit persons to whom the`
		`+ + * Software is furnished to do so, subject to the following`
		`+ + * conditions:`
		`+ + *`
		`+ + * The above copyright notice and this permission notice shall be`
		`+ + * included in all copies or substantial portions of the Software.`
		`+ + *`
		`+ + * THE SOFTWARE IS 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. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT`
		`+ + * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,`
		`+ + * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING`
		`+ + * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR`
		`+ + * OTHER DEALINGS IN THE SOFTWARE.`
		`+ + */`
		`+ +`
		`+ +/dts-v1/;`
		`+ +`
		`+ +#include "imx6ul.dtsi"`
		`+ +`
		`+ +/ {`
		`+ + model = "F-Secure USB armory Mk II";`
		`+ + compatible = "inversepath,imx6ul-usbarmory-mkII", "fsl,imx6ul";`
		`+ +`
		`+ + chosen {`
		`+ + stdout-path = &uart2;`
		`+ + };`
		`+ +`
		`+ + memory {`
		`+ + device_type = "memory";`
		`+ + reg = <0x80000000 0x20000000>;`
		`+ + };`
		`+ +`
		`+ + leds {`
		`+ + compatible = "gpio-leds";`
		`+ + pinctrl-names = "default";`
		`+ + pinctrl-0 = <&pinctrl_led>;`
		`+ +`
		`+ + led-white {`
		`+ + label = "LED_WHITE";`
		`+ + gpios = <&gpio4 21 GPIO_ACTIVE_LOW>;`
		`+ + linux,default-trigger = "heartbeat";`
		`+ + };`
		`+ +`
		`+ + led-blue {`
		`+ + label = "LED_BLUE";`
		`+ + gpios = <&gpio4 22 GPIO_ACTIVE_LOW>;`
		`+ + };`
		`+ + };`
		`+ +`
		`+ + regulators {`
		`+ + compatible = "simple-bus";`
		`+ + #address-cells = <1>;`
		`+ + #size-cells = <0>;`
		`+ +`
		`+ + reg_sd1_vmmc: sd1_regulator {`
		`+ + compatible = "regulator-fixed";`
		`+ + regulator-name = "VSD_3V3";`
		`+ + regulator-min-microvolt = <3300000>;`
		`+ + regulator-max-microvolt = <3300000>;`
		`+ + };`
		`+ + };`
		`+ +};`
		`+ +`
		`+ +&uart1 {`
		`+ + pinctrl-names = "default";`
		`+ + pinctrl-0 = <&pinctrl_bluetooth>;`
		`+ + uart-has-rtscts;`
		`+ + status = "okay";`
		`+ +};`
		`+ +`
		`+ +&uart2 {`
		`+ + pinctrl-names = "default";`
		`+ + pinctrl-0 = <&pinctrl_uart2>;`
		`+ + status = "okay";`
		`+ +};`
		`+ +`
		`+ +&usdhc1 {`
		`+ + pinctrl-names = "default";`
		`+ + pinctrl-0 = <&pinctrl_usdhc1>;`
		`+ + no-1-8-v;`
		`+ + keep-power-in-suspend;`
		`+ + wakeup-source;`
		`+ + status = "okay";`
		`+ +};`
		`+ +`
		`+ +&usdhc2 {`
		`+ + pinctrl-names = "default";`
		`+ + pinctrl-0 = <&pinctrl_usdhc2>;`
		`+ + non-removable;`
		`+ + status = "okay";`
		`+ +};`
		`+ +`
		`+ +&i2c1 {`
		`+ + pinctrl-0 = <&pinctrl_i2c1>;`
		`+ + status = "okay";`
		`+ +};`
		`+ +`
		`+ +&iomuxc {`
		`+ + pinctrl_uart2: uart2grp {`
		`+ + fsl,pins = <`
		`+ + MX6UL_PAD_UART2_TX_DATA__UART2_DCE_TX 0x1b0b1`
		`+ + MX6UL_PAD_UART2_RX_DATA__UART2_DCE_RX 0x1b0b1`
		`+ + >;`
		`+ + };`
		`+ +`
		`+ + pinctrl_bluetooth: uart1grp {`
		`+ + fsl,pins = <`
		`+ + MX6UL_PAD_UART1_TX_DATA__UART1_DCE_TX 0x1b0b0 /* BT_UART_TX */`
		`+ + MX6UL_PAD_UART1_RX_DATA__UART1_DCE_RX 0x1b0b0 /* BT_UART_RX */`
		`+ + MX6UL_PAD_UART1_CTS_B__UART1_DCE_CTS 0x1b0b0 /* BT_UART_CTS */`
		`+ + MX6UL_PAD_GPIO1_IO07__UART1_DCE_RTS 0x130b0 /* BT_UART_RTS */`
		`+ + MX6UL_PAD_UART3_TX_DATA__GPIO1_IO24 0x1f020 /* BT_UART_DSR */`
		`+ + MX6UL_PAD_UART3_RX_DATA__GPIO1_IO25 0x10020 /* BT_UART_DTR */`
		`+ + MX6UL_PAD_GPIO1_IO04__GPIO1_IO04 0x1f020 /* BT_SWDCLK */`
		`+ + MX6UL_PAD_GPIO1_IO05__GPIO1_IO05 0x1f020 /* BT_SWDIO */`
		`+ + MX6UL_PAD_GPIO1_IO09__GPIO1_IO09 0x1f020 /* BT_RESET */`
		`+ + MX6UL_PAD_UART3_RTS_B__GPIO1_IO27 0x1f020 /* BT_SWITCH_1 */`
		`+ + MX6UL_PAD_UART3_CTS_B__GPIO1_IO26 0x1f020 /* BT_SWITCH_2 */`
		`+ + >;`
		`+ + };`
		`+ +`
		`+ + pinctrl_i2c1: i2c1grp {`
		`+ + fsl,pins = <`
		`+ + MX6UL_PAD_GPIO1_IO02__I2C1_SCL 0x4001b8b0`
		`+ + MX6UL_PAD_GPIO1_IO03__I2C1_SDA 0x4001b8b0`
		`+ + >;`
		`+ + };`
		`+ +`
		`+ + pinctrl_led: ledgrp {`
		`+ + fsl,pins = <`
		`+ + MX6UL_PAD_CSI_DATA06__GPIO4_IO27 0x1f020`
		`+ + MX6UL_PAD_CSI_DATA07__GPIO4_IO28 0x1f020`
		`+ + >;`
		`+ + };`
		`+ +`
		`+ + pinctrl_usdhc1: usdhc1grp {`
		`+ + fsl,pins = <`
		`+ + MX6UL_PAD_SD1_CMD__USDHC1_CMD 0x1f019`
		`+ + MX6UL_PAD_SD1_CLK__USDHC1_CLK 0x1f019`
		`+ + MX6UL_PAD_SD1_DATA0__USDHC1_DATA0 0x1f019`
		`+ + MX6UL_PAD_SD1_DATA1__USDHC1_DATA1 0x1f019`
		`+ + MX6UL_PAD_SD1_DATA2__USDHC1_DATA2 0x1f019`
		`+ + MX6UL_PAD_SD1_DATA3__USDHC1_DATA3 0x1f019`
		`+ + >;`
		`+ + };`
		`+ +`
		`+ + pinctrl_usdhc2: usdhc2grp {`
		`+ + fsl,pins = <`
		`+ + MX6UL_PAD_NAND_RE_B__USDHC2_CLK 0x10071`
		`+ + MX6UL_PAD_NAND_WE_B__USDHC2_CMD 0x17059`
		`+ + MX6UL_PAD_NAND_DATA00__USDHC2_DATA0 0x17059`
		`+ + MX6UL_PAD_NAND_DATA01__USDHC2_DATA1 0x17059`
		`+ + MX6UL_PAD_NAND_DATA02__USDHC2_DATA2 0x17059`
		`+ + MX6UL_PAD_NAND_DATA03__USDHC2_DATA3 0x17059`
		`+ + MX6UL_PAD_NAND_DATA04__USDHC2_DATA4 0x17059`
		`+ + MX6UL_PAD_NAND_DATA05__USDHC2_DATA5 0x17059`
		`+ + MX6UL_PAD_NAND_DATA06__USDHC2_DATA6 0x17059`
		`+ + MX6UL_PAD_NAND_DATA07__USDHC2_DATA7 0x17059`
		`+ + >;`
		`+ + };`
		`+ +};`
		`+ +`
		`+ +&aips2 {`
		`+ + crypto: crypto@2140000 {`
		`+ + compatible = "fsl,imx6ul-caam", "fsl,sec-v4.0";`
		`+ + #address-cells = <1>;`
		`+ + #size-cells = <1>;`
		`+ + reg = <0x2140000 0x3c000>;`
		`+ + ranges = <0 0x2140000 0x3c000>;`
		`+ + interrupts = <GIC_SPI 48 IRQ_TYPE_LEVEL_HIGH>;`
		`+ + clocks = <&clks IMX6UL_CLK_CAAM_IPG>, <&clks IMX6UL_CLK_CAAM_ACLK>,`
		`+ + <&clks IMX6UL_CLK_CAAM_MEM>;`
		`+ + clock-names = "ipg", "aclk", "mem";`
		`+ +`
		`+ + sec_jr0: jr@1000 {`
		`+ + compatible = "fsl,sec-v4.0-job-ring";`
		`+ + reg = <0x1000 0x1000>;`
		`+ + interrupts = <GIC_SPI 105 IRQ_TYPE_LEVEL_HIGH>;`
		`+ + };`
		`+ +`
		`+ + sec_jr1: jr@2000 {`
		`+ + compatible = "fsl,sec-v4.0-job-ring";`
		`+ + reg = <0x2000 0x1000>;`
		`+ + interrupts = <GIC_SPI 106 IRQ_TYPE_LEVEL_HIGH>;`
		`+ + };`
		`+ + sec_jr2: jr@3000 {`
		`+ + compatible = "fsl,sec-v4.0-job-ring";`
		`+ + reg = <0x3000 0x1000>;`
		`+ + interrupts = <GIC_SPI 46 IRQ_TYPE_LEVEL_HIGH>;`
		`+ + };`
		`+ + };`
		`+ +};`
		`+ +`
		`+ +/ {`
		`+ + soc {`
		`+ + caam_sm: caam-sm@00100000 {`
		`+ + compatible = "fsl,imx7d-caam-sm", "fsl,imx6q-caam-sm";`
		`+ + reg = <0x00100000 0x3fff>;`
		`+ + };`
		`+ +`
		`+ + irq_sec_vio: caam_secvio {`
		`+ + compatible = "fsl,imx7d-caam-secvio", "fsl,imx6q-caam-secvio";`
		`+ + interrupts = <GIC_SPI 20 IRQ_TYPE_LEVEL_HIGH>;`
		`+ + };`
		`+ + };`
		`+ +`
		`+ + caam_keyblob: caam-keyblob {`
		`+ + compatible = "fsl,sec-v4.0-keyblob";`
		`+ + status = "okay";`
		`+ + };`
		`+ +};`
		`+ +`
		`+ +&usbotg1 {`
		`+ + dr_mode = "peripheral";`
		`+ + disable-over-current;`
		`+ + tpl-support;`
		`+ + status = "okay";`
		`+ +};`
		`+ +`
		`+ +&usbotg2 {`
		`+ + dr_mode = "host";`
		`+ + disable-over-current;`
		`+ + tpl-support;`
		`+ + status = "okay";`
		`+ +};`
		`+ diff --git a/arch/arm/boot/dts/imx6ull-usbarmory.dts b/arch/arm/boot/dts/imx6ull-usbarmory.dts`
		`+ new file mode 100644`
		`+ index 000000000000..f74d0296d5f6`
		`+ --- /dev/null`
		`+ +++ b/arch/arm/boot/dts/imx6ull-usbarmory.dts`
		`+ @@ -0,0 +1,257 @@`
		`+ +/*`
		`+ + * USB armory Mk II device tree file`
		`+ + * https://github.com/inversepath/usbarmory`
		`+ + *`
		`+ + * Copyright (C) 2019, F-Secure Corporation`
		`+ + * Andrej Rosano <andrej.rosano@f-secure.com>`
		`+ + *`
		`+ + * This file is dual-licensed: you can use it either under the terms`
		`+ + * of the GPL or the X11 license, at your option. Note that this dual`
		`+ + * licensing only applies to this file, and not this project as a`
		`+ + * whole.`
		`+ + *`
		`+ + * a) This file is free software; you can redistribute it and/or`
		`+ + * modify it under the terms of the GNU General Public License as`
		`+ + * published by the Free Software Foundation; either version 2 of the`
		`+ + * License, or (at your option) any later version.`
		`+ + *`
		`+ + * This file is distributed in the hope that it will be useful,`
		`+ + * but WITHOUT ANY WARRANTY; without even the implied warranty of`
		`+ + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the`
		`+ + * GNU General Public License for more details.`
		`+ + *`
		`+ + * Or, alternatively,`
		`+ + *`
		`+ + * b) Permission is hereby granted, free of charge, to any person`
		`+ + * obtaining a copy of this software and associated documentation`
		`+ + * files (the "Software"), to deal in the Software without`
		`+ + * restriction, including without limitation the rights to use,`
		`+ + * copy, modify, merge, publish, distribute, sublicense, and/or`
		`+ + * sell copies of the Software, and to permit persons to whom the`
		`+ + * Software is furnished to do so, subject to the following`
		`+ + * conditions:`
		`+ + *`
		`+ + * The above copyright notice and this permission notice shall be`
		`+ + * included in all copies or substantial portions of the Software.`
		`+ + *`
		`+ + * THE SOFTWARE IS 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. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT`
		`+ + * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,`
		`+ + * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING`
		`+ + * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR`
		`+ + * OTHER DEALINGS IN THE SOFTWARE.`
		`+ + */`
		`+ +`
		`+ +/dts-v1/;`
		`+ +`
		`+ +#include "imx6ul.dtsi"`
		`+ +`
		`+ +/ {`
		`+ + model = "F-Secure USB armory Mk II";`
		`+ + compatible = "inversepath,imx6ull-usbarmory-mkII", "fsl,imx6ull";`
		`+ +`
		`+ + chosen {`
		`+ + stdout-path = &uart2;`
		`+ + };`
		`+ +`
		`+ + memory {`
		`+ + device_type = "memory";`
		`+ + reg = <0x80000000 0x20000000>;`
		`+ + };`
		`+ +`
		`+ + leds {`
		`+ + compatible = "gpio-leds";`
		`+ + pinctrl-names = "default";`
		`+ + pinctrl-0 = <&pinctrl_led>;`
		`+ +`
		`+ + led-white {`
		`+ + label = "LED_WHITE";`
		`+ + gpios = <&gpio4 21 GPIO_ACTIVE_LOW>;`
		`+ + linux,default-trigger = "heartbeat";`
		`+ + };`
		`+ +`
		`+ + led-blue {`
		`+ + label = "LED_BLUE";`
		`+ + gpios = <&gpio4 22 GPIO_ACTIVE_LOW>;`
		`+ + };`
		`+ + };`
		`+ +`
		`+ + regulators {`
		`+ + compatible = "simple-bus";`
		`+ + #address-cells = <1>;`
		`+ + #size-cells = <0>;`
		`+ +`
		`+ + reg_sd1_vmmc: sd1_regulator {`
		`+ + compatible = "regulator-fixed";`
		`+ + regulator-name = "VSD_3V3";`
		`+ + regulator-min-microvolt = <3300000>;`
		`+ + regulator-max-microvolt = <3300000>;`
		`+ + };`
		`+ + };`
		`+ +};`
		`+ +`
		`+ +/* Delete CAAM node in AIPS-2 (i.MX6UL specific) */`
		`+ +/delete-node/ &crypto;`
		`+ +`
		`+ +&cpu0 {`
		`+ + operating-points = <`
		`+ + /* kHz uV */`
		`+ + 900000 1275000`
		`+ + 792000 1225000`
		`+ + 528000 1175000`
		`+ + 396000 1025000`
		`+ + 198000 950000`
		`+ + >;`
		`+ + fsl,soc-operating-points = <`
		`+ + /* KHz uV */`
		`+ + 900000 1250000`
		`+ + 792000 1175000`
		`+ + 528000 1175000`
		`+ + 396000 1175000`
		`+ + 198000 1175000`
		`+ + >;`
		`+ +};`
		`+ +`
		`+ +&uart1 {`
		`+ + pinctrl-names = "default";`
		`+ + pinctrl-0 = <&pinctrl_bluetooth>;`
		`+ + uart-has-rtscts;`
		`+ + status = "okay";`
		`+ +};`
		`+ +`
		`+ +&uart2 {`
		`+ + pinctrl-names = "default";`
		`+ + pinctrl-0 = <&pinctrl_uart2>;`
		`+ + status = "okay";`
		`+ +};`
		`+ +`
		`+ +&usdhc1 {`
		`+ + pinctrl-names = "default";`
		`+ + pinctrl-0 = <&pinctrl_usdhc1>;`
		`+ + no-1-8-v;`
		`+ + keep-power-in-suspend;`
		`+ + wakeup-source;`
		`+ + status = "okay";`
		`+ +};`
		`+ +`
		`+ +&usdhc2 {`
		`+ + pinctrl-names = "default";`
		`+ + pinctrl-0 = <&pinctrl_usdhc2>;`
		`+ + non-removable;`
		`+ + status = "okay";`
		`+ +};`
		`+ +`
		`+ +&i2c1 {`
		`+ + pinctrl-0 = <&pinctrl_i2c1>;`
		`+ + status = "okay";`
		`+ +};`
		`+ +`
		`+ +&iomuxc {`
		`+ + pinctrl_uart2: uart2grp {`
		`+ + fsl,pins = <`
		`+ + MX6UL_PAD_UART2_TX_DATA__UART2_DCE_TX 0x1b0b1`
		`+ + MX6UL_PAD_UART2_RX_DATA__UART2_DCE_RX 0x1b0b1`
		`+ + >;`
		`+ + };`
		`+ +`
		`+ + pinctrl_bluetooth: uart1grp {`
		`+ + fsl,pins = <`
		`+ + MX6UL_PAD_UART1_TX_DATA__UART1_DCE_TX 0x1b0b0 /* BT_UART_TX */`
		`+ + MX6UL_PAD_UART1_RX_DATA__UART1_DCE_RX 0x1b0b0 /* BT_UART_RX */`
		`+ + MX6UL_PAD_UART1_CTS_B__UART1_DCE_CTS 0x1b0b0 /* BT_UART_CTS */`
		`+ + MX6UL_PAD_GPIO1_IO07__UART1_DCE_RTS 0x130b0 /* BT_UART_RTS */`
		`+ + MX6UL_PAD_UART3_TX_DATA__GPIO1_IO24 0x1f020 /* BT_UART_DSR */`
		`+ + MX6UL_PAD_UART3_RX_DATA__GPIO1_IO25 0x10020 /* BT_UART_DTR */`
		`+ + MX6UL_PAD_GPIO1_IO04__GPIO1_IO04 0x1f020 /* BT_SWDCLK */`
		`+ + MX6UL_PAD_GPIO1_IO05__GPIO1_IO05 0x1f020 /* BT_SWDIO */`
		`+ + MX6UL_PAD_GPIO1_IO09__GPIO1_IO09 0x1f020 /* BT_RESET */`
		`+ + MX6UL_PAD_UART3_RTS_B__GPIO1_IO27 0x1f020 /* BT_SWITCH_1 */`
		`+ + MX6UL_PAD_UART3_CTS_B__GPIO1_IO26 0x1f020 /* BT_SWITCH_2 */`
		`+ + >;`
		`+ + };`
		`+ +`
		`+ + pinctrl_i2c1: i2c1grp {`
		`+ + fsl,pins = <`
		`+ + MX6UL_PAD_GPIO1_IO02__I2C1_SCL 0x4001b8b0`
		`+ + MX6UL_PAD_GPIO1_IO03__I2C1_SDA 0x4001b8b0`
		`+ + >;`
		`+ + };`
		`+ +`
		`+ + pinctrl_led: ledgrp {`
		`+ + fsl,pins = <`
		`+ + MX6UL_PAD_CSI_DATA06__GPIO4_IO27 0x1f020`
		`+ + MX6UL_PAD_CSI_DATA07__GPIO4_IO28 0x1f020`
		`+ + >;`
		`+ + };`
		`+ +`
		`+ + pinctrl_usdhc1: usdhc1grp {`
		`+ + fsl,pins = <`
		`+ + MX6UL_PAD_SD1_CMD__USDHC1_CMD 0x1f019`
		`+ + MX6UL_PAD_SD1_CLK__USDHC1_CLK 0x1f019`
		`+ + MX6UL_PAD_SD1_DATA0__USDHC1_DATA0 0x1f019`
		`+ + MX6UL_PAD_SD1_DATA1__USDHC1_DATA1 0x1f019`
		`+ + MX6UL_PAD_SD1_DATA2__USDHC1_DATA2 0x1f019`
		`+ + MX6UL_PAD_SD1_DATA3__USDHC1_DATA3 0x1f019`
		`+ + >;`
		`+ + };`
		`+ +`
		`+ + pinctrl_usdhc2: usdhc2grp {`
		`+ + fsl,pins = <`
		`+ + MX6UL_PAD_NAND_RE_B__USDHC2_CLK 0x10071`
		`+ + MX6UL_PAD_NAND_WE_B__USDHC2_CMD 0x17059`
		`+ + MX6UL_PAD_NAND_DATA00__USDHC2_DATA0 0x17059`
		`+ + MX6UL_PAD_NAND_DATA01__USDHC2_DATA1 0x17059`
		`+ + MX6UL_PAD_NAND_DATA02__USDHC2_DATA2 0x17059`
		`+ + MX6UL_PAD_NAND_DATA03__USDHC2_DATA3 0x17059`
		`+ + MX6UL_PAD_NAND_DATA04__USDHC2_DATA4 0x17059`
		`+ + MX6UL_PAD_NAND_DATA05__USDHC2_DATA5 0x17059`
		`+ + MX6UL_PAD_NAND_DATA06__USDHC2_DATA6 0x17059`
		`+ + MX6UL_PAD_NAND_DATA07__USDHC2_DATA7 0x17059`
		`+ + >;`
		`+ + };`
		`+ +};`
		`+ +`
		`+ +/ {`
		`+ + soc {`
		`+ + aips3: aips-bus@02200000 {`
		`+ + compatible = "fsl,aips-bus", "simple-bus";`
		`+ + #address-cells = <1>;`
		`+ + #size-cells = <1>;`
		`+ + reg = <0x02200000 0x100000>;`
		`+ + ranges;`
		`+ +`
		`+ + dcp: dcp@02280000 {`
		`+ + compatible = "fsl,imx6ull-dcp", "fsl,imx6sl-dcp", "fsl,imx28-dcp";`
		`+ + reg = <0x02280000 0x4000>;`
		`+ + interrupts = <GIC_SPI 46 IRQ_TYPE_LEVEL_HIGH>,`
		`+ + <GIC_SPI 47 IRQ_TYPE_LEVEL_HIGH>,`
		`+ + <GIC_SPI 48 IRQ_TYPE_LEVEL_HIGH>;`
		`+ + clocks = <&clks IMX6ULL_CLK_DCP_CLK>;`
		`+ + clock-names = "dcp";`
		`+ + };`
		`+ +`
		`+ + rngb: rngb@02284000 {`
		`+ + compatible = "fsl,imx6sl-rng", "fsl,imx25-rngb", "fsl,imx-rng", "imx-rng";`
		`+ + reg = <0x02284000 0x4000>;`
		`+ + interrupts = <GIC_SPI 6 IRQ_TYPE_LEVEL_HIGH>;`
		`+ + clocks = <&clks IMX6UL_CLK_DUMMY>;`
		`+ + };`
		`+ + };`
		`+ + };`
		`+ +};`
		`+ +`
		`+ +&usbotg1 {`
		`+ + dr_mode = "peripheral";`
		`+ + disable-over-current;`
		`+ + tpl-support;`
		`+ + status = "okay";`
		`+ +};`
		`+ +`
		`+ +&usbotg2 {`
		`+ + dr_mode = "host";`
		`+ + disable-over-current;`
		`+ + tpl-support;`
		`+ + status = "okay";`
		`+ +};`
		`+ --`
		`+ 2.35.1`
		`+`

libre/linux-libre-pck/PKGBUILD

file modified

+69 -17

		`@@ -13,9 +13,13 @@`
		`_replacesoldmodules=()`

		`pkgbase=linux-libre-pck`
		`- pkgver=5.17.8.pck1`
		`+ pkgver=5.18.14.pck1`
		`pkgrel=1`
		`- pkgdesc='Linux-libre PCK'`
		`+ pkgdesc='Linux-libre PCK (Parabola community kernel)'`
		`+ zenver="${pkgver//pck/zen}"`
		`+ aufsver=20220620`
		`+ rcnver=5.18.12`
		`+ rcnrel=armv7-x8`
		`url='https://wiki.parabola.nu/PCK'`
		`arch=(i686 x86_64 armv7h)`
		`license=(GPL2)`
		`@@ -24,33 +28,73 @@`
		`xmlto python-sphinx python-sphinx_rtd_theme graphviz imagemagick texlive-latexextra`
		`)`
		`options=('!strip')`
		`- _srcname=linux-5.17`
		`+ _srcname=linux-5.18`
		`source=(`
		`"https://linux-libre.fsfla.org/pub/linux-libre/releases/${_srcname##-}-gnu/linux-libre-${_srcname##-}-gnu.tar.xz"{,.sign}`
		`"https://linux-libre.fsfla.org/pub/linux-libre/releases/${pkgver%.}-gnu/patch-${_srcname##-}-gnu-${pkgver%.*}-gnu.xz"{,.sign}`
		`- "https://repo.parabola.nu/other/pck/patches/${pkgver%.}-gnu/patch-${pkgver%.}-gnu-${pkgver##*.}.patch"{,.sig}`
		`+ "https://repo.parabola.nu/other/linux-libre/logos/logo_linux_"{clut224.ppm,vga16.ppm,mono.pbm}{,.sig}`
		`+ "https://framagit.org/Megver83/zen-patches/-/raw/main/patch-${zenver//.zen/-zen}.diff"`
		`+ #"https://raw.githubusercontent.com/dolohow/uksm/master/v5.x/uksm-${_srcname##*-}.patch"`
		`+ "https://gitlab.com/sirlucjan/kernel-patches/-/raw/master/${_srcname##*-}/aufs-patches/0001-aufs-${aufsver}.patch"`
		`config.i686 config.x86_64 config.armv7h # the main kernel config files`
		`linux-armv7h.preset # armv7h preset file for mkinitcpio ramdisk`
		`+`
		`+ # maintain the TTY over USB disconnects`
		`+ # http://www.coreboot.org/EHCI_Gadget_Debug`
		`+ 0001-usb-serial-gadget-no-TTY-hangup-on-USB-disconnect-WI.patch`
		`+ # fix Atmel maXTouch touchscreen support`
		`+ # https://labs.parabola.nu/issues/877`
		`+ # http://www.fsfla.org/pipermail/linux-libre/2015-November/003202.html`
		`+ 0002-fix-Atmel-maXTouch-touchscreen-support.patch`
		`)`
		`source_i686=(`
		`# avoid using zstd compression in ultra mode (exhausts virtual memory)`
		`no-ultra-zstd.patch`
		`)`
		`+ source_armv7h=(`
		`+ # RCN patch (CM3 firmware deblobbed and bloatware removed)`
		`+ "https://repo.parabola.nu/other/rcn-libre/patches/$rcnver/rcn-libre-$rcnver-$rcnrel.patch"{,.sig}`
		`+ # Arch Linux ARM patches`
		`+ 0001-ARM-atags-add-support-for-Marvell-s-u-boot.patch`
		`+ 0002-ARM-atags-fdt-retrieve-MAC-addresses-from-Marvell-bo.patch`
		`+ 0003-fix-mvsdio-eMMC-timing.patch`
		`+ 0004-net-smsc95xx-Allow-mac-address-to-be-set-as-a-parame.patch`
		`+ 0005-set-default-cubietruck-led-triggers.patch`
		`+ 0006-exynos4412-odroid-set-higher-minimum-buck2-regulator.patch`
		`+ 0007-USB-Armory-MkII-support.patch`
		`+ )`
		`validpgpkeys=(`
		`'474402C8C582DAFBE389C427BCB7CF877E7D47A7' # Alexandre Oliva`
		`'6DB9C4B4F0D8C0DC432CF6E4227CA7C556B2BA78' # David P.`
		`)`
		`- sha512sums=('565de7f956e40a931858cb29b61619f25fc57ce588b8762bef806e470d20bbbdf98a6e1c55eccae61a7365c0ecaae4825d81f7eec8689911710949ba5b34ce0c'`
		`+ sha512sums=('13be3762fffd74c63eeb23b0d34b994a3e5198bfdbda4f013b38f8d3edd24b9bbebe5a4bfde0f5191aa1cf2678e4517f3b5540a40b30ebc05da1f6708cbb98bb'`
		`+ 'SKIP'`
		`+ '9016e87060d3ddbf4bad5adee54f07cba3930a23a5c2a7ca32338a98d0c51676228f3d97405c624f2f48a67849f9b40a5dc670e10fbc02bc75cc4d47deab4c34'`
		`+ 'SKIP'`
		`+ '13cb5bc42542e7b8bb104d5f68253f6609e463b6799800418af33eb0272cc269aaa36163c3e6f0aacbdaaa1d05e2827a4a7c4a08a029238439ed08b89c564bb3'`
		`'SKIP'`
		`- '71ba9ae3f75d72d2d86cc8cab1df463725e00088fb93b09553066a9b968d3a32abed77fac6011433377ac2970c8149a28e85ed25429da7dec56b47ba871cd4ae'`
		`+ '7a3716bfe3b9f546da309c7492f3e08f8f506813afeb1c737a474c83313d5c313cf4582b65215c2cfce3b74d9d1021c96e8badafe8f6e5b01fe28d2b5c61ae78'`
		`'SKIP'`
		`- 'df322ff9c3fad418e875f8827cdd0a8f6a13a55c4656b87300f6a592ba56724e30c303ed94eb2d69eb95379c3c643ee5ff84771a03911efae7e212b8fa5d48bd'`
		`+ '267295aa0cea65684968420c68b32f1a66a22d018b9d2b2c1ef14267bcf4cb68aaf7099d073cbfefe6c25c8608bdcbbd45f7ac8893fdcecbf1e621abdfe9ecc1'`
		`'SKIP'`
		`- '50de63086aef1cd4278fc7088ae537ae6eb4994a4e8d09edbc957ff90e7232b85ce37928117589a1a619ded90eb584b770579e6efc5d5b2cc3e4f6c6cd96a71a'`
		`- 'f18d743a28afde8af4701853dfb59bfe6f3789756f9ffa3658cb2c75a8af59cd30ae125b74882529ad81b2c399e42ea56fabdc1e4354d5ce2b84d8ac2d96a51f'`
		`- 'e92981457f0747cf9b595557459740155188b80e3908eb5cd35579c647bcaddc5be8376a2b4c47b984f52009c1764789bc9a009fb9b18207d524c32e8ad644e0'`
		`- '53103bf55b957b657039510527df0df01279dec59cda115a4d6454e4135025d4546167fa30bdc99107f232561c1e096d8328609ab5a876cf7017176f92ad3e0b')`
		`+ 'e86399efba97b385cb748e1f5e41dd777d9ce3c7a0affb33bfa6f3a3e7ca1c6d2b3a50b3341f1132cdd2be9590e817b82e73883698e50447e45ddc490c6b52a7'`
		`+ 'f47bcdd8d32b0b2ff1c58d552e2fe83047b6aa183ba03670dfd4e0f1f27eec6808eab53904847b316d8e31c85b4d63a7f365c6a91008a6d6cbcf89639073a880'`
		`+ '1f247490ca428c372194838919ba049e61f357249419998692c3a20cc6728d509b079f39f3edcc0f76342c437a350d28eefafe8aa743477cecbfff1bb43ea8bb'`
		`+ '88369e64e767fe490c22a221a55a5aa51377995897b7462320d53d64c9e83cb57fba3ea8ec591f15263905f86dc9f23cca0492cbb6a562aeb1a0fab0f8e447cf'`
		`+ '959f644c82015be6ddf0b84100b24d48a8208af7374d3ae748226e45ca592970354d20125df8cad2d71369c3d9d950f930776263dde8ce222d1afd571af331eb'`
		`+ '53103bf55b957b657039510527df0df01279dec59cda115a4d6454e4135025d4546167fa30bdc99107f232561c1e096d8328609ab5a876cf7017176f92ad3e0b'`
		`+ '02af4dd2a007e41db0c63822c8ab3b80b5d25646af1906dc85d0ad9bb8bbf5236f8e381d7f91cf99ed4b0978c50aee37cb9567cdeef65b7ec3d91b882852b1af'`
		`+ 'b8fe56e14006ab866970ddbd501c054ae37186ddc065bb869cf7d18db8c0d455118d5bda3255fb66a0dde38b544655cfe9040ffe46e41d19830b47959b2fb168')`
		`sha512sums_i686=('bca15cc96f64c38adcd13a46752866b5b30555ac21e19b3f7afcd20fcb7ec585c9d990fe8f842f44d5f69d477d72867fe6a9102729f26f93f5a80b372e41ce85')`
		`+ sha512sums_armv7h=('94c6243d23bc995dec3edcb1dd5cc7d5e7d30fec70fc32b9be5f3e7d934da7035e9152fea3cce58a53b0f35f29060bdef2a3a2dac3c46f520adf1088897362f9'`
		`+ 'SKIP'`
		`+ '8da996a42249672893fa532ccbd096347580a0dc1698c45e9c865646e2765789553b1bb42793e721de30aea70340fdc116d2e4a50580fef999ca5fc627aaf4c3'`
		`+ '0e6ddc24011d77a2e422b642c4507317fc2d26b20f5649818a2f11acac165ccab2cf2e64ab50d44ce7affcfe12c2ef5158790e499058831e7995400b2087df78'`
		`+ '5d2f228151148358b07744a9c09cf6e2420c4284735d4ce7dc925a1deb3970298cc95dd766ee13e094e2853847b016c3ebc2d61bb423e370b4bc33938367ebda'`
		`+ 'a206c3dc678839831d72eefee997cbe1bb877af7f6f90dfe5cab0bd7d9686a3b13a2aba74c8fbe5533872e12306ac9ea1b5eede18ef3cf10b8d01361afd67e9c'`
		`+ 'a1072dd808c63592178cc01ea3c36de946f277fb451b13c34f51a5ac134cde4a8a4d57487132af1c6d7b5820842cdda9dc4edb3da85d33bd02bf87a032c3263a'`
		`+ '85b2e16a930b8066990c42f973d386dc3c6d62fdf3d1289bbb51df3df296c26f30051162fba49a42d38f71f05de926aa8c065097f14bd8e9f8e28a52949ead00'`
		`+ '2e99582d8b670b6c6b27add14b60e957cbcf9cd6aae40491bd9dea6ac455c0ade0bbee21e3bdfb5e06ce83ad27c5a788404b05bf7ac93831ca18d2e60a67017c')`

		`_replacesarchkernel=("${_replacesarchkernel[@]/\%/${pkgbase#linux-libre}}")`
		`_replacesoldkernels=("${_replacesoldkernels[@]/\%/${pkgbase#linux-libre}}")`
		`@@ -73,11 +117,20 @@`
		`patch -Np1 < "../patch-${_srcname##-}-gnu-${pkgver%.}-gnu"`
		`fi`

		`+ echo "Adding freedo as boot logo..."`
		`+ install -m644 -t drivers/video/logo \`
		`+ ../logo_linux_{clut224.ppm,vga16.ppm,mono.pbm}`
		`+`
		`echo "Setting version..."`
		`scripts/setlocalversion --save-scmversion`
		`echo "-$pkgrel" > localversion.10-pkgrel`
		`echo "${pkgbase#linux-libre}" > localversion.20-pkgname`

		`+ echo "Applying Zen Patch..."`
		`+ sed -e "/^+EXTRAVERSION = -zen/s/zen/pck/" \`
		`+ -e "/^[-+]EXTRAVERSION =/s/= */= -gnu/" \`
		`+ "../patch-${zenver//.zen/-zen}.diff" \| patch -Np1 -i -`
		`+`
		`if [ "$CARCH" = "armv7h" ]; then`
		`local src_armv7h`
		`for src_armv7h in "${source_armv7h[@]}"; do`
		`@@ -120,8 +173,7 @@`

		`build() {`
		`cd $_srcname`
		`- make all`
		`- make htmldocs`
		`+ make htmldocs all`
		`}`

		`_package() {`
		`@@ -130,7 +182,7 @@`
		`optdepends=('wireless-regdb: to set the correct wireless channels of your country'`
		`'linux-libre-firmware: firmware images needed for some devices')`
		`provides=(VIRTUALBOX-GUEST-MODULES WIREGUARD-MODULE VHBA-MODULE)`
		`- provides+=("${_replacesarchkernel[@]/%/=${pkgver//pck/zen}}" "LINUX-ABI_VERSION=${pkgver%.*}")`
		`+ provides+=("${_replacesarchkernel[@]/%/=$zenver}" "LINUX-ABI_VERSION=${pkgver%.*}")`
		`conflicts+=("${_replacesarchkernel[@]}" "${_replacesoldkernels[@]}" "${_replacesoldmodules[@]}")`
		`replaces+=("${_replacesarchkernel[@]}" "${_replacesoldkernels[@]}" "${_replacesoldmodules[@]}")`

		`@@ -168,7 +220,7 @@`
		`_package-headers() {`
		`pkgdesc="Headers and scripts for building modules for the $pkgdesc kernel"`
		`depends=(pahole)`
		`- provides=("${_replacesarchkernel[@]/%/-headers=${pkgver//pck/zen}}")`
		`+ provides=("${_replacesarchkernel[@]/%/-headers=$zenver}")`
		`conflicts=("${_replacesarchkernel[@]/%/-headers}" "${_replacesoldkernels[@]/%/-headers}")`
		`replaces=("${_replacesarchkernel[@]/%/-headers}" "${_replacesoldkernels[@]/%/-headers}")`

		`@@ -180,7 +232,7 @@`
		`localversion.* version vmlinux`
		`install -Dt "$builddir/kernel" -m644 kernel/Makefile`
		`install -Dt "$builddir/arch/$KARCH" -m644 arch/$KARCH/Makefile`
		`- if [[ $CARCH = i686 ]]; then`
		`+ if [ "$CARCH" = "i686" ]; then`
		`install -Dt "$builddir/arch/$KARCH" -m644 arch/$KARCH/Makefile_32.cpu`
		`fi`
		`cp -t "$builddir" -a scripts`
		`@@ -271,7 +323,7 @@`

		`_package-docs() {`
		`pkgdesc="Documentation for the $pkgdesc kernel"`
		`- provides=("${_replacesarchkernel[@]/%/-docs=${pkgver//pck/zen}}")`
		`+ provides=("${_replacesarchkernel[@]/%/-docs=$zenver}")`
		`conflicts=("${_replacesarchkernel[@]/%/-docs}" "${_replacesoldkernels[@]/%/-docs}")`
		`replaces=("${_replacesarchkernel[@]/%/-docs}" "${_replacesoldkernels[@]/%/-docs}")`

libre/linux-libre-pck/config.armv7h

file modified

+546 -397

		`@@ -1,22 +1,22 @@`
		`#`
		`# Automatically generated file; DO NOT EDIT.`
		`- # Linux/arm 5.17.8-gnu-pck1 Kernel Configuration`
		`+ # Linux/arm 5.18.14-gnu-pck1 Kernel Configuration`
		`#`
		`CONFIG_CC_VERSION_TEXT="gcc (GCC) 11.2.0"`
		`CONFIG_CC_IS_GCC=y`
		`CONFIG_GCC_VERSION=110200`
		`CONFIG_CLANG_VERSION=0`
		`CONFIG_AS_IS_GNU=y`
		`- CONFIG_AS_VERSION=23800`
		`+ CONFIG_AS_VERSION=23700`
		`CONFIG_LD_IS_BFD=y`
		`CONFIG_LD_VERSION=23800`
		`CONFIG_LLD_VERSION=0`
		`- CONFIG_CC_CAN_LINK=y`
		`- CONFIG_CC_CAN_LINK_STATIC=y`
		`CONFIG_CC_HAS_ASM_GOTO=y`
		`CONFIG_CC_HAS_ASM_GOTO_OUTPUT=y`
		`+ CONFIG_CC_HAS_ASM_GOTO_TIED_OUTPUT=y`
		`CONFIG_CC_HAS_ASM_INLINE=y`
		`CONFIG_CC_HAS_NO_PROFILE_FN_ATTR=y`
		`+ CONFIG_PAHOLE_VERSION=123`
		`CONFIG_IRQ_WORK=y`
		`CONFIG_BUILDTIME_TABLE_SORT=y`
		`CONFIG_THREAD_INFO_IN_TASK=y`
		`@@ -167,6 +167,7 @@`
		`# end of Scheduler features`

		`CONFIG_CC_IMPLICIT_FALLTHROUGH="-Wimplicit-fallthrough=5"`
		`+ CONFIG_GCC12_NO_ARRAY_BOUNDS=y`
		`CONFIG_CGROUPS=y`
		`CONFIG_PAGE_COUNTER=y`
		`CONFIG_MEMCG=y`
		`@@ -275,6 +276,7 @@`
		`# end of General setup`

		`CONFIG_ARM=y`
		`+ CONFIG_ARM_HAS_GROUP_RELOCS=y`
		`CONFIG_ARM_HAS_SG_CHAIN=y`
		`CONFIG_ARM_DMA_USE_IOMMU=y`
		`CONFIG_ARM_DMA_IOMMU_ALIGNMENT=8`
		`@@ -323,6 +325,7 @@`
		`# end of Multiple platform selection`

		`# CONFIG_ARCH_VIRT is not set`
		`+ # CONFIG_ARCH_AIROHA is not set`
		`# CONFIG_ARCH_ACTIONS is not set`
		`# CONFIG_ARCH_ALPINE is not set`
		`# CONFIG_ARCH_ARTPEC is not set`
		`@@ -587,6 +590,7 @@`
		`CONFIG_SMP=y`
		`CONFIG_SMP_ON_UP=y`
		`CONFIG_CURRENT_POINTER_IN_TPIDRURO=y`
		`+ CONFIG_IRQSTACKS=y`
		`CONFIG_ARM_CPU_TOPOLOGY=y`
		`# CONFIG_SCHED_MC is not set`
		`# CONFIG_SCHED_SMT is not set`
		`@@ -625,7 +629,6 @@`
		`CONFIG_HIGHPTE=y`
		`CONFIG_CPU_SW_DOMAIN_PAN=y`
		`CONFIG_HW_PERF_EVENTS=y`
		`- CONFIG_ARCH_WANT_GENERAL_HUGETLB=y`
		`CONFIG_ARM_MODULE_PLTS=y`
		`CONFIG_FORCE_MAX_ZONEORDER=12`
		`CONFIG_ALIGNMENT_TRAP=y`
		`@@ -711,6 +714,7 @@`
		`CONFIG_CPU_IDLE_GOV_MENU=y`
		`# CONFIG_CPU_IDLE_GOV_TEO is not set`
		`CONFIG_DT_IDLE_STATES=y`
		`+ CONFIG_DT_IDLE_GENPD=y`

		`#`
		`# ARM CPU Idle Drivers`
		`@@ -846,6 +850,8 @@`
		`CONFIG_HAVE_IRQ_TIME_ACCOUNTING=y`
		`CONFIG_HAVE_MOD_ARCH_SPECIFIC=y`
		`CONFIG_MODULES_USE_ELF_REL=y`
		`+ CONFIG_HAVE_IRQ_EXIT_ON_IRQ_STACK=y`
		`+ CONFIG_HAVE_SOFTIRQ_ON_OWN_STACK=y`
		`CONFIG_ARCH_HAS_ELF_RANDOMIZE=y`
		`CONFIG_HAVE_ARCH_MMAP_RND_BITS=y`
		`CONFIG_HAVE_EXIT_THREAD=y`
		`@@ -857,6 +863,8 @@`
		`CONFIG_OLD_SIGSUSPEND3=y`
		`CONFIG_OLD_SIGACTION=y`
		`CONFIG_COMPAT_32BIT_TIME=y`
		`+ CONFIG_HAVE_ARCH_VMAP_STACK=y`
		`+ CONFIG_VMAP_STACK=y`
		`CONFIG_ARCH_OPTIONAL_KERNEL_RWX=y`
		`CONFIG_ARCH_OPTIONAL_KERNEL_RWX_DEFAULT=y`
		`CONFIG_ARCH_HAS_STRICT_KERNEL_RWX=y`
		`@@ -900,6 +908,7 @@`
		`# CONFIG_TRIM_UNUSED_KSYMS is not set`
		`CONFIG_MODULES_TREE_LOOKUP=y`
		`CONFIG_BLOCK=y`
		`+ CONFIG_BLOCK_LEGACY_AUTOLOAD=y`
		`CONFIG_BLK_RQ_ALLOC_TIME=y`
		`CONFIG_BLK_CGROUP_RWSTAT=y`
		`CONFIG_BLK_DEV_BSG_COMMON=y`
		`@@ -950,12 +959,12 @@`
		`CONFIG_BLK_MQ_VIRTIO=y`
		`CONFIG_BLK_PM=y`
		`CONFIG_BLOCK_HOLDER_DEPRECATED=y`
		`+ CONFIG_BLK_MQ_STACKING=y`

		`#`
		`# IO Schedulers`
		`#`
		`CONFIG_MQ_IOSCHED_DEADLINE=y`
		`- # CONFIG_MQ_IOSCHED_DEADLINE_NODEFAULT is not set`
		`CONFIG_MQ_IOSCHED_KYBER=y`
		`CONFIG_IOSCHED_BFQ=y`
		`CONFIG_BFQ_GROUP_IOSCHED=y`
		`@@ -1012,6 +1021,7 @@`
		`CONFIG_UKSM=y`
		`# CONFIG_KSM_LEGACY is not set`
		`CONFIG_DEFAULT_MMAP_MIN_ADDR=4096`
		`+ CONFIG_ARCH_WANT_GENERAL_HUGETLB=y`
		`CONFIG_FRONTSWAP=y`
		`CONFIG_CMA=y`
		`# CONFIG_CMA_DEBUG is not set`
		`@@ -1038,6 +1048,7 @@`
		`# CONFIG_ZSMALLOC_STAT is not set`
		`CONFIG_GENERIC_EARLY_IOREMAP=y`
		`# CONFIG_IDLE_PAGE_TRACKING is not set`
		`+ CONFIG_ARCH_HAS_CURRENT_STACK_POINTER=y`
		`CONFIG_ZONE_DMA=y`
		`# CONFIG_PERCPU_STATS is not set`
		`# CONFIG_GUP_TEST is not set`
		`@@ -1538,7 +1549,6 @@`
		`CONFIG_BRIDGE_EBT_LOG=m`
		`CONFIG_BRIDGE_EBT_NFLOG=m`
		`CONFIG_BPFILTER=y`
		`- CONFIG_BPFILTER_UMH=m`
		`CONFIG_IP_DCCP=m`
		`CONFIG_INET_DCCP_DIAG=m`

		`@@ -2039,6 +2049,7 @@`
		`CONFIG_NET_SOCK_MSG=y`
		`CONFIG_NET_DEVLINK=y`
		`CONFIG_PAGE_POOL=y`
		`+ # CONFIG_PAGE_POOL_STATS is not set`
		`CONFIG_FAILOVER=m`
		`CONFIG_ETHTOOL_NETLINK=y`

		`@@ -2079,6 +2090,8 @@`
		`# CONFIG_PCIE_BUS_SAFE is not set`
		`# CONFIG_PCIE_BUS_PERFORMANCE is not set`
		`# CONFIG_PCIE_BUS_PEER2PEER is not set`
		`+ CONFIG_VGA_ARB=y`
		`+ CONFIG_VGA_ARB_MAX_GPUS=16`
		`# CONFIG_HOTPLUG_PCI is not set`

		`#`
		`@@ -2223,6 +2236,7 @@`
		`CONFIG_ARM_SCMI_HAVE_SHMEM=y`
		`CONFIG_ARM_SCMI_TRANSPORT_MAILBOX=y`
		`CONFIG_ARM_SCMI_TRANSPORT_SMC=y`
		`+ # CONFIG_ARM_SCMI_TRANSPORT_SMC_ATOMIC_ENABLE is not set`
		`# CONFIG_ARM_SCMI_TRANSPORT_VIRTIO is not set`
		`CONFIG_ARM_SCMI_POWER_DOMAIN=y`
		`# end of ARM System Control and Management Interface Protocol`
		`@@ -2254,6 +2268,7 @@`
		`# CONFIG_EFI_DISABLE_PCI_DMA is not set`
		`# end of EFI (Extensible Firmware Interface) Support`

		`+ # CONFIG_EFI_DISABLE_RUNTIME is not set`
		`CONFIG_ARM_PSCI_FW=y`
		`# CONFIG_ARM_PSCI_CHECKER is not set`
		`CONFIG_HAVE_ARM_SMCCC=y`
		`@@ -2427,6 +2442,7 @@`
		`CONFIG_MTD_NAND_ECC_SW_HAMMING=y`
		`# CONFIG_MTD_NAND_ECC_SW_HAMMING_SMC is not set`
		`CONFIG_MTD_NAND_ECC_SW_BCH=y`
		`+ # CONFIG_MTD_NAND_ECC_MXIC is not set`
		`# end of ECC engine support`
		`# end of NAND`

		`@@ -2497,6 +2513,7 @@`
		`CONFIG_NVME_CORE=m`
		`CONFIG_BLK_DEV_NVME=m`
		`# CONFIG_NVME_MULTIPATH is not set`
		`+ # CONFIG_NVME_VERBOSE_ERRORS is not set`
		`# CONFIG_NVME_HWMON is not set`
		`# CONFIG_NVME_FC is not set`
		`# CONFIG_NVME_TCP is not set`
		`@@ -2533,6 +2550,7 @@`
		`# CONFIG_PCI_ENDPOINT_TEST is not set`
		`# CONFIG_XILINX_SDFEC is not set`
		`# CONFIG_HISI_HIKEY_USB is not set`
		`+ # CONFIG_OPEN_DICE is not set`
		`# CONFIG_C2PORT is not set`

		`#`
		`@@ -3025,7 +3043,9 @@`
		`CONFIG_ENIC=m`
		`CONFIG_NET_VENDOR_CORTINA=y`
		`# CONFIG_GEMINI_ETHERNET is not set`
		`+ CONFIG_NET_VENDOR_DAVICOM=y`
		`# CONFIG_DM9000 is not set`
		`+ # CONFIG_DM9051 is not set`
		`# CONFIG_DNET is not set`
		`CONFIG_NET_VENDOR_DEC=y`
		`CONFIG_NET_TULIP=y`
		`@@ -3067,6 +3087,8 @@`
		`# CONFIG_FSL_ENETC_VF is not set`
		`# CONFIG_FSL_ENETC_IERB is not set`
		`# CONFIG_FSL_ENETC_MDIO is not set`
		`+ CONFIG_NET_VENDOR_FUNGIBLE=y`
		`+ # CONFIG_FUN_ETH is not set`
		`CONFIG_NET_VENDOR_GOOGLE=y`
		`CONFIG_NET_VENDOR_HISILICON=y`
		`# CONFIG_HIX5HD2_GMAC is not set`
		`@@ -3611,6 +3633,7 @@`
		`CONFIG_MT7921_COMMON=m`
		`CONFIG_MT7921E=m`
		`CONFIG_MT7921S=m`
		`+ # CONFIG_MT7921U is not set`
		`CONFIG_WLAN_VENDOR_MICROCHIP=y`
		`CONFIG_WILC1000=m`
		`CONFIG_WILC1000_SDIO=m`
		`@@ -3670,9 +3693,13 @@`
		`# CONFIG_RTL8XXXU_UNTESTED is not set`
		`CONFIG_RTW88=m`
		`# CONFIG_RTW88_8822BE is not set`
		`+ # CONFIG_RTW88_8822BU is not set`
		`# CONFIG_RTW88_8822CE is not set`
		`+ # CONFIG_RTW88_8822CU is not set`
		`# CONFIG_RTW88_8723DE is not set`
		`+ # CONFIG_RTW88_8723DU is not set`
		`# CONFIG_RTW88_8821CE is not set`
		`+ # CONFIG_RTW88_8821CU is not set`
		`CONFIG_RTW89=m`
		`# CONFIG_RTW89_8852AE is not set`
		`CONFIG_WLAN_VENDOR_RSI=y`
		`@@ -3739,6 +3766,7 @@`
		`CONFIG_INPUT_FF_MEMLESS=y`
		`CONFIG_INPUT_SPARSEKMAP=m`
		`CONFIG_INPUT_MATRIXKMAP=y`
		`+ CONFIG_INPUT_VIVALDIFMAP=y`

		`#`
		`# Userland interfaces`
		`@@ -3906,6 +3934,7 @@`
		`CONFIG_TOUCHSCREEN_MELFAS_MIP4=m`
		`# CONFIG_TOUCHSCREEN_MSG2638 is not set`
		`CONFIG_TOUCHSCREEN_MTOUCH=m`
		`+ # CONFIG_TOUCHSCREEN_IMAGIS is not set`
		`CONFIG_TOUCHSCREEN_IMX6UL_TSC=m`
		`CONFIG_TOUCHSCREEN_INEXIO=m`
		`CONFIG_TOUCHSCREEN_MK712=m`
		`@@ -4124,7 +4153,6 @@`
		`# CONFIG_SERIAL_SIFIVE is not set`
		`# CONFIG_SERIAL_SCCNXP is not set`
		`# CONFIG_SERIAL_SC16IS7XX is not set`
		`- # CONFIG_SERIAL_BCM63XX is not set`
		`# CONFIG_SERIAL_ALTERA_JTAGUART is not set`
		`# CONFIG_SERIAL_ALTERA_UART is not set`
		`CONFIG_SERIAL_XILINX_PS_UART=y`
		`@@ -4437,6 +4465,7 @@`
		`# CONFIG_PINCTRL_IMX8MQ is not set`
		`# CONFIG_PINCTRL_IMX8ULP is not set`
		`# CONFIG_PINCTRL_IMXRT1050 is not set`
		`+ # CONFIG_PINCTRL_IMX93 is not set`
		`CONFIG_PINCTRL_VF610=y`
		`CONFIG_PINCTRL_MESON=y`
		`CONFIG_PINCTRL_MESON8=y`
		`@@ -4663,6 +4692,7 @@`
		`CONFIG_POWER_SUPPLY_HWMON=y`
		`# CONFIG_PDA_POWER is not set`
		`CONFIG_GENERIC_ADC_BATTERY=m`
		`+ # CONFIG_IP5XXX_POWER is not set`
		`# CONFIG_TEST_POWER is not set`
		`# CONFIG_CHARGER_ADP5061 is not set`
		`CONFIG_BATTERY_ACT8945A=m`
		`@@ -4671,6 +4701,7 @@`
		`# CONFIG_BATTERY_DS2780 is not set`
		`# CONFIG_BATTERY_DS2781 is not set`
		`# CONFIG_BATTERY_DS2782 is not set`
		`+ # CONFIG_BATTERY_SAMSUNG_SDI is not set`
		`CONFIG_BATTERY_SBS=m`
		`CONFIG_CHARGER_SBS=m`
		`CONFIG_MANAGER_SBS=m`
		`@@ -4722,6 +4753,7 @@`
		`# CONFIG_CHARGER_BD99954 is not set`
		`# CONFIG_RN5T618_POWER is not set`
		`CONFIG_BATTERY_ACER_A500=m`
		`+ # CONFIG_BATTERY_UG3105 is not set`
		`CONFIG_HWMON=y`
		`CONFIG_HWMON_VID=m`
		`# CONFIG_HWMON_DEBUG_CHIP is not set`
		`@@ -4855,6 +4887,7 @@`
		`CONFIG_SENSORS_IRPS5401=m`
		`CONFIG_SENSORS_ISL68137=m`
		`CONFIG_SENSORS_LM25066=m`
		`+ # CONFIG_SENSORS_LM25066_REGULATOR is not set`
		`CONFIG_SENSORS_LTC2978=m`
		`CONFIG_SENSORS_LTC2978_REGULATOR=y`
		`CONFIG_SENSORS_LTC3815=m`
		`@@ -4870,6 +4903,7 @@`
		`CONFIG_SENSORS_MP2975=m`
		`# CONFIG_SENSORS_MP5023 is not set`
		`CONFIG_SENSORS_PIM4328=m`
		`+ # CONFIG_SENSORS_PLI1209BC is not set`
		`CONFIG_SENSORS_PM6764TR=m`
		`CONFIG_SENSORS_PXE1610=m`
		`CONFIG_SENSORS_Q54SJ108A2=m`
		`@@ -4879,6 +4913,7 @@`
		`CONFIG_SENSORS_UCD9000=m`
		`CONFIG_SENSORS_UCD9200=m`
		`CONFIG_SENSORS_XDPE122=m`
		`+ # CONFIG_SENSORS_XDPE122_REGULATOR is not set`
		`CONFIG_SENSORS_ZL6100=m`
		`CONFIG_SENSORS_PWM_FAN=m`
		`CONFIG_SENSORS_RASPBERRYPI_HWMON=m`
		`@@ -4890,6 +4925,7 @@`
		`# CONFIG_SENSORS_SHT4x is not set`
		`CONFIG_SENSORS_SHTC1=m`
		`CONFIG_SENSORS_SIS5595=m`
		`+ # CONFIG_SENSORS_SY7636A is not set`
		`CONFIG_SENSORS_DME1737=m`
		`CONFIG_SENSORS_EMC1403=m`
		`CONFIG_SENSORS_EMC2103=m`
		`@@ -4917,6 +4953,7 @@`
		`CONFIG_SENSORS_TMP108=m`
		`CONFIG_SENSORS_TMP401=m`
		`CONFIG_SENSORS_TMP421=m`
		`+ # CONFIG_SENSORS_TMP464 is not set`
		`# CONFIG_SENSORS_TMP513 is not set`
		`CONFIG_SENSORS_VEXPRESS=y`
		`# CONFIG_SENSORS_VIA686A is not set`
		`@@ -5134,6 +5171,7 @@`
		`# CONFIG_MFD_MAX77650 is not set`
		`CONFIG_MFD_MAX77686=y`
		`CONFIG_MFD_MAX77693=y`
		`+ # CONFIG_MFD_MAX77714 is not set`
		`# CONFIG_MFD_MAX77843 is not set`
		`CONFIG_MFD_MAX8907=y`
		`# CONFIG_MFD_MAX8925 is not set`
		`@@ -5158,6 +5196,7 @@`
		`CONFIG_MFD_RN5T618=y`
		`CONFIG_MFD_SEC_CORE=y`
		`# CONFIG_MFD_SI476X_CORE is not set`
		`+ # CONFIG_MFD_SIMPLE_MFD_I2C is not set`
		`# CONFIG_MFD_SM501 is not set`
		`# CONFIG_MFD_SKY81452 is not set`
		`CONFIG_MFD_STMPE=y`
		`@@ -5295,6 +5334,7 @@`
		`CONFIG_REGULATOR_RK808=y`
		`CONFIG_REGULATOR_RN5T618=y`
		`# CONFIG_REGULATOR_RT4801 is not set`
		`+ # CONFIG_REGULATOR_RT5190A is not set`
		`# CONFIG_REGULATOR_RT6160 is not set`
		`# CONFIG_REGULATOR_RT6245 is not set`
		`# CONFIG_REGULATOR_RTQ2134 is not set`
		`@@ -5306,11 +5346,13 @@`
		`# CONFIG_REGULATOR_SLG51000 is not set`
		`CONFIG_REGULATOR_STPMIC1=y`
		`CONFIG_REGULATOR_TI_ABB=y`
		`+ # CONFIG_REGULATOR_SY7636A is not set`
		`CONFIG_REGULATOR_SY8106A=y`
		`# CONFIG_REGULATOR_SY8824X is not set`
		`# CONFIG_REGULATOR_SY8827N is not set`
		`CONFIG_REGULATOR_TPS51632=y`
		`CONFIG_REGULATOR_TPS62360=y`
		`+ # CONFIG_REGULATOR_TPS6286X is not set`
		`CONFIG_REGULATOR_TPS65023=y`
		`CONFIG_REGULATOR_TPS6507X=y`
		`# CONFIG_REGULATOR_TPS65086 is not set`
		`@@ -5326,44 +5368,44 @@`
		`CONFIG_REGULATOR_VEXPRESS=y`
		`CONFIG_REGULATOR_WM8994=y`
		`CONFIG_RC_CORE=m`
		`- CONFIG_RC_MAP=m`
		`CONFIG_LIRC=y`
		`+ CONFIG_RC_MAP=m`
		`CONFIG_RC_DECODERS=y`
		`+ CONFIG_IR_IMON_DECODER=m`
		`+ CONFIG_IR_JVC_DECODER=m`
		`+ CONFIG_IR_MCE_KBD_DECODER=m`
		`CONFIG_IR_NEC_DECODER=m`
		`CONFIG_IR_RC5_DECODER=m`
		`CONFIG_IR_RC6_DECODER=m`
		`- CONFIG_IR_JVC_DECODER=m`
		`- CONFIG_IR_SONY_DECODER=m`
		`+ CONFIG_IR_RCMM_DECODER=m`
		`CONFIG_IR_SANYO_DECODER=m`
		`CONFIG_IR_SHARP_DECODER=m`
		`- CONFIG_IR_MCE_KBD_DECODER=m`
		`+ CONFIG_IR_SONY_DECODER=m`
		`CONFIG_IR_XMP_DECODER=m`
		`- CONFIG_IR_IMON_DECODER=m`
		`- CONFIG_IR_RCMM_DECODER=m`
		`CONFIG_RC_DEVICES=y`
		`- CONFIG_RC_ATI_REMOTE=m`
		`+ CONFIG_IR_GPIO_CIR=m`
		`+ CONFIG_IR_GPIO_TX=m`
		`CONFIG_IR_HIX5HD2=m`
		`+ CONFIG_IR_IGORPLUGUSB=m`
		`+ CONFIG_IR_IGUANA=m`
		`CONFIG_IR_IMON=m`
		`CONFIG_IR_IMON_RAW=m`
		`CONFIG_IR_MCEUSB=m`
		`CONFIG_IR_MESON=m`
		`# CONFIG_IR_MESON_TX is not set`
		`+ CONFIG_IR_PWM_TX=m`
		`CONFIG_IR_REDRAT3=m`
		`+ CONFIG_IR_RX51=m`
		`+ CONFIG_IR_SERIAL=m`
		`+ CONFIG_IR_SERIAL_TRANSMITTER=y`
		`CONFIG_IR_SPI=m`
		`CONFIG_IR_STREAMZAP=m`
		`- CONFIG_IR_IGORPLUGUSB=m`
		`- CONFIG_IR_IGUANA=m`
		`+ CONFIG_IR_SUNXI=m`
		`+ # CONFIG_IR_TOY is not set`
		`CONFIG_IR_TTUSBIR=m`
		`- CONFIG_IR_RX51=m`
		`+ CONFIG_RC_ATI_REMOTE=m`
		`CONFIG_RC_LOOPBACK=m`
		`- CONFIG_IR_GPIO_CIR=m`
		`- CONFIG_IR_GPIO_TX=m`
		`- CONFIG_IR_PWM_TX=m`
		`- CONFIG_IR_SUNXI=m`
		`- CONFIG_IR_SERIAL=m`
		`- CONFIG_IR_SERIAL_TRANSMITTER=y`
		`# CONFIG_RC_XBOX_DVD is not set`
		`- # CONFIG_IR_TOY is not set`
		`CONFIG_CEC_CORE=y`
		`CONFIG_CEC_NOTIFIER=y`
		`CONFIG_CEC_PIN=y`
		`@@ -5411,7 +5453,6 @@`
		`#`
		`# Video4Linux options`
		`#`
		`- CONFIG_VIDEO_V4L2=y`
		`CONFIG_VIDEO_V4L2_I2C=y`
		`CONFIG_VIDEO_V4L2_SUBDEV_API=y`
		`# CONFIG_VIDEO_ADV_DEBUG is not set`
		`@@ -5450,17 +5491,17 @@`
		`#`
		`# Media drivers`
		`#`
		`+`
		`+ #`
		`+ # Media drivers`
		`+ #`
		`CONFIG_MEDIA_USB_SUPPORT=y`

		`#`
		`# Webcam devices`
		`#`
		`- CONFIG_USB_VIDEO_CLASS=m`
		`- CONFIG_USB_VIDEO_CLASS_INPUT_EVDEV=y`
		`+ CONFIG_VIDEO_CPIA2=m`
		`CONFIG_USB_GSPCA=m`
		`- CONFIG_USB_M5602=m`
		`- CONFIG_USB_STV06XX=m`
		`- CONFIG_USB_GL860=m`
		`CONFIG_USB_GSPCA_BENQ=m`
		`CONFIG_USB_GSPCA_CONEX=m`
		`CONFIG_USB_GSPCA_CPIA1=m`
		`@@ -5485,13 +5526,13 @@`
		`CONFIG_USB_GSPCA_SN9C20X=m`
		`CONFIG_USB_GSPCA_SONIXB=m`
		`CONFIG_USB_GSPCA_SONIXJ=m`
		`+ CONFIG_USB_GSPCA_SPCA1528=m`
		`CONFIG_USB_GSPCA_SPCA500=m`
		`CONFIG_USB_GSPCA_SPCA501=m`
		`CONFIG_USB_GSPCA_SPCA505=m`
		`CONFIG_USB_GSPCA_SPCA506=m`
		`CONFIG_USB_GSPCA_SPCA508=m`
		`CONFIG_USB_GSPCA_SPCA561=m`
		`- CONFIG_USB_GSPCA_SPCA1528=m`
		`CONFIG_USB_GSPCA_SQ905=m`
		`CONFIG_USB_GSPCA_SQ905C=m`
		`CONFIG_USB_GSPCA_SQ930X=m`
		`@@ -5507,29 +5548,33 @@`
		`CONFIG_USB_GSPCA_VICAM=m`
		`CONFIG_USB_GSPCA_XIRLINK_CIT=m`
		`CONFIG_USB_GSPCA_ZC3XX=m`
		`+ CONFIG_USB_GL860=m`
		`+ CONFIG_USB_M5602=m`
		`+ CONFIG_USB_STV06XX=m`
		`CONFIG_USB_PWC=m`
		`# CONFIG_USB_PWC_DEBUG is not set`
		`CONFIG_USB_PWC_INPUT_EVDEV=y`
		`- CONFIG_VIDEO_CPIA2=m`
		`- CONFIG_USB_ZR364XX=m`
		`- CONFIG_USB_STKWEBCAM=m`
		`CONFIG_USB_S2255=m`
		`+ CONFIG_USB_STKWEBCAM=m`
		`CONFIG_VIDEO_USBTV=m`
		`+ CONFIG_USB_VIDEO_CLASS=m`
		`+ CONFIG_USB_VIDEO_CLASS_INPUT_EVDEV=y`
		`+ CONFIG_USB_ZR364XX=m`

		`#`
		`# Analog TV USB devices`
		`#`
		`+ CONFIG_VIDEO_GO7007=m`
		`+ CONFIG_VIDEO_GO7007_USB=m`
		`+ CONFIG_VIDEO_GO7007_LOADER=m`
		`+ CONFIG_VIDEO_GO7007_USB_S2250_BOARD=m`
		`+ CONFIG_VIDEO_HDPVR=m`
		`CONFIG_VIDEO_PVRUSB2=m`
		`CONFIG_VIDEO_PVRUSB2_SYSFS=y`
		`CONFIG_VIDEO_PVRUSB2_DVB=y`
		`# CONFIG_VIDEO_PVRUSB2_DEBUGIFC is not set`
		`- CONFIG_VIDEO_HDPVR=m`
		`CONFIG_VIDEO_STK1160_COMMON=m`
		`CONFIG_VIDEO_STK1160=m`
		`- CONFIG_VIDEO_GO7007=m`
		`- CONFIG_VIDEO_GO7007_USB=m`
		`- CONFIG_VIDEO_GO7007_LOADER=m`
		`- CONFIG_VIDEO_GO7007_USB_S2250_BOARD=m`

		`#`
		`# Analog/digital TV USB devices`
		`@@ -5548,34 +5593,9 @@`
		`#`
		`# Digital TV USB devices`
		`#`
		`- CONFIG_DVB_USB=m`
		`- # CONFIG_DVB_USB_DEBUG is not set`
		`- CONFIG_DVB_USB_DIB3000MC=m`
		`- CONFIG_DVB_USB_A800=m`
		`- CONFIG_DVB_USB_DIBUSB_MB=m`
		`- CONFIG_DVB_USB_DIBUSB_MB_FAULTY=y`
		`- CONFIG_DVB_USB_DIBUSB_MC=m`
		`- CONFIG_DVB_USB_DIB0700=m`
		`- CONFIG_DVB_USB_UMT_010=m`
		`- CONFIG_DVB_USB_CXUSB=m`
		`- # CONFIG_DVB_USB_CXUSB_ANALOG is not set`
		`- CONFIG_DVB_USB_M920X=m`
		`- CONFIG_DVB_USB_DIGITV=m`
		`- CONFIG_DVB_USB_VP7045=m`
		`- CONFIG_DVB_USB_VP702X=m`
		`- CONFIG_DVB_USB_GP8PSK=m`
		`- CONFIG_DVB_USB_NOVA_T_USB2=m`
		`- CONFIG_DVB_USB_TTUSB2=m`
		`- CONFIG_DVB_USB_DTT200U=m`
		`- CONFIG_DVB_USB_OPERA1=m`
		`- CONFIG_DVB_USB_AF9005=m`
		`- CONFIG_DVB_USB_AF9005_REMOTE=m`
		`- CONFIG_DVB_USB_PCTV452E=m`
		`- CONFIG_DVB_USB_DW2102=m`
		`- CONFIG_DVB_USB_CINERGY_T2=m`
		`- CONFIG_DVB_USB_DTV5100=m`
		`- CONFIG_DVB_USB_AZ6027=m`
		`- CONFIG_DVB_USB_TECHNISAT_USB2=m`
		`+ CONFIG_DVB_AS102=m`
		`+ CONFIG_DVB_B2C2_FLEXCOP_USB=m`
		`+ # CONFIG_DVB_B2C2_FLEXCOP_USB_DEBUG is not set`
		`CONFIG_DVB_USB_V2=m`
		`CONFIG_DVB_USB_AF9015=m`
		`CONFIG_DVB_USB_AF9035=m`
		`@@ -5583,19 +5603,44 @@`
		`CONFIG_DVB_USB_AU6610=m`
		`CONFIG_DVB_USB_AZ6007=m`
		`CONFIG_DVB_USB_CE6230=m`
		`+ CONFIG_DVB_USB_DVBSKY=m`
		`CONFIG_DVB_USB_EC168=m`
		`CONFIG_DVB_USB_GL861=m`
		`CONFIG_DVB_USB_LME2510=m`
		`CONFIG_DVB_USB_MXL111SF=m`
		`CONFIG_DVB_USB_RTL28XXU=m`
		`- CONFIG_DVB_USB_DVBSKY=m`
		`CONFIG_DVB_USB_ZD1301=m`
		`+ CONFIG_DVB_USB=m`
		`+ # CONFIG_DVB_USB_DEBUG is not set`
		`+ CONFIG_DVB_USB_A800=m`
		`+ CONFIG_DVB_USB_AF9005=m`
		`+ CONFIG_DVB_USB_AF9005_REMOTE=m`
		`+ CONFIG_DVB_USB_AZ6027=m`
		`+ CONFIG_DVB_USB_CINERGY_T2=m`
		`+ CONFIG_DVB_USB_CXUSB=m`
		`+ # CONFIG_DVB_USB_CXUSB_ANALOG is not set`
		`+ CONFIG_DVB_USB_DIB0700=m`
		`+ CONFIG_DVB_USB_DIB3000MC=m`
		`+ CONFIG_DVB_USB_DIBUSB_MB=m`
		`+ CONFIG_DVB_USB_DIBUSB_MB_FAULTY=y`
		`+ CONFIG_DVB_USB_DIBUSB_MC=m`
		`+ CONFIG_DVB_USB_DIGITV=m`
		`+ CONFIG_DVB_USB_DTT200U=m`
		`+ CONFIG_DVB_USB_DTV5100=m`
		`+ CONFIG_DVB_USB_DW2102=m`
		`+ CONFIG_DVB_USB_GP8PSK=m`
		`+ CONFIG_DVB_USB_M920X=m`
		`+ CONFIG_DVB_USB_NOVA_T_USB2=m`
		`+ CONFIG_DVB_USB_OPERA1=m`
		`+ CONFIG_DVB_USB_PCTV452E=m`
		`+ CONFIG_DVB_USB_TECHNISAT_USB2=m`
		`+ CONFIG_DVB_USB_TTUSB2=m`
		`+ CONFIG_DVB_USB_UMT_010=m`
		`+ CONFIG_DVB_USB_VP702X=m`
		`+ CONFIG_DVB_USB_VP7045=m`
		`+ CONFIG_SMS_USB_DRV=m`
		`CONFIG_DVB_TTUSB_BUDGET=m`
		`CONFIG_DVB_TTUSB_DEC=m`
		`- CONFIG_SMS_USB_DRV=m`
		`- CONFIG_DVB_B2C2_FLEXCOP_USB=m`
		`- # CONFIG_DVB_B2C2_FLEXCOP_USB_DEBUG is not set`
		`- CONFIG_DVB_AS102=m`

		`#`
		`# Webcam, TV (analog/digital) USB devices`
		`@@ -5625,17 +5670,19 @@`
		`#`
		`# Media capture/analog TV support`
		`#`
		`+ CONFIG_VIDEO_DT3155=m`
		`CONFIG_VIDEO_IVTV=m`
		`CONFIG_VIDEO_IVTV_ALSA=m`
		`CONFIG_VIDEO_FB_IVTV=m`
		`CONFIG_VIDEO_HEXIUM_GEMINI=m`
		`CONFIG_VIDEO_HEXIUM_ORION=m`
		`CONFIG_VIDEO_MXB=m`
		`- CONFIG_VIDEO_DT3155=m`

		`#`
		`# Media capture/analog/hybrid TV support`
		`#`
		`+ CONFIG_VIDEO_BT848=m`
		`+ CONFIG_DVB_BT8XX=m`
		`CONFIG_VIDEO_CX18=m`
		`CONFIG_VIDEO_CX18_ALSA=m`
		`CONFIG_VIDEO_CX23885=m`
		`@@ -5649,8 +5696,6 @@`
		`CONFIG_VIDEO_CX88_ENABLE_VP3054=y`
		`CONFIG_VIDEO_CX88_VP3054=m`
		`CONFIG_VIDEO_CX88_MPEG=m`
		`- CONFIG_VIDEO_BT848=m`
		`- CONFIG_DVB_BT8XX=m`
		`CONFIG_VIDEO_SAA7134=m`
		`CONFIG_VIDEO_SAA7134_ALSA=m`
		`CONFIG_VIDEO_SAA7134_RC=y`
		`@@ -5661,239 +5706,227 @@`
		`#`
		`# Media digital TV PCI Adapters`
		`#`
		`- CONFIG_DVB_BUDGET_CORE=m`
		`- CONFIG_DVB_BUDGET=m`
		`- CONFIG_DVB_BUDGET_CI=m`
		`- CONFIG_DVB_BUDGET_AV=m`
		`CONFIG_DVB_B2C2_FLEXCOP_PCI=m`
		`# CONFIG_DVB_B2C2_FLEXCOP_PCI_DEBUG is not set`
		`- CONFIG_DVB_PLUTO2=m`
		`+ CONFIG_DVB_DDBRIDGE=m`
		`+ # CONFIG_DVB_DDBRIDGE_MSIENABLE is not set`
		`CONFIG_DVB_DM1105=m`
		`- CONFIG_DVB_PT1=m`
		`- CONFIG_DVB_PT3=m`
		`CONFIG_MANTIS_CORE=m`
		`CONFIG_DVB_MANTIS=m`
		`CONFIG_DVB_HOPPER=m`
		`+ CONFIG_DVB_NETUP_UNIDVB=m`
		`CONFIG_DVB_NGENE=m`
		`- CONFIG_DVB_DDBRIDGE=m`
		`- # CONFIG_DVB_DDBRIDGE_MSIENABLE is not set`
		`+ CONFIG_DVB_PLUTO2=m`
		`+ CONFIG_DVB_PT1=m`
		`+ CONFIG_DVB_PT3=m`
		`CONFIG_DVB_SMIPCIE=m`
		`- CONFIG_DVB_NETUP_UNIDVB=m`
		`+ CONFIG_DVB_BUDGET_CORE=m`
		`+ CONFIG_DVB_BUDGET=m`
		`+ CONFIG_DVB_BUDGET_CI=m`
		`+ CONFIG_DVB_BUDGET_AV=m`
		`CONFIG_RADIO_ADAPTERS=y`
		`+ # CONFIG_RADIO_MAXIRADIO is not set`
		`+ CONFIG_RADIO_SAA7706H=m`
		`+ CONFIG_RADIO_SHARK=m`
		`+ CONFIG_RADIO_SHARK2=m`
		`+ CONFIG_RADIO_SI4713=m`
		`CONFIG_RADIO_TEA575X=m`
		`+ CONFIG_RADIO_TEA5764=m`
		`+ CONFIG_RADIO_TEF6862=m`
		`+ CONFIG_RADIO_WL1273=m`
		`+ CONFIG_USB_DSBR=m`
		`+ CONFIG_USB_KEENE=m`
		`+ CONFIG_USB_MA901=m`
		`+ CONFIG_USB_MR800=m`
		`+ CONFIG_USB_RAREMONO=m`
		`CONFIG_RADIO_SI470X=y`
		`CONFIG_USB_SI470X=m`
		`CONFIG_I2C_SI470X=m`
		`- CONFIG_RADIO_SI4713=m`
		`CONFIG_USB_SI4713=m`
		`CONFIG_PLATFORM_SI4713=m`
		`CONFIG_I2C_SI4713=m`
		`- CONFIG_USB_MR800=m`
		`- CONFIG_USB_DSBR=m`
		`- # CONFIG_RADIO_MAXIRADIO is not set`
		`- CONFIG_RADIO_SHARK=m`
		`- CONFIG_RADIO_SHARK2=m`
		`- CONFIG_USB_KEENE=m`
		`- CONFIG_USB_RAREMONO=m`
		`- CONFIG_USB_MA901=m`
		`- CONFIG_RADIO_TEA5764=m`
		`- CONFIG_RADIO_SAA7706H=m`
		`- CONFIG_RADIO_TEF6862=m`
		`- CONFIG_RADIO_WL1273=m`
		`CONFIG_RADIO_WL128X=m`
		`- CONFIG_MEDIA_COMMON_OPTIONS=y`
		`-`
		`- #`
		`- # common driver options`
		`- #`
		`- CONFIG_VIDEO_CX2341X=m`
		`- CONFIG_VIDEO_TVEEPROM=m`
		`- CONFIG_TTPCI_EEPROM=m`
		`- CONFIG_CYPRESS_FIRMWARE=m`
		`- CONFIG_VIDEOBUF2_CORE=m`
		`- CONFIG_VIDEOBUF2_V4L2=m`
		`- CONFIG_VIDEOBUF2_MEMOPS=m`
		`- CONFIG_VIDEOBUF2_DMA_CONTIG=m`
		`- CONFIG_VIDEOBUF2_VMALLOC=m`
		`- CONFIG_VIDEOBUF2_DMA_SG=m`
		`- CONFIG_VIDEOBUF2_DVB=m`
		`- CONFIG_DVB_B2C2_FLEXCOP=m`
		`- CONFIG_VIDEO_SAA7146=m`
		`- CONFIG_VIDEO_SAA7146_VV=m`
		`- CONFIG_SMS_SIANO_MDTV=m`
		`- CONFIG_SMS_SIANO_RC=y`
		`- # CONFIG_SMS_SIANO_DEBUGFS is not set`
		`+ CONFIG_MEDIA_PLATFORM_DRIVERS=y`
		`CONFIG_V4L_PLATFORM_DRIVERS=y`
		`- CONFIG_VIDEO_CAFE_CCIC=m`
		`- # CONFIG_VIDEO_CADENCE is not set`
		`- # CONFIG_VIDEO_ASPEED is not set`
		`- CONFIG_VIDEO_MUX=m`
		`- CONFIG_VIDEO_OMAP3=m`
		`- # CONFIG_VIDEO_OMAP3_DEBUG is not set`
		`- # CONFIG_VIDEO_ROCKCHIP_ISP1 is not set`
		`- CONFIG_VIDEO_SAMSUNG_EXYNOS4_IS=m`
		`- CONFIG_VIDEO_EXYNOS4_IS_COMMON=m`
		`- CONFIG_VIDEO_S5P_FIMC=m`
		`- CONFIG_VIDEO_S5P_MIPI_CSIS=m`
		`- CONFIG_VIDEO_EXYNOS_FIMC_LITE=m`
		`- CONFIG_VIDEO_EXYNOS4_FIMC_IS=m`
		`- CONFIG_VIDEO_EXYNOS4_ISP_DMA_CAPTURE=y`
		`- CONFIG_VIDEO_AM437X_VPFE=m`
		`- CONFIG_VIDEO_XILINX=m`
		`- # CONFIG_VIDEO_XILINX_CSI2RXSS is not set`
		`- CONFIG_VIDEO_XILINX_TPG=m`
		`- CONFIG_VIDEO_XILINX_VTC=m`
		`- CONFIG_VIDEO_SUN4I_CSI=m`
		`- CONFIG_VIDEO_SUN6I_CSI=m`
		`- # CONFIG_VIDEO_TI_CAL is not set`
		`+ # CONFIG_SDR_PLATFORM_DRIVERS is not set`
		`+ CONFIG_DVB_PLATFORM_DRIVERS=y`
		`CONFIG_V4L_MEM2MEM_DRIVERS=y`
		`- CONFIG_VIDEO_CODA=m`
		`- CONFIG_VIDEO_IMX_VDOA=m`
		`- CONFIG_VIDEO_IMX_PXP=m`
		`- # CONFIG_VIDEO_IMX8_JPEG is not set`
		`CONFIG_VIDEO_MEM2MEM_DEINTERLACE=m`
		`- # CONFIG_VIDEO_MESON_GE2D is not set`
		`- # CONFIG_VIDEO_SAMSUNG_S5P_G2D is not set`
		`- CONFIG_VIDEO_SAMSUNG_S5P_JPEG=m`
		`- CONFIG_VIDEO_SAMSUNG_S5P_MFC=m`
		`- CONFIG_VIDEO_SAMSUNG_EXYNOS_GSC=m`
		`- CONFIG_VIDEO_ROCKCHIP_RGA=m`
		`- CONFIG_VIDEO_TI_VPE=m`
		`- # CONFIG_VIDEO_TI_VPE_DEBUG is not set`
		`- # CONFIG_VIDEO_SUN8I_DEINTERLACE is not set`
		`- # CONFIG_VIDEO_SUN8I_ROTATE is not set`
		`- CONFIG_VIDEO_TI_VPDMA=m`
		`- CONFIG_VIDEO_TI_SC=m`
		`- CONFIG_VIDEO_TI_CSC=m`
		`- CONFIG_DVB_PLATFORM_DRIVERS=y`
		`- CONFIG_DVB_C8SECTPFE=m`
		`- # CONFIG_SDR_PLATFORM_DRIVERS is not set`
		`+ CONFIG_VIDEO_MUX=m`

		`#`
		`- # MMC/SDIO DVB adapters`
		`+ # Allegro DVT media platform drivers`
		`#`
		`- CONFIG_SMS_SDIO_DRV=m`
		`- # CONFIG_V4L_TEST_DRIVERS is not set`
		`- # CONFIG_DVB_TEST_DRIVERS is not set`
		`- # end of Media drivers`

		`#`
		`- # Media ancillary drivers`
		`+ # Amlogic media platform drivers`
		`#`
		`- CONFIG_MEDIA_ATTACH=y`
		`+ # CONFIG_VIDEO_MESON_GE2D is not set`

		`#`
		`- # IR I2C driver auto-selected by 'Autoselect ancillary drivers'`
		`+ # Amphion drivers`
		`#`
		`- CONFIG_VIDEO_IR_I2C=m`
		`+ # CONFIG_VIDEO_AMPHION_VPU is not set`

		`#`
		`- # Audio decoders, processors and mixers`
		`+ # Aspeed media platform drivers`
		`#`
		`- CONFIG_VIDEO_TVAUDIO=m`
		`- CONFIG_VIDEO_TDA7432=m`
		`- CONFIG_VIDEO_TDA9840=m`
		`- # CONFIG_VIDEO_TDA1997X is not set`
		`- CONFIG_VIDEO_TEA6415C=m`
		`- CONFIG_VIDEO_TEA6420=m`
		`- CONFIG_VIDEO_MSP3400=m`
		`- CONFIG_VIDEO_CS3308=m`
		`- CONFIG_VIDEO_CS5345=m`
		`- CONFIG_VIDEO_CS53L32A=m`
		`- CONFIG_VIDEO_TLV320AIC23B=m`
		`- CONFIG_VIDEO_UDA1342=m`
		`- CONFIG_VIDEO_WM8775=m`
		`- CONFIG_VIDEO_WM8739=m`
		`- CONFIG_VIDEO_VP27SMPX=m`
		`- CONFIG_VIDEO_SONY_BTF_MPX=m`
		`- # end of Audio decoders, processors and mixers`
		`+ # CONFIG_VIDEO_ASPEED is not set`

		`#`
		`- # RDS decoders`
		`+ # Atmel media platform drivers`
		`#`
		`- CONFIG_VIDEO_SAA6588=m`
		`- # end of RDS decoders`

		`#`
		`- # Video decoders`
		`+ # Cadence media platform drivers`
		`#`
		`- # CONFIG_VIDEO_ADV7180 is not set`
		`- # CONFIG_VIDEO_ADV7183 is not set`
		`- # CONFIG_VIDEO_ADV748X is not set`
		`- # CONFIG_VIDEO_ADV7604 is not set`
		`- # CONFIG_VIDEO_ADV7842 is not set`
		`- CONFIG_VIDEO_BT819=m`
		`- CONFIG_VIDEO_BT856=m`
		`- # CONFIG_VIDEO_BT866 is not set`
		`- CONFIG_VIDEO_KS0127=m`
		`- # CONFIG_VIDEO_ML86V7667 is not set`
		`- CONFIG_VIDEO_SAA7110=m`
		`- CONFIG_VIDEO_SAA711X=m`
		`- # CONFIG_VIDEO_TC358743 is not set`
		`- # CONFIG_VIDEO_TVP514X is not set`
		`- CONFIG_VIDEO_TVP5150=m`
		`- # CONFIG_VIDEO_TVP7002 is not set`
		`- CONFIG_VIDEO_TW2804=m`
		`- CONFIG_VIDEO_TW9903=m`
		`- CONFIG_VIDEO_TW9906=m`
		`- # CONFIG_VIDEO_TW9910 is not set`
		`- CONFIG_VIDEO_VPX3220=m`
		`- # CONFIG_VIDEO_MAX9286 is not set`
		`+ # CONFIG_VIDEO_CADENCE_CSI2RX is not set`
		`+ # CONFIG_VIDEO_CADENCE_CSI2TX is not set`

		`#`
		`- # Video and audio decoders`
		`+ # Chips&Media media platform drivers`
		`#`
		`- CONFIG_VIDEO_SAA717X=m`
		`- CONFIG_VIDEO_CX25840=m`
		`- # end of Video decoders`
		`+ CONFIG_VIDEO_CODA=m`
		`+ CONFIG_VIDEO_IMX_VDOA=m`

		`#`
		`- # Video encoders`
		`+ # Intel media platform drivers`
		`#`
		`- CONFIG_VIDEO_SAA7127=m`
		`- CONFIG_VIDEO_SAA7185=m`
		`- CONFIG_VIDEO_ADV7170=m`
		`- CONFIG_VIDEO_ADV7175=m`
		`- # CONFIG_VIDEO_ADV7343 is not set`
		`- # CONFIG_VIDEO_ADV7393 is not set`
		`- # CONFIG_VIDEO_AD9389B is not set`
		`- # CONFIG_VIDEO_AK881X is not set`
		`- # CONFIG_VIDEO_THS8200 is not set`
		`- # end of Video encoders`

		`#`
		`- # Video improvement chips`
		`+ # Marvell media platform drivers`
		`#`
		`- CONFIG_VIDEO_UPD64031A=m`
		`- CONFIG_VIDEO_UPD64083=m`
		`- # end of Video improvement chips`
		`+ CONFIG_VIDEO_CAFE_CCIC=m`

		`#`
		`- # Audio/Video compression chips`
		`+ # Mediatek media platform drivers`
		`#`
		`- CONFIG_VIDEO_SAA6752HS=m`
		`- # end of Audio/Video compression chips`

		`#`
		`- # SDR tuner chips`
		`+ # NVidia media platform drivers`
		`#`
		`- # CONFIG_SDR_MAX2175 is not set`
		`- # end of SDR tuner chips`
		`+ # CONFIG_VIDEO_TEGRA_VDE is not set`

		`#`
		`- # Miscellaneous helper chips`
		`+ # NXP media platform drivers`
		`#`
		`- # CONFIG_VIDEO_THS7303 is not set`
		`- CONFIG_VIDEO_M52790=m`
		`- # CONFIG_VIDEO_I2C is not set`
		`- # CONFIG_VIDEO_ST_MIPID02 is not set`
		`- # end of Miscellaneous helper chips`
		`+ # CONFIG_VIDEO_IMX_MIPI_CSIS is not set`
		`+ CONFIG_VIDEO_IMX_PXP=m`
		`+ # CONFIG_VIDEO_IMX8_JPEG is not set`
		`+`
		`+ #`
		`+ # Qualcomm media platform drivers`
		`+ #`
		`+`
		`+ #`
		`+ # Renesas media platform drivers`
		`+ #`
		`+`
		`+ #`
		`+ # Rockchip media platform drivers`
		`+ #`
		`+ CONFIG_VIDEO_ROCKCHIP_RGA=m`
		`+ # CONFIG_VIDEO_ROCKCHIP_ISP1 is not set`
		`+`
		`+ #`
		`+ # Samsung media platform drivers`
		`+ #`
		`+ CONFIG_VIDEO_SAMSUNG_EXYNOS_GSC=m`
		`+ CONFIG_VIDEO_SAMSUNG_EXYNOS4_IS=m`
		`+ CONFIG_VIDEO_EXYNOS4_IS_COMMON=m`
		`+ CONFIG_VIDEO_S5P_FIMC=m`
		`+ CONFIG_VIDEO_S5P_MIPI_CSIS=m`
		`+ CONFIG_VIDEO_EXYNOS_FIMC_LITE=m`
		`+ CONFIG_VIDEO_EXYNOS4_FIMC_IS=m`
		`+ CONFIG_VIDEO_EXYNOS4_ISP_DMA_CAPTURE=y`
		`+ # CONFIG_VIDEO_SAMSUNG_S5P_G2D is not set`
		`+ CONFIG_VIDEO_SAMSUNG_S5P_JPEG=m`
		`+ CONFIG_VIDEO_SAMSUNG_S5P_MFC=m`
		`+`
		`+ #`
		`+ # STMicroelectronics media platform drivers`
		`+ #`
		`+ CONFIG_DVB_C8SECTPFE=m`
		`+`
		`+ #`
		`+ # Sunxi media platform drivers`
		`+ #`
		`+ CONFIG_VIDEO_SUN4I_CSI=m`
		`+ CONFIG_VIDEO_SUN6I_CSI=m`
		`+ # CONFIG_VIDEO_SUN8I_DEINTERLACE is not set`
		`+ # CONFIG_VIDEO_SUN8I_ROTATE is not set`
		`+`
		`+ #`
		`+ # Texas Instruments drivers`
		`+ #`
		`+ CONFIG_VIDEO_TI_VPDMA=m`
		`+ CONFIG_VIDEO_TI_SC=m`
		`+ CONFIG_VIDEO_TI_CSC=m`
		`+ # CONFIG_VIDEO_TI_CAL is not set`
		`+ CONFIG_VIDEO_TI_VPE=m`
		`+ # CONFIG_VIDEO_TI_VPE_DEBUG is not set`
		`+ CONFIG_VIDEO_AM437X_VPFE=m`
		`+ CONFIG_VIDEO_OMAP3=m`
		`+ # CONFIG_VIDEO_OMAP3_DEBUG is not set`
		`+`
		`+ #`
		`+ # VIA media platform drivers`
		`+ #`
		`+`
		`+ #`
		`+ # Xilinx media platform drivers`
		`+ #`
		`+ CONFIG_VIDEO_XILINX=m`
		`+ # CONFIG_VIDEO_XILINX_CSI2RXSS is not set`
		`+ CONFIG_VIDEO_XILINX_TPG=m`
		`+ CONFIG_VIDEO_XILINX_VTC=m`
		`+`
		`+ #`
		`+ # MMC/SDIO DVB adapters`
		`+ #`
		`+ CONFIG_SMS_SDIO_DRV=m`
		`+ # CONFIG_V4L_TEST_DRIVERS is not set`
		`+ # CONFIG_DVB_TEST_DRIVERS is not set`
		`+ CONFIG_MEDIA_COMMON_OPTIONS=y`
		`+`
		`+ #`
		`+ # common driver options`
		`+ #`
		`+ CONFIG_CYPRESS_FIRMWARE=m`
		`+ CONFIG_TTPCI_EEPROM=m`
		`+ CONFIG_VIDEO_CX2341X=m`
		`+ CONFIG_VIDEO_TVEEPROM=m`
		`+ CONFIG_DVB_B2C2_FLEXCOP=m`
		`+ CONFIG_VIDEO_SAA7146=m`
		`+ CONFIG_VIDEO_SAA7146_VV=m`
		`+ CONFIG_SMS_SIANO_MDTV=m`
		`+ CONFIG_SMS_SIANO_RC=y`
		`+ # CONFIG_SMS_SIANO_DEBUGFS is not set`
		`+ CONFIG_VIDEOBUF2_CORE=m`
		`+ CONFIG_VIDEOBUF2_V4L2=m`
		`+ CONFIG_VIDEOBUF2_MEMOPS=m`
		`+ CONFIG_VIDEOBUF2_DMA_CONTIG=m`
		`+ CONFIG_VIDEOBUF2_VMALLOC=m`
		`+ CONFIG_VIDEOBUF2_DMA_SG=m`
		`+ CONFIG_VIDEOBUF2_DVB=m`
		`+ # end of Media drivers`
		`+`
		`+ #`
		`+ # Media ancillary drivers`
		`+ #`
		`+ CONFIG_MEDIA_ATTACH=y`
		`+`
		`+ #`
		`+ # IR I2C driver auto-selected by 'Autoselect ancillary drivers'`
		`+ #`
		`+ CONFIG_VIDEO_IR_I2C=m`

		`#`
		`# Camera sensor devices`
		`#`
		`# CONFIG_VIDEO_HI556 is not set`
		`# CONFIG_VIDEO_HI846 is not set`
		`+ # CONFIG_VIDEO_HI847 is not set`
		`# CONFIG_VIDEO_IMX208 is not set`
		`# CONFIG_VIDEO_IMX214 is not set`
		`# CONFIG_VIDEO_IMX219 is not set`
		`@@ -5905,7 +5938,21 @@`
		`# CONFIG_VIDEO_IMX335 is not set`
		`# CONFIG_VIDEO_IMX355 is not set`
		`# CONFIG_VIDEO_IMX412 is not set`
		`+ # CONFIG_VIDEO_MT9M001 is not set`
		`+ # CONFIG_VIDEO_MT9M032 is not set`
		`+ # CONFIG_VIDEO_MT9M111 is not set`
		`+ # CONFIG_VIDEO_MT9P031 is not set`
		`+ # CONFIG_VIDEO_MT9T001 is not set`
		`+ # CONFIG_VIDEO_MT9T112 is not set`
		`+ CONFIG_VIDEO_MT9V011=m`
		`+ # CONFIG_VIDEO_MT9V032 is not set`
		`+ # CONFIG_VIDEO_MT9V111 is not set`
		`+ CONFIG_VIDEO_NOON010PC30=m`
		`+ # CONFIG_VIDEO_OG01A1B is not set`
		`# CONFIG_VIDEO_OV02A10 is not set`
		`+ # CONFIG_VIDEO_OV08D10 is not set`
		`+ # CONFIG_VIDEO_OV13858 is not set`
		`+ # CONFIG_VIDEO_OV13B10 is not set`
		`CONFIG_VIDEO_OV2640=m`
		`# CONFIG_VIDEO_OV2659 is not set`
		`# CONFIG_VIDEO_OV2680 is not set`
		`@@ -5914,76 +5961,162 @@`
		`# CONFIG_VIDEO_OV5645 is not set`
		`# CONFIG_VIDEO_OV5647 is not set`
		`# CONFIG_VIDEO_OV5648 is not set`
		`- # CONFIG_VIDEO_OV6650 is not set`
		`# CONFIG_VIDEO_OV5670 is not set`
		`# CONFIG_VIDEO_OV5675 is not set`
		`# CONFIG_VIDEO_OV5693 is not set`
		`# CONFIG_VIDEO_OV5695 is not set`
		`+ # CONFIG_VIDEO_OV6650 is not set`
		`# CONFIG_VIDEO_OV7251 is not set`
		`- # CONFIG_VIDEO_OV772X is not set`
		`CONFIG_VIDEO_OV7640=m`
		`CONFIG_VIDEO_OV7670=m`
		`+ # CONFIG_VIDEO_OV772X is not set`
		`# CONFIG_VIDEO_OV7740 is not set`
		`# CONFIG_VIDEO_OV8856 is not set`
		`# CONFIG_VIDEO_OV8865 is not set`
		`# CONFIG_VIDEO_OV9282 is not set`
		`# CONFIG_VIDEO_OV9640 is not set`
		`# CONFIG_VIDEO_OV9650 is not set`
		`- # CONFIG_VIDEO_OV13858 is not set`
		`- # CONFIG_VIDEO_OV13B10 is not set`
		`- # CONFIG_VIDEO_VS6624 is not set`
		`- # CONFIG_VIDEO_MT9M001 is not set`
		`- # CONFIG_VIDEO_MT9M032 is not set`
		`- # CONFIG_VIDEO_MT9M111 is not set`
		`- # CONFIG_VIDEO_MT9P031 is not set`
		`- # CONFIG_VIDEO_MT9T001 is not set`
		`- # CONFIG_VIDEO_MT9T112 is not set`
		`- CONFIG_VIDEO_MT9V011=m`
		`- # CONFIG_VIDEO_MT9V032 is not set`
		`- # CONFIG_VIDEO_MT9V111 is not set`
		`- CONFIG_VIDEO_SR030PC30=m`
		`- CONFIG_VIDEO_NOON010PC30=m`
		`- # CONFIG_VIDEO_M5MOLS is not set`
		`# CONFIG_VIDEO_RDACM20 is not set`
		`# CONFIG_VIDEO_RDACM21 is not set`
		`# CONFIG_VIDEO_RJ54N1 is not set`
		`- # CONFIG_VIDEO_S5K6AA is not set`
		`- # CONFIG_VIDEO_S5K6A3 is not set`
		`+ # CONFIG_VIDEO_S5C73M3 is not set`
		`# CONFIG_VIDEO_S5K4ECGX is not set`
		`# CONFIG_VIDEO_S5K5BAF is not set`
		`+ # CONFIG_VIDEO_S5K6A3 is not set`
		`+ # CONFIG_VIDEO_S5K6AA is not set`
		`+ CONFIG_VIDEO_SR030PC30=m`
		`+ # CONFIG_VIDEO_VS6624 is not set`
		`# CONFIG_VIDEO_CCS is not set`
		`# CONFIG_VIDEO_ET8EK8 is not set`
		`- # CONFIG_VIDEO_S5C73M3 is not set`
		`+ # CONFIG_VIDEO_M5MOLS is not set`
		`# end of Camera sensor devices`

		`#`
		`- # Lens drivers`
		`+ # Lens drivers`
		`+ #`
		`+ # CONFIG_VIDEO_AD5820 is not set`
		`+ # CONFIG_VIDEO_AK7375 is not set`
		`+ # CONFIG_VIDEO_DW9714 is not set`
		`+ # CONFIG_VIDEO_DW9768 is not set`
		`+ # CONFIG_VIDEO_DW9807_VCM is not set`
		`+ # end of Lens drivers`
		`+`
		`+ #`
		`+ # Flash devices`
		`+ #`
		`+ # CONFIG_VIDEO_ADP1653 is not set`
		`+ # CONFIG_VIDEO_LM3560 is not set`
		`+ # CONFIG_VIDEO_LM3646 is not set`
		`+ # end of Flash devices`
		`+`
		`+ #`
		`+ # Audio decoders, processors and mixers`
		`+ #`
		`+ CONFIG_VIDEO_CS3308=m`
		`+ CONFIG_VIDEO_CS5345=m`
		`+ CONFIG_VIDEO_CS53L32A=m`
		`+ CONFIG_VIDEO_MSP3400=m`
		`+ CONFIG_VIDEO_SONY_BTF_MPX=m`
		`+ # CONFIG_VIDEO_TDA1997X is not set`
		`+ CONFIG_VIDEO_TDA7432=m`
		`+ CONFIG_VIDEO_TDA9840=m`
		`+ CONFIG_VIDEO_TEA6415C=m`
		`+ CONFIG_VIDEO_TEA6420=m`
		`+ CONFIG_VIDEO_TLV320AIC23B=m`
		`+ CONFIG_VIDEO_TVAUDIO=m`
		`+ CONFIG_VIDEO_UDA1342=m`
		`+ CONFIG_VIDEO_VP27SMPX=m`
		`+ CONFIG_VIDEO_WM8739=m`
		`+ CONFIG_VIDEO_WM8775=m`
		`+ # end of Audio decoders, processors and mixers`
		`+`
		`+ #`
		`+ # RDS decoders`
		`+ #`
		`+ CONFIG_VIDEO_SAA6588=m`
		`+ # end of RDS decoders`
		`+`
		`+ #`
		`+ # Video decoders`
		`+ #`
		`+ # CONFIG_VIDEO_ADV7180 is not set`
		`+ # CONFIG_VIDEO_ADV7183 is not set`
		`+ # CONFIG_VIDEO_ADV748X is not set`
		`+ # CONFIG_VIDEO_ADV7604 is not set`
		`+ # CONFIG_VIDEO_ADV7842 is not set`
		`+ CONFIG_VIDEO_BT819=m`
		`+ CONFIG_VIDEO_BT856=m`
		`+ # CONFIG_VIDEO_BT866 is not set`
		`+ # CONFIG_VIDEO_ISL7998X is not set`
		`+ CONFIG_VIDEO_KS0127=m`
		`+ # CONFIG_VIDEO_MAX9286 is not set`
		`+ # CONFIG_VIDEO_ML86V7667 is not set`
		`+ CONFIG_VIDEO_SAA7110=m`
		`+ CONFIG_VIDEO_SAA711X=m`
		`+ # CONFIG_VIDEO_TC358743 is not set`
		`+ # CONFIG_VIDEO_TVP514X is not set`
		`+ CONFIG_VIDEO_TVP5150=m`
		`+ # CONFIG_VIDEO_TVP7002 is not set`
		`+ CONFIG_VIDEO_TW2804=m`
		`+ CONFIG_VIDEO_TW9903=m`
		`+ CONFIG_VIDEO_TW9906=m`
		`+ # CONFIG_VIDEO_TW9910 is not set`
		`+ CONFIG_VIDEO_VPX3220=m`
		`+`
		`+ #`
		`+ # Video and audio decoders`
		`#`
		`- # CONFIG_VIDEO_AD5820 is not set`
		`- # CONFIG_VIDEO_AK7375 is not set`
		`- # CONFIG_VIDEO_DW9714 is not set`
		`- # CONFIG_VIDEO_DW9768 is not set`
		`- # CONFIG_VIDEO_DW9807_VCM is not set`
		`- # end of Lens drivers`
		`+ CONFIG_VIDEO_SAA717X=m`
		`+ CONFIG_VIDEO_CX25840=m`
		`+ # end of Video decoders`

		`#`
		`- # Flash devices`
		`+ # Video encoders`
		`#`
		`- # CONFIG_VIDEO_ADP1653 is not set`
		`- # CONFIG_VIDEO_LM3560 is not set`
		`- # CONFIG_VIDEO_LM3646 is not set`
		`- # end of Flash devices`
		`+ # CONFIG_VIDEO_AD9389B is not set`
		`+ CONFIG_VIDEO_ADV7170=m`
		`+ CONFIG_VIDEO_ADV7175=m`
		`+ # CONFIG_VIDEO_ADV7343 is not set`
		`+ # CONFIG_VIDEO_ADV7393 is not set`
		`+ # CONFIG_VIDEO_AK881X is not set`
		`+ CONFIG_VIDEO_SAA7127=m`
		`+ CONFIG_VIDEO_SAA7185=m`
		`+ # CONFIG_VIDEO_THS8200 is not set`
		`+ # end of Video encoders`

		`#`
		`- # SPI helper chips`
		`+ # Video improvement chips`
		`#`
		`- # CONFIG_VIDEO_GS1662 is not set`
		`- # end of SPI helper chips`
		`+ CONFIG_VIDEO_UPD64031A=m`
		`+ CONFIG_VIDEO_UPD64083=m`
		`+ # end of Video improvement chips`
		`+`
		`+ #`
		`+ # Audio/Video compression chips`
		`+ #`
		`+ CONFIG_VIDEO_SAA6752HS=m`
		`+ # end of Audio/Video compression chips`
		`+`
		`+ #`
		`+ # SDR tuner chips`
		`+ #`
		`+ # CONFIG_SDR_MAX2175 is not set`
		`+ # end of SDR tuner chips`
		`+`
		`+ #`
		`+ # Miscellaneous helper chips`
		`+ #`
		`+ # CONFIG_VIDEO_I2C is not set`
		`+ CONFIG_VIDEO_M52790=m`
		`+ # CONFIG_VIDEO_ST_MIPID02 is not set`
		`+ # CONFIG_VIDEO_THS7303 is not set`
		`+ # end of Miscellaneous helper chips`

		`#`
		`# Media SPI Adapters`
		`#`
		`# CONFIG_CXD2880_SPI_DRV is not set`
		`+ # CONFIG_VIDEO_GS1662 is not set`
		`# end of Media SPI Adapters`

		`CONFIG_MEDIA_TUNER=y`
		`@@ -5991,43 +6124,43 @@`
		`#`
		`# Customize TV tuners`
		`#`
		`- CONFIG_MEDIA_TUNER_SIMPLE=y`
		`- CONFIG_MEDIA_TUNER_TDA18250=m`
		`- CONFIG_MEDIA_TUNER_TDA8290=y`
		`- CONFIG_MEDIA_TUNER_TDA827X=y`
		`- CONFIG_MEDIA_TUNER_TDA18271=y`
		`- CONFIG_MEDIA_TUNER_TDA9887=y`
		`- CONFIG_MEDIA_TUNER_TEA5761=y`
		`- CONFIG_MEDIA_TUNER_TEA5767=y`
		`+ CONFIG_MEDIA_TUNER_E4000=m`
		`+ CONFIG_MEDIA_TUNER_FC0011=m`
		`+ CONFIG_MEDIA_TUNER_FC0012=m`
		`+ CONFIG_MEDIA_TUNER_FC0013=m`
		`+ CONFIG_MEDIA_TUNER_FC2580=m`
		`+ CONFIG_MEDIA_TUNER_IT913X=m`
		`+ CONFIG_MEDIA_TUNER_M88RS6000T=m`
		`+ CONFIG_MEDIA_TUNER_MAX2165=m`
		`+ CONFIG_MEDIA_TUNER_MC44S803=y`
		`CONFIG_MEDIA_TUNER_MSI001=m`
		`- CONFIG_MEDIA_TUNER_MT20XX=y`
		`CONFIG_MEDIA_TUNER_MT2060=m`
		`CONFIG_MEDIA_TUNER_MT2063=m`
		`- CONFIG_MEDIA_TUNER_MT2266=m`
		`+ CONFIG_MEDIA_TUNER_MT20XX=y`
		`CONFIG_MEDIA_TUNER_MT2131=m`
		`- CONFIG_MEDIA_TUNER_QT1010=m`
		`- CONFIG_MEDIA_TUNER_XC2028=y`
		`- CONFIG_MEDIA_TUNER_XC5000=y`
		`- CONFIG_MEDIA_TUNER_XC4000=y`
		`+ CONFIG_MEDIA_TUNER_MT2266=m`
		`+ CONFIG_MEDIA_TUNER_MXL301RF=m`
		`CONFIG_MEDIA_TUNER_MXL5005S=m`
		`CONFIG_MEDIA_TUNER_MXL5007T=m`
		`- CONFIG_MEDIA_TUNER_MC44S803=y`
		`- CONFIG_MEDIA_TUNER_MAX2165=m`
		`- CONFIG_MEDIA_TUNER_TDA18218=m`
		`- CONFIG_MEDIA_TUNER_FC0011=m`
		`- CONFIG_MEDIA_TUNER_FC0012=m`
		`- CONFIG_MEDIA_TUNER_FC0013=m`
		`+ CONFIG_MEDIA_TUNER_QM1D1B0004=m`
		`+ CONFIG_MEDIA_TUNER_QM1D1C0042=m`
		`+ CONFIG_MEDIA_TUNER_QT1010=m`
		`+ CONFIG_MEDIA_TUNER_R820T=m`
		`+ CONFIG_MEDIA_TUNER_SI2157=m`
		`+ CONFIG_MEDIA_TUNER_SIMPLE=y`
		`CONFIG_MEDIA_TUNER_TDA18212=m`
		`- CONFIG_MEDIA_TUNER_E4000=m`
		`- CONFIG_MEDIA_TUNER_FC2580=m`
		`- CONFIG_MEDIA_TUNER_M88RS6000T=m`
		`+ CONFIG_MEDIA_TUNER_TDA18218=m`
		`+ CONFIG_MEDIA_TUNER_TDA18250=m`
		`+ CONFIG_MEDIA_TUNER_TDA18271=y`
		`+ CONFIG_MEDIA_TUNER_TDA827X=y`
		`+ CONFIG_MEDIA_TUNER_TDA8290=y`
		`+ CONFIG_MEDIA_TUNER_TDA9887=y`
		`+ CONFIG_MEDIA_TUNER_TEA5761=y`
		`+ CONFIG_MEDIA_TUNER_TEA5767=y`
		`CONFIG_MEDIA_TUNER_TUA9001=m`
		`- CONFIG_MEDIA_TUNER_SI2157=m`
		`- CONFIG_MEDIA_TUNER_IT913X=m`
		`- CONFIG_MEDIA_TUNER_R820T=m`
		`- CONFIG_MEDIA_TUNER_MXL301RF=m`
		`- CONFIG_MEDIA_TUNER_QM1D1C0042=m`
		`- CONFIG_MEDIA_TUNER_QM1D1B0004=m`
		`+ CONFIG_MEDIA_TUNER_XC2028=y`
		`+ CONFIG_MEDIA_TUNER_XC4000=y`
		`+ CONFIG_MEDIA_TUNER_XC5000=y`
		`# end of Customize TV tuners`

		`#`
		`@@ -6037,126 +6170,126 @@`
		`#`
		`# Multistandard (satellite) frontends`
		`#`
		`+ CONFIG_DVB_M88DS3103=m`
		`+ CONFIG_DVB_MXL5XX=m`
		`CONFIG_DVB_STB0899=m`
		`CONFIG_DVB_STB6100=m`
		`CONFIG_DVB_STV090x=m`
		`CONFIG_DVB_STV0910=m`
		`CONFIG_DVB_STV6110x=m`
		`CONFIG_DVB_STV6111=m`
		`- CONFIG_DVB_MXL5XX=m`
		`- CONFIG_DVB_M88DS3103=m`

		`#`
		`# Multistandard (cable + terrestrial) frontends`
		`#`
		`CONFIG_DVB_DRXK=m`
		`- CONFIG_DVB_TDA18271C2DD=m`
		`- CONFIG_DVB_SI2165=m`
		`CONFIG_DVB_MN88472=m`
		`CONFIG_DVB_MN88473=m`
		`+ CONFIG_DVB_SI2165=m`
		`+ CONFIG_DVB_TDA18271C2DD=m`

		`#`
		`# DVB-S (satellite) frontends`
		`#`
		`CONFIG_DVB_CX24110=m`
		`+ CONFIG_DVB_CX24116=m`
		`+ CONFIG_DVB_CX24117=m`
		`+ CONFIG_DVB_CX24120=m`
		`CONFIG_DVB_CX24123=m`
		`+ CONFIG_DVB_DS3000=m`
		`+ CONFIG_DVB_MB86A16=m`
		`CONFIG_DVB_MT312=m`
		`- CONFIG_DVB_ZL10036=m`
		`- CONFIG_DVB_ZL10039=m`
		`CONFIG_DVB_S5H1420=m`
		`- CONFIG_DVB_STV0288=m`
		`+ CONFIG_DVB_SI21XX=m`
		`CONFIG_DVB_STB6000=m`
		`+ CONFIG_DVB_STV0288=m`
		`CONFIG_DVB_STV0299=m`
		`- CONFIG_DVB_STV6110=m`
		`CONFIG_DVB_STV0900=m`
		`- CONFIG_DVB_TDA8083=m`
		`+ CONFIG_DVB_STV6110=m`
		`+ CONFIG_DVB_TDA10071=m`
		`CONFIG_DVB_TDA10086=m`
		`+ CONFIG_DVB_TDA8083=m`
		`CONFIG_DVB_TDA8261=m`
		`- CONFIG_DVB_VES1X93=m`
		`- CONFIG_DVB_TUNER_ITD1000=m`
		`- CONFIG_DVB_TUNER_CX24113=m`
		`CONFIG_DVB_TDA826X=m`
		`- CONFIG_DVB_TUA6100=m`
		`- CONFIG_DVB_CX24116=m`
		`- CONFIG_DVB_CX24117=m`
		`- CONFIG_DVB_CX24120=m`
		`- CONFIG_DVB_SI21XX=m`
		`CONFIG_DVB_TS2020=m`
		`- CONFIG_DVB_DS3000=m`
		`- CONFIG_DVB_MB86A16=m`
		`- CONFIG_DVB_TDA10071=m`
		`+ CONFIG_DVB_TUA6100=m`
		`+ CONFIG_DVB_TUNER_CX24113=m`
		`+ CONFIG_DVB_TUNER_ITD1000=m`
		`+ CONFIG_DVB_VES1X93=m`
		`+ CONFIG_DVB_ZL10036=m`
		`+ CONFIG_DVB_ZL10039=m`

		`#`
		`# DVB-T (terrestrial) frontends`
		`#`
		`- CONFIG_DVB_SP887X=m`
		`+ CONFIG_DVB_AF9013=m`
		`+ CONFIG_DVB_AS102_FE=m`
		`CONFIG_DVB_CX22700=m`
		`CONFIG_DVB_CX22702=m`
		`- # CONFIG_DVB_S5H1432 is not set`
		`- CONFIG_DVB_DRXD=m`
		`- CONFIG_DVB_L64781=m`
		`- CONFIG_DVB_TDA1004X=m`
		`- CONFIG_DVB_NXT6000=m`
		`- CONFIG_DVB_MT352=m`
		`- CONFIG_DVB_ZL10353=m`
		`+ CONFIG_DVB_CXD2820R=m`
		`+ CONFIG_DVB_CXD2841ER=m`
		`CONFIG_DVB_DIB3000MB=m`
		`CONFIG_DVB_DIB3000MC=m`
		`CONFIG_DVB_DIB7000M=m`
		`CONFIG_DVB_DIB7000P=m`
		`# CONFIG_DVB_DIB9000 is not set`
		`- CONFIG_DVB_TDA10048=m`
		`- CONFIG_DVB_AF9013=m`
		`+ CONFIG_DVB_DRXD=m`
		`CONFIG_DVB_EC100=m`
		`- CONFIG_DVB_STV0367=m`
		`- CONFIG_DVB_CXD2820R=m`
		`- CONFIG_DVB_CXD2841ER=m`
		`+ CONFIG_DVB_GP8PSK_FE=m`
		`+ CONFIG_DVB_L64781=m`
		`+ CONFIG_DVB_MT352=m`
		`+ CONFIG_DVB_NXT6000=m`
		`CONFIG_DVB_RTL2830=m`
		`CONFIG_DVB_RTL2832=m`
		`CONFIG_DVB_RTL2832_SDR=m`
		`+ # CONFIG_DVB_S5H1432 is not set`
		`CONFIG_DVB_SI2168=m`
		`- CONFIG_DVB_AS102_FE=m`
		`+ CONFIG_DVB_SP887X=m`
		`+ CONFIG_DVB_STV0367=m`
		`+ CONFIG_DVB_TDA10048=m`
		`+ CONFIG_DVB_TDA1004X=m`
		`CONFIG_DVB_ZD1301_DEMOD=m`
		`- CONFIG_DVB_GP8PSK_FE=m`
		`+ CONFIG_DVB_ZL10353=m`
		`# CONFIG_DVB_CXD2880 is not set`

		`#`
		`# DVB-C (cable) frontends`
		`#`
		`- CONFIG_DVB_VES1820=m`
		`+ CONFIG_DVB_STV0297=m`
		`CONFIG_DVB_TDA10021=m`
		`CONFIG_DVB_TDA10023=m`
		`- CONFIG_DVB_STV0297=m`
		`+ CONFIG_DVB_VES1820=m`

		`#`
		`# ATSC (North American/Korean Terrestrial/Cable DTV) frontends`
		`#`
		`- CONFIG_DVB_NXT200X=m`
		`- CONFIG_DVB_OR51211=m`
		`- CONFIG_DVB_OR51132=m`
		`+ CONFIG_DVB_AU8522=m`
		`+ CONFIG_DVB_AU8522_DTV=m`
		`+ CONFIG_DVB_AU8522_V4L=m`
		`CONFIG_DVB_BCM3510=m`
		`- CONFIG_DVB_LGDT330X=m`
		`+ CONFIG_DVB_LG2160=m`
		`CONFIG_DVB_LGDT3305=m`
		`CONFIG_DVB_LGDT3306A=m`
		`- CONFIG_DVB_LG2160=m`
		`+ CONFIG_DVB_LGDT330X=m`
		`+ CONFIG_DVB_MXL692=m`
		`+ CONFIG_DVB_NXT200X=m`
		`+ CONFIG_DVB_OR51132=m`
		`+ CONFIG_DVB_OR51211=m`
		`CONFIG_DVB_S5H1409=m`
		`- CONFIG_DVB_AU8522=m`
		`- CONFIG_DVB_AU8522_DTV=m`
		`- CONFIG_DVB_AU8522_V4L=m`
		`CONFIG_DVB_S5H1411=m`
		`- CONFIG_DVB_MXL692=m`

		`#`
		`# ISDB-T (terrestrial) frontends`
		`#`
		`- CONFIG_DVB_S921=m`
		`CONFIG_DVB_DIB8000=m`
		`CONFIG_DVB_MB86A20S=m`
		`+ CONFIG_DVB_S921=m`

		`#`
		`# ISDB-S (satellite) & ISDB-T (terrestrial) frontends`
		`#`
		`- CONFIG_DVB_TC90522=m`
		`# CONFIG_DVB_MN88443X is not set`
		`+ CONFIG_DVB_TC90522=m`

		`#`
		`# Digital terrestrial only tuners/PLL`
		`@@ -6168,25 +6301,25 @@`
		`#`
		`# SEC control devices for DVB-S`
		`#`
		`- CONFIG_DVB_DRX39XYJ=m`
		`- CONFIG_DVB_LNBH25=m`
		`- # CONFIG_DVB_LNBH29 is not set`
		`- CONFIG_DVB_LNBP21=m`
		`- CONFIG_DVB_LNBP22=m`
		`+ CONFIG_DVB_A8293=m`
		`+ CONFIG_DVB_AF9033=m`
		`+ CONFIG_DVB_ASCOT2E=m`
		`+ CONFIG_DVB_ATBM8830=m`
		`+ CONFIG_DVB_HELENE=m`
		`+ CONFIG_DVB_HORUS3A=m`
		`CONFIG_DVB_ISL6405=m`
		`CONFIG_DVB_ISL6421=m`
		`CONFIG_DVB_ISL6423=m`
		`- CONFIG_DVB_A8293=m`
		`+ CONFIG_DVB_IX2505V=m`
		`# CONFIG_DVB_LGS8GL5 is not set`
		`CONFIG_DVB_LGS8GXX=m`
		`- CONFIG_DVB_ATBM8830=m`
		`- CONFIG_DVB_TDA665x=m`
		`- CONFIG_DVB_IX2505V=m`
		`+ CONFIG_DVB_LNBH25=m`
		`+ # CONFIG_DVB_LNBH29 is not set`
		`+ CONFIG_DVB_LNBP21=m`
		`+ CONFIG_DVB_LNBP22=m`
		`CONFIG_DVB_M88RS2000=m`
		`- CONFIG_DVB_AF9033=m`
		`- CONFIG_DVB_HORUS3A=m`
		`- CONFIG_DVB_ASCOT2E=m`
		`- CONFIG_DVB_HELENE=m`
		`+ CONFIG_DVB_TDA665x=m`
		`+ CONFIG_DVB_DRX39XYJ=m`

		`#`
		`# Common Interface (EN50221) controller drivers`
		`@@ -6204,8 +6337,6 @@`
		`#`
		`# Graphics support`
		`#`
		`- CONFIG_VGA_ARB=y`
		`- CONFIG_VGA_ARB_MAX_GPUS=16`
		`CONFIG_TEGRA_HOST1X=m`
		`CONFIG_TEGRA_HOST1X_FIREWALL=y`
		`CONFIG_IMX_IPUV3_CORE=m`
		`@@ -6216,6 +6347,7 @@`
		`CONFIG_DRM_DP_AUX_CHARDEV=y`
		`# CONFIG_DRM_DEBUG_MM is not set`
		`# CONFIG_DRM_DEBUG_SELFTEST is not set`
		`+ CONFIG_DRM_DP_HELPER=y`
		`CONFIG_DRM_KMS_HELPER=y`
		`# CONFIG_DRM_DEBUG_DP_MST_TOPOLOGY_REFS is not set`
		`# CONFIG_DRM_DEBUG_MODESET_LOCK is not set`
		`@@ -6328,7 +6460,6 @@`
		`CONFIG_DRM_VIRTIO_GPU=m`
		`CONFIG_DRM_MSM=y`
		`CONFIG_DRM_MSM_GPU_STATE=y`
		`- # CONFIG_DRM_MSM_REGISTER_LOGGING is not set`
		`# CONFIG_DRM_MSM_GPU_SUDO is not set`
		`CONFIG_DRM_MSM_HDMI_HDCP=y`
		`CONFIG_DRM_MSM_DP=y`
		`@@ -6379,6 +6510,7 @@`
		`# CONFIG_DRM_PANEL_LG_LG4573 is not set`
		`# CONFIG_DRM_PANEL_NEC_NL8048HL11 is not set`
		`# CONFIG_DRM_PANEL_NOVATEK_NT35510 is not set`
		`+ # CONFIG_DRM_PANEL_NOVATEK_NT35560 is not set`
		`# CONFIG_DRM_PANEL_NOVATEK_NT35950 is not set`
		`# CONFIG_DRM_PANEL_NOVATEK_NT36672A is not set`
		`# CONFIG_DRM_PANEL_NOVATEK_NT39016 is not set`
		`@@ -6409,7 +6541,6 @@`
		`# CONFIG_DRM_PANEL_SITRONIX_ST7701 is not set`
		`# CONFIG_DRM_PANEL_SITRONIX_ST7703 is not set`
		`# CONFIG_DRM_PANEL_SITRONIX_ST7789V is not set`
		`- # CONFIG_DRM_PANEL_SONY_ACX424AKP is not set`
		`# CONFIG_DRM_PANEL_SONY_ACX565AKM is not set`
		`# CONFIG_DRM_PANEL_SONY_TULIP_TRULY_NT35521 is not set`
		`# CONFIG_DRM_PANEL_TDO_TL070WSH30 is not set`
		`@@ -6433,6 +6564,7 @@`
		`# CONFIG_DRM_CHRONTEL_CH7033 is not set`
		`# CONFIG_DRM_CROS_EC_ANX7688 is not set`
		`CONFIG_DRM_DISPLAY_CONNECTOR=m`
		`+ # CONFIG_DRM_ITE_IT6505 is not set`
		`# CONFIG_DRM_LONTIUM_LT8912B is not set`
		`# CONFIG_DRM_LONTIUM_LT9611 is not set`
		`# CONFIG_DRM_LONTIUM_LT9611UXC is not set`
		`@@ -6491,6 +6623,7 @@`
		`CONFIG_DRM_BOCHS=m`
		`CONFIG_DRM_CIRRUS_QEMU=m`
		`CONFIG_DRM_GM12U320=m`
		`+ # CONFIG_DRM_PANEL_MIPI_DBI is not set`
		`CONFIG_DRM_SIMPLEDRM=y`
		`CONFIG_TINYDRM_HX8357D=m`
		`CONFIG_TINYDRM_ILI9163=m`
		`@@ -6508,6 +6641,7 @@`
		`# CONFIG_DRM_MCDE is not set`
		`# CONFIG_DRM_TIDSS is not set`
		`# CONFIG_DRM_GUD is not set`
		`+ # CONFIG_DRM_SSD130X is not set`
		`CONFIG_DRM_LEGACY=y`
		`# CONFIG_DRM_TDFX is not set`
		`# CONFIG_DRM_R128 is not set`
		`@@ -7003,6 +7137,7 @@`
		`# CONFIG_SND_SOC_AK5558 is not set`
		`# CONFIG_SND_SOC_ALC5623 is not set`
		`CONFIG_SND_SOC_ALC5632=m`
		`+ # CONFIG_SND_SOC_AW8738 is not set`
		`# CONFIG_SND_SOC_BD28623 is not set`
		`# CONFIG_SND_SOC_BT_SCO is not set`
		`CONFIG_SND_SOC_CROS_EC_CODEC=m`
		`@@ -7101,6 +7236,7 @@`
		`# CONFIG_SND_SOC_TAS5086 is not set`
		`# CONFIG_SND_SOC_TAS571X is not set`
		`# CONFIG_SND_SOC_TAS5720 is not set`
		`+ # CONFIG_SND_SOC_TAS5805M is not set`
		`# CONFIG_SND_SOC_TAS6424 is not set`
		`# CONFIG_SND_SOC_TDA7419 is not set`
		`# CONFIG_SND_SOC_TFA9879 is not set`
		`@@ -7220,6 +7356,7 @@`
		`CONFIG_HID_GLORIOUS=m`
		`CONFIG_HID_HOLTEK=m`
		`CONFIG_HOLTEK_FF=y`
		`+ CONFIG_HID_VIVALDI_COMMON=m`
		`# CONFIG_HID_GOOGLE_HAMMER is not set`
		`CONFIG_HID_VIVALDI=m`
		`# CONFIG_HID_GT683R is not set`
		`@@ -7271,12 +7408,14 @@`
		`CONFIG_HID_PLANTRONICS=m`
		`CONFIG_HID_PLAYSTATION=m`
		`CONFIG_PLAYSTATION_FF=y`
		`+ # CONFIG_HID_RAZER is not set`
		`CONFIG_HID_PRIMAX=m`
		`CONFIG_HID_RETRODE=m`
		`CONFIG_HID_ROCCAT=m`
		`CONFIG_HID_SAITEK=m`
		`CONFIG_HID_SAMSUNG=m`
		`CONFIG_HID_SEMITEK=m`
		`+ # CONFIG_HID_SIGMAMICRO is not set`
		`CONFIG_HID_SONY=m`
		`CONFIG_SONY_FF=y`
		`CONFIG_HID_SPEEDLINK=m`
		`@@ -7719,8 +7858,10 @@`
		`# CONFIG_TYPEC_TCPM is not set`
		`# CONFIG_TYPEC_UCSI is not set`
		`# CONFIG_TYPEC_TPS6598X is not set`
		`+ # CONFIG_TYPEC_RT1719 is not set`
		`CONFIG_TYPEC_HD3SS3220=y`
		`# CONFIG_TYPEC_STUSB160X is not set`
		`+ # CONFIG_TYPEC_WUSB3801 is not set`

		`#`
		`# USB Type-C Multiplexer/DeMultiplexer Switch support`
		`@@ -8232,7 +8373,6 @@`
		`# Analog to digital converters`
		`#`
		`CONFIG_AD7816=m`
		`- CONFIG_AD7280=m`
		`# end of Analog to digital converters`

		`#`
		`@@ -8303,7 +8443,6 @@`
		`# CONFIG_VIDEO_ROCKCHIP_VDEC is not set`
		`CONFIG_VIDEO_SUNXI=y`
		`CONFIG_VIDEO_SUNXI_CEDRUS=m`
		`- CONFIG_TEGRA_VDE=m`
		`# CONFIG_VIDEO_ZORAN is not set`
		`# CONFIG_VIDEO_TEGRA is not set`
		`CONFIG_DVB_AV7110_IR=y`
		`@@ -8311,15 +8450,8 @@`
		`CONFIG_DVB_AV7110_OSD=y`
		`CONFIG_DVB_BUDGET_PATCH=m`
		`CONFIG_DVB_SP8870=m`
		`-`
		`- #`
		`- # Android`
		`- #`
		`- # end of Android`
		`-`
		`# CONFIG_STAGING_BOARD is not set`
		`CONFIG_LTE_GDM724X=m`
		`- CONFIG_GS_FPGABOOT=m`
		`# CONFIG_UNISYSSPAR is not set`
		`# CONFIG_COMMON_CLK_XLNX_CLKWZRD is not set`
		`CONFIG_FB_TFT=m`
		`@@ -8407,13 +8539,13 @@`
		`# CONFIG_COMMON_CLK_CDCE706 is not set`
		`# CONFIG_COMMON_CLK_CDCE925 is not set`
		`# CONFIG_COMMON_CLK_CS2000_CP is not set`
		`- # CONFIG_COMMON_CLK_LAN966X is not set`
		`CONFIG_COMMON_CLK_S2MPS11=y`
		`CONFIG_CLK_TWL6040=y`
		`CONFIG_COMMON_CLK_AXI_CLKGEN=y`
		`CONFIG_CLK_QORIQ=y`
		`CONFIG_COMMON_CLK_PALMAS=y`
		`CONFIG_COMMON_CLK_PWM=y`
		`+ # CONFIG_COMMON_CLK_RS9_PCIE is not set`
		`# CONFIG_COMMON_CLK_VC5 is not set`
		`# CONFIG_COMMON_CLK_FIXED_MMIO is not set`
		`CONFIG_CLK_BCM2711_DVP=y`
		`@@ -8434,6 +8566,7 @@`
		`# CONFIG_CLK_IMX8MP is not set`
		`# CONFIG_CLK_IMX8MQ is not set`
		`# CONFIG_CLK_IMX8ULP is not set`
		`+ # CONFIG_CLK_IMX93 is not set`

		`#`
		`# Clock support for Amlogic platforms`
		`@@ -8475,6 +8608,7 @@`
		`CONFIG_SUN4I_A10_CCU=y`
		`CONFIG_SUN5I_CCU=y`
		`CONFIG_SUN6I_A31_CCU=y`
		`+ CONFIG_SUN6I_RTC_CCU=y`
		`CONFIG_SUN8I_A23_CCU=y`
		`CONFIG_SUN8I_A33_CCU=y`
		`CONFIG_SUN8I_A83T_CCU=y`
		`@@ -8586,6 +8720,7 @@`
		`#`
		`CONFIG_RPMSG=m`
		`CONFIG_RPMSG_CHAR=m`
		`+ # CONFIG_RPMSG_CTRL is not set`
		`CONFIG_RPMSG_NS=m`
		`# CONFIG_RPMSG_QCOM_GLINK_RPM is not set`
		`CONFIG_RPMSG_VIRTIO=m`
		`@@ -8760,6 +8895,8 @@`
		`CONFIG_ADXL355=m`
		`CONFIG_ADXL355_I2C=m`
		`CONFIG_ADXL355_SPI=m`
		`+ # CONFIG_ADXL367_SPI is not set`
		`+ # CONFIG_ADXL367_I2C is not set`
		`CONFIG_ADXL372=m`
		`CONFIG_ADXL372_SPI=m`
		`CONFIG_ADXL372_I2C=m`
		`@@ -8814,6 +8951,7 @@`
		`CONFIG_AD7124=m`
		`CONFIG_AD7192=m`
		`CONFIG_AD7266=m`
		`+ CONFIG_AD7280=m`
		`CONFIG_AD7291=m`
		`CONFIG_AD7292=m`
		`CONFIG_AD7298=m`
		`@@ -8902,6 +9040,7 @@`
		`# Amplifiers`
		`#`
		`CONFIG_AD8366=m`
		`+ # CONFIG_ADA4250 is not set`
		`CONFIG_HMC425=m`
		`# end of Amplifiers`

		`@@ -8980,6 +9119,7 @@`
		`CONFIG_AD5593R=m`
		`CONFIG_AD5504=m`
		`CONFIG_AD5624R_SPI=m`
		`+ # CONFIG_LTC2688 is not set`
		`CONFIG_AD5686=m`
		`CONFIG_AD5686_SPI=m`
		`CONFIG_AD5696_I2C=m`
		`@@ -9036,6 +9176,7 @@`
		`CONFIG_ADF4350=m`
		`CONFIG_ADF4371=m`
		`CONFIG_ADMV1013=m`
		`+ # CONFIG_ADMV4420 is not set`
		`CONFIG_ADRF6780=m`
		`# end of Phase-Locked Loop (PLL) frequency synthesizers`
		`# end of Frequency Synthesizers DDS/PLL`
		`@@ -9302,7 +9443,10 @@`
		`CONFIG_PING=m`
		`CONFIG_RFD77402=m`
		`CONFIG_SRF04=m`
		`+ CONFIG_SX_COMMON=m`
		`CONFIG_SX9310=m`
		`+ # CONFIG_SX9324 is not set`
		`+ # CONFIG_SX9360 is not set`
		`CONFIG_SX9500=m`
		`CONFIG_SRF08=m`
		`CONFIG_VCNL3020=m`
		`@@ -9427,11 +9571,9 @@`

		`# CONFIG_PHY_CADENCE_TORRENT is not set`
		`# CONFIG_PHY_CADENCE_DPHY is not set`
		`+ # CONFIG_PHY_CADENCE_DPHY_RX is not set`
		`# CONFIG_PHY_CADENCE_SIERRA is not set`
		`# CONFIG_PHY_CADENCE_SALVO is not set`
		`- # CONFIG_PHY_FSL_IMX8MQ_USB is not set`
		`- # CONFIG_PHY_MIXEL_MIPI_DPHY is not set`
		`- # CONFIG_PHY_FSL_IMX8M_PCIE is not set`
		`CONFIG_ARMADA375_USBCLUSTER_PHY=y`
		`# CONFIG_PHY_MVEBU_A3700_COMPHY is not set`
		`# CONFIG_PHY_MVEBU_A3700_UTMI is not set`
		`@@ -9453,6 +9595,7 @@`
		`CONFIG_PHY_ROCKCHIP_INNO_USB2=y`
		`# CONFIG_PHY_ROCKCHIP_INNO_CSIDPHY is not set`
		`# CONFIG_PHY_ROCKCHIP_INNO_DSIDPHY is not set`
		`+ # CONFIG_PHY_ROCKCHIP_NANENG_COMBO_PHY is not set`
		`CONFIG_PHY_ROCKCHIP_PCIE=y`
		`CONFIG_PHY_ROCKCHIP_TYPEC=y`
		`CONFIG_PHY_ROCKCHIP_USB=y`
		`@@ -9563,6 +9706,7 @@`
		`# CONFIG_MICROCHIP_TCB_CAPTURE is not set`
		`# CONFIG_INTEL_QEP is not set`
		`# CONFIG_MOST is not set`
		`+ # CONFIG_PECI is not set`
		`# end of Device Drivers`

		`#`
		`@@ -9620,6 +9764,7 @@`
		`# CONFIG_F2FS_FAULT_INJECTION is not set`
		`# CONFIG_F2FS_FS_COMPRESSION is not set`
		`CONFIG_F2FS_IOSTAT=y`
		`+ # CONFIG_F2FS_UNFAIR_RWSEM is not set`
		`# CONFIG_ZONEFS_FS is not set`
		`CONFIG_FS_POSIX_ACL=y`
		`CONFIG_EXPORTFS=y`
		`@@ -9822,7 +9967,6 @@`
		`# CONFIG_NFS_V4_2_READ_PLUS is not set`
		`CONFIG_NFSD=m`
		`CONFIG_NFSD_V2_ACL=y`
		`- CONFIG_NFSD_V3=y`
		`CONFIG_NFSD_V3_ACL=y`
		`CONFIG_NFSD_V4=y`
		`CONFIG_NFSD_PNFS=y`
		`@@ -9940,7 +10084,6 @@`
		`CONFIG_SECURITY_PATH=y`
		`CONFIG_HAVE_HARDENED_USERCOPY_ALLOCATOR=y`
		`CONFIG_HARDENED_USERCOPY=y`
		`- # CONFIG_HARDENED_USERCOPY_PAGESPAN is not set`
		`CONFIG_FORTIFY_SOURCE=y`
		`# CONFIG_STATIC_USERMODEHELPER is not set`
		`# CONFIG_SECURITY_SELINUX is not set`
		`@@ -10029,6 +10172,7 @@`
		`#`
		`CONFIG_CRYPTO_RSA=y`
		`CONFIG_CRYPTO_DH=m`
		`+ # CONFIG_CRYPTO_DH_RFC7919_GROUPS is not set`
		`CONFIG_CRYPTO_ECC=m`
		`CONFIG_CRYPTO_ECDH=m`
		`# CONFIG_CRYPTO_ECDSA is not set`
		`@@ -10081,6 +10225,7 @@`
		`CONFIG_CRYPTO_BLAKE2B=y`
		`# CONFIG_CRYPTO_BLAKE2S is not set`
		`CONFIG_CRYPTO_CRCT10DIF=y`
		`+ CONFIG_CRYPTO_CRC64_ROCKSOFT=y`
		`CONFIG_CRYPTO_GHASH=m`
		`CONFIG_CRYPTO_POLY1305=m`
		`CONFIG_CRYPTO_MD4=m`
		`@@ -10256,9 +10401,11 @@`
		`CONFIG_CRYPTO_LIB_SM4=m`
		`# end of Crypto library routines`

		`+ CONFIG_LIB_MEMNEQ=y`
		`CONFIG_CRC_CCITT=y`
		`CONFIG_CRC16=y`
		`CONFIG_CRC_T10DIF=y`
		`+ CONFIG_CRC64_ROCKSOFT=y`
		`CONFIG_CRC_ITU_T=y`
		`CONFIG_CRC32=y`
		`# CONFIG_CRC32_SELFTEST is not set`
		`@@ -10266,7 +10413,7 @@`
		`# CONFIG_CRC32_SLICEBY4 is not set`
		`# CONFIG_CRC32_SARWATE is not set`
		`# CONFIG_CRC32_BIT is not set`
		`- CONFIG_CRC64=m`
		`+ CONFIG_CRC64=y`
		`# CONFIG_CRC4 is not set`
		`CONFIG_CRC7=y`
		`CONFIG_LIBCRC32C=y`
		`@@ -10319,7 +10466,6 @@`
		`CONFIG_ARCH_HAS_SETUP_DMA_OPS=y`
		`CONFIG_ARCH_HAS_TEARDOWN_DMA_OPS=y`
		`CONFIG_DMA_NONCOHERENT_MMAP=y`
		`- CONFIG_DMA_REMAP=y`
		`CONFIG_DMA_CMA=y`
		`# CONFIG_DMA_PERNUMA_CMA is not set`

		`@@ -10394,10 +10540,16 @@`
		`CONFIG_DEBUG_BUGVERBOSE=y`
		`# end of printk and dmesg options`

		`+ CONFIG_DEBUG_KERNEL=y`
		`+ CONFIG_DEBUG_MISC=y`
		`+`
		`#`
		`# Compile-time checks and compiler options`
		`#`
		`- # CONFIG_DEBUG_INFO is not set`
		`+ CONFIG_DEBUG_INFO_NONE=y`
		`+ # CONFIG_DEBUG_INFO_DWARF_TOOLCHAIN_DEFAULT is not set`
		`+ # CONFIG_DEBUG_INFO_DWARF4 is not set`
		`+ # CONFIG_DEBUG_INFO_DWARF5 is not set`
		`CONFIG_FRAME_WARN=1024`
		`CONFIG_STRIP_ASM_SYMS=y`
		`# CONFIG_READABLE_ASM is not set`
		`@@ -10432,9 +10584,6 @@`
		`CONFIG_HAVE_KCSAN_COMPILER=y`
		`# end of Generic Kernel Debugging Instruments`

		`- CONFIG_DEBUG_KERNEL=y`
		`- CONFIG_DEBUG_MISC=y`
		`-`
		`#`
		`# Networking Debugging`
		`#`

libre/linux-libre-pck/config.i686

file modified

+632 -392

		`@@ -1,6 +1,6 @@`
		`#`
		`# Automatically generated file; DO NOT EDIT.`
		`- # Linux/x86 5.17.8-gnu-pck1 Kernel Configuration`
		`+ # Linux/x86 5.18.14-gnu-pck1 Kernel Configuration`
		`#`
		`CONFIG_CC_VERSION_TEXT="gcc (GCC) 12.1.0"`
		`CONFIG_CC_IS_GCC=y`
		`@@ -15,8 +15,10 @@`
		`CONFIG_CC_CAN_LINK_STATIC=y`
		`CONFIG_CC_HAS_ASM_GOTO=y`
		`CONFIG_CC_HAS_ASM_GOTO_OUTPUT=y`
		`+ CONFIG_CC_HAS_ASM_GOTO_TIED_OUTPUT=y`
		`CONFIG_CC_HAS_ASM_INLINE=y`
		`CONFIG_CC_HAS_NO_PROFILE_FN_ATTR=y`
		`+ CONFIG_PAHOLE_VERSION=123`
		`CONFIG_IRQ_WORK=y`
		`CONFIG_BUILDTIME_TABLE_SORT=y`
		`CONFIG_THREAD_INFO_IN_TASK=y`
		`@@ -28,8 +30,8 @@`
		`CONFIG_INIT_ENV_ARG_LIMIT=32`
		`# CONFIG_COMPILE_TEST is not set`
		`# CONFIG_WERROR is not set`
		`- CONFIG_LOCALVERSION="-zen"`
		`- # CONFIG_LOCALVERSION_AUTO is not set`
		`+ CONFIG_LOCALVERSION=""`
		`+ CONFIG_LOCALVERSION_AUTO=y`
		`CONFIG_BUILD_SALT=""`
		`CONFIG_HAVE_KERNEL_GZIP=y`
		`CONFIG_HAVE_KERNEL_BZIP2=y`
		`@@ -46,7 +48,7 @@`
		`# CONFIG_KERNEL_LZ4 is not set`
		`# CONFIG_KERNEL_ZSTD is not set`
		`CONFIG_DEFAULT_INIT=""`
		`- CONFIG_DEFAULT_HOSTNAME="archlinux"`
		`+ CONFIG_DEFAULT_HOSTNAME="parabola"`
		`CONFIG_SWAP=y`
		`CONFIG_SYSVIPC=y`
		`CONFIG_SYSVIPC_SYSCTL=y`
		`@@ -103,6 +105,7 @@`
		`CONFIG_NO_HZ_IDLE=y`
		`CONFIG_NO_HZ=y`
		`CONFIG_HIGH_RES_TIMERS=y`
		`+ CONFIG_CLOCKSOURCE_WATCHDOG_MAX_SKEW_US=100`
		`# end of Timers subsystem`

		`CONFIG_BPF=y`
		`@@ -186,6 +189,8 @@`

		`CONFIG_ARCH_WANT_BATCHED_UNMAP_TLB_FLUSH=y`
		`CONFIG_CC_IMPLICIT_FALLTHROUGH="-Wimplicit-fallthrough=5"`
		`+ CONFIG_GCC12_NO_ARRAY_BOUNDS=y`
		`+ CONFIG_CC_NO_ARRAY_BOUNDS=y`
		`CONFIG_CGROUPS=y`
		`CONFIG_PAGE_COUNTER=y`
		`CONFIG_MEMCG=y`
		`@@ -315,11 +320,9 @@`
		`CONFIG_ARCH_MAY_HAVE_PC_FDC=y`
		`CONFIG_GENERIC_CALIBRATE_DELAY=y`
		`CONFIG_ARCH_HAS_CPU_RELAX=y`
		`- CONFIG_ARCH_HAS_FILTER_PGPROT=y`
		`CONFIG_ARCH_HIBERNATION_POSSIBLE=y`
		`CONFIG_ARCH_NR_GPIO=512`
		`CONFIG_ARCH_SUSPEND_POSSIBLE=y`
		`- CONFIG_ARCH_WANT_GENERAL_HUGETLB=y`
		`CONFIG_HAVE_INTEL_TXT=y`
		`CONFIG_X86_32_SMP=y`
		`CONFIG_ARCH_SUPPORTS_UPROBES=y`
		`@@ -334,8 +337,6 @@`
		`CONFIG_X86_FEATURE_NAMES=y`
		`CONFIG_X86_MPPARSE=y`
		`# CONFIG_GOLDFISH is not set`
		`- CONFIG_RETPOLINE=y`
		`- CONFIG_CC_HAS_SLS=y`
		`CONFIG_X86_CPU_RESCTRL=y`
		`# CONFIG_X86_BIGSMP is not set`
		`# CONFIG_X86_EXTENDED_PLATFORM is not set`
		`@@ -470,11 +471,10 @@`
		`CONFIG_X86_ESPFIX32=y`
		`CONFIG_X86_IOPL_IOPERM=y`
		`CONFIG_TOSHIBA=m`
		`- CONFIG_I8K=m`
		`CONFIG_X86_REBOOTFIXUPS=y`
		`CONFIG_MICROCODE=y`
		`- CONFIG_MICROCODE_INTEL=y`
		`- CONFIG_MICROCODE_AMD=y`
		`+ # CONFIG_MICROCODE_INTEL is not set`
		`+ # CONFIG_MICROCODE_AMD is not set`
		`# CONFIG_MICROCODE_OLD_INTERFACE is not set`
		`CONFIG_X86_MSR=y`
		`CONFIG_X86_CPUID=y`
		`@@ -500,6 +500,7 @@`
		`CONFIG_ARCH_RANDOM=y`
		`CONFIG_X86_SMAP=y`
		`CONFIG_X86_UMIP=y`
		`+ CONFIG_CC_HAS_IBT=y`
		`# CONFIG_X86_INTEL_TSX_MODE_OFF is not set`
		`# CONFIG_X86_INTEL_TSX_MODE_ON is not set`
		`CONFIG_X86_INTEL_TSX_MODE_AUTO=y`
		`@@ -528,6 +529,14 @@`
		`# CONFIG_STRICT_SIGALTSTACK_SIZE is not set`
		`# end of Processor type and features`

		`+ CONFIG_CC_HAS_SLS=y`
		`+ CONFIG_CC_HAS_RETURN_THUNK=y`
		`+ CONFIG_SPECULATION_MITIGATIONS=y`
		`+ CONFIG_RETPOLINE=y`
		`+ CONFIG_RETHUNK=y`
		`+ CONFIG_CPU_UNRET_ENTRY=y`
		`+ CONFIG_CPU_IBPB_ENTRY=y`
		`+ CONFIG_CPU_IBRS_ENTRY=y`
		`CONFIG_ARCH_MHP_MEMMAP_ON_MEMORY_ENABLE=y`

		`#`
		`@@ -741,7 +750,6 @@`
		`CONFIG_KVM_INTEL=m`
		`CONFIG_KVM_AMD=m`
		`CONFIG_KVM_XEN=y`
		`- CONFIG_KVM_MMU_AUDIT=y`
		`CONFIG_AS_AVX512=y`
		`CONFIG_AS_SHA1_NI=y`
		`CONFIG_AS_SHA256_NI=y`
		`@@ -764,6 +772,7 @@`
		`CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y`
		`CONFIG_ARCH_USE_BUILTIN_BSWAP=y`
		`CONFIG_KRETPROBES=y`
		`+ CONFIG_KRETPROBE_ON_RETHOOK=y`
		`CONFIG_USER_RETURN_NOTIFIER=y`
		`CONFIG_HAVE_IOREMAP_PROT=y`
		`CONFIG_HAVE_KPROBES=y`
		`@@ -837,6 +846,7 @@`
		`CONFIG_OLD_SIGACTION=y`
		`CONFIG_COMPAT_32BIT_TIME=y`
		`CONFIG_HAVE_ARCH_RANDOMIZE_KSTACK_OFFSET=y`
		`+ CONFIG_RANDOMIZE_KSTACK_OFFSET=y`
		`CONFIG_RANDOMIZE_KSTACK_OFFSET_DEFAULT=y`
		`CONFIG_ARCH_HAS_STRICT_KERNEL_RWX=y`
		`CONFIG_STRICT_KERNEL_RWX=y`
		`@@ -848,12 +858,12 @@`
		`CONFIG_ARCH_HAS_MEM_ENCRYPT=y`
		`CONFIG_HAVE_STATIC_CALL=y`
		`CONFIG_HAVE_PREEMPT_DYNAMIC=y`
		`+ CONFIG_HAVE_PREEMPT_DYNAMIC_CALL=y`
		`CONFIG_ARCH_WANT_LD_ORPHAN_WARN=y`
		`CONFIG_ARCH_SUPPORTS_DEBUG_PAGEALLOC=y`
		`CONFIG_ARCH_SPLIT_ARG64=y`
		`CONFIG_ARCH_HAS_PARANOID_L1D_FLUSH=y`
		`CONFIG_DYNAMIC_SIGFRAME=y`
		`- CONFIG_ARCH_HAS_NONLEAF_PMD_YOUNG=y`

		`#`
		`# GCOV-based kernel profiling`
		`@@ -894,6 +904,7 @@`
		`CONFIG_MODPROBE_PATH="/sbin/modprobe"`
		`CONFIG_MODULES_TREE_LOOKUP=y`
		`CONFIG_BLOCK=y`
		`+ CONFIG_BLOCK_LEGACY_AUTOLOAD=y`
		`CONFIG_BLK_RQ_ALLOC_TIME=y`
		`CONFIG_BLK_CGROUP_RWSTAT=y`
		`CONFIG_BLK_DEV_BSG_COMMON=y`
		`@@ -946,12 +957,12 @@`
		`CONFIG_BLK_MQ_RDMA=y`
		`CONFIG_BLK_PM=y`
		`CONFIG_BLOCK_HOLDER_DEPRECATED=y`
		`+ CONFIG_BLK_MQ_STACKING=y`

		`#`
		`# IO Schedulers`
		`#`
		`CONFIG_MQ_IOSCHED_DEADLINE=y`
		`- # CONFIG_MQ_IOSCHED_DEADLINE_NODEFAULT is not set`
		`CONFIG_MQ_IOSCHED_KYBER=y`
		`CONFIG_IOSCHED_BFQ=y`
		`CONFIG_BFQ_GROUP_IOSCHED=y`
		`@@ -1017,6 +1028,7 @@`
		`CONFIG_TRANSPARENT_HUGEPAGE=y`
		`CONFIG_TRANSPARENT_HUGEPAGE_ALWAYS=y`
		`# CONFIG_TRANSPARENT_HUGEPAGE_MADVISE is not set`
		`+ CONFIG_ARCH_WANT_GENERAL_HUGETLB=y`
		`CONFIG_NEED_PER_CPU_EMBED_FIRST_CHUNK=y`
		`CONFIG_NEED_PER_CPU_PAGE_FIRST_CHUNK=y`
		`CONFIG_HAVE_SETUP_PER_CPU_AREA=y`
		`@@ -1048,6 +1060,8 @@`
		`CONFIG_PAGE_IDLE_FLAG=y`
		`CONFIG_IDLE_PAGE_TRACKING=y`
		`CONFIG_ARCH_HAS_CACHE_LINE_SIZE=y`
		`+ CONFIG_ARCH_HAS_CURRENT_STACK_POINTER=y`
		`+ CONFIG_ARCH_HAS_FILTER_PGPROT=y`
		`CONFIG_ZONE_DMA=y`
		`CONFIG_HMM_MIRROR=y`
		`CONFIG_VMAP_PFN=y`
		`@@ -1069,6 +1083,7 @@`
		`CONFIG_DAMON=y`
		`CONFIG_DAMON_VADDR=y`
		`CONFIG_DAMON_PADDR=y`
		`+ CONFIG_DAMON_SYSFS=y`
		`CONFIG_DAMON_DBGFS=y`
		`CONFIG_DAMON_RECLAIM=y`
		`# end of Data Access Monitoring`
		`@@ -1981,6 +1996,7 @@`
		`CONFIG_AF_KCM=m`
		`CONFIG_STREAM_PARSER=y`
		`CONFIG_MCTP=y`
		`+ CONFIG_MCTP_FLOWS=y`
		`CONFIG_FIB_RULES=y`
		`CONFIG_WIRELESS=y`
		`CONFIG_WIRELESS_EXT=y`
		`@@ -2083,6 +2099,7 @@`
		`CONFIG_NET_SOCK_MSG=y`
		`CONFIG_NET_DEVLINK=y`
		`CONFIG_PAGE_POOL=y`
		`+ # CONFIG_PAGE_POOL_STATS is not set`
		`CONFIG_FAILOVER=m`
		`CONFIG_ETHTOOL_NETLINK=y`

		`@@ -2121,6 +2138,8 @@`
		`CONFIG_PCI_PRI=y`
		`CONFIG_PCI_PASID=y`
		`CONFIG_PCI_LABEL=y`
		`+ CONFIG_VGA_ARB=y`
		`+ CONFIG_VGA_ARB_MAX_GPUS=10`
		`CONFIG_HOTPLUG_PCI=y`
		`CONFIG_HOTPLUG_PCI_COMPAQ=m`
		`# CONFIG_HOTPLUG_PCI_COMPAQ_NVRAM is not set`
		`@@ -2176,9 +2195,11 @@`
		`# end of PCI switch controller drivers`

		`CONFIG_CXL_BUS=m`
		`- CONFIG_CXL_MEM=m`
		`+ CONFIG_CXL_PCI=m`
		`# CONFIG_CXL_MEM_RAW_COMMANDS is not set`
		`CONFIG_CXL_ACPI=m`
		`+ CONFIG_CXL_MEM=m`
		`+ CONFIG_CXL_PORT=m`
		`CONFIG_PCCARD=m`
		`CONFIG_PCMCIA=m`
		`CONFIG_PCMCIA_LOAD_CIS=y`
		`@@ -2316,6 +2337,7 @@`
		`CONFIG_EFI_DEV_PATH_PARSER=y`
		`CONFIG_EFI_EARLYCON=y`
		`CONFIG_EFI_CUSTOM_SSDT_OVERLAYS=y`
		`+ # CONFIG_EFI_DISABLE_RUNTIME is not set`

		`#`
		`# Tegra firmware driver`
		`@@ -2443,6 +2465,7 @@`
		`CONFIG_MTD_NAND_ECC_SW_HAMMING=y`
		`CONFIG_MTD_NAND_ECC_SW_HAMMING_SMC=y`
		`CONFIG_MTD_NAND_ECC_SW_BCH=y`
		`+ CONFIG_MTD_NAND_ECC_MXIC=y`
		`# end of ECC engine support`
		`# end of NAND`

		`@@ -2457,9 +2480,6 @@`
		`# CONFIG_MTD_SPI_NOR_SWP_DISABLE is not set`
		`CONFIG_MTD_SPI_NOR_SWP_DISABLE_ON_VOLATILE=y`
		`# CONFIG_MTD_SPI_NOR_SWP_KEEP is not set`
		`- CONFIG_SPI_INTEL_SPI=m`
		`- CONFIG_SPI_INTEL_SPI_PCI=m`
		`- CONFIG_SPI_INTEL_SPI_PLATFORM=m`
		`CONFIG_MTD_UBI=m`
		`CONFIG_MTD_UBI_WL_THRESHOLD=4096`
		`CONFIG_MTD_UBI_BEB_LIMIT=20`
		`@@ -2532,6 +2552,7 @@`
		`CONFIG_NVME_CORE=m`
		`CONFIG_BLK_DEV_NVME=m`
		`CONFIG_NVME_MULTIPATH=y`
		`+ CONFIG_NVME_VERBOSE_ERRORS=y`
		`CONFIG_NVME_HWMON=y`
		`CONFIG_NVME_FABRICS=m`
		`CONFIG_NVME_RDMA=m`
		`@@ -2611,7 +2632,7 @@`
		`CONFIG_ALTERA_STAPL=m`
		`CONFIG_INTEL_MEI=m`
		`CONFIG_INTEL_MEI_ME=m`
		`- CONFIG_INTEL_MEI_TXE=m`
		`+ # CONFIG_INTEL_MEI_TXE is not set`
		`CONFIG_INTEL_MEI_HDCP=m`
		`CONFIG_INTEL_MEI_PXP=m`
		`CONFIG_VMWARE_VMCI=m`
		`@@ -3095,7 +3116,10 @@`
		`CONFIG_NET_DSA_XRS700X_MDIO=m`
		`CONFIG_NET_DSA_QCA8K=m`
		`CONFIG_NET_DSA_REALTEK=m`
		`- CONFIG_NET_DSA_REALTEK_SMI=m`
		`+ # CONFIG_NET_DSA_REALTEK_MDIO is not set`
		`+ # CONFIG_NET_DSA_REALTEK_SMI is not set`
		`+ CONFIG_NET_DSA_REALTEK_RTL8365MB=m`
		`+ CONFIG_NET_DSA_REALTEK_RTL8366RB=m`
		`CONFIG_NET_DSA_SMSC_LAN9303=m`
		`CONFIG_NET_DSA_SMSC_LAN9303_I2C=m`
		`CONFIG_NET_DSA_SMSC_LAN9303_MDIO=m`
		`@@ -3187,6 +3211,8 @@`
		`CONFIG_ENIC=m`
		`CONFIG_NET_VENDOR_CORTINA=y`
		`# CONFIG_GEMINI_ETHERNET is not set`
		`+ CONFIG_NET_VENDOR_DAVICOM=y`
		`+ CONFIG_DM9051=m`
		`CONFIG_DNET=m`
		`CONFIG_NET_VENDOR_DEC=y`
		`CONFIG_NET_TULIP=y`
		`@@ -3220,6 +3246,9 @@`
		`# CONFIG_EZCHIP_NPS_MANAGEMENT_ENET is not set`
		`CONFIG_NET_VENDOR_FUJITSU=y`
		`CONFIG_PCMCIA_FMVJ18X=m`
		`+ CONFIG_NET_VENDOR_FUNGIBLE=y`
		`+ CONFIG_FUN_CORE=m`
		`+ CONFIG_FUN_ETH=m`
		`CONFIG_NET_VENDOR_GOOGLE=y`
		`CONFIG_GVE=m`
		`CONFIG_NET_VENDOR_HUAWEI=y`
		`@@ -3510,6 +3539,7 @@`
		`# MCTP Device Drivers`
		`#`
		`CONFIG_MCTP_SERIAL=m`
		`+ CONFIG_MCTP_TRANSPORT_I2C=m`
		`# end of MCTP Device Drivers`

		`CONFIG_MDIO_DEVICE=m`
		`@@ -3819,6 +3849,7 @@`
		`CONFIG_MT7921_COMMON=m`
		`CONFIG_MT7921E=m`
		`CONFIG_MT7921S=m`
		`+ CONFIG_MT7921U=m`
		`CONFIG_WLAN_VENDOR_MICROCHIP=y`
		`CONFIG_WILC1000=m`
		`CONFIG_WILC1000_SDIO=m`
		`@@ -3880,18 +3911,25 @@`
		`CONFIG_RTW88=m`
		`CONFIG_RTW88_CORE=m`
		`CONFIG_RTW88_PCI=m`
		`+ CONFIG_RTW88_USB=m`
		`CONFIG_RTW88_8822B=m`
		`CONFIG_RTW88_8822C=m`
		`+ CONFIG_RTW88_8723D=m`
		`CONFIG_RTW88_8821C=m`
		`CONFIG_RTW88_8822BE=m`
		`+ CONFIG_RTW88_8822BU=m`
		`CONFIG_RTW88_8822CE=m`
		`+ CONFIG_RTW88_8822CU=m`
		`# CONFIG_RTW88_8723DE is not set`
		`+ CONFIG_RTW88_8723DU=m`
		`CONFIG_RTW88_8821CE=m`
		`+ CONFIG_RTW88_8821CU=m`
		`CONFIG_RTW88_DEBUG=y`
		`CONFIG_RTW88_DEBUGFS=y`
		`CONFIG_RTW89=m`
		`CONFIG_RTW89_CORE=m`
		`CONFIG_RTW89_PCI=m`
		`+ CONFIG_RTW89_8852A=m`
		`CONFIG_RTW89_8852AE=m`
		`CONFIG_RTW89_DEBUG=y`
		`CONFIG_RTW89_DEBUGMSG=y`
		`@@ -3936,13 +3974,11 @@`
		`CONFIG_IEEE802154_MRF24J40=m`
		`CONFIG_IEEE802154_CC2520=m`
		`CONFIG_IEEE802154_ATUSB=m`
		`- # CONFIG_IEEE802154_WPANUSB is not set`
		`CONFIG_IEEE802154_ADF7242=m`
		`CONFIG_IEEE802154_CA8210=m`
		`# CONFIG_IEEE802154_CA8210_DEBUGFS is not set`
		`CONFIG_IEEE802154_MCR20A=m`
		`CONFIG_IEEE802154_HWSIM=m`
		`- # CONFIG_IEEE802154_BCFSERIAL is not set`

		`#`
		`# Wireless WAN`
		`@@ -3994,6 +4030,7 @@`
		`CONFIG_INPUT_FF_MEMLESS=m`
		`CONFIG_INPUT_SPARSEKMAP=m`
		`CONFIG_INPUT_MATRIXKMAP=m`
		`+ CONFIG_INPUT_VIVALDIFMAP=m`

		`#`
		`# Userland interfaces`
		`@@ -4173,6 +4210,7 @@`
		`CONFIG_TOUCHSCREEN_MELFAS_MIP4=m`
		`CONFIG_TOUCHSCREEN_MSG2638=m`
		`CONFIG_TOUCHSCREEN_MTOUCH=m`
		`+ CONFIG_TOUCHSCREEN_IMAGIS=m`
		`# CONFIG_TOUCHSCREEN_IMX6UL_TSC is not set`
		`CONFIG_TOUCHSCREEN_INEXIO=m`
		`CONFIG_TOUCHSCREEN_MK712=m`
		`@@ -4404,7 +4442,6 @@`
		`CONFIG_SERIAL_SC16IS7XX_I2C=y`
		`CONFIG_SERIAL_SC16IS7XX_SPI=y`
		`# CONFIG_SERIAL_TIMBERDALE is not set`
		`- # CONFIG_SERIAL_BCM63XX is not set`
		`CONFIG_SERIAL_ALTERA_JTAGUART=m`
		`CONFIG_SERIAL_ALTERA_UART=m`
		`CONFIG_SERIAL_ALTERA_UART_MAXPORTS=4`
		`@@ -4548,6 +4585,7 @@`
		`#`
		`# PC SMBus host controller drivers`
		`#`
		`+ CONFIG_I2C_CCGX_UCSI=y`
		`CONFIG_I2C_ALI1535=m`
		`CONFIG_I2C_ALI1563=m`
		`CONFIG_I2C_ALI15X3=m`
		`@@ -4582,6 +4620,7 @@`
		`CONFIG_I2C_DESIGNWARE_CORE=y`
		`CONFIG_I2C_DESIGNWARE_SLAVE=y`
		`CONFIG_I2C_DESIGNWARE_PLATFORM=y`
		`+ CONFIG_I2C_DESIGNWARE_AMDPSP=y`
		`CONFIG_I2C_DESIGNWARE_BAYTRAIL=y`
		`CONFIG_I2C_DESIGNWARE_PCI=y`
		`CONFIG_I2C_EG20T=m`
		`@@ -4651,6 +4690,9 @@`
		`CONFIG_SPI_DLN2=m`
		`CONFIG_SPI_NXP_FLEXSPI=m`
		`CONFIG_SPI_GPIO=m`
		`+ CONFIG_SPI_INTEL=m`
		`+ CONFIG_SPI_INTEL_PCI=m`
		`+ CONFIG_SPI_INTEL_PLATFORM=m`
		`CONFIG_SPI_LM70_LLP=m`
		`# CONFIG_SPI_FSL_SPI is not set`
		`# CONFIG_SPI_LANTIQ_SSC is not set`
		`@@ -4775,7 +4817,6 @@`
		`# CONFIG_DEBUG_GPIO is not set`
		`CONFIG_GPIO_CDEV=y`
		`CONFIG_GPIO_CDEV_V1=y`
		`- # CONFIG_GPIO_OF_HELPER is not set`
		`CONFIG_GPIO_GENERIC=m`
		`CONFIG_GPIO_MAX730X=m`

		`@@ -4854,7 +4895,7 @@`
		`CONFIG_GPIO_TPS6586X=y`
		`CONFIG_GPIO_TPS65910=y`
		`CONFIG_GPIO_TPS65912=m`
		`- CONFIG_GPIO_TPS68470=y`
		`+ CONFIG_GPIO_TPS68470=m`
		`CONFIG_GPIO_TQMX86=m`
		`CONFIG_GPIO_TWL4030=m`
		`CONFIG_GPIO_TWL6040=m`
		`@@ -4958,6 +4999,7 @@`
		`CONFIG_POWER_SUPPLY_HWMON=y`
		`CONFIG_PDA_POWER=m`
		`CONFIG_GENERIC_ADC_BATTERY=m`
		`+ CONFIG_IP5XXX_POWER=m`
		`CONFIG_MAX8925_POWER=m`
		`CONFIG_WM831X_BACKUP=m`
		`CONFIG_WM831X_POWER=m`
		`@@ -4971,6 +5013,7 @@`
		`CONFIG_BATTERY_DS2781=m`
		`CONFIG_BATTERY_DS2782=m`
		`CONFIG_BATTERY_OLPC=m`
		`+ # CONFIG_BATTERY_SAMSUNG_SDI is not set`
		`CONFIG_BATTERY_SBS=m`
		`CONFIG_CHARGER_SBS=m`
		`CONFIG_MANAGER_SBS=m`
		`@@ -5030,6 +5073,7 @@`
		`CONFIG_CHARGER_WILCO=m`
		`CONFIG_BATTERY_SURFACE=m`
		`CONFIG_CHARGER_SURFACE=m`
		`+ CONFIG_BATTERY_UG3105=m`
		`CONFIG_HWMON=y`
		`CONFIG_HWMON_VID=m`
		`# CONFIG_HWMON_DEBUG_CHIP is not set`
		`@@ -5074,6 +5118,7 @@`
		`CONFIG_SENSORS_DS620=m`
		`CONFIG_SENSORS_DS1621=m`
		`CONFIG_SENSORS_DELL_SMM=m`
		`+ # CONFIG_I8K is not set`
		`CONFIG_SENSORS_DA9052_ADC=m`
		`CONFIG_SENSORS_DA9055=m`
		`CONFIG_SENSORS_I5K_AMB=m`
		`@@ -5177,6 +5222,7 @@`
		`CONFIG_SENSORS_IRPS5401=m`
		`CONFIG_SENSORS_ISL68137=m`
		`CONFIG_SENSORS_LM25066=m`
		`+ CONFIG_SENSORS_LM25066_REGULATOR=y`
		`CONFIG_SENSORS_LTC2978=m`
		`# CONFIG_SENSORS_LTC2978_REGULATOR is not set`
		`CONFIG_SENSORS_LTC3815=m`
		`@@ -5192,6 +5238,8 @@`
		`CONFIG_SENSORS_MP2975=m`
		`CONFIG_SENSORS_MP5023=m`
		`CONFIG_SENSORS_PIM4328=m`
		`+ CONFIG_SENSORS_PLI1209BC=m`
		`+ CONFIG_SENSORS_PLI1209BC_REGULATOR=y`
		`CONFIG_SENSORS_PM6764TR=m`
		`CONFIG_SENSORS_PXE1610=m`
		`CONFIG_SENSORS_Q54SJ108A2=m`
		`@@ -5201,6 +5249,7 @@`
		`CONFIG_SENSORS_UCD9000=m`
		`CONFIG_SENSORS_UCD9200=m`
		`CONFIG_SENSORS_XDPE122=m`
		`+ CONFIG_SENSORS_XDPE122_REGULATOR=y`
		`CONFIG_SENSORS_ZL6100=m`
		`# CONFIG_SENSORS_PWM_FAN is not set`
		`CONFIG_SENSORS_SBTSI=m`
		`@@ -5211,6 +5260,7 @@`
		`CONFIG_SENSORS_SHT4x=m`
		`CONFIG_SENSORS_SHTC1=m`
		`CONFIG_SENSORS_SIS5595=m`
		`+ CONFIG_SENSORS_SY7636A=m`
		`CONFIG_SENSORS_DME1737=m`
		`CONFIG_SENSORS_EMC1403=m`
		`CONFIG_SENSORS_EMC2103=m`
		`@@ -5238,6 +5288,7 @@`
		`CONFIG_SENSORS_TMP108=m`
		`CONFIG_SENSORS_TMP401=m`
		`CONFIG_SENSORS_TMP421=m`
		`+ CONFIG_SENSORS_TMP464=m`
		`CONFIG_SENSORS_TMP513=m`
		`CONFIG_SENSORS_VIA_CPUTEMP=m`
		`CONFIG_SENSORS_VIA686A=m`
		`@@ -5265,7 +5316,7 @@`
		`CONFIG_SENSORS_ACPI_POWER=m`
		`CONFIG_SENSORS_ATK0110=m`
		`CONFIG_SENSORS_ASUS_WMI=m`
		`- CONFIG_SENSORS_ASUS_WMI_EC=m`
		`+ CONFIG_SENSORS_ASUS_EC=m`
		`CONFIG_THERMAL=y`
		`CONFIG_THERMAL_NETLINK=y`
		`# CONFIG_THERMAL_STATISTICS is not set`
		`@@ -5305,6 +5356,7 @@`
		`CONFIG_INTEL_PCH_THERMAL=m`
		`CONFIG_INTEL_TCC_COOLING=m`
		`CONFIG_INTEL_MENLOW=m`
		`+ CONFIG_INTEL_HFI_THERMAL=y`
		`# end of Intel thermal drivers`

		`CONFIG_GENERIC_ADC_THERMAL=m`
		`@@ -5499,6 +5551,7 @@`
		`# CONFIG_MFD_MAX77650 is not set`
		`# CONFIG_MFD_MAX77686 is not set`
		`CONFIG_MFD_MAX77693=m`
		`+ # CONFIG_MFD_MAX77714 is not set`
		`CONFIG_MFD_MAX77843=y`
		`CONFIG_MFD_MAX8907=m`
		`CONFIG_MFD_MAX8925=y`
		`@@ -5524,6 +5577,7 @@`
		`# CONFIG_MFD_RN5T618 is not set`
		`# CONFIG_MFD_SEC_CORE is not set`
		`CONFIG_MFD_SI476X_CORE=m`
		`+ CONFIG_MFD_SIMPLE_MFD_I2C=m`
		`CONFIG_MFD_SM501=m`
		`CONFIG_MFD_SM501_GPIO=y`
		`CONFIG_MFD_SKY81452=m`
		`@@ -5666,11 +5720,12 @@`
		`CONFIG_REGULATOR_PV88080=m`
		`CONFIG_REGULATOR_PV88090=m`
		`CONFIG_REGULATOR_PWM=m`
		`- CONFIG_REGULATOR_RASPBERRYPI_TOUCHSCREEN_ATTINY=m`
		`+ # CONFIG_REGULATOR_RASPBERRYPI_TOUCHSCREEN_ATTINY is not set`
		`CONFIG_REGULATOR_RC5T583=m`
		`CONFIG_REGULATOR_RT4801=m`
		`CONFIG_REGULATOR_RT4831=m`
		`CONFIG_REGULATOR_RT5033=m`
		`+ CONFIG_REGULATOR_RT5190A=m`
		`CONFIG_REGULATOR_RT6160=m`
		`CONFIG_REGULATOR_RT6245=m`
		`CONFIG_REGULATOR_RTQ2134=m`
		`@@ -5678,12 +5733,14 @@`
		`CONFIG_REGULATOR_RTQ6752=m`
		`CONFIG_REGULATOR_SKY81452=m`
		`CONFIG_REGULATOR_SLG51000=m`
		`+ CONFIG_REGULATOR_SY7636A=m`
		`# CONFIG_REGULATOR_SY8106A is not set`
		`# CONFIG_REGULATOR_SY8824X is not set`
		`# CONFIG_REGULATOR_SY8827N is not set`
		`CONFIG_REGULATOR_TPS51632=m`
		`CONFIG_REGULATOR_TPS6105X=m`
		`CONFIG_REGULATOR_TPS62360=m`
		`+ # CONFIG_REGULATOR_TPS6286X is not set`
		`CONFIG_REGULATOR_TPS65023=m`
		`CONFIG_REGULATOR_TPS6507X=m`
		`CONFIG_REGULATOR_TPS65086=m`
		`@@ -5701,46 +5758,46 @@`
		`CONFIG_REGULATOR_WM8400=m`
		`CONFIG_REGULATOR_WM8994=m`
		`CONFIG_RC_CORE=y`
		`- CONFIG_RC_MAP=m`
		`- CONFIG_LIRC=y`
		`CONFIG_BPF_LIRC_MODE2=y`
		`+ CONFIG_LIRC=y`
		`+ CONFIG_RC_MAP=m`
		`CONFIG_RC_DECODERS=y`
		`+ CONFIG_IR_IMON_DECODER=m`
		`+ CONFIG_IR_JVC_DECODER=m`
		`+ CONFIG_IR_MCE_KBD_DECODER=m`
		`CONFIG_IR_NEC_DECODER=m`
		`CONFIG_IR_RC5_DECODER=m`
		`CONFIG_IR_RC6_DECODER=m`
		`- CONFIG_IR_JVC_DECODER=m`
		`- CONFIG_IR_SONY_DECODER=m`
		`+ CONFIG_IR_RCMM_DECODER=m`
		`CONFIG_IR_SANYO_DECODER=m`
		`CONFIG_IR_SHARP_DECODER=m`
		`- CONFIG_IR_MCE_KBD_DECODER=m`
		`+ CONFIG_IR_SONY_DECODER=m`
		`CONFIG_IR_XMP_DECODER=m`
		`- CONFIG_IR_IMON_DECODER=m`
		`- CONFIG_IR_RCMM_DECODER=m`
		`CONFIG_RC_DEVICES=y`
		`- CONFIG_RC_ATI_REMOTE=m`
		`CONFIG_IR_ENE=m`
		`+ CONFIG_IR_FINTEK=m`
		`+ # CONFIG_IR_GPIO_CIR is not set`
		`+ # CONFIG_IR_GPIO_TX is not set`
		`# CONFIG_IR_HIX5HD2 is not set`
		`+ CONFIG_IR_IGORPLUGUSB=m`
		`+ CONFIG_IR_IGUANA=m`
		`CONFIG_IR_IMON=m`
		`CONFIG_IR_IMON_RAW=m`
		`- CONFIG_IR_MCEUSB=m`
		`CONFIG_IR_ITE_CIR=m`
		`- CONFIG_IR_FINTEK=m`
		`+ CONFIG_IR_MCEUSB=m`
		`CONFIG_IR_NUVOTON=m`
		`+ # CONFIG_IR_PWM_TX is not set`
		`CONFIG_IR_REDRAT3=m`
		`+ CONFIG_IR_SERIAL=m`
		`+ CONFIG_IR_SERIAL_TRANSMITTER=y`
		`# CONFIG_IR_SPI is not set`
		`CONFIG_IR_STREAMZAP=m`
		`- CONFIG_IR_WINBOND_CIR=m`
		`- CONFIG_IR_IGORPLUGUSB=m`
		`- CONFIG_IR_IGUANA=m`
		`+ CONFIG_IR_TOY=m`
		`CONFIG_IR_TTUSBIR=m`
		`+ CONFIG_IR_WINBOND_CIR=m`
		`+ CONFIG_RC_ATI_REMOTE=m`
		`CONFIG_RC_LOOPBACK=m`
		`- # CONFIG_IR_GPIO_CIR is not set`
		`- # CONFIG_IR_GPIO_TX is not set`
		`- # CONFIG_IR_PWM_TX is not set`
		`- CONFIG_IR_SERIAL=m`
		`- CONFIG_IR_SERIAL_TRANSMITTER=y`
		`CONFIG_RC_XBOX_DVD=m`
		`- CONFIG_IR_TOY=m`
		`CONFIG_CEC_CORE=y`
		`CONFIG_CEC_NOTIFIER=y`
		`CONFIG_CEC_PIN=y`
		`@@ -5782,7 +5839,6 @@`
		`#`
		`# Video4Linux options`
		`#`
		`- CONFIG_VIDEO_V4L2=m`
		`CONFIG_VIDEO_V4L2_I2C=y`
		`CONFIG_VIDEO_V4L2_SUBDEV_API=y`
		`# CONFIG_VIDEO_ADV_DEBUG is not set`
		`@@ -5822,17 +5878,17 @@`
		`#`
		`# Drivers filtered as selected at 'Filter media drivers'`
		`#`
		`+`
		`+ #`
		`+ # Media drivers`
		`+ #`
		`CONFIG_MEDIA_USB_SUPPORT=y`

		`#`
		`# Webcam devices`
		`#`
		`- CONFIG_USB_VIDEO_CLASS=m`
		`- CONFIG_USB_VIDEO_CLASS_INPUT_EVDEV=y`
		`+ CONFIG_VIDEO_CPIA2=m`
		`CONFIG_USB_GSPCA=m`
		`- CONFIG_USB_M5602=m`
		`- CONFIG_USB_STV06XX=m`
		`- CONFIG_USB_GL860=m`
		`CONFIG_USB_GSPCA_BENQ=m`
		`CONFIG_USB_GSPCA_CONEX=m`
		`CONFIG_USB_GSPCA_CPIA1=m`
		`@@ -5857,13 +5913,13 @@`
		`CONFIG_USB_GSPCA_SN9C20X=m`
		`CONFIG_USB_GSPCA_SONIXB=m`
		`CONFIG_USB_GSPCA_SONIXJ=m`
		`+ CONFIG_USB_GSPCA_SPCA1528=m`
		`CONFIG_USB_GSPCA_SPCA500=m`
		`CONFIG_USB_GSPCA_SPCA501=m`
		`CONFIG_USB_GSPCA_SPCA505=m`
		`CONFIG_USB_GSPCA_SPCA506=m`
		`CONFIG_USB_GSPCA_SPCA508=m`
		`CONFIG_USB_GSPCA_SPCA561=m`
		`- CONFIG_USB_GSPCA_SPCA1528=m`
		`CONFIG_USB_GSPCA_SQ905=m`
		`CONFIG_USB_GSPCA_SQ905C=m`
		`CONFIG_USB_GSPCA_SQ930X=m`
		`@@ -5879,29 +5935,33 @@`
		`CONFIG_USB_GSPCA_VICAM=m`
		`CONFIG_USB_GSPCA_XIRLINK_CIT=m`
		`CONFIG_USB_GSPCA_ZC3XX=m`
		`+ CONFIG_USB_GL860=m`
		`+ CONFIG_USB_M5602=m`
		`+ CONFIG_USB_STV06XX=m`
		`CONFIG_USB_PWC=m`
		`# CONFIG_USB_PWC_DEBUG is not set`
		`CONFIG_USB_PWC_INPUT_EVDEV=y`
		`- CONFIG_VIDEO_CPIA2=m`
		`- CONFIG_USB_ZR364XX=m`
		`- CONFIG_USB_STKWEBCAM=m`
		`CONFIG_USB_S2255=m`
		`+ CONFIG_USB_STKWEBCAM=m`
		`CONFIG_VIDEO_USBTV=m`
		`+ CONFIG_USB_VIDEO_CLASS=m`
		`+ CONFIG_USB_VIDEO_CLASS_INPUT_EVDEV=y`
		`+ CONFIG_USB_ZR364XX=m`

		`#`
		`# Analog TV USB devices`
		`#`
		`+ CONFIG_VIDEO_GO7007=m`
		`+ CONFIG_VIDEO_GO7007_USB=m`
		`+ CONFIG_VIDEO_GO7007_LOADER=m`
		`+ CONFIG_VIDEO_GO7007_USB_S2250_BOARD=m`
		`+ CONFIG_VIDEO_HDPVR=m`
		`CONFIG_VIDEO_PVRUSB2=m`
		`CONFIG_VIDEO_PVRUSB2_SYSFS=y`
		`CONFIG_VIDEO_PVRUSB2_DVB=y`
		`# CONFIG_VIDEO_PVRUSB2_DEBUGIFC is not set`
		`- CONFIG_VIDEO_HDPVR=m`
		`CONFIG_VIDEO_STK1160_COMMON=m`
		`CONFIG_VIDEO_STK1160=m`
		`- CONFIG_VIDEO_GO7007=m`
		`- CONFIG_VIDEO_GO7007_USB=m`
		`- CONFIG_VIDEO_GO7007_LOADER=m`
		`- CONFIG_VIDEO_GO7007_USB_S2250_BOARD=m`

		`#`
		`# Analog/digital TV USB devices`
		`@@ -5920,34 +5980,9 @@`
		`#`
		`# Digital TV USB devices`
		`#`
		`- CONFIG_DVB_USB=m`
		`- # CONFIG_DVB_USB_DEBUG is not set`
		`- CONFIG_DVB_USB_DIB3000MC=m`
		`- CONFIG_DVB_USB_A800=m`
		`- CONFIG_DVB_USB_DIBUSB_MB=m`
		`- CONFIG_DVB_USB_DIBUSB_MB_FAULTY=y`
		`- CONFIG_DVB_USB_DIBUSB_MC=m`
		`- CONFIG_DVB_USB_DIB0700=m`
		`- CONFIG_DVB_USB_UMT_010=m`
		`- CONFIG_DVB_USB_CXUSB=m`
		`- CONFIG_DVB_USB_CXUSB_ANALOG=y`
		`- CONFIG_DVB_USB_M920X=m`
		`- CONFIG_DVB_USB_DIGITV=m`
		`- CONFIG_DVB_USB_VP7045=m`
		`- CONFIG_DVB_USB_VP702X=m`
		`- CONFIG_DVB_USB_GP8PSK=m`
		`- CONFIG_DVB_USB_NOVA_T_USB2=m`
		`- CONFIG_DVB_USB_TTUSB2=m`
		`- CONFIG_DVB_USB_DTT200U=m`
		`- CONFIG_DVB_USB_OPERA1=m`
		`- CONFIG_DVB_USB_AF9005=m`
		`- CONFIG_DVB_USB_AF9005_REMOTE=m`
		`- CONFIG_DVB_USB_PCTV452E=m`
		`- CONFIG_DVB_USB_DW2102=m`
		`- CONFIG_DVB_USB_CINERGY_T2=m`
		`- CONFIG_DVB_USB_DTV5100=m`
		`- CONFIG_DVB_USB_AZ6027=m`
		`- CONFIG_DVB_USB_TECHNISAT_USB2=m`
		`+ CONFIG_DVB_AS102=m`
		`+ CONFIG_DVB_B2C2_FLEXCOP_USB=m`
		`+ # CONFIG_DVB_B2C2_FLEXCOP_USB_DEBUG is not set`
		`CONFIG_DVB_USB_V2=m`
		`CONFIG_DVB_USB_AF9015=m`
		`CONFIG_DVB_USB_AF9035=m`
		`@@ -5955,19 +5990,44 @@`
		`CONFIG_DVB_USB_AU6610=m`
		`CONFIG_DVB_USB_AZ6007=m`
		`CONFIG_DVB_USB_CE6230=m`
		`+ CONFIG_DVB_USB_DVBSKY=m`
		`CONFIG_DVB_USB_EC168=m`
		`CONFIG_DVB_USB_GL861=m`
		`CONFIG_DVB_USB_LME2510=m`
		`CONFIG_DVB_USB_MXL111SF=m`
		`CONFIG_DVB_USB_RTL28XXU=m`
		`- CONFIG_DVB_USB_DVBSKY=m`
		`CONFIG_DVB_USB_ZD1301=m`
		`+ CONFIG_DVB_USB=m`
		`+ # CONFIG_DVB_USB_DEBUG is not set`
		`+ CONFIG_DVB_USB_A800=m`
		`+ CONFIG_DVB_USB_AF9005=m`
		`+ CONFIG_DVB_USB_AF9005_REMOTE=m`
		`+ CONFIG_DVB_USB_AZ6027=m`
		`+ CONFIG_DVB_USB_CINERGY_T2=m`
		`+ CONFIG_DVB_USB_CXUSB=m`
		`+ CONFIG_DVB_USB_CXUSB_ANALOG=y`
		`+ CONFIG_DVB_USB_DIB0700=m`
		`+ CONFIG_DVB_USB_DIB3000MC=m`
		`+ CONFIG_DVB_USB_DIBUSB_MB=m`
		`+ CONFIG_DVB_USB_DIBUSB_MB_FAULTY=y`
		`+ CONFIG_DVB_USB_DIBUSB_MC=m`
		`+ CONFIG_DVB_USB_DIGITV=m`
		`+ CONFIG_DVB_USB_DTT200U=m`
		`+ CONFIG_DVB_USB_DTV5100=m`
		`+ CONFIG_DVB_USB_DW2102=m`
		`+ CONFIG_DVB_USB_GP8PSK=m`
		`+ CONFIG_DVB_USB_M920X=m`
		`+ CONFIG_DVB_USB_NOVA_T_USB2=m`
		`+ CONFIG_DVB_USB_OPERA1=m`
		`+ CONFIG_DVB_USB_PCTV452E=m`
		`+ CONFIG_DVB_USB_TECHNISAT_USB2=m`
		`+ CONFIG_DVB_USB_TTUSB2=m`
		`+ CONFIG_DVB_USB_UMT_010=m`
		`+ CONFIG_DVB_USB_VP702X=m`
		`+ CONFIG_DVB_USB_VP7045=m`
		`+ CONFIG_SMS_USB_DRV=m`
		`CONFIG_DVB_TTUSB_BUDGET=m`
		`CONFIG_DVB_TTUSB_DEC=m`
		`- CONFIG_SMS_USB_DRV=m`
		`- CONFIG_DVB_B2C2_FLEXCOP_USB=m`
		`- # CONFIG_DVB_B2C2_FLEXCOP_USB_DEBUG is not set`
		`- CONFIG_DVB_AS102=m`

		`#`
		`# Webcam, TV (analog/digital) USB devices`
		`@@ -5991,17 +6051,19 @@`
		`#`
		`# Media capture/analog TV support`
		`#`
		`+ CONFIG_VIDEO_DT3155=m`
		`CONFIG_VIDEO_IVTV=m`
		`CONFIG_VIDEO_IVTV_ALSA=m`
		`# CONFIG_VIDEO_FB_IVTV is not set`
		`CONFIG_VIDEO_HEXIUM_GEMINI=m`
		`CONFIG_VIDEO_HEXIUM_ORION=m`
		`CONFIG_VIDEO_MXB=m`
		`- CONFIG_VIDEO_DT3155=m`

		`#`
		`# Media capture/analog/hybrid TV support`
		`#`
		`+ CONFIG_VIDEO_BT848=m`
		`+ CONFIG_DVB_BT8XX=m`
		`CONFIG_VIDEO_CX18=m`
		`CONFIG_VIDEO_CX18_ALSA=m`
		`CONFIG_VIDEO_CX23885=m`
		`@@ -6015,8 +6077,6 @@`
		`CONFIG_VIDEO_CX88_ENABLE_VP3054=y`
		`CONFIG_VIDEO_CX88_VP3054=m`
		`CONFIG_VIDEO_CX88_MPEG=m`
		`- CONFIG_VIDEO_BT848=m`
		`- CONFIG_DVB_BT8XX=m`
		`CONFIG_VIDEO_SAA7134=m`
		`CONFIG_VIDEO_SAA7134_ALSA=m`
		`CONFIG_VIDEO_SAA7134_RC=y`
		`@@ -6027,150 +6087,202 @@`
		`#`
		`# Media digital TV PCI Adapters`
		`#`
		`- CONFIG_DVB_BUDGET_CORE=m`
		`- CONFIG_DVB_BUDGET=m`
		`- CONFIG_DVB_BUDGET_CI=m`
		`- CONFIG_DVB_BUDGET_AV=m`
		`CONFIG_DVB_B2C2_FLEXCOP_PCI=m`
		`# CONFIG_DVB_B2C2_FLEXCOP_PCI_DEBUG is not set`
		`- CONFIG_DVB_PLUTO2=m`
		`+ CONFIG_DVB_DDBRIDGE=m`
		`+ # CONFIG_DVB_DDBRIDGE_MSIENABLE is not set`
		`CONFIG_DVB_DM1105=m`
		`- CONFIG_DVB_PT1=m`
		`- CONFIG_DVB_PT3=m`
		`CONFIG_MANTIS_CORE=m`
		`CONFIG_DVB_MANTIS=m`
		`CONFIG_DVB_HOPPER=m`
		`+ CONFIG_DVB_NETUP_UNIDVB=m`
		`CONFIG_DVB_NGENE=m`
		`- CONFIG_DVB_DDBRIDGE=m`
		`- # CONFIG_DVB_DDBRIDGE_MSIENABLE is not set`
		`+ CONFIG_DVB_PLUTO2=m`
		`+ CONFIG_DVB_PT1=m`
		`+ CONFIG_DVB_PT3=m`
		`CONFIG_DVB_SMIPCIE=m`
		`- CONFIG_DVB_NETUP_UNIDVB=m`
		`+ CONFIG_DVB_BUDGET_CORE=m`
		`+ CONFIG_DVB_BUDGET=m`
		`+ CONFIG_DVB_BUDGET_CI=m`
		`+ CONFIG_DVB_BUDGET_AV=m`
		`CONFIG_VIDEO_IPU3_CIO2=m`
		`CONFIG_CIO2_BRIDGE=y`
		`- CONFIG_RADIO_ADAPTERS=y`
		`+ CONFIG_RADIO_ADAPTERS=m`
		`+ CONFIG_RADIO_MAXIRADIO=m`
		`+ CONFIG_RADIO_SAA7706H=m`
		`+ CONFIG_RADIO_SHARK=m`
		`+ CONFIG_RADIO_SHARK2=m`
		`+ CONFIG_RADIO_SI4713=m`
		`+ CONFIG_RADIO_SI476X=m`
		`CONFIG_RADIO_TEA575X=m`
		`+ CONFIG_RADIO_TEA5764=m`
		`+ CONFIG_RADIO_TEF6862=m`
		`+ CONFIG_RADIO_WL1273=m`
		`+ CONFIG_USB_DSBR=m`
		`+ CONFIG_USB_KEENE=m`
		`+ CONFIG_USB_MA901=m`
		`+ CONFIG_USB_MR800=m`
		`+ CONFIG_USB_RAREMONO=m`
		`CONFIG_RADIO_SI470X=m`
		`CONFIG_USB_SI470X=m`
		`CONFIG_I2C_SI470X=m`
		`- CONFIG_RADIO_SI4713=m`
		`CONFIG_USB_SI4713=m`
		`CONFIG_PLATFORM_SI4713=m`
		`CONFIG_I2C_SI4713=m`
		`- CONFIG_RADIO_SI476X=m`
		`- CONFIG_USB_MR800=m`
		`- CONFIG_USB_DSBR=m`
		`- CONFIG_RADIO_MAXIRADIO=m`
		`- CONFIG_RADIO_SHARK=m`
		`- CONFIG_RADIO_SHARK2=m`
		`- CONFIG_USB_KEENE=m`
		`- CONFIG_USB_RAREMONO=m`
		`- CONFIG_USB_MA901=m`
		`- CONFIG_RADIO_TEA5764=m`
		`- CONFIG_RADIO_SAA7706H=m`
		`- CONFIG_RADIO_TEF6862=m`
		`- CONFIG_RADIO_WL1273=m`
		`CONFIG_RADIO_WL128X=m`
		`# CONFIG_V4L_RADIO_ISA_DRIVERS is not set`
		`- CONFIG_MEDIA_COMMON_OPTIONS=y`
		`-`
		`- #`
		`- # common driver options`
		`- #`
		`- CONFIG_VIDEO_CX2341X=m`
		`- CONFIG_VIDEO_TVEEPROM=m`
		`- CONFIG_TTPCI_EEPROM=m`
		`- CONFIG_CYPRESS_FIRMWARE=m`
		`- CONFIG_VIDEOBUF2_CORE=m`
		`- CONFIG_VIDEOBUF2_V4L2=m`
		`- CONFIG_VIDEOBUF2_MEMOPS=m`
		`- CONFIG_VIDEOBUF2_DMA_CONTIG=m`
		`- CONFIG_VIDEOBUF2_VMALLOC=m`
		`- CONFIG_VIDEOBUF2_DMA_SG=m`
		`- CONFIG_VIDEOBUF2_DVB=m`
		`- CONFIG_DVB_B2C2_FLEXCOP=m`
		`- CONFIG_VIDEO_SAA7146=m`
		`- CONFIG_VIDEO_SAA7146_VV=m`
		`- CONFIG_SMS_SIANO_MDTV=m`
		`- CONFIG_SMS_SIANO_RC=y`
		`- # CONFIG_SMS_SIANO_DEBUGFS is not set`
		`- CONFIG_VIDEO_V4L2_TPG=m`
		`+ CONFIG_MEDIA_PLATFORM_DRIVERS=y`
		`CONFIG_V4L_PLATFORM_DRIVERS=y`
		`- CONFIG_VIDEO_CAFE_CCIC=m`
		`- # CONFIG_VIDEO_CADENCE is not set`
		`- CONFIG_VIDEO_ASPEED=m`
		`- # CONFIG_VIDEO_MUX is not set`
		`- # CONFIG_VIDEO_XILINX is not set`
		`+ CONFIG_DVB_PLATFORM_DRIVERS=y`
		`CONFIG_V4L_MEM2MEM_DRIVERS=y`
		`CONFIG_VIDEO_MEM2MEM_DEINTERLACE=m`
		`- CONFIG_DVB_PLATFORM_DRIVERS=y`
		`+ # CONFIG_VIDEO_MUX is not set`

		`#`
		`- # MMC/SDIO DVB adapters`
		`+ # Allegro DVT media platform drivers`
		`#`
		`- CONFIG_SMS_SDIO_DRV=m`
		`- CONFIG_V4L_TEST_DRIVERS=y`
		`- CONFIG_VIDEO_VIMC=m`
		`- CONFIG_VIDEO_VIVID=m`
		`- CONFIG_VIDEO_VIVID_CEC=y`
		`- CONFIG_VIDEO_VIVID_MAX_DEVS=64`
		`- CONFIG_VIDEO_VIM2M=m`
		`- CONFIG_VIDEO_VICODEC=m`
		`- CONFIG_DVB_TEST_DRIVERS=y`
		`- CONFIG_DVB_VIDTV=m`

		`#`
		`- # FireWire (IEEE 1394) Adapters`
		`+ # Amlogic media platform drivers`
		`#`
		`- CONFIG_DVB_FIREDTV=m`
		`- CONFIG_DVB_FIREDTV_INPUT=y`
		`- # end of Media drivers`

		`- CONFIG_MEDIA_HIDE_ANCILLARY_SUBDRV=y`
		`+ #`
		`+ # Amphion drivers`
		`+ #`

		`#`
		`- # Media ancillary drivers`
		`+ # Aspeed media platform drivers`
		`#`
		`- CONFIG_MEDIA_ATTACH=y`
		`+ CONFIG_VIDEO_ASPEED=m`

		`#`
		`- # IR I2C driver auto-selected by 'Autoselect ancillary drivers'`
		`+ # Atmel media platform drivers`
		`#`
		`- CONFIG_VIDEO_IR_I2C=m`

		`#`
		`- # audio, video and radio I2C drivers auto-selected by 'Autoselect ancillary drivers'`
		`+ # Cadence media platform drivers`
		`#`
		`- CONFIG_VIDEO_TVAUDIO=m`
		`- CONFIG_VIDEO_TDA7432=m`
		`- CONFIG_VIDEO_TDA9840=m`
		`- CONFIG_VIDEO_TEA6415C=m`
		`- CONFIG_VIDEO_TEA6420=m`
		`- CONFIG_VIDEO_MSP3400=m`
		`- CONFIG_VIDEO_CS3308=m`
		`- CONFIG_VIDEO_CS5345=m`
		`- CONFIG_VIDEO_CS53L32A=m`
		`- CONFIG_VIDEO_UDA1342=m`
		`- CONFIG_VIDEO_WM8775=m`
		`- CONFIG_VIDEO_WM8739=m`
		`- CONFIG_VIDEO_VP27SMPX=m`
		`- CONFIG_VIDEO_SONY_BTF_MPX=m`
		`- CONFIG_VIDEO_SAA6588=m`
		`- CONFIG_VIDEO_SAA711X=m`
		`- CONFIG_VIDEO_TVP5150=m`
		`- CONFIG_VIDEO_TW2804=m`
		`- CONFIG_VIDEO_TW9903=m`
		`- CONFIG_VIDEO_TW9906=m`
		`+ # CONFIG_VIDEO_CADENCE_CSI2RX is not set`
		`+ # CONFIG_VIDEO_CADENCE_CSI2TX is not set`

		`#`
		`- # Video and audio decoders`
		`+ # Chips&Media media platform drivers`
		`#`
		`- CONFIG_VIDEO_SAA717X=m`
		`- CONFIG_VIDEO_CX25840=m`
		`- CONFIG_VIDEO_SAA7127=m`
		`- CONFIG_VIDEO_UPD64031A=m`
		`- CONFIG_VIDEO_UPD64083=m`
		`- CONFIG_VIDEO_SAA6752HS=m`
		`- CONFIG_VIDEO_M52790=m`
		`+`
		`+ #`
		`+ # Intel media platform drivers`
		`+ #`
		`+`
		`+ #`
		`+ # Marvell media platform drivers`
		`+ #`
		`+ CONFIG_VIDEO_CAFE_CCIC=m`
		`+`
		`+ #`
		`+ # Mediatek media platform drivers`
		`+ #`
		`+`
		`+ #`
		`+ # NVidia media platform drivers`
		`+ #`
		`+`
		`+ #`
		`+ # NXP media platform drivers`
		`+ #`
		`+`
		`+ #`
		`+ # Qualcomm media platform drivers`
		`+ #`
		`+`
		`+ #`
		`+ # Renesas media platform drivers`
		`+ #`
		`+`
		`+ #`
		`+ # Rockchip media platform drivers`
		`+ #`
		`+`
		`+ #`
		`+ # Samsung media platform drivers`
		`+ #`
		`+`
		`+ #`
		`+ # STMicroelectronics media platform drivers`
		`+ #`
		`+`
		`+ #`
		`+ # Sunxi media platform drivers`
		`+ #`
		`+`
		`+ #`
		`+ # Texas Instruments drivers`
		`+ #`
		`+`
		`+ #`
		`+ # VIA media platform drivers`
		`+ #`
		`+ # CONFIG_VIDEO_VIA_CAMERA is not set`
		`+`
		`+ #`
		`+ # Xilinx media platform drivers`
		`+ #`
		`+ # CONFIG_VIDEO_XILINX is not set`
		`+`
		`+ #`
		`+ # MMC/SDIO DVB adapters`
		`+ #`
		`+ CONFIG_SMS_SDIO_DRV=m`
		`+ CONFIG_V4L_TEST_DRIVERS=y`
		`+ CONFIG_VIDEO_VIM2M=m`
		`+ CONFIG_VIDEO_VICODEC=m`
		`+ CONFIG_VIDEO_VIMC=m`
		`+ CONFIG_VIDEO_VIVID=m`
		`+ CONFIG_VIDEO_VIVID_CEC=y`
		`+ CONFIG_VIDEO_VIVID_MAX_DEVS=64`
		`+ CONFIG_DVB_TEST_DRIVERS=y`
		`+ CONFIG_DVB_VIDTV=m`
		`+`
		`+ #`
		`+ # FireWire (IEEE 1394) Adapters`
		`+ #`
		`+ CONFIG_DVB_FIREDTV=m`
		`+ CONFIG_DVB_FIREDTV_INPUT=y`
		`+ CONFIG_MEDIA_COMMON_OPTIONS=y`
		`+`
		`+ #`
		`+ # common driver options`
		`+ #`
		`+ CONFIG_CYPRESS_FIRMWARE=m`
		`+ CONFIG_TTPCI_EEPROM=m`
		`+ CONFIG_VIDEO_CX2341X=m`
		`+ CONFIG_VIDEO_TVEEPROM=m`
		`+ CONFIG_DVB_B2C2_FLEXCOP=m`
		`+ CONFIG_VIDEO_SAA7146=m`
		`+ CONFIG_VIDEO_SAA7146_VV=m`
		`+ CONFIG_SMS_SIANO_MDTV=m`
		`+ CONFIG_SMS_SIANO_RC=y`
		`+ # CONFIG_SMS_SIANO_DEBUGFS is not set`
		`+ CONFIG_VIDEO_V4L2_TPG=m`
		`+ CONFIG_VIDEOBUF2_CORE=m`
		`+ CONFIG_VIDEOBUF2_V4L2=m`
		`+ CONFIG_VIDEOBUF2_MEMOPS=m`
		`+ CONFIG_VIDEOBUF2_DMA_CONTIG=m`
		`+ CONFIG_VIDEOBUF2_VMALLOC=m`
		`+ CONFIG_VIDEOBUF2_DMA_SG=m`
		`+ CONFIG_VIDEOBUF2_DVB=m`
		`+ # end of Media drivers`
		`+`
		`+ CONFIG_MEDIA_HIDE_ANCILLARY_SUBDRV=y`
		`+`
		`+ #`
		`+ # Media ancillary drivers`
		`+ #`
		`+ CONFIG_MEDIA_ATTACH=y`
		`+`
		`+ #`
		`+ # IR I2C driver auto-selected by 'Autoselect ancillary drivers'`
		`+ #`
		`+ CONFIG_VIDEO_IR_I2C=m`

		`#`
		`# Camera sensor devices`
		`@@ -6179,6 +6291,7 @@`
		`CONFIG_VIDEO_CCS_PLL=m`
		`CONFIG_VIDEO_HI556=m`
		`CONFIG_VIDEO_HI846=m`
		`+ CONFIG_VIDEO_HI847=m`
		`CONFIG_VIDEO_IMX208=m`
		`CONFIG_VIDEO_IMX214=m`
		`CONFIG_VIDEO_IMX219=m`
		`@@ -6190,7 +6303,22 @@`
		`# CONFIG_VIDEO_IMX335 is not set`
		`CONFIG_VIDEO_IMX355=m`
		`# CONFIG_VIDEO_IMX412 is not set`
		`+ CONFIG_VIDEO_MAX9271_LIB=m`
		`+ CONFIG_VIDEO_MT9M001=m`
		`+ CONFIG_VIDEO_MT9M032=m`
		`+ CONFIG_VIDEO_MT9M111=m`
		`+ CONFIG_VIDEO_MT9P031=m`
		`+ CONFIG_VIDEO_MT9T001=m`
		`+ CONFIG_VIDEO_MT9T112=m`
		`+ CONFIG_VIDEO_MT9V011=m`
		`+ CONFIG_VIDEO_MT9V032=m`
		`+ CONFIG_VIDEO_MT9V111=m`
		`+ CONFIG_VIDEO_NOON010PC30=m`
		`+ CONFIG_VIDEO_OG01A1B=m`
		`CONFIG_VIDEO_OV02A10=m`
		`+ CONFIG_VIDEO_OV08D10=m`
		`+ CONFIG_VIDEO_OV13858=m`
		`+ CONFIG_VIDEO_OV13B10=m`
		`CONFIG_VIDEO_OV2640=m`
		`CONFIG_VIDEO_OV2659=m`
		`CONFIG_VIDEO_OV2680=m`
		`@@ -6200,15 +6328,15 @@`
		`# CONFIG_VIDEO_OV5645 is not set`
		`CONFIG_VIDEO_OV5647=m`
		`CONFIG_VIDEO_OV5648=m`
		`- CONFIG_VIDEO_OV6650=m`
		`CONFIG_VIDEO_OV5670=m`
		`CONFIG_VIDEO_OV5675=m`
		`CONFIG_VIDEO_OV5693=m`
		`CONFIG_VIDEO_OV5695=m`
		`+ CONFIG_VIDEO_OV6650=m`
		`CONFIG_VIDEO_OV7251=m`
		`- CONFIG_VIDEO_OV772X=m`
		`CONFIG_VIDEO_OV7640=m`
		`CONFIG_VIDEO_OV7670=m`
		`+ CONFIG_VIDEO_OV772X=m`
		`CONFIG_VIDEO_OV7740=m`
		`CONFIG_VIDEO_OV8856=m`
		`CONFIG_VIDEO_OV8865=m`
		`@@ -6216,32 +6344,19 @@`
		`CONFIG_VIDEO_OV9640=m`
		`CONFIG_VIDEO_OV9650=m`
		`CONFIG_VIDEO_OV9734=m`
		`- CONFIG_VIDEO_OV13858=m`
		`- CONFIG_VIDEO_OV13B10=m`
		`- CONFIG_VIDEO_VS6624=m`
		`- CONFIG_VIDEO_MT9M001=m`
		`- CONFIG_VIDEO_MT9M032=m`
		`- CONFIG_VIDEO_MT9M111=m`
		`- CONFIG_VIDEO_MT9P031=m`
		`- CONFIG_VIDEO_MT9T001=m`
		`- CONFIG_VIDEO_MT9T112=m`
		`- CONFIG_VIDEO_MT9V011=m`
		`- CONFIG_VIDEO_MT9V032=m`
		`- CONFIG_VIDEO_MT9V111=m`
		`- CONFIG_VIDEO_SR030PC30=m`
		`- CONFIG_VIDEO_NOON010PC30=m`
		`- CONFIG_VIDEO_M5MOLS=m`
		`- CONFIG_VIDEO_MAX9271_LIB=m`
		`CONFIG_VIDEO_RDACM20=m`
		`CONFIG_VIDEO_RDACM21=m`
		`CONFIG_VIDEO_RJ54N1=m`
		`- CONFIG_VIDEO_S5K6AA=m`
		`- CONFIG_VIDEO_S5K6A3=m`
		`+ CONFIG_VIDEO_S5C73M3=m`
		`CONFIG_VIDEO_S5K4ECGX=m`
		`CONFIG_VIDEO_S5K5BAF=m`
		`+ CONFIG_VIDEO_S5K6A3=m`
		`+ CONFIG_VIDEO_S5K6AA=m`
		`+ CONFIG_VIDEO_SR030PC30=m`
		`+ CONFIG_VIDEO_VS6624=m`
		`CONFIG_VIDEO_CCS=m`
		`CONFIG_VIDEO_ET8EK8=m`
		`- CONFIG_VIDEO_S5C73M3=m`
		`+ CONFIG_VIDEO_M5MOLS=m`
		`# end of Camera sensor devices`

		`#`
		`@@ -6263,6 +6378,41 @@`
		`# end of Flash devices`

		`#`
		`+ # audio, video and radio I2C drivers auto-selected by 'Autoselect ancillary drivers'`
		`+ #`
		`+ CONFIG_VIDEO_CS3308=m`
		`+ CONFIG_VIDEO_CS5345=m`
		`+ CONFIG_VIDEO_CS53L32A=m`
		`+ CONFIG_VIDEO_MSP3400=m`
		`+ CONFIG_VIDEO_SONY_BTF_MPX=m`
		`+ CONFIG_VIDEO_TDA7432=m`
		`+ CONFIG_VIDEO_TDA9840=m`
		`+ CONFIG_VIDEO_TEA6415C=m`
		`+ CONFIG_VIDEO_TEA6420=m`
		`+ CONFIG_VIDEO_TVAUDIO=m`
		`+ CONFIG_VIDEO_UDA1342=m`
		`+ CONFIG_VIDEO_VP27SMPX=m`
		`+ CONFIG_VIDEO_WM8739=m`
		`+ CONFIG_VIDEO_WM8775=m`
		`+ CONFIG_VIDEO_SAA6588=m`
		`+ CONFIG_VIDEO_SAA711X=m`
		`+ CONFIG_VIDEO_TVP5150=m`
		`+ CONFIG_VIDEO_TW2804=m`
		`+ CONFIG_VIDEO_TW9903=m`
		`+ CONFIG_VIDEO_TW9906=m`
		`+`
		`+ #`
		`+ # Video and audio decoders`
		`+ #`
		`+ CONFIG_VIDEO_SAA717X=m`
		`+ CONFIG_VIDEO_CX25840=m`
		`+ CONFIG_VIDEO_SAA7127=m`
		`+ CONFIG_VIDEO_UPD64031A=m`
		`+ CONFIG_VIDEO_UPD64083=m`
		`+ CONFIG_VIDEO_SAA6752HS=m`
		`+ CONFIG_VIDEO_M52790=m`
		`+`
		`+ #`
		`# SPI I2C drivers auto-selected by 'Autoselect ancillary drivers'`
		`#`

		`@@ -6270,6 +6420,7 @@`
		`# Media SPI Adapters`
		`#`
		`CONFIG_CXD2880_SPI_DRV=m`
		`+ CONFIG_VIDEO_GS1662=m`
		`# end of Media SPI Adapters`

		`CONFIG_MEDIA_TUNER=m`
		`@@ -6277,42 +6428,42 @@`
		`#`
		`# Tuner drivers auto-selected by 'Autoselect ancillary drivers'`
		`#`
		`+ CONFIG_MEDIA_TUNER_E4000=m`
		`+ CONFIG_MEDIA_TUNER_FC0011=m`
		`+ CONFIG_MEDIA_TUNER_FC0012=m`
		`+ CONFIG_MEDIA_TUNER_FC0013=m`
		`+ CONFIG_MEDIA_TUNER_FC2580=m`
		`+ CONFIG_MEDIA_TUNER_IT913X=m`
		`+ CONFIG_MEDIA_TUNER_M88RS6000T=m`
		`+ CONFIG_MEDIA_TUNER_MAX2165=m`
		`+ CONFIG_MEDIA_TUNER_MC44S803=m`
		`+ CONFIG_MEDIA_TUNER_MT2060=m`
		`+ CONFIG_MEDIA_TUNER_MT2063=m`
		`+ CONFIG_MEDIA_TUNER_MT20XX=m`
		`+ CONFIG_MEDIA_TUNER_MT2131=m`
		`+ CONFIG_MEDIA_TUNER_MT2266=m`
		`+ CONFIG_MEDIA_TUNER_MXL301RF=m`
		`+ CONFIG_MEDIA_TUNER_MXL5005S=m`
		`+ CONFIG_MEDIA_TUNER_MXL5007T=m`
		`+ CONFIG_MEDIA_TUNER_QM1D1B0004=m`
		`+ CONFIG_MEDIA_TUNER_QM1D1C0042=m`
		`+ CONFIG_MEDIA_TUNER_QT1010=m`
		`+ CONFIG_MEDIA_TUNER_R820T=m`
		`+ CONFIG_MEDIA_TUNER_SI2157=m`
		`CONFIG_MEDIA_TUNER_SIMPLE=m`
		`+ CONFIG_MEDIA_TUNER_TDA18212=m`
		`+ CONFIG_MEDIA_TUNER_TDA18218=m`
		`CONFIG_MEDIA_TUNER_TDA18250=m`
		`- CONFIG_MEDIA_TUNER_TDA8290=m`
		`- CONFIG_MEDIA_TUNER_TDA827X=m`
		`CONFIG_MEDIA_TUNER_TDA18271=m`
		`+ CONFIG_MEDIA_TUNER_TDA827X=m`
		`+ CONFIG_MEDIA_TUNER_TDA8290=m`
		`CONFIG_MEDIA_TUNER_TDA9887=m`
		`CONFIG_MEDIA_TUNER_TEA5761=m`
		`CONFIG_MEDIA_TUNER_TEA5767=m`
		`- CONFIG_MEDIA_TUNER_MT20XX=m`
		`- CONFIG_MEDIA_TUNER_MT2060=m`
		`- CONFIG_MEDIA_TUNER_MT2063=m`
		`- CONFIG_MEDIA_TUNER_MT2266=m`
		`- CONFIG_MEDIA_TUNER_MT2131=m`
		`- CONFIG_MEDIA_TUNER_QT1010=m`
		`+ CONFIG_MEDIA_TUNER_TUA9001=m`
		`CONFIG_MEDIA_TUNER_XC2028=m`
		`- CONFIG_MEDIA_TUNER_XC5000=m`
		`CONFIG_MEDIA_TUNER_XC4000=m`
		`- CONFIG_MEDIA_TUNER_MXL5005S=m`
		`- CONFIG_MEDIA_TUNER_MXL5007T=m`
		`- CONFIG_MEDIA_TUNER_MC44S803=m`
		`- CONFIG_MEDIA_TUNER_MAX2165=m`
		`- CONFIG_MEDIA_TUNER_TDA18218=m`
		`- CONFIG_MEDIA_TUNER_FC0011=m`
		`- CONFIG_MEDIA_TUNER_FC0012=m`
		`- CONFIG_MEDIA_TUNER_FC0013=m`
		`- CONFIG_MEDIA_TUNER_TDA18212=m`
		`- CONFIG_MEDIA_TUNER_E4000=m`
		`- CONFIG_MEDIA_TUNER_FC2580=m`
		`- CONFIG_MEDIA_TUNER_M88RS6000T=m`
		`- CONFIG_MEDIA_TUNER_TUA9001=m`
		`- CONFIG_MEDIA_TUNER_SI2157=m`
		`- CONFIG_MEDIA_TUNER_IT913X=m`
		`- CONFIG_MEDIA_TUNER_R820T=m`
		`- CONFIG_MEDIA_TUNER_MXL301RF=m`
		`- CONFIG_MEDIA_TUNER_QM1D1C0042=m`
		`- CONFIG_MEDIA_TUNER_QM1D1B0004=m`
		`+ CONFIG_MEDIA_TUNER_XC5000=m`

		`#`
		`# DVB Frontend drivers auto-selected by 'Autoselect ancillary drivers'`
		`@@ -6321,116 +6472,116 @@`
		`#`
		`# Multistandard (satellite) frontends`
		`#`
		`+ CONFIG_DVB_M88DS3103=m`
		`+ CONFIG_DVB_MXL5XX=m`
		`CONFIG_DVB_STB0899=m`
		`CONFIG_DVB_STB6100=m`
		`CONFIG_DVB_STV090x=m`
		`CONFIG_DVB_STV0910=m`
		`CONFIG_DVB_STV6110x=m`
		`CONFIG_DVB_STV6111=m`
		`- CONFIG_DVB_MXL5XX=m`
		`- CONFIG_DVB_M88DS3103=m`

		`#`
		`# Multistandard (cable + terrestrial) frontends`
		`#`
		`CONFIG_DVB_DRXK=m`
		`- CONFIG_DVB_TDA18271C2DD=m`
		`- CONFIG_DVB_SI2165=m`
		`CONFIG_DVB_MN88472=m`
		`CONFIG_DVB_MN88473=m`
		`+ CONFIG_DVB_SI2165=m`
		`+ CONFIG_DVB_TDA18271C2DD=m`

		`#`
		`# DVB-S (satellite) frontends`
		`#`
		`CONFIG_DVB_CX24110=m`
		`+ CONFIG_DVB_CX24116=m`
		`+ CONFIG_DVB_CX24117=m`
		`+ CONFIG_DVB_CX24120=m`
		`CONFIG_DVB_CX24123=m`
		`+ CONFIG_DVB_DS3000=m`
		`+ CONFIG_DVB_MB86A16=m`
		`CONFIG_DVB_MT312=m`
		`- CONFIG_DVB_ZL10036=m`
		`- CONFIG_DVB_ZL10039=m`
		`CONFIG_DVB_S5H1420=m`
		`- CONFIG_DVB_STV0288=m`
		`+ CONFIG_DVB_SI21XX=m`
		`CONFIG_DVB_STB6000=m`
		`+ CONFIG_DVB_STV0288=m`
		`CONFIG_DVB_STV0299=m`
		`- CONFIG_DVB_STV6110=m`
		`CONFIG_DVB_STV0900=m`
		`- CONFIG_DVB_TDA8083=m`
		`+ CONFIG_DVB_STV6110=m`
		`+ CONFIG_DVB_TDA10071=m`
		`CONFIG_DVB_TDA10086=m`
		`+ CONFIG_DVB_TDA8083=m`
		`CONFIG_DVB_TDA8261=m`
		`- CONFIG_DVB_VES1X93=m`
		`- CONFIG_DVB_TUNER_ITD1000=m`
		`- CONFIG_DVB_TUNER_CX24113=m`
		`CONFIG_DVB_TDA826X=m`
		`- CONFIG_DVB_TUA6100=m`
		`- CONFIG_DVB_CX24116=m`
		`- CONFIG_DVB_CX24117=m`
		`- CONFIG_DVB_CX24120=m`
		`- CONFIG_DVB_SI21XX=m`
		`CONFIG_DVB_TS2020=m`
		`- CONFIG_DVB_DS3000=m`
		`- CONFIG_DVB_MB86A16=m`
		`- CONFIG_DVB_TDA10071=m`
		`+ CONFIG_DVB_TUA6100=m`
		`+ CONFIG_DVB_TUNER_CX24113=m`
		`+ CONFIG_DVB_TUNER_ITD1000=m`
		`+ CONFIG_DVB_VES1X93=m`
		`+ CONFIG_DVB_ZL10036=m`
		`+ CONFIG_DVB_ZL10039=m`

		`#`
		`# DVB-T (terrestrial) frontends`
		`#`
		`- CONFIG_DVB_SP887X=m`
		`+ CONFIG_DVB_AF9013=m`
		`+ CONFIG_DVB_AS102_FE=m`
		`CONFIG_DVB_CX22700=m`
		`CONFIG_DVB_CX22702=m`
		`- CONFIG_DVB_DRXD=m`
		`- CONFIG_DVB_L64781=m`
		`- CONFIG_DVB_TDA1004X=m`
		`- CONFIG_DVB_NXT6000=m`
		`- CONFIG_DVB_MT352=m`
		`- CONFIG_DVB_ZL10353=m`
		`+ CONFIG_DVB_CXD2820R=m`
		`+ CONFIG_DVB_CXD2841ER=m`
		`CONFIG_DVB_DIB3000MB=m`
		`CONFIG_DVB_DIB3000MC=m`
		`CONFIG_DVB_DIB7000M=m`
		`CONFIG_DVB_DIB7000P=m`
		`- CONFIG_DVB_TDA10048=m`
		`- CONFIG_DVB_AF9013=m`
		`+ CONFIG_DVB_DRXD=m`
		`CONFIG_DVB_EC100=m`
		`- CONFIG_DVB_STV0367=m`
		`- CONFIG_DVB_CXD2820R=m`
		`- CONFIG_DVB_CXD2841ER=m`
		`+ CONFIG_DVB_GP8PSK_FE=m`
		`+ CONFIG_DVB_L64781=m`
		`+ CONFIG_DVB_MT352=m`
		`+ CONFIG_DVB_NXT6000=m`
		`CONFIG_DVB_RTL2830=m`
		`CONFIG_DVB_RTL2832=m`
		`CONFIG_DVB_SI2168=m`
		`- CONFIG_DVB_AS102_FE=m`
		`+ CONFIG_DVB_SP887X=m`
		`+ CONFIG_DVB_STV0367=m`
		`+ CONFIG_DVB_TDA10048=m`
		`+ CONFIG_DVB_TDA1004X=m`
		`CONFIG_DVB_ZD1301_DEMOD=m`
		`- CONFIG_DVB_GP8PSK_FE=m`
		`+ CONFIG_DVB_ZL10353=m`

		`#`
		`# DVB-C (cable) frontends`
		`#`
		`- CONFIG_DVB_VES1820=m`
		`+ CONFIG_DVB_STV0297=m`
		`CONFIG_DVB_TDA10021=m`
		`CONFIG_DVB_TDA10023=m`
		`- CONFIG_DVB_STV0297=m`
		`+ CONFIG_DVB_VES1820=m`

		`#`
		`# ATSC (North American/Korean Terrestrial/Cable DTV) frontends`
		`#`
		`- CONFIG_DVB_NXT200X=m`
		`- CONFIG_DVB_OR51211=m`
		`- CONFIG_DVB_OR51132=m`
		`+ CONFIG_DVB_AU8522=m`
		`+ CONFIG_DVB_AU8522_DTV=m`
		`+ CONFIG_DVB_AU8522_V4L=m`
		`CONFIG_DVB_BCM3510=m`
		`- CONFIG_DVB_LGDT330X=m`
		`+ CONFIG_DVB_LG2160=m`
		`CONFIG_DVB_LGDT3305=m`
		`CONFIG_DVB_LGDT3306A=m`
		`- CONFIG_DVB_LG2160=m`
		`+ CONFIG_DVB_LGDT330X=m`
		`+ CONFIG_DVB_MXL692=m`
		`+ CONFIG_DVB_NXT200X=m`
		`+ CONFIG_DVB_OR51132=m`
		`+ CONFIG_DVB_OR51211=m`
		`CONFIG_DVB_S5H1409=m`
		`- CONFIG_DVB_AU8522=m`
		`- CONFIG_DVB_AU8522_DTV=m`
		`- CONFIG_DVB_AU8522_V4L=m`
		`CONFIG_DVB_S5H1411=m`
		`- CONFIG_DVB_MXL692=m`

		`#`
		`# ISDB-T (terrestrial) frontends`
		`#`
		`- CONFIG_DVB_S921=m`
		`CONFIG_DVB_DIB8000=m`
		`CONFIG_DVB_MB86A20S=m`
		`+ CONFIG_DVB_S921=m`

		`#`
		`# ISDB-S (satellite) & ISDB-T (terrestrial) frontends`
		`@@ -6447,23 +6598,23 @@`
		`#`
		`# SEC control devices for DVB-S`
		`#`
		`- CONFIG_DVB_DRX39XYJ=m`
		`- CONFIG_DVB_LNBH25=m`
		`- CONFIG_DVB_LNBP21=m`
		`- CONFIG_DVB_LNBP22=m`
		`+ CONFIG_DVB_A8293=m`
		`+ CONFIG_DVB_AF9033=m`
		`+ CONFIG_DVB_ASCOT2E=m`
		`+ CONFIG_DVB_ATBM8830=m`
		`+ CONFIG_DVB_HELENE=m`
		`+ CONFIG_DVB_HORUS3A=m`
		`CONFIG_DVB_ISL6405=m`
		`CONFIG_DVB_ISL6421=m`
		`CONFIG_DVB_ISL6423=m`
		`- CONFIG_DVB_A8293=m`
		`- CONFIG_DVB_LGS8GXX=m`
		`- CONFIG_DVB_ATBM8830=m`
		`- CONFIG_DVB_TDA665x=m`
		`CONFIG_DVB_IX2505V=m`
		`+ CONFIG_DVB_LGS8GXX=m`
		`+ CONFIG_DVB_LNBH25=m`
		`+ CONFIG_DVB_LNBP21=m`
		`+ CONFIG_DVB_LNBP22=m`
		`CONFIG_DVB_M88RS2000=m`
		`- CONFIG_DVB_AF9033=m`
		`- CONFIG_DVB_HORUS3A=m`
		`- CONFIG_DVB_ASCOT2E=m`
		`- CONFIG_DVB_HELENE=m`
		`+ CONFIG_DVB_TDA665x=m`
		`+ CONFIG_DVB_DRX39XYJ=m`

		`#`
		`# Common Interface (EN50221) controller drivers`
		`@@ -6492,8 +6643,6 @@`
		`CONFIG_AGP_VIA=m`
		`CONFIG_AGP_EFFICEON=m`
		`CONFIG_INTEL_GTT=m`
		`- CONFIG_VGA_ARB=y`
		`- CONFIG_VGA_ARB_MAX_GPUS=10`
		`CONFIG_VGA_SWITCHEROO=y`
		`CONFIG_DRM=y`
		`CONFIG_DRM_MIPI_DBI=m`
		`@@ -6501,12 +6650,14 @@`
		`CONFIG_DRM_DP_AUX_CHARDEV=y`
		`# CONFIG_DRM_DEBUG_MM is not set`
		`# CONFIG_DRM_DEBUG_SELFTEST is not set`
		`+ CONFIG_DRM_DP_HELPER=m`
		`CONFIG_DRM_KMS_HELPER=y`
		`CONFIG_DRM_FBDEV_EMULATION=y`
		`CONFIG_DRM_FBDEV_OVERALLOC=100`
		`CONFIG_DRM_LOAD_EDID_FIRMWARE=y`
		`CONFIG_DRM_DP_CEC=y`
		`CONFIG_DRM_TTM=m`
		`+ CONFIG_DRM_BUDDY=m`
		`CONFIG_DRM_VRAM_HELPER=m`
		`CONFIG_DRM_TTM_HELPER=m`
		`CONFIG_DRM_GEM_CMA_HELPER=m`
		`@@ -6620,6 +6771,7 @@`
		`# CONFIG_DRM_PANEL_LG_LG4573 is not set`
		`# CONFIG_DRM_PANEL_NEC_NL8048HL11 is not set`
		`# CONFIG_DRM_PANEL_NOVATEK_NT35510 is not set`
		`+ # CONFIG_DRM_PANEL_NOVATEK_NT35560 is not set`
		`# CONFIG_DRM_PANEL_NOVATEK_NT35950 is not set`
		`# CONFIG_DRM_PANEL_NOVATEK_NT36672A is not set`
		`# CONFIG_DRM_PANEL_NOVATEK_NT39016 is not set`
		`@@ -6650,7 +6802,6 @@`
		`# CONFIG_DRM_PANEL_SITRONIX_ST7701 is not set`
		`# CONFIG_DRM_PANEL_SITRONIX_ST7703 is not set`
		`# CONFIG_DRM_PANEL_SITRONIX_ST7789V is not set`
		`- # CONFIG_DRM_PANEL_SONY_ACX424AKP is not set`
		`# CONFIG_DRM_PANEL_SONY_ACX565AKM is not set`
		`# CONFIG_DRM_PANEL_SONY_TULIP_TRULY_NT35521 is not set`
		`# CONFIG_DRM_PANEL_TDO_TL070WSH30 is not set`
		`@@ -6674,6 +6825,7 @@`
		`# CONFIG_DRM_CHRONTEL_CH7033 is not set`
		`# CONFIG_DRM_CROS_EC_ANX7688 is not set`
		`# CONFIG_DRM_DISPLAY_CONNECTOR is not set`
		`+ # CONFIG_DRM_ITE_IT6505 is not set`
		`# CONFIG_DRM_LONTIUM_LT8912B is not set`
		`# CONFIG_DRM_LONTIUM_LT9611 is not set`
		`# CONFIG_DRM_LONTIUM_LT9611UXC is not set`
		`@@ -6712,6 +6864,7 @@`
		`CONFIG_DRM_BOCHS=m`
		`CONFIG_DRM_CIRRUS_QEMU=m`
		`CONFIG_DRM_GM12U320=m`
		`+ CONFIG_DRM_PANEL_MIPI_DBI=m`
		`CONFIG_DRM_SIMPLEDRM=y`
		`CONFIG_TINYDRM_HX8357D=m`
		`CONFIG_TINYDRM_ILI9163=m`
		`@@ -6724,8 +6877,16 @@`
		`CONFIG_TINYDRM_ST7735R=m`
		`CONFIG_DRM_VBOXVIDEO=m`
		`CONFIG_DRM_GUD=m`
		`+ CONFIG_DRM_SSD130X=m`
		`+ CONFIG_DRM_SSD130X_I2C=m`
		`CONFIG_DRM_HYPERV=m`
		`- # CONFIG_DRM_LEGACY is not set`
		`+ CONFIG_DRM_LEGACY=y`
		`+ CONFIG_DRM_TDFX=m`
		`+ CONFIG_DRM_R128=m`
		`+ CONFIG_DRM_MGA=m`
		`+ CONFIG_DRM_SIS=m`
		`+ CONFIG_DRM_VIA=m`
		`+ CONFIG_DRM_SAVAGE=m`
		`CONFIG_DRM_PANEL_ORIENTATION_QUIRKS=y`
		`CONFIG_DRM_NOMODESET=y`
		`CONFIG_DRM_PRIVACY_SCREEN=y`
		`@@ -6748,61 +6909,102 @@`
		`# CONFIG_FB_FOREIGN_ENDIAN is not set`
		`CONFIG_FB_SYS_FOPS=y`
		`CONFIG_FB_DEFERRED_IO=y`
		`+ CONFIG_FB_HECUBA=m`
		`+ CONFIG_FB_SVGALIB=m`
		`+ CONFIG_FB_BACKLIGHT=m`
		`CONFIG_FB_MODE_HELPERS=y`
		`- # CONFIG_FB_TILEBLITTING is not set`
		`+ CONFIG_FB_TILEBLITTING=y`

		`#`
		`# Frame buffer hardware drivers`
		`#`
		`- # CONFIG_FB_CIRRUS is not set`
		`- # CONFIG_FB_PM2 is not set`
		`- # CONFIG_FB_CYBER2000 is not set`
		`- # CONFIG_FB_ARC is not set`
		`- # CONFIG_FB_ASILIANT is not set`
		`- # CONFIG_FB_IMSTT is not set`
		`- # CONFIG_FB_VGA16 is not set`
		`- # CONFIG_FB_UVESA is not set`
		`+ CONFIG_FB_CIRRUS=m`
		`+ CONFIG_FB_PM2=m`
		`+ CONFIG_FB_PM2_FIFO_DISCONNECT=y`
		`+ CONFIG_FB_CYBER2000=m`
		`+ CONFIG_FB_CYBER2000_DDC=y`
		`+ CONFIG_FB_ARC=m`
		`+ CONFIG_FB_ASILIANT=y`
		`+ CONFIG_FB_IMSTT=y`
		`+ CONFIG_FB_VGA16=m`
		`+ CONFIG_FB_UVESA=m`
		`CONFIG_FB_VESA=y`
		`CONFIG_FB_EFI=y`
		`- # CONFIG_FB_N411 is not set`
		`- # CONFIG_FB_HGA is not set`
		`- # CONFIG_FB_OPENCORES is not set`
		`- # CONFIG_FB_S1D13XXX is not set`
		`- # CONFIG_FB_NVIDIA is not set`
		`- # CONFIG_FB_RIVA is not set`
		`- # CONFIG_FB_I740 is not set`
		`+ CONFIG_FB_N411=m`
		`+ CONFIG_FB_HGA=m`
		`+ CONFIG_FB_OPENCORES=m`
		`+ CONFIG_FB_S1D13XXX=m`
		`+ CONFIG_FB_NVIDIA=m`
		`+ CONFIG_FB_NVIDIA_I2C=y`
		`+ # CONFIG_FB_NVIDIA_DEBUG is not set`
		`+ CONFIG_FB_NVIDIA_BACKLIGHT=y`
		`+ CONFIG_FB_RIVA=m`
		`+ CONFIG_FB_RIVA_I2C=y`
		`+ # CONFIG_FB_RIVA_DEBUG is not set`
		`+ CONFIG_FB_RIVA_BACKLIGHT=y`
		`+ CONFIG_FB_I740=m`
		`CONFIG_FB_I810=m`
		`CONFIG_FB_I810_GTF=y`
		`CONFIG_FB_I810_I2C=y`
		`- # CONFIG_FB_LE80578 is not set`
		`- # CONFIG_FB_MATROX is not set`
		`- # CONFIG_FB_RADEON is not set`
		`- # CONFIG_FB_ATY128 is not set`
		`- # CONFIG_FB_ATY is not set`
		`- # CONFIG_FB_S3 is not set`
		`- # CONFIG_FB_SAVAGE is not set`
		`- # CONFIG_FB_SIS is not set`
		`- # CONFIG_FB_VIA is not set`
		`- # CONFIG_FB_NEOMAGIC is not set`
		`- # CONFIG_FB_KYRO is not set`
		`- # CONFIG_FB_3DFX is not set`
		`- # CONFIG_FB_VOODOO1 is not set`
		`- # CONFIG_FB_VT8623 is not set`
		`- # CONFIG_FB_TRIDENT is not set`
		`- # CONFIG_FB_ARK is not set`
		`- # CONFIG_FB_PM3 is not set`
		`- # CONFIG_FB_CARMINE is not set`
		`- # CONFIG_FB_GEODE is not set`
		`- # CONFIG_FB_SM501 is not set`
		`- # CONFIG_FB_SMSCUFX is not set`
		`+ CONFIG_FB_LE80578=m`
		`+ CONFIG_FB_CARILLO_RANCH=m`
		`+ CONFIG_FB_MATROX=m`
		`+ CONFIG_FB_MATROX_MILLENIUM=y`
		`+ CONFIG_FB_MATROX_MYSTIQUE=y`
		`+ CONFIG_FB_MATROX_G=y`
		`+ CONFIG_FB_MATROX_I2C=m`
		`+ CONFIG_FB_MATROX_MAVEN=m`
		`+ CONFIG_FB_RADEON=m`
		`+ CONFIG_FB_RADEON_I2C=y`
		`+ CONFIG_FB_RADEON_BACKLIGHT=y`
		`+ # CONFIG_FB_RADEON_DEBUG is not set`
		`+ CONFIG_FB_ATY128=m`
		`+ CONFIG_FB_ATY128_BACKLIGHT=y`
		`+ CONFIG_FB_ATY=m`
		`+ CONFIG_FB_ATY_CT=y`
		`+ CONFIG_FB_ATY_GENERIC_LCD=y`
		`+ CONFIG_FB_ATY_GX=y`
		`+ CONFIG_FB_ATY_BACKLIGHT=y`
		`+ CONFIG_FB_S3=m`
		`+ CONFIG_FB_S3_DDC=y`
		`+ CONFIG_FB_SAVAGE=m`
		`+ CONFIG_FB_SAVAGE_I2C=y`
		`+ CONFIG_FB_SAVAGE_ACCEL=y`
		`+ CONFIG_FB_SIS=m`
		`+ # CONFIG_FB_SIS_300 is not set`
		`+ CONFIG_FB_SIS_315=y`
		`+ CONFIG_FB_VIA=m`
		`+ # CONFIG_FB_VIA_DIRECT_PROCFS is not set`
		`+ CONFIG_FB_VIA_X_COMPATIBILITY=y`
		`+ CONFIG_FB_NEOMAGIC=m`
		`+ CONFIG_FB_KYRO=m`
		`+ CONFIG_FB_3DFX=m`
		`+ CONFIG_FB_3DFX_ACCEL=y`
		`+ CONFIG_FB_3DFX_I2C=y`
		`+ CONFIG_FB_VOODOO1=m`
		`+ CONFIG_FB_VT8623=m`
		`+ CONFIG_FB_TRIDENT=m`
		`+ CONFIG_FB_ARK=m`
		`+ CONFIG_FB_PM3=m`
		`+ CONFIG_FB_CARMINE=m`
		`+ CONFIG_FB_CARMINE_DRAM_EVAL=y`
		`+ # CONFIG_CARMINE_DRAM_CUSTOM is not set`
		`+ CONFIG_FB_GEODE=y`
		`+ CONFIG_FB_GEODE_LX=m`
		`+ CONFIG_FB_GEODE_GX=m`
		`+ CONFIG_FB_GEODE_GX1=m`
		`+ CONFIG_FB_SM501=m`
		`+ CONFIG_FB_SMSCUFX=m`
		`CONFIG_FB_UDL=m`
		`- # CONFIG_FB_IBM_GXT4500 is not set`
		`- # CONFIG_FB_VIRTUAL is not set`
		`- # CONFIG_FB_METRONOME is not set`
		`- # CONFIG_FB_MB862XX is not set`
		`- # CONFIG_FB_HYPERV is not set`
		`- # CONFIG_FB_SSD1307 is not set`
		`- # CONFIG_FB_SM712 is not set`
		`+ CONFIG_FB_IBM_GXT4500=m`
		`+ CONFIG_FB_VIRTUAL=m`
		`+ CONFIG_FB_METRONOME=m`
		`+ CONFIG_FB_MB862XX=m`
		`+ CONFIG_FB_MB862XX_PCI_GDC=y`
		`+ CONFIG_FB_MB862XX_I2C=y`
		`+ CONFIG_FB_HYPERV=m`
		`+ CONFIG_FB_SSD1307=m`
		`+ CONFIG_FB_SM712=m`
		`# end of Frame buffer Devices`

		`#`
		`@@ -6824,6 +7026,7 @@`
		`CONFIG_BACKLIGHT_CLASS_DEVICE=y`
		`CONFIG_BACKLIGHT_KTD253=m`
		`CONFIG_BACKLIGHT_LM3533=m`
		`+ # CONFIG_BACKLIGHT_CARILLO_RANCH is not set`
		`# CONFIG_BACKLIGHT_PWM is not set`
		`CONFIG_BACKLIGHT_DA903X=m`
		`CONFIG_BACKLIGHT_DA9052=m`
		`@@ -6855,6 +7058,7 @@`
		`# end of Backlight & LCD device support`

		`CONFIG_VGASTATE=m`
		`+ CONFIG_VIDEOMODE_HELPERS=y`
		`CONFIG_HDMI=y`

		`#`
		`@@ -7147,8 +7351,10 @@`
		`CONFIG_SND_SOC_AMD_YC_MACH=m`
		`CONFIG_SND_AMD_ACP_CONFIG=m`
		`CONFIG_SND_SOC_AMD_ACP_COMMON=m`
		`+ CONFIG_SND_SOC_AMD_ACP_PDM=m`
		`CONFIG_SND_SOC_AMD_ACP_I2S=m`
		`CONFIG_SND_SOC_AMD_ACP_PCM=m`
		`+ CONFIG_SND_SOC_AMD_ACP_PCI=m`
		`CONFIG_SND_AMD_ASOC_RENOIR=m`
		`CONFIG_SND_SOC_AMD_MACH_COMMON=m`
		`CONFIG_SND_SOC_AMD_LEGACY_MACH=m`
		`@@ -7206,10 +7412,13 @@`
		`CONFIG_SND_SOC_INTEL_SKYLAKE_HDAUDIO_CODEC=y`
		`CONFIG_SND_SOC_INTEL_SKYLAKE_COMMON=m`
		`CONFIG_SND_SOC_ACPI_INTEL_MATCH=m`
		`+ CONFIG_SND_SOC_INTEL_AVS=m`
		`CONFIG_SND_SOC_INTEL_MACH=y`
		`CONFIG_SND_SOC_INTEL_USER_FRIENDLY_LONG_NAMES=y`
		`CONFIG_SND_SOC_INTEL_HDA_DSP_COMMON=m`
		`CONFIG_SND_SOC_INTEL_SOF_MAXIM_COMMON=m`
		`+ CONFIG_SND_SOC_INTEL_SOF_REALTEK_COMMON=m`
		`+ CONFIG_SND_SOC_INTEL_SOF_CIRRUS_COMMON=m`
		`CONFIG_SND_SOC_INTEL_HASWELL_MACH=m`
		`CONFIG_SND_SOC_INTEL_BDW_RT5650_MACH=m`
		`CONFIG_SND_SOC_INTEL_BDW_RT5677_MACH=m`
		`@@ -7249,6 +7458,7 @@`
		`CONFIG_SND_SOC_INTEL_CML_LP_DA7219_MAX98357A_MACH=m`
		`CONFIG_SND_SOC_INTEL_SOF_CML_RT1011_RT5682_MACH=m`
		`CONFIG_SND_SOC_INTEL_SOF_DA7219_MAX98373_MACH=m`
		`+ CONFIG_SND_SOC_INTEL_SOF_SSP_AMP_MACH=m`
		`# CONFIG_SND_SOC_INTEL_EHL_RT5660_MACH is not set`
		`CONFIG_SND_SOC_INTEL_SOUNDWIRE_SOF_MACH=m`
		`CONFIG_SND_SOC_MTK_BTCVSD=m`
		`@@ -7258,7 +7468,8 @@`
		`CONFIG_SND_SOC_SOF_ACPI=m`
		`CONFIG_SND_SOC_SOF_ACPI_DEV=m`
		`# CONFIG_SND_SOC_SOF_OF is not set`
		`- # CONFIG_SND_SOC_SOF_DEBUG_PROBES is not set`
		`+ CONFIG_SND_SOC_SOF_DEBUG_PROBES=m`
		`+ CONFIG_SND_SOC_SOF_CLIENT=m`
		`CONFIG_SND_SOC_SOF=m`
		`CONFIG_SND_SOC_SOF_PROBE_WORK_QUEUE=y`
		`CONFIG_SND_SOC_SOF_AMD_TOPLEVEL=m`
		`@@ -7290,6 +7501,7 @@`
		`CONFIG_SND_SOC_SOF_HDA_AUDIO_CODEC=y`
		`CONFIG_SND_SOC_SOF_HDA_LINK_BASELINE=m`
		`CONFIG_SND_SOC_SOF_HDA=m`
		`+ CONFIG_SND_SOC_SOF_HDA_PROBES=y`
		`CONFIG_SND_SOC_SOF_INTEL_SOUNDWIRE_LINK_BASELINE=m`
		`CONFIG_SND_SOC_SOF_INTEL_SOUNDWIRE=m`
		`CONFIG_SND_SOC_SOF_XTENSA=m`
		`@@ -7334,6 +7546,7 @@`
		`CONFIG_SND_SOC_AK5386=m`
		`CONFIG_SND_SOC_AK5558=m`
		`CONFIG_SND_SOC_ALC5623=m`
		`+ CONFIG_SND_SOC_AW8738=m`
		`CONFIG_SND_SOC_BD28623=m`
		`# CONFIG_SND_SOC_BT_SCO is not set`
		`CONFIG_SND_SOC_CROS_EC_CODEC=m`
		`@@ -7475,6 +7688,7 @@`
		`CONFIG_SND_SOC_TAS5086=m`
		`CONFIG_SND_SOC_TAS571X=m`
		`CONFIG_SND_SOC_TAS5720=m`
		`+ CONFIG_SND_SOC_TAS5805M=m`
		`CONFIG_SND_SOC_TAS6424=m`
		`CONFIG_SND_SOC_TDA7419=m`
		`CONFIG_SND_SOC_TFA9879=m`
		`@@ -7539,6 +7753,7 @@`
		`CONFIG_SND_SOC_NAU8824=m`
		`CONFIG_SND_SOC_NAU8825=m`
		`CONFIG_SND_SOC_TPA6130A2=m`
		`+ CONFIG_SND_SOC_LPASS_MACRO_COMMON=m`
		`CONFIG_SND_SOC_LPASS_WSA_MACRO=m`
		`CONFIG_SND_SOC_LPASS_VA_MACRO=m`
		`CONFIG_SND_SOC_LPASS_RX_MACRO=m`
		`@@ -7602,6 +7817,7 @@`
		`CONFIG_HID_GLORIOUS=m`
		`CONFIG_HID_HOLTEK=m`
		`CONFIG_HOLTEK_FF=y`
		`+ CONFIG_HID_VIVALDI_COMMON=m`
		`CONFIG_HID_GOOGLE_HAMMER=m`
		`CONFIG_HID_VIVALDI=m`
		`CONFIG_HID_GT683R=m`
		`@@ -7653,12 +7869,14 @@`
		`CONFIG_HID_PLANTRONICS=m`
		`CONFIG_HID_PLAYSTATION=m`
		`CONFIG_PLAYSTATION_FF=y`
		`+ CONFIG_HID_RAZER=m`
		`CONFIG_HID_PRIMAX=m`
		`CONFIG_HID_RETRODE=m`
		`CONFIG_HID_ROCCAT=m`
		`CONFIG_HID_SAITEK=m`
		`CONFIG_HID_SAMSUNG=m`
		`CONFIG_HID_SEMITEK=m`
		`+ CONFIG_HID_SIGMAMICRO=m`
		`CONFIG_HID_SONY=m`
		`CONFIG_SONY_FF=y`
		`CONFIG_HID_SPEEDLINK=m`
		`@@ -8109,8 +8327,10 @@`
		`CONFIG_UCSI_CCG=m`
		`CONFIG_UCSI_ACPI=m`
		`CONFIG_TYPEC_TPS6598X=m`
		`+ CONFIG_TYPEC_RT1719=m`
		`CONFIG_TYPEC_HD3SS3220=m`
		`CONFIG_TYPEC_STUSB160X=m`
		`+ CONFIG_TYPEC_WUSB3801=m`

		`#`
		`# USB Type-C Multiplexer/DeMultiplexer Switch support`
		`@@ -8598,9 +8818,11 @@`
		`CONFIG_VFIO_PCI=m`
		`CONFIG_VFIO_PCI_VGA=y`
		`CONFIG_VFIO_PCI_IGD=y`
		`+ CONFIG_MLX5_VFIO_PCI=m`
		`CONFIG_VFIO_MDEV=m`
		`CONFIG_IRQ_BYPASS_MANAGER=m`
		`CONFIG_VIRT_DRIVERS=y`
		`+ CONFIG_VMGENID=y`
		`CONFIG_VBOXGUEST=m`
		`CONFIG_NITRO_ENCLAVES=m`
		`CONFIG_VIRTIO=y`
		`@@ -8677,7 +8899,6 @@`
		`# Analog to digital converters`
		`#`
		`CONFIG_AD7816=m`
		`- CONFIG_AD7280=m`
		`# end of Analog to digital converters`

		`#`
		`@@ -8733,19 +8954,11 @@`
		`CONFIG_DVB_AV7110_OSD=y`
		`CONFIG_DVB_BUDGET_PATCH=m`
		`CONFIG_DVB_SP8870=m`
		`-`
		`- #`
		`- # Android`
		`- #`
		`- CONFIG_ASHMEM=y`
		`- # end of Android`
		`-`
		`# CONFIG_STAGING_BOARD is not set`
		`CONFIG_LTE_GDM724X=m`
		`CONFIG_FIREWIRE_SERIAL=m`
		`CONFIG_FWTTY_MAX_TOTAL_PORTS=64`
		`CONFIG_FWTTY_MAX_CARD_PORTS=32`
		`- CONFIG_GS_FPGABOOT=m`
		`CONFIG_UNISYSSPAR=y`
		`# CONFIG_COMMON_CLK_XLNX_CLKWZRD is not set`
		`# CONFIG_FB_TFT is not set`
		`@@ -8824,7 +9037,6 @@`
		`CONFIG_INTEL_ATOMISP2_LED=m`
		`CONFIG_INTEL_ATOMISP2_PM=m`
		`CONFIG_INTEL_SAR_INT1092=m`
		`- CONFIG_INTEL_CHT_INT33FE=m`
		`CONFIG_INTEL_SKL_INT3472=m`
		`CONFIG_INTEL_PMC_CORE=y`
		`CONFIG_INTEL_PMT_CLASS=m`
		`@@ -8838,6 +9050,7 @@`
		`CONFIG_INTEL_INT0002_VGPIO=m`
		`CONFIG_INTEL_OAKTRAIL=m`
		`CONFIG_INTEL_CHTDC_TI_PWRBTN=m`
		`+ CONFIG_INTEL_CHTWC_INT33FE=m`
		`CONFIG_INTEL_PUNIT_IPC=m`
		`CONFIG_INTEL_RST=m`
		`CONFIG_INTEL_SMARTCONNECT=m`
		`@@ -8862,7 +9075,7 @@`
		`CONFIG_SONYPI_COMPAT=y`
		`CONFIG_SYSTEM76_ACPI=m`
		`CONFIG_TOPSTAR_LAPTOP=m`
		`- CONFIG_I2C_MULTI_INSTANTIATE=m`
		`+ CONFIG_SERIAL_MULTI_INSTANTIATE=m`
		`CONFIG_MLX_PLATFORM=m`
		`CONFIG_TOUCHSCREEN_DMI=y`
		`CONFIG_X86_ANDROID_TABLETS=m`
		`@@ -8892,6 +9105,7 @@`
		`CONFIG_CROS_EC_TYPEC=m`
		`CONFIG_CROS_USBPD_LOGGER=m`
		`CONFIG_CROS_USBPD_NOTIFY=m`
		`+ CONFIG_CHROMEOS_PRIVACY_SCREEN=m`
		`CONFIG_WILCO_EC=m`
		`CONFIG_WILCO_EC_DEBUGFS=m`
		`CONFIG_WILCO_EC_EVENTS=m`
		`@@ -8903,7 +9117,6 @@`
		`CONFIG_OLPC_EC=y`
		`CONFIG_SURFACE_PLATFORMS=y`
		`CONFIG_SURFACE3_WMI=m`
		`- CONFIG_SURFACE_3_BUTTON=m`
		`CONFIG_SURFACE_3_POWER_OPREGION=m`
		`CONFIG_SURFACE_ACPI_NOTIFY=m`
		`CONFIG_SURFACE_AGGREGATOR_CDEV=m`
		`@@ -8931,11 +9144,11 @@`
		`CONFIG_COMMON_CLK_TPS68470=m`
		`# CONFIG_COMMON_CLK_CDCE925 is not set`
		`CONFIG_COMMON_CLK_CS2000_CP=m`
		`- # CONFIG_COMMON_CLK_LAN966X is not set`
		`CONFIG_CLK_TWL6040=m`
		`# CONFIG_COMMON_CLK_AXI_CLKGEN is not set`
		`CONFIG_COMMON_CLK_PALMAS=m`
		`CONFIG_COMMON_CLK_PWM=m`
		`+ # CONFIG_COMMON_CLK_RS9_PCIE is not set`
		`# CONFIG_COMMON_CLK_VC5 is not set`
		`# CONFIG_COMMON_CLK_FIXED_MMIO is not set`
		`# CONFIG_CLK_LGM_CGU is not set`
		`@@ -8993,6 +9206,7 @@`
		`#`
		`CONFIG_RPMSG=m`
		`CONFIG_RPMSG_CHAR=m`
		`+ CONFIG_RPMSG_CTRL=m`
		`CONFIG_RPMSG_NS=m`
		`CONFIG_RPMSG_QCOM_GLINK=m`
		`CONFIG_RPMSG_QCOM_GLINK_RPM=m`
		`@@ -9119,6 +9333,9 @@`
		`CONFIG_ADXL355=m`
		`CONFIG_ADXL355_I2C=m`
		`CONFIG_ADXL355_SPI=m`
		`+ CONFIG_ADXL367=m`
		`+ CONFIG_ADXL367_SPI=m`
		`+ CONFIG_ADXL367_I2C=m`
		`CONFIG_ADXL372=m`
		`CONFIG_ADXL372_SPI=m`
		`CONFIG_ADXL372_I2C=m`
		`@@ -9173,6 +9390,7 @@`
		`CONFIG_AD7124=m`
		`CONFIG_AD7192=m`
		`CONFIG_AD7266=m`
		`+ CONFIG_AD7280=m`
		`CONFIG_AD7291=m`
		`CONFIG_AD7292=m`
		`CONFIG_AD7298=m`
		`@@ -9256,6 +9474,7 @@`
		`# Amplifiers`
		`#`
		`CONFIG_AD8366=m`
		`+ CONFIG_ADA4250=m`
		`CONFIG_HMC425=m`
		`# end of Amplifiers`

		`@@ -9333,6 +9552,7 @@`
		`CONFIG_AD5593R=m`
		`CONFIG_AD5504=m`
		`CONFIG_AD5624R_SPI=m`
		`+ CONFIG_LTC2688=m`
		`# CONFIG_AD5686_SPI is not set`
		`# CONFIG_AD5696_I2C is not set`
		`CONFIG_AD5755=m`
		`@@ -9388,6 +9608,7 @@`
		`CONFIG_ADF4350=m`
		`CONFIG_ADF4371=m`
		`CONFIG_ADMV1013=m`
		`+ CONFIG_ADMV4420=m`
		`CONFIG_ADRF6780=m`
		`# end of Phase-Locked Loop (PLL) frequency synthesizers`
		`# end of Frequency Synthesizers DDS/PLL`
		`@@ -9658,7 +9879,10 @@`
		`CONFIG_PING=m`
		`CONFIG_RFD77402=m`
		`CONFIG_SRF04=m`
		`+ CONFIG_SX_COMMON=m`
		`# CONFIG_SX9310 is not set`
		`+ CONFIG_SX9324=m`
		`+ CONFIG_SX9360=m`
		`CONFIG_SX9500=m`
		`CONFIG_SRF08=m`
		`# CONFIG_VCNL3020 is not set`
		`@@ -9748,11 +9972,9 @@`

		`# CONFIG_PHY_CADENCE_TORRENT is not set`
		`# CONFIG_PHY_CADENCE_DPHY is not set`
		`+ # CONFIG_PHY_CADENCE_DPHY_RX is not set`
		`# CONFIG_PHY_CADENCE_SIERRA is not set`
		`# CONFIG_PHY_CADENCE_SALVO is not set`
		`- # CONFIG_PHY_FSL_IMX8MQ_USB is not set`
		`- # CONFIG_PHY_MIXEL_MIPI_DPHY is not set`
		`- # CONFIG_PHY_FSL_IMX8M_PCIE is not set`
		`CONFIG_PHY_PXA_28NM_HSIC=m`
		`CONFIG_PHY_PXA_28NM_USB2=m`
		`# CONFIG_PHY_LAN966X_SERDES is not set`
		`@@ -9771,8 +9993,7 @@`
		`CONFIG_INTEL_RAPL_CORE=m`
		`CONFIG_INTEL_RAPL=m`
		`CONFIG_IDLE_INJECT=y`
		`- CONFIG_DTPM=y`
		`- CONFIG_DTPM_CPU=y`
		`+ # CONFIG_DTPM is not set`
		`CONFIG_MCB=m`
		`CONFIG_MCB_PCI=m`
		`CONFIG_MCB_LPC=m`
		`@@ -9881,6 +10102,7 @@`
		`CONFIG_MOST_USB_HDM=m`
		`CONFIG_MOST_CDEV=m`
		`CONFIG_MOST_SND=m`
		`+ # CONFIG_PECI is not set`
		`# end of Device Drivers`

		`#`
		`@@ -9949,8 +10171,8 @@`
		`CONFIG_F2FS_FS_LZ4HC=y`
		`CONFIG_F2FS_FS_ZSTD=y`
		`CONFIG_F2FS_IOSTAT=y`
		`+ CONFIG_F2FS_UNFAIR_RWSEM=y`
		`CONFIG_ZONEFS_FS=m`
		`- CONFIG_FS_DAX=y`
		`CONFIG_FS_POSIX_ACL=y`
		`CONFIG_EXPORTFS=y`
		`CONFIG_EXPORTFS_BLOCK_OPS=y`
		`@@ -9978,7 +10200,6 @@`
		`CONFIG_FUSE_FS=m`
		`CONFIG_CUSE=m`
		`CONFIG_VIRTIO_FS=m`
		`- CONFIG_FUSE_DAX=y`
		`CONFIG_OVERLAY_FS=m`
		`CONFIG_OVERLAY_FS_REDIRECT_DIR=y`
		`# CONFIG_OVERLAY_FS_REDIRECT_ALWAYS_FOLLOW is not set`
		`@@ -10175,7 +10396,7 @@`
		`CONFIG_PNFS_FILE_LAYOUT=m`
		`CONFIG_PNFS_BLOCK=m`
		`CONFIG_PNFS_FLEXFILE_LAYOUT=m`
		`- CONFIG_NFS_V4_1_IMPLEMENTATION_ID_DOMAIN="kernel.org"`
		`+ CONFIG_NFS_V4_1_IMPLEMENTATION_ID_DOMAIN="linux-libre.fsfla.org"`
		`CONFIG_NFS_V4_1_MIGRATION=y`
		`CONFIG_NFS_V4_SECURITY_LABEL=y`
		`CONFIG_NFS_FSCACHE=y`
		`@@ -10186,7 +10407,6 @@`
		`# CONFIG_NFS_V4_2_READ_PLUS is not set`
		`CONFIG_NFSD=m`
		`CONFIG_NFSD_V2_ACL=y`
		`- CONFIG_NFSD_V3=y`
		`CONFIG_NFSD_V3_ACL=y`
		`CONFIG_NFSD_V4=y`
		`CONFIG_NFSD_PNFS=y`
		`@@ -10306,6 +10526,7 @@`
		`CONFIG_PERSISTENT_KEYRINGS=y`
		`CONFIG_TRUSTED_KEYS=m`
		`CONFIG_ENCRYPTED_KEYS=m`
		`+ # CONFIG_USER_DECRYPTED_DATA is not set`
		`CONFIG_KEY_DH_OPERATIONS=y`
		`CONFIG_SECURITY_DMESG_RESTRICT=y`
		`CONFIG_SECURITY=y`
		`@@ -10353,14 +10574,24 @@`
		`# CONFIG_LOCK_DOWN_KERNEL_FORCE_INTEGRITY is not set`
		`# CONFIG_LOCK_DOWN_KERNEL_FORCE_CONFIDENTIALITY is not set`
		`CONFIG_SECURITY_LANDLOCK=y`
		`- # CONFIG_INTEGRITY is not set`
		`+ CONFIG_INTEGRITY=y`
		`+ CONFIG_INTEGRITY_SIGNATURE=y`
		`+ CONFIG_INTEGRITY_ASYMMETRIC_KEYS=y`
		`+ CONFIG_INTEGRITY_TRUSTED_KEYRING=y`
		`+ CONFIG_INTEGRITY_PLATFORM_KEYRING=y`
		`+ CONFIG_INTEGRITY_MACHINE_KEYRING=y`
		`+ CONFIG_LOAD_UEFI_KEYS=y`
		`+ CONFIG_INTEGRITY_AUDIT=y`
		`+ # CONFIG_IMA is not set`
		`+ # CONFIG_IMA_KEYRINGS_PERMIT_SIGNED_BY_BUILTIN_OR_SECONDARY is not set`
		`# CONFIG_IMA_SECURE_AND_OR_TRUSTED_BOOT is not set`
		`+ # CONFIG_EVM is not set`
		`# CONFIG_DEFAULT_SECURITY_SELINUX is not set`
		`# CONFIG_DEFAULT_SECURITY_SMACK is not set`
		`# CONFIG_DEFAULT_SECURITY_TOMOYO is not set`
		`# CONFIG_DEFAULT_SECURITY_APPARMOR is not set`
		`CONFIG_DEFAULT_SECURITY_DAC=y`
		`- CONFIG_LSM="landlock,lockdown,yama,bpf"`
		`+ CONFIG_LSM="landlock,lockdown,yama,integrity,bpf"`

		`#`
		`# Kernel hardening options`
		`@@ -10371,9 +10602,9 @@`
		`#`
		`CONFIG_CC_HAS_AUTO_VAR_INIT_PATTERN=y`
		`CONFIG_CC_HAS_AUTO_VAR_INIT_ZERO=y`
		`- # CONFIG_INIT_STACK_NONE is not set`
		`+ CONFIG_INIT_STACK_NONE=y`
		`# CONFIG_INIT_STACK_ALL_PATTERN is not set`
		`- CONFIG_INIT_STACK_ALL_ZERO=y`
		`+ # CONFIG_INIT_STACK_ALL_ZERO is not set`
		`# CONFIG_GCC_PLUGIN_STACKLEAK is not set`
		`CONFIG_INIT_ON_ALLOC_DEFAULT_ON=y`
		`# CONFIG_INIT_ON_FREE_DEFAULT_ON is not set`
		`@@ -10429,6 +10660,7 @@`
		`#`
		`CONFIG_CRYPTO_RSA=y`
		`CONFIG_CRYPTO_DH=y`
		`+ CONFIG_CRYPTO_DH_RFC7919_GROUPS=y`
		`CONFIG_CRYPTO_ECC=y`
		`CONFIG_CRYPTO_ECDH=m`
		`CONFIG_CRYPTO_ECDSA=y`
		`@@ -10482,6 +10714,7 @@`
		`CONFIG_CRYPTO_BLAKE2B=m`
		`CONFIG_CRYPTO_BLAKE2S=m`
		`CONFIG_CRYPTO_CRCT10DIF=y`
		`+ CONFIG_CRYPTO_CRC64_ROCKSOFT=y`
		`CONFIG_CRYPTO_GHASH=m`
		`CONFIG_CRYPTO_POLY1305=m`
		`CONFIG_CRYPTO_MD4=m`
		`@@ -10579,10 +10812,8 @@`
		`CONFIG_CRYPTO_DEV_AMLOGIC_GXL_DEBUG=y`
		`CONFIG_ASYMMETRIC_KEY_TYPE=y`
		`CONFIG_ASYMMETRIC_PUBLIC_KEY_SUBTYPE=y`
		`- CONFIG_ASYMMETRIC_TPM_KEY_SUBTYPE=m`
		`CONFIG_X509_CERTIFICATE_PARSER=y`
		`CONFIG_PKCS8_PRIVATE_KEY_PARSER=m`
		`- CONFIG_TPM_KEY_PARSER=m`
		`CONFIG_PKCS7_MESSAGE_PARSER=y`
		`# CONFIG_PKCS7_TEST_KEY is not set`
		`CONFIG_SIGNED_PE_FILE_VERIFICATION=y`
		`@@ -10640,12 +10871,15 @@`
		`CONFIG_CRYPTO_LIB_POLY1305=m`
		`CONFIG_CRYPTO_LIB_CHACHA20POLY1305=m`
		`CONFIG_CRYPTO_LIB_SHA256=y`
		`+ CONFIG_CRYPTO_LIB_SM3=m`
		`CONFIG_CRYPTO_LIB_SM4=m`
		`# end of Crypto library routines`

		`+ CONFIG_LIB_MEMNEQ=y`
		`CONFIG_CRC_CCITT=y`
		`CONFIG_CRC16=m`
		`CONFIG_CRC_T10DIF=y`
		`+ CONFIG_CRC64_ROCKSOFT=y`
		`CONFIG_CRC_ITU_T=m`
		`CONFIG_CRC32=y`
		`# CONFIG_CRC32_SELFTEST is not set`
		`@@ -10653,7 +10887,7 @@`
		`# CONFIG_CRC32_SLICEBY4 is not set`
		`# CONFIG_CRC32_SARWATE is not set`
		`# CONFIG_CRC32_BIT is not set`
		`- CONFIG_CRC64=m`
		`+ CONFIG_CRC64=y`
		`CONFIG_CRC4=m`
		`CONFIG_CRC7=m`
		`CONFIG_LIBCRC32C=m`
		`@@ -10734,6 +10968,7 @@`
		`CONFIG_CLZ_TAB=y`
		`CONFIG_IRQ_POLL=y`
		`CONFIG_MPILIB=y`
		`+ CONFIG_SIGNATURE=y`
		`CONFIG_DIMLIB=y`
		`CONFIG_OID_REGISTRY=y`
		`CONFIG_UCS2_STRING=y`
		`@@ -10786,18 +11021,24 @@`
		`CONFIG_DEBUG_BUGVERBOSE=y`
		`# end of printk and dmesg options`

		`+ CONFIG_DEBUG_KERNEL=y`
		`+ # CONFIG_DEBUG_MISC is not set`
		`+`
		`#`
		`# Compile-time checks and compiler options`
		`#`
		`CONFIG_DEBUG_INFO=y`
		`+ # CONFIG_DEBUG_INFO_NONE is not set`
		`+ # CONFIG_DEBUG_INFO_DWARF_TOOLCHAIN_DEFAULT is not set`
		`+ # CONFIG_DEBUG_INFO_DWARF4 is not set`
		`+ CONFIG_DEBUG_INFO_DWARF5=y`
		`# CONFIG_DEBUG_INFO_REDUCED is not set`
		`# CONFIG_DEBUG_INFO_COMPRESSED is not set`
		`# CONFIG_DEBUG_INFO_SPLIT is not set`
		`- # CONFIG_DEBUG_INFO_DWARF_TOOLCHAIN_DEFAULT is not set`
		`- CONFIG_DEBUG_INFO_DWARF4=y`
		`CONFIG_DEBUG_INFO_BTF=y`
		`CONFIG_PAHOLE_HAS_SPLIT_BTF=y`
		`CONFIG_DEBUG_INFO_BTF_MODULES=y`
		`+ # CONFIG_MODULE_ALLOW_BTF_MISMATCH is not set`
		`# CONFIG_GDB_SCRIPTS is not set`
		`CONFIG_FRAME_WARN=1024`
		`CONFIG_STRIP_ASM_SYMS=y`
		`@@ -10827,9 +11068,6 @@`
		`CONFIG_HAVE_KCSAN_COMPILER=y`
		`# end of Generic Kernel Debugging Instruments`

		`- CONFIG_DEBUG_KERNEL=y`
		`- # CONFIG_DEBUG_MISC is not set`
		`-`
		`#`
		`# Networking Debugging`
		`#`
		`@@ -10877,6 +11115,7 @@`
		`CONFIG_KFENCE=y`
		`CONFIG_KFENCE_SAMPLE_INTERVAL=100`
		`CONFIG_KFENCE_NUM_OBJECTS=255`
		`+ CONFIG_KFENCE_DEFERRABLE=y`
		`CONFIG_KFENCE_STRESS_TEST_FAULTS=0`
		`# end of Memory Debugging`

		`@@ -10967,6 +11206,8 @@`
		`CONFIG_LATENCYTOP=y`
		`CONFIG_USER_STACKTRACE_SUPPORT=y`
		`CONFIG_NOP_TRACER=y`
		`+ CONFIG_HAVE_RETHOOK=y`
		`+ CONFIG_RETHOOK=y`
		`CONFIG_HAVE_FUNCTION_TRACER=y`
		`CONFIG_HAVE_FUNCTION_GRAPH_TRACER=y`
		`CONFIG_HAVE_DYNAMIC_FTRACE=y`
		`@@ -10993,6 +11234,7 @@`
		`CONFIG_DYNAMIC_FTRACE=y`
		`CONFIG_DYNAMIC_FTRACE_WITH_REGS=y`
		`CONFIG_DYNAMIC_FTRACE_WITH_DIRECT_CALLS=y`
		`+ CONFIG_FPROBE=y`
		`CONFIG_FUNCTION_PROFILER=y`
		`CONFIG_STACK_TRACER=y`
		`# CONFIG_IRQSOFF_TRACER is not set`
		`@@ -11096,7 +11338,6 @@`
		`# CONFIG_TEST_BITMAP is not set`
		`# CONFIG_TEST_UUID is not set`
		`# CONFIG_TEST_XARRAY is not set`
		`- # CONFIG_TEST_OVERFLOW is not set`
		`# CONFIG_TEST_RHASHTABLE is not set`
		`# CONFIG_TEST_SIPHASH is not set`
		`# CONFIG_TEST_IDA is not set`
		`@@ -11115,7 +11356,6 @@`
		`# CONFIG_TEST_KMOD is not set`
		`# CONFIG_TEST_MEMCAT_P is not set`
		`# CONFIG_TEST_OBJAGG is not set`
		`- # CONFIG_TEST_STACKINIT is not set`
		`# CONFIG_TEST_MEMINIT is not set`
		`# CONFIG_TEST_FREE_PAGES is not set`
		`# CONFIG_TEST_FPU is not set`

libre/linux-libre-pck/config.x86_64

file modified

+535 -336

		`@@ -1,6 +1,6 @@`
		`#`
		`# Automatically generated file; DO NOT EDIT.`
		`- # Linux/x86 5.17.8-gnu-pck1 Kernel Configuration`
		`+ # Linux/x86 5.18.14-gnu-pck1 Kernel Configuration`
		`#`
		`CONFIG_CC_VERSION_TEXT="gcc (GCC) 12.1.0"`
		`CONFIG_CC_IS_GCC=y`
		`@@ -15,8 +15,10 @@`
		`CONFIG_CC_CAN_LINK_STATIC=y`
		`CONFIG_CC_HAS_ASM_GOTO=y`
		`CONFIG_CC_HAS_ASM_GOTO_OUTPUT=y`
		`+ CONFIG_CC_HAS_ASM_GOTO_TIED_OUTPUT=y`
		`CONFIG_CC_HAS_ASM_INLINE=y`
		`CONFIG_CC_HAS_NO_PROFILE_FN_ATTR=y`
		`+ CONFIG_PAHOLE_VERSION=123`
		`CONFIG_IRQ_WORK=y`
		`CONFIG_BUILDTIME_TABLE_SORT=y`
		`CONFIG_THREAD_INFO_IN_TASK=y`
		`@@ -104,6 +106,7 @@`
		`# CONFIG_NO_HZ_FULL is not set`
		`CONFIG_NO_HZ=y`
		`CONFIG_HIGH_RES_TIMERS=y`
		`+ CONFIG_CLOCKSOURCE_WATCHDOG_MAX_SKEW_US=100`
		`# end of Timers subsystem`

		`CONFIG_BPF=y`
		`@@ -196,6 +199,8 @@`
		`CONFIG_ARCH_WANT_BATCHED_UNMAP_TLB_FLUSH=y`
		`CONFIG_CC_HAS_INT128=y`
		`CONFIG_CC_IMPLICIT_FALLTHROUGH="-Wimplicit-fallthrough=5"`
		`+ CONFIG_GCC12_NO_ARRAY_BOUNDS=y`
		`+ CONFIG_CC_NO_ARRAY_BOUNDS=y`
		`CONFIG_ARCH_SUPPORTS_INT128=y`
		`CONFIG_NUMA_BALANCING=y`
		`CONFIG_NUMA_BALANCING_DEFAULT_ENABLED=y`
		`@@ -331,11 +336,9 @@`
		`CONFIG_ARCH_MAY_HAVE_PC_FDC=y`
		`CONFIG_GENERIC_CALIBRATE_DELAY=y`
		`CONFIG_ARCH_HAS_CPU_RELAX=y`
		`- CONFIG_ARCH_HAS_FILTER_PGPROT=y`
		`CONFIG_ARCH_HIBERNATION_POSSIBLE=y`
		`CONFIG_ARCH_NR_GPIO=1024`
		`CONFIG_ARCH_SUSPEND_POSSIBLE=y`
		`- CONFIG_ARCH_WANT_GENERAL_HUGETLB=y`
		`CONFIG_AUDIT_ARCH=y`
		`CONFIG_HAVE_INTEL_TXT=y`
		`CONFIG_X86_64_SMP=y`
		`@@ -353,9 +356,6 @@`
		`CONFIG_X86_X2APIC=y`
		`CONFIG_X86_MPPARSE=y`
		`# CONFIG_GOLDFISH is not set`
		`- CONFIG_RETPOLINE=y`
		`- CONFIG_CC_HAS_SLS=y`
		`- CONFIG_SLS=y`
		`CONFIG_X86_CPU_RESCTRL=y`
		`# CONFIG_X86_EXTENDED_PLATFORM is not set`
		`CONFIG_X86_INTEL_LPSS=y`
		`@@ -481,7 +481,6 @@`
		`CONFIG_X86_ESPFIX64=y`
		`CONFIG_X86_VSYSCALL_EMULATION=y`
		`CONFIG_X86_IOPL_IOPERM=y`
		`- CONFIG_I8K=m`
		`CONFIG_MICROCODE=y`
		`# CONFIG_MICROCODE_INTEL is not set`
		`# CONFIG_MICROCODE_AMD is not set`
		`@@ -501,7 +500,6 @@`
		`CONFIG_NODES_SHIFT=5`
		`CONFIG_ARCH_SPARSEMEM_ENABLE=y`
		`CONFIG_ARCH_SPARSEMEM_DEFAULT=y`
		`- CONFIG_ARCH_SELECT_MEMORY_MODEL=y`
		`# CONFIG_ARCH_MEMORY_PROBE is not set`
		`CONFIG_ARCH_PROC_KCORE_TEXT=y`
		`CONFIG_ILLEGAL_POINTER_VALUE=0xdead000000000000`
		`@@ -518,6 +516,8 @@`
		`CONFIG_ARCH_RANDOM=y`
		`CONFIG_X86_SMAP=y`
		`CONFIG_X86_UMIP=y`
		`+ CONFIG_CC_HAS_IBT=y`
		`+ CONFIG_X86_KERNEL_IBT=y`
		`CONFIG_X86_INTEL_MEMORY_PROTECTION_KEYS=y`
		`# CONFIG_X86_INTEL_TSX_MODE_OFF is not set`
		`# CONFIG_X86_INTEL_TSX_MODE_ON is not set`
		`@@ -535,7 +535,9 @@`
		`CONFIG_KEXEC=y`
		`CONFIG_KEXEC_FILE=y`
		`CONFIG_ARCH_HAS_KEXEC_PURGATORY=y`
		`- # CONFIG_KEXEC_SIG is not set`
		`+ CONFIG_KEXEC_SIG=y`
		`+ # CONFIG_KEXEC_SIG_FORCE is not set`
		`+ CONFIG_KEXEC_BZIMAGE_VERIFY_SIG=y`
		`CONFIG_CRASH_DUMP=y`
		`CONFIG_KEXEC_JUMP=y`
		`CONFIG_PHYSICAL_START=0x1000000`
		`@@ -560,6 +562,16 @@`
		`# CONFIG_LIVEPATCH is not set`
		`# end of Processor type and features`

		`+ CONFIG_CC_HAS_SLS=y`
		`+ CONFIG_CC_HAS_RETURN_THUNK=y`
		`+ CONFIG_SPECULATION_MITIGATIONS=y`
		`+ CONFIG_PAGE_TABLE_ISOLATION=y`
		`+ CONFIG_RETPOLINE=y`
		`+ CONFIG_RETHUNK=y`
		`+ CONFIG_CPU_UNRET_ENTRY=y`
		`+ CONFIG_CPU_IBPB_ENTRY=y`
		`+ CONFIG_CPU_IBRS_ENTRY=y`
		`+ CONFIG_SLS=y`
		`CONFIG_ARCH_HAS_ADD_PAGES=y`
		`CONFIG_ARCH_MHP_MEMMAP_ON_MEMORY_ENABLE=y`

		`@@ -729,7 +741,7 @@`
		`# Binary Emulations`
		`#`
		`CONFIG_IA32_EMULATION=y`
		`- # CONFIG_X86_X32 is not set`
		`+ # CONFIG_X86_X32_ABI is not set`
		`CONFIG_COMPAT_32=y`
		`CONFIG_COMPAT=y`
		`CONFIG_COMPAT_FOR_U64_ALIGNMENT=y`
		`@@ -761,7 +773,6 @@`
		`CONFIG_KVM_AMD=m`
		`CONFIG_KVM_AMD_SEV=y`
		`CONFIG_KVM_XEN=y`
		`- CONFIG_KVM_MMU_AUDIT=y`
		`CONFIG_KVM_EXTERNAL_WRITE_TRACKING=y`
		`CONFIG_AS_AVX512=y`
		`CONFIG_AS_SHA1_NI=y`
		`@@ -785,6 +796,7 @@`
		`CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y`
		`CONFIG_ARCH_USE_BUILTIN_BSWAP=y`
		`CONFIG_KRETPROBES=y`
		`+ CONFIG_KRETPROBE_ON_RETHOOK=y`
		`CONFIG_USER_RETURN_NOTIFIER=y`
		`CONFIG_HAVE_IOREMAP_PROT=y`
		`CONFIG_HAVE_KPROBES=y`
		`@@ -847,6 +859,7 @@`
		`CONFIG_HAVE_ARCH_TRANSPARENT_HUGEPAGE=y`
		`CONFIG_HAVE_ARCH_TRANSPARENT_HUGEPAGE_PUD=y`
		`CONFIG_HAVE_ARCH_HUGE_VMAP=y`
		`+ CONFIG_HAVE_ARCH_HUGE_VMALLOC=y`
		`CONFIG_ARCH_WANT_HUGE_PMD_SHARE=y`
		`CONFIG_HAVE_ARCH_SOFT_DIRTY=y`
		`CONFIG_HAVE_MOD_ARCH_SPECIFIC=y`
		`@@ -871,6 +884,7 @@`
		`CONFIG_HAVE_ARCH_VMAP_STACK=y`
		`CONFIG_VMAP_STACK=y`
		`CONFIG_HAVE_ARCH_RANDOMIZE_KSTACK_OFFSET=y`
		`+ CONFIG_RANDOMIZE_KSTACK_OFFSET=y`
		`CONFIG_RANDOMIZE_KSTACK_OFFSET_DEFAULT=y`
		`CONFIG_ARCH_HAS_STRICT_KERNEL_RWX=y`
		`CONFIG_STRICT_KERNEL_RWX=y`
		`@@ -884,6 +898,7 @@`
		`CONFIG_HAVE_STATIC_CALL=y`
		`CONFIG_HAVE_STATIC_CALL_INLINE=y`
		`CONFIG_HAVE_PREEMPT_DYNAMIC=y`
		`+ CONFIG_HAVE_PREEMPT_DYNAMIC_CALL=y`
		`CONFIG_ARCH_WANT_LD_ORPHAN_WARN=y`
		`CONFIG_ARCH_SUPPORTS_DEBUG_PAGEALLOC=y`
		`CONFIG_ARCH_SUPPORTS_PAGE_TABLE_CHECK=y`
		`@@ -932,6 +947,7 @@`
		`CONFIG_MODPROBE_PATH="/sbin/modprobe"`
		`CONFIG_MODULES_TREE_LOOKUP=y`
		`CONFIG_BLOCK=y`
		`+ CONFIG_BLOCK_LEGACY_AUTOLOAD=y`
		`CONFIG_BLK_RQ_ALLOC_TIME=y`
		`CONFIG_BLK_CGROUP_RWSTAT=y`
		`CONFIG_BLK_DEV_BSG_COMMON=y`
		`@@ -986,12 +1002,12 @@`
		`CONFIG_BLK_MQ_RDMA=y`
		`CONFIG_BLK_PM=y`
		`CONFIG_BLOCK_HOLDER_DEPRECATED=y`
		`+ CONFIG_BLK_MQ_STACKING=y`

		`#`
		`# IO Schedulers`
		`#`
		`CONFIG_MQ_IOSCHED_DEADLINE=y`
		`- # CONFIG_MQ_IOSCHED_DEADLINE_NODEFAULT is not set`
		`CONFIG_MQ_IOSCHED_KYBER=y`
		`CONFIG_IOSCHED_BFQ=y`
		`CONFIG_BFQ_GROUP_IOSCHED=y`
		`@@ -1030,8 +1046,6 @@`
		`#`
		`# Memory Management options`
		`#`
		`- CONFIG_SELECT_MEMORY_MODEL=y`
		`- CONFIG_SPARSEMEM_MANUAL=y`
		`CONFIG_SPARSEMEM=y`
		`CONFIG_SPARSEMEM_EXTREME=y`
		`CONFIG_SPARSEMEM_VMEMMAP_ENABLE=y`
		`@@ -1054,6 +1068,7 @@`
		`CONFIG_COMPACTION=y`
		`CONFIG_PAGE_REPORTING=y`
		`CONFIG_MIGRATION=y`
		`+ CONFIG_DEVICE_MIGRATION=y`
		`CONFIG_ARCH_ENABLE_HUGEPAGE_MIGRATION=y`
		`CONFIG_ARCH_ENABLE_THP_MIGRATION=y`
		`CONFIG_CONTIG_ALLOC=y`
		`@@ -1070,6 +1085,7 @@`
		`CONFIG_TRANSPARENT_HUGEPAGE=y`
		`CONFIG_TRANSPARENT_HUGEPAGE_ALWAYS=y`
		`# CONFIG_TRANSPARENT_HUGEPAGE_MADVISE is not set`
		`+ CONFIG_ARCH_WANT_GENERAL_HUGETLB=y`
		`CONFIG_ARCH_WANTS_THP_SWAP=y`
		`CONFIG_THP_SWAP=y`
		`CONFIG_NEED_PER_CPU_EMBED_FIRST_CHUNK=y`
		`@@ -1106,11 +1122,12 @@`
		`CONFIG_PAGE_IDLE_FLAG=y`
		`CONFIG_IDLE_PAGE_TRACKING=y`
		`CONFIG_ARCH_HAS_CACHE_LINE_SIZE=y`
		`+ CONFIG_ARCH_HAS_CURRENT_STACK_POINTER=y`
		`+ CONFIG_ARCH_HAS_FILTER_PGPROT=y`
		`CONFIG_ARCH_HAS_PTE_DEVMAP=y`
		`CONFIG_ZONE_DMA=y`
		`CONFIG_ZONE_DMA32=y`
		`CONFIG_ZONE_DEVICE=y`
		`- CONFIG_DEV_PAGEMAP_OPS=y`
		`CONFIG_HMM_MIRROR=y`
		`CONFIG_DEVICE_PRIVATE=y`
		`CONFIG_VMAP_PFN=y`
		`@@ -1133,6 +1150,7 @@`
		`CONFIG_DAMON=y`
		`CONFIG_DAMON_VADDR=y`
		`CONFIG_DAMON_PADDR=y`
		`+ CONFIG_DAMON_SYSFS=y`
		`CONFIG_DAMON_DBGFS=y`
		`CONFIG_DAMON_RECLAIM=y`
		`# end of Data Access Monitoring`
		`@@ -2039,6 +2057,7 @@`
		`CONFIG_AF_KCM=m`
		`CONFIG_STREAM_PARSER=y`
		`CONFIG_MCTP=y`
		`+ CONFIG_MCTP_FLOWS=y`
		`CONFIG_FIB_RULES=y`
		`CONFIG_WIRELESS=y`
		`CONFIG_WIRELESS_EXT=y`
		`@@ -2143,6 +2162,7 @@`
		`CONFIG_NET_SOCK_MSG=y`
		`CONFIG_NET_DEVLINK=y`
		`CONFIG_PAGE_POOL=y`
		`+ # CONFIG_PAGE_POOL_STATS is not set`
		`CONFIG_FAILOVER=m`
		`CONFIG_ETHTOOL_NETLINK=y`

		`@@ -2184,6 +2204,8 @@`
		`CONFIG_PCI_P2PDMA=y`
		`CONFIG_PCI_LABEL=y`
		`CONFIG_PCI_HYPERV=m`
		`+ CONFIG_VGA_ARB=y`
		`+ CONFIG_VGA_ARB_MAX_GPUS=10`
		`CONFIG_HOTPLUG_PCI=y`
		`CONFIG_HOTPLUG_PCI_ACPI=y`
		`CONFIG_HOTPLUG_PCI_ACPI_IBM=m`
		`@@ -2232,10 +2254,12 @@`
		`# end of PCI switch controller drivers`

		`CONFIG_CXL_BUS=m`
		`- CONFIG_CXL_MEM=m`
		`+ CONFIG_CXL_PCI=m`
		`# CONFIG_CXL_MEM_RAW_COMMANDS is not set`
		`CONFIG_CXL_ACPI=m`
		`CONFIG_CXL_PMEM=m`
		`+ CONFIG_CXL_MEM=m`
		`+ CONFIG_CXL_PORT=m`
		`CONFIG_PCCARD=m`
		`CONFIG_PCMCIA=m`
		`CONFIG_PCMCIA_LOAD_CIS=y`
		`@@ -2371,6 +2395,7 @@`
		`CONFIG_EFI_DEV_PATH_PARSER=y`
		`CONFIG_EFI_EARLYCON=y`
		`CONFIG_EFI_CUSTOM_SSDT_OVERLAYS=y`
		`+ # CONFIG_EFI_DISABLE_RUNTIME is not set`

		`#`
		`# Tegra firmware driver`
		`@@ -2493,6 +2518,7 @@`
		`CONFIG_MTD_NAND_ECC_SW_HAMMING=y`
		`CONFIG_MTD_NAND_ECC_SW_HAMMING_SMC=y`
		`CONFIG_MTD_NAND_ECC_SW_BCH=y`
		`+ CONFIG_MTD_NAND_ECC_MXIC=y`
		`# end of ECC engine support`
		`# end of NAND`

		`@@ -2507,9 +2533,6 @@`
		`# CONFIG_MTD_SPI_NOR_SWP_DISABLE is not set`
		`CONFIG_MTD_SPI_NOR_SWP_DISABLE_ON_VOLATILE=y`
		`# CONFIG_MTD_SPI_NOR_SWP_KEEP is not set`
		`- CONFIG_SPI_INTEL_SPI=m`
		`- CONFIG_SPI_INTEL_SPI_PCI=m`
		`- CONFIG_SPI_INTEL_SPI_PLATFORM=m`
		`CONFIG_MTD_UBI=m`
		`CONFIG_MTD_UBI_WL_THRESHOLD=4096`
		`CONFIG_MTD_UBI_BEB_LIMIT=20`
		`@@ -2579,6 +2602,7 @@`
		`CONFIG_NVME_CORE=m`
		`CONFIG_BLK_DEV_NVME=m`
		`CONFIG_NVME_MULTIPATH=y`
		`+ CONFIG_NVME_VERBOSE_ERRORS=y`
		`CONFIG_NVME_HWMON=y`
		`CONFIG_NVME_FABRICS=m`
		`CONFIG_NVME_RDMA=m`
		`@@ -3125,6 +3149,10 @@`
		`CONFIG_NET_DSA_XRS700X_MDIO=m`
		`CONFIG_NET_DSA_QCA8K=m`
		`CONFIG_NET_DSA_REALTEK=m`
		`+ # CONFIG_NET_DSA_REALTEK_MDIO is not set`
		`+ # CONFIG_NET_DSA_REALTEK_SMI is not set`
		`+ CONFIG_NET_DSA_REALTEK_RTL8365MB=m`
		`+ CONFIG_NET_DSA_REALTEK_RTL8366RB=m`
		`CONFIG_NET_DSA_SMSC_LAN9303=m`
		`CONFIG_NET_DSA_SMSC_LAN9303_I2C=m`
		`CONFIG_NET_DSA_SMSC_LAN9303_MDIO=m`
		`@@ -3217,6 +3245,8 @@`
		`CONFIG_NET_VENDOR_CISCO=y`
		`CONFIG_ENIC=m`
		`CONFIG_NET_VENDOR_CORTINA=y`
		`+ CONFIG_NET_VENDOR_DAVICOM=y`
		`+ CONFIG_DM9051=m`
		`CONFIG_DNET=m`
		`CONFIG_NET_VENDOR_DEC=y`
		`CONFIG_NET_TULIP=y`
		`@@ -3249,6 +3279,9 @@`
		`CONFIG_NET_VENDOR_EZCHIP=y`
		`CONFIG_NET_VENDOR_FUJITSU=y`
		`CONFIG_PCMCIA_FMVJ18X=m`
		`+ CONFIG_NET_VENDOR_FUNGIBLE=y`
		`+ CONFIG_FUN_CORE=m`
		`+ CONFIG_FUN_ETH=m`
		`CONFIG_NET_VENDOR_GOOGLE=y`
		`CONFIG_GVE=m`
		`CONFIG_NET_VENDOR_HUAWEI=y`
		`@@ -3536,6 +3569,7 @@`
		`# MCTP Device Drivers`
		`#`
		`CONFIG_MCTP_SERIAL=m`
		`+ CONFIG_MCTP_TRANSPORT_I2C=m`
		`# end of MCTP Device Drivers`

		`CONFIG_MDIO_DEVICE=m`
		`@@ -3840,6 +3874,7 @@`
		`CONFIG_MT7921_COMMON=m`
		`CONFIG_MT7921E=m`
		`CONFIG_MT7921S=m`
		`+ CONFIG_MT7921U=m`
		`CONFIG_WLAN_VENDOR_MICROCHIP=y`
		`CONFIG_WILC1000=m`
		`CONFIG_WILC1000_SDIO=m`
		`@@ -3901,19 +3936,25 @@`
		`CONFIG_RTW88=m`
		`CONFIG_RTW88_CORE=m`
		`CONFIG_RTW88_PCI=m`
		`+ CONFIG_RTW88_USB=m`
		`CONFIG_RTW88_8822B=m`
		`CONFIG_RTW88_8822C=m`
		`CONFIG_RTW88_8723D=m`
		`CONFIG_RTW88_8821C=m`
		`CONFIG_RTW88_8822BE=m`
		`+ CONFIG_RTW88_8822BU=m`
		`CONFIG_RTW88_8822CE=m`
		`+ CONFIG_RTW88_8822CU=m`
		`CONFIG_RTW88_8723DE=m`
		`+ CONFIG_RTW88_8723DU=m`
		`CONFIG_RTW88_8821CE=m`
		`+ CONFIG_RTW88_8821CU=m`
		`CONFIG_RTW88_DEBUG=y`
		`CONFIG_RTW88_DEBUGFS=y`
		`CONFIG_RTW89=m`
		`CONFIG_RTW89_CORE=m`
		`CONFIG_RTW89_PCI=m`
		`+ CONFIG_RTW89_8852A=m`
		`CONFIG_RTW89_8852AE=m`
		`CONFIG_RTW89_DEBUG=y`
		`CONFIG_RTW89_DEBUGMSG=y`
		`@@ -3957,13 +3998,11 @@`
		`CONFIG_IEEE802154_MRF24J40=m`
		`CONFIG_IEEE802154_CC2520=m`
		`CONFIG_IEEE802154_ATUSB=m`
		`- # CONFIG_IEEE802154_WPANUSB is not set`
		`CONFIG_IEEE802154_ADF7242=m`
		`CONFIG_IEEE802154_CA8210=m`
		`# CONFIG_IEEE802154_CA8210_DEBUGFS is not set`
		`CONFIG_IEEE802154_MCR20A=m`
		`CONFIG_IEEE802154_HWSIM=m`
		`- # CONFIG_IEEE802154_BCFSERIAL is not set`

		`#`
		`# Wireless WAN`
		`@@ -4016,6 +4055,7 @@`
		`CONFIG_INPUT_FF_MEMLESS=m`
		`CONFIG_INPUT_SPARSEKMAP=m`
		`CONFIG_INPUT_MATRIXKMAP=m`
		`+ CONFIG_INPUT_VIVALDIFMAP=m`

		`#`
		`# Userland interfaces`
		`@@ -4185,6 +4225,7 @@`
		`CONFIG_TOUCHSCREEN_MELFAS_MIP4=m`
		`CONFIG_TOUCHSCREEN_MSG2638=m`
		`CONFIG_TOUCHSCREEN_MTOUCH=m`
		`+ CONFIG_TOUCHSCREEN_IMAGIS=m`
		`CONFIG_TOUCHSCREEN_INEXIO=m`
		`CONFIG_TOUCHSCREEN_MK712=m`
		`CONFIG_TOUCHSCREEN_PENMOUNT=m`
		`@@ -4403,7 +4444,6 @@`
		`CONFIG_SERIAL_SC16IS7XX=m`
		`CONFIG_SERIAL_SC16IS7XX_I2C=y`
		`CONFIG_SERIAL_SC16IS7XX_SPI=y`
		`- # CONFIG_SERIAL_BCM63XX is not set`
		`CONFIG_SERIAL_ALTERA_JTAGUART=m`
		`CONFIG_SERIAL_ALTERA_UART=m`
		`CONFIG_SERIAL_ALTERA_UART_MAXPORTS=4`
		`@@ -4537,6 +4577,7 @@`
		`#`
		`# PC SMBus host controller drivers`
		`#`
		`+ CONFIG_I2C_CCGX_UCSI=y`
		`CONFIG_I2C_ALI1535=m`
		`CONFIG_I2C_ALI1563=m`
		`CONFIG_I2C_ALI15X3=m`
		`@@ -4571,6 +4612,7 @@`
		`CONFIG_I2C_DESIGNWARE_CORE=y`
		`CONFIG_I2C_DESIGNWARE_SLAVE=y`
		`CONFIG_I2C_DESIGNWARE_PLATFORM=y`
		`+ CONFIG_I2C_DESIGNWARE_AMDPSP=y`
		`CONFIG_I2C_DESIGNWARE_BAYTRAIL=y`
		`CONFIG_I2C_DESIGNWARE_PCI=y`
		`CONFIG_I2C_EMEV2=m`
		`@@ -4634,6 +4676,9 @@`
		`CONFIG_SPI_DLN2=m`
		`CONFIG_SPI_NXP_FLEXSPI=m`
		`CONFIG_SPI_GPIO=m`
		`+ CONFIG_SPI_INTEL=m`
		`+ CONFIG_SPI_INTEL_PCI=m`
		`+ CONFIG_SPI_INTEL_PLATFORM=m`
		`CONFIG_SPI_LM70_LLP=m`
		`# CONFIG_SPI_LANTIQ_SSC is not set`
		`CONFIG_SPI_OC_TINY=m`
		`@@ -4810,7 +4855,7 @@`
		`CONFIG_GPIO_TPS6586X=y`
		`CONFIG_GPIO_TPS65910=y`
		`CONFIG_GPIO_TPS65912=m`
		`- CONFIG_GPIO_TPS68470=y`
		`+ CONFIG_GPIO_TPS68470=m`
		`CONFIG_GPIO_TQMX86=m`
		`CONFIG_GPIO_TWL4030=m`
		`CONFIG_GPIO_TWL6040=m`
		`@@ -4904,6 +4949,7 @@`
		`CONFIG_POWER_SUPPLY_HWMON=y`
		`CONFIG_PDA_POWER=m`
		`CONFIG_GENERIC_ADC_BATTERY=m`
		`+ CONFIG_IP5XXX_POWER=m`
		`CONFIG_MAX8925_POWER=m`
		`CONFIG_WM831X_BACKUP=m`
		`CONFIG_WM831X_POWER=m`
		`@@ -4916,6 +4962,7 @@`
		`CONFIG_BATTERY_DS2780=m`
		`CONFIG_BATTERY_DS2781=m`
		`CONFIG_BATTERY_DS2782=m`
		`+ # CONFIG_BATTERY_SAMSUNG_SDI is not set`
		`CONFIG_BATTERY_SBS=m`
		`CONFIG_CHARGER_SBS=m`
		`CONFIG_MANAGER_SBS=m`
		`@@ -4975,6 +5022,7 @@`
		`CONFIG_CHARGER_WILCO=m`
		`CONFIG_BATTERY_SURFACE=m`
		`CONFIG_CHARGER_SURFACE=m`
		`+ CONFIG_BATTERY_UG3105=m`
		`CONFIG_HWMON=y`
		`CONFIG_HWMON_VID=m`
		`# CONFIG_HWMON_DEBUG_CHIP is not set`
		`@@ -5019,6 +5067,7 @@`
		`CONFIG_SENSORS_DS620=m`
		`CONFIG_SENSORS_DS1621=m`
		`CONFIG_SENSORS_DELL_SMM=m`
		`+ # CONFIG_I8K is not set`
		`CONFIG_SENSORS_DA9052_ADC=m`
		`CONFIG_SENSORS_DA9055=m`
		`CONFIG_SENSORS_I5K_AMB=m`
		`@@ -5121,6 +5170,7 @@`
		`CONFIG_SENSORS_IRPS5401=m`
		`CONFIG_SENSORS_ISL68137=m`
		`CONFIG_SENSORS_LM25066=m`
		`+ CONFIG_SENSORS_LM25066_REGULATOR=y`
		`CONFIG_SENSORS_LTC2978=m`
		`# CONFIG_SENSORS_LTC2978_REGULATOR is not set`
		`CONFIG_SENSORS_LTC3815=m`
		`@@ -5136,6 +5186,8 @@`
		`CONFIG_SENSORS_MP2975=m`
		`CONFIG_SENSORS_MP5023=m`
		`CONFIG_SENSORS_PIM4328=m`
		`+ CONFIG_SENSORS_PLI1209BC=m`
		`+ CONFIG_SENSORS_PLI1209BC_REGULATOR=y`
		`CONFIG_SENSORS_PM6764TR=m`
		`CONFIG_SENSORS_PXE1610=m`
		`CONFIG_SENSORS_Q54SJ108A2=m`
		`@@ -5145,6 +5197,7 @@`
		`CONFIG_SENSORS_UCD9000=m`
		`CONFIG_SENSORS_UCD9200=m`
		`CONFIG_SENSORS_XDPE122=m`
		`+ CONFIG_SENSORS_XDPE122_REGULATOR=y`
		`CONFIG_SENSORS_ZL6100=m`
		`CONFIG_SENSORS_SBTSI=m`
		`CONFIG_SENSORS_SBRMI=m`
		`@@ -5154,6 +5207,7 @@`
		`CONFIG_SENSORS_SHT4x=m`
		`CONFIG_SENSORS_SHTC1=m`
		`CONFIG_SENSORS_SIS5595=m`
		`+ CONFIG_SENSORS_SY7636A=m`
		`CONFIG_SENSORS_DME1737=m`
		`CONFIG_SENSORS_EMC1403=m`
		`CONFIG_SENSORS_EMC2103=m`
		`@@ -5181,6 +5235,7 @@`
		`CONFIG_SENSORS_TMP108=m`
		`CONFIG_SENSORS_TMP401=m`
		`CONFIG_SENSORS_TMP421=m`
		`+ CONFIG_SENSORS_TMP464=m`
		`CONFIG_SENSORS_TMP513=m`
		`CONFIG_SENSORS_VIA_CPUTEMP=m`
		`CONFIG_SENSORS_VIA686A=m`
		`@@ -5208,7 +5263,7 @@`
		`CONFIG_SENSORS_ACPI_POWER=m`
		`CONFIG_SENSORS_ATK0110=m`
		`CONFIG_SENSORS_ASUS_WMI=m`
		`- CONFIG_SENSORS_ASUS_WMI_EC=m`
		`+ CONFIG_SENSORS_ASUS_EC=m`
		`CONFIG_THERMAL=y`
		`CONFIG_THERMAL_NETLINK=y`
		`# CONFIG_THERMAL_STATISTICS is not set`
		`@@ -5249,6 +5304,7 @@`
		`CONFIG_INTEL_PCH_THERMAL=m`
		`CONFIG_INTEL_TCC_COOLING=m`
		`CONFIG_INTEL_MENLOW=m`
		`+ CONFIG_INTEL_HFI_THERMAL=y`
		`# end of Intel thermal drivers`

		`CONFIG_GENERIC_ADC_THERMAL=m`
		`@@ -5445,6 +5501,7 @@`
		`CONFIG_MFD_RT5033=m`
		`CONFIG_MFD_RC5T583=y`
		`CONFIG_MFD_SI476X_CORE=m`
		`+ CONFIG_MFD_SIMPLE_MFD_I2C=m`
		`CONFIG_MFD_SM501=m`
		`CONFIG_MFD_SM501_GPIO=y`
		`CONFIG_MFD_SKY81452=m`
		`@@ -5561,11 +5618,11 @@`
		`CONFIG_REGULATOR_PV88080=m`
		`CONFIG_REGULATOR_PV88090=m`
		`CONFIG_REGULATOR_PWM=m`
		`- CONFIG_REGULATOR_RASPBERRYPI_TOUCHSCREEN_ATTINY=m`
		`CONFIG_REGULATOR_RC5T583=m`
		`CONFIG_REGULATOR_RT4801=m`
		`CONFIG_REGULATOR_RT4831=m`
		`CONFIG_REGULATOR_RT5033=m`
		`+ CONFIG_REGULATOR_RT5190A=m`
		`CONFIG_REGULATOR_RT6160=m`
		`CONFIG_REGULATOR_RT6245=m`
		`CONFIG_REGULATOR_RTQ2134=m`
		`@@ -5573,6 +5630,7 @@`
		`CONFIG_REGULATOR_RTQ6752=m`
		`CONFIG_REGULATOR_SKY81452=m`
		`CONFIG_REGULATOR_SLG51000=m`
		`+ CONFIG_REGULATOR_SY7636A=m`
		`CONFIG_REGULATOR_TPS51632=m`
		`CONFIG_REGULATOR_TPS6105X=m`
		`CONFIG_REGULATOR_TPS62360=m`
		`@@ -5592,41 +5650,41 @@`
		`CONFIG_REGULATOR_WM8400=m`
		`CONFIG_REGULATOR_WM8994=m`
		`CONFIG_RC_CORE=y`
		`- CONFIG_RC_MAP=m`
		`- CONFIG_LIRC=y`
		`CONFIG_BPF_LIRC_MODE2=y`
		`+ CONFIG_LIRC=y`
		`+ CONFIG_RC_MAP=m`
		`CONFIG_RC_DECODERS=y`
		`+ CONFIG_IR_IMON_DECODER=m`
		`+ CONFIG_IR_JVC_DECODER=m`
		`+ CONFIG_IR_MCE_KBD_DECODER=m`
		`CONFIG_IR_NEC_DECODER=m`
		`CONFIG_IR_RC5_DECODER=m`
		`CONFIG_IR_RC6_DECODER=m`
		`- CONFIG_IR_JVC_DECODER=m`
		`- CONFIG_IR_SONY_DECODER=m`
		`+ CONFIG_IR_RCMM_DECODER=m`
		`CONFIG_IR_SANYO_DECODER=m`
		`CONFIG_IR_SHARP_DECODER=m`
		`- CONFIG_IR_MCE_KBD_DECODER=m`
		`+ CONFIG_IR_SONY_DECODER=m`
		`CONFIG_IR_XMP_DECODER=m`
		`- CONFIG_IR_IMON_DECODER=m`
		`- CONFIG_IR_RCMM_DECODER=m`
		`CONFIG_RC_DEVICES=y`
		`- CONFIG_RC_ATI_REMOTE=m`
		`CONFIG_IR_ENE=m`
		`+ CONFIG_IR_FINTEK=m`
		`+ CONFIG_IR_IGORPLUGUSB=m`
		`+ CONFIG_IR_IGUANA=m`
		`CONFIG_IR_IMON=m`
		`CONFIG_IR_IMON_RAW=m`
		`- CONFIG_IR_MCEUSB=m`
		`CONFIG_IR_ITE_CIR=m`
		`- CONFIG_IR_FINTEK=m`
		`+ CONFIG_IR_MCEUSB=m`
		`CONFIG_IR_NUVOTON=m`
		`CONFIG_IR_REDRAT3=m`
		`+ CONFIG_IR_SERIAL=m`
		`+ CONFIG_IR_SERIAL_TRANSMITTER=y`
		`CONFIG_IR_STREAMZAP=m`
		`- CONFIG_IR_WINBOND_CIR=m`
		`- CONFIG_IR_IGORPLUGUSB=m`
		`- CONFIG_IR_IGUANA=m`
		`+ CONFIG_IR_TOY=m`
		`CONFIG_IR_TTUSBIR=m`
		`+ CONFIG_IR_WINBOND_CIR=m`
		`+ CONFIG_RC_ATI_REMOTE=m`
		`CONFIG_RC_LOOPBACK=m`
		`- CONFIG_IR_SERIAL=m`
		`- CONFIG_IR_SERIAL_TRANSMITTER=y`
		`CONFIG_RC_XBOX_DVD=m`
		`- CONFIG_IR_TOY=m`
		`CONFIG_CEC_CORE=y`
		`CONFIG_CEC_NOTIFIER=y`
		`CONFIG_CEC_PIN=y`
		`@@ -5669,7 +5727,6 @@`
		`#`
		`# Video4Linux options`
		`#`
		`- CONFIG_VIDEO_V4L2=m`
		`CONFIG_VIDEO_V4L2_I2C=y`
		`CONFIG_VIDEO_V4L2_SUBDEV_API=y`
		`# CONFIG_VIDEO_ADV_DEBUG is not set`
		`@@ -5709,17 +5766,17 @@`
		`#`
		`# Drivers filtered as selected at 'Filter media drivers'`
		`#`
		`+`
		`+ #`
		`+ # Media drivers`
		`+ #`
		`CONFIG_MEDIA_USB_SUPPORT=y`

		`#`
		`# Webcam devices`
		`#`
		`- CONFIG_USB_VIDEO_CLASS=m`
		`- CONFIG_USB_VIDEO_CLASS_INPUT_EVDEV=y`
		`+ CONFIG_VIDEO_CPIA2=m`
		`CONFIG_USB_GSPCA=m`
		`- CONFIG_USB_M5602=m`
		`- CONFIG_USB_STV06XX=m`
		`- CONFIG_USB_GL860=m`
		`CONFIG_USB_GSPCA_BENQ=m`
		`CONFIG_USB_GSPCA_CONEX=m`
		`CONFIG_USB_GSPCA_CPIA1=m`
		`@@ -5744,13 +5801,13 @@`
		`CONFIG_USB_GSPCA_SN9C20X=m`
		`CONFIG_USB_GSPCA_SONIXB=m`
		`CONFIG_USB_GSPCA_SONIXJ=m`
		`+ CONFIG_USB_GSPCA_SPCA1528=m`
		`CONFIG_USB_GSPCA_SPCA500=m`
		`CONFIG_USB_GSPCA_SPCA501=m`
		`CONFIG_USB_GSPCA_SPCA505=m`
		`CONFIG_USB_GSPCA_SPCA506=m`
		`CONFIG_USB_GSPCA_SPCA508=m`
		`CONFIG_USB_GSPCA_SPCA561=m`
		`- CONFIG_USB_GSPCA_SPCA1528=m`
		`CONFIG_USB_GSPCA_SQ905=m`
		`CONFIG_USB_GSPCA_SQ905C=m`
		`CONFIG_USB_GSPCA_SQ930X=m`
		`@@ -5766,29 +5823,33 @@`
		`CONFIG_USB_GSPCA_VICAM=m`
		`CONFIG_USB_GSPCA_XIRLINK_CIT=m`
		`CONFIG_USB_GSPCA_ZC3XX=m`
		`+ CONFIG_USB_GL860=m`
		`+ CONFIG_USB_M5602=m`
		`+ CONFIG_USB_STV06XX=m`
		`CONFIG_USB_PWC=m`
		`# CONFIG_USB_PWC_DEBUG is not set`
		`CONFIG_USB_PWC_INPUT_EVDEV=y`
		`- CONFIG_VIDEO_CPIA2=m`
		`- CONFIG_USB_ZR364XX=m`
		`- CONFIG_USB_STKWEBCAM=m`
		`CONFIG_USB_S2255=m`
		`+ CONFIG_USB_STKWEBCAM=m`
		`CONFIG_VIDEO_USBTV=m`
		`+ CONFIG_USB_VIDEO_CLASS=m`
		`+ CONFIG_USB_VIDEO_CLASS_INPUT_EVDEV=y`
		`+ CONFIG_USB_ZR364XX=m`

		`#`
		`# Analog TV USB devices`
		`#`
		`+ CONFIG_VIDEO_GO7007=m`
		`+ CONFIG_VIDEO_GO7007_USB=m`
		`+ CONFIG_VIDEO_GO7007_LOADER=m`
		`+ CONFIG_VIDEO_GO7007_USB_S2250_BOARD=m`
		`+ CONFIG_VIDEO_HDPVR=m`
		`CONFIG_VIDEO_PVRUSB2=m`
		`CONFIG_VIDEO_PVRUSB2_SYSFS=y`
		`CONFIG_VIDEO_PVRUSB2_DVB=y`
		`# CONFIG_VIDEO_PVRUSB2_DEBUGIFC is not set`
		`- CONFIG_VIDEO_HDPVR=m`
		`CONFIG_VIDEO_STK1160_COMMON=m`
		`CONFIG_VIDEO_STK1160=m`
		`- CONFIG_VIDEO_GO7007=m`
		`- CONFIG_VIDEO_GO7007_USB=m`
		`- CONFIG_VIDEO_GO7007_LOADER=m`
		`- CONFIG_VIDEO_GO7007_USB_S2250_BOARD=m`

		`#`
		`# Analog/digital TV USB devices`
		`@@ -5807,34 +5868,9 @@`
		`#`
		`# Digital TV USB devices`
		`#`
		`- CONFIG_DVB_USB=m`
		`- # CONFIG_DVB_USB_DEBUG is not set`
		`- CONFIG_DVB_USB_DIB3000MC=m`
		`- CONFIG_DVB_USB_A800=m`
		`- CONFIG_DVB_USB_DIBUSB_MB=m`
		`- CONFIG_DVB_USB_DIBUSB_MB_FAULTY=y`
		`- CONFIG_DVB_USB_DIBUSB_MC=m`
		`- CONFIG_DVB_USB_DIB0700=m`
		`- CONFIG_DVB_USB_UMT_010=m`
		`- CONFIG_DVB_USB_CXUSB=m`
		`- CONFIG_DVB_USB_CXUSB_ANALOG=y`
		`- CONFIG_DVB_USB_M920X=m`
		`- CONFIG_DVB_USB_DIGITV=m`
		`- CONFIG_DVB_USB_VP7045=m`
		`- CONFIG_DVB_USB_VP702X=m`
		`- CONFIG_DVB_USB_GP8PSK=m`
		`- CONFIG_DVB_USB_NOVA_T_USB2=m`
		`- CONFIG_DVB_USB_TTUSB2=m`
		`- CONFIG_DVB_USB_DTT200U=m`
		`- CONFIG_DVB_USB_OPERA1=m`
		`- CONFIG_DVB_USB_AF9005=m`
		`- CONFIG_DVB_USB_AF9005_REMOTE=m`
		`- CONFIG_DVB_USB_PCTV452E=m`
		`- CONFIG_DVB_USB_DW2102=m`
		`- CONFIG_DVB_USB_CINERGY_T2=m`
		`- CONFIG_DVB_USB_DTV5100=m`
		`- CONFIG_DVB_USB_AZ6027=m`
		`- CONFIG_DVB_USB_TECHNISAT_USB2=m`
		`+ CONFIG_DVB_AS102=m`
		`+ CONFIG_DVB_B2C2_FLEXCOP_USB=m`
		`+ # CONFIG_DVB_B2C2_FLEXCOP_USB_DEBUG is not set`
		`CONFIG_DVB_USB_V2=m`
		`CONFIG_DVB_USB_AF9015=m`
		`CONFIG_DVB_USB_AF9035=m`
		`@@ -5842,19 +5878,44 @@`
		`CONFIG_DVB_USB_AU6610=m`
		`CONFIG_DVB_USB_AZ6007=m`
		`CONFIG_DVB_USB_CE6230=m`
		`+ CONFIG_DVB_USB_DVBSKY=m`
		`CONFIG_DVB_USB_EC168=m`
		`CONFIG_DVB_USB_GL861=m`
		`CONFIG_DVB_USB_LME2510=m`
		`CONFIG_DVB_USB_MXL111SF=m`
		`CONFIG_DVB_USB_RTL28XXU=m`
		`- CONFIG_DVB_USB_DVBSKY=m`
		`CONFIG_DVB_USB_ZD1301=m`
		`+ CONFIG_DVB_USB=m`
		`+ # CONFIG_DVB_USB_DEBUG is not set`
		`+ CONFIG_DVB_USB_A800=m`
		`+ CONFIG_DVB_USB_AF9005=m`
		`+ CONFIG_DVB_USB_AF9005_REMOTE=m`
		`+ CONFIG_DVB_USB_AZ6027=m`
		`+ CONFIG_DVB_USB_CINERGY_T2=m`
		`+ CONFIG_DVB_USB_CXUSB=m`
		`+ CONFIG_DVB_USB_CXUSB_ANALOG=y`
		`+ CONFIG_DVB_USB_DIB0700=m`
		`+ CONFIG_DVB_USB_DIB3000MC=m`
		`+ CONFIG_DVB_USB_DIBUSB_MB=m`
		`+ CONFIG_DVB_USB_DIBUSB_MB_FAULTY=y`
		`+ CONFIG_DVB_USB_DIBUSB_MC=m`
		`+ CONFIG_DVB_USB_DIGITV=m`
		`+ CONFIG_DVB_USB_DTT200U=m`
		`+ CONFIG_DVB_USB_DTV5100=m`
		`+ CONFIG_DVB_USB_DW2102=m`
		`+ CONFIG_DVB_USB_GP8PSK=m`
		`+ CONFIG_DVB_USB_M920X=m`
		`+ CONFIG_DVB_USB_NOVA_T_USB2=m`
		`+ CONFIG_DVB_USB_OPERA1=m`
		`+ CONFIG_DVB_USB_PCTV452E=m`
		`+ CONFIG_DVB_USB_TECHNISAT_USB2=m`
		`+ CONFIG_DVB_USB_TTUSB2=m`
		`+ CONFIG_DVB_USB_UMT_010=m`
		`+ CONFIG_DVB_USB_VP702X=m`
		`+ CONFIG_DVB_USB_VP7045=m`
		`+ CONFIG_SMS_USB_DRV=m`
		`CONFIG_DVB_TTUSB_BUDGET=m`
		`CONFIG_DVB_TTUSB_DEC=m`
		`- CONFIG_SMS_USB_DRV=m`
		`- CONFIG_DVB_B2C2_FLEXCOP_USB=m`
		`- # CONFIG_DVB_B2C2_FLEXCOP_USB_DEBUG is not set`
		`- CONFIG_DVB_AS102=m`

		`#`
		`# Webcam, TV (analog/digital) USB devices`
		`@@ -5878,17 +5939,19 @@`
		`#`
		`# Media capture/analog TV support`
		`#`
		`+ CONFIG_VIDEO_DT3155=m`
		`CONFIG_VIDEO_IVTV=m`
		`CONFIG_VIDEO_IVTV_ALSA=m`
		`# CONFIG_VIDEO_FB_IVTV is not set`
		`CONFIG_VIDEO_HEXIUM_GEMINI=m`
		`CONFIG_VIDEO_HEXIUM_ORION=m`
		`CONFIG_VIDEO_MXB=m`
		`- CONFIG_VIDEO_DT3155=m`

		`#`
		`# Media capture/analog/hybrid TV support`
		`#`
		`+ CONFIG_VIDEO_BT848=m`
		`+ CONFIG_DVB_BT8XX=m`
		`CONFIG_VIDEO_CX18=m`
		`CONFIG_VIDEO_CX18_ALSA=m`
		`CONFIG_VIDEO_CX23885=m`
		`@@ -5902,8 +5965,6 @@`
		`CONFIG_VIDEO_CX88_ENABLE_VP3054=y`
		`CONFIG_VIDEO_CX88_VP3054=m`
		`CONFIG_VIDEO_CX88_MPEG=m`
		`- CONFIG_VIDEO_BT848=m`
		`- CONFIG_DVB_BT8XX=m`
		`CONFIG_VIDEO_SAA7134=m`
		`CONFIG_VIDEO_SAA7134_ALSA=m`
		`CONFIG_VIDEO_SAA7134_RC=y`
		`@@ -5914,149 +5975,198 @@`
		`#`
		`# Media digital TV PCI Adapters`
		`#`
		`- CONFIG_DVB_BUDGET_CORE=m`
		`- CONFIG_DVB_BUDGET=m`
		`- CONFIG_DVB_BUDGET_CI=m`
		`- CONFIG_DVB_BUDGET_AV=m`
		`CONFIG_DVB_B2C2_FLEXCOP_PCI=m`
		`# CONFIG_DVB_B2C2_FLEXCOP_PCI_DEBUG is not set`
		`- CONFIG_DVB_PLUTO2=m`
		`+ CONFIG_DVB_DDBRIDGE=m`
		`+ # CONFIG_DVB_DDBRIDGE_MSIENABLE is not set`
		`CONFIG_DVB_DM1105=m`
		`- CONFIG_DVB_PT1=m`
		`- CONFIG_DVB_PT3=m`
		`CONFIG_MANTIS_CORE=m`
		`CONFIG_DVB_MANTIS=m`
		`CONFIG_DVB_HOPPER=m`
		`+ CONFIG_DVB_NETUP_UNIDVB=m`
		`CONFIG_DVB_NGENE=m`
		`- CONFIG_DVB_DDBRIDGE=m`
		`- # CONFIG_DVB_DDBRIDGE_MSIENABLE is not set`
		`+ CONFIG_DVB_PLUTO2=m`
		`+ CONFIG_DVB_PT1=m`
		`+ CONFIG_DVB_PT3=m`
		`CONFIG_DVB_SMIPCIE=m`
		`- CONFIG_DVB_NETUP_UNIDVB=m`
		`+ CONFIG_DVB_BUDGET_CORE=m`
		`+ CONFIG_DVB_BUDGET=m`
		`+ CONFIG_DVB_BUDGET_CI=m`
		`+ CONFIG_DVB_BUDGET_AV=m`
		`CONFIG_VIDEO_IPU3_CIO2=m`
		`CONFIG_CIO2_BRIDGE=y`
		`- CONFIG_RADIO_ADAPTERS=y`
		`+ CONFIG_RADIO_ADAPTERS=m`
		`+ CONFIG_RADIO_MAXIRADIO=m`
		`+ CONFIG_RADIO_SAA7706H=m`
		`+ CONFIG_RADIO_SHARK=m`
		`+ CONFIG_RADIO_SHARK2=m`
		`+ CONFIG_RADIO_SI4713=m`
		`+ CONFIG_RADIO_SI476X=m`
		`CONFIG_RADIO_TEA575X=m`
		`+ CONFIG_RADIO_TEA5764=m`
		`+ CONFIG_RADIO_TEF6862=m`
		`+ CONFIG_RADIO_WL1273=m`
		`+ CONFIG_USB_DSBR=m`
		`+ CONFIG_USB_KEENE=m`
		`+ CONFIG_USB_MA901=m`
		`+ CONFIG_USB_MR800=m`
		`+ CONFIG_USB_RAREMONO=m`
		`CONFIG_RADIO_SI470X=m`
		`CONFIG_USB_SI470X=m`
		`CONFIG_I2C_SI470X=m`
		`- CONFIG_RADIO_SI4713=m`
		`CONFIG_USB_SI4713=m`
		`CONFIG_PLATFORM_SI4713=m`
		`CONFIG_I2C_SI4713=m`
		`- CONFIG_RADIO_SI476X=m`
		`- CONFIG_USB_MR800=m`
		`- CONFIG_USB_DSBR=m`
		`- CONFIG_RADIO_MAXIRADIO=m`
		`- CONFIG_RADIO_SHARK=m`
		`- CONFIG_RADIO_SHARK2=m`
		`- CONFIG_USB_KEENE=m`
		`- CONFIG_USB_RAREMONO=m`
		`- CONFIG_USB_MA901=m`
		`- CONFIG_RADIO_TEA5764=m`
		`- CONFIG_RADIO_SAA7706H=m`
		`- CONFIG_RADIO_TEF6862=m`
		`- CONFIG_RADIO_WL1273=m`
		`CONFIG_RADIO_WL128X=m`
		`- CONFIG_MEDIA_COMMON_OPTIONS=y`
		`-`
		`- #`
		`- # common driver options`
		`- #`
		`- CONFIG_VIDEO_CX2341X=m`
		`- CONFIG_VIDEO_TVEEPROM=m`
		`- CONFIG_TTPCI_EEPROM=m`
		`- CONFIG_CYPRESS_FIRMWARE=m`
		`- CONFIG_VIDEOBUF2_CORE=m`
		`- CONFIG_VIDEOBUF2_V4L2=m`
		`- CONFIG_VIDEOBUF2_MEMOPS=m`
		`- CONFIG_VIDEOBUF2_DMA_CONTIG=m`
		`- CONFIG_VIDEOBUF2_VMALLOC=m`
		`- CONFIG_VIDEOBUF2_DMA_SG=m`
		`- CONFIG_VIDEOBUF2_DVB=m`
		`- CONFIG_DVB_B2C2_FLEXCOP=m`
		`- CONFIG_VIDEO_SAA7146=m`
		`- CONFIG_VIDEO_SAA7146_VV=m`
		`- CONFIG_SMS_SIANO_MDTV=m`
		`- CONFIG_SMS_SIANO_RC=y`
		`- # CONFIG_SMS_SIANO_DEBUGFS is not set`
		`- CONFIG_VIDEO_V4L2_TPG=m`
		`+ CONFIG_MEDIA_PLATFORM_DRIVERS=y`
		`CONFIG_V4L_PLATFORM_DRIVERS=y`
		`- CONFIG_VIDEO_CAFE_CCIC=m`
		`- CONFIG_VIDEO_CADENCE=y`
		`- CONFIG_VIDEO_CADENCE_CSI2RX=m`
		`- CONFIG_VIDEO_CADENCE_CSI2TX=m`
		`- CONFIG_VIDEO_ASPEED=m`
		`+ CONFIG_DVB_PLATFORM_DRIVERS=y`
		`CONFIG_V4L_MEM2MEM_DRIVERS=y`
		`CONFIG_VIDEO_MEM2MEM_DEINTERLACE=m`
		`- CONFIG_DVB_PLATFORM_DRIVERS=y`

		`#`
		`- # MMC/SDIO DVB adapters`
		`+ # Allegro DVT media platform drivers`
		`#`
		`- CONFIG_SMS_SDIO_DRV=m`
		`- CONFIG_V4L_TEST_DRIVERS=y`
		`- CONFIG_VIDEO_VIMC=m`
		`- CONFIG_VIDEO_VIVID=m`
		`- CONFIG_VIDEO_VIVID_CEC=y`
		`- CONFIG_VIDEO_VIVID_MAX_DEVS=64`
		`- CONFIG_VIDEO_VIM2M=m`
		`- CONFIG_VIDEO_VICODEC=m`
		`- CONFIG_DVB_TEST_DRIVERS=y`
		`- CONFIG_DVB_VIDTV=m`

		`#`
		`- # FireWire (IEEE 1394) Adapters`
		`+ # Amlogic media platform drivers`
		`#`
		`- CONFIG_DVB_FIREDTV=m`
		`- CONFIG_DVB_FIREDTV_INPUT=y`
		`- # end of Media drivers`

		`- CONFIG_MEDIA_HIDE_ANCILLARY_SUBDRV=y`
		`+ #`
		`+ # Amphion drivers`
		`+ #`

		`#`
		`- # Media ancillary drivers`
		`+ # Aspeed media platform drivers`
		`#`
		`- CONFIG_MEDIA_ATTACH=y`
		`+ CONFIG_VIDEO_ASPEED=m`

		`#`
		`- # IR I2C driver auto-selected by 'Autoselect ancillary drivers'`
		`+ # Atmel media platform drivers`
		`#`
		`- CONFIG_VIDEO_IR_I2C=m`

		`#`
		`- # audio, video and radio I2C drivers auto-selected by 'Autoselect ancillary drivers'`
		`+ # Cadence media platform drivers`
		`#`
		`- CONFIG_VIDEO_TVAUDIO=m`
		`- CONFIG_VIDEO_TDA7432=m`
		`- CONFIG_VIDEO_TDA9840=m`
		`- CONFIG_VIDEO_TEA6415C=m`
		`- CONFIG_VIDEO_TEA6420=m`
		`- CONFIG_VIDEO_MSP3400=m`
		`- CONFIG_VIDEO_CS3308=m`
		`- CONFIG_VIDEO_CS5345=m`
		`- CONFIG_VIDEO_CS53L32A=m`
		`- CONFIG_VIDEO_UDA1342=m`
		`- CONFIG_VIDEO_WM8775=m`
		`- CONFIG_VIDEO_WM8739=m`
		`- CONFIG_VIDEO_VP27SMPX=m`
		`- CONFIG_VIDEO_SONY_BTF_MPX=m`
		`- CONFIG_VIDEO_SAA6588=m`
		`- CONFIG_VIDEO_SAA711X=m`
		`- CONFIG_VIDEO_TVP5150=m`
		`- CONFIG_VIDEO_TW2804=m`
		`- CONFIG_VIDEO_TW9903=m`
		`- CONFIG_VIDEO_TW9906=m`
		`+ CONFIG_VIDEO_CADENCE_CSI2RX=m`
		`+ CONFIG_VIDEO_CADENCE_CSI2TX=m`

		`#`
		`- # Video and audio decoders`
		`+ # Chips&Media media platform drivers`
		`#`
		`- CONFIG_VIDEO_SAA717X=m`
		`- CONFIG_VIDEO_CX25840=m`
		`- CONFIG_VIDEO_SAA7127=m`
		`- CONFIG_VIDEO_UPD64031A=m`
		`- CONFIG_VIDEO_UPD64083=m`
		`- CONFIG_VIDEO_SAA6752HS=m`
		`- CONFIG_VIDEO_M52790=m`
		`+`
		`+ #`
		`+ # Intel media platform drivers`
		`+ #`
		`+`
		`+ #`
		`+ # Marvell media platform drivers`
		`+ #`
		`+ CONFIG_VIDEO_CAFE_CCIC=m`
		`+`
		`+ #`
		`+ # Mediatek media platform drivers`
		`+ #`
		`+`
		`+ #`
		`+ # NVidia media platform drivers`
		`+ #`
		`+`
		`+ #`
		`+ # NXP media platform drivers`
		`+ #`
		`+`
		`+ #`
		`+ # Qualcomm media platform drivers`
		`+ #`
		`+`
		`+ #`
		`+ # Renesas media platform drivers`
		`+ #`
		`+`
		`+ #`
		`+ # Rockchip media platform drivers`
		`+ #`
		`+`
		`+ #`
		`+ # Samsung media platform drivers`
		`+ #`
		`+`
		`+ #`
		`+ # STMicroelectronics media platform drivers`
		`+ #`
		`+`
		`+ #`
		`+ # Sunxi media platform drivers`
		`+ #`
		`+`
		`+ #`
		`+ # Texas Instruments drivers`
		`+ #`
		`+`
		`+ #`
		`+ # VIA media platform drivers`
		`+ #`
		`+`
		`+ #`
		`+ # Xilinx media platform drivers`
		`+ #`
		`+`
		`+ #`
		`+ # MMC/SDIO DVB adapters`
		`+ #`
		`+ CONFIG_SMS_SDIO_DRV=m`
		`+ CONFIG_V4L_TEST_DRIVERS=y`
		`+ CONFIG_VIDEO_VIM2M=m`
		`+ CONFIG_VIDEO_VICODEC=m`
		`+ CONFIG_VIDEO_VIMC=m`
		`+ CONFIG_VIDEO_VIVID=m`
		`+ CONFIG_VIDEO_VIVID_CEC=y`
		`+ CONFIG_VIDEO_VIVID_MAX_DEVS=64`
		`+ CONFIG_DVB_TEST_DRIVERS=y`
		`+ CONFIG_DVB_VIDTV=m`
		`+`
		`+ #`
		`+ # FireWire (IEEE 1394) Adapters`
		`+ #`
		`+ CONFIG_DVB_FIREDTV=m`
		`+ CONFIG_DVB_FIREDTV_INPUT=y`
		`+ CONFIG_MEDIA_COMMON_OPTIONS=y`
		`+`
		`+ #`
		`+ # common driver options`
		`+ #`
		`+ CONFIG_CYPRESS_FIRMWARE=m`
		`+ CONFIG_TTPCI_EEPROM=m`
		`+ CONFIG_VIDEO_CX2341X=m`
		`+ CONFIG_VIDEO_TVEEPROM=m`
		`+ CONFIG_DVB_B2C2_FLEXCOP=m`
		`+ CONFIG_VIDEO_SAA7146=m`
		`+ CONFIG_VIDEO_SAA7146_VV=m`
		`+ CONFIG_SMS_SIANO_MDTV=m`
		`+ CONFIG_SMS_SIANO_RC=y`
		`+ # CONFIG_SMS_SIANO_DEBUGFS is not set`
		`+ CONFIG_VIDEO_V4L2_TPG=m`
		`+ CONFIG_VIDEOBUF2_CORE=m`
		`+ CONFIG_VIDEOBUF2_V4L2=m`
		`+ CONFIG_VIDEOBUF2_MEMOPS=m`
		`+ CONFIG_VIDEOBUF2_DMA_CONTIG=m`
		`+ CONFIG_VIDEOBUF2_VMALLOC=m`
		`+ CONFIG_VIDEOBUF2_DMA_SG=m`
		`+ CONFIG_VIDEOBUF2_DVB=m`
		`+ # end of Media drivers`
		`+`
		`+ CONFIG_MEDIA_HIDE_ANCILLARY_SUBDRV=y`
		`+`
		`+ #`
		`+ # Media ancillary drivers`
		`+ #`
		`+ CONFIG_MEDIA_ATTACH=y`
		`+`
		`+ #`
		`+ # IR I2C driver auto-selected by 'Autoselect ancillary drivers'`
		`+ #`
		`+ CONFIG_VIDEO_IR_I2C=m`

		`#`
		`# Camera sensor devices`
		`@@ -6065,6 +6175,7 @@`
		`CONFIG_VIDEO_CCS_PLL=m`
		`CONFIG_VIDEO_HI556=m`
		`CONFIG_VIDEO_HI846=m`
		`+ CONFIG_VIDEO_HI847=m`
		`CONFIG_VIDEO_IMX208=m`
		`CONFIG_VIDEO_IMX214=m`
		`CONFIG_VIDEO_IMX219=m`
		`@@ -6073,7 +6184,22 @@`
		`CONFIG_VIDEO_IMX290=m`
		`CONFIG_VIDEO_IMX319=m`
		`CONFIG_VIDEO_IMX355=m`
		`+ CONFIG_VIDEO_MAX9271_LIB=m`
		`+ CONFIG_VIDEO_MT9M001=m`
		`+ CONFIG_VIDEO_MT9M032=m`
		`+ CONFIG_VIDEO_MT9M111=m`
		`+ CONFIG_VIDEO_MT9P031=m`
		`+ CONFIG_VIDEO_MT9T001=m`
		`+ CONFIG_VIDEO_MT9T112=m`
		`+ CONFIG_VIDEO_MT9V011=m`
		`+ CONFIG_VIDEO_MT9V032=m`
		`+ CONFIG_VIDEO_MT9V111=m`
		`+ CONFIG_VIDEO_NOON010PC30=m`
		`+ CONFIG_VIDEO_OG01A1B=m`
		`CONFIG_VIDEO_OV02A10=m`
		`+ CONFIG_VIDEO_OV08D10=m`
		`+ CONFIG_VIDEO_OV13858=m`
		`+ CONFIG_VIDEO_OV13B10=m`
		`CONFIG_VIDEO_OV2640=m`
		`CONFIG_VIDEO_OV2659=m`
		`CONFIG_VIDEO_OV2680=m`
		`@@ -6081,47 +6207,34 @@`
		`CONFIG_VIDEO_OV2740=m`
		`CONFIG_VIDEO_OV5647=m`
		`CONFIG_VIDEO_OV5648=m`
		`- CONFIG_VIDEO_OV6650=m`
		`CONFIG_VIDEO_OV5670=m`
		`CONFIG_VIDEO_OV5675=m`
		`CONFIG_VIDEO_OV5693=m`
		`CONFIG_VIDEO_OV5695=m`
		`+ CONFIG_VIDEO_OV6650=m`
		`CONFIG_VIDEO_OV7251=m`
		`- CONFIG_VIDEO_OV772X=m`
		`CONFIG_VIDEO_OV7640=m`
		`CONFIG_VIDEO_OV7670=m`
		`+ CONFIG_VIDEO_OV772X=m`
		`CONFIG_VIDEO_OV7740=m`
		`CONFIG_VIDEO_OV8856=m`
		`CONFIG_VIDEO_OV8865=m`
		`CONFIG_VIDEO_OV9640=m`
		`CONFIG_VIDEO_OV9650=m`
		`CONFIG_VIDEO_OV9734=m`
		`- CONFIG_VIDEO_OV13858=m`
		`- CONFIG_VIDEO_OV13B10=m`
		`- CONFIG_VIDEO_VS6624=m`
		`- CONFIG_VIDEO_MT9M001=m`
		`- CONFIG_VIDEO_MT9M032=m`
		`- CONFIG_VIDEO_MT9M111=m`
		`- CONFIG_VIDEO_MT9P031=m`
		`- CONFIG_VIDEO_MT9T001=m`
		`- CONFIG_VIDEO_MT9T112=m`
		`- CONFIG_VIDEO_MT9V011=m`
		`- CONFIG_VIDEO_MT9V032=m`
		`- CONFIG_VIDEO_MT9V111=m`
		`- CONFIG_VIDEO_SR030PC30=m`
		`- CONFIG_VIDEO_NOON010PC30=m`
		`- CONFIG_VIDEO_M5MOLS=m`
		`- CONFIG_VIDEO_MAX9271_LIB=m`
		`CONFIG_VIDEO_RDACM20=m`
		`CONFIG_VIDEO_RDACM21=m`
		`CONFIG_VIDEO_RJ54N1=m`
		`- CONFIG_VIDEO_S5K6AA=m`
		`- CONFIG_VIDEO_S5K6A3=m`
		`+ CONFIG_VIDEO_S5C73M3=m`
		`CONFIG_VIDEO_S5K4ECGX=m`
		`CONFIG_VIDEO_S5K5BAF=m`
		`+ CONFIG_VIDEO_S5K6A3=m`
		`+ CONFIG_VIDEO_S5K6AA=m`
		`+ CONFIG_VIDEO_SR030PC30=m`
		`+ CONFIG_VIDEO_VS6624=m`
		`CONFIG_VIDEO_CCS=m`
		`CONFIG_VIDEO_ET8EK8=m`
		`- CONFIG_VIDEO_S5C73M3=m`
		`+ CONFIG_VIDEO_M5MOLS=m`
		`# end of Camera sensor devices`

		`#`
		`@@ -6143,6 +6256,41 @@`
		`# end of Flash devices`

		`#`
		`+ # audio, video and radio I2C drivers auto-selected by 'Autoselect ancillary drivers'`
		`+ #`
		`+ CONFIG_VIDEO_CS3308=m`
		`+ CONFIG_VIDEO_CS5345=m`
		`+ CONFIG_VIDEO_CS53L32A=m`
		`+ CONFIG_VIDEO_MSP3400=m`
		`+ CONFIG_VIDEO_SONY_BTF_MPX=m`
		`+ CONFIG_VIDEO_TDA7432=m`
		`+ CONFIG_VIDEO_TDA9840=m`
		`+ CONFIG_VIDEO_TEA6415C=m`
		`+ CONFIG_VIDEO_TEA6420=m`
		`+ CONFIG_VIDEO_TVAUDIO=m`
		`+ CONFIG_VIDEO_UDA1342=m`
		`+ CONFIG_VIDEO_VP27SMPX=m`
		`+ CONFIG_VIDEO_WM8739=m`
		`+ CONFIG_VIDEO_WM8775=m`
		`+ CONFIG_VIDEO_SAA6588=m`
		`+ CONFIG_VIDEO_SAA711X=m`
		`+ CONFIG_VIDEO_TVP5150=m`
		`+ CONFIG_VIDEO_TW2804=m`
		`+ CONFIG_VIDEO_TW9903=m`
		`+ CONFIG_VIDEO_TW9906=m`
		`+`
		`+ #`
		`+ # Video and audio decoders`
		`+ #`
		`+ CONFIG_VIDEO_SAA717X=m`
		`+ CONFIG_VIDEO_CX25840=m`
		`+ CONFIG_VIDEO_SAA7127=m`
		`+ CONFIG_VIDEO_UPD64031A=m`
		`+ CONFIG_VIDEO_UPD64083=m`
		`+ CONFIG_VIDEO_SAA6752HS=m`
		`+ CONFIG_VIDEO_M52790=m`
		`+`
		`+ #`
		`# SPI I2C drivers auto-selected by 'Autoselect ancillary drivers'`
		`#`

		`@@ -6150,6 +6298,7 @@`
		`# Media SPI Adapters`
		`#`
		`CONFIG_CXD2880_SPI_DRV=m`
		`+ CONFIG_VIDEO_GS1662=m`
		`# end of Media SPI Adapters`

		`CONFIG_MEDIA_TUNER=m`
		`@@ -6157,42 +6306,42 @@`
		`#`
		`# Tuner drivers auto-selected by 'Autoselect ancillary drivers'`
		`#`
		`+ CONFIG_MEDIA_TUNER_E4000=m`
		`+ CONFIG_MEDIA_TUNER_FC0011=m`
		`+ CONFIG_MEDIA_TUNER_FC0012=m`
		`+ CONFIG_MEDIA_TUNER_FC0013=m`
		`+ CONFIG_MEDIA_TUNER_FC2580=m`
		`+ CONFIG_MEDIA_TUNER_IT913X=m`
		`+ CONFIG_MEDIA_TUNER_M88RS6000T=m`
		`+ CONFIG_MEDIA_TUNER_MAX2165=m`
		`+ CONFIG_MEDIA_TUNER_MC44S803=m`
		`+ CONFIG_MEDIA_TUNER_MT2060=m`
		`+ CONFIG_MEDIA_TUNER_MT2063=m`
		`+ CONFIG_MEDIA_TUNER_MT20XX=m`
		`+ CONFIG_MEDIA_TUNER_MT2131=m`
		`+ CONFIG_MEDIA_TUNER_MT2266=m`
		`+ CONFIG_MEDIA_TUNER_MXL301RF=m`
		`+ CONFIG_MEDIA_TUNER_MXL5005S=m`
		`+ CONFIG_MEDIA_TUNER_MXL5007T=m`
		`+ CONFIG_MEDIA_TUNER_QM1D1B0004=m`
		`+ CONFIG_MEDIA_TUNER_QM1D1C0042=m`
		`+ CONFIG_MEDIA_TUNER_QT1010=m`
		`+ CONFIG_MEDIA_TUNER_R820T=m`
		`+ CONFIG_MEDIA_TUNER_SI2157=m`
		`CONFIG_MEDIA_TUNER_SIMPLE=m`
		`+ CONFIG_MEDIA_TUNER_TDA18212=m`
		`+ CONFIG_MEDIA_TUNER_TDA18218=m`
		`CONFIG_MEDIA_TUNER_TDA18250=m`
		`- CONFIG_MEDIA_TUNER_TDA8290=m`
		`- CONFIG_MEDIA_TUNER_TDA827X=m`
		`CONFIG_MEDIA_TUNER_TDA18271=m`
		`+ CONFIG_MEDIA_TUNER_TDA827X=m`
		`+ CONFIG_MEDIA_TUNER_TDA8290=m`
		`CONFIG_MEDIA_TUNER_TDA9887=m`
		`CONFIG_MEDIA_TUNER_TEA5761=m`
		`CONFIG_MEDIA_TUNER_TEA5767=m`
		`- CONFIG_MEDIA_TUNER_MT20XX=m`
		`- CONFIG_MEDIA_TUNER_MT2060=m`
		`- CONFIG_MEDIA_TUNER_MT2063=m`
		`- CONFIG_MEDIA_TUNER_MT2266=m`
		`- CONFIG_MEDIA_TUNER_MT2131=m`
		`- CONFIG_MEDIA_TUNER_QT1010=m`
		`+ CONFIG_MEDIA_TUNER_TUA9001=m`
		`CONFIG_MEDIA_TUNER_XC2028=m`
		`- CONFIG_MEDIA_TUNER_XC5000=m`
		`CONFIG_MEDIA_TUNER_XC4000=m`
		`- CONFIG_MEDIA_TUNER_MXL5005S=m`
		`- CONFIG_MEDIA_TUNER_MXL5007T=m`
		`- CONFIG_MEDIA_TUNER_MC44S803=m`
		`- CONFIG_MEDIA_TUNER_MAX2165=m`
		`- CONFIG_MEDIA_TUNER_TDA18218=m`
		`- CONFIG_MEDIA_TUNER_FC0011=m`
		`- CONFIG_MEDIA_TUNER_FC0012=m`
		`- CONFIG_MEDIA_TUNER_FC0013=m`
		`- CONFIG_MEDIA_TUNER_TDA18212=m`
		`- CONFIG_MEDIA_TUNER_E4000=m`
		`- CONFIG_MEDIA_TUNER_FC2580=m`
		`- CONFIG_MEDIA_TUNER_M88RS6000T=m`
		`- CONFIG_MEDIA_TUNER_TUA9001=m`
		`- CONFIG_MEDIA_TUNER_SI2157=m`
		`- CONFIG_MEDIA_TUNER_IT913X=m`
		`- CONFIG_MEDIA_TUNER_R820T=m`
		`- CONFIG_MEDIA_TUNER_MXL301RF=m`
		`- CONFIG_MEDIA_TUNER_QM1D1C0042=m`
		`- CONFIG_MEDIA_TUNER_QM1D1B0004=m`
		`+ CONFIG_MEDIA_TUNER_XC5000=m`

		`#`
		`# DVB Frontend drivers auto-selected by 'Autoselect ancillary drivers'`
		`@@ -6201,116 +6350,116 @@`
		`#`
		`# Multistandard (satellite) frontends`
		`#`
		`+ CONFIG_DVB_M88DS3103=m`
		`+ CONFIG_DVB_MXL5XX=m`
		`CONFIG_DVB_STB0899=m`
		`CONFIG_DVB_STB6100=m`
		`CONFIG_DVB_STV090x=m`
		`CONFIG_DVB_STV0910=m`
		`CONFIG_DVB_STV6110x=m`
		`CONFIG_DVB_STV6111=m`
		`- CONFIG_DVB_MXL5XX=m`
		`- CONFIG_DVB_M88DS3103=m`

		`#`
		`# Multistandard (cable + terrestrial) frontends`
		`#`
		`CONFIG_DVB_DRXK=m`
		`- CONFIG_DVB_TDA18271C2DD=m`
		`- CONFIG_DVB_SI2165=m`
		`CONFIG_DVB_MN88472=m`
		`CONFIG_DVB_MN88473=m`
		`+ CONFIG_DVB_SI2165=m`
		`+ CONFIG_DVB_TDA18271C2DD=m`

		`#`
		`# DVB-S (satellite) frontends`
		`#`
		`CONFIG_DVB_CX24110=m`
		`+ CONFIG_DVB_CX24116=m`
		`+ CONFIG_DVB_CX24117=m`
		`+ CONFIG_DVB_CX24120=m`
		`CONFIG_DVB_CX24123=m`
		`+ CONFIG_DVB_DS3000=m`
		`+ CONFIG_DVB_MB86A16=m`
		`CONFIG_DVB_MT312=m`
		`- CONFIG_DVB_ZL10036=m`
		`- CONFIG_DVB_ZL10039=m`
		`CONFIG_DVB_S5H1420=m`
		`- CONFIG_DVB_STV0288=m`
		`+ CONFIG_DVB_SI21XX=m`
		`CONFIG_DVB_STB6000=m`
		`+ CONFIG_DVB_STV0288=m`
		`CONFIG_DVB_STV0299=m`
		`- CONFIG_DVB_STV6110=m`
		`CONFIG_DVB_STV0900=m`
		`- CONFIG_DVB_TDA8083=m`
		`+ CONFIG_DVB_STV6110=m`
		`+ CONFIG_DVB_TDA10071=m`
		`CONFIG_DVB_TDA10086=m`
		`+ CONFIG_DVB_TDA8083=m`
		`CONFIG_DVB_TDA8261=m`
		`- CONFIG_DVB_VES1X93=m`
		`- CONFIG_DVB_TUNER_ITD1000=m`
		`- CONFIG_DVB_TUNER_CX24113=m`
		`CONFIG_DVB_TDA826X=m`
		`- CONFIG_DVB_TUA6100=m`
		`- CONFIG_DVB_CX24116=m`
		`- CONFIG_DVB_CX24117=m`
		`- CONFIG_DVB_CX24120=m`
		`- CONFIG_DVB_SI21XX=m`
		`CONFIG_DVB_TS2020=m`
		`- CONFIG_DVB_DS3000=m`
		`- CONFIG_DVB_MB86A16=m`
		`- CONFIG_DVB_TDA10071=m`
		`+ CONFIG_DVB_TUA6100=m`
		`+ CONFIG_DVB_TUNER_CX24113=m`
		`+ CONFIG_DVB_TUNER_ITD1000=m`
		`+ CONFIG_DVB_VES1X93=m`
		`+ CONFIG_DVB_ZL10036=m`
		`+ CONFIG_DVB_ZL10039=m`

		`#`
		`# DVB-T (terrestrial) frontends`
		`#`
		`- CONFIG_DVB_SP887X=m`
		`+ CONFIG_DVB_AF9013=m`
		`+ CONFIG_DVB_AS102_FE=m`
		`CONFIG_DVB_CX22700=m`
		`CONFIG_DVB_CX22702=m`
		`- CONFIG_DVB_DRXD=m`
		`- CONFIG_DVB_L64781=m`
		`- CONFIG_DVB_TDA1004X=m`
		`- CONFIG_DVB_NXT6000=m`
		`- CONFIG_DVB_MT352=m`
		`- CONFIG_DVB_ZL10353=m`
		`+ CONFIG_DVB_CXD2820R=m`
		`+ CONFIG_DVB_CXD2841ER=m`
		`CONFIG_DVB_DIB3000MB=m`
		`CONFIG_DVB_DIB3000MC=m`
		`CONFIG_DVB_DIB7000M=m`
		`CONFIG_DVB_DIB7000P=m`
		`- CONFIG_DVB_TDA10048=m`
		`- CONFIG_DVB_AF9013=m`
		`+ CONFIG_DVB_DRXD=m`
		`CONFIG_DVB_EC100=m`
		`- CONFIG_DVB_STV0367=m`
		`- CONFIG_DVB_CXD2820R=m`
		`- CONFIG_DVB_CXD2841ER=m`
		`+ CONFIG_DVB_GP8PSK_FE=m`
		`+ CONFIG_DVB_L64781=m`
		`+ CONFIG_DVB_MT352=m`
		`+ CONFIG_DVB_NXT6000=m`
		`CONFIG_DVB_RTL2830=m`
		`CONFIG_DVB_RTL2832=m`
		`CONFIG_DVB_SI2168=m`
		`- CONFIG_DVB_AS102_FE=m`
		`+ CONFIG_DVB_SP887X=m`
		`+ CONFIG_DVB_STV0367=m`
		`+ CONFIG_DVB_TDA10048=m`
		`+ CONFIG_DVB_TDA1004X=m`
		`CONFIG_DVB_ZD1301_DEMOD=m`
		`- CONFIG_DVB_GP8PSK_FE=m`
		`+ CONFIG_DVB_ZL10353=m`

		`#`
		`# DVB-C (cable) frontends`
		`#`
		`- CONFIG_DVB_VES1820=m`
		`+ CONFIG_DVB_STV0297=m`
		`CONFIG_DVB_TDA10021=m`
		`CONFIG_DVB_TDA10023=m`
		`- CONFIG_DVB_STV0297=m`
		`+ CONFIG_DVB_VES1820=m`

		`#`
		`# ATSC (North American/Korean Terrestrial/Cable DTV) frontends`
		`#`
		`- CONFIG_DVB_NXT200X=m`
		`- CONFIG_DVB_OR51211=m`
		`- CONFIG_DVB_OR51132=m`
		`+ CONFIG_DVB_AU8522=m`
		`+ CONFIG_DVB_AU8522_DTV=m`
		`+ CONFIG_DVB_AU8522_V4L=m`
		`CONFIG_DVB_BCM3510=m`
		`- CONFIG_DVB_LGDT330X=m`
		`+ CONFIG_DVB_LG2160=m`
		`CONFIG_DVB_LGDT3305=m`
		`CONFIG_DVB_LGDT3306A=m`
		`- CONFIG_DVB_LG2160=m`
		`+ CONFIG_DVB_LGDT330X=m`
		`+ CONFIG_DVB_MXL692=m`
		`+ CONFIG_DVB_NXT200X=m`
		`+ CONFIG_DVB_OR51132=m`
		`+ CONFIG_DVB_OR51211=m`
		`CONFIG_DVB_S5H1409=m`
		`- CONFIG_DVB_AU8522=m`
		`- CONFIG_DVB_AU8522_DTV=m`
		`- CONFIG_DVB_AU8522_V4L=m`
		`CONFIG_DVB_S5H1411=m`
		`- CONFIG_DVB_MXL692=m`

		`#`
		`# ISDB-T (terrestrial) frontends`
		`#`
		`- CONFIG_DVB_S921=m`
		`CONFIG_DVB_DIB8000=m`
		`CONFIG_DVB_MB86A20S=m`
		`+ CONFIG_DVB_S921=m`

		`#`
		`# ISDB-S (satellite) & ISDB-T (terrestrial) frontends`
		`@@ -6327,23 +6476,23 @@`
		`#`
		`# SEC control devices for DVB-S`
		`#`
		`- CONFIG_DVB_DRX39XYJ=m`
		`- CONFIG_DVB_LNBH25=m`
		`- CONFIG_DVB_LNBP21=m`
		`- CONFIG_DVB_LNBP22=m`
		`+ CONFIG_DVB_A8293=m`
		`+ CONFIG_DVB_AF9033=m`
		`+ CONFIG_DVB_ASCOT2E=m`
		`+ CONFIG_DVB_ATBM8830=m`
		`+ CONFIG_DVB_HELENE=m`
		`+ CONFIG_DVB_HORUS3A=m`
		`CONFIG_DVB_ISL6405=m`
		`CONFIG_DVB_ISL6421=m`
		`CONFIG_DVB_ISL6423=m`
		`- CONFIG_DVB_A8293=m`
		`- CONFIG_DVB_LGS8GXX=m`
		`- CONFIG_DVB_ATBM8830=m`
		`- CONFIG_DVB_TDA665x=m`
		`CONFIG_DVB_IX2505V=m`
		`+ CONFIG_DVB_LGS8GXX=m`
		`+ CONFIG_DVB_LNBH25=m`
		`+ CONFIG_DVB_LNBP21=m`
		`+ CONFIG_DVB_LNBP22=m`
		`CONFIG_DVB_M88RS2000=m`
		`- CONFIG_DVB_AF9033=m`
		`- CONFIG_DVB_HORUS3A=m`
		`- CONFIG_DVB_ASCOT2E=m`
		`- CONFIG_DVB_HELENE=m`
		`+ CONFIG_DVB_TDA665x=m`
		`+ CONFIG_DVB_DRX39XYJ=m`

		`#`
		`# Common Interface (EN50221) controller drivers`
		`@@ -6366,8 +6515,6 @@`
		`CONFIG_AGP_SIS=m`
		`CONFIG_AGP_VIA=m`
		`CONFIG_INTEL_GTT=m`
		`- CONFIG_VGA_ARB=y`
		`- CONFIG_VGA_ARB_MAX_GPUS=10`
		`CONFIG_VGA_SWITCHEROO=y`
		`CONFIG_DRM=y`
		`CONFIG_DRM_MIPI_DBI=m`
		`@@ -6375,12 +6522,14 @@`
		`CONFIG_DRM_DP_AUX_CHARDEV=y`
		`# CONFIG_DRM_DEBUG_MM is not set`
		`# CONFIG_DRM_DEBUG_SELFTEST is not set`
		`+ CONFIG_DRM_DP_HELPER=m`
		`CONFIG_DRM_KMS_HELPER=y`
		`CONFIG_DRM_FBDEV_EMULATION=y`
		`CONFIG_DRM_FBDEV_OVERALLOC=100`
		`CONFIG_DRM_LOAD_EDID_FIRMWARE=y`
		`CONFIG_DRM_DP_CEC=y`
		`CONFIG_DRM_TTM=m`
		`+ CONFIG_DRM_BUDDY=m`
		`CONFIG_DRM_VRAM_HELPER=m`
		`CONFIG_DRM_TTM_HELPER=m`
		`CONFIG_DRM_GEM_CMA_HELPER=m`
		`@@ -6484,6 +6633,7 @@`
		`CONFIG_DRM_BOCHS=m`
		`CONFIG_DRM_CIRRUS_QEMU=m`
		`CONFIG_DRM_GM12U320=m`
		`+ CONFIG_DRM_PANEL_MIPI_DBI=m`
		`CONFIG_DRM_SIMPLEDRM=y`
		`CONFIG_TINYDRM_HX8357D=m`
		`CONFIG_TINYDRM_ILI9163=m`
		`@@ -6498,6 +6648,8 @@`
		`CONFIG_DRM_XEN_FRONTEND=m`
		`CONFIG_DRM_VBOXVIDEO=m`
		`CONFIG_DRM_GUD=m`
		`+ CONFIG_DRM_SSD130X=m`
		`+ CONFIG_DRM_SSD130X_I2C=m`
		`CONFIG_DRM_HYPERV=m`
		`# CONFIG_DRM_LEGACY is not set`
		`CONFIG_DRM_PANEL_ORIENTATION_QUIRKS=y`
		`@@ -6873,8 +7025,10 @@`
		`CONFIG_SND_SOC_AMD_YC_MACH=m`
		`CONFIG_SND_AMD_ACP_CONFIG=m`
		`CONFIG_SND_SOC_AMD_ACP_COMMON=m`
		`+ CONFIG_SND_SOC_AMD_ACP_PDM=m`
		`CONFIG_SND_SOC_AMD_ACP_I2S=m`
		`CONFIG_SND_SOC_AMD_ACP_PCM=m`
		`+ CONFIG_SND_SOC_AMD_ACP_PCI=m`
		`CONFIG_SND_AMD_ASOC_RENOIR=m`
		`CONFIG_SND_SOC_AMD_MACH_COMMON=m`
		`CONFIG_SND_SOC_AMD_LEGACY_MACH=m`
		`@@ -6931,10 +7085,13 @@`
		`CONFIG_SND_SOC_INTEL_SKYLAKE_HDAUDIO_CODEC=y`
		`CONFIG_SND_SOC_INTEL_SKYLAKE_COMMON=m`
		`CONFIG_SND_SOC_ACPI_INTEL_MATCH=m`
		`+ CONFIG_SND_SOC_INTEL_AVS=m`
		`CONFIG_SND_SOC_INTEL_MACH=y`
		`CONFIG_SND_SOC_INTEL_USER_FRIENDLY_LONG_NAMES=y`
		`CONFIG_SND_SOC_INTEL_HDA_DSP_COMMON=m`
		`CONFIG_SND_SOC_INTEL_SOF_MAXIM_COMMON=m`
		`+ CONFIG_SND_SOC_INTEL_SOF_REALTEK_COMMON=m`
		`+ CONFIG_SND_SOC_INTEL_SOF_CIRRUS_COMMON=m`
		`CONFIG_SND_SOC_INTEL_HASWELL_MACH=m`
		`CONFIG_SND_SOC_INTEL_BDW_RT5650_MACH=m`
		`CONFIG_SND_SOC_INTEL_BDW_RT5677_MACH=m`
		`@@ -6974,6 +7131,7 @@`
		`CONFIG_SND_SOC_INTEL_CML_LP_DA7219_MAX98357A_MACH=m`
		`CONFIG_SND_SOC_INTEL_SOF_CML_RT1011_RT5682_MACH=m`
		`CONFIG_SND_SOC_INTEL_SOF_DA7219_MAX98373_MACH=m`
		`+ CONFIG_SND_SOC_INTEL_SOF_SSP_AMP_MACH=m`
		`CONFIG_SND_SOC_INTEL_EHL_RT5660_MACH=m`
		`CONFIG_SND_SOC_INTEL_SOUNDWIRE_SOF_MACH=m`
		`CONFIG_SND_SOC_MTK_BTCVSD=m`
		`@@ -6982,7 +7140,8 @@`
		`CONFIG_SND_SOC_SOF_PCI=m`
		`CONFIG_SND_SOC_SOF_ACPI=m`
		`CONFIG_SND_SOC_SOF_ACPI_DEV=m`
		`- # CONFIG_SND_SOC_SOF_DEBUG_PROBES is not set`
		`+ CONFIG_SND_SOC_SOF_DEBUG_PROBES=m`
		`+ CONFIG_SND_SOC_SOF_CLIENT=m`
		`CONFIG_SND_SOC_SOF=m`
		`CONFIG_SND_SOC_SOF_PROBE_WORK_QUEUE=y`
		`CONFIG_SND_SOC_SOF_AMD_TOPLEVEL=m`
		`@@ -7014,6 +7173,7 @@`
		`CONFIG_SND_SOC_SOF_HDA_AUDIO_CODEC=y`
		`CONFIG_SND_SOC_SOF_HDA_LINK_BASELINE=m`
		`CONFIG_SND_SOC_SOF_HDA=m`
		`+ CONFIG_SND_SOC_SOF_HDA_PROBES=y`
		`CONFIG_SND_SOC_SOF_INTEL_SOUNDWIRE_LINK_BASELINE=m`
		`CONFIG_SND_SOC_SOF_INTEL_SOUNDWIRE=m`
		`CONFIG_SND_SOC_SOF_XTENSA=m`
		`@@ -7058,6 +7218,7 @@`
		`CONFIG_SND_SOC_AK5386=m`
		`CONFIG_SND_SOC_AK5558=m`
		`CONFIG_SND_SOC_ALC5623=m`
		`+ CONFIG_SND_SOC_AW8738=m`
		`CONFIG_SND_SOC_BD28623=m`
		`# CONFIG_SND_SOC_BT_SCO is not set`
		`CONFIG_SND_SOC_CROS_EC_CODEC=m`
		`@@ -7199,6 +7360,7 @@`
		`CONFIG_SND_SOC_TAS5086=m`
		`CONFIG_SND_SOC_TAS571X=m`
		`CONFIG_SND_SOC_TAS5720=m`
		`+ CONFIG_SND_SOC_TAS5805M=m`
		`CONFIG_SND_SOC_TAS6424=m`
		`CONFIG_SND_SOC_TDA7419=m`
		`CONFIG_SND_SOC_TFA9879=m`
		`@@ -7263,6 +7425,7 @@`
		`CONFIG_SND_SOC_NAU8824=m`
		`CONFIG_SND_SOC_NAU8825=m`
		`CONFIG_SND_SOC_TPA6130A2=m`
		`+ CONFIG_SND_SOC_LPASS_MACRO_COMMON=m`
		`CONFIG_SND_SOC_LPASS_WSA_MACRO=m`
		`CONFIG_SND_SOC_LPASS_VA_MACRO=m`
		`CONFIG_SND_SOC_LPASS_RX_MACRO=m`
		`@@ -7324,6 +7487,7 @@`
		`CONFIG_HID_GLORIOUS=m`
		`CONFIG_HID_HOLTEK=m`
		`CONFIG_HOLTEK_FF=y`
		`+ CONFIG_HID_VIVALDI_COMMON=m`
		`CONFIG_HID_GOOGLE_HAMMER=m`
		`CONFIG_HID_VIVALDI=m`
		`CONFIG_HID_GT683R=m`
		`@@ -7375,12 +7539,14 @@`
		`CONFIG_HID_PLANTRONICS=m`
		`CONFIG_HID_PLAYSTATION=m`
		`CONFIG_PLAYSTATION_FF=y`
		`+ CONFIG_HID_RAZER=m`
		`CONFIG_HID_PRIMAX=m`
		`CONFIG_HID_RETRODE=m`
		`CONFIG_HID_ROCCAT=m`
		`CONFIG_HID_SAITEK=m`
		`CONFIG_HID_SAMSUNG=m`
		`CONFIG_HID_SEMITEK=m`
		`+ CONFIG_HID_SIGMAMICRO=m`
		`CONFIG_HID_SONY=m`
		`CONFIG_SONY_FF=y`
		`CONFIG_HID_SPEEDLINK=m`
		`@@ -7839,8 +8005,10 @@`
		`CONFIG_UCSI_CCG=m`
		`CONFIG_UCSI_ACPI=m`
		`CONFIG_TYPEC_TPS6598X=m`
		`+ CONFIG_TYPEC_RT1719=m`
		`CONFIG_TYPEC_HD3SS3220=m`
		`CONFIG_TYPEC_STUSB160X=m`
		`+ CONFIG_TYPEC_WUSB3801=m`

		`#`
		`# USB Type-C Multiplexer/DeMultiplexer Switch support`
		`@@ -8306,9 +8474,11 @@`
		`CONFIG_VFIO_PCI=m`
		`CONFIG_VFIO_PCI_VGA=y`
		`CONFIG_VFIO_PCI_IGD=y`
		`+ CONFIG_MLX5_VFIO_PCI=m`
		`CONFIG_VFIO_MDEV=m`
		`CONFIG_IRQ_BYPASS_MANAGER=m`
		`CONFIG_VIRT_DRIVERS=y`
		`+ CONFIG_VMGENID=y`
		`CONFIG_VBOXGUEST=m`
		`CONFIG_NITRO_ENCLAVES=m`
		`CONFIG_ACRN_HSM=m`
		`@@ -8424,7 +8594,6 @@`
		`# Analog to digital converters`
		`#`
		`CONFIG_AD7816=m`
		`- CONFIG_AD7280=m`
		`# end of Analog to digital converters`

		`#`
		`@@ -8489,18 +8658,10 @@`
		`CONFIG_DVB_AV7110_OSD=y`
		`CONFIG_DVB_BUDGET_PATCH=m`
		`CONFIG_DVB_SP8870=m`
		`-`
		`- #`
		`- # Android`
		`- #`
		`- CONFIG_ASHMEM=y`
		`- # end of Android`
		`-`
		`CONFIG_LTE_GDM724X=m`
		`CONFIG_FIREWIRE_SERIAL=m`
		`CONFIG_FWTTY_MAX_TOTAL_PORTS=64`
		`CONFIG_FWTTY_MAX_CARD_PORTS=32`
		`- CONFIG_GS_FPGABOOT=m`
		`CONFIG_UNISYSSPAR=y`
		`CONFIG_UNISYS_VISORNIC=m`
		`CONFIG_UNISYS_VISORINPUT=m`
		`@@ -8529,6 +8690,7 @@`
		`CONFIG_ACER_WIRELESS=m`
		`CONFIG_ACER_WMI=m`
		`CONFIG_AMD_PMC=m`
		`+ CONFIG_AMD_HSMP=m`
		`CONFIG_ADV_SWBUTTON=m`
		`CONFIG_APPLE_GMUX=m`
		`CONFIG_ASUS_LAPTOP=m`
		`@@ -8576,7 +8738,6 @@`
		`CONFIG_INTEL_ATOMISP2_PDX86=y`
		`CONFIG_INTEL_ATOMISP2_LED=m`
		`CONFIG_INTEL_SAR_INT1092=m`
		`- CONFIG_INTEL_CHT_INT33FE=m`
		`CONFIG_INTEL_SKL_INT3472=m`
		`CONFIG_INTEL_PMC_CORE=y`
		`CONFIG_INTEL_PMT_CLASS=m`
		`@@ -8593,19 +8754,27 @@`
		`CONFIG_INTEL_WMI=y`
		`CONFIG_INTEL_WMI_SBL_FW_UPDATE=m`
		`CONFIG_INTEL_WMI_THUNDERBOLT=m`
		`+`
		`+ #`
		`+ # Intel Uncore Frequency Control`
		`+ #`
		`+ CONFIG_INTEL_UNCORE_FREQ_CONTROL=m`
		`+ # end of Intel Uncore Frequency Control`
		`+`
		`CONFIG_INTEL_HID_EVENT=m`
		`CONFIG_INTEL_VBTN=m`
		`CONFIG_INTEL_INT0002_VGPIO=m`
		`CONFIG_INTEL_OAKTRAIL=m`
		`CONFIG_INTEL_BXTWC_PMIC_TMU=m`
		`CONFIG_INTEL_CHTDC_TI_PWRBTN=m`
		`+ CONFIG_INTEL_CHTWC_INT33FE=m`
		`CONFIG_INTEL_ISHTP_ECLITE=m`
		`CONFIG_INTEL_MRFLD_PWRBTN=m`
		`CONFIG_INTEL_PUNIT_IPC=m`
		`CONFIG_INTEL_RST=m`
		`+ CONFIG_INTEL_SDSI=m`
		`CONFIG_INTEL_SMARTCONNECT=m`
		`CONFIG_INTEL_TURBO_MAX_3=y`
		`- CONFIG_INTEL_UNCORE_FREQ_CONTROL=m`
		`CONFIG_INTEL_VSEC=m`
		`CONFIG_MSI_LAPTOP=m`
		`CONFIG_MSI_WMI=m`
		`@@ -8625,7 +8794,7 @@`
		`CONFIG_SONYPI_COMPAT=y`
		`CONFIG_SYSTEM76_ACPI=m`
		`CONFIG_TOPSTAR_LAPTOP=m`
		`- CONFIG_I2C_MULTI_INSTANTIATE=m`
		`+ CONFIG_SERIAL_MULTI_INSTANTIATE=m`
		`CONFIG_MLX_PLATFORM=m`
		`CONFIG_TOUCHSCREEN_DMI=y`
		`CONFIG_X86_ANDROID_TABLETS=m`
		`@@ -8657,6 +8826,7 @@`
		`CONFIG_CROS_EC_TYPEC=m`
		`CONFIG_CROS_USBPD_LOGGER=m`
		`CONFIG_CROS_USBPD_NOTIFY=m`
		`+ CONFIG_CHROMEOS_PRIVACY_SCREEN=m`
		`CONFIG_WILCO_EC=m`
		`CONFIG_WILCO_EC_DEBUGFS=m`
		`CONFIG_WILCO_EC_EVENTS=m`
		`@@ -8667,7 +8837,6 @@`
		`CONFIG_MLXREG_LC=m`
		`CONFIG_SURFACE_PLATFORMS=y`
		`CONFIG_SURFACE3_WMI=m`
		`- CONFIG_SURFACE_3_BUTTON=m`
		`CONFIG_SURFACE_3_POWER_OPREGION=m`
		`CONFIG_SURFACE_ACPI_NOTIFY=m`
		`CONFIG_SURFACE_AGGREGATOR_CDEV=m`
		`@@ -8725,7 +8894,7 @@`
		`CONFIG_IOMMU_DEFAULT_DMA_LAZY=y`
		`# CONFIG_IOMMU_DEFAULT_PASSTHROUGH is not set`
		`CONFIG_IOMMU_DMA=y`
		`- CONFIG_IOMMU_SVA_LIB=y`
		`+ CONFIG_IOMMU_SVA=y`
		`CONFIG_AMD_IOMMU=y`
		`CONFIG_AMD_IOMMU_V2=y`
		`CONFIG_DMAR_TABLE=y`
		`@@ -8750,6 +8919,7 @@`
		`#`
		`CONFIG_RPMSG=m`
		`CONFIG_RPMSG_CHAR=m`
		`+ CONFIG_RPMSG_CTRL=m`
		`CONFIG_RPMSG_NS=m`
		`CONFIG_RPMSG_QCOM_GLINK=m`
		`CONFIG_RPMSG_QCOM_GLINK_RPM=m`
		`@@ -8876,6 +9046,9 @@`
		`CONFIG_ADXL355=m`
		`CONFIG_ADXL355_I2C=m`
		`CONFIG_ADXL355_SPI=m`
		`+ CONFIG_ADXL367=m`
		`+ CONFIG_ADXL367_SPI=m`
		`+ CONFIG_ADXL367_I2C=m`
		`CONFIG_ADXL372=m`
		`CONFIG_ADXL372_SPI=m`
		`CONFIG_ADXL372_I2C=m`
		`@@ -8929,6 +9102,7 @@`
		`CONFIG_AD7124=m`
		`CONFIG_AD7192=m`
		`CONFIG_AD7266=m`
		`+ CONFIG_AD7280=m`
		`CONFIG_AD7291=m`
		`CONFIG_AD7292=m`
		`CONFIG_AD7298=m`
		`@@ -9010,6 +9184,7 @@`
		`# Amplifiers`
		`#`
		`CONFIG_AD8366=m`
		`+ CONFIG_ADA4250=m`
		`CONFIG_HMC425=m`
		`# end of Amplifiers`

		`@@ -9087,6 +9262,7 @@`
		`CONFIG_AD5593R=m`
		`CONFIG_AD5504=m`
		`CONFIG_AD5624R_SPI=m`
		`+ CONFIG_LTC2688=m`
		`CONFIG_AD5686=m`
		`CONFIG_AD5686_SPI=m`
		`CONFIG_AD5696_I2C=m`
		`@@ -9142,6 +9318,8 @@`
		`CONFIG_ADF4350=m`
		`CONFIG_ADF4371=m`
		`CONFIG_ADMV1013=m`
		`+ CONFIG_ADMV1014=m`
		`+ CONFIG_ADMV4420=m`
		`CONFIG_ADRF6780=m`
		`# end of Phase-Locked Loop (PLL) frequency synthesizers`
		`# end of Frequency Synthesizers DDS/PLL`
		`@@ -9409,7 +9587,10 @@`
		`CONFIG_PING=m`
		`CONFIG_RFD77402=m`
		`CONFIG_SRF04=m`
		`+ CONFIG_SX_COMMON=m`
		`CONFIG_SX9310=m`
		`+ CONFIG_SX9324=m`
		`+ CONFIG_SX9360=m`
		`CONFIG_SX9500=m`
		`CONFIG_SRF08=m`
		`CONFIG_VCNL3020=m`
		`@@ -9508,8 +9689,6 @@`
		`CONFIG_INTEL_RAPL_CORE=m`
		`CONFIG_INTEL_RAPL=m`
		`CONFIG_IDLE_INJECT=y`
		`- CONFIG_DTPM=y`
		`- CONFIG_DTPM_CPU=y`
		`CONFIG_MCB=m`
		`CONFIG_MCB_PCI=m`
		`CONFIG_MCB_LPC=m`
		`@@ -9538,7 +9717,6 @@`

		`CONFIG_LIBNVDIMM=y`
		`CONFIG_BLK_DEV_PMEM=m`
		`- CONFIG_ND_BLK=m`
		`CONFIG_ND_CLAIM=y`
		`CONFIG_ND_BTT=m`
		`CONFIG_BTT=y`
		`@@ -9626,6 +9804,7 @@`
		`CONFIG_MOST_USB_HDM=m`
		`CONFIG_MOST_CDEV=m`
		`CONFIG_MOST_SND=m`
		`+ # CONFIG_PECI is not set`
		`# end of Device Drivers`

		`#`
		`@@ -9694,6 +9873,7 @@`
		`CONFIG_F2FS_FS_LZ4HC=y`
		`CONFIG_F2FS_FS_ZSTD=y`
		`CONFIG_F2FS_IOSTAT=y`
		`+ CONFIG_F2FS_UNFAIR_RWSEM=y`
		`CONFIG_ZONEFS_FS=m`
		`CONFIG_FS_DAX=y`
		`CONFIG_FS_DAX_PMD=y`
		`@@ -9939,7 +10119,6 @@`
		`# CONFIG_NFS_V4_2_READ_PLUS is not set`
		`CONFIG_NFSD=m`
		`CONFIG_NFSD_V2_ACL=y`
		`- CONFIG_NFSD_V3=y`
		`CONFIG_NFSD_V3_ACL=y`
		`CONFIG_NFSD_V4=y`
		`CONFIG_NFSD_PNFS=y`
		`@@ -10059,13 +10238,13 @@`
		`CONFIG_PERSISTENT_KEYRINGS=y`
		`CONFIG_TRUSTED_KEYS=m`
		`CONFIG_ENCRYPTED_KEYS=m`
		`+ # CONFIG_USER_DECRYPTED_DATA is not set`
		`CONFIG_KEY_DH_OPERATIONS=y`
		`CONFIG_KEY_NOTIFICATIONS=y`
		`CONFIG_SECURITY_DMESG_RESTRICT=y`
		`CONFIG_SECURITY=y`
		`CONFIG_SECURITYFS=y`
		`CONFIG_SECURITY_NETWORK=y`
		`- CONFIG_PAGE_TABLE_ISOLATION=y`
		`CONFIG_SECURITY_INFINIBAND=y`
		`CONFIG_SECURITY_NETWORK_XFRM=y`
		`CONFIG_SECURITY_PATH=y`
		`@@ -10108,14 +10287,24 @@`
		`# CONFIG_LOCK_DOWN_KERNEL_FORCE_INTEGRITY is not set`
		`# CONFIG_LOCK_DOWN_KERNEL_FORCE_CONFIDENTIALITY is not set`
		`CONFIG_SECURITY_LANDLOCK=y`
		`- # CONFIG_INTEGRITY is not set`
		`+ CONFIG_INTEGRITY=y`
		`+ CONFIG_INTEGRITY_SIGNATURE=y`
		`+ CONFIG_INTEGRITY_ASYMMETRIC_KEYS=y`
		`+ CONFIG_INTEGRITY_TRUSTED_KEYRING=y`
		`+ CONFIG_INTEGRITY_PLATFORM_KEYRING=y`
		`+ CONFIG_INTEGRITY_MACHINE_KEYRING=y`
		`+ CONFIG_LOAD_UEFI_KEYS=y`
		`+ CONFIG_INTEGRITY_AUDIT=y`
		`+ # CONFIG_IMA is not set`
		`+ # CONFIG_IMA_KEYRINGS_PERMIT_SIGNED_BY_BUILTIN_OR_SECONDARY is not set`
		`# CONFIG_IMA_SECURE_AND_OR_TRUSTED_BOOT is not set`
		`+ # CONFIG_EVM is not set`
		`# CONFIG_DEFAULT_SECURITY_SELINUX is not set`
		`# CONFIG_DEFAULT_SECURITY_SMACK is not set`
		`# CONFIG_DEFAULT_SECURITY_TOMOYO is not set`
		`# CONFIG_DEFAULT_SECURITY_APPARMOR is not set`
		`CONFIG_DEFAULT_SECURITY_DAC=y`
		`- CONFIG_LSM="landlock,lockdown,yama,bpf"`
		`+ CONFIG_LSM="landlock,lockdown,yama,integrity,bpf"`

		`#`
		`# Kernel hardening options`
		`@@ -10184,6 +10373,7 @@`
		`#`
		`CONFIG_CRYPTO_RSA=y`
		`CONFIG_CRYPTO_DH=y`
		`+ CONFIG_CRYPTO_DH_RFC7919_GROUPS=y`
		`CONFIG_CRYPTO_ECC=y`
		`CONFIG_CRYPTO_ECDH=m`
		`CONFIG_CRYPTO_ECDSA=y`
		`@@ -10243,6 +10433,7 @@`
		`CONFIG_CRYPTO_BLAKE2S_X86=m`
		`CONFIG_CRYPTO_CRCT10DIF=y`
		`CONFIG_CRYPTO_CRCT10DIF_PCLMUL=m`
		`+ CONFIG_CRYPTO_CRC64_ROCKSOFT=y`
		`CONFIG_CRYPTO_GHASH=m`
		`CONFIG_CRYPTO_POLY1305=m`
		`CONFIG_CRYPTO_POLY1305_X86_64=m`
		`@@ -10258,6 +10449,7 @@`
		`CONFIG_CRYPTO_SHA512=y`
		`CONFIG_CRYPTO_SHA3=m`
		`CONFIG_CRYPTO_SM3=m`
		`+ CONFIG_CRYPTO_SM3_AVX_X86_64=m`
		`CONFIG_CRYPTO_STREEBOG=m`
		`CONFIG_CRYPTO_WP512=m`
		`CONFIG_CRYPTO_GHASH_CLMUL_NI_INTEL=m`
		`@@ -10358,10 +10550,8 @@`
		`CONFIG_CRYPTO_DEV_AMLOGIC_GXL_DEBUG=y`
		`CONFIG_ASYMMETRIC_KEY_TYPE=y`
		`CONFIG_ASYMMETRIC_PUBLIC_KEY_SUBTYPE=y`
		`- CONFIG_ASYMMETRIC_TPM_KEY_SUBTYPE=m`
		`CONFIG_X509_CERTIFICATE_PARSER=y`
		`CONFIG_PKCS8_PRIVATE_KEY_PARSER=m`
		`- CONFIG_TPM_KEY_PARSER=m`
		`CONFIG_PKCS7_MESSAGE_PARSER=y`
		`# CONFIG_PKCS7_TEST_KEY is not set`
		`CONFIG_SIGNED_PE_FILE_VERIFICATION=y`
		`@@ -10424,12 +10614,15 @@`
		`CONFIG_CRYPTO_LIB_POLY1305=m`
		`CONFIG_CRYPTO_LIB_CHACHA20POLY1305=m`
		`CONFIG_CRYPTO_LIB_SHA256=y`
		`+ CONFIG_CRYPTO_LIB_SM3=m`
		`CONFIG_CRYPTO_LIB_SM4=m`
		`# end of Crypto library routines`

		`+ CONFIG_LIB_MEMNEQ=y`
		`CONFIG_CRC_CCITT=y`
		`CONFIG_CRC16=m`
		`CONFIG_CRC_T10DIF=y`
		`+ CONFIG_CRC64_ROCKSOFT=y`
		`CONFIG_CRC_ITU_T=m`
		`CONFIG_CRC32=y`
		`# CONFIG_CRC32_SELFTEST is not set`
		`@@ -10437,7 +10630,7 @@`
		`# CONFIG_CRC32_SLICEBY4 is not set`
		`# CONFIG_CRC32_SARWATE is not set`
		`# CONFIG_CRC32_BIT is not set`
		`- CONFIG_CRC64=m`
		`+ CONFIG_CRC64=y`
		`CONFIG_CRC4=m`
		`CONFIG_CRC7=m`
		`CONFIG_LIBCRC32C=m`
		`@@ -10520,6 +10713,7 @@`
		`CONFIG_CLZ_TAB=y`
		`CONFIG_IRQ_POLL=y`
		`CONFIG_MPILIB=y`
		`+ CONFIG_SIGNATURE=y`
		`CONFIG_DIMLIB=y`
		`CONFIG_OID_REGISTRY=y`
		`CONFIG_UCS2_STRING=y`
		`@@ -10575,18 +10769,24 @@`
		`CONFIG_DEBUG_BUGVERBOSE=y`
		`# end of printk and dmesg options`

		`+ CONFIG_DEBUG_KERNEL=y`
		`+ # CONFIG_DEBUG_MISC is not set`
		`+`
		`#`
		`# Compile-time checks and compiler options`
		`#`
		`CONFIG_DEBUG_INFO=y`
		`+ # CONFIG_DEBUG_INFO_NONE is not set`
		`+ # CONFIG_DEBUG_INFO_DWARF_TOOLCHAIN_DEFAULT is not set`
		`+ # CONFIG_DEBUG_INFO_DWARF4 is not set`
		`+ CONFIG_DEBUG_INFO_DWARF5=y`
		`# CONFIG_DEBUG_INFO_REDUCED is not set`
		`# CONFIG_DEBUG_INFO_COMPRESSED is not set`
		`# CONFIG_DEBUG_INFO_SPLIT is not set`
		`- # CONFIG_DEBUG_INFO_DWARF_TOOLCHAIN_DEFAULT is not set`
		`- CONFIG_DEBUG_INFO_DWARF4=y`
		`CONFIG_DEBUG_INFO_BTF=y`
		`CONFIG_PAHOLE_HAS_SPLIT_BTF=y`
		`CONFIG_DEBUG_INFO_BTF_MODULES=y`
		`+ # CONFIG_MODULE_ALLOW_BTF_MISMATCH is not set`
		`# CONFIG_GDB_SCRIPTS is not set`
		`CONFIG_FRAME_WARN=2048`
		`CONFIG_STRIP_ASM_SYMS=y`
		`@@ -10618,9 +10818,6 @@`
		`# CONFIG_KCSAN is not set`
		`# end of Generic Kernel Debugging Instruments`

		`- CONFIG_DEBUG_KERNEL=y`
		`- # CONFIG_DEBUG_MISC is not set`
		`-`
		`#`
		`# Networking Debugging`
		`#`
		`@@ -10668,6 +10865,7 @@`
		`CONFIG_KFENCE=y`
		`CONFIG_KFENCE_SAMPLE_INTERVAL=100`
		`CONFIG_KFENCE_NUM_OBJECTS=255`
		`+ CONFIG_KFENCE_DEFERRABLE=y`
		`CONFIG_KFENCE_STRESS_TEST_FAULTS=0`
		`# end of Memory Debugging`

		`@@ -10760,6 +10958,8 @@`
		`CONFIG_LATENCYTOP=y`
		`CONFIG_USER_STACKTRACE_SUPPORT=y`
		`CONFIG_NOP_TRACER=y`
		`+ CONFIG_HAVE_RETHOOK=y`
		`+ CONFIG_RETHOOK=y`
		`CONFIG_HAVE_FUNCTION_TRACER=y`
		`CONFIG_HAVE_FUNCTION_GRAPH_TRACER=y`
		`CONFIG_HAVE_DYNAMIC_FTRACE=y`
		`@@ -10789,6 +10989,7 @@`
		`CONFIG_DYNAMIC_FTRACE_WITH_REGS=y`
		`CONFIG_DYNAMIC_FTRACE_WITH_DIRECT_CALLS=y`
		`CONFIG_DYNAMIC_FTRACE_WITH_ARGS=y`
		`+ CONFIG_FPROBE=y`
		`CONFIG_FUNCTION_PROFILER=y`
		`CONFIG_STACK_TRACER=y`
		`# CONFIG_IRQSOFF_TRACER is not set`
		`@@ -10897,7 +11098,6 @@`
		`# CONFIG_TEST_BITMAP is not set`
		`# CONFIG_TEST_UUID is not set`
		`# CONFIG_TEST_XARRAY is not set`
		`- # CONFIG_TEST_OVERFLOW is not set`
		`# CONFIG_TEST_RHASHTABLE is not set`
		`# CONFIG_TEST_SIPHASH is not set`
		`# CONFIG_TEST_IDA is not set`
		`@@ -10916,7 +11116,6 @@`
		`# CONFIG_TEST_KMOD is not set`
		`# CONFIG_TEST_MEMCAT_P is not set`
		`# CONFIG_TEST_OBJAGG is not set`
		`- # CONFIG_TEST_STACKINIT is not set`
		`# CONFIG_TEST_MEMINIT is not set`
		`# CONFIG_TEST_HMM is not set`
		`# CONFIG_TEST_FREE_PAGES is not set`

libre/linux-libre-tools/PKGBUILD

file modified

+1 -1

		`@@ -1,4 +1,4 @@`
		`- # Maintainer (Arch): Sébastien Luttringer`
		`+ # Maintainer (arch): Sébastien Luttringer`
		`# Maintainer: David P. <megver83@parabola.nu>`
		`# Contributor: Omar Vega Ramos <ovruni@gnu.org.pe>`
		`# Contributor: André Silva <emulatorman@hyperbola.info>`

libre/linux-libre-vanilla/PKGBUILD

file modified

+5 -5

		`@@ -6,7 +6,7 @@`
		`# Contributor: Michał Masłowski <mtjm@mtjm.eu>`
		`# Contributor: Luke R. <g4jc@openmailbox.org>`
		`# Contributor: Andreas Grapentin <andreas@grapentin.org>`
		`- # Maintainers: Parabola hackers <dev@lists.parabola.nu>`
		`+ # Maintainer: Parabola Hackers <dev@lists.parabola.nu>`

		`# Based on linux package`

		`@@ -15,7 +15,7 @@`
		`_replacesoldmodules=() # '%' gets replaced with kernel suffix`

		`pkgbase=linux-libre-vanilla`
		`- pkgver=5.17.8`
		`+ pkgver=6.0.10`
		`pkgrel=1`
		`pkgdesc='Linux-libre without additional patches'`
		`url='https://linux-libre.fsfla.org/'`
		`@@ -28,7 +28,7 @@`
		`makedepends=( ${makedepends[*]/git/} )`
		`makedepends_armv7h=(uboot-tools vboot-utils dtc) # required by linux-libre-chromebook`
		`options=('!strip')`
		`- _srcname=linux-5.17`
		`+ _srcname=linux-6.0`
		`source=(`
		`"https://linux-libre.fsfla.org/pub/linux-libre/releases/${_srcname##-}-gnu/linux-libre-${_srcname##-}-gnu.tar.xz"{,.sign}`
		`"https://linux-libre.fsfla.org/pub/linux-libre/releases/$pkgver-gnu/patch-${_srcname##*-}-gnu-$pkgver-gnu.xz"{,.sign}`
		`@@ -42,9 +42,9 @@`
		`'474402C8C582DAFBE389C427BCB7CF877E7D47A7' # Alexandre Oliva`
		`'6DB9C4B4F0D8C0DC432CF6E4227CA7C556B2BA78' # David P.`
		`)`
		`- sha512sums=('565de7f956e40a931858cb29b61619f25fc57ce588b8762bef806e470d20bbbdf98a6e1c55eccae61a7365c0ecaae4825d81f7eec8689911710949ba5b34ce0c'`
		`+ sha512sums=('2e37b90d6e89da5984c8e8da9ff5f984b429ac20518d1243c9a77bced0272eae64eef7d26e2065b58d279c53eea9710db8adca170d55f460dde11e113fe52a06'`
		`'SKIP'`
		`- '71ba9ae3f75d72d2d86cc8cab1df463725e00088fb93b09553066a9b968d3a32abed77fac6011433377ac2970c8149a28e85ed25429da7dec56b47ba871cd4ae'`
		`+ 'c164243a7c409268d0f9b362a9995749c0ee522ee2d9a048ee8b0207ff8cf32c47d7dd1023ec0a71a6a97aca224f6d241cbb74140833da54428f1f89edc96738'`
		`'SKIP'`
		`'13cb5bc42542e7b8bb104d5f68253f6609e463b6799800418af33eb0272cc269aaa36163c3e6f0aacbdaaa1d05e2827a4a7c4a08a029238439ed08b89c564bb3'`
		`'SKIP'`

libre/linux-libre/0001-ZEN-Add-sysctl-and-CONFIG-to-disallow-unprivileged-C.patch

file modified

+7 -7

		`@@ -1,7 +1,7 @@`
		`- From 9baf57b4c2d9348bd5adecbb893870d1d79fade1 Mon Sep 17 00:00:00 2001`
		`+ From 63cec1d1efdb31caeef17411c7560e8b0f941073 Mon Sep 17 00:00:00 2001`
		`From: "Jan Alexander Steffens (heftig)" <jan.steffens@gmail.com>`
		`Date: Mon, 16 Sep 2019 04:53:20 +0200`
		`- Subject: [PATCH 1/2] ZEN: Add sysctl and CONFIG to disallow unprivileged`
		`+ Subject: [PATCH 1/3] ZEN: Add sysctl and CONFIG to disallow unprivileged`
		`CLONE_NEWUSER`

		`Our default behavior continues to match the vanilla kernel.`
		`@@ -36,10 +36,10 @@`
		`{`
		`return &init_user_ns;`
		`diff --git a/init/Kconfig b/init/Kconfig`
		`- index b19e2eeaae80..2c2e01d76076 100644`
		`+ index fa63cc019ebf..5aa29feccae3 100644`
		`--- a/init/Kconfig`
		`+++ b/init/Kconfig`
		`- @@ -1240,6 +1240,22 @@ config USER_NS`
		`+ @@ -1249,6 +1249,22 @@ config USER_NS`

		`If unsure, say N.`

		`@@ -102,7 +102,7 @@`
		`if (err)`
		`goto bad_unshare_out;`
		`diff --git a/kernel/sysctl.c b/kernel/sysctl.c`
		`- index 830aaf8ca08e..af4c0806bd8e 100644`
		`+ index c42ba2d669dc..a6ddbf02a809 100644`
		`--- a/kernel/sysctl.c`
		`+++ b/kernel/sysctl.c`
		`@@ -91,6 +91,9 @@`
		`@@ -115,7 +115,7 @@`

		`#if defined(CONFIG_SYSCTL)`

		`- @@ -1803,6 +1806,15 @@ static struct ctl_table kern_table[] = {`
		`+ @@ -1806,6 +1809,15 @@ static struct ctl_table kern_table[] = {`
		`.mode = 0644,`
		`.proc_handler = proc_dointvec,`
		`},`
		`@@ -150,5 +150,5 @@`
		`static DEFINE_MUTEX(userns_state_mutex);`

		`--`
		`- 2.36.1`
		`+ 2.37.1`

libre/linux-libre/0002-HID-apple-Properly-handle-function-keys-on-Keychron-.patch

file modified

+3 -3

		`@@ -1,7 +1,7 @@`
		`- From e410435c977a01e386fda83b5215540365a0086f Mon Sep 17 00:00:00 2001`
		`+ From 4b81eecd4c636d953aaf4ebafd8171716f4c61fe Mon Sep 17 00:00:00 2001`
		`From: Bryan Cain <bryancain3@gmail.com>`
		`Date: Thu, 5 May 2022 13:12:21 -0600`
		`- Subject: [PATCH 2/2] HID: apple: Properly handle function keys on Keychron`
		`+ Subject: [PATCH 2/3] HID: apple: Properly handle function keys on Keychron`
		`keyboards`
		`MIME-Version: 1.0`
		`Content-Type: text/plain; charset=UTF-8`
		`@@ -103,5 +103,5 @@`
		`}`

		`--`
		`- 2.36.1`
		`+ 2.37.1`

libre/linux-libre/0003-soundwire-Raise-DEFAULT_PROBE_TIMEOUT-to-10000-ms.patch

file added

+26

		`@@ -0,0 +1,26 @@`
		`+ From 2da21cf28e573b84e5a5baecc1eda7372322375d Mon Sep 17 00:00:00 2001`
		`+ From: "Jan Alexander Steffens (heftig)" <heftig@archlinux.org>`
		`+ Date: Sat, 23 Jul 2022 11:14:46 +0200`
		`+ Subject: [PATCH 3/3] soundwire: Raise DEFAULT_PROBE_TIMEOUT to 10000 ms`
		`+`
		`+ See: https://github.com/thesofproject/linux/issues/3777#issuecomment-1192655300`
		`+ ---`
		`+ drivers/soundwire/bus.h \| 2 +-`
		`+ 1 file changed, 1 insertion(+), 1 deletion(-)`
		`+`
		`+ diff --git a/drivers/soundwire/bus.h b/drivers/soundwire/bus.h`
		`+ index 7631ef5e71fb..d3ed828daac0 100644`
		`+ --- a/drivers/soundwire/bus.h`
		`+ +++ b/drivers/soundwire/bus.h`
		`+ @@ -5,7 +5,7 @@`
		`+ #define __SDW_BUS_H`
		`+`
		`+ #define DEFAULT_BANK_SWITCH_TIMEOUT 3000`
		`+ -#define DEFAULT_PROBE_TIMEOUT 2000`
		`+ +#define DEFAULT_PROBE_TIMEOUT 10000`
		`+`
		`+ u64 sdw_dmi_override_adr(struct sdw_bus *bus, u64 addr);`
		`+`
		`+ --`
		`+ 2.37.1`
		`+`

libre/linux-libre/PKGBUILD

file modified

+14 -13

		`@@ -14,11 +14,11 @@`
		`_replacesoldmodules=() # '%' gets replaced with kernel suffix`

		`pkgbase=linux-libre`
		`- pkgver=5.18.5`
		`+ pkgver=5.18.14`
		`pkgrel=1`
		`pkgdesc='Linux-libre'`
		`- rcnver=5.18.2`
		`- rcnrel=armv7-x6`
		`+ rcnver=5.18.12`
		`+ rcnrel=armv7-x8`
		`url='https://linux-libre.fsfla.org/'`
		`arch=(i686 x86_64 armv7h)`
		`license=(GPL2)`
		`@@ -47,6 +47,7 @@`
		`# Arch Linux patches`
		`0001-ZEN-Add-sysctl-and-CONFIG-to-disallow-unprivileged-C.patch`
		`0002-HID-apple-Properly-handle-function-keys-on-Keychron-.patch`
		`+ 0003-soundwire-Raise-DEFAULT_PROBE_TIMEOUT-to-10000-ms.patch`
		`)`
		`source_i686=(`
		`# avoid using zstd compression in ultra mode (exhausts virtual memory)`
		`@@ -72,7 +73,7 @@`
		`)`
		`sha512sums=('13be3762fffd74c63eeb23b0d34b994a3e5198bfdbda4f013b38f8d3edd24b9bbebe5a4bfde0f5191aa1cf2678e4517f3b5540a40b30ebc05da1f6708cbb98bb'`
		`'SKIP'`
		`- '9355c0f22606c0401e8a01d6e22f0fa6e97b69a9fce6d991235da6430907fb6a788fca30bd48e5cbb743cc4a211a40806c896f660db7432e7bc85ba7634b5d06'`
		`+ '9016e87060d3ddbf4bad5adee54f07cba3930a23a5c2a7ca32338a98d0c51676228f3d97405c624f2f48a67849f9b40a5dc670e10fbc02bc75cc4d47deab4c34'`
		`'SKIP'`
		`'13cb5bc42542e7b8bb104d5f68253f6609e463b6799800418af33eb0272cc269aaa36163c3e6f0aacbdaaa1d05e2827a4a7c4a08a029238439ed08b89c564bb3'`
		`'SKIP'`
		`@@ -80,8 +81,8 @@`
		`'SKIP'`
		`'267295aa0cea65684968420c68b32f1a66a22d018b9d2b2c1ef14267bcf4cb68aaf7099d073cbfefe6c25c8608bdcbbd45f7ac8893fdcecbf1e621abdfe9ecc1'`
		`'SKIP'`
		`- 'bcec71d3bd1daaa27bdf4c9a10f0b302b915e8236ef47b5e6d6eaf65bfd0b34644d8d3ff6c25d894ae21dedbece3c1f1ff152fbf8525b77100bc790d0541f3f1'`
		`- 'e141c387e8045030278d683a1294bfd3d13197bf3466a9c89c4f72a53aafed606acc8e42e528479527c638af895bce2303944b5d8b8a29040f5aae8a9581dd5a'`
		`+ '9833a9caf788aa928b7c4fab85205259459cc65ccf2b1ef1af8f9dfecf8804829aa4c1f0571a1a0819c6e838ab3f32a5322df9ddb07a201bc43c66ad6c3b2f3b'`
		`+ '9112373138102b14ca900156afc6292334fc2b9ee542f1f5264ff2b6dc82073f761e9caf35aff56fb47cb285fbc2c4421f6d89c1d417f823f38b1e3f287d9294'`
		`'47d16ffc94510d4a8773146a46cfb35aca8cfdae38d17283334cd62d92de36250fbec90e9892357033398ecc7d970127b1a41b703a8372972422ca4af7c90c70'`
		`'53103bf55b957b657039510527df0df01279dec59cda115a4d6454e4135025d4546167fa30bdc99107f232561c1e096d8328609ab5a876cf7017176f92ad3e0b'`
		`'f10af02f0cb2d31259d9633e1ba845f555f525789f750fc2ddc51bd18c5ff64fcdd242dae801623887f5ce5cdb5528bce890459f0fab9fd31a28868bb7f6bba5'`
		`@@ -89,10 +90,11 @@`
		`'143dea30c6da00e504c99984a98a0eb2411f558fcdd9dfa7f607d6c14e9e7dffff9cb00121d9317044b07e3e210808286598c785ee854084b993ec9cb14d8232'`
		`'02af4dd2a007e41db0c63822c8ab3b80b5d25646af1906dc85d0ad9bb8bbf5236f8e381d7f91cf99ed4b0978c50aee37cb9567cdeef65b7ec3d91b882852b1af'`
		`'b8fe56e14006ab866970ddbd501c054ae37186ddc065bb869cf7d18db8c0d455118d5bda3255fb66a0dde38b544655cfe9040ffe46e41d19830b47959b2fb168'`
		`- '1b6c3108d5628ca6db20c2bc3431e560ab2a274aaf863e7a796f1931a35982d175247f47cbfbb7d643ffc6b742442806755bb10339e5b0577c3f232b38288891'`
		`- 'bf6d9a66be49c2cc67b0a0f3cfb61734adf7a3b032b5ed133e1e0afbf4a6ddbd3e8231e4b85fef2e3aeb7274a60f7572a4469c057ff13d81134613f01767d3b2')`
		`+ '671ab29fb1858c3898792164ac49d57103ecdeff220d7b262efb0c74ee270a670cf40f746a76f400513019989d858326fb3da507a0159418215e0b645011c406'`
		`+ '2fecb2fb31981af21e17ce08c8352236f8817e6000f7e542f7479eaa7300238c4581f992b4da4d49dd2657d3e3c038eb0369954559f233b2913c382ef25b5753'`
		`+ '816ad9cb93a473376487234d4bf255f7d081c37186b1715e914c2c30dcdcfaee7b6db4eeb427969190d0cffa7499bc99c95ef58fb8c632d27e51d0350990f0ce')`
		`sha512sums_i686=('bca15cc96f64c38adcd13a46752866b5b30555ac21e19b3f7afcd20fcb7ec585c9d990fe8f842f44d5f69d477d72867fe6a9102729f26f93f5a80b372e41ce85')`
		`- sha512sums_armv7h=('5a75b12dd386940a0bf1be630d45a514ef3c32289ec5976988764baa8483b254e5dcc879337556bfa041b6dbf9ac16debbe4b57bf86db30089661e9536ffaa0a'`
		`+ sha512sums_armv7h=('94c6243d23bc995dec3edcb1dd5cc7d5e7d30fec70fc32b9be5f3e7d934da7035e9152fea3cce58a53b0f35f29060bdef2a3a2dac3c46f520adf1088897362f9'`
		`'SKIP'`
		`'8da996a42249672893fa532ccbd096347580a0dc1698c45e9c865646e2765789553b1bb42793e721de30aea70340fdc116d2e4a50580fef999ca5fc627aaf4c3'`
		`'0e6ddc24011d77a2e422b642c4507317fc2d26b20f5649818a2f11acac165ccab2cf2e64ab50d44ce7affcfe12c2ef5158790e499058831e7995400b2087df78'`
		`@@ -175,8 +177,7 @@`

		`build() {`
		`cd $_srcname`
		`- make all`
		`- make htmldocs`
		`+ make htmldocs all`
		`}`

		`_package() {`
		`@@ -236,7 +237,7 @@`
		`localversion.* version vmlinux`
		`install -Dt "$builddir/kernel" -m644 kernel/Makefile`
		`install -Dt "$builddir/arch/$KARCH" -m644 arch/$KARCH/Makefile`
		`- if [[ $CARCH = i686 ]]; then`
		`+ if [ "$CARCH" = i686 ]; then`
		`install -Dt "$builddir/arch/$KARCH" -m644 arch/$KARCH/Makefile_32.cpu`
		`fi`
		`cp -t "$builddir" -a scripts`
		`@@ -379,7 +380,7 @@`
		`}`

		`pkgname=("$pkgbase" "$pkgbase-headers" "$pkgbase-docs")`
		`- [[ $CARCH = armv7h ]] && pkgname+=("$pkgbase-chromebook")`
		`+ [ "$CARCH" = armv7h ] && pkgname+=("$pkgbase-chromebook")`
		`for _p in "${pkgname[@]}"; do`
		`eval "package_$_p() {`
		`$(declare -f "_package${_p#$pkgbase}")`

libre/linux-libre/config.i686

file modified

+31 -8

		`@@ -1,6 +1,6 @@`
		`#`
		`# Automatically generated file; DO NOT EDIT.`
		`- # Linux/x86 5.18.5-gnu Kernel Configuration`
		`+ # Linux/x86 5.18.14-gnu Kernel Configuration`
		`#`
		`CONFIG_CC_VERSION_TEXT="gcc (GCC) 12.1.0"`
		`CONFIG_CC_IS_GCC=y`
		`@@ -18,7 +18,7 @@`
		`CONFIG_CC_HAS_ASM_GOTO_TIED_OUTPUT=y`
		`CONFIG_CC_HAS_ASM_INLINE=y`
		`CONFIG_CC_HAS_NO_PROFILE_FN_ATTR=y`
		`- CONFIG_PAHOLE_VERSION=0`
		`+ CONFIG_PAHOLE_VERSION=123`
		`CONFIG_IRQ_WORK=y`
		`CONFIG_BUILDTIME_TABLE_SORT=y`
		`CONFIG_THREAD_INFO_IN_TASK=y`
		`@@ -187,6 +187,8 @@`

		`CONFIG_ARCH_WANT_BATCHED_UNMAP_TLB_FLUSH=y`
		`CONFIG_CC_IMPLICIT_FALLTHROUGH="-Wimplicit-fallthrough=5"`
		`+ CONFIG_GCC12_NO_ARRAY_BOUNDS=y`
		`+ CONFIG_CC_NO_ARRAY_BOUNDS=y`
		`CONFIG_CGROUPS=y`
		`CONFIG_PAGE_COUNTER=y`
		`CONFIG_MEMCG=y`
		`@@ -332,8 +334,6 @@`
		`CONFIG_X86_FEATURE_NAMES=y`
		`CONFIG_X86_MPPARSE=y`
		`# CONFIG_GOLDFISH is not set`
		`- CONFIG_RETPOLINE=y`
		`- CONFIG_CC_HAS_SLS=y`
		`CONFIG_X86_CPU_RESCTRL=y`
		`CONFIG_X86_BIGSMP=y`
		`# CONFIG_X86_EXTENDED_PLATFORM is not set`
		`@@ -493,6 +493,14 @@`
		`# CONFIG_STRICT_SIGALTSTACK_SIZE is not set`
		`# end of Processor type and features`

		`+ CONFIG_CC_HAS_SLS=y`
		`+ CONFIG_CC_HAS_RETURN_THUNK=y`
		`+ CONFIG_SPECULATION_MITIGATIONS=y`
		`+ CONFIG_RETPOLINE=y`
		`+ CONFIG_RETHUNK=y`
		`+ CONFIG_CPU_UNRET_ENTRY=y`
		`+ CONFIG_CPU_IBPB_ENTRY=y`
		`+ CONFIG_CPU_IBRS_ENTRY=y`
		`CONFIG_ARCH_MHP_MEMMAP_ON_MEMORY_ENABLE=y`

		`#`
		`@@ -10478,14 +10486,24 @@`
		`# CONFIG_LOCK_DOWN_KERNEL_FORCE_INTEGRITY is not set`
		`# CONFIG_LOCK_DOWN_KERNEL_FORCE_CONFIDENTIALITY is not set`
		`CONFIG_SECURITY_LANDLOCK=y`
		`- # CONFIG_INTEGRITY is not set`
		`+ CONFIG_INTEGRITY=y`
		`+ CONFIG_INTEGRITY_SIGNATURE=y`
		`+ CONFIG_INTEGRITY_ASYMMETRIC_KEYS=y`
		`+ CONFIG_INTEGRITY_TRUSTED_KEYRING=y`
		`+ CONFIG_INTEGRITY_PLATFORM_KEYRING=y`
		`+ CONFIG_INTEGRITY_MACHINE_KEYRING=y`
		`+ CONFIG_LOAD_UEFI_KEYS=y`
		`+ CONFIG_INTEGRITY_AUDIT=y`
		`+ # CONFIG_IMA is not set`
		`+ # CONFIG_IMA_KEYRINGS_PERMIT_SIGNED_BY_BUILTIN_OR_SECONDARY is not set`
		`# CONFIG_IMA_SECURE_AND_OR_TRUSTED_BOOT is not set`
		`+ # CONFIG_EVM is not set`
		`# CONFIG_DEFAULT_SECURITY_SELINUX is not set`
		`# CONFIG_DEFAULT_SECURITY_SMACK is not set`
		`# CONFIG_DEFAULT_SECURITY_TOMOYO is not set`
		`# CONFIG_DEFAULT_SECURITY_APPARMOR is not set`
		`CONFIG_DEFAULT_SECURITY_DAC=y`
		`- CONFIG_LSM="landlock,lockdown,yama,bpf"`
		`+ CONFIG_LSM="landlock,lockdown,yama,integrity,bpf"`

		`#`
		`# Kernel hardening options`
		`@@ -10496,9 +10514,9 @@`
		`#`
		`CONFIG_CC_HAS_AUTO_VAR_INIT_PATTERN=y`
		`CONFIG_CC_HAS_AUTO_VAR_INIT_ZERO=y`
		`- # CONFIG_INIT_STACK_NONE is not set`
		`+ CONFIG_INIT_STACK_NONE=y`
		`# CONFIG_INIT_STACK_ALL_PATTERN is not set`
		`- CONFIG_INIT_STACK_ALL_ZERO=y`
		`+ # CONFIG_INIT_STACK_ALL_ZERO is not set`
		`# CONFIG_GCC_PLUGIN_STACKLEAK is not set`
		`CONFIG_INIT_ON_ALLOC_DEFAULT_ON=y`
		`# CONFIG_INIT_ON_FREE_DEFAULT_ON is not set`
		`@@ -10769,6 +10787,7 @@`
		`CONFIG_CRYPTO_LIB_SM4=m`
		`# end of Crypto library routines`

		`+ CONFIG_LIB_MEMNEQ=y`
		`CONFIG_CRC_CCITT=y`
		`CONFIG_CRC16=m`
		`CONFIG_CRC_T10DIF=y`
		`@@ -10861,6 +10880,7 @@`
		`CONFIG_CLZ_TAB=y`
		`CONFIG_IRQ_POLL=y`
		`CONFIG_MPILIB=y`
		`+ CONFIG_SIGNATURE=y`
		`CONFIG_DIMLIB=y`
		`CONFIG_OID_REGISTRY=y`
		`CONFIG_UCS2_STRING=y`
		`@@ -10928,6 +10948,9 @@`
		`# CONFIG_DEBUG_INFO_COMPRESSED is not set`
		`# CONFIG_DEBUG_INFO_SPLIT is not set`
		`CONFIG_DEBUG_INFO_BTF=y`
		`+ CONFIG_PAHOLE_HAS_SPLIT_BTF=y`
		`+ CONFIG_DEBUG_INFO_BTF_MODULES=y`
		`+ # CONFIG_MODULE_ALLOW_BTF_MISMATCH is not set`
		`# CONFIG_GDB_SCRIPTS is not set`
		`CONFIG_FRAME_WARN=1024`
		`CONFIG_STRIP_ASM_SYMS=y`

libre/linux-libre/config.x86_64

file modified

+18 -7

		`@@ -1,6 +1,6 @@`
		`#`
		`# Automatically generated file; DO NOT EDIT.`
		`- # Linux/x86 5.18.5-gnu Kernel Configuration`
		`+ # Linux/x86 5.18.14-gnu Kernel Configuration`
		`#`
		`CONFIG_CC_VERSION_TEXT="gcc (GCC) 12.1.0"`
		`CONFIG_CC_IS_GCC=y`
		`@@ -197,6 +197,8 @@`
		`CONFIG_ARCH_WANT_BATCHED_UNMAP_TLB_FLUSH=y`
		`CONFIG_CC_HAS_INT128=y`
		`CONFIG_CC_IMPLICIT_FALLTHROUGH="-Wimplicit-fallthrough=5"`
		`+ CONFIG_GCC12_NO_ARRAY_BOUNDS=y`
		`+ CONFIG_CC_NO_ARRAY_BOUNDS=y`
		`CONFIG_ARCH_SUPPORTS_INT128=y`
		`CONFIG_NUMA_BALANCING=y`
		`CONFIG_NUMA_BALANCING_DEFAULT_ENABLED=y`
		`@@ -351,9 +353,6 @@`
		`CONFIG_X86_X2APIC=y`
		`CONFIG_X86_MPPARSE=y`
		`# CONFIG_GOLDFISH is not set`
		`- CONFIG_RETPOLINE=y`
		`- CONFIG_CC_HAS_SLS=y`
		`- CONFIG_SLS=y`
		`CONFIG_X86_CPU_RESCTRL=y`
		`# CONFIG_X86_EXTENDED_PLATFORM is not set`
		`CONFIG_X86_INTEL_LPSS=y`
		`@@ -497,7 +496,9 @@`
		`CONFIG_KEXEC=y`
		`CONFIG_KEXEC_FILE=y`
		`CONFIG_ARCH_HAS_KEXEC_PURGATORY=y`
		`- # CONFIG_KEXEC_SIG is not set`
		`+ CONFIG_KEXEC_SIG=y`
		`+ # CONFIG_KEXEC_SIG_FORCE is not set`
		`+ CONFIG_KEXEC_BZIMAGE_VERIFY_SIG=y`
		`CONFIG_CRASH_DUMP=y`
		`CONFIG_KEXEC_JUMP=y`
		`CONFIG_PHYSICAL_START=0x1000000`
		`@@ -522,6 +523,16 @@`
		`# CONFIG_LIVEPATCH is not set`
		`# end of Processor type and features`

		`+ CONFIG_CC_HAS_SLS=y`
		`+ CONFIG_CC_HAS_RETURN_THUNK=y`
		`+ CONFIG_SPECULATION_MITIGATIONS=y`
		`+ CONFIG_PAGE_TABLE_ISOLATION=y`
		`+ CONFIG_RETPOLINE=y`
		`+ CONFIG_RETHUNK=y`
		`+ CONFIG_CPU_UNRET_ENTRY=y`
		`+ CONFIG_CPU_IBPB_ENTRY=y`
		`+ CONFIG_CPU_IBRS_ENTRY=y`
		`+ CONFIG_SLS=y`
		`CONFIG_ARCH_HAS_ADD_PAGES=y`
		`CONFIG_ARCH_MHP_MEMMAP_ON_MEMORY_ENABLE=y`

		`@@ -10159,7 +10170,6 @@`
		`CONFIG_SECURITY=y`
		`CONFIG_SECURITYFS=y`
		`CONFIG_SECURITY_NETWORK=y`
		`- CONFIG_PAGE_TABLE_ISOLATION=y`
		`CONFIG_SECURITY_INFINIBAND=y`
		`CONFIG_SECURITY_NETWORK_XFRM=y`
		`CONFIG_SECURITY_PATH=y`
		`@@ -10219,7 +10229,7 @@`
		`# CONFIG_DEFAULT_SECURITY_TOMOYO is not set`
		`# CONFIG_DEFAULT_SECURITY_APPARMOR is not set`
		`CONFIG_DEFAULT_SECURITY_DAC=y`
		`- CONFIG_LSM="landlock,lockdown,yama,bpf"`
		`+ CONFIG_LSM="landlock,lockdown,yama,integrity,bpf"`

		`#`
		`# Kernel hardening options`
		`@@ -10533,6 +10543,7 @@`
		`CONFIG_CRYPTO_LIB_SM4=m`
		`# end of Crypto library routines`

		`+ CONFIG_LIB_MEMNEQ=y`
		`CONFIG_CRC_CCITT=y`
		`CONFIG_CRC16=m`
		`CONFIG_CRC_T10DIF=y`

libre/lsb-release/PKGBUILD

file modified

+4 -4

		`@@ -1,7 +1,7 @@`
		`- # Maintainer (Arch): Sven-Hendrik Haase <sh@lutzhaase.com>`
		`- # Contributor (Arch): Malte Rabenseifner <malte@zearan.de>`
		`- # Contributor (Arch): John Gerritse <reaphsharc@gmail.com>`
		`- # Contributor (Hyperbola): André Silva <emulatorman@hyperbola.info>`
		`+ # Maintainer (arch): Sven-Hendrik Haase <sh@lutzhaase.com>`
		`+ # Contributor: Malte Rabenseifner <malte@zearan.de>`
		`+ # Contributor: John Gerritse <reaphsharc@gmail.com>`
		`+ # Contributor: André Silva <emulatorman@hyperbola.info>`
		`# Maintainer: Omar Vega Ramos <ovruni@gnu.org.pe>`
		`# Contributor: Michał Masłowski <mtjm@mtjm.eu>`

libre/marble/PKGBUILD

file modified

+3 -3

		`@@ -1,8 +1,8 @@`
		`# Maintainer (arch): Antonio Rojas <arojas@archlinux.org>`
		`# Maintainer (arch): Felix Yan <felixonmars@archlinux.org>`
		`- # Contributor (arch): Andrea Scarpino <andrea@archlinux.org>`
		`- # Contributor (arch): Gustavo Alvarez <sl1pkn07@gmail.com>`
		`- # Contributor (arch): Balló György <ballogyor+arch at gmail dot com>`
		`+ # Contributor: Andrea Scarpino <andrea@archlinux.org>`
		`+ # Contributor: Gustavo Alvarez <sl1pkn07@gmail.com>`
		`+ # Contributor: Balló György <ballogyor+arch at gmail dot com>`
		`# Contributor: bill-auger <bill-auger@programmer.net>`

libre/mate-icon-theme-faenza/PKGBUILD

file modified

+2 -2

		`@@ -1,5 +1,5 @@`
		`- # Contributor (Arch): Martin Wimpress <code@flexion.org>`
		`- # Maintainer (Hyperbola): André Silva <emulatorman@hyperbola.info>`
		`+ # Contributor: Martin Wimpress <code@flexion.org>`
		`+ # Maintainer (hyperbola): André Silva <emulatorman@hyperbola.info>`
		`# Maintainer: Omar Vega Ramos <ovruni@gnu.org.pe>`

		`pkgname=mate-icon-theme-faenza`

libre/mate-sensors-applet/PKGBUILD

file modified

+3 -3

		`@@ -1,6 +1,6 @@`
		`- # Maintainer (Arch): Brad Fanella <cesura@archlinux.org>`
		`- # Contributor (Arch): Martin Wimpress <code@flexion.org>`
		`- # Contributor (Hyperbola): André Silva <emulatorman@hyperbola.info>`
		`+ # Maintainer (arch): Brad Fanella <cesura@archlinux.org>`
		`+ # Contributor: Martin Wimpress <code@flexion.org>`
		`+ # Contributor: André Silva <emulatorman@hyperbola.info>`
		`# Maintainer: Omar Vega Ramos <ovruni@gnu.org.pe>`

		`pkgname=mate-sensors-applet`

libre/maven/PKGBUILD

file modified

+2 -2

		`@@ -1,6 +1,6 @@`
		`# Maintainer: Luke Shumaker <lukeshu@sbcglobal.net>`
		`- # Maintainer (Arch): Sergej Pupykin <pupykin.s+arch@gmail.com>`
		`- # Contributor (Arch): William Rea <sillywilly@gmail.com>`
		`+ # Maintainer (arch): Sergej Pupykin <pupykin.s+arch@gmail.com>`
		`+ # Contributor: William Rea <sillywilly@gmail.com>`

		`pkgname=maven`
		`pkgver=3.3.9`

libre/mc/PKGBUILD

file modified

+5 -5

		`@@ -1,8 +1,8 @@`
		`- # Maintainer (Arch): Alad Wenter <alad@archlinux.org>`
		`- # Maintainer (Arch): schuay <jakob.gruber@gmail.com>`
		`- # Contributor (Arch): Daniel J Griffiths <ghost1227@archlinux.us>`
		`- # Maintainer (Hyperbola): André Silva <emulatorman@hyperbola.info>`
		`- # Contributor (Hyperbola): Márcio Silva <coadde@hyperbola.info>`
		`+ # Maintainer (arch): Alad Wenter <alad@archlinux.org>`
		`+ # Maintainer (arch): schuay <jakob.gruber@gmail.com>`
		`+ # Contributor: Daniel J Griffiths <ghost1227@archlinux.us>`
		`+ # Contributor: André Silva <emulatorman@hyperbola.info>`
		`+ # Contributor: Márcio Silva <coadde@hyperbola.info>`
		`# Maintainer: Omar Vega Ramos <ovruni@gnu.org.pe>`

		`pkgname=mc`

libre/mcomix/PKGBUILD

file removed

-57

		`@@ -1,57 +0,0 @@`
		`- # Maintainer (Arch): schuay <jakob.gruber@gmail.com>`
		`- # Contributor (Arch): Ray Powell <ray_al@xphoniexx.net>`
		`- # Maintainer (Hyperbola): André Silva <emulatorman@hyperbola.info>`
		`- # Maintainer: Omar Vega Ramos <ovruni@gnu.org.pe>`
		`- # Contributor: bill-auger <bill-auger@programmer.net>`
		`-`
		`- pkgname=mcomix`
		`- pkgver=1.3.0.dev0`
		`- pkgrel=3`
		`- pkgrel+=.parabola1`
		`- pkgdesc="A user-friendly, customizable image viewer specifically designed to handle comic books"`
		`- pkgdesc+=", without non-free RAR support"`
		`- arch=('any')`
		`- url="https://github.com/multiSnow/mcomix3"`
		`- license=('GPL')`
		`- depends=('gtk3' 'python-cairo' 'python-gobject' 'python-pillow')`
		`- makedepends=('git')`
		`- optdepends=('mupdf-tools: for pdf comics'`
		`- 'p7zip: for 7zip compressed comics')`
		`- _commit=a95f08140fc8850890f283bc06e3e2615477d736 # HEAD as of 20200528.`
		`- source=("git+https://github.com/multiSnow/mcomix3.git#commit=$_commit"`
		`- 'libre.patch')`
		`- sha256sums=('SKIP'`
		`- '8566f979b4d56866074f22a44ee31f6904dac6ef802fa88413cedd82ee752721')`
		`-`
		`- prepare() {`
		`- cd mcomix3`
		`-`
		`- # Remove nonfree unRAR support`
		`- rm -v mcomix/mcomix/archive/rar{,_external}.py`
		`- patch -Np1 -i ${srcdir}/libre.patch`
		`- }`
		`-`
		`- package() {`
		`- cd mcomix3`
		`-`
		`- python installer.py --srcdir=mcomix --target="${pkgdir}"/usr/share`
		`-`
		`- install -dm755 "$pkgdir"/usr/bin`
		`- ln -s /usr/share/mcomix/mcomixstarter.py "$pkgdir"/usr/bin/mcomix`
		`- ln -s /usr/share/mcomix/comicthumb.py "$pkgdir"/usr/bin/comicthumb`
		`-`
		`- install -Dm644 mime/mcomix.desktop "$pkgdir"/usr/share/applications/mcomix.desktop`
		`- install -Dm644 mime/mcomix.appdata.xml "$pkgdir"/usr/share/metainfo/mcomix.appdata.xml`
		`- install -Dm644 mime/comicthumb.thumbnailer "$pkgdir"/usr/share/thumbnailers/comicthumb.thumbnailer`
		`-`
		`- for size in 16x16 22x22 24x24 32x32 48x48`
		`- do`
		`- install -dm755 "$pkgdir"/usr/share/icons/hicolor/$size/apps/`
		`- install -Dm644 mcomix/mcomix/images/$size/mcomix.png "$pkgdir"/usr/share/icons/hicolor/$size/apps/mcomix.png`
		`- install -Dm644 mime/icons/$size/application-x-cb7.png "$pkgdir"/usr/share/icons/hicolor/$size/mimetypes/application-x-cb7.png`
		`- install -Dm644 mime/icons/$size/application-x-cbt.png "$pkgdir"/usr/share/icons/hicolor/$size/mimetypes/application-x-cbt.png`
		`- done`
		`-`
		`- install -Dm644 man/mcomix.1 "$pkgdir"/usr/share/man/man1/mcomix.1`
		`- install -Dm644 man/comicthumb.1 "$pkgdir"/usr/share/man/man1/comicthumb.1`
		`- }`

libre/mcomix/libre.patch

file removed

-254

		`@@ -1,254 +0,0 @@`
		`- diff --git a/man/comicthumb.1 b/man/comicthumb.1`
		`- index 4af1791..6546014 100644`
		`- --- a/man/comicthumb.1`
		`- +++ b/man/comicthumb.1`
		`- @@ -1,7 +1,7 @@`
		`- .TH comicthumb 1`
		`-`
		`- .SH NAME`
		`- -\fBcomicthumb\fP - Thumbnailer for cbz, cbr and cbt archives.`
		`- +\fBcomicthumb\fP - Thumbnailer for cbz and cbt archives.`
		`-`
		`- .SH SYNOPSIS`
		`- .nf`
		`- diff --git a/man/mcomix.1 b/man/mcomix.1`
		`- index 5361e86..37b0698 100644`
		`- --- a/man/mcomix.1`
		`- +++ b/man/mcomix.1`
		`- @@ -12,7 +12,7 @@`
		`- .B MComix`
		`- is a user-friendly, customizable image viewer. It is specifically designed to`
		`- handle comic books (both Western comics and manga) and supports a variety of`
		`- -container formats (including CBR, CBZ, CB7, CBT, LHA and PDF).`
		`- +container formats (including CBZ, CB7, CBT, LHA and PDF).`
		`-`
		`- .SH OPTIONS`
		`- .TP`
		`- diff --git a/mcomix/comicthumb.py b/mcomix/comicthumb.py`
		`- index 3606091..150a1f5 100755`
		`- --- a/mcomix/comicthumb.py`
		`- +++ b/mcomix/comicthumb.py`
		`- @@ -34,7 +34,7 @@ def main():`
		`- parser=argparse.ArgumentParser(`
		`- prog='comicthumb',`
		`- description='Thumbnailer for comic book archives',`
		`- - epilog='Supported formats: ZIP, RAR and tar (.cbz, .cbr, .cbt)',`
		`- + epilog='Supported formats: ZIP and tar (.cbz, .cbt)',`
		`- )`
		`- parser.add_argument('infile',default=None,metavar='INFILE',`
		`- help='input archive')`
		`- diff --git a/mcomix/mcomix/about_dialog.py b/mcomix/mcomix/about_dialog.py`
		`- index ba64a40..0160ed9 100644`
		`- --- a/mcomix/mcomix/about_dialog.py`
		`- +++ b/mcomix/mcomix/about_dialog.py`
		`- @@ -28,7 +28,7 @@ class _AboutDialog(Gtk.AboutDialog):`
		`- comment = \`
		`- _('%s is an image viewer specifically designed to handle comic books.') % \`
		`- constants.APPNAME + ' ' + \`
		`- - _('It reads ZIP, RAR and tar archives, as well as plain image files.')`
		`- + _('It reads ZIP and tar archives, as well as plain image files.')`
		`- self.set_comments(comment)`
		`-`
		`- license = \`
		`- diff --git a/mcomix/mcomix/archive_tools.py b/mcomix/mcomix/archive_tools.py`
		`- index c121f59..1f48aa8 100644`
		`- --- a/mcomix/mcomix/archive_tools.py`
		`- +++ b/mcomix/mcomix/archive_tools.py`
		`- @@ -15,8 +15,6 @@ from mcomix.archive import (`
		`- archivemount,`
		`- lha_external,`
		`- pdf_external,`
		`- - rar,`
		`- - rar_external,`
		`- sevenzip_external,`
		`- squashfs,`
		`- tar,`
		`- @@ -47,16 +45,6 @@ _HANDLERS = {`
		`- constants.XZ: (`
		`- tar.TarArchive,`
		`- ),`
		`- - constants.RAR: (`
		`- - rar.RarArchive,`
		`- - rar_external.RarArchive,`
		`- - # Last resort: some versions of 7z support RAR.`
		`- - sevenzip_external.SevenZipArchive,`
		`- - ),`
		`- - constants.RAR5: (`
		`- - rar.RarArchive,`
		`- - rar_external.RarArchive,`
		`- - ),`
		`- constants.LHA: (`
		`- # Prefer 7z over lha executable for Unicode support.`
		`- sevenzip_external.SevenZipArchive,`
		`- @@ -90,9 +78,6 @@ def _is_available(archive_type):`
		`- def szip_available():`
		`- return _is_available(constants.SEVENZIP)`
		`-`
		`- -def rar_available():`
		`- - return _is_available(constants.RAR)`
		`- -`
		`- def lha_available():`
		`- return _is_available(constants.LHA)`
		`-`
		`- @@ -109,7 +94,6 @@ def init_supported_formats():`
		`- for name, formats, is_available in (`
		`- ('ZIP', constants.ZIP_FORMATS , True ),`
		`- ('Tar', constants.TAR_FORMATS , True ),`
		`- - ('RAR', constants.RAR_FORMATS , rar_available() ),`
		`- ('7z' , constants.SZIP_FORMATS, szip_available()),`
		`- ('LHA', constants.LHA_FORMATS , lha_available() ),`
		`- ('PDF', constants.PDF_FORMATS , pdf_available() ),`
		`- @@ -168,11 +152,6 @@ def archive_mime_type(path):`
		`- else:`
		`- return constants.TAR`
		`-`
		`- - if magic.startswith(b'Rar!\x1a\x07'):`
		`- - if sevenzip_external.is_7z_support_rar():`
		`- - return constants.RAR`
		`- - else:`
		`- - return constants.RAR5`
		`-`
		`- if magic[0:6] == b'7z\xbc\xaf\x27\x1c':`
		`- return constants.SEVENZIP`
		`- diff --git a/mcomix/mcomix/constants.py b/mcomix/mcomix/constants.py`
		`- index 414f65c..e068218 100644`
		`- --- a/mcomix/mcomix/constants.py`
		`- +++ b/mcomix/mcomix/constants.py`
		`- @@ -49,7 +49,7 @@ ANIMATION_NORMAL = 1 # loop as animation setting`
		`- ANIMATION_ONCE = 1<<1 # loop only once`
		`- ANIMATION_INF = 1<<2 # loop infinity`
		`-`
		`- -ZIP, RAR, RAR5, TAR, GZIP, BZIP2, XZ, PDF, SEVENZIP, LHA, ZIP_EXTERNAL, SQUASHFS = range(12)`
		`- +ZIP, TAR, GZIP, BZIP2, XZ, PDF, SEVENZIP, LHA, ZIP_EXTERNAL, SQUASHFS = range(10)`
		`- NORMAL_CURSOR, GRAB_CURSOR, WAIT_CURSOR, NO_CURSOR = range(4)`
		`- LIBRARY_DRAG_EXTERNAL_ID, LIBRARY_DRAG_BOOK_ID, LIBRARY_DRAG_COLLECTION_ID = range(3)`
		`- AUTOROTATE_NEVER, AUTOROTATE_WIDTH_90, AUTOROTATE_WIDTH_270, \`
		`- @@ -84,13 +84,6 @@ ZIP_FORMATS = (`
		`- ('.cbz', 'application/vnd.comicbook+zip'),`
		`- )`
		`-`
		`- -RAR_FORMATS = (`
		`- - # https://www.iana.org/assignments/media-types/application/vnd.rar`
		`- - ('.rar', 'application/vnd.rar'),`
		`- - # https://www.iana.org/assignments/media-types/application/vnd.comicbook-rar`
		`- - ('.cbr', 'application/vnd.comicbook-rar'),`
		`- -)`
		`- -`
		`- TAR_FORMATS = (`
		`- # not registed in IANA`
		`- ('.tar', 'application/x-tar'),`
		`- @@ -143,7 +136,7 @@ SQUASHFS_FORMATS = (`
		`- ('.sqsh', 'application/vnd.squashfs'),`
		`- )`
		`-`
		`- -ARCHIVE_FORMATS = ZIP_FORMATS + RAR_FORMATS + TAR_FORMATS + SQUASHFS_FORMATS`
		`- +ARCHIVE_FORMATS = ZIP_FORMATS + TAR_FORMATS + SQUASHFS_FORMATS`
		`- ARCHIVE_FORMATS += SZIP_FORMATS + LHA_FORMATS + PDF_FORMATS`
		`-`
		`- # vim: expandtab:sw=4:ts=4`
		`- diff --git a/mcomix/mcomix/messages/mcomix.pot b/mcomix/mcomix/messages/mcomix.pot`
		`- index e622347..02528c3 100644`
		`- --- a/mcomix/mcomix/messages/mcomix.pot`
		`- +++ b/mcomix/mcomix/messages/mcomix.pot`
		`- @@ -24,7 +24,7 @@ msgid "%s is an image viewer specifically designed to handle comic books."`
		`- msgstr ""`
		`-`
		`- #: mcomix/mcomix/about_dialog.py:30`
		`- -msgid "It reads ZIP, RAR and tar archives, as well as plain image files."`
		`- +msgid "It reads ZIP and tar archives, as well as plain image files."`
		`- msgstr ""`
		`-`
		`- #: mcomix/mcomix/about_dialog.py:34`
		`- @@ -1523,10 +1523,6 @@ msgstr ""`
		`- msgid "ZIP archive"`
		`- msgstr ""`
		`-`
		`- -#: mcomix/mcomix/strings.py:10`
		`- -msgid "RAR archive"`
		`- -msgstr ""`
		`- -`
		`- #: mcomix/mcomix/strings.py:11`
		`- msgid "Tar archive"`
		`- msgstr ""`
		`- diff --git a/mcomix/mcomix/strings.py b/mcomix/mcomix/strings.py`
		`- index 0eb2ea7..c534f5f 100644`
		`- --- a/mcomix/mcomix/strings.py`
		`- +++ b/mcomix/mcomix/strings.py`
		`- @@ -3,11 +3,10 @@`
		`- This file should only be imported after gettext has been correctly initialized`
		`- and installed in the global namespace. '''`
		`-`
		`- -from mcomix.constants import ZIP, RAR, TAR, GZIP, BZIP2, XZ, PDF, SEVENZIP, LHA, ZIP_EXTERNAL`
		`- +from mcomix.constants import ZIP, TAR, GZIP, BZIP2, XZ, PDF, SEVENZIP, LHA, ZIP_EXTERNAL`
		`-`
		`- ARCHIVE_DESCRIPTIONS = {`
		`- ZIP : _('ZIP archive'),`
		`- - RAR : _('RAR archive'),`
		`- TAR : _('Tar archive'),`
		`- GZIP : _('Gzip compressed tar archive'),`
		`- BZIP2 : _('Bzip2 compressed tar archive'),`
		`- diff --git a/mime/comicbook.schemas b/mime/comicbook.schemas`
		`- index d8ab034..3bf2711 100644`
		`- --- a/mime/comicbook.schemas`
		`- +++ b/mime/comicbook.schemas`
		`- @@ -1,27 +1,5 @@`
		`- <gconfschemafile>`
		`- <schemalist>`
		`- - <schema>`
		`- - <key>/schemas/desktop/gnome/thumbnailers/application@vnd.comicbook-rar/enable</key>`
		`- - <applyto>/desktop/gnome/thumbnailers/application@vnd.comicbook-rar/enable</applyto>`
		`- - <owner>comicthumb</owner>`
		`- - <type>bool</type>`
		`- - <default>true</default>`
		`- - <locale name="C">`
		`- - <short></short>`
		`- - <long></long>`
		`- - </locale>`
		`- - </schema>`
		`- - <schema>`
		`- - <key>/schemas/desktop/gnome/thumbnailers/application@vnd.comicbook-rar/command</key>`
		`- - <applyto>/desktop/gnome/thumbnailers/application@vnd.comicbook-rar/command</applyto>`
		`- - <owner>comicthumb</owner>`
		`- - <type>string</type>`
		`- - <default>comicthumb %i %o %s</default>`
		`- - <locale name="C">`
		`- - <short></short>`
		`- - <long></long>`
		`- - </locale>`
		`- - </schema>`
		`- <schema>`
		`- <key>/schemas/desktop/gnome/thumbnailers/application@vnd.comicbook+zip/enable</key>`
		`- <applyto>/desktop/gnome/thumbnailers/application@vnd.comicbook+zip/enable</applyto>`
		`- diff --git a/mime/comicthumb.thumbnailer b/mime/comicthumb.thumbnailer`
		`- index e357fe0..88cc59f 100644`
		`- --- a/mime/comicthumb.thumbnailer`
		`- +++ b/mime/comicthumb.thumbnailer`
		`- @@ -1,4 +1,4 @@`
		`- [Thumbnailer Entry]`
		`- TryExec=comicthumb`
		`- Exec=comicthumb %i %o %s`
		`- -MimeType=application/vnd.comicbook-rar;application/vnd.comicbook+zip;application/x-cb7;application/x-cbt;application/pdf`
		`- +MimeType=application/vnd.comicbook+zip;application/x-cb7;application/x-cbt;application/pdf`
		`- diff --git a/mime/mcomix.appdata.xml b/mime/mcomix.appdata.xml`
		`- index 514f95d..b07b474 100644`
		`- --- a/mime/mcomix.appdata.xml`
		`- +++ b/mime/mcomix.appdata.xml`
		`- @@ -10,7 +10,7 @@`
		`- <p>`
		`- MComix is a user-friendly, customizable image viewer. It is specifically`
		`- designed to handle comic books (both Western comics and manga) and supports`
		`- - a variety of container formats (including CBR, CBZ, CB7, CBT, LHA and PDF).`
		`- + a variety of container formats (including CBZ, CB7, CBT, LHA and PDF).`
		`- </p>`
		`- <p>`
		`- MComix is a fork of the Comix project, and aims to add bug fixes and`
		`- diff --git a/mime/mcomix.desktop b/mime/mcomix.desktop`
		`- index 0bb8315..1d46cdf 100644`
		`- --- a/mime/mcomix.desktop`
		`- +++ b/mime/mcomix.desktop`
		`- @@ -19,4 +19,4 @@ Terminal=false`
		`- Type=Application`
		`- StartupNotify=true`
		`- Categories=Graphics;Viewer;`
		`- -MimeType=application/vnd.comicbook-rar;application/vnd.comicbook+zip;application/x-cb7;application/x-cbt;application/pdf;image/bmp;image/gif;image/jpeg;image/png;image/tiff;image/x-portable-bitmap;image/x-portable-graymap;image/x-portable-pixmap;`
		`- +MimeType=application/vnd.comicbook+zip;application/x-cb7;application/x-cbt;application/pdf;image/bmp;image/gif;image/jpeg;image/png;image/tiff;image/x-portable-bitmap;image/x-portable-graymap;image/x-portable-pixmap;`

libre/memtest86+/PKGBUILD

file modified

+3 -3

		`@@ -1,6 +1,6 @@`
		`- # Maintainer (Arch): Eric Bélanger <eric@archlinux.org>`
		`- # Maintainer (Hyperbola): André Silva <emulatorman@hyperbola.info>`
		`- # Contributor (Hyperbola): Márcio Silva <coadde@hyperbola.info>`
		`+ # Maintainer (arch): Eric Bélanger <eric@archlinux.org>`
		`+ # Contributor: André Silva <emulatorman@hyperbola.info>`
		`+ # Contributor: Márcio Silva <coadde@hyperbola.info>`
		`# Maintainer: Omar Vega Ramos <ovruni@gnu.org.pe>`

		`pkgname=memtest86+`

libre/mesa-demos/PKGBUILD

file modified

+3 -3

		`@@ -1,6 +1,6 @@`
		`- # Maintainer (Arch): Jan de Groot <jgc@archlinux.org>`
		`- # Maintainer (Arch): Andreas Radke <andyrtr@archlinux.org>`
		`- # Maintainer (Hyperbola): André Silva <emulatorman@hyperbola.info>`
		`+ # Maintainer (arch): Jan de Groot <jgc@archlinux.org>`
		`+ # Maintainer (arch): Andreas Radke <andyrtr@archlinux.org>`
		`+ # Contributor: André Silva <emulatorman@hyperbola.info>`
		`# Maintainer: Omar Vega Ramos <ovruni@gnu.org.pe>`

		`pkgname='mesa-demos'`

libre/midori/PKGBUILD

file modified

+6 -6

		`@@ -1,9 +1,9 @@`
		`- # Maintainer (Arch): Alexander F. Rødseth <xyproto@archlinux.org>`
		`- # Contributor (Arch): Andreas Radke <andyrtr@archlinux.org>`
		`- # Contributor (Arch): rabyte <rabyte@gmail.com>`
		`- # Contributor (Arch): Johannes Krampf <wuischke@amule.org>`
		`- # Contributor (Arch): Bartłomiej Piotrowski <barthalion@gmail.com>`
		`- # Contributor (Arch): André Silva <emulatorman@hyperbola.info>`
		`+ # Maintainer (arch): Alexander F. Rødseth <xyproto@archlinux.org>`
		`+ # Contributor: Andreas Radke <andyrtr@archlinux.org>`
		`+ # Contributor: rabyte <rabyte@gmail.com>`
		`+ # Contributor: Johannes Krampf <wuischke@amule.org>`
		`+ # Contributor: Bartłomiej Piotrowski <barthalion@gmail.com>`
		`+ # Contributor: André Silva <emulatorman@hyperbola.info>`
		`# Maintainer: Omar Vega Ramos <ovruni@gnu.org.pe>`

		`pkgname=midori`

libre/mkinitcpio-parabolaiso/PKGBUILD

file modified

+1 -1

		`@@ -1,4 +1,4 @@`
		`- # Maintainer (Arch): David Runge <dvzrv@archlinux.org>`
		`+ # Maintainer (arch): David Runge <dvzrv@archlinux.org>`
		`# Maintainer: David P. <megver83@parabola.nu>`

		`pkgname=mkinitcpio-parabolaiso`

libre/mkinitcpio/PKGBUILD

file modified

+3 -3

		`@@ -1,6 +1,6 @@`
		`- # Maintainer (Arch): Giancarlo Razzolini <grazzolini@archlinux.org>`
		`- # Maintainer (Arch): Dave Reisner <dreisner@archlinux.org>`
		`- # Maintainer (Arch): Thomas Bächler <thomas@archlinux.org>`
		`+ # Maintainer (arch): Giancarlo Razzolini <grazzolini@archlinux.org>`
		`+ # Maintainer (arch): Dave Reisner <dreisner@archlinux.org>`
		`+ # Maintainer (arch): Thomas Bächler <thomas@archlinux.org>`
		`# Maintainer: David P. <megver83@parabola.nu>`

libre/mkisolinux/PKGBUILD

file removed

-30

		`@@ -1,30 +0,0 @@`
		`- # $Id: PKGBUILD 12670 2008-09-17 21:19:05Z tpowa $`
		`- # Maintainer (Arch): Tobias Powalowski <tpowa@archlinux.org>`
		`- # Maintainer: Omar Vega Ramos <ovruni@gnu.org.pe>`
		`-`
		`- pkgname=mkisolinux`
		`- pkgver=2013.05`
		`- pkgrel=2.parabola1`
		`- pkgdesc="Advanced, modular isolinux bootcd image creation utility (Parabola rebranded)"`
		`- arch=(any)`
		`- license=('GPL')`
		`- url="https://parabolagnulinux.org/"`
		`- depends=('mkinitcpio' 'cdrkit' 'syslinux' 'pciutils')`
		`- replaces=('mkbootcd' "${pkgname}-parabola")`
		`- conflicts=(${pkgname}-parabola)`
		`- backup=(etc/mkisolinux.conf)`
		`- source=('boot.msg' 'mkisolinux' 'mkisolinux.conf' 'options.msg')`
		`-`
		`-`
		`- package()`
		`- {`
		`- cd "$srcdir/"`
		`- install -D -m755 mkisolinux "$pkgdir/usr/bin/mkisolinux"`
		`- install -D -m644 mkisolinux.conf "$pkgdir/etc/mkisolinux.conf"`
		`- install -D -m644 boot.msg "$pkgdir/usr/share/mkisolinux/boot.msg"`
		`- install -D -m644 options.msg "$pkgdir/usr/share/mkisolinux/options.msg"`
		`- }`
		`- md5sums=('0ddb91a127ba040ce1434776d387825e'`
		`- 'd19183e162aff04f7f4c7b9e46be1315'`
		`- 'a474f11ab00ecbc12dafb548bb9ac025'`
		`- 'ae0007d6679b5a575b2a9e5ac3664baf')`

libre/mkisolinux/boot.msg

file removed

-15

		`@@ -1,15 +0,0 @@`
		`-`
		`-`
		`- ------------------------------------------------------------------------------`
		`- Parabola GNU/Linux-libre`
		`- ISOLINUX BOOT`
		`- created with 'mkisolinux' written by Tobias Powalowski <tpowa@archlinux.org>`
		`- rebranded for Parabola by André Silva <emulatorman@parabola.nu>`
		`-`
		`- Press ENTER or type 'parabola' to boot the CD.`
		`-`
		`- If you wish to change your defaults to boot into your existing system,`
		`- type 'vmlinuz initrd=initrd.img <any_other_boot_option>'`
		`- Use the F2 key for troubleshooting and options.`
		`- ------------------------------------------------------------------------------`
		`-`

libre/mkisolinux/mkisolinux

file removed

-116

		`@@ -1,116 +0,0 @@`
		`- #! /bin/sh`
		`- # Created by Tobias Powalowski <tpowa@archlinux.org>`
		`- # Rebranded for Parabola by André Silva <emulatorman@parabola.nu>`
		`- # Settings`
		`- APPNAME=$(basename "${0}")`
		`- CONFIG="/etc/mkisolinux.conf"`
		`- GENIMG=""`
		`- BURN="0"`
		`- BLANK="0"`
		`- TARNAME=""`
		`- export TEMPDIR=$(mktemp -d /tmp/mkisolinux.XXXX)`
		`- usage ()`
		`- {`
		`- echo "${APPNAME}: usage"`
		`- echo " -g=IMAGE Generate a ISO image as IMAGE"`
		`- echo " -c=CONFIG Use CONFIG file. default: /etc/mkisolinux.conf"`
		`- echo " -B Burn the ISO image after creation"`
		`- echo " -b Blanking media first"`
		`- echo " -h This message."`
		`- exit 1`
		`- }`
		`-`
		`- [ "$1" == "" ] && usage`
		`-`
		`- while [ $# -gt 0 ]; do`
		`- case $1 in`
		`- -c=\|--c=) CONFIG="$(echo $1 \| awk -F= '{print $2;}')" ;;`
		`- -g=\|--g=) GENIMG="$(echo $1 \| awk -F= '{print $2;}')" ;;`
		`- -B\|--B) BURN="1" ;;`
		`- -b\|--b) BLANK="1" ;;`
		`- -t=\|--t=) TARNAME="$(echo $1 \| awk -F= '{print $2;}')" ;;`
		`- -h\|--h\|?) usage ;;`
		`- *) usage ;;`
		`- esac`
		`- shift`
		`- done`
		`-`
		`- if [ "${TARNAME}" = "" -a "${GENIMG}" = "" ]; then`
		`- echo "ERROR: No image name specified, please use the -g option"`
		`- exit 1`
		`- fi`
		`-`
		`- if [ ! -f "${CONFIG}" ]; then`
		`- echo "config file '${CONFIG}' cannot be found, aborting..."`
		`- exit 1`
		`- fi`
		`-`
		`- . "${CONFIG}"`
		`- # export for mkinitcpio`
		`- [ -n "${APPENDBOOTMESSAGE}" ] && export APPENDBOOTMESSAGE`
		`- [ -n "${APPENDOPTIONSBOOTMESSAGE}" ] && export APPENDOPTIONSBOOTMESSAGE`
		`-`
		`- export RUNPROGRAM="${APPNAME}"`
		`- export BOOTDIRNAME="boot/syslinux"`
		`-`
		`- [ "${BOOTMESSAGE}" = "" ] && export BOOTMESSAGE=$(mktemp /tmp/bootmessage.XXXX)`
		`- [ "${OPTIONSBOOTMESSAGE}" = "" ] && export OPTIONSBOOTMESSAGE=$(mktemp /tmp/optionsbootmessage.XXXX)`
		`- [ "${ISONAME}" = "" ] && export ISONAME=$(mktemp /tmp/isoname.XXXX)`
		`- export USEKERNEL=${VERSION}`
		`-`
		`- # begin script`
		`- mkdir -p ${TEMPDIR}/${BOOTDIRNAME}/`
		`- # prepare syslinux`
		`- install -m755 /usr/lib/syslinux/isolinux.bin ${TEMPDIR}/${BOOTDIRNAME}/isolinux.bin`
		`- for i in /usr/lib/syslinux/*.c32; do`
		`- install -m644 $i ${TEMPDIR}/${BOOTDIRNAME}/$(basename $i)`
		`- done`
		`- install -m644 /usr/share/hwdata/pci.ids ${TEMPDIR}/${BOOTDIRNAME}/pci.ids`
		`- # create syslinux.cfg`
		`- echo ":: Creating syslinux.cfg ..."`
		`- if [ "${ISOLINUXCFG}" = "" ]; then`
		`- [ -e ${TEMPDIR}/${BOOTDIRNAME}/syslinux.cfg ] && rm ${TEMPDIR}/${BOOTDIRNAME}/syslinux.cfg`
		`- echo "prompt ${PROMPT}" >> ${TEMPDIR}/${BOOTDIRNAME}/syslinux.cfg`
		`- echo "timeout ${TIMEOUT}" >> ${TEMPDIR}/${BOOTDIRNAME}/syslinux.cfg`
		`- echo "display boot.msg" >> ${TEMPDIR}/${BOOTDIRNAME}/syslinux.cfg`
		`- echo "F1 boot.msg" >> ${TEMPDIR}/${BOOTDIRNAME}/syslinux.cfg`
		`- echo "F2 options.msg" >> ${TEMPDIR}/${BOOTDIRNAME}/syslinux.cfg`
		`- echo "default parabola" >> ${TEMPDIR}/${BOOTDIRNAME}/syslinux.cfg`
		`- echo "label parabola" >> ${TEMPDIR}/${BOOTDIRNAME}/syslinux.cfg`
		`- echo "kernel /boot/vmlinuz" >> ${TEMPDIR}/${BOOTDIRNAME}/syslinux.cfg`
		`- echo "append initrd=/boot/initrd.img ${KERNEL_BOOT_OPTIONS}" >> ${TEMPDIR}/${BOOTDIRNAME}/syslinux.cfg`
		`- else`
		`- sed "s\|@@PROMPT@@\|${PROMPT}\|g;s\|@@TIMEOUT@@\|${TIMEOUT}\|g;s\|@@KERNEL_BOOT_OPTIONS@@\|${KERNEL_BOOT_OPTIONS}\|g" \`
		`- ${ISOLINUXCFG} > ${TEMPDIR}/${BOOTDIRNAME}/syslinux.cfg`
		`- fi`
		`- [ ! -s ${TEMPDIR}/${BOOTDIRNAME}/syslinux.cfg ] && echo "No syslinux.cfg found" && exit 1`
		`-`
		`- echo ":: Calling mkinitcpio CONFIG=${MKINITCPIO_CONFIG} KERNEL=${VERSION} ..."`
		`- # generate initramdisk`
		`- echo ":: Creating initramdisk ..."`
		`- mkinitcpio -c ${MKINITCPIO_CONFIG} -k ${VERSION} -g ${TEMPDIR}/boot/initrd.img`
		`- echo ":: Using ${KERNEL} as image kernel ..."`
		`- install -m644 ${KERNEL} ${TEMPDIR}/boot/vmlinuz`
		`- install -m644 ${BOOTMESSAGE} ${TEMPDIR}/${BOOTDIRNAME}/boot.msg`
		`- install -m644 ${OPTIONSBOOTMESSAGE} ${TEMPDIR}/${BOOTDIRNAME}/options.msg`
		`- [ ! -s ${TEMPDIR}/${BOOTDIRNAME}/boot.msg ] && echo 'ERROR:no boot.msg found, aborting!' && exit 1`
		`- [ ! -s ${TEMPDIR}/${BOOTDIRNAME}/options.msg ] && echo 'ERROR:no options.msg found, aborting!' && exit 1`
		`- # create image`
		`- echo ":: Creating ISO image ..."`
		`- [ -e ${GENIMG} ] && rm ${GENIMG}`
		`- [ -s "${ISONAME}" ] && ISONAME=$(cat $ISONAME) \|\| ISONAME="Parabola GNU/Linux-libre"`
		`- mkisofs -RlDJLV "${ISONAME}" -b boot/syslinux/isolinux.bin -c boot/syslinux/boot.cat \`
		`- -no-emul-boot -boot-load-size 4 -boot-info-table -o ${GENIMG} ${TEMPDIR}/ > /dev/null 2>&1 \`
		`- && echo ":: ISO Image succesfull created at ${GENIMG}"`
		`- # burning/blanking image`
		`- if [ "$BLANK" = "1" ]; then`
		`- echo ":: Blanking media DEVICE=${DEVICE}, BLANKMODE=${BLANKMODE}, SPEED=${SPEED} ..."`
		`- cdrecord dev=${DEVICE} speed=${SPEED} blank=${BLANKMODE} > /dev/null 2>&1 && echo ":: Successfull."`
		`- fi`
		`- if [ "$BURN" = "1" ]; then`
		`- echo ":: Burning ISO image DEVICE=${DEVICE}, SPEED=${SPEED} ..."`
		`- cdrecord dev=${DEVICE} speed=${SPEED} -eject ${GENIMG} > /dev/null 2>&1 && echo ":: Successfull."`
		`- fi`
		`-`
		`- # clean /tmp`
		`- rm -r ${TEMPDIR}`

libre/mkisolinux/mkisolinux.conf

file removed

-39

		`@@ -1,39 +0,0 @@`
		`- # Created by Tobias Powalowski <tpowa@archlinux.org>`
		`- # Rebranded for Parabola by André Silva <emulatorman@parabola.nu>`
		`- # config file of mkisolinux`
		`-`
		`- # DEFAULT kernel boot options like root=/dev/sda3 etc.`
		`- # add your root= option, if you boot from a disk device`
		`- # and don't want to add it by hand on each boot`
		`- KERNEL_BOOT_OPTIONS=""`
		`-`
		`- # mkinitcpio config file, defaulted to stock config file`
		`- MKINITCPIO_CONFIG="/etc/mkinitcpio.conf"`
		`-`
		`- # kernel version, defaulted to build for runtime kernel`
		`- VERSION="$(uname -r)"`
		`-`
		`- # kernel image, defaulted to stock libre kernel`
		`- KERNEL="/boot/vmlinuz-linux-libre"`
		`-`
		`- # boot message files`
		`- BOOTMESSAGE="/usr/share/mkisolinux/boot.msg"`
		`- OPTIONSBOOTMESSAGE="/usr/share/mkisolinux/options.msg"`
		`-`
		`- # syslinux.cfg file to use`
		`- SYSLINUXCFG=""`
		`-`
		`- # Prompt on boot, 1=yes 0=no`
		`- PROMPT="1"`
		`-`
		`- # Name of the ISO, if empty Parabola GNU/Linux-libre is used if not set by a HOOK later`
		`- ISONAME=""`
		`-`
		`- # Timeout, 30 seconds to fix usb keyboard issues`
		`- # 0 means wait for prompt`
		`- TIMEOUT="300"`
		`-`
		`- # Setting cdrecord options`
		`- DEVICE=""`
		`- SPEED=""`
		`- BLANKMODE=""`

libre/mkisolinux/options.msg

file removed

-6

		`@@ -1,6 +0,0 @@`
		`- ------------------------------------------------------------------------------`
		`- Parabola GNU/Linux-libre options and troubleshooting:`
		`-`
		`- - If your system hangs during the boot process, any combinations of the`
		`- boot options noapic acpi=off pci=routeirq nosmp nomsi may be useful.`
		`- ------------------------------------------------------------------------------`

libre/mkpxelinux/PKGBUILD

file removed

-30

		`@@ -1,30 +0,0 @@`
		`- # $Id: PKGBUILD 197074 2013-10-21 15:42:46Z tpowa $`
		`- # Maintainer (Arch): Tobias Powalowski <tpowa@archlinux.org>`
		`- # Maintainer: Omar Vega Ramos <ovruni@gnu.org.pe>`
		`-`
		`- pkgname=mkpxelinux`
		`- pkgver=2013.10`
		`- pkgrel=2.parabola1`
		`- pkgdesc="Advanced, modular network pxe boot image creation utility (Parabola rebranded)"`
		`- arch=(any)`
		`- license=('GPL')`
		`- url="https://parabolagnulinux.org/"`
		`- depends=('mkinitcpio' 'tftp-hpa' 'syslinux')`
		`- replaces=(${pkgname}-parabola)`
		`- conflicts=(${pkgname}-parabola)`
		`- backup=(etc/mkpxelinux.conf)`
		`- optdepends=('dhcp: for dhcp server usage')`
		`- source=('boot.msg' 'mkpxelinux' 'mkpxelinux.conf' 'options.msg')`
		`-`
		`- package()`
		`- {`
		`- cd "$srcdir/"`
		`- install -D -m755 mkpxelinux "$pkgdir/usr/bin/mkpxelinux"`
		`- install -D -m644 mkpxelinux.conf "$pkgdir/etc/mkpxelinux.conf"`
		`- install -D -m644 boot.msg "$pkgdir/usr/share/mkpxelinux/boot.msg"`
		`- install -D -m644 options.msg "$pkgdir/usr/share/mkpxelinux/options.msg"`
		`- }`
		`- md5sums=('7225e73bfe717f97bd7ab52f5ab157f6'`
		`- '44c6b9fa8ae668a432f26adb9e70bd3f'`
		`- '158dece3af889740b0f0ee397f9058ed'`
		`- 'ae0007d6679b5a575b2a9e5ac3664baf')`

libre/mkpxelinux/boot.msg

file removed

-14

		`@@ -1,14 +0,0 @@`
		`-`
		`-`
		`- ------------------------------------------------------------------------------`
		`- Parabola GNU/Linux-libre`
		`- PXELINUX BOOT`
		`- created with 'mkpxelinux' written by Tobias Powalowski <tpowa@archlinux.org>`
		`-`
		`- Press ENTER or type 'parabola' to boot image.`
		`-`
		`- If you wish to change your defaults to boot into your existing system,`
		`- type 'vmlinuz initrd=initrd.img <any_other_boot_option>'`
		`- Use the F2 key for troubleshooting and options.`
		`- ------------------------------------------------------------------------------`
		`-`

libre/mkpxelinux/mkpxelinux

file removed

-91

		`@@ -1,91 +0,0 @@`
		`- #! /bin/sh`
		`- # Created by Tobias Powalowski <tpowa@archlinux.org>`
		`- # Rebranded for Parabola by André Silva <emulatorman@parabola.nu>`
		`- # Settings`
		`- APPNAME=$(basename "${0}")`
		`- CONFIG="/etc/mkpxelinux.conf"`
		`-`
		`- usage ()`
		`- {`
		`- echo "${APPNAME}: usage"`
		`- echo""`
		`- echo " -d=INSTALLDIR Your INSTALLDIR overwrites config default"`
		`- echo " -c=CONFIG Use CONFIG file. default: /etc/mkpxelinux.conf"`
		`- echo " -h This message."`
		`- exit 1`
		`- }`
		`-`
		`- [ "$1" == "" ] && usage && exit 1`
		`-`
		`- while [ $# -gt 0 ]; do`
		`- case $1 in`
		`- -c=\|--c=) CONFIG="$(echo $1 \| awk -F= '{print $2;}')" ;;`
		`- -d=\|--d=) CUSTOMINSTALLDIR="$(echo $1 \| awk -F= '{print $2;}')" ;;`
		`- -h\|--h\|?) usage ;;`
		`- *) usage ;;`
		`- esac`
		`- shift`
		`- done`
		`-`
		`- if [ ! -f "${CONFIG}" ]; then`
		`- echo "config file '${CONFIG}' cannot be found, aborting..."`
		`- exit 1`
		`- fi`
		`-`
		`- . "${CONFIG}"`
		`- # export for mkinitcpio`
		`- [ -n "${APPENDBOOTMESSAGE}" ] && export APPENDBOOTMESSAGE`
		`- [ -n "${APPENDOPTIONSBOOTMESSAGE}" ] && export APPENDOPTIONSBOOTMESSAGE`
		`-`
		`- ! [ "${CUSTOMINSTALLDIR}" = "" ] && INSTALLDIR=${CUSTOMINSTALLDIR}`
		`-`
		`- if [ "${INSTALLDIR}" = "" ]; then`
		`- echo "ERROR: No INSTALLDIR name specified, please use the -d option"`
		`- exit 1`
		`- fi`
		`-`
		`- if ! [ $UID -eq 0 ]; then`
		`- echo "ERROR: only works when run as root!"`
		`- exit 1`
		`- fi`
		`-`
		`- ! [ -e ${INSTALLDIR} ] && echo "No ${INSTALLDIR} found!" && exit 1`
		`- export TEMPDIR=${NFSROOTDIR}`
		`- export INSTALLDIR=${INSTALLDIR}`
		`- export RUNPROGRAM="${APPNAME}"`
		`- [ "${BOOTMESSAGE}" = "" ] && export BOOTMESSAGE=$(mktemp /tmp/bootmessage.XXXX)`
		`- [ "${OPTIONSBOOTMESSAGE}" = "" ] && export OPTIONSBOOTMESSAGE=$(mktemp /tmp/optionsbootmessage.XXXX)`
		`- export USEKERNEL=${VERSION}`
		`- # begin script`
		`- # create default`
		`- echo ":: Creating pxelinux default config file ..."`
		`- mkdir -p ${INSTALLDIR}/pxelinux.cfg`
		`- if [ "${PXELINUX_DEFAULT}" = "" ]; then`
		`- [ -e ${INSTALLDIR}/pxelinux.cfg/default ] && rm ${INSTALLDIR}/pxelinux.cfg/default`
		`- echo "prompt ${PROMPT}" >> ${INSTALLDIR}/pxelinux.cfg/default`
		`- echo "timeout ${TIMEOUT}" >> ${INSTALLDIR}/pxelinux.cfg/default`
		`- echo "display boot.msg" >> ${INSTALLDIR}/pxelinux.cfg/default`
		`- echo "F1 boot.msg" >> ${INSTALLDIR}/pxelinux.cfg/default`
		`- echo "F2 options.msg" >> ${INSTALLDIR}/pxelinux.cfg/default`
		`- echo "default parabola" >> ${INSTALLDIR}/pxelinux.cfg/default`
		`- echo "label parabola" >> ${INSTALLDIR}/pxelinux.cfg/default`
		`- echo "kernel vmlinuz" >> ${INSTALLDIR}/pxelinux.cfg/default`
		`- echo "append initrd=initrd.img ${KERNEL_BOOT_OPTIONS}" >> ${INSTALLDIR}/pxelinux.cfg/default`
		`- else`
		`- sed "s\|@@PROMPT@@\|${PROMPT}\|g;s\|@@TIMEOUT@@\|${TIMEOUT}\|g;s\|@@KERNEL_BOOT_OPTIONS@@\|${KERNEL_BOOT_OPTIONS}\|g" \`
		`- ${PXELINUX_DEFAULT} > ${INSTALLDIR}/pxelinux.cfg/default`
		`- fi`
		`- [ ! -s ${INSTALLDIR}/pxelinux.cfg/default ] && echo "No pxelinux default config found" && exit 1`
		`- echo ":: Calling mkinitcpio CONFIG=${MKINITCPIO_CONFIG} KERNEL=${VERSION} ..."`
		`- # generate initramdisk`
		`- echo ":: Creating initramdisk ..."`
		`- mkinitcpio -c ${MKINITCPIO_CONFIG} -k ${VERSION} -g ${INSTALLDIR}/initrd.img`
		`- echo ":: Using ${KERNEL} as image kernel ..."`
		`- install -m644 ${KERNEL} ${INSTALLDIR}/vmlinuz`
		`- echo ":: Installing message files to ${INSTALLDIR} ..."`
		`- install -m644 ${BOOTMESSAGE} ${INSTALLDIR}/boot.msg`
		`- install -m644 ${OPTIONSBOOTMESSAGE} ${INSTALLDIR}/options.msg`
		`- [ ! -s ${INSTALLDIR}/boot.msg ] && echo 'ERROR:no boot.msg found, aborting!' && exit 1`
		`- [ ! -s ${INSTALLDIR}/options.msg ] && echo 'ERROR:no options.msg found, aborting!' && exit 1`
		`- echo ":: Installing PXELINUX to ${INSTALLDIR} ..."`
		`- install -m644 /usr/lib/syslinux/bios/pxelinux.0 ${INSTALLDIR}/pxelinux.0 && echo "Installation completed."`

libre/mkpxelinux/mkpxelinux.conf

file removed

-37

		`@@ -1,37 +0,0 @@`
		`- # Created by Tobias Powalowski <tpowa@archlinux.org>`
		`- # Rebranded for Parabola by André Silva <emulatorman@parabola.nu>`
		`- # config file of mkpxelinux`
		`-`
		`- # DEFAULT kernel boot options like ip=:::::eth0:dhcp etc.`
		`- # add your root= option, if you boot from a disk device`
		`- # and don't want to add it by hand on each boot`
		`- KERNEL_BOOT_OPTIONS=""`
		`-`
		`- # mkinitcpio config file, defaulted to stock config file`
		`- MKINITCPIO_CONFIG="/etc/mkinitcpio.conf"`
		`-`
		`- # kernel version, defaulted to build for runtime kernel`
		`- VERSION="$(uname -r)"`
		`-`
		`- # kernel image, defaulted to stock libre kernel`
		`- KERNEL="/boot/vmlinuz-linux-libre"`
		`-`
		`- # boot message files`
		`- BOOTMESSAGE="/usr/share/mkpxelinux/boot.msg"`
		`- OPTIONSBOOTMESSAGE="/usr/share/mkpxelinux/options.msg"`
		`-`
		`- #pxelinux default config file to use`
		`- PXELINUX_DEFAULT=""`
		`-`
		`- # Prompt on boot, 1=yes 0=no`
		`- PROMPT="1"`
		`-`
		`- # Timeout, 30 seconds to fix usb keyboard issues`
		`- # 0 means wait for prompt`
		`- TIMEOUT="300"`
		`-`
		`- # Installdir of tftp, default location`
		`- INSTALLDIR="/var/tftpboot"`
		`-`
		`- # Nfsrootdir, for hooks that might need it`
		`- NFSROOTDIR=""`

libre/mkpxelinux/options.msg

file removed

-6

		`@@ -1,6 +0,0 @@`
		`- ------------------------------------------------------------------------------`
		`- Parabola GNU/Linux-libre options and troubleshooting:`
		`-`
		`- - If your system hangs during the boot process, any combinations of the`
		`- boot options noapic acpi=off pci=routeirq nosmp nomsi may be useful.`
		`- ------------------------------------------------------------------------------`

libre/mksyslinux/PKGBUILD

file removed

-29

		`@@ -1,29 +0,0 @@`
		`- # $Id: PKGBUILD 187120 2013-06-04 06:46:39Z tpowa $`
		`- # Maintainer (Arch): Tobias Powalowski <tpowa@archlinux.org>`
		`- # Maintainer: Omar Vega Ramos <ovruni@gnu.org.pe>`
		`-`
		`- pkgname=mksyslinux`
		`- pkgver=2013.06`
		`- pkgrel=2.parabola1`
		`- pkgdesc="Advanced, modular syslinux boot image creation utility (Parabola rebranded)"`
		`- arch=(any)`
		`- license=('GPL')`
		`- url="https://parabolagnulinux.org/"`
		`- replaces=(${pkgname}-parabola)`
		`- conflicts=(${pkgname}-parabola)`
		`- depends=('mkinitcpio' 'syslinux' 'pciutils')`
		`- backup=(etc/mksyslinux.conf)`
		`- source=('boot.msg' 'mksyslinux' 'mksyslinux.conf' 'options.msg')`
		`-`
		`- package()`
		`- {`
		`- cd "$srcdir/"`
		`- install -D -m755 mksyslinux "$pkgdir/usr/bin/mksyslinux"`
		`- install -D -m644 mksyslinux.conf "$pkgdir/etc/mksyslinux.conf"`
		`- install -D -m644 boot.msg "$pkgdir/usr/share/mksyslinux/boot.msg"`
		`- install -D -m644 options.msg "$pkgdir/usr/share/mksyslinux/options.msg"`
		`- }`
		`- md5sums=('e9836ac2bbb436ca3a13bfbe9cc5c19a'`
		`- '0a9fd93356b5d98ab386f28bc849b808'`
		`- 'c702b0b41ae7f58e9b08b53f3b6b0961'`
		`- 'ae0007d6679b5a575b2a9e5ac3664baf')`

libre/mksyslinux/boot.msg

file removed

-15

		`@@ -1,15 +0,0 @@`
		`-`
		`-`
		`- ------------------------------------------------------------------------------`
		`- Parabola GNU/Linux-libre`
		`- SYSLINUX BOOT`
		`- created with 'mksyslinux' by Tobias Powalowski <tpowa@archlinux.org>`
		`- rebranded for Parabola by André Silva <emulatorman@parabola.nu>`
		`-`
		`- Press ENTER or type 'parabola' to boot image.`
		`-`
		`- If you wish to change your defaults to boot into your existing system,`
		`- type 'vmlinuz initrd=initrd.img <any_other_boot_option>'`
		`- Use the F2 key for troubleshooting and options.`
		`- ------------------------------------------------------------------------------`
		`-`

libre/mksyslinux/mksyslinux

file removed

-144

		`@@ -1,144 +0,0 @@`
		`- #! /bin/sh`
		`- # Created by Tobias Powalowski <tpowa@archlinux.org>`
		`- # Settings`
		`- APPNAME=$(basename "${0}")`
		`- CONFIG="/etc/mksyslinux.conf"`
		`- export TEMPDIR=$(mktemp /tmp/mksyslinux.XXX)`
		`- TMPDIR=$(mktemp -d /tmp/mksyslinux-image.XXX)`
		`- BOOTDIRNAME=boot/syslinux`
		`-`
		`- usage ()`
		`- {`
		`- echo "${APPNAME}: usage"`
		`- echo "WRITING TO DEVICE:"`
		`- echo "- PREPARATION: Your device must have a bootable first partition in FAT16 format!"`
		`- echo "- ATTENTION: The MBR of your DEVICE will be overwritten! You have been warned!"`
		`- echo ""`
		`- echo "CREATING AN IMAGE FILE:"`
		`- echo "- For creating an image file use the -i=IMAGEFILE switch"`
		`- echo "- use 'dd if=<yourimage> of=<yourdevice>' to write to your device afterwards."`
		`- echo ""`
		`- echo "PARAMETERS:"`
		`- echo " -d=DEVICE Your DEVICE first partition from /dev/xxx tree to install"`
		`- echo " -i=IMAGENAME Your IMAGENAME"`
		`- echo " -c=CONFIG Use CONFIG file. default: /etc/mksyslinux.conf"`
		`- echo " -h This message."`
		`- exit 1`
		`- }`
		`-`
		`- [ "$1" == "" ] && usage && exit 1`
		`-`
		`-`
		`- while [ $# -gt 0 ]; do`
		`- case $1 in`
		`- -c=\|--c=) CONFIG="$(echo $1 \| awk -F= '{print $2;}')" ;;`
		`- -d=\|--d=) DEVICE="$(echo $1 \| awk -F= '{print $2;}')" ;;`
		`- -i=\|--i=) IMAGENAME="$(echo $1 \| awk -F= '{print $2;}')" ;;`
		`- -h\|--h\|?) usage ;;`
		`- *) usage ;;`
		`- esac`
		`- shift`
		`- done`
		`-`
		`- if [ ! -f "${CONFIG}" ]; then`
		`- echo "config file '${CONFIG}' cannot be found, aborting..."`
		`- exit 1`
		`- fi`
		`-`
		`- if [ "${IMAGENAME}" = "" ]; then`
		`- if [ "${DEVICE}" = "" ]; then`
		`- echo "ERROR: No DEVICE name specified, please use the -d option"`
		`- exit 1`
		`- fi`
		`- fi`
		`-`
		`- if ! [ $UID -eq 0 ]; then`
		`- echo "ERROR: only works when run as root!"`
		`- exit 1`
		`- fi`
		`-`
		`- . "${CONFIG}"`
		`- # export for mkinitcpio`
		`- [ -n "${APPENDBOOTMESSAGE}" ] && export APPENDBOOTMESSAGE`
		`- [ -n "${APPENDBOOTMESSAGE_SYSLINUX}" ] && export APPENDBOOTMESSAGE_SYSLINUX`
		`- [ -n "${APPENDOPTIONSBOOTMESSAGE}" ] && export APPENDOPTIONSBOOTMESSAGE`
		`-`
		`- MBRDEVICE="$(echo ${DEVICE} \| sed -e 's/[0-9]//g')"`
		`-`
		`- export RUNPROGRAM="${APPNAME}"`
		`- [ "${BOOTMESSAGE}" = "" ] && export BOOTMESSAGE=$(mktemp /tmp/bootmessage.XXXX)`
		`- [ "${OPTIONSBOOTMESSAGE}" = "" ] && export OPTIONSBOOTMESSAGE=$(mktemp /tmp/optionsbootmessage.XXXX)`
		`- export USEKERNEL=${VERSION}`
		`- # begin script`
		`- [ -e ${TEMPDIR} ] && rm -r ${TEMPDIR}`
		`- mkdir -p ${TEMPDIR}`
		`- echo ":: Mounting ${DEVICE} ..."`
		`- if ! [ "${IMAGENAME}" = "" ]; then`
		`- modprobe loop`
		`- else`
		`- mount ${DEVICE} ${TEMPDIR} \|\| exit 1`
		`- fi`
		`- mkdir -p ${TEMPDIR}/${BOOTDIRNAME}`
		`- # prepare syslinux bootloader`
		`- install -m755 /usr/lib/syslinux/isolinux.bin ${TEMPDIR}/${BOOTDIRNAME}/isolinux.bin`
		`- for i in /usr/lib/syslinux/*.c32; do`
		`- install -m644 $i ${TEMPDIR}/${BOOTDIRNAME}/$(basename $i)`
		`- done`
		`- install -m644 /usr/share/hwdata/pci.ids ${TEMPDIR}/${BOOTDIRNAME}/pci.ids`
		`-`
		`- # create syslinux.cfg`
		`- echo ":: Creating syslinux.cfg ..."`
		`- if [ "${SYSLINUXCFG}" = "" ]; then`
		`- [ -e ${TEMPDIR}/${BOOTDIRNAME}/syslinux.cfg ] && rm ${TEMPDIR}/${BOOTDIRNAME}/syslinux.cfg`
		`- echo "prompt ${PROMPT}" >> ${TEMPDIR}/${BOOTDIRNAME}/syslinux.cfg`
		`- echo "timeout ${TIMEOUT}" >> ${TEMPDIR}/${BOOTDIRNAME}/syslinux.cfg`
		`- echo "display boot.msg" >> ${TEMPDIR}/${BOOTDIRNAME}/syslinux.cfg`
		`- echo "F1 boot.msg" >> ${TEMPDIR}/${BOOTDIRNAME}/syslinux.cfg`
		`- echo "F2 options.msg" >> ${TEMPDIR}/${BOOTDIRNAME}/syslinux.cfg`
		`- echo "default parabola" >> ${TEMPDIR}/${BOOTDIRNAME}/syslinux.cfg`
		`- echo "label parabola" >> ${TEMPDIR}/${BOOTDIRNAME}/syslinux.cfg`
		`- echo "kernel /boot/vmlinuz" >> ${TEMPDIR}/${BOOTDIRNAME}/syslinux.cfg`
		`- echo "append initrd=/boot/initrd.img ${KERNEL_BOOT_OPTIONS}" >> ${TEMPDIR}/${BOOTDIRNAME}/syslinux.cfg`
		`- else`
		`- sed "s\|@@PROMPT@@\|${PROMPT}\|g;s\|@@TIMEOUT@@\|${TIMEOUT}\|g;s\|@@KERNEL_BOOT_OPTIONS@@\|${KERNEL_BOOT_OPTIONS}\|g" \`
		`- ${SYSLINUXCFG} > ${TEMPDIR}/${BOOTDIRNAME}/syslinux.cfg`
		`- fi`
		`- [ ! -s ${TEMPDIR}/${BOOTDIRNAME}/syslinux.cfg ] && echo "No syslinux.cfg found" && exit 1`
		`- echo ":: Calling mkinitcpio CONFIG=${MKINITCPIO_CONFIG} KERNEL=${VERSION} ..."`
		`- # generate initramdisk`
		`- echo ":: Creating initramdisk ..."`
		`- mkinitcpio -c ${MKINITCPIO_CONFIG} -k ${VERSION} -g ${TEMPDIR}/boot/initrd.img`
		`- echo ":: Using ${KERNEL} as image kernel ..."`
		`- install -m644 ${KERNEL} ${TEMPDIR}/boot/vmlinuz`
		`- install -m644 ${BOOTMESSAGE} ${TEMPDIR}/${BOOTDIRNAME}/boot.msg`
		`- install -m644 ${OPTIONSBOOTMESSAGE} ${TEMPDIR}/${BOOTDIRNAME}/options.msg`
		`- [ ! -s ${TEMPDIR}/${BOOTDIRNAME}/boot.msg ] && echo 'ERROR:no boot.msg found, aborting!' && exit 1`
		`- [ ! -s ${TEMPDIR}/${BOOTDIRNAME}/options.msg ] && echo 'ERROR:no options.msg found, aborting!' && exit 1`
		`- if ! [ "${IMAGENAME}" = "" ]; then`
		`- # ext2 overhead's upper bound is 6%`
		`- # empirically tested up to 1GB`
		`- rootsize=$(du -bs ${TEMPDIR}\|cut -f1)`
		`- IMGSZ=$(( (${rootsize}*106)/100/512 + 1)) # image size in sectors`
		`- # create the filesystem image file`
		`- dd if=/dev/zero of="${IMAGENAME}" bs=512 count="${IMGSZ}"`
		`- # create a filesystem on the image`
		`- mkfs.vfat "${IMAGENAME}"`
		`- mount -o loop ${IMAGENAME} ${TMPDIR} \|\| exit 1`
		`- cp -r "${TEMPDIR}"/* "$TMPDIR"`
		`- umount ${TMPDIR}`
		`- else`
		`- echo ":: Unmounting ${DEVICE} ..."`
		`- umount ${TEMPDIR} \|\| exit 1`
		`- fi`
		`- if ! [ "${IMAGENAME}" = "" ]; then`
		`- echo ":: Installing SYSLINUX on ${IMAGENAME} ..."`
		`- syslinux ${IMAGENAME} && echo "Installation completed."`
		`- else`
		`- echo ":: Installing MBR on ${MBRDEVICE} ..."`
		`- cat ${MBR} > ${MBRDEVICE}`
		`- echo ":: Installing SYSLINUX on ${DEVICE} ..."`
		`- syslinux -t offset ${DEVICE} && echo "Installation completed."`
		`- fi`
		`- # clean /tmp`
		`- rm -r ${TEMPDIR}`
		`- ! [ ${IMAGENAME} = "" ] && rm -r ${TMPDIR}`

libre/mksyslinux/mksyslinux.conf

file removed

-34

		`@@ -1,34 +0,0 @@`
		`- # Created by Tobias Powalowski <tpowa@archlinux.org>`
		`- # Rebranded for Parabola by André Silva <emulatorman@parabola.nu>`
		`- # config file of mksyslinux`
		`-`
		`- # DEFAULT kernel boot options like root=/dev/sda3 etc.`
		`- # add your root= option, if you boot from a disk device`
		`- # and don't want to add it by hand on each boot`
		`- KERNEL_BOOT_OPTIONS=""`
		`-`
		`- # mkinitcpio config file, defaulted to stock config file`
		`- MKINITCPIO_CONFIG="/etc/mkinitcpio.conf"`
		`-`
		`- # kernel version, defaulted to build for runtime kernel`
		`- VERSION="$(uname -r)"`
		`-`
		`- # kernel image, defaulted to stock libre kernel`
		`- KERNEL="/boot/vmlinuz-linux-libre"`
		`-`
		`- # boot message files`
		`- BOOTMESSAGE="/usr/share/mksyslinux/boot.msg"`
		`- OPTIONSBOOTMESSAGE="/usr/share/mksyslinux/options.msg"`
		`-`
		`- # syslinux.cfg file to use`
		`- SYSLINUXCFG=""`
		`-`
		`- # Prompt on boot, 1=yes 0=no`
		`- PROMPT="1"`
		`-`
		`- # Timeout, 30 seconds to fix usb keyboard issues`
		`- # 0 means wait for prompt`
		`- TIMEOUT="300"`
		`-`
		`- # default MBR`
		`- MBR="/usr/lib/syslinux/mbr.bin"`

libre/mksyslinux/options.msg

file removed

-6

		`@@ -1,6 +0,0 @@`
		`- ------------------------------------------------------------------------------`
		`- Parabola GNU/Linux-libre options and troubleshooting:`
		`-`
		`- - If your system hangs during the boot process, any combinations of the`
		`- boot options noapic acpi=off pci=routeirq nosmp nomsi may be useful.`
		`- ------------------------------------------------------------------------------`

libre/mozilla-searchplugins/PKGBUILD

file modified

+1 -1

		`@@ -1,4 +1,4 @@`
		`- # Contributor (Hyperbola): Márcio Silva <coadde@hyperbola.info>`
		`+ # Contributor: Márcio Silva <coadde@hyperbola.info>`
		`# Maintainer: Luke Shumaker <lukeshu@sbcglobal.net>`
		`# Contributor: Figue <ffigue at gmail>`
		`# Contributor: Figue <ffigue at gmail>`

libre/mplayer/PKGBUILD

file modified

+4 -4

		`@@ -1,7 +1,7 @@`
		`- # Maintainer (Arch): Levente Polyak <anthraxx@archlinux.org>`
		`- # Contributor (Arch): Ionut Biru <ibiru@archlinux.org>`
		`- # Contributor (Arch): Bartłomiej Piotrowski <bpiotrowski@archlinux.org>`
		`- # Contributor (Arch): Hugo Doria <hugo@archlinux.org>`
		`+ # Maintainer (arch): Levente Polyak <anthraxx@archlinux.org>`
		`+ # Contributor: Ionut Biru <ibiru@archlinux.org>`
		`+ # Contributor: Bartłomiej Piotrowski <bpiotrowski@archlinux.org>`
		`+ # Contributor: Hugo Doria <hugo@archlinux.org>`
		`# Maintainer: Omar Vega Ramos <ovruni@gnu.org.pe>`
		`# Contributor: André Silva <emulatorman@hyperbola.info>`
		`# Contributor: Márcio Silva <coadde@hyperbola.info>`

libre/musescore/PKGBUILD

file modified

+3 -3

		`@@ -1,7 +1,7 @@`
		`# Maintainer (arch): Maxime Gauduin <alucryd@archlinux.org>`
		`- # Contributor (arch): Stefan Husmann <stefan-husmann@t-online.de>`
		`- # Contributor (arch): Cristian Maureira <saint@archlinux.cl>`
		`- # Contributor (arch): Dr.Egg <rwhite@archlinux.us>`
		`+ # Contributor: Stefan Husmann <stefan-husmann@t-online.de>`
		`+ # Contributor: Cristian Maureira <saint@archlinux.cl>`
		`+ # Contributor: Dr.Egg <rwhite@archlinux.us>`
		`# Maintainer: bill-auger <bill-auger@programmer.net>`

		`# parabola changes and rationale:`

libre/netpbm/PKGBUILD

file modified

+1 -1

		`@@ -1,5 +1,5 @@`
		`# Maintainer: Omar Vega Ramos <ovruni@gnu.org.pe>`
		`- # Contributor (Hyperbola): André Silva <emulatorman@hyperbola.info>`
		`+ # Contributor: André Silva <emulatorman@hyperbola.info>`
		`# Maintainer (Arch):`
		`# parabola changes and rationale:`
		`# - Added armv7h and i686 support`

libre/ogre/PKGBUILD

file modified

+1 -1

		`@@ -1,4 +1,4 @@`
		`- # Maintainer (Arch): Sven-Hendrik Haase <svenstaro@archlinux.org>`
		`+ # Maintainer (arch): Sven-Hendrik Haase <svenstaro@archlinux.org>`
		`# Maintainer: Omar Vega Ramos <ovruni@gnu.org.pe>`
		`# Contributor: Márcio Silva <coadde@hyperbola.info>`

libre/opencv/PKGBUILD

file modified

+1 -1

		`@@ -1,5 +1,5 @@`
		`# Maintainer (arch): Ray Rashif <schiv@archlinux.org>`
		`- # Contributor (arch): Tobias Powalowski <tpowa@archlinux.org>`
		`+ # Contributor: Tobias Powalowski <tpowa@archlinux.org>`
		`# Contributor: André Silva <emulatorman@hyperbola.info>`
		`# Contributor: Márcio Silva <coadde@hyperbola.info>`
		`# Maintainer: Omar Vega Ramos <ovruni@gnu.org.pe>`

libre/openmw/PKGBUILD

file modified

+2 -2

		`@@ -1,5 +1,5 @@`
		`- # Maintainer (Arch): Sven-Hendrik Haase <sh@lutzhaase.com>`
		`- # Contributor (Arch): Sandy Carter <bwrsandman@gmail.com>`
		`+ # Maintainer (arch): Sven-Hendrik Haase <sh@lutzhaase.com>`
		`+ # Contributor: Sandy Carter <bwrsandman@gmail.com>`
		`# Contributor: André Silva <emulatorman@hyperbola.info>`
		`pkgname=openmw`
		`pkgver=0.45.0`

libre/opentest4j/PKGBUILD

file added

+57

		`@@ -0,0 +1,57 @@`
		`+ # Maintainer: Parabola Hackers <dev@lists.parabola.nu>`
		`+`
		`+ pkgname=opentest4j`
		`+ pkgver=1.2.0`
		`+ pkgrel=1`
		`+ pkgdesc='Minimal common foundation for testing libraries for Java'`
		`+ arch=('any')`
		`+ url='https://github.com/ota4j-team/opentest4j'`
		`+ license=('Apache')`
		`+ depends=('java-environment' 'java-runtime')`
		`+ makedepends=('jh')`
		`+ source=("https://github.com/ota4j-team/${pkgname}/archive/refs/tags/r${pkgver}.tar.gz")`
		`+ sha512sums=('cd98d976935de97d259ec4c04510334f2b56f8a32db2c97e0f20a2e3b99f119ffeb390589eb42d4594808d96194067871d5eaad6a40dd58af30b9f995b13ef08')`
		`+`
		`+ prepare() {`
		`+ cd "${srcdir}/${pkgname}-r${pkgver}"`
		`+ mkdir -p "${srcdir}/dist/classes"`
		`+ mkdir -p "${srcdir}/dist/source"`
		`+ }`
		`+`
		`+ build() {`
		`+ cd "${srcdir}/${pkgname}-r${pkgver}"`
		`+`
		`+ javac \`
		`+ -classpath "${CLASSPATH}" \`
		`+ -d "classes" \`
		`+ -encoding UTF-8 \`
		`+ $(find "src/main/java/" -name \*.java)`
		`+`
		`+ jar -cvf "${pkgname}.jar" \`
		`+ -C "classes" .`
		`+`
		`+ javadoc \`
		`+ -d "build/javadoc" \`
		`+ -encoding UTF-8 \`
		`+ -sourcepath "src/main/java" \`
		`+ org.opentest4j`
		`+ }`
		`+`
		`+ package() {`
		`+ cd "${srcdir}/${pkgname}-r${pkgver}"`
		`+`
		`+ # CONTRIBUTING.md has the project license statement:`
		`+ # Project License: [Apache License Version 2.0](LICENSE)`
		`+ install -Dm644 \`
		`+ LICENSE CONTRIBUTING.md \`
		`+ -t "${pkgdir}/usr/share/licenses/${pkgname}/"`
		`+`
		`+ export DESTDIR="$pkgdir"`
		`+ jh mvn-install ${pkgname} ${pkgname} ${pkgver} \`
		`+ pom.xml \`
		`+ "${pkgname}.jar" \`
		`+ "${pkgname}.jar"`
		`+`
		`+ ln -s "/usr/share/java/${pkgname}.jar" \`
		`+ "${pkgdir}/usr/share/java/${pkgname}-${pkgver}.jar"`
		`+ }`

libre/openttd/PKGBUILD

file modified

+2 -2

		`@@ -1,5 +1,5 @@`
		`- # Maintainer (Arch): Vesa Kaihlavirta <vegai@iki.fi>`
		`- # Maintainer (Hyperbola): André Silva <emulatorman@hyperbola.info>`
		`+ # Maintainer (arch): Vesa Kaihlavirta <vegai@iki.fi>`
		`+ # Contributor: André Silva <emulatorman@hyperbola.info>`
		`# Maintainer: Omar Vega Ramos <ovruni@gnu.org.pe>`

		`# parabola changes and rationale:`

libre/p7zip/PKGBUILD

file modified

+7 -7

		`@@ -1,10 +1,10 @@`
		`- # Maintainer (Arch): Evangelos Foutras <evangelos@foutrelis.com>`
		`- # Contributor (Arch): Gaetan Bisson <bisson@archlinux.org>`
		`- # Contributor (Arch): Thayer Williams <thayer@archlinux.org>`
		`- # Contributor (Arch): Hugo Doria <hugo@archlinux.org>`
		`- # Contributor (Arch): TuxSpirit<tuxspirit@archlinux.fr>`
		`- # Contributor (Arch): Daniel J Griffiths <ghost1227@archlinux.us>`
		`- # Maintainer (Hyperbola): André Silva <emulatorman@hyperbola.info>`
		`+ # Maintainer (arch): Evangelos Foutras <evangelos@foutrelis.com>`
		`+ # Contributor: Gaetan Bisson <bisson@archlinux.org>`
		`+ # Contributor: Thayer Williams <thayer@archlinux.org>`
		`+ # Contributor: Hugo Doria <hugo@archlinux.org>`
		`+ # Contributor: TuxSpirit<tuxspirit@archlinux.fr>`
		`+ # Contributor: Daniel J Griffiths <ghost1227@archlinux.us>`
		`+ # Contributor: André Silva <emulatorman@hyperbola.info>`
		`# Maintainer: Omar Vega Ramos <ovruni@gnu.org.pe>`

		`_pkgname=p7zip-libre`

libre/pacman-mirrorlist/PKGBUILD

file modified

+1 -1

		`@@ -1,5 +1,5 @@`
		`# Maintainer (arch): Florian Pritz <bluewind@xinu.at>`
		`- # Contributor (arch): Dan McGee <dan@archlinux.org>`
		`+ # Contributor: Dan McGee <dan@archlinux.org>`
		`# Contributor: Isaac David <isacdaavid@at@isacdaavid@dot@info>`
		`# Contributor: André Silva <emulatorman@hyperbola.info>`
		`# Contributor: Esteban Carnevale <alfplayer@mailoo.org>`

libre/pacman/9002-pacman-key-updatedb.patch

file added

+16

		`@@ -0,0 +1,16 @@`
		`+ this helps to ensure that an expired key will be trusted again,`
		`+ immediately after the updated keyring package is installed`
		`+`
		`+ diff --git a/scripts/pacman-key.sh.in b/scripts/pacman-key.sh.in`
		`+ index f7f1dd6..c5fb73f 100644`
		`+ --- a/scripts/pacman-key.sh.in`
		`+ +++ b/scripts/pacman-key.sh.in`
		`+ @@ -599,7 +599,7 @@ verify_sig() {`
		`+`
		`+ updatedb() {`
		`+ msg "$(gettext "Updating trust database...")"`
		`+ - if ! "${GPG_PACMAN[@]}" --batch --check-trustdb ; then`
		`+ + if ! "${GPG_PACMAN[@]}" --batch --check-trustdb --yes ; then`
		`+ error "$(gettext "Trust database could not be updated.")"`
		`+ exit 1`
		`+ fi`

libre/pacman/PKGBUILD

file modified

+56 -53

		`@@ -10,22 +10,22 @@`

		`# parabola changes and rationale:`
		`# - adapt config files to support multiple arches`
		`- # - install keyring updater service files`
		`# - allow pacstrap to create cross-arch chroots`
		`+ # - disable tests requiring networking`


		`pkgname=pacman`
		`- pkgver=6.0.1`
		`- pkgrel=4`
		`- pkgrel+=.parabola2`
		`+ pkgver=6.0.2`
		`+ pkgrel=5`
		`+ pkgrel+=.parabola3`
		`pkgdesc="A library-based package manager with dependency support"`
		`arch=('x86_64')`
		`arch+=('armv7h' 'i686')`
		`url="https://www.archlinux.org/pacman/"`
		`license=('GPL')`
		`groups=('base-devel')`
		`- depends=('bash' 'glibc' 'libarchive' 'curl'`
		`- 'gpgme' 'pacman-mirrorlist' 'archlinux-keyring')`
		`+ depends=('bash' 'glibc' 'libarchive' 'curl' 'gpgme' 'pacman-mirrorlist'`
		`+ 'gettext' 'gawk' 'coreutils' 'gnupg' 'grep')`
		`_upstream_keyring=$(case ${CARCH} in armv7h) echo 'archlinuxarm-keyring' ;; \`
		`i686 ) echo 'archlinux32-keyring' ;; esac)`
		`depends+=('parabola-keyring' ${_upstream_keyring} )`
		`@@ -39,47 +39,43 @@`
		`validpgpkeys=('6645B0A8C7005E78DB1D7864F99FFE0FEAE999BD' # Allan McRae <allan@archlinux.org>`
		`'B8151B117037781095514CA7BBDFFC92306B1121') # Andrew Gregory (pacman) <andrew@archlinux.org>`
		`source=(https://sources.archlinux.org/other/pacman/$pkgname-$pkgver.tar.xz{,.sig}`
		`- add-flto-to-LDFLAGS-for-clang.patch`
		`- makepkg-use-ffile-prefix-map-instead-of-fdebug-prefi.patch`
		`- libmakepkg-add-extra-buildflags-only-when-buildflags.patch`
		`- make-link-time-optimization-flags-configurable.patch`
		`+ pacman-always-create-directories-from-debugedit.patch::https://gitlab.archlinux.org/pacman/pacman/-/commit/efd0c24c07b86be014a4edb5a8ece021b87e3900.patch`
		`+ pacman-always-create-directories-from-debugedit-fixup.patch::https://gitlab.archlinux.org/pacman/pacman/-/commit/86981383a2f4380bda26311831be94cdc743649b.patch`
		`+ pacman-fix-unique-source-paths.patch::https://gitlab.archlinux.org/pacman/pacman/-/commit/478af273dfe24ded197ec54ae977ddc3719d74a0.patch`
		`+ pacman-strip-include-o-files-similar-to-kernel-modules.patch::https://gitlab.archlinux.org/pacman/pacman/-/commit/de11824527ec4e2561e161ac40a5714ec943543c.patch`
		`pacman.conf`
		`makepkg.conf)`
		`source=( ${source[*]/pacman.conf/} $(printf "pacman.conf.%s\n" "${arch[@]}" \| sort) ) # pacman.conf.{armv7h,i686,x86_64}`
		`source=( ${source[*]/makepkg.conf/makepkg.conf.in} ) # makepkg.conf.in`
		`source+=(dummy.conf`
		`- pacman-keyring.service`
		`- pacman-keyring.timer`
		`- pacman-keyring.initd`
		`- 9001-makepkg-Treat-pkgrel-more-similarly-to-pkgver.patch)`
		`+ 9001-makepkg-Treat-pkgrel-more-similarly-to-pkgver.patch`
		`+ 9002-pacman-key-updatedb.patch)`
		`source_armv7h=(0001-Sychronize-filesystem.patch`
		`0002-Revert-close-stdin-before-running-install-scripts.patch`
		`0003-Revert-alpm_run_chroot-always-connect-parent2child-p.patch)`
		`- sha256sums=('0db61456e56aa49e260e891c0b025be210319e62b15521f29d3e93b00d3bf731'`
		`+ sha256sums=('7d8e3e8c5121aec0965df71f59bedf46052c6cf14f96365c4411ec3de0a4c1a5'`
		`'SKIP'`
		`- '82ff91b85f4c6ceba19f9330437e2a22aabc966c2b9e2a20a53857f98a42c223'`
		`- 'b940e6c0c05a185dce1dbb9da0dcbebf742fca7a63f3e3308d49205afe5a6582'`
		`- '7d0aee976c9c71fcf7c96ef1d99aa76efe47d8c1f4451842d6d159ec7deb4278'`
		`- '5b43e26a76be3ed10a69d4bfb2be48db8cce359baf46583411c7f124737ebe6a'`
		`+ '522b789e442b3bb3afa7ea3fa417a99554f36ec00de3986cbe92c80f09a7db99'`
		`+ 'dab7c70fb9d77d702069bb57f5a12496b463d68ae20460fb0a3ffcb4791321a9'`
		`+ '0b56c61eac3d9425d68faa2eccbaefdc5ed422b643974ae829eaca0460043da1'`
		`+ 'acd0b149b6324dc1eca3cd2d3b30df6ef64c5653e83523d77200ec593e01d2a7'`
		`'20e9de1b612c3f24736e76a753cd38b7ea0f80160185012a538a77297acfb31f' # makepkg.conf.in`
		`- '655a1e9a198ccd93313d26327fd20c4d7e4a630840c6e5615143953d2418c3d6' # pacman.conf.armv7h`
		`- 'f8069c81ddcba59fce6884002f5f40374859dd60610bae1ff99f93827b796e80' # pacman.conf.i686`
		`- '748310c1c63dd9d4da2c452938757f82345a0bc0da520968c30048105bbe9b46') # pacman.conf.x86_64`
		`- sha256sums+=('ab10d0156ef1f7cd67c5e7365687f754020ae3b4ab79a23a1882cd78ede15fb3'`
		`- '220f1b25a64727041dc6fa3fd486b0a043f735a3f6cecedc4e2f7c47ec6ce66d'`
		`- '2a857061f032ff5485f5c75ab74e6f6532621e08963ef48640a792cca16cacd6'`
		`- '3a0115c5441e565eab0f72e4154440e640be6317cfa13dee0f36b058f63e1774'`
		`- '9ccc7ef5bd27a68d8788f10c6e5b36495c5d9038d4eb160f9ea4dc9901b622d8')`
		`+ 'ba97c17a2d994b69617d89dd57c774189c9af99d89ccf78615dec2feefada25e' # pacman.conf.armv7h`
		`+ 'a9745669798187ae1862481eceda93691d64c48c8198b06b9df85fa6f21966de' # pacman.conf.i686`
		`+ 'aac3d5414de69f8cd3126adc85066299c8f6149bd12dffceb1049e124aab6f34') # pacman.conf.x86_64`
		`+ sha256sums+=('8fca32bf5ee85b67c93983d7e1c93734de5e715b3bb732f7e48b88da7844f94b'`
		`+ '9ccc7ef5bd27a68d8788f10c6e5b36495c5d9038d4eb160f9ea4dc9901b622d8'`
		`+ '98396eba73b305da7e86a163bb1fcb5ff2cb2c5dd1e0ccf09fd1e7e0222fe3c5')`
		`sha256sums_armv7h=('8d70fb5094f58aad98b601bbc42be354c2014b9fe734a1ee0b1e14bb041cc9cc'`
		`'0e771370da68c855bfb4eaad4c2ae137883a474886a049b934dac2e775574cb9'`
		`'2f586f72c34150330389854575a21be1d3ef3637c4f94bec2e948c2717a5aecb')`

		`prepare() {`
		`cd "$pkgname-$pkgver"`
		`- patch -Np1 -i ../add-flto-to-LDFLAGS-for-clang.patch`
		`- patch -Np1 -i ../makepkg-use-ffile-prefix-map-instead-of-fdebug-prefi.patch`
		`- patch -Np1 -i ../libmakepkg-add-extra-buildflags-only-when-buildflags.patch`
		`- patch -Np1 -i ../make-link-time-optimization-flags-configurable.patch`
		`+ patch -Np1 -i ../pacman-always-create-directories-from-debugedit.patch`
		`+ patch -Np1 -i ../pacman-always-create-directories-from-debugedit-fixup.patch`
		`+ patch -Np1 -i ../pacman-fix-unique-source-paths.patch`
		`+ patch -Np1 -i ../pacman-strip-include-o-files-similar-to-kernel-modules.patch`

		`# From Arch ARM`
		`if [ "${CARCH}" = "armv7h" ]; then`
		`@@ -90,11 +86,24 @@`

		`# From Parabola`
		`patch -p1 -i ../9001-makepkg-Treat-pkgrel-more-similarly-to-pkgver.patch`
		`+ patch -p1 -i ../9002-pacman-key-updatedb.patch`

		`# Generate the architecture-specific makepkg.conf files`
		`local carch mycarch mychost myflags myldflags`
		`for carch in "${arch[@]}"; do`
		`case $carch in`
		`+ aarch64)`
		`+ mycarch="aarch64"`
		`+ mychost="aarch64-unknown-linux-gnu"`
		`+ myflags="-march=armv8-a "`
		`+ ;;`
		`+ armv7h)`
		`+ mycarch="armv7h"`
		`+ mychost="armv7l-unknown-linux-gnueabihf"`
		`+ myflags="-march=armv7-a -mfloat-abi=hard -mfpu=neon -O2 -pipe -fno-plt -fexceptions \`
		`+ -Wp,-D_FORTIFY_SOURCE=2 -Wformat -Werror=format-security \`
		`+ -fstack-clash-protection"`
		`+ ;;`
		`i686)`
		`mycarch="i686"`
		`mychost="i686-pc-linux-gnu"`
		`@@ -109,23 +118,25 @@`
		`-Wp,-D_FORTIFY_SOURCE=2 -Wformat -Werror=format-security \`
		`-fstack-clash-protection -fcf-protection"`
		`;;`
		`- armv7h)`
		`- mycarch="armv7h"`
		`- mychost="armv7l-unknown-linux-gnueabihf"`
		`- myflags="-march=armv7-a -mfloat-abi=hard -mfpu=vfpv3-d16 -O2 -pipe -fno-plt -fexceptions \`
		`- -Wp,-D_FORTIFY_SOURCE=2 -Wformat -Werror=format-security \`
		`- -fstack-clash-protection"`
		`- ;;`
		`esac`
		`myldflags="-Wl,-O1,--sort-common,--as-needed,-z,relro,-z,now"`

		`- # set things correctly in the default conf file`
		`+ # configure the per-arch default makepkg.conf files`
		`sed < "$srcdir/makepkg.conf.in" > "$srcdir/makepkg.conf.$carch" \`
		`-e "s\|@CARCH[@]\|$mycarch\|g" \`
		`-e "s\|@CHOST[@]\|$mychost\|g" \`
		`-e "s\|@CARCHFLAGS[@]\|$myflags\|g" \`
		`-e "s\|@LDFLAGS[@]\|$myldflags\|g"`
		`done`
		`+`
		`+ # neutralize tests which require networking`
		`+ local net_check_url=https://repo.parabola.nu/check_network_status.txt`
		`+ local tests=() # eg: tests/sync-failover-404-with-body.py`
		`+ local sed_rx="s\|/PKGBUILD\|&$(printf "\\\n'%s': true," "${tests[@]}")\|"`
		`+`
		`+ if (( ${#tests[@]} ))`
		`+ then curl ${net_check_url} &> /dev/null \|\| sed -i "${sed_rx}" test/pacman/meson.build`
		`+ fi`
		`}`

		`build() {`
		`@@ -139,6 +150,12 @@`
		`-Dldconfig=/usr/bin/ldconfig \`
		`build`

		`+ # FIXME: armv7h fails building doxygen`
		`+ # terminate called after throwing an instance of 'ghc::filesystem::filesystem_error'`
		`+ # what(): Value too large for defined data type: '/build/pacman/src'`
		`+ # qemu: uncaught target signal 6 (Aborted) - core dumped`
		`+ [[ "${CARCH}" != armv7h ]] \|\| meson configure -Ddoxygen=disabled build`
		`+`
		`meson compile -C build`
		`}`

		`@@ -171,18 +188,4 @@`
		`install -m644 "$srcdir/pacman.conf.$carch" "$pkgdir/usr/share/pacman/defaults/"`
		`install -m644 "$srcdir/makepkg.conf.$carch" "$pkgdir/usr/share/pacman/defaults/"`
		`done`
		`-`
		`- # systemd service`
		`- install -dm755 "$pkgdir/usr/lib/systemd/system"`
		`- install -dm755 "$pkgdir/usr/lib/systemd/system-preset"`
		`- install -m644 "$srcdir/pacman-keyring.service" "$pkgdir/usr/lib/systemd/system/"`
		`- install -m644 "$srcdir/pacman-keyring.timer" "$pkgdir/usr/lib/systemd/system/"`
		`- install -m644 /dev/stdin "$pkgdir/usr/lib/systemd/system-preset/90-pacman.preset" \`
		`- <<<"enable pacman-keyring.timer"`
		`-`
		`- # openrc service`
		`- install -dm755 "$pkgdir/etc/init.d"`
		`- install -dm755 "$pkgdir/etc/runlevels/default"`
		`- install -m755 "$srcdir/pacman-keyring.initd" "$pkgdir/etc/init.d/pacman-keyring"`
		`- ln -s /etc/init.d/pacman-keyring "$pkgdir/etc/runlevels/default/pacman-keyring"`
		`}`

libre/pacman/add-flto-to-LDFLAGS-for-clang.patch

file removed

-24

		`@@ -1,24 +0,0 @@`
		`- From 26ee6ff6adbcd8560ec3a65cf219d2ab98edb804 Mon Sep 17 00:00:00 2001`
		`- From: Allan McRae <allan@archlinux.org>`
		`- Date: Fri, 24 Dec 2021 17:59:32 +1000`
		`- Subject: [PATCH] LTO: Add -flto to LDFLAGS for clang`
		`-`
		`- GCC automatically detects when it is linking LTO objects, but clang does`
		`- not. Add -flto to LDFLAGS to make this work for clang too.`
		`-`
		`- Signed-off-by: Allan McRae <allan@archlinux.org>`
		`- ---`
		`- scripts/libmakepkg/buildenv/lto.sh.in \| 1 +`
		`- 1 file changed, 1 insertion(+)`
		`-`
		`- diff --git a/scripts/libmakepkg/buildenv/lto.sh.in b/scripts/libmakepkg/buildenv/lto.sh.in`
		`- index 1f1ca53f..c3bd0fa4 100644`
		`- --- a/scripts/libmakepkg/buildenv/lto.sh.in`
		`- +++ b/scripts/libmakepkg/buildenv/lto.sh.in`
		`- @@ -33,5 +33,6 @@ buildenv_lto() {`
		`- if check_option "lto" "y"; then`
		`- CFLAGS+=" -flto"`
		`- CXXFLAGS+=" -flto"`
		`- + LDFLAGS+=" -flto"`
		`- fi`
		`- }`

libre/pacman/dummy.conf

file modified

+2 -1

		`@@ -1,1 +1,2 @@`
		`- # parabola's pacman.conf expects at least 1 file matching /etc/pacman.d/*.conf`
		`+ # if the '# Over-rides #' include in pacman.conf is enabled,`
		`+ # there must exist at least 1 file matching /etc/pacman.d/*.conf`

libre/pacman/libmakepkg-add-extra-buildflags-only-when-buildflags.patch

file removed

-41

		`@@ -1,41 +0,0 @@`
		`- From 42fe4864a0c8e2846007ffee532fe0cf4b321cdd Mon Sep 17 00:00:00 2001`
		`- From: Allan McRae <allan@archlinux.org>`
		`- Date: Sun, 9 Jan 2022 12:45:58 +1000`
		`- Subject: [PATCH] libmakepkg: add extra buildflags only when buildflags is not`
		`- disabled`
		`-`
		`- This means options=('!buildflags') will disable the addition of CFLAG`
		`- etc for LTO and debug building.`
		`-`
		`- Signed-off-by: Allan McRae <allan@archlinux.org>`
		`- ---`
		`- scripts/libmakepkg/buildenv/debugflags.sh.in \| 2 +-`
		`- scripts/libmakepkg/buildenv/lto.sh.in \| 2 +-`
		`- 2 files changed, 2 insertions(+), 2 deletions(-)`
		`-`
		`- diff --git a/scripts/libmakepkg/buildenv/debugflags.sh.in b/scripts/libmakepkg/buildenv/debugflags.sh.in`
		`- index 84ca7b71..1cb58613 100644`
		`- --- a/scripts/libmakepkg/buildenv/debugflags.sh.in`
		`- +++ b/scripts/libmakepkg/buildenv/debugflags.sh.in`
		`- @@ -29,7 +29,7 @@ source "$LIBRARY/util/option.sh"`
		`- buildenv_functions+=('buildenv_debugflags')`
		`-`
		`- buildenv_debugflags() {`
		`- - if check_option "debug" "y"; then`
		`- + if check_option "debug" "y" && ! check_option "buildflags" "n"; then`
		`- DEBUG_CFLAGS+=" -ffile-prefix-map=$srcdir=${DBGSRCDIR:-/usr/src/debug}"`
		`- DEBUG_CXXFLAGS+=" -ffile-prefix-map=$srcdir=${DBGSRCDIR:-/usr/src/debug}"`
		`- DEBUG_RUSTFLAGS+=" --remap-path-prefix=$srcdir=${DBGSRCDIR:-/usr/src/debug}"`
		`- diff --git a/scripts/libmakepkg/buildenv/lto.sh.in b/scripts/libmakepkg/buildenv/lto.sh.in`
		`- index 081d5648..6e500eab 100644`
		`- --- a/scripts/libmakepkg/buildenv/lto.sh.in`
		`- +++ b/scripts/libmakepkg/buildenv/lto.sh.in`
		`- @@ -30,7 +30,7 @@ build_options+=('lto')`
		`- buildenv_functions+=('buildenv_lto')`
		`-`
		`- buildenv_lto() {`
		`- - if check_option "lto" "y"; then`
		`- + if check_option "lto" "y" && ! check_option "buildflags" "n"; then`
		`- CFLAGS+=" -flto"`
		`- CXXFLAGS+=" -flto"`
		`- LDFLAGS+=" -flto"`

libre/pacman/make-link-time-optimization-flags-configurable.patch

file removed

-108

		`@@ -1,108 +0,0 @@`
		`- From e1ce2351f5c00dd90104e0f4ce3bf176da28af08 Mon Sep 17 00:00:00 2001`
		`- From: Evangelos Foutras <evangelos@foutrelis.com>`
		`- Date: Thu, 10 Feb 2022 05:15:01 +0200`
		`- Subject: [PATCH] Make link time optimization flags configurable`
		`-`
		`- We want to use -flto=auto in Arch Linux to speed up building, but we`
		`- can't hardcode it in buildenv/lto.sh because other downstreams might`
		`- have clang < 13.0.0 which did not recognize -flto=auto as equivalent`
		`- to -flto=full.`
		`-`
		`- Introducing an LTOFLAGS variable to makepkg.conf seems the way to go.`
		`-`
		`- Signed-off-by: Allan McRae <allan@archlinux.org>`
		`- ---`
		`- doc/makepkg.conf.5.asciidoc \| 10 ++++++++--`
		`- etc/makepkg.conf.in \| 1 +`
		`- scripts/libmakepkg/buildenv/buildflags.sh.in \| 2 +-`
		`- scripts/libmakepkg/buildenv/lto.sh.in \| 6 +++---`
		`- scripts/libmakepkg/lint_config/variable.sh.in \| 8 ++++----`
		`- 5 files changed, 17 insertions(+), 10 deletions(-)`
		`-`
		`- diff --git a/doc/makepkg.conf.5.asciidoc b/doc/makepkg.conf.5.asciidoc`
		`- index 39c5c808..a0d9a6d4 100644`
		`- --- a/doc/makepkg.conf.5.asciidoc`
		`- +++ b/doc/makepkg.conf.5.asciidoc`
		`- @@ -81,6 +81,11 @@ Options`
		- usage resembling ``-Wl,--hash-style=gnu''. Read ld(1) for more details on
		`- available linker flags.`
		`-`
		`- +LTOFLAGS="ltoflags"::`
		- + Additional compiler and linker flags appended to `CFLAGS`, `CXXFLAGS`
		- + and `LDFLAGS` when building with link time optimization. If empty,
		- + ``-flto'' is used.
		`- +`
		`- MAKEFLAGS="makeflags"::`
		- This is often used to set the number of jobs used; for example, `-j2`.
		`- Other flags that make accepts can also be passed.`
		`- @@ -190,8 +195,9 @@ Options`
		- package containing the debug symbols when used with `strip'.
		`-`
		`- lto;;`
		`- - Enable building packages using link time optimization. Adds '-flto'`
		`- - to both CFLAGS and CXXFLAGS.`
		`- + Enable building packages using link time optimization. Adds the`
		`- + flags specified in LTOFLAGS to CFLAGS, CXXFLAGS and LDFLAGS (or`
		- + ``-flto'' if LTOFLAGS is empty).
		`-`
		`- autodep;;`
		`- Enable the automatic addition of libraries to the depends and`
		`- diff --git a/etc/makepkg.conf.in b/etc/makepkg.conf.in`
		`- index 0c911cce..edc5f442 100644`
		`- --- a/etc/makepkg.conf.in`
		`- +++ b/etc/makepkg.conf.in`
		`- @@ -41,6 +41,7 @@ CHOST="@CHOST@"`
		`- #CFLAGS="-O2 -pipe"`
		`- #CXXFLAGS="-O2 -pipe"`
		`- #LDFLAGS=""`
		`- +#LTOFLAGS="-flto"`
		`- #RUSTFLAGS="-C opt-level=2"`
		`- #-- Make Flags: change this for DistCC/SMP systems`
		`- #MAKEFLAGS="-j2"`
		`- diff --git a/scripts/libmakepkg/buildenv/buildflags.sh.in b/scripts/libmakepkg/buildenv/buildflags.sh.in`
		`- index 74f91988..07b4a730 100644`
		`- --- a/scripts/libmakepkg/buildenv/buildflags.sh.in`
		`- +++ b/scripts/libmakepkg/buildenv/buildflags.sh.in`
		`- @@ -30,6 +30,6 @@ buildenv_functions+=('buildenv_buildflags')`
		`-`
		`- buildenv_buildflags() {`
		`- if check_option "buildflags" "n"; then`
		`- - unset CPPFLAGS CFLAGS DEBUG_CFLAGS CXXFLAGS DEBUG_CXXFLAGS LDFLAGS RUSTFLAGS DEBUG_RUSTFLAGS`
		`- + unset CPPFLAGS CFLAGS DEBUG_CFLAGS CXXFLAGS DEBUG_CXXFLAGS LDFLAGS LTOFLAGS RUSTFLAGS DEBUG_RUSTFLAGS`
		`- fi`
		`- }`
		`- diff --git a/scripts/libmakepkg/buildenv/lto.sh.in b/scripts/libmakepkg/buildenv/lto.sh.in`
		`- index 6e500eab..6492def7 100644`
		`- --- a/scripts/libmakepkg/buildenv/lto.sh.in`
		`- +++ b/scripts/libmakepkg/buildenv/lto.sh.in`
		`- @@ -31,8 +31,8 @@ buildenv_functions+=('buildenv_lto')`
		`-`
		`- buildenv_lto() {`
		`- if check_option "lto" "y" && ! check_option "buildflags" "n"; then`
		`- - CFLAGS+=" -flto"`
		`- - CXXFLAGS+=" -flto"`
		`- - LDFLAGS+=" -flto"`
		`- + CFLAGS+=" ${LTOFLAGS:--flto}"`
		`- + CXXFLAGS+=" ${LTOFLAGS:--flto}"`
		`- + LDFLAGS+=" ${LTOFLAGS:--flto}"`
		`- fi`
		`- }`
		`- diff --git a/scripts/libmakepkg/lint_config/variable.sh.in b/scripts/libmakepkg/lint_config/variable.sh.in`
		`- index 8327b0a5..03a67ee2 100644`
		`- --- a/scripts/libmakepkg/lint_config/variable.sh.in`
		`- +++ b/scripts/libmakepkg/lint_config/variable.sh.in`
		`- @@ -32,10 +32,10 @@ lint_config_variables() {`
		`- local array=(DLAGENTS VCSCLIENTS BUILDENV OPTIONS INTEGRITY_CHECK MAN_DIRS`
		`- DOC_DIRS PURGE_TARGETS COMPRESSGZ COMPRESSBZ2 COMPRESSXZ`
		`- COMPRESSLRZ COMPRESSLZO COMPRESSZ)`
		`- - local string=(CARCH CHOST CPPFLAGS CFLAGS CXXFLAGS RUSTFLAGS LDFLAGS DEBUG_CFLAGS`
		`- - DEBUG_CXXFLAGS DEBUG_RUSTFLAGS DISTCC_HOSTS BUILDDIR STRIP_BINARIES`
		`- - STRIP_SHARED STRIP_STATIC PKGDEST SRCDEST SRCPKGDEST LOGDEST PACKAGER`
		`- - GPGKEY PKGEXT SRCEXT)`
		`- + local string=(CARCH CHOST CPPFLAGS CFLAGS CXXFLAGS RUSTFLAGS LDFLAGS LTOFLAGS`
		`- + DEBUG_CFLAGS DEBUG_CXXFLAGS DEBUG_RUSTFLAGS DISTCC_HOSTS BUILDDIR`
		`- + STRIP_BINARIES STRIP_SHARED STRIP_STATIC PKGDEST SRCDEST SRCPKGDEST`
		`- + LOGDEST PACKAGER GPGKEY PKGEXT SRCEXT)`
		`-`
		`- local i keys ret=0`
		`-`

libre/pacman/makepkg-use-ffile-prefix-map-instead-of-fdebug-prefi.patch

file removed

-40

		`@@ -1,40 +0,0 @@`
		`- From e37f7d8b6b4d2f9accf97eb96d0eacbddf2a1345 Mon Sep 17 00:00:00 2001`
		`- From: Xiretza <xiretza@xiretza.xyz>`
		`- Date: Sat, 1 Jan 2022 14:40:24 +0100`
		`- Subject: [PATCH] makepkg: use -ffile-prefix-map instead of -fdebug-prefix-map`
		`-`
		`- >From gcc(1):`
		`-`
		`- -ffile-prefix-map=old=new`
		`- [...] Specifying this option is equivalent to specifying all the`
		`- individual -f*-prefix-map options. This can be used to make reproducible`
		`- builds that are location independent.`
		`-`
		`- Specifically, this additionally enables -fmacro-prefix-map=, which causes`
		`- prefix mapping to be applied to expansions of __FILE__ and similar macros.`
		`-`
		`- Without this option, if source files are compiled by passing the`
		`- absolute file path to the compiler (as done by e.g. cmake), any`
		`- expansions of __FILE__ (e.g. from uses of assert()) will contain`
		`- $srcdir.`
		`-`
		`- Signed-off-by: Allan McRae <allan@archlinux.org>`
		`- ---`
		`- scripts/libmakepkg/buildenv/debugflags.sh.in \| 4 ++--`
		`- 1 file changed, 2 insertions(+), 2 deletions(-)`
		`-`
		`- diff --git a/scripts/libmakepkg/buildenv/debugflags.sh.in b/scripts/libmakepkg/buildenv/debugflags.sh.in`
		`- index e0a1ed00..84ca7b71 100644`
		`- --- a/scripts/libmakepkg/buildenv/debugflags.sh.in`
		`- +++ b/scripts/libmakepkg/buildenv/debugflags.sh.in`
		`- @@ -30,8 +30,8 @@ buildenv_functions+=('buildenv_debugflags')`
		`-`
		`- buildenv_debugflags() {`
		`- if check_option "debug" "y"; then`
		`- - DEBUG_CFLAGS+=" -fdebug-prefix-map=$srcdir=${DBGSRCDIR:-/usr/src/debug}"`
		`- - DEBUG_CXXFLAGS+=" -fdebug-prefix-map=$srcdir=${DBGSRCDIR:-/usr/src/debug}"`
		`- + DEBUG_CFLAGS+=" -ffile-prefix-map=$srcdir=${DBGSRCDIR:-/usr/src/debug}"`
		`- + DEBUG_CXXFLAGS+=" -ffile-prefix-map=$srcdir=${DBGSRCDIR:-/usr/src/debug}"`
		`- DEBUG_RUSTFLAGS+=" --remap-path-prefix=$srcdir=${DBGSRCDIR:-/usr/src/debug}"`
		`- CFLAGS+=" $DEBUG_CFLAGS"`
		`- CXXFLAGS+=" $DEBUG_CXXFLAGS"`

libre/pacman/pacman-keyring.initd

file removed

-26

		`@@ -1,26 +0,0 @@`
		`- #!/sbin/openrc-run`
		`-`
		`- # This is not a daemon; but a short-lived process,`
		`- # which only needs to run occasionally.`
		`- # Running it as a pseudo-service,`
		`- # simplifies the install (rather than requiring a cron deamon).`
		`- # Users must only add it to the 'default' runlevel.`
		`-`
		`-`
		`- name="pacman-keyring"`
		`- description="Refresh pacman keyring"`
		`-`
		`-`
		`- depend() {`
		`- need net`
		`- after logger`
		`- }`
		`-`
		`- # Custom start() function with wrapper, to always exit "success" status.`
		`- # The command will exit non-zero upon any failed key retrieval;`
		`- # which is common if not likely, due to the large number of keys it fetches.`
		`- start() {`
		`- ebegin "Starting ${RC_SVCNAME}"`
		`- start-stop-daemon --start --exec /usr/bin/bash -- -c '/usr/bin/pacman-key --refresh-keys \|\| :'`
		`- eend $?`
		`- }`

libre/pacman/pacman-keyring.service

file removed

-7

		`@@ -1,7 +0,0 @@`
		`- [Unit]`
		`- Description=Refresh pacman keyring`
		`- Documentation=man:pacman-key`
		`-`
		`- [Service]`
		`- Type=oneshot`
		`- ExecStart=/usr/bin/pacman-key --refresh-keys`

libre/pacman/pacman-keyring.timer

file removed

-11

		`@@ -1,11 +0,0 @@`
		`- [Unit]`
		`- Description=Refresh pacman keyring once a week`
		`- Documentation=man:pacman-key`
		`-`
		`- [Timer]`
		`- OnCalendar=weekly`
		`- AccuracySec=1h`
		`- Persistent=true`
		`-`
		`- [Install]`
		`- WantedBy=timers.target`

libre/parabola-base/PKGBUILD

file modified

+6 -5

		`@@ -1,5 +1,6 @@`
		`# Contributor: bill-auger <bill-auger@programmer.net>`
		`- # Maintainers: Parabola hackers <dev@lists.parabola.nu>`
		`+ # Maintainer: Parabola Hackers <dev@lists.parabola.nu>`
		`+`

		`# this is the canonical definition of the standard Parabola systemd CLI system`
		`# as installed onto the systemd CLI LiveISOs, and installed by the installers`
		`@@ -18,8 +19,8 @@`

		`# (obsolete 'base' group) - ('libre/base' meta-package) + posix`
		`depends=(cryptsetup dialog dhcpcd inetutils jfsutils linux-libre logrotate lvm2`
		`- mdadm netctl posix reiserfsprogs sysfsutils usbutils vi xfsprogs) # TODO: your-system-sanity`
		`+ mdadm netctl posix reiserfsprogs sysfsutils usbutils vi xfsprogs)`

		`- # supplemental package-set for the systemd CLI LiveISOs`
		`- depends+=(bash-completion elinks haveged hdparm mc nano networkmanager ntp`
		`- openssh openvpn p7zip rsync screen sudo unarchiver unzip w3m zip)`
		`+ # supplemental package-set (eg: the systemd CLI LiveISOs)`
		`+ depends+=(bash-completion links haveged hdparm icu-compat mc nano networkmanager`
		`+ ntp openssh openvpn p7zip rsync screen sudo unarchiver unzip w3m zip)`

libre/parabola-hackers/PKGBUILD

file modified

+3 -2

		`@@ -1,17 +1,18 @@`
		`+ # SPDX-License-Identifier: CC0-1.0`
		`# Maintainer: Luke Shumaker <lukeshu@sbcglobal.net>`
		`# Contributor: bill-auger <bill-auger@programmer.net>`


		`pkgbase=parabola-hackers`
		`pkgname=(parabola-hackers parabola-hackers-nshd)`
		`- pkgver=20210719`
		`+ pkgver=20220802`
		`pkgrel=1`
		`pkgdesc='Programs for doing magic with hackers.git'`
		`url='https://git.parabola.nu/packages/parabola-hackers.git/'`
		`license=('GPL')`
		`arch=('armv7h' 'i686' 'x86_64')`

		`- makedepends=('go' 'git')`
		`+ makedepends=('git' 'go')`
		`source=("parabola-hackers::git://git.parabola.nu/packages/parabola-hackers.git#tag=v${pkgver}")`
		`_go_sources=("git.lukeshu.com/go/libgnulinux#branch=master"`
		`"git.lukeshu.com/go/libnslcd#branch=master"`

libre/parabola-keyring/PKGBUILD

file modified

+41 -25

		`@@ -1,5 +1,5 @@`
		`# SPDX-License-Identifier: CC0-1.0`
		`- # Maintainer: Parabola automatic package builder <autobuilder@parabola.nu>`
		`+ # Maintainer: Parabola Hackers <dev@lists.parabola.nu>`


		`# NOTE: This PKGBUILD does not need to be edited manually.`
		`@@ -8,49 +8,65 @@`
		`# eg: $ git commit --allow-empty --message=rebuild`
		`# $ git push parabola master`
		`# The autobuilder will modify this PKGBUILD,`
		`- # replacing $pkgver, $_gitver, and the checksum (updpkgsums),`
		`+ # replacing $pkgver and $_gitver,`
		`# build and publish the package,`
		`# and commit the modified PKGBUILD to abslibre.`


		`pkgname=parabola-keyring`
		`- pkgver=20220322`
		`- _gitver=af4575f5afbdca6b556d182dab149e181edbd4b4`
		`+ pkgver=20221105`
		`+ _gitver=374d9b5b110ddfe715419b10caa4de2972aed162`
		`pkgrel=1`
		`- pkgdesc='Parabola GNU/Linux-libre PGP keyring'`
		`- arch=('any')`
		`- url='https://git.parabola.nu/hackers.git/'`
		`- license=('GPL')`
		`- makedepends=(parabola-hackers git)`
		`+ pkgdesc="Parabola GNU/Linux-libre PGP keyring"`
		`+ arch=(any)`
		`+ url=https://wiki.parabola.nu/Parabola_Keyring`
		`+ license=(GPL)`
		`+`
		`+ makedepends=(git parabola-hackers)`
		`+ makedepends=( ${makedepends[*]/parabola-hackers/parabola-hackers>=20220802-1} ) # in libre-testing`
		`install=$pkgname.install`
		`- source=("hackers-${_gitver}::git://git.parabola.nu/hackers.git#commit=${_gitver}")`
		`+ source=(hackers-${_gitver}::git://git.parabola.nu/hackers.git#commit=${_gitver})`
		`+`
		`sha512sums=('SKIP')`


		`- prepare() {`
		`- cd "$srcdir"`
		`- mv {,.}hackers-$_gitver`
		`- mkdir .cachedir`
		`- export PARABOLA_HACKERS_YAMLDIR="$PWD/.hackers-$_gitver/users"`
		`+ prepare()`
		`+ {`
		`+ # network check`
		`+ # NOTE: this is the only parabola PKGBUILD, which requires internet access in the build chroot`
		`+ # the pacman-make-keyring procedure was originally in a mksource() function,`
		`+ # presumably for that reason; but that o/c removed the requirement only from users`
		`+ # TODO: it would be great to re-implement this, so that it does not`
		`+ # there is a WIP on the parabola-hackers.git 'wip-import-keys-from-hackers-git' branch`
		`+ local net_check_url=https://repo.parabola.nu/check_network_status.txt`
		`+ local net_err_msg="ERROR: this PKGBUILD requires internet access in the build chroot"`
		`+ curl ${net_check_url} &> /dev/null \|\| ! echo "${net_err_msg}" \|\| return 1`
		`+ }`

		`- local net_err_msg="ERROR: this PKGBUILD requires the build host to be connected to the internet"`
		`- curl www.parabola.nu &> /dev/null \|\| ! echo "${net_err_msg}" \|\| return 1`
		`+ build()`
		`+ {`
		`+ mv {,.}hackers-${_gitver}`
		`+ mkdir .cachedir`
		`+ export PARABOLA_HACKERS_YAMLDIR="${PWD}"/.hackers-${_gitver}/users`

		`# NOTE: the current 'parabola-hackers' package does not yet recognize`
		`# the 'keyserver' env-var - the keyserver is still hard-coded;`
		`# and it is now invalid - 'parabola-hackers' must be rebuilt for this;`
		`# but that build currently has a problem - the autobuilder handles`
		`# this now, via an un-published kludge in the autobuild.sh script`
		`- # TODO: remove this note, after 'parabola-hackers' has been rebuilt`
		`+ # TODO: remove this note and the version constraint,`
		`+ # after 'parabola-hackers' has been rebuilt`
		`+ # NOTE: the rebuilt 'parabola-hackers' is now in [libre-testing]`
		`/usr/lib/parabola-hackers/pacman-make-keyring \`
		`- V="$pkgver" \`
		`- keyserver='hkp://pgp.cyberbits.eu:11371' \`
		`- cachedir="$PWD/.cachedir"`
		`+ V=${pkgver} \`
		`+ keyserver=hkp://pgp.cyberbits.eu:11371 \`
		`+ cachedir="${PWD}/.cachedir"`
		`}`

		`- package() {`
		`- cd "$srcdir"`
		`- bsdtar xf "$pkgname-$pkgver.tar.gz"`
		`- cd "$srcdir/$pkgname-$pkgver"`
		`+ package()`
		`+ {`
		`+ bsdtar xf ${pkgname}-${pkgver}.tar.gz`
		`+ cd ${pkgname}-${pkgver}`
		`+`
		`make PREFIX=/usr DESTDIR="${pkgdir}" install`
		`}`

libre/parabola-themes-slim/PKGBUILD

file modified

+2 -2

		`@@ -1,5 +1,5 @@`
		`- # Maintainer (Arch): Eric Bélanger <eric@archlinux.org>`
		`- # Contributor (Arch): Thayer Williams <thayer@archlinux.org>`
		`+ # Maintainer (arch): Eric Bélanger <eric@archlinux.org>`
		`+ # Contributor: Thayer Williams <thayer@archlinux.org>`
		`# Maintainer: Omar Vega Ramos <ovruni@gnu.org.pe>`

		`pkgname=parabola-themes-slim`

libre/parabola-vmbootstrap/PKGBUILD

file modified

+1 -1

		`@@ -2,7 +2,7 @@`
		`# Copyright (C) 2019,2020,2021 bill-auger <bill-auger@programmer.net>`
		`# This program is free software: you can redistribute it and/or modify`
		`# it under the terms of the CC0 1.0 License.`
		`- # Maintainers: Parabola hackers <dev@lists.parabola.nu>`
		`+ # Maintainer: Parabola Hackers <dev@lists.parabola.nu>`

		`pkgname=parabola-vmbootstrap`
		`pkgver=20200401`

libre/parabola-xdg-menu/PKGBUILD

file modified

+3 -3

		`@@ -1,7 +1,7 @@`
		`# $Id: PKGBUILD 126121 2015-01-18 19:32:58Z eric $`
		`- # Maintainer (Arch): Sergej Pupykin <sergej@aur.archlinux.org>`
		`- # Contributor (Arch): Sergej Pupykin <sergej@aur.archlinux.org>`
		`- # Maintainer (Hyperbola): André Silva <emulatorman@hyperbola.info>`
		`+ # Maintainer (arch): Sergej Pupykin <sergej@aur.archlinux.org>`
		`+ # Contributor: Sergej Pupykin <sergej@aur.archlinux.org>`
		`+ # Contributor: André Silva <emulatorman@hyperbola.info>`
		`# Maintainer: Omar Vega Ramos <ovruni@gnu.org.pe>`

		`pkgname=parabola-xdg-menu`

libre/parabolaiso/PKGBUILD

file modified

+7 -7

		`@@ -1,17 +1,17 @@`
		`- # Maintainer (Arch): David Runge <dvzrv@archlinux.org>`
		`- # Contributor (Arch): Pierre Schmitz <pierre@archlinux.de>`
		`- # Contributor (Arch): Gerardo Exequiel Pozzi <djgera@archlinux.org>`
		`+ # Maintainer (arch): David Runge <dvzrv@archlinux.org>`
		`+ # Contributor: Pierre Schmitz <pierre@archlinux.de>`
		`+ # Contributor: Gerardo Exequiel Pozzi <djgera@archlinux.org>`
		`# Maintainer: David P. <megver83@parabola.nu>`

		`pkgname=parabolaiso`
		`- pkgver=64`
		`+ pkgver=65`
		`pkgrel=1`
		`pkgdesc="Tools for creating Parabola GNU/Linux-libre live and install iso images"`
		`arch=(any)`
		`license=(GPL3)`
		`url="https://git.parabola.nu/parabolaiso.git/"`
		`- depends=(arch-install-scripts bash dosfstools e2fsprogs erofs-utils`
		`- libarchive libisoburn mtools squashfs-tools grub)`
		`+ depends=(arch-install-scripts bash dosfstools e2fsprogs erofs-utils grub`
		`+ libarchive libisoburn mtools squashfs-tools)`
		`makedepends=(git)`
		`checkdepends=(shellcheck)`
		`optdepends=(`
		`@@ -20,7 +20,7 @@`
		`'qemu-desktop: for run_parabolaiso'`
		`'qemu-user-static: for armv7h support when building in bootstrap mode from x86'`
		`)`
		`- source=("git+https://git.parabola.nu/packages/parabolaiso.git#tag=v${pkgver}?signed")`
		`+ source=(git+https://git.parabola.nu/packages/parabolaiso.git#tag=v${pkgver}?signed)`
		`sha256sums=('SKIP')`
		`validpgpkeys=(6DB9C4B4F0D8C0DC432CF6E4227CA7C556B2BA78) # David P. <megver83@parabola.nu>`

libre/paraboley-git/PKGBUILD

file modified

+3 -3

		`@@ -3,10 +3,10 @@`
		`# Maintainer (AUR) : youngunix <zagazaw2004 'at' gmail 'dot' com>`
		`# Maintainer (AUR) : Jeremy L <jl AT adminempire DOT com>`
		`# Maintainer (Arch) : Alexander F Rødseth <xyproto@archlinux.org>`
		`- # Contributor (Arch) : Laurie Clark-Michalek <bluepeppers@archlinux.us>`
		`- # Contributor (Arch) : graysky <graysky AT archlinux DOR us>`
		`+ # Contributor: Laurie Clark-Michalek <bluepeppers@archlinux.us>`
		`+ # Contributor: graysky <graysky AT archlinux DOR us>`
		`# Maintainer: Omar Vega Ramos <ovruni@gnu.org.pe>`
		`- # Contributor: Aurélien DESBRIÈRES <aurelien@hackers.camp>`
		`+ # Contributor: Aurélien Desbrières <aurelien@hackers.camp>`
		`# Contributor: Isaac David <isacdaavid@at@isacdaavid@dot@info>`

		`_pkgname=paraboley`

libre/performous-freesongs/PKGBUILD

file modified

+2 -2

		`@@ -1,5 +1,5 @@`
		`- # Maintainer (Arch): Laurent Carlier <lordheavym@gmail.com>`
		`- # Maintainer (Hyperbola): André Silva <emulatorman@hyperbola.info>`
		`+ # Maintainer (arch): Laurent Carlier <lordheavym@gmail.com>`
		`+ # Contributor: André Silva <emulatorman@hyperbola.info>`
		`# Maintainer: Omar Vega Ramos <ovruni@gnu.org.pe>`

		`pkgname=performous-freesongs`

libre/perl-algorithm-diff/PKGBUILD

file modified

+2 -2

		`@@ -1,5 +1,5 @@`
		`- # Maintainer (Arch): Sergej Pupykin <pupykin.s+arch@gmail.com>`
		`- # Maintainer (Arch): Charles Mauch <cmauch@gmail.com>`
		`+ # Maintainer (arch): Sergej Pupykin <pupykin.s+arch@gmail.com>`
		`+ # Maintainer (arch): Charles Mauch <cmauch@gmail.com>`
		`# Maintainer: Isaac David <isacdaavid@at@isacdaavid@dot@info>`

		`pkgname=perl-algorithm-diff`

libre/pixman-static/PKGBUILD

file modified

+3 -3

		`@@ -1,6 +1,6 @@`
		`- # Maintainer (Arch:pixman): Jan de Groot <jgc@archlinux.org>`
		`- # Maintainer (Arch:pixman): Andreas Radke <andyrtr@archlinux.org>`
		`- # Contributor (Arch:pixman): Alexander Baldeck <alexander@archlinux.org>`
		`+ # Maintainer (arch:pixman): Jan de Groot <jgc@archlinux.org>`
		`+ # Maintainer (arch:pixman): Andreas Radke <andyrtr@archlinux.org>`
		`+ # Contributor: Alexander Baldeck <alexander@archlinux.org>`
		`# Maintainer: Luke Shumaker <lukeshu@parabola.nu>`
		`# Contributor: Márcio Silva <coadde@hyperbola.info>`

libre/plasma-meta/PKGBUILD

file modified

+1 -1

		`@@ -1,5 +1,5 @@`
		`# Maintainer (arch): Antonio Rojas <arojas@archlinux.org>`
		`- # Contributor (arch): Andrea Scarpino <andrea@archlinux.org>`
		`+ # Contributor: Andrea Scarpino <andrea@archlinux.org>`
		`# Contributor: bill-auger <bill-auger@programmer.net>`

libre/ponysay/PKGBUILD

file modified

+4 -4

		`@@ -1,7 +1,7 @@`
		`- # Maintainer (Arch): Sven-Hendrik Haase <sh@lutzhaase.com>`
		`- # Contributor (Arch): Erkin Batu Altunbaş <erkinbatu@gmail.com>`
		`- # Maintainer (Hyperbola): André Silva <emulatorman@hyperbola.info>`
		`- # Contributor (Hyperbola): Márcio Silva <coadde@hyperbola.info>`
		`+ # Maintainer (arch): Sven-Hendrik Haase <sh@lutzhaase.com>`
		`+ # Contributor: Erkin Batu Altunbaş <erkinbatu@gmail.com>`
		`+ # Contributor: André Silva <emulatorman@hyperbola.info>`
		`+ # Contributor: Márcio Silva <coadde@hyperbola.info>`
		`# Maintainer: Omar Vega Ramos <ovruni@gnu.org.pe>`

		`_pkgname=ponysay-libre`

libre/povray/PKGBUILD

file modified

+6 -6

		`@@ -1,10 +1,10 @@`
		`- # Maintainer (Arch): Alexander F. Rødseth <xyproto@archlinux.org>`
		`- # Contributor (Arch): Tom Newsom <Jeepster@gmx.co.uk>`
		`- # Contributor (Arch): tobias <tobias@archlinux.org>`
		`- # Contributor (Arch): red_over_blue`
		`- # Contributor (Arch): neri`
		`+ # Maintainer (arch): Alexander F. Rødseth <xyproto@archlinux.org>`
		`+ # Contributor: Tom Newsom <Jeepster@gmx.co.uk>`
		`+ # Contributor: tobias <tobias@archlinux.org>`
		`+ # Contributor: red_over_blue`
		`+ # Contributor: neri`
		`# Maintainer: Omar Vega Ramos <ovruni@gnu.org.pe>`
		`- # Contributor (Hyperbola): Márcio Silva <coadde@hyperbola.info>`
		`+ # Contributor: Márcio Silva <coadde@hyperbola.info>`
		`# Don't build povray before 3.7 version (that ones are nonfree software)`

		`_pkgname=povray-libre`

libre/powerpc64le-linux-gnu-gcc-initial/PKGBUILD

file modified

+1 -1

		`@@ -1,4 +1,4 @@`
		`- # Maintainers: Parabola hackers <dev@lists.parabola.nu>`
		`+ # Maintainer: Parabola Hackers <dev@lists.parabola.nu>`

		`_target=powerpc64le-linux-gnu`
		`pkgname=$_target-gcc-initial`

libre/psensor/PKGBUILD

file modified

+4 -4

		`@@ -1,7 +1,7 @@`
		`- # Maintainer (Arch): Robin Broda <robin@broda.me>`
		`- # Contributor (Arch): X0rg`
		`- # Contributor (Arch): marlock <marlock87@hotmail.com>`
		`- # Contributor (Arch): Diogo Leal <estranho@diogoleal.com>`
		`+ # Maintainer (arch): Robin Broda <robin@broda.me>`
		`+ # Contributor: X0rg`
		`+ # Contributor: marlock <marlock87@hotmail.com>`
		`+ # Contributor: Diogo Leal <estranho@diogoleal.com>`
		`# Maintainer: Freemor <freemor@freemor.ca>`

		`pkgname=psensor`

libre/pureos-archive-keyring/PKGBUILD

file modified

+1 -1

		`@@ -1,7 +1,7 @@`
		`# $Id$`
		`# This PKGBUILD is based on Arch's ubuntu-keyring version 2018.02.28-1.0`
		`# Contributor: Denis 'GNUtoo' Carikli <GNUtoo@cyberdimension.org>`
		`- # Maintainers: Parabola hackers <dev@lists.parabola.nu>`
		`+ # Maintainer: Parabola Hackers <dev@lists.parabola.nu>`

		`pkgname=pureos-archive-keyring`
		`pkgver=2016.09`

libre/pyqt5/PKGBUILD

file added

+107

		`@@ -0,0 +1,107 @@`
		`+ # Maintainer (arch): Antonio Rojas <arojas@archlinux.org>`
		`+ # Maintainer (arch): Felix Yan <felixonmars@archlinux.org>`
		`+ # Contributor: Andrea Scarpino <andrea@archlinux.org>`
		`+ # Contributor: Yichao Yu <yyc1992@gmail.com>`
		`+ # Contributor: Douglas Soares de Andrade <douglas@archlinux.org>`
		`+ # Contributor: riai <riai@bigfoot.com> Ben <ben@benmazer.net>`
		`+`
		`+`
		`+ # parabola changes and rationale:`
		`+ # - restore support for qt5-webkit dependents`
		`+ # - pin to strongly-coupled dependency versions`
		`+`
		`+`
		`+ pkgbase=pyqt5`
		`+ pkgname=('python-pyqt5')`
		`+ pkgdesc="A set of Python bindings for the Qt5 toolkit"`
		`+ pkgver=5.15.7`
		`+ pkgrel=3`
		`+ pkgrel+=.parabola1`
		`+ arch=('x86_64')`
		`+ arch+=('armv7h' 'i686')`
		`+ url="https://riverbankcomputing.com/software/pyqt/intro"`
		`+ license=('GPL')`
		`+ groups=(pyqt5)`
		`+ depends=('python-pyqt5-sip' 'qt5-base')`
		`+ optdepends=('python-opengl: enable OpenGL 3D graphics in PyQt applications'`
		`+ 'python-dbus: for python-dbus mainloop support'`
		`+ 'qt5-multimedia: QtMultimedia, QtMultimediaWidgets'`
		`+ 'qt5-tools: QtHelp, QtDesigner'`
		`+ 'qt5-svg: QtSvg'`
		`+ 'qt5-xmlpatterns: QtXmlPatterns'`
		`+ 'qt5-declarative: QtQml, qmlplugin'`
		`+ 'qt5-serialport: QtSerialPort'`
		`+ 'qt5-websockets: QtWebSockets'`
		`+ 'qt5-connectivity: QtNfc, QtBluetooth'`
		`+ 'qt5-x11extras: QtX11Extras'`
		`+ 'qt5-remoteobjects: QtRemoteObjects'`
		`+ 'qt5-speech: QtTextToSpeech'`
		`+ 'qt5-quick3d: QtQuick3D'`
		`+ 'qt5-location: QtLocation, QtPositioning'`
		`+ 'qt5-sensors: QtSensors'`
		`+ 'qt5-webchannel: QtWebChannel')`
		`+ optdepends+=('qt5-webkit: QtWebKit, QtWebKitWidgets')`
		`+ provides=(qt5-python-bindings)`
		`+ makedepends=('sip' 'pyqt-builder' 'python-opengl' 'python-dbus'`
		`+ 'qt5-connectivity' 'qt5-multimedia' 'qt5-tools' 'qt5-serialport' 'qt5-speech' 'qt5-svg'`
		`+ 'qt5-websockets' 'qt5-x11extras' 'qt5-xmlpatterns' 'qt5-remoteobjects' 'qt5-quick3d'`
		`+ 'qt5-sensors' 'qt5-webchannel' 'qt5-location')`
		`+ makedepends+=('qt5-webkit')`
		`+ conflicts=('pyqt5-common')`
		`+ source=("https://pypi.python.org/packages/source/P/PyQt5/PyQt5-$pkgver.tar.gz")`
		`+ sha256sums=('755121a52b3a08cb07275c10ebb96576d36e320e572591db16cfdbc558101594')`
		`+ options=(debug)`
		`+`
		`+`
		`+ _version_constraint() # (dep_pkgname [precision])`
		`+ {`
		`+ local dep_pkgname=$1`
		`+ local full_version=$(pacman -S --print-format='%v' ${dep_pkgname} \| tail -n 1)`
		`+ local n_dots=$(tmp=${full_version%-*} ; tmp=${tmp//[^\.]} ; echo "${#tmp}" ;)`
		`+ local def_precision=$(( n_dots + 1 ))`
		`+ local precision=$( [[ "$2" =~ ^[1-${def_precision}]$ ]] && echo $2 \|\| echo ${def_precision} )`
		`+ local pkgver_rx='[^-\.\ ]+'`
		`+ local subver_rx='\.'${pkgver_rx}`
		`+ local pkgrel_rx='[^-\ ]+'`
		`+ local capture_rx=${pkgver_rx}`
		`+ for (( n_dots=1 ; n_dots < precision ; n_dots++ )) ; do capture_rx+=${subver_rx} ; done ;`
		`+`
		`+ if [[ "${full_version}" =~ ^(${capture_rx})(${subver_rx})*-${pkgrel_rx}$ ]]`
		`+ then local version=${BASH_REMATCH[1]}`
		`+ local subver_inc=$(( ${version##*.} + 1 ))`
		`+ local version_inc=$( [[ "${version}" =~ \. ]] && echo ${version%.*}.${subver_inc} \|\| \`
		`+ echo ${subver_inc} )`
		`+ local constraint_string="${dep_pkgname}>=${version} ${dep_pkgname}<${version_inc}"`
		`+`
		`+ echo "applied version constraint: ${constraint_string}" >&2`
		`+ echo -n "${constraint_string}"`
		`+ else echo "ERROR: _version_constraint() error parsing: dep_pkgname='${dep_pkgname}' full_version='${full_version}'" >&2`
		`+ exit 1`
		`+ fi`
		`+ }`
		`+`
		`+ build() {`
		`+ cd PyQt5-$pkgver`
		`+ sip-build \`
		`+ --confirm-license \`
		`+ --no-make \`
		`+ --api-dir /usr/share/qt/qsci/api/python \`
		`+ --pep484-pyi`
		`+ cd build`
		`+ make`
		`+ }`
		`+`
		`+ package_python-pyqt5(){`
		`+ depends+=( $(_version_constraint python 2) \`
		`+ $(_version_constraint qt5-base ) )`
		`+`
		`+ cd PyQt5-$pkgver/build`
		`+ make INSTALL_ROOT="$pkgdir" install -j1`
		`+`
		`+ # Remove unused py2 version of uic modules:`
		`+ rm -r "$pkgdir"/usr/lib/python*/site-packages/PyQt5/uic/port_v2`
		`+`
		`+ # compile Python bytecode`
		`+ python -m compileall -d / "$pkgdir"/usr/lib`
		`+ python -O -m compileall -d / "$pkgdir"/usr/lib`
		`+ }`

libre/pyrit/PKGBUILD

file modified

+2 -2

		`@@ -1,5 +1,5 @@`
		`- # Maintainer (Arch): Levente Polyak <anthraxx[at]archlinux[dot]org>`
		`- # Contributor (Arch): Fabian Melters <melters [at] gmail [dot] com>`
		`+ # Maintainer (arch): Levente Polyak <anthraxx[at]archlinux[dot]org>`
		`+ # Contributor: Fabian Melters <melters [at] gmail [dot] com>`
		`# Maintainer: André Silva <emulatorman@hyperbola.info>`

		`pkgname=pyrit`

libre/pysolfc-cardsets/PKGBUILD

file modified

+3 -3

		`@@ -1,6 +1,6 @@`
		`- # Maintainer (Arch): Jaroslav Lichtblau <svetlemodry@archlinux.org>`
		`- # Contributor (Arch): Eric Bélanger <eric@archlinux.org>`
		`- # Maintainer (Hyperbola): André Silva <emulatorman@hyperbola.info>`
		`+ # Maintainer (arch): Jaroslav Lichtblau <svetlemodry@archlinux.org>`
		`+ # Contributor: Eric Bélanger <eric@archlinux.org>`
		`+ # Contributor: André Silva <emulatorman@hyperbola.info>`
		`# Maintainer: Omar Vega Ramos <ovruni@gnu.org.pe>`

		`pkgname=pysolfc-cardsets`

libre/python-markdown2/PKGBUILD

file modified

+5 -5

		`@@ -1,10 +1,10 @@`
		`# $Id$`
		`# Maintainer: Luke Shumaker <lukeshu@lukeshu.com>`
		`- # Maintainer (Arch:python-markdown): Kyle Keen <keenerd@gmail.com>`
		`- # Contributor (Arch:python-markdown): Angel Velasquez <angvp@archlinux.org>`
		`- # Contributor (Arch:python-markdown): Andrew Antle <andrew dot antle at gmail dot com>`
		`- # Contributor (Arch:python-markdown): Thomas Dziedzic < gostrc at gmail >`
		`- # Contributor (Arch:python-markdown): Chaiwat Suttipongsakul <cwt at bashell dot com>`
		`+ # Maintainer (arch:python-markdown): Kyle Keen <keenerd@gmail.com>`
		`+ # Contributor: Angel Velasquez <angvp@archlinux.org>`
		`+ # Contributor: Andrew Antle <andrew dot antle at gmail dot com>`
		`+ # Contributor: Thomas Dziedzic < gostrc at gmail >`
		`+ # Contributor: Chaiwat Suttipongsakul <cwt at bashell dot com>`

		`# Rational for inclusion in [libre]:`
		`# - Used by libre/parabolaweb-utils`

libre/python-markupsafe0/PKGBUILD

file modified

+3 -3

		`@@ -1,8 +1,8 @@`
		`# $Id$`
		`# Maintainer: Luke Shumaker <lukeshu@lukeshu.com>`
		`- # Maintainer (Arch:python-markupsafe): Felix Yan <felixonmars@archlinux.org>`
		`- # Contributor (Arch:python-markupsafe): Ionut Biru <ibiru@archlinux.org>`
		`- # Contributor (Arch:python-markupsafe): Alex Anthony <alex.anthony28991@gmail.com>`
		`+ # Maintainer (arch:python-markupsafe): Felix Yan <felixonmars@archlinux.org>`
		`+ # Contributor: Ionut Biru <ibiru@archlinux.org>`
		`+ # Contributor: Alex Anthony <alex.anthony28991@gmail.com>`

		`# Rational for inclusion in [libre]:`
		`# - Used by libre/parabolaweb-utils`

libre/python-psycopg2.6/PKGBUILD

file modified

+3 -3

		`@@ -1,8 +1,8 @@`
		`# $Id$`
		`# Maintainer: Luke Shumaker <lukeshu@lukeshu.com>`
		`- # Maintainer (Arch:python-psycopg2): Sergej Pupykin <pupykin.s+arch@gmail.com>`
		`- # Maintainer (Arch:python-psycopg2): Angel 'angvp' Velasquez <angvp[at]archlinux.com.ve>`
		`- # Maintainer (Arch:python-psycopg2): Douglas Soares de Andrade <dsa@aur.archlinux.org>`
		`+ # Maintainer (arch:python-psycopg2): Sergej Pupykin <pupykin.s+arch@gmail.com>`
		`+ # Maintainer (arch:python-psycopg2): Angel 'angvp' Velasquez <angvp[at]archlinux.com.ve>`
		`+ # Maintainer (arch:python-psycopg2): Douglas Soares de Andrade <dsa@aur.archlinux.org>`

		`# Rational for inclusion in [libre]:`
		`# - Used by libre/parabolaweb-utils`

libre/python-reportlab/PKGBUILD

file modified

+3 -3

		`@@ -1,6 +1,6 @@`
		`- # Maintainer (Arch): Morten Linderud <foxboron@archlinux.org>`
		`- # Contributor (Arch): Angel 'angvp' Velasquez <angvp[at]archlinux.com.ve>`
		`- # Contributor (Arch): William Rea <sillywilly@gmail.com>`
		`+ # Maintainer (arch): Morten Linderud <foxboron@archlinux.org>`
		`+ # Contributor: Angel 'angvp' Velasquez <angvp[at]archlinux.com.ve>`
		`+ # Contributor: William Rea <sillywilly@gmail.com>`
		`# Maintainer: Omar Vega Ramos <ovruni@gnu.org.pe>`
		`# Contributor: fauno <fauno@kiwwwi.com.ar>`
		`# Contributor: borgo <nomail>`

libre/python2-memcached1.54/PKGBUILD

file modified

+4 -4

		`@@ -1,8 +1,8 @@`
		`# Maintainer: Luke Shumaker <lukeshu@lukeshu.com>`
		`- # Maintainer (Arch:python2-memcached): Alexander Rødseth <rodseth@gmail.com>`
		`- # Contributor (Arch:python2-memcached): Angel Velasquez <angvp@archlinux.org>`
		`- # Contributor (Arch:python2-memcached): Geoffroy Carrier <geoffroy.carrier@aur.archlinux.org>`
		`- # Contributor (Arch:python2-memcached): Nathan Jones <nathanj@insightbb.com>`
		`+ # Maintainer (arch:python2-memcached): Alexander Rødseth <rodseth@gmail.com>`
		`+ # Contributor: Angel Velasquez <angvp@archlinux.org>`
		`+ # Contributor: Geoffroy Carrier <geoffroy.carrier@aur.archlinux.org>`
		`+ # Contributor: Nathan Jones <nathanj@insightbb.com>`

		`# Rational for inclusion in [libre]:`
		`# - Used by libre/parabolaweb-utils`

libre/qt5-styleplugins/PKGBUILD

file modified

+20 -11

		`@@ -3,16 +3,20 @@`


		`# parabola changes and rationale:`
		`- # - no libre changes`
		`- # - in libre because it is a dependency of 'parabola-laf'`
		`+ # - pin to strongly-coupled dependency versions`
		`+ # - do not install pacman hook (the version constraints handle that better)`
		`+ # - no libre changes`
		`+ # - in libre because it is a dependency of 'parabola-laf'`


		`pkgname=qt5-styleplugins`
		`pkgver=5.0.0.20170311`
		`- _commit=335dbece103e2cbf6c7cf819ab6672c2956b17b3 # unreleased master branch tip`
		`+ # $_commit is the unreleased VCS tip from 2017`
		`+ _commit=335dbece103e2cbf6c7cf819ab6672c2956b17b3`
		`pkgdesc='Additional style plugins for Qt5'`
		`- pkgrel=36`
		`- arch=(armv7h i686 x86_64)`
		`+ pkgrel=38`
		`+ arch=('x86_64' 'aarch64')`
		`+ arch+=('armv7h' 'i686')`
		`url="https://github.com/qt/qtstyleplugins"`
		`license=('LGPL')`
		`depends=('qt5-base' 'gtk2')`
		`@@ -20,12 +24,12 @@`
		`"${pkgname}-${_commit}.tar.gz::${url}/archive/${_commit}.tar.gz"`
		`"0001-fix-build-against-Qt-5.15.patch"`
		`"0002-fix-gtk2-background.patch"`
		`+ "${pkgname}.hook"`
		`)`
		`- sha512sums=(`
		`- 'e8c2d0e9c6b0a47cab04ffd2e9384606638905b63a7c1580f9b629bbcc84ebff19743363ffee3dbd31c3de1dcda684211ad3052932b5aa0081e529afd9cbb14d'`
		`- 'f5cedadceb7c4243ba69b5041c6c524223ce742ec9c2c483e706f31e32e9e03e4efb6ed54fa2aada867a7c0145a8f3ec1193377d177c6c77066b5f3ec191e9ce'`
		`- 'c39b468c93eaada7d49df9547627fbf91d50292523566ef93287ce0e958b29e6c3635f6e77ad42c4f449a062cc63b68e9f2a24c89524165649f776d205fb5382'`
		`- )`
		`+ sha512sums=('e8c2d0e9c6b0a47cab04ffd2e9384606638905b63a7c1580f9b629bbcc84ebff19743363ffee3dbd31c3de1dcda684211ad3052932b5aa0081e529afd9cbb14d'`
		`+ 'f5cedadceb7c4243ba69b5041c6c524223ce742ec9c2c483e706f31e32e9e03e4efb6ed54fa2aada867a7c0145a8f3ec1193377d177c6c77066b5f3ec191e9ce'`
		`+ 'c39b468c93eaada7d49df9547627fbf91d50292523566ef93287ce0e958b29e6c3635f6e77ad42c4f449a062cc63b68e9f2a24c89524165649f776d205fb5382'`
		`+ '5f976142d27eabacd1e1050bb39801d2e4cd68ec7459662e0352541d42d6a75740d3238b5120fb47641a125d6e3200f3a39c304497ac603457e3a97e641dabc2')`


		`_version_constraint() # (dep_pkgname [precision])`
		`@@ -76,8 +80,13 @@`
		`qmake PREFIX='/usr' \`
		`CONFIG+='nostrip' \`
		`QMAKE_CFLAGS_RELEASE="$CFLAGS" \`
		`- QMAKE_CXXFLAGS_RELEASE="$CXXFLAGS"`
		`+ QMAKE_CXXFLAGS_RELEASE="$CXXFLAGS" \`
		`+ qtstyleplugins.pro # required for armv7h`
		`make`
		`+`
		`+ # NOTE: armv7h FTBS`
		`+ # Project ERROR: No module claims plugin type 'platformthemes'`
		`+ # Project ERROR: No module claims plugin type 'styles'`
		`}`

		`package() {`

libre/qt5-styleplugins/qt5-styleplugins.hook

file added

		`@@ -0,0 +1,9 @@`
		`+ [Trigger]`
		`+ Type = Package`
		`+ Operation = Upgrade`
		`+ Target = qt5-base`
		`+`
		`+ [Action]`
		`+ Description = Qt5 Upgrade Warning`
		`+ When = PostTransaction`
		`+ Exec = /usr/bin/echo "[WARNING] qt5-base was updated, qt5 applications will break until qt5-styleplugins is rebuilt."`

libre/qt5-webkit/PKGBUILD

file added

+88

		`@@ -0,0 +1,88 @@`
		`+ # Maintainer (aur): Felix Yan <felixonmars@archlinux.org>`
		`+ # Maintainer (aur): Antonio Rojas <arojas@archlinux.org>`
		`+ # Contributor: Andrea Scarpino <andrea@archlinux.org>`
		`+`
		`+`
		`+ # parabola changes and rationale:`
		`+ # - blacklist rescue for webengine clients which support alternate backends (redmine #1167)`
		`+ # - pin to strongly-coupled dependency versions`
		`+`
		`+`
		`+ pkgname=qt5-webkit`
		`+ _pkgver=5.212.0-alpha4`
		`+ pkgver=${_pkgver/-/}`
		`+ pkgrel=18`
		`+ pkgrel+=.parabola1`
		`+ arch=(x86_64)`
		`+ arch+=(armv7h i686)`
		`+ url='https://github.com/qtwebkit/qtwebkit'`
		`+ license=(GPL3 LGPL3 FDL custom)`
		`+ pkgdesc='Classes for a WebKit2 based implementation and a new QML API'`
		`+ source=("https://github.com/qtwebkit/qtwebkit/releases/download/qtwebkit-$_pkgver/qtwebkit-$_pkgver.tar.xz"`
		`+ icu68.patch`
		`+ glib-2.68.patch`
		`+ qt5-webkit-python-3.9.patch # https://github.com/qtwebkit/qtwebkit/commit/78360c01.patch`
		`+ qt5-webkit-bison-3.7.patch) # https://github.com/qtwebkit/qtwebkit/commit/d92b11fe.patch`
		`+ depends=(qt5-location qt5-sensors qt5-webchannel libwebp libxslt libxcomposite gst-plugins-base hyphen woff2)`
		`+ makedepends=(cmake ruby gperf python qt5-doc qt5-tools)`
		`+ optdepends=('gst-plugins-good: Webm codec support')`
		`+ sha256sums=('9ca126da9273664dd23a3ccd0c9bebceb7bb534bddd743db31caf6a5a6d4a9e6'`
		`+ '0b40ed924f03ff6081af610bb0ee01560b7bd1fb68f8af02053304a01d4ccdf0'`
		`+ '4969dd03e482155e2490b50307dada81dda7bbc9e5398e3a53c20bc474f7c04e'`
		`+ '6e0cee08e4fa57b04752e80817f33562f48aa42608a3a620930b6040259b4932'`
		`+ '34f37b53ee0bc31c63ce85ebd1ae95543a8ba28483e387b20efd50574bd813be')`
		`+ options=(!lto)`
		`+`
		`+`
		`+ _version_constraint() # (dep_pkgname [precision])`
		`+ {`
		`+ local dep_pkgname=$1`
		`+ local full_version=$(pacman -S --print-format='%v' ${dep_pkgname} \| tail -n 1)`
		`+ local n_dots=$(tmp=${full_version%-*} ; tmp=${tmp//[^\.]} ; echo "${#tmp}" ;)`
		`+ local def_precision=$(( n_dots + 1 ))`
		`+ local precision=$( [[ "$2" =~ ^[1-${def_precision}]$ ]] && echo $2 \|\| echo ${def_precision} )`
		`+ local pkgver_rx='[^-\.\ ]+'`
		`+ local subver_rx='\.'${pkgver_rx}`
		`+ local pkgrel_rx='[^-\ ]+'`
		`+ local capture_rx=${pkgver_rx}`
		`+ for (( n_dots=1 ; n_dots < precision ; n_dots++ )) ; do capture_rx+=${subver_rx} ; done ;`
		`+`
		`+ if [[ "${full_version}" =~ ^(${capture_rx})(${subver_rx})*-${pkgrel_rx}$ ]]`
		`+ then local version=${BASH_REMATCH[1]}`
		`+ local subver_inc=$(( ${version##*.} + 1 ))`
		`+ local version_inc=$( [[ "${version}" =~ \. ]] && echo ${version%.*}.${subver_inc} \|\| \`
		`+ echo ${subver_inc} )`
		`+ local constraint_string="${dep_pkgname}>=${version} ${dep_pkgname}<${version_inc}"`
		`+`
		`+ echo "applied version constraint: ${constraint_string}" >&2`
		`+ echo -n "${constraint_string}"`
		`+ else echo "ERROR: _version_constraint() error parsing: dep_pkgname='${dep_pkgname}' full_version='${full_version}'" >&2`
		`+ exit 1`
		`+ fi`
		`+ }`
		`+`
		`+ prepare() {`
		`+ cd qtwebkit-$_pkgver`
		`+ patch -p0 -i ../icu68.patch # Fix build with ICU 68.x`
		`+ patch -p1 -i ../glib-2.68.patch # https://github.com/qtwebkit/qtwebkit/issues/1057`
		`+ patch -p1 -i ../qt5-webkit-python-3.9.patch # Fix build with python 3.9`
		`+ patch -p1 -i ../qt5-webkit-bison-3.7.patch # Fix build with bison 3.7`
		`+ }`
		`+`
		`+ build() {`
		`+ cmake -B build -S qtwebkit-$_pkgver \`
		`+ -DCMAKE_INSTALL_PREFIX=/usr \`
		`+ -DCMAKE_CXX_FLAGS="${CXXFLAGS} -DNDEBUG" \`
		`+ -DPORT=Qt \`
		`+ -DENABLE_TOOLS=OFF`
		`+ cmake --build build`
		`+ }`
		`+`
		`+ package() {`
		`+ depends+=( $(_version_constraint qt5-base) )`
		`+`
		`+ DESTDIR="$pkgdir" cmake --install build`
		`+`
		`+ install -d "$pkgdir"/usr/share/licenses`
		`+ ln -s /usr/share/licenses/qt5-base "$pkgdir"/usr/share/licenses/${pkgname}`
		`+ }`

libre/qt5-webkit/glib-2.68.patch

file added

+26

		`@@ -0,0 +1,26 @@`
		`+ From 5b698ba3faffd4e198a45be9fe74f53307395e4b Mon Sep 17 00:00:00 2001`
		`+ From: Fabian Vogt <fvogt@suse.de>`
		`+ Date: Wed, 7 Apr 2021 13:38:09 +0200`
		`+ Subject: [PATCH] Remove invalid g_object declarations to fix build with glib`
		`+ >= 2.68`
		`+`
		`+ g_object_ref_sink is defined as a macro meanwhile and so the build fails.`
		`+ Just remove the declarations, glib.h is included anyway.`
		`+ ---`
		`+ Source/WTF/wtf/glib/GRefPtr.h \| 3 ---`
		`+ 1 file changed, 3 deletions(-)`
		`+`
		`+ diff --git a/Source/WTF/wtf/glib/GRefPtr.h b/Source/WTF/wtf/glib/GRefPtr.h`
		`+ index 06133d82cb35..d9a1d2f145f5 100644`
		`+ --- a/Source/WTF/wtf/glib/GRefPtr.h`
		`+ +++ b/Source/WTF/wtf/glib/GRefPtr.h`
		`+ @@ -29,9 +29,6 @@`
		`+ #include <algorithm>`
		`+ #include <glib.h>`
		`+`
		`+ -extern "C" void g_object_unref(gpointer);`
		`+ -extern "C" gpointer g_object_ref_sink(gpointer);`
		`+ -`
		`+ namespace WTF {`
		`+`
		`+ enum GRefPtrAdoptType { GRefPtrAdopt };`

libre/qt5-webkit/icu68.patch

file added

+170

		`@@ -0,0 +1,170 @@`
		`+ Regressed by https://github.com/unicode-org/icu/commit/c3fe7e09d844`
		`+`
		`+ In file included from Source/WebCore/platform/text/TextAllInOne.cpp:31:`
		`+ Source/WebCore/platform/text/TextCodecICU.cpp:311:42: error: use of undeclared identifier 'TRUE'`
		`+ ucnv_setFallback(m_converterICU, TRUE);`
		`+ ^`
		`+ In file included from Source/WebCore/platform/text/TextAllInOne.cpp:40:`
		`+ In file included from Source/WebCore/platform/text/icu/UTextProvider.cpp:27:`
		`+ Source/WebCore/platform/text/icu/UTextProvider.h:83:28: error: use of undeclared identifier 'TRUE'`
		`+ isAccessible = TRUE;`
		`+ ^`
		`+ Source/WebCore/platform/text/icu/UTextProvider.h:88:28: error: use of undeclared identifier 'FALSE'`
		`+ isAccessible = FALSE;`
		`+ ^`
		`+ Source/WebCore/platform/text/icu/UTextProvider.h:97:28: error: use of undeclared identifier 'TRUE'`
		`+ isAccessible = TRUE;`
		`+ ^`
		`+ Source/WebCore/platform/text/icu/UTextProvider.h:102:28: error: use of undeclared identifier 'FALSE'`
		`+ isAccessible = FALSE;`
		`+ ^`
		`+ In file included from Source/WebCore/platform/text/TextAllInOne.cpp:41:`
		`+ Source/WebCore/platform/text/icu/UTextProviderLatin1.cpp:103:20: error: use of undeclared identifier 'TRUE'`
		`+ return TRUE;`
		`+ ^`
		`+ Source/WebCore/platform/text/icu/UTextProviderLatin1.cpp:108:20: error: use of undeclared identifier 'FALSE'`
		`+ return FALSE;`
		`+ ^`
		`+ Source/WebCore/platform/text/icu/UTextProviderLatin1.cpp:114:20: error: use of undeclared identifier 'TRUE'`
		`+ return TRUE;`
		`+ ^`
		`+ Source/WebCore/platform/text/icu/UTextProviderLatin1.cpp:119:20: error: use of undeclared identifier 'FALSE'`
		`+ return FALSE;`
		`+ ^`
		`+ Source/WebCore/platform/text/icu/UTextProviderLatin1.cpp:147:12: error: use of undeclared identifier 'TRUE'`
		`+ return TRUE;`
		`+ ^`
		`+ Source/WebCore/platform/text/icu/UTextProviderLatin1.cpp:339:16: error: use of undeclared identifier 'FALSE'`
		`+ return FALSE;`
		`+ ^`
		`+ Source/WebCore/platform/text/icu/UTextProviderLatin1.cpp:359:12: error: use of undeclared identifier 'TRUE'`
		`+ return TRUE;`
		`+ ^`
		`+ In file included from Source/WebCore/platform/text/TextAllInOne.cpp:42:`
		`+ Source/WebCore/platform/text/icu/UTextProviderUTF16.cpp:128:16: error: use of undeclared identifier 'FALSE'`
		`+ return FALSE;`
		`+ ^`
		`+ Source/WebCore/platform/text/icu/UTextProviderUTF16.cpp:148:12: error: use of undeclared identifier 'TRUE'`
		`+ return TRUE;`
		`+ ^`
		`+`
		`+ --- Source/WebCore/platform/text/TextCodecICU.cpp.orig 2020-03-04 17:16:37 UTC`
		`+ +++ Source/WebCore/platform/text/TextCodecICU.cpp`
		`+ @@ -308,7 +308,7 @@ void TextCodecICU::createICUConverter() const`
		`+ m_converterICU = ucnv_open(m_canonicalConverterName, &err);`
		`+ ASSERT(U_SUCCESS(err));`
		`+ if (m_converterICU)`
		`+ - ucnv_setFallback(m_converterICU, TRUE);`
		`+ + ucnv_setFallback(m_converterICU, true);`
		`+ }`
		`+`
		`+ int TextCodecICU::decodeToBuffer(UChar* target, UChar* targetLimit, const char& source, const char sourceLimit, int32_t* offsets, bool flush, UErrorCode& err)`
		`+ --- Source/WebCore/platform/text/icu/UTextProvider.h.orig 2020-03-04 17:16:37 UTC`
		`+ +++ Source/WebCore/platform/text/icu/UTextProvider.h`
		`+ @@ -80,12 +80,12 @@ inline bool uTextAccessInChunkOrOutOfRange(UText* text`
		`+ // Ensure chunk offset is well formed if computed offset exceeds int32_t range.`
		`+ ASSERT(offset < std::numeric_limits<int32_t>::max());`
		`+ text->chunkOffset = offset < std::numeric_limits<int32_t>::max() ? static_cast<int32_t>(offset) : 0;`
		`+ - isAccessible = TRUE;`
		`+ + isAccessible = true;`
		`+ return true;`
		`+ }`
		`+ if (nativeIndex >= nativeLength && text->chunkNativeLimit == nativeLength) {`
		`+ text->chunkOffset = text->chunkLength;`
		`+ - isAccessible = FALSE;`
		`+ + isAccessible = false;`
		`+ return true;`
		`+ }`
		`+ } else {`
		`+ @@ -94,12 +94,12 @@ inline bool uTextAccessInChunkOrOutOfRange(UText* text`
		`+ // Ensure chunk offset is well formed if computed offset exceeds int32_t range.`
		`+ ASSERT(offset < std::numeric_limits<int32_t>::max());`
		`+ text->chunkOffset = offset < std::numeric_limits<int32_t>::max() ? static_cast<int32_t>(offset) : 0;`
		`+ - isAccessible = TRUE;`
		`+ + isAccessible = true;`
		`+ return true;`
		`+ }`
		`+ if (nativeIndex <= 0 && !text->chunkNativeStart) {`
		`+ text->chunkOffset = 0;`
		`+ - isAccessible = FALSE;`
		`+ + isAccessible = false;`
		`+ return true;`
		`+ }`
		`+ }`
		`+ --- Source/WebCore/platform/text/icu/UTextProviderLatin1.cpp.orig 2020-03-04 17:16:37 UTC`
		`+ +++ Source/WebCore/platform/text/icu/UTextProviderLatin1.cpp`
		`+ @@ -100,23 +100,23 @@ static UBool uTextLatin1Access(UText* uText, int64_t i`
		`+ if (index < uText->chunkNativeLimit && index >= uText->chunkNativeStart) {`
		`+ // Already inside the buffer. Set the new offset.`
		`+ uText->chunkOffset = static_cast<int32_t>(index - uText->chunkNativeStart);`
		`+ - return TRUE;`
		`+ + return true;`
		`+ }`
		`+ if (index >= length && uText->chunkNativeLimit == length) {`
		`+ // Off the end of the buffer, but we can't get it.`
		`+ uText->chunkOffset = static_cast<int32_t>(index - uText->chunkNativeStart);`
		`+ - return FALSE;`
		`+ + return false;`
		`+ }`
		`+ } else {`
		`+ if (index <= uText->chunkNativeLimit && index > uText->chunkNativeStart) {`
		`+ // Already inside the buffer. Set the new offset.`
		`+ uText->chunkOffset = static_cast<int32_t>(index - uText->chunkNativeStart);`
		`+ - return TRUE;`
		`+ + return true;`
		`+ }`
		`+ if (!index && !uText->chunkNativeStart) {`
		`+ // Already at the beginning; can't go any farther.`
		`+ uText->chunkOffset = 0;`
		`+ - return FALSE;`
		`+ + return false;`
		`+ }`
		`+ }`
		`+`
		`+ @@ -144,7 +144,7 @@ static UBool uTextLatin1Access(UText* uText, int64_t i`
		`+`
		`+ uText->nativeIndexingLimit = uText->chunkLength;`
		`+`
		`+ - return TRUE;`
		`+ + return true;`
		`+ }`
		`+`
		`+ static int32_t uTextLatin1Extract(UText* uText, int64_t start, int64_t limit, UChar* dest, int32_t destCapacity, UErrorCode* status)`
		`+ @@ -336,7 +336,7 @@ static int64_t uTextLatin1ContextAwareNativeLength(UTe`
		`+ static UBool uTextLatin1ContextAwareAccess(UText* text, int64_t nativeIndex, UBool forward)`
		`+ {`
		`+ if (!text->context)`
		`+ - return FALSE;`
		`+ + return false;`
		`+ int64_t nativeLength = uTextLatin1ContextAwareNativeLength(text);`
		`+ UBool isAccessible;`
		`+ if (uTextAccessInChunkOrOutOfRange(text, nativeIndex, nativeLength, forward, isAccessible))`
		`+ @@ -356,7 +356,7 @@ static UBool uTextLatin1ContextAwareAccess(UText* text`
		`+ ASSERT(newContext == UTextProviderContext::PriorContext);`
		`+ textLatin1ContextAwareSwitchToPriorContext(text, nativeIndex, nativeLength, forward);`
		`+ }`
		`+ - return TRUE;`
		`+ + return true;`
		`+ }`
		`+`
		`+ static int32_t uTextLatin1ContextAwareExtract(UText, int64_t, int64_t, UChar, int32_t, UErrorCode* errorCode)`
		`+ --- Source/WebCore/platform/text/icu/UTextProviderUTF16.cpp.orig 2020-03-04 17:16:37 UTC`
		`+ +++ Source/WebCore/platform/text/icu/UTextProviderUTF16.cpp`
		`+ @@ -125,7 +125,7 @@ static inline int64_t uTextUTF16ContextAwareNativeLeng`
		`+ static UBool uTextUTF16ContextAwareAccess(UText* text, int64_t nativeIndex, UBool forward)`
		`+ {`
		`+ if (!text->context)`
		`+ - return FALSE;`
		`+ + return false;`
		`+ int64_t nativeLength = uTextUTF16ContextAwareNativeLength(text);`
		`+ UBool isAccessible;`
		`+ if (uTextAccessInChunkOrOutOfRange(text, nativeIndex, nativeLength, forward, isAccessible))`
		`+ @@ -145,7 +145,7 @@ static UBool uTextUTF16ContextAwareAccess(UText* text,`
		`+ ASSERT(newContext == UTextProviderContext::PriorContext);`
		`+ textUTF16ContextAwareSwitchToPriorContext(text, nativeIndex, nativeLength, forward);`
		`+ }`
		`+ - return TRUE;`
		`+ + return true;`
		`+ }`
		`+`
		`+ static int32_t uTextUTF16ContextAwareExtract(UText, int64_t, int64_t, UChar, int32_t, UErrorCode* errorCode)`

libre/qt5-webkit/qt5-webkit-bison-3.7.patch

file added

+46

		`@@ -0,0 +1,46 @@`
		`+ From d92b11fea65364fefa700249bd3340e0cd4c5b31 Mon Sep 17 00:00:00 2001`
		`+ From: Dmitry Shachnev <mitya57@gmail.com>`
		`+ Date: Tue, 4 Aug 2020 21:04:06 +0300`
		`+ Subject: [PATCH] Let Bison generate the header directly, to fix build with`
		`+ Bison 3.7`
		`+`
		`+ Starting with Bison 3.7, the generated C++ file #include's the header`
		`+ by default, instead of duplicating it. So we should not delete it.`
		`+`
		`+ Remove the code to add #ifdef guards to the header, since Bison adds`
		`+ them itself since version 2.6.3.`
		`+ ---`
		`+ Source/WebCore/css/makegrammar.pl \| 21 +--------------------`
		`+ 1 file changed, 1 insertion(+), 20 deletions(-)`
		`+`
		`+ diff --git a/Source/WebCore/css/makegrammar.pl b/Source/WebCore/css/makegrammar.pl`
		`+ index 5d63b08102eb5..9435701c70612 100644`
		`+ --- a/Source/WebCore/css/makegrammar.pl`
		`+ +++ b/Source/WebCore/css/makegrammar.pl`
		`+ @@ -73,25 +73,6 @@`
		`+ }`
		`+`
		`+ my $fileBase = File::Spec->join($outputDir, $filename);`
		`+ -my @bisonCommand = ($bison, "-d", "-p", $symbolsPrefix, $grammarFilePath, "-o", "$fileBase.cpp");`
		`+ +my @bisonCommand = ($bison, "--defines=$fileBase.h", "-p", $symbolsPrefix, $grammarFilePath, "-o", "$fileBase.cpp");`
		`+ push @bisonCommand, "--no-lines" if $^O eq "MSWin32"; # Work around bug in bison >= 3.0 on Windows where it puts backslashes into #line directives.`
		`+ system(@bisonCommand) == 0 or die;`
		`+ -`
		`+ -open HEADER, ">$fileBase.h" or die;`
		`+ -print HEADER << "EOF";`
		`+ -#ifndef CSSGRAMMAR_H`
		`+ -#define CSSGRAMMAR_H`
		`+ -EOF`
		`+ -`
		`+ -open HPP, "<$fileBase.cpp.h" or open HPP, "<$fileBase.hpp" or die;`
		`+ -while (<HPP>) {`
		`+ - print HEADER;`
		`+ -}`
		`+ -close HPP;`
		`+ -`
		`+ -print HEADER "#endif\n";`
		`+ -close HEADER;`
		`+ -`
		`+ -unlink("$fileBase.cpp.h");`
		`+ -unlink("$fileBase.hpp");`
		`+ -`

libre/qt5-webkit/qt5-webkit-python-3.9.patch

file added

+27

		`@@ -0,0 +1,27 @@`
		`+ From 78360c01c796b6260bf828bc9c8a0ef73c5132fd Mon Sep 17 00:00:00 2001`
		`+ From: Konstantin Tokarev <annulen@yandex.ru>`
		`+ Date: Wed, 3 Jun 2020 15:01:42 +0300`
		`+ Subject: [PATCH] Fix compilation with Python 3.9: avoid passing encoding to`
		`+ json.load()`
		`+`
		`+ In Python 2.7 UTF-8 is assumed by default, while in Python 3 this argument`
		`+ is not supported.`
		`+`
		`+ Change-Id: Ic459d60a6b20bc1838d8771bc36ac41614fe61a9`
		`+ ---`
		`+ Source/JavaScriptCore/generate-bytecode-files \| 2 +-`
		`+ 1 file changed, 1 insertion(+), 1 deletion(-)`
		`+`
		`+ diff --git a/Source/JavaScriptCore/generate-bytecode-files b/Source/JavaScriptCore/generate-bytecode-files`
		`+ index c5dab429c7b0f..af3431275ecf9 100644`
		`+ --- a/Source/JavaScriptCore/generate-bytecode-files`
		`+ +++ b/Source/JavaScriptCore/generate-bytecode-files`
		`+ @@ -163,7 +163,7 @@ if __name__ == "__main__":`
		`+ initBytecodesFile = openOrExit(initASMFileName, "w")`
		`+`
		`+ try:`
		`+ - bytecodeSections = json.load(bytecodeFile, encoding = "utf-8")`
		`+ + bytecodeSections = json.load(bytecodeFile)`
		`+ except:`
		`+ print("Unexpected error parsing {0}: {1}".format(bytecodeJSONFile, sys.exc_info()))`
		`+`

libre/quassel/0001-qtui-Set-desktop-file-name.patch

file removed

-46

		`@@ -1,46 +0,0 @@`
		`- From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001`
		`- From: "Jan Alexander Steffens (heftig)" <jan.steffens@gmail.com>`
		`- Date: Fri, 22 Mar 2019 22:37:22 +0100`
		`- Subject: [PATCH] qtui: Set desktop file name`
		`-`
		`- The XCB platform plugin defaults the WM class to the executable name,`
		`- which already matches our desktop file name. Unfortunately, the Wayland`
		`- platform plugin prepends the inverted organization domain, resulting in`
		`- an app ID of "org.quassel-irc.quasselclient", thus breaking the`
		`- association.`
		`-`
		`- Set the desktop file name explicitly so the Wayland platform doesn't get`
		`- confused.`
		`- ---`
		`- src/qtui/monoapplication.cpp \| 3 +++`
		`- src/qtui/qtuiapplication.cpp \| 3 +++`
		`- 2 files changed, 6 insertions(+)`
		`-`
		`- diff --git a/src/qtui/monoapplication.cpp b/src/qtui/monoapplication.cpp`
		`- index 809f1147..457a5dce 100644`
		`- --- a/src/qtui/monoapplication.cpp`
		`- +++ b/src/qtui/monoapplication.cpp`
		`- @@ -32,6 +32,9 @@ MonolithicApplication::MonolithicApplication(int &argc, char **argv)`
		`- : QtUiApplication(argc, argv)`
		`- {`
		`- Quassel::setRunMode(Quassel::Monolithic);`
		`- +#if QT_VERSION >= 0x050700`
		`- + QGuiApplication::setDesktopFileName(Quassel::buildInfo().applicationName);`
		`- +#endif`
		`- }`
		`-`
		`-`
		`- diff --git a/src/qtui/qtuiapplication.cpp b/src/qtui/qtuiapplication.cpp`
		`- index e5b0b773..42e4bf77 100644`
		`- --- a/src/qtui/qtuiapplication.cpp`
		`- +++ b/src/qtui/qtuiapplication.cpp`
		`- @@ -92,6 +92,9 @@ QtUiApplication::QtUiApplication(int &argc, char **argv)`
		`- #if (QT_VERSION >= QT_VERSION_CHECK(5, 6, 0))`
		`- QGuiApplication::setFallbackSessionManagementEnabled(false);`
		`- #endif`
		`- +#if QT_VERSION >= 0x050700`
		`- + QGuiApplication::setDesktopFileName(Quassel::buildInfo().clientApplicationName);`
		`- +#endif`
		`- }`
		`-`
		`-`

libre/quassel/0002-common-Disable-enum-type-stream-operators-for-Qt-5.1.patch

file removed

-35

		`@@ -1,35 +0,0 @@`
		`- From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001`
		`- From: Manuel Nickschas <sputnick@quassel-irc.org>`
		`- Date: Tue, 7 Jan 2020 18:34:54 +0100`
		`- Subject: [PATCH] common: Disable enum type stream operators for Qt >= 5.14`
		`-`
		`- Starting from version 5.14, Qt provides stream operators for enum`
		`- types, which collide with the ones we ship in types.h. Disable`
		`- Quassel's stream operators when compiling against Qt 5.14 or later.`
		`-`
		`- Add a unit test that ensures that enum serialization honors the width`
		`- of the underlying type.`
		`- ---`
		`- src/common/types.h \| 2 ++`
		`- 1 file changed, 2 insertions(+)`
		`-`
		`- diff --git a/src/common/types.h b/src/common/types.h`
		`- index 467d9fb2..c4b9f364 100644`
		`- --- a/src/common/types.h`
		`- +++ b/src/common/types.h`
		`- @@ -140,6 +140,7 @@ Q_DECLARE_METATYPE(QHostAddress)`
		`- typedef QList<MsgId> MsgIdList;`
		`- typedef QList<BufferId> BufferIdList;`
		`-`
		`- +#if QT_VERSION < QT_VERSION_CHECK(5, 14, 0)`
		`- /**`
		`- * Catch-all stream serialization operator for enum types.`
		`- *`
		`- @@ -169,6 +170,7 @@ QDataStream &operator>>(QDataStream &in, T &value) {`
		`- value = static_cast<T>(v);`
		`- return in;`
		`- }`
		`- +#endif`
		`-`
		`- // Exceptions`
		`-`

libre/quassel/0003-Removed-mozilla-IRC-network-from-networks.ini.patch

file removed

-24

		`@@ -1,24 +0,0 @@`
		`- From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001`
		`- From: Svetlana T <svetlana@members.fsf.org>`
		`- Date: Sun, 8 Mar 2020 07:46:19 +1100`
		`- Subject: [PATCH] Removed mozilla IRC network from networks.ini`
		`-`
		`- Mozilla IRC has shut down this month. Mozilla moved their chat services to matrix. I am removing it from the default preset now.`
		`- ---`
		`- data/networks.ini \| 3 ---`
		`- 1 file changed, 3 deletions(-)`
		`-`
		`- diff --git a/data/networks.ini b/data/networks.ini`
		`- index 5f8fa029..73afecb3 100644`
		`- --- a/data/networks.ini`
		`- +++ b/data/networks.ini`
		`- @@ -35,9 +35,6 @@ Servers=irc.gamesnet.net:6667`
		`- [IRCnet]`
		- Servers=irc.ircnet.com:6667,open.ircnet.net:6666,irc.us.ircnet.net:6665,ircnet.netvision.net.il:6666,irc.tokyo.wide.ad.jp:6666,irc.freebsd.org.tw:6666,linz.irc.at:6666,vienna.irc.at:6666,ircnet.realroot.be:6666,irc.datacomm.ch:6664,irc.felk.cvut.cz:6667,random.ircd.de:6666,irc.dotsrc.org:6666,irc.ircnet.ee:6666,irc.cs.hut.fi:6667,ircnet.club-internet.fr:6666,atw.irc.hu:6667,irc.simnet.is:6660,irc.eutelia.it:6664,irc.eutelia.it:7000,irc.tin.it:6665,irc.apollo.lv:6666,irc.apollo.lv:7000,irc.uunet.nl:6660,irc.xs4all.nl:6660,irc.snt.utwente.nl:6660,irc.ifi.uio.no:6667,irc.pvv.ntnu.no:6667,lublin.irc.pl:6666,warszawa.irc.pl:6666,irc.ludd.luth.se:6661,irc.swipnet.se:6660,irc.swipnet.se:8000,irc.arnes.si:6666,irc.link.si:6666,irc.nextra.sk:6666,ircnet.demon.co.uk:6665,ircnet.eversible.com:6665,ircnet.choopa.net:6665
		`-`
		`- -[Mozilla]`
		`- -Servers=irc.mozilla.org:+6697,irc.mozilla.org:6667`
		`- -`
		`- [OFTC]`
		`- Servers=irc.oftc.net:+6697,irc.oftc.net:6667`
		`-`

libre/quassel/0004-This-commit-changes-the-official-Quassel-IRC-channel.patch

file removed

-99

		`@@ -1,99 +0,0 @@`
		`- From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001`
		`- From: phuzion <398094+phuzion@users.noreply.github.com>`
		`- Date: Wed, 19 May 2021 18:05:36 +0000`
		`- Subject: [PATCH] This commit changes the official Quassel IRC channel,`
		`- (#quassel) from the Freenode IRC network to the Libera IRC network in`
		`- response to recent issues which resulted in the entire volunteer staff of`
		`- Freenode stepping down.`
		`-`
		`- For more information about this situation, please read this:`
		`- https://gist.github.com/joepie91/df80d8d36cd9d1bde46ba018af497409`
		`- ---`
		`- README.md \| 6 ++----`
		`- data/networks.ini \| 7 +++++--`
		`- src/qtui/aboutdlg.cpp \| 2 +-`
		`- 3 files changed, 8 insertions(+), 7 deletions(-)`
		`-`
		`- diff --git a/README.md b/README.md`
		`- index c7b03dc2..6f54dfaa 100644`
		`- --- a/README.md`
		`- +++ b/README.md`
		`- @@ -47,31 +47,29 @@ documentation.`
		`-`
		`- IRC is the preferred means of getting in touch with the developers.`
		`-`
		- -The Quassel IRC Team can be contacted on `Freenode/#quassel`
		- -(or `#quassel.de`). If you have trouble getting Quassel to connect,
		`- -you can use [Freenode's webchat][help-freenode].`
		- +The Quassel IRC Team can be contacted on `Libera Chat/#quassel`
		- +(or `#quassel.de`).
		`-`
		`- We always welcome new users in our channels!`
		`-`
		`- You can learn more and reach out to us in several ways:`
		`- * [Visit our homepage][web-home]`
		`- * [Submit and browse issues on the bugtracker][dev-bugs]`
		`- * GitHub issues are not used, but [pull requests][dev-pr-new] are accepted!`
		`- * [Email the dev team - devel@quassel-irc.org][dev-email]`
		`-`
		`- Thanks for reading,`
		`-`
		`- ~ The Quassel IRC Team`
		`-`
		`- [web-home]: https://quassel-irc.org`
		`- [web-download]: https://quassel-irc.org/downloads`
		`- [dev-bugs]: https://bugs.quassel-irc.org`
		`- [dev-email]: mailto:devel@quassel-irc.org`
		`- [dev-pr-new]: https://github.com/quassel/quassel/pull/new/master`
		`- [docs-wiki]: https://bugs.quassel-irc.org/projects/quassel-irc/wiki`
		`- [docs-wiki-unofficial-build]: https://bugs.quassel-irc.org/projects/quassel-irc/wiki#Unofficial-builds`
		`- [docs-wiki-getstart]: https://bugs.quassel-irc.org/projects/quassel-irc/wiki#Getting-started`
		`- -[help-freenode]: https://webchat.freenode.net?channels=%23quassel`
		`- [repo-changelog]: ChangeLog`
		`- [ci-linux-badge]: https://travis-ci.org/quassel/quassel.svg?branch=master`
		`- [ci-linux-status-page]: https://travis-ci.org/quassel/quassel/branches`
		`- diff --git a/data/networks.ini b/data/networks.ini`
		`- index 73afecb3..cf16313e 100644`
		`- --- a/data/networks.ini`
		`- +++ b/data/networks.ini`
		`- @@ -19,22 +19,25 @@ Servers=irc.efnet.info:6667,irc.efnet.org:6667,irc.inter.net.il:6667,irc.igs.ca:`
		`- Servers=irc.enterthegame.com:6667`
		`-`
		`- [Freenode]`
		`- -Default=Yes`
		`- -DefaultChannels=#quassel`
		`- Servers=chat.freenode.net:+6697,chat.freenode.net:6667`
		`-`
		`- [GalaxyNet]`
		`- Servers=irc.galaxynet.org:6662,irc.galaxynet.org:7000,boston.ma.us.galaxynet.org:6661`
		`-`
		`- [GameSurge]`
		`- Servers=irc.gamesurge.net:6667,irc.eu.gamesurge.net:6667`
		`-`
		`- [GamesNET]`
		`- Servers=irc.gamesnet.net:6667`
		`-`
		`- [IRCnet]`
		- Servers=irc.ircnet.com:6667,open.ircnet.net:6666,irc.us.ircnet.net:6665,ircnet.netvision.net.il:6666,irc.tokyo.wide.ad.jp:6666,irc.freebsd.org.tw:6666,linz.irc.at:6666,vienna.irc.at:6666,ircnet.realroot.be:6666,irc.datacomm.ch:6664,irc.felk.cvut.cz:6667,random.ircd.de:6666,irc.dotsrc.org:6666,irc.ircnet.ee:6666,irc.cs.hut.fi:6667,ircnet.club-internet.fr:6666,atw.irc.hu:6667,irc.simnet.is:6660,irc.eutelia.it:6664,irc.eutelia.it:7000,irc.tin.it:6665,irc.apollo.lv:6666,irc.apollo.lv:7000,irc.uunet.nl:6660,irc.xs4all.nl:6660,irc.snt.utwente.nl:6660,irc.ifi.uio.no:6667,irc.pvv.ntnu.no:6667,lublin.irc.pl:6666,warszawa.irc.pl:6666,irc.ludd.luth.se:6661,irc.swipnet.se:6660,irc.swipnet.se:8000,irc.arnes.si:6666,irc.link.si:6666,irc.nextra.sk:6666,ircnet.demon.co.uk:6665,ircnet.eversible.com:6665,ircnet.choopa.net:6665
		`-`
		`- +[Libera Chat]`
		`- +Default=Yes`
		`- +DefaultChannels=#quassel`
		`- +Servers=irc.libera.chat:+6697,irc.libera.chat:6667`
		`- +`
		`- [OFTC]`
		`- Servers=irc.oftc.net:+6697,irc.oftc.net:6667`
		`-`
		`- diff --git a/src/qtui/aboutdlg.cpp b/src/qtui/aboutdlg.cpp`
		`- index 6b21b0f5..a6c4da25 100644`
		`- --- a/src/qtui/aboutdlg.cpp`
		`- +++ b/src/qtui/aboutdlg.cpp`
		`- @@ -67,7 +67,7 @@ QString AboutDlg::about() const`
		`- QString res {tr("<b>A modern, distributed IRC Client</b><br><br>"`
		`- "©%1 by the Quassel Project<br>"`
		`- "<a href=\"https://quassel-irc.org\">https://quassel-irc.org</a><br>"`
		`- - "<a href=\"irc://irc.freenode.net/quassel\">#quassel</a> on <a href=\"https://www.freenode.net\">Freenode</a><br><br>"`
		`- + "<a href=\"irc://irc.libera.chat/quassel\">#quassel</a> on <a href=\"https://libera.chat\">Libera Chat</a><br><br>"`
		`- "Quassel IRC is dual-licensed under <a href=\"https://www.gnu.org/licenses/gpl-2.0.txt\">GPLv2</a> and "`
		`- "<a href=\"https://www.gnu.org/licenses/gpl-3.0.txt\">GPLv3</a>.<br>"`
		`- "<a href=\"https://api.kde.org/frameworks/breeze-icons/html\">Breeze icon theme</a> © Uri Herrera and others, licensed under the "`

libre/quassel/9000-search-duck.patch

file modified

+16 -12

		`@@ -1,15 +1,19 @@`
		`- diff --git a/src/qtui/chatviewsettings.h b/src/qtui/chatviewsettings.h`
		`- index 838891b..4d28926 100644`
		`- --- a/src/qtui/chatviewsettings.h`
		`- +++ b/src/qtui/chatviewsettings.h`
		`- @@ -104,7 +104,7 @@ public:`
		`- */`
		`- inline void enableSenderBrackets(bool enabled) { setLocalValue("ShowSenderBrackets", enabled); }`
		`+ diff --git a/src/qtui/chatviewsettings.cpp b/src/qtui/chatviewsettings.cpp`
		`+ index 51435018..e4dbe734 100644`
		`+ --- a/src/qtui/chatviewsettings.cpp`
		`+ +++ b/src/qtui/chatviewsettings.cpp`
		`+ @@ -90,7 +90,7 @@ void ChatViewSettings::enableSenderBrackets(bool enabled)`
		`+`
		`+ QString ChatViewSettings::webSearchUrlFormatString() const`
		`+ {`
		`+ - return localValue("WebSearchUrlFormat", "https://www.google.com/search?q=%s").toString();`
		`+ + return localValue("WebSearchUrlFormat", "https://html.duckduckgo.com/html/?q=%s").toString();`
		`+ }`
		`+`
		`+ void ChatViewSettings::setWebSearchUrlFormatString(const QString& format)`
		`+ --`
		`+ 2.37.3`

		`- - inline QString webSearchUrlFormatString() { return localValue("WebSearchUrlFormat", "https://www.google.com/search?q=%s").toString(); }`
		`- + inline QString webSearchUrlFormatString() { return localValue("WebSearchUrlFormat", "https://duckduckgo.com/?q=%s").toString(); }`
		`- inline void setWebSearchUrlFormatString(const QString &format) { setLocalValue("WebSearchUrlFormat", format); }`
		`- };`

		`diff --git a/src/qtui/settingspages/chatviewsettingspage.ui b/src/qtui/settingspages/chatviewsettingspage.ui`
		`index 99f568a..7d13fff 100644`
		`@@ -20,7 +24,7 @@`
		`</property>`
		`<property name="defaultValue" stdset="0">`
		`- <string>https://www.google.com/search?q=%s</string>`
		`- + <string>https://duckduckgo.com/?q=%s</string>`
		`+ + <string>https://html.duckduckgo.com/html/?q=%s</string>`
		`</property>`
		`</widget>`
		`</item>`

libre/quassel/PKGBUILD

file modified

+21 -32

		`@@ -1,11 +1,13 @@`
		`# Maintainer (arch): Jaroslav Lichtblau <svetlemodry@archlinux.org>`
		`# Contributor: Vesa Kaihlavirta <vegai@iki.fi>`
		`# Maintainer: bill-auger <bill-auger@programmer.net>`
		`+ # Contributer: Wael Karram <wael@waelk.tech>`


		`# parabola changes and rationale:`
		`# - repalce qt5-webengine with qt5-webkit (for URL previews)`
		`# - set duckduckgo as default search engine`
		`+ # - pin to strongly-coupled dependencies`


		`pkgbase=quassel`
		`@@ -15,57 +17,46 @@`
		`'quassel-monolithic'`
		`'quassel-monolithic-qt'`
		`'quassel-common')`
		`- pkgver=0.13.1`
		`- pkgrel=9`
		`+ pkgver=0.14.0`
		`+ pkgrel=2`
		`pkgrel+=.parabola1`
		`pkgdesc="Next-generation distributed IRC client"`
		`arch=('x86_64')`
		`arch+=('armv7h' 'i686')`
		`url="https://quassel-irc.org/"`
		`license=('GPL')`
		`- makedepends=('qt5-base' 'qt5-tools' 'qt5-webengine' 'qca' 'qt5-script'`
		`+ makedepends=('qt5-base' 'qt5-tools' 'qt5-webengine' 'qca'`
		`'qt5-multimedia' 'knotifyconfig' 'sonnet' 'libldap' 'cmake'`
		`- 'extra-cmake-modules' 'python' 'hicolor-icon-theme')`
		`- makedepends=(${makedepends[*]/qt5-webengine/qt5-webkit})`
		`+ 'extra-cmake-modules' 'python' 'hicolor-icon-theme' 'boost')`
		`+ makedepends=( ${makedepends[*]/qt5-webengine/qt5-webkit} )`
		`source=(https://quassel-irc.org/pub/$pkgbase-$pkgver.tar.bz2`
		`- 0001-qtui-Set-desktop-file-name.patch`
		`- 0002-common-Disable-enum-type-stream-operators-for-Qt-5.1.patch`
		`- 0003-Removed-mozilla-IRC-network-from-networks.ini.patch`
		`- 0004-This-commit-changes-the-official-Quassel-IRC-channel.patch`
		`$pkgbase.service`
		`$pkgbase.sysusers`
		`$pkgbase.tmpfiles`
		`$pkgbase.conf)`
		`source+=(9000-search-duck.patch)`
		`- sha256sums=('48efee9778743b1db9f44efb91d1c913104db01190c57f2ff57483c39a97e855'`
		`- '7a64214024dc047f35ec8af3c5d543853a5c89c0506766c69c2e1072ca8f5ec7'`
		`- 'a1f874558f31c786b2fb483454d14e74a0dfc01382e1ba58bd610a65e02f4df4'`
		`- '0f92f3a51d2e3272d71b21a563047d7fae93bc2dd6676f405a2d63a20d48521b'`
		`- 'f59d4138f5fc8c9e84b5626fcbe16eec21b22344dc6c28d784c511677de661e1'`
		`+ sha256sums=('bbd46ca429c1518480904c9e2b0ab3a0412fe197f3ce4879974e06ed3a0093a3'`
		`'5dbe20290f3361b9b7a74a52905137e76b656976febf2d31082a2276f9dcde7f'`
		`'3c72441a99e2668c6a8a751fa07beeb44f937576c8a1b5f615e4a55f841d93d9'`
		`'2afd4340c7713f6533e5d175a86b28fd118ecd907776c2b10925d1a4fb31cdca'`
		`'f3031ea8217e01ba42cea14606169e3e27affa5918968ffd5a03c21ae92fe2b8')`
		`- sha256sums+=('3d90a7edfa2b2e27e5f56b25f7583585efbcd35219c04a3bf138d9fe9bb9eab2')`
		`+ sha256sums+=('e1dcb63b3b4e85b3c70d2a1788dd20271608dfe715bf23487f7b492989b2b3ec')`


		`prepare() {`
		`cd $pkgbase-$pkgver`
		`- patch -Np1 -i ../0001-qtui-Set-desktop-file-name.patch`
		`- patch -Np1 -i ../0002-common-Disable-enum-type-stream-operators-for-Qt-5.1.patch`
		`- patch -Np1 -i ../0003-Removed-mozilla-IRC-network-from-networks.ini.patch`
		`- patch -Np1 -i ../0004-This-commit-changes-the-official-Quassel-IRC-channel.patch`

		`# parabola patches`
		`+ echo "applying 9000-search-duck.patch"`
		`patch -Np1 -i ../9000-search-duck.patch`
		`}`

		`_build() (`
		`cmake -H$pkgbase-$pkgver -Bbuild-$1 \`
		`- -DCMAKE_INSTALL_PREFIX=/usr/ \`
		`+ -DCMAKE_INSTALL_PREFIX=/usr \`
		`-DCMAKE_BUILD_TYPE=None \`
		`+ -DENABLE_SHARED=OFF \`
		`-DCMAKE_CXX_FLAGS="$CXXFLAGS -Wno-suggest-override" \`
		`- -DHAVE_SSL=ON \`
		`"${@:2}" \`
		`-Wno-dev`
		`cmake --build build-$1`
		`@@ -118,7 +109,7 @@`

		`package_quassel-core() {`
		`pkgdesc="Next-generation distributed IRC client - core only"`
		`- depends=('icu' 'qca' 'qt5-script' 'libldap')`
		`+ depends=('icu' 'qca' 'libldap')`
		`depends+=(libicuuc.so libicudata.so) # via 'qt5-base' -> libQt5Core.so.N -> libicuuc.so.M -> libicudata.so.M`
		`optdepends=('postgresql: PostgreSQL database support')`
		`backup=(etc/conf.d/quassel)`
		`@@ -141,8 +132,7 @@`
		`package_quassel-client() {`
		`pkgdesc="Next-generation distributed IRC client - client only, KDE version"`
		`depends=('quassel-common' 'qt5-base' 'qt5-webengine' 'qt5-multimedia' 'knotifyconfig')`
		`- pkgdesc+=" with webkit HTML rendering"`
		`- depends=(${depends[*]/qt5-webengine/qt5-webkit})`
		`+ depends=( ${depends[*]/qt5-webengine/qt5-webkit} )`
		`optdepends=('perl: for builtin /exec scripts')`
		`conflicts=('quassel-client-qt')`

		`@@ -150,7 +140,7 @@`
		`install -Dm644 $pkgbase-$pkgver/data/quasselclient.appdata.xml "$pkgdir/usr/share/metainfo/quasselclient.appdata.xml"`

		`# Split quassel-common`
		`- rm -r "$pkgdir"/usr/share/{icons,knotifications5,pixmaps,quassel}`
		`+ rm -r "$pkgdir"/usr/share/{icons,knotifications5,quassel}`
		`}`

		`package_quassel-client-qt() {`
		`@@ -163,7 +153,7 @@`
		`_install client-qt`

		`# Split quassel-common`
		`- rm -r "$pkgdir"/usr/share/{icons,pixmaps,quassel}`
		`+ rm -r "$pkgdir"/usr/share/{icons,quassel}`

		`# Ignore package by AppStream to avoid duplicated IDs`
		`echo 'X-AppStream-Ignore=true' >> "$pkgdir/usr/share/applications/quasselclient.desktop"`
		`@@ -171,10 +161,9 @@`

		`package_quassel-monolithic() {`
		`pkgdesc="Next-generation distributed IRC client - monolithic, KDE version"`
		`- depends=('quassel-common' 'qt5-base' 'qt5-webengine' 'qt5-multimedia' 'qt5-script' 'qca'`
		`+ depends=('quassel-common' 'qt5-base' 'qt5-webengine' 'qt5-multimedia' 'qca'`
		`'knotifyconfig' 'libldap')`
		`- pkgdesc+=" with webkit HTML rendering"`
		`- depends=(${depends[*]/qt5-webengine/qt5-webkit})`
		`+ depends=( ${depends[*]/qt5-webengine/qt5-webkit} )`
		`optdepends=('perl: for builtin /exec scripts'`
		`'postgresql: PostgreSQL database support')`
		`conflicts=('quassel-monolithic-qt')`
		`@@ -184,13 +173,13 @@`

		`# Split quassel-common`
		`mkdir "$srcdir/quassel-common"`
		`- mv "$pkgdir"/usr/share/{icons,knotifications5,pixmaps,quassel} \`
		`+ mv "$pkgdir"/usr/share/{icons,knotifications5,quassel} \`
		`"$srcdir/quassel-common/"`
		`}`

		`package_quassel-monolithic-qt() {`
		`pkgdesc="Next-generation distributed IRC client - monolithic, Qt version with reduced deps"`
		`- depends=('quassel-common' 'qca' 'qt5-base' 'qt5-svg' 'qt5-script' 'sonnet')`
		`+ depends=('quassel-common' 'qca' 'qt5-base' 'qt5-svg' 'sonnet')`
		`optdepends=('perl: for builtin /exec scripts'`
		`'postgresql: PostgreSQL database support')`
		`conflicts=('quassel-monolithic')`
		`@@ -198,7 +187,7 @@`
		`_install monolithic-qt`

		`# Split quassel-common`
		`- rm -r "$pkgdir"/usr/share/{icons,pixmaps,quassel}`
		`+ rm -r "$pkgdir"/usr/share/{icons,quassel}`

		`# Ignore package by AppStream to avoid duplicated IDs`
		`echo 'X-AppStream-Ignore=true' >> "$pkgdir/usr/share/applications/quassel.desktop"`

libre/qutebrowser/PKGBUILD

file modified

+6 -8

		`@@ -12,17 +12,14 @@`
		`# - set webkit backend as default`
		`# - condensed the excessive webkit rant on the welcome screen`
		`# - pin to strongly-coupled dependency versions`
		`- # NOTE: according to the release notes, v2.5.0 is the final release to support webkit`
		`- # options:`
		`- # * recover webkit support --> may be difficult to maintain`
		`- # * freeze the version --> does anyone want a frozen GUI web browser?`
		`- # * blacklist it --> RIP qutebrowser - parabola has plenty more :)`
		`+ # - freeze at v2.5.0 (final release with webkit support)`
		`+`


		`pkgname=qutebrowser`
		`- pkgver=2.5.0`
		`+ pkgver=2.5.2`
		`pkgrel=1`
		`- pkgrel+=.parabola3`
		`+ pkgrel+=.parabola1`
		`pkgdesc="A keyboard-driven, vim-like browser based on PyQt5"`
		`pkgdesc+=" and QtWebKit"`
		`arch=('armv7h' 'i686' 'x86_64') # per arch version constraints`
		`@@ -30,6 +27,7 @@`
		`license=("GPL")`
		`depends=("python-jinja" "python-pyqt5" "python-yaml" "qt5-base" "python-pyqtwebengine")`
		`depends=( ${depends[*]/python-pyqtwebengine/qt5-webkit} )`
		`+ depends+=( asciidoc=10.2.0 ) # asciidoc<10.2.0 depends on python2`
		`makedepends=("asciidoc" "python-setuptools")`
		`optdepends=("python-adblock: adblocking backend"`
		`"python-pygments"`
		`@@ -45,7 +43,7 @@`
		`"https://github.com/qutebrowser/qutebrowser/releases/download/v$pkgver/qutebrowser-$pkgver.tar.gz.asc")`
		`source+=("warning-webkit.html")`
		`validpgpkeys=("E04E560002401B8EF0E76F0A916EB0C8FD55A072") # Florian Bruhin`
		`- sha256sums=('e18442a230570f25918a2e89ad4d073ace46c4f59b5fdda2e80ab3c4764451fd'`
		`+ sha256sums=('a9bfce14ddc403de0deb2eedf983c231ce003e0759995ec7ef4ea34e4974e908'`
		`'SKIP')`
		`sha256sums+=('e18216f24387b61a109611958bb59248beaf5afc90da8654e29ea8b0a7ef1610')`

libre/reflector/PKGBUILD

file modified

+1 -1

		`@@ -1,4 +1,4 @@`
		`- # Maintainer (Arch): Xyne <ac xunilhcra enyx, backwards>`
		`+ # Maintainer (arch): Xyne <ac xunilhcra enyx, backwards>`
		`# Maintainer: Omar Vega Ramos <ovruni@gnu.org.pe>`
		`# Contributor: grizzlyuser <grizzlyuser@protonmail.com>`

libre/retroarch/PKGBUILD

file modified

+14 -25

		`@@ -12,42 +12,40 @@`


		`pkgname=retroarch`
		`- pkgver=1.9.6`
		`+ pkgver=1.10.3`
		`pkgrel=2`
		`- pkgrel+=.parabola2`
		`+ pkgrel+=.parabola1`
		`pkgdesc='Reference frontend for the libretro API'`
		`arch=(x86_64)`
		`- arch+=(i686 armv7h)`
		`+ arch+=(armv7h i686)`
		`url=http://www.libretro.com/`
		`license=(GPL)`
		`groups=(libretro)`
		`depends=(`
		`alsa-lib`
		`+ ffmpeg`
		`flac`
		`libass.so`
		`- libavcodec.so`
		`- libavformat.so`
		`- libavutil.so`
		`libdrm`
		`libfreetype.so`
		`libgl`
		`libpulse`
		`- libswresample.so`
		`- libswscale.so`
		`libudev.so`
		`libusb-1.0.so`
		`mbedtls`
		`mesa`
		`- miniupnpc`
		`openal`
		`qt5-base`
		`sdl2`
		`+ spirv-tools`
		`v4l-utils`
		`zlib`
		`)`
		`depends+=(libmbedcrypto.so)`
		`makedepends=(`
		`+ gamemode`
		`git`
		`+ libdecor`
		`libx11`
		`libxcb`
		`libxext`
		`@@ -61,6 +59,8 @@`
		`wayland-protocols`
		`)`
		`optdepends=(`
		`+ 'gamemode: GameMode support'`
		`+ 'libdecor: Wayland decorations'`
		`'libretro-overlays: Collection of overlays'`
		`'libretro-shaders: Collection of shaders'`
		`'libxinerama: X11 support'`
		`@@ -71,45 +71,36 @@`
		`'wayland: Wayland support'`
		`)`
		`backup=(etc/retroarch.cfg)`
		`- _tag=4a6dc36b1cc026bf337537e2d7527a117727bb91`
		`+ _commit=9b282aa742b6c3d2f2925ae5a12e2cd7c6b6ad38 # tag v1.10.3`
		`source=(`
		`- git+https://github.com/libretro/RetroArch.git#tag=${_tag}`
		`+ git+https://github.com/libretro/RetroArch.git#commit=${_commit}`
		`retroarch-config.patch`
		`disable-auto-update.patch`
		`)`
		`- sha256sums=(`
		`- SKIP`
		`- 7857cff30c45721b66666828ca9edbb2923817c6c64591be3f58fe019277103e`
		`- cb3915a5ada76e29abd2a8b2c06c8dc50909473b5c53ec112dffab87fcc585e1`
		`- )`
		`+ b2sums=('SKIP'`
		`+ '5ecbe57126c7f9b66bdf189f0af2f1cec031cb68ea85bb9609847ba9beb0e720c902cd3330d7c286901a73e6c2e272c3f04166cf9a47bb6f80097f19dde8ce3a'`
		`+ '40fb95bd303cd59731d2dfd68da40032affa4bdcd07c7a5831109141e2768e18571231589375c8d97397eefebe5bf1c086dc255be8179906226c6e6c995a4f84')`

		`pkgver() {`
		`cd RetroArch`
		`-`
		`git describe --tags \| sed 's/^v//'`
		`}`

		`prepare() {`
		`cd RetroArch`
		`-`
		`patch -Np1 -i ../retroarch-config.patch`
		`-`
		`git cherry-pick -n 685948368e6b28b97e1b91bdfe5921519359a033 # FS#66843`

		`echo "applying disable-auto-update.patch"`
		`- sed -i 's\|$#define DEFAULT_BUILDBOT_SERVER_URL$ ".*\|\1 ""\|' config.def.h`
		`- sed -i 's\|$#define DEFAULT_BUILDBOT_ASSETS_SERVER_URL$ ".*\|\1 ""\|' config.def.h`
		`patch -Np1 -i ${srcdir}/disable-auto-update.patch`
		`}`

		`build() {`
		`cd RetroArch`
		`-`
		`./configure \`
		`--prefix=/usr \`
		`--disable-builtinflac \`
		`--disable-builtinmbedtls \`
		`- --disable-builtinminiupnpc \`
		`--disable-builtinzlib \`
		`--disable-cg \`
		`--disable-jack \`
		`@@ -123,9 +114,7 @@`

		`package() {`
		`cd RetroArch`
		`-`
		`make DESTDIR="${pkgdir}" install`
		`-`
		`install -Dm 644 libretro-common/audio/dsp_filters/*.{dsp,so} -t "${pkgdir}"/usr/lib/retroarch/filters/audio/`
		`install -Dm 644 gfx/video_filters/*.{filt,so} -t "${pkgdir}"/usr/lib/retroarch/filters/video/`
		`}`

libre/retroarch/disable-auto-update.patch

file modified

+172 -4

		`@@ -1,8 +1,150 @@`
		`+ diff --git a/config.def.h b/config.def.h`
		`+ index 49a2eacb94..5c502741cb 100644`
		`+ --- a/config.def.h`
		`+ +++ b/config.def.h`
		`+ @@ -672,7 +672,7 @@ static const bool menu_show_shutdown = true;`
		`+ #if defined(HAVE_LAKKA) \|\| defined(VITA)`
		`+ static const bool menu_show_core_updater = false;`
		`+ #else`
		`+ -static const bool menu_show_core_updater = true;`
		`+ +static const bool menu_show_core_updater = false;`
		`+ #endif`
		`+ #ifdef HAVE_MIST`
		`+ static const bool menu_show_core_manager_steam = true;`
		`+ @@ -1561,96 +1561,96 @@ static const bool enable_device_vibration = false;`
		`+ #endif`
		`+`
		`+ #if defined(HAKCHI)`
		`+ -#define DEFAULT_BUILDBOT_SERVER_URL "http://hakchicloud.com/Libretro_Cores/"`
		`+ +#define DEFAULT_BUILDBOT_SERVER_URL ""`
		`+ #elif defined(ANDROID)`
		`+ #if defined(ANDROID_ARM_V7)`
		`+ -#define DEFAULT_BUILDBOT_SERVER_URL "http://buildbot.libretro.com/nightly/android/latest/armeabi-v7a/"`
		`+ +#define DEFAULT_BUILDBOT_SERVER_URL ""`
		`+ #elif defined(ANDROID_ARM)`
		`+ -#define DEFAULT_BUILDBOT_SERVER_URL "http://buildbot.libretro.com/nightly/android/latest/armeabi/"`
		`+ +#define DEFAULT_BUILDBOT_SERVER_URL ""`
		`+ #elif defined(ANDROID_AARCH64)`
		`+ -#define DEFAULT_BUILDBOT_SERVER_URL "http://buildbot.libretro.com/nightly/android/latest/arm64-v8a/"`
		`+ +#define DEFAULT_BUILDBOT_SERVER_URL ""`
		`+ #elif defined(ANDROID_X86)`
		`+ -#define DEFAULT_BUILDBOT_SERVER_URL "http://buildbot.libretro.com/nightly/android/latest/x86/"`
		`+ +#define DEFAULT_BUILDBOT_SERVER_URL ""`
		`+ #elif defined(ANDROID_X64)`
		`+ -#define DEFAULT_BUILDBOT_SERVER_URL "http://buildbot.libretro.com/nightly/android/latest/x86_64/"`
		`+ +#define DEFAULT_BUILDBOT_SERVER_URL ""`
		`+ #else`
		`+ #define DEFAULT_BUILDBOT_SERVER_URL ""`
		`+ #endif`
		`+ #elif defined(__QNX__)`
		`+ -#define DEFAULT_BUILDBOT_SERVER_URL "http://buildbot.libretro.com/nightly/blackberry/latest/"`
		`+ +#define DEFAULT_BUILDBOT_SERVER_URL ""`
		`+ #elif defined(IOS)`
		`+ -#define DEFAULT_BUILDBOT_SERVER_URL "http://buildbot.libretro.com/nightly/apple/ios/latest/"`
		`+ +#define DEFAULT_BUILDBOT_SERVER_URL ""`
		`+ #elif defined(OSX)`
		`+ #if defined(__x86_64__)`
		`+ -#define DEFAULT_BUILDBOT_SERVER_URL "http://buildbot.libretro.com/nightly/apple/osx/x86_64/latest/"`
		`+ +#define DEFAULT_BUILDBOT_SERVER_URL ""`
		`+ #elif defined(__i386__) \|\| defined(__i486__) \|\| defined(__i686__)`
		`+ -#define DEFAULT_BUILDBOT_SERVER_URL "http://bot.libretro.com/nightly/apple/osx/x86/latest/"`
		`+ +#define DEFAULT_BUILDBOT_SERVER_URL ""`
		`+ #elif defined(__aarch64__)`
		`+ -#define DEFAULT_BUILDBOT_SERVER_URL "http://buildbot.libretro.com/nightly/apple/osx/arm64/latest/"`
		`+ +#define DEFAULT_BUILDBOT_SERVER_URL ""`
		`+ #else`
		`+ -#define DEFAULT_BUILDBOT_SERVER_URL "http://buildbot.libretro.com/nightly/apple/osx/ppc/latest/"`
		`+ +#define DEFAULT_BUILDBOT_SERVER_URL ""`
		`+ #endif`
		`+ #elif defined(_WIN32) && !defined(_XBOX)`
		`+ #if _MSC_VER >= 1910`
		`+ #ifndef __WINRT__`
		`+ #if defined(__x86_64__) \|\| defined(_M_X64)`
		`+ -#define DEFAULT_BUILDBOT_SERVER_URL "http://buildbot.libretro.com/nightly/windows-msvc2017-desktop/x64/latest/"`
		`+ +#define DEFAULT_BUILDBOT_SERVER_URL ""`
		`+ #elif defined(__i386__) \|\| defined(__i486__) \|\| defined(__i686__) \|\| defined(_M_IX86) \|\| defined(_M_IA64)`
		`+ -#define DEFAULT_BUILDBOT_SERVER_URL "http://buildbot.libretro.com/nightly/windows-msvc2017-desktop/x86/latest/"`
		`+ +#define DEFAULT_BUILDBOT_SERVER_URL ""`
		`+ #elif defined(__arm__) \|\| defined(_M_ARM)`
		`+ -#define DEFAULT_BUILDBOT_SERVER_URL "http://buildbot.libretro.com/nightly/windows-msvc2017-desktop/arm/latest/"`
		`+ +#define DEFAULT_BUILDBOT_SERVER_URL ""`
		`+ #elif defined(__aarch64__) \|\| defined(_M_ARM64)`
		`+ -#define DEFAULT_BUILDBOT_SERVER_URL "http://buildbot.libretro.com/nightly/windows-msvc2017-desktop/arm64/latest/"`
		`+ +#define DEFAULT_BUILDBOT_SERVER_URL ""`
		`+ #endif`
		`+ #else`
		`+ #if defined(__x86_64__) \|\| defined(_M_X64)`
		`+ -#define DEFAULT_BUILDBOT_SERVER_URL "http://buildbot.libretro.com/nightly/windows-msvc2017-uwp/x64/latest/"`
		`+ +#define DEFAULT_BUILDBOT_SERVER_URL ""`
		`+ #elif defined(__i386__) \|\| defined(__i486__) \|\| defined(__i686__) \|\| defined(_M_IX86) \|\| defined(_M_IA64)`
		`+ -#define DEFAULT_BUILDBOT_SERVER_URL "http://buildbot.libretro.com/nightly/windows-msvc2017-uwp/x86/latest/"`
		`+ +#define DEFAULT_BUILDBOT_SERVER_URL ""`
		`+ #elif defined(__arm__) \|\| defined(_M_ARM)`
		`+ -#define DEFAULT_BUILDBOT_SERVER_URL "http://buildbot.libretro.com/nightly/windows-msvc2017-uwp/arm/latest/"`
		`+ +#define DEFAULT_BUILDBOT_SERVER_URL ""`
		`+ #elif defined(__aarch64__) \|\| defined(_M_ARM64)`
		`+ -#define DEFAULT_BUILDBOT_SERVER_URL "http://buildbot.libretro.com/nightly/windows-msvc2017-uwp/arm64/latest/"`
		`+ +#define DEFAULT_BUILDBOT_SERVER_URL ""`
		`+ #endif`
		`+ #endif`
		`+ #elif _MSC_VER == 1600`
		`+ #if defined(__x86_64__) \|\| defined(_M_X64)`
		`+ -#define DEFAULT_BUILDBOT_SERVER_URL "http://buildbot.libretro.com/nightly/windows-msvc2010/x86_64/latest/"`
		`+ +#define DEFAULT_BUILDBOT_SERVER_URL ""`
		`+ #elif defined(__i386__) \|\| defined(__i486__) \|\| defined(__i686__) \|\| defined(_M_IX86) \|\| defined(_M_IA64)`
		`+ -#define DEFAULT_BUILDBOT_SERVER_URL "http://buildbot.libretro.com/nightly/windows-msvc2010/x86/latest/"`
		`+ +#define DEFAULT_BUILDBOT_SERVER_URL ""`
		`+ #endif`
		`+ #elif _MSC_VER == 1400`
		`+ -#define DEFAULT_BUILDBOT_SERVER_URL "http://buildbot.libretro.com/nightly/windows-msvc2005/x86/latest/"`
		`+ +#define DEFAULT_BUILDBOT_SERVER_URL ""`
		`+ #elif _MSC_VER == 1310`
		`+ -#define DEFAULT_BUILDBOT_SERVER_URL "http://buildbot.libretro.com/nightly/windows-msvc2003/x86/latest/"`
		`+ +#define DEFAULT_BUILDBOT_SERVER_URL ""`
		`+ #else`
		`+ #if defined(__x86_64__) \|\| defined(_M_X64)`
		`+ -#define DEFAULT_BUILDBOT_SERVER_URL "http://buildbot.libretro.com/nightly/windows/x86_64/latest/"`
		`+ +#define DEFAULT_BUILDBOT_SERVER_URL ""`
		`+ #elif defined(__i386__) \|\| defined(__i486__) \|\| defined(__i686__) \|\| defined(_M_IX86) \|\| defined(_M_IA64)`
		`+ -#define DEFAULT_BUILDBOT_SERVER_URL "http://buildbot.libretro.com/nightly/windows/x86/latest/"`
		`+ +#define DEFAULT_BUILDBOT_SERVER_URL ""`
		`+ #endif`
		`+ #endif`
		`+ #elif defined(__linux__)`
		`+ #if defined(__x86_64__)`
		`+ -#define DEFAULT_BUILDBOT_SERVER_URL "http://buildbot.libretro.com/nightly/linux/x86_64/latest/"`
		`+ +#define DEFAULT_BUILDBOT_SERVER_URL ""`
		`+ #elif defined(__i386__) \|\| defined(__i486__) \|\| defined(__i686__)`
		`+ -#define DEFAULT_BUILDBOT_SERVER_URL "http://buildbot.libretro.com/nightly/linux/x86/latest/"`
		`+ +#define DEFAULT_BUILDBOT_SERVER_URL ""`
		`+ #elif defined(__arm__) && __ARM_ARCH == 7 && defined(__ARM_PCS_VFP)`
		`+ -#define DEFAULT_BUILDBOT_SERVER_URL "http://buildbot.libretro.com/nightly/linux/armhf/latest/"`
		`+ +#define DEFAULT_BUILDBOT_SERVER_URL ""`
		`+ #else`
		`+ #define DEFAULT_BUILDBOT_SERVER_URL ""`
		`+ #endif`
		`+ #elif defined(WIIU)`
		`+ -#define DEFAULT_BUILDBOT_SERVER_URL "http://buildbot.libretro.com/nightly/nintendo/wiiu/latest/"`
		`+ +#define DEFAULT_BUILDBOT_SERVER_URL ""`
		`+ #elif defined(HAVE_LIBNX)`
		`+ -#define DEFAULT_BUILDBOT_SERVER_URL "http://buildbot.libretro.com/nightly/nintendo/switch/libnx/latest/"`
		`+ +#define DEFAULT_BUILDBOT_SERVER_URL ""`
		`+ #elif defined(_3DS)`
		`+ #define DEFAULT_BUILDBOT_SERVER_URL envIsHomebrew() ? "http://buildbot.libretro.com/nightly/nintendo/3ds/latest/3dsx/" : "http://buildbot.libretro.com/nightly/nintendo/3ds/latest/cia/"`
		`+ #else`
		`+ #define DEFAULT_BUILDBOT_SERVER_URL ""`
		`+ #endif`
		`+`
		`+ -#define DEFAULT_BUILDBOT_ASSETS_SERVER_URL "http://buildbot.libretro.com/assets/"`
		`+ +#define DEFAULT_BUILDBOT_ASSETS_SERVER_URL ""`
		`+`
		`+ #define DEFAULT_DISCORD_APP_ID "475456035851599874"`
		`+`
		`diff --git a/frontend/drivers/platform_darwin.m b/frontend/drivers/platform_darwin.m`
		`- index a5b01fb67e..6a66752926 100644`
		`+ index 6c5fdca400..6b0dcb3947 100644`
		`--- a/frontend/drivers/platform_darwin.m`
		`+++ b/frontend/drivers/platform_darwin.m`
		`- @@ -475,7 +475,7 @@ static void frontend_darwin_get_env(int argc, char argv[],`
		`+ @@ -460,7 +460,7 @@ static void frontend_darwin_get_env(int argc, char argv[],`
		`int major, minor;`
		`get_ios_version(&major, &minor);`
		`if (major > 8)`
		`@@ -24,11 +166,37 @@`

		`while (!net_http_update(http1, &pos, &tot))`
		`printf("%.9lu / %.9lu \r",pos,tot);`
		`+ diff --git a/qb/config.params.sh b/qb/config.params.sh`
		`+ index f457ae4263..e5c4e03c25 100644`
		`+ --- a/qb/config.params.sh`
		`+ +++ b/qb/config.params.sh`
		`+ @@ -139,9 +139,9 @@ HAVE_7ZIP=yes # Compile in 7z support`
		`+ HAVE_FLAC=auto # Compile in flac support`
		`+ HAVE_DR_MP3=yes # Compile in Dr. MP3 support`
		`+ HAVE_BUILTINFLAC=auto # Bake in flac support`
		`+ -HAVE_ONLINE_UPDATER=yes # Disable the online updater`
		`+ -HAVE_UPDATE_CORES=yes # Disable downloading cores with online updater`
		`+ -HAVE_UPDATE_ASSETS=yes # Disable downloading assets with online updater`
		`+ +HAVE_ONLINE_UPDATER=no # Disable the online updater`
		`+ +HAVE_UPDATE_CORES=no # Disable downloading cores with online updater`
		`+ +HAVE_UPDATE_ASSETS=no # Disable downloading assets with online updater`
		`+ HAVE_PRESERVE_DYLIB=no # Enable dlclose() for Valgrind support`
		`+ HAVE_PARPORT=auto # Parallel port joypad support`
		`+ HAVE_IMAGEVIEWER=yes # Built-in image viewer support.`
		`diff --git a/retroarch.cfg b/retroarch.cfg`
		`- index 21d91ab1ef..fa99900f4d 100644`
		`+ index 416c6c1abb..d574d637f6 100644`
		`--- a/retroarch.cfg`
		`+++ b/retroarch.cfg`
		`- @@ -729,13 +729,13 @@ menu_show_core_updater = false`
		`+ @@ -687,7 +687,7 @@`
		`+ #### Menu`
		`+`
		`+ # If disabled, will hide 'Online Updater' inside the menu.`
		`+ -# menu_show_online_updater = true`
		`+ +menu_show_online_updater = false`
		`+`
		`+ # If disabled, will hide the ability to update cores (and core info files) inside the menu.`
		`+ menu_show_core_updater = false`
		`+ @@ -769,13 +769,13 @@ menu_show_core_updater = false`
		`#### Core Updater`

		`# URL to core update directory on buildbot.`

libre/riscv64-linux-gnu-linux-libre-api-headers/PKGBUILD

file modified

+2 -2

		`@@ -1,6 +1,6 @@`
		`# Maintainer: David P. <megver83@parabola.nu>`
		`- # Maintainer (Arch): Felix Yan <felixonmars@archlinux.org>`
		`- # Contributor (Arch): Anatol Pomozov <anatol.pomozov@gmail.com>`
		`+ # Maintainer (arch): Felix Yan <felixonmars@archlinux.org>`
		`+ # Contributor: Anatol Pomozov <anatol.pomozov@gmail.com>`

		`_target_arch=riscv`
		`_target=riscv64-linux-gnu`

libre/rp-pppoe/PKGBUILD

file modified

+4 -4

		`@@ -1,7 +1,7 @@`
		`- # Maintainer (Arch): Felix Yan <felixonmars@archlinux.org>`
		`- # Contributor (Arch): Daniel Isenmann <daniel@archlinux.org>`
		`- # Contributor (Arch): orelien <aurelien.foret@wanadoo.fr>`
		`- # Maintainer (Hyperbola): André Silva <emulatorman@hyperbola.info>`
		`+ # Maintainer (arch): Felix Yan <felixonmars@archlinux.org>`
		`+ # Contributor: Daniel Isenmann <daniel@archlinux.org>`
		`+ # Contributor: orelien <aurelien.foret@wanadoo.fr>`
		`+ # Contributor: André Silva <emulatorman@hyperbola.info>`
		`# Maintainer: Omar Vega Ramos <ovruni@gnu.org.pe>`

		`# parabola changes and rationale:`

libre/ruby/PKGBUILD

file modified

+207 -34

		`@@ -1,45 +1,48 @@`
		`- # Contributor (Arch): Thomas Dziedzic <gostrc@gmail.com>`
		`- # Contributor (Arch): Allan McRae <allan@archlinux.org>`
		`- # Contributor (Arch): John Proctor <jproctor@prium.net>`
		`- # Contributor (Arch): Jeramy Rutley <jrutley@gmail.com>`
		`-`
		`+ # Maintainer (arch): Anatol Pomozov <anatol.pomozov@gmail.com>`
		`+ # Maintainer (arch): Andreas 'Segaja' Schleifer <segaja at archlinux dot org>`
		`+ # Maintainer (arch): Tim Meusel <tim@bastelfreak.de>`
		`+ # Contributor: Thomas Dziedzic <gostrc@gmail.com>`
		`+ # Contributor: Allan McRae <allan@archlinux.org>`
		`+ # Contributor: John Proctor <jproctor@prium.net>`
		`+ # Contributor: Jeramy Rutley <jrutley@gmail.com>`
		`# Maintainer: Omar Vega Ramos <ovruni@gnu.org.pe>`
		`# Contributor: Daniel Milewski <niitotantei@riseup.net>`
		`# Contributor: André Silva <emulatorman@hyperbola.info>`
		`# Contributor: Luke Shumaker <lukeshu@parabola.nu>`
		`# Contributor: fauno <fauno@parabola.nu>`

		`- # Rationale for inclusion in [libre]: Problematic license of`
		`- # generator.c in bundled json extension.`
		`- #`
		`- # https://labs.parabola.nu/issues/674`
		`- # https://bugs.ruby-lang.org/issues/11844`
		`- # https://github.com/flori/json/issues/277`

		`+ # parabola changes and rationale:`
		`+ # - generator.c in bundled json extension.`
		`+ # https://labs.parabola.nu/issues/674`
		`+ # https://bugs.ruby-lang.org/issues/11844`
		`+ # https://github.com/flori/json/issues/277`

		`- pkgname=(ruby ruby-docs)`
		`- pkgver=3.0.1`
		`- _jsonver=2.5.1`
		`+`
		`+ pkgname=(ruby ruby-docs ruby-stdlib ruby-bundledgems)`
		`+ pkgver=3.0.4`
		`+ pkgrel=17`
		`pkgrel=1`
		`pkgrel+=.parabola1`
		`+ _jsonver=2.5.1`
		`_srcrel=1 # increment this to rebuild the sourceball without bumping pkgver`
		`arch=(x86_64)`
		`- arch+=(i686 armv7h)`
		`+ arch+=(armv7h i686)`
		`url='https://www.ruby-lang.org/en/'`
		`license=(BSD2 custom)`
		`- depends=(libxcrypt)`
		`makedepends=(gdbm openssl libffi doxygen graphviz libyaml ttf-dejavu tk)`
		`- options=(!emptydirs)`
		`- source=(https://cache.ruby-lang.org/pub/ruby/${pkgver:0:3}/ruby-${pkgver}.tar.xz`
		`- json-${_jsonver}.tar.gz::https://github.com/flori/json/archive/v${_jsonver}.tar.gz`
		`+ options=(debug !emptydirs !lto) # Disable LTO until fixes for https://bugs.ruby-lang.org/issues/18062 released`
		`+ source=(https://cache.ruby-lang.org/pub/ruby/${pkgver:0:3}/ruby-${pkgver}.tar.xz)`
		`+ source+=(json-${_jsonver}.tar.gz::https://github.com/flori/json/archive/v${_jsonver}.tar.gz`
		`remove-json-ext.patch`
		`add-json_pure.patch`
		`json-libre.patch)`
		`- sha512sums=('97d2e883656060846b304368d9d836e2f3ef39859c36171c9398a0573818e4ed75bfd7460f901a9553f7f53518c505327a66e74f83704a881469f5ac61fe13d7'`
		`- '4df7ec9b86692376e89c2019c2c1ab3ae9af28fb4742864acc6f985c0551fc10795742cc1124d6435e820617c00d4c5f4aa6c83b21d2fff43ed05cd9d0a89087'`
		`- 'e3cb4d17872d69d7bc2697b751e27c7f76edbf996f4e3007241cd8a60d2251056cf8dd858f249c0b28088da5b969c63bc5c0d52eef9c95e52e190234d3e46609'`
		`- 'c3933f1c6d7ddf669e0cfd8ffdd60abeb59a10bdfcab05a1c1b826ab65bed7019df85c15dd8af0b127a5728d5f6c322fcd724e0b9ecf0d9cdb5d28956050cc9a'`
		`- 'bb2cc232a0b096a3c40e219258aaa008183ed9a1f8b3bfd5f84680809f4b60e659f02e1db24480b30e6f11ad726b258da9dab17462621e8bfb8f9b6ed98dfbfd')`
		`+ sha512sums=('53bf7dd403b0c68af9691882ad8ed7422c8d1f496627428fb4c3caf0b0313715524b744c5f453aced2d49e16e55f3f45b46b9a77aa3097dbfcae7caa0208194b')`
		`+ sha512sums+=('4df7ec9b86692376e89c2019c2c1ab3ae9af28fb4742864acc6f985c0551fc10795742cc1124d6435e820617c00d4c5f4aa6c83b21d2fff43ed05cd9d0a89087'`
		`+ 'e3cb4d17872d69d7bc2697b751e27c7f76edbf996f4e3007241cd8a60d2251056cf8dd858f249c0b28088da5b969c63bc5c0d52eef9c95e52e190234d3e46609'`
		`+ 'c3933f1c6d7ddf669e0cfd8ffdd60abeb59a10bdfcab05a1c1b826ab65bed7019df85c15dd8af0b127a5728d5f6c322fcd724e0b9ecf0d9cdb5d28956050cc9a'`
		`+ 'bb2cc232a0b096a3c40e219258aaa008183ed9a1f8b3bfd5f84680809f4b60e659f02e1db24480b30e6f11ad726b258da9dab17462621e8bfb8f9b6ed98dfbfd')`
		`+`

		`prepare() {`
		`cd "$srcdir/json-${_jsonver}"`
		`@@ -92,7 +95,7 @@`

		`package_ruby() {`
		`pkgdesc='An object-oriented language for quick and easy programming'`
		`- depends=(gdbm openssl libffi libyaml gmp zlib rubygems ruby-irb)`
		`+ depends=(gdbm openssl libffi libyaml libxcrypt gmp zlib rubygems ruby-stdlib ruby-bundledgems)`
		`optdepends=(`
		`'ruby-docs: Ruby documentation'`
		`'tk: for Ruby/TK'`
		`@@ -112,20 +115,14 @@`
		`rm "${pkgdir}"/usr/bin/gem`

		`# remove bundler as it shipped as a separate package`
		`- rm -r "${pkgdir}"/usr/lib/ruby/${rubyver}/{bundler,bundler.rb}`
		`rm "${pkgdir}"/usr/bin/{bundle,bundler}`
		`- rm "${pkgdir}"/usr/lib/ruby/gems/${rubyver}/specifications/default/bundler-*.gemspec`

		`# remove bundled rdoc gem`
		`- rm -r "${pkgdir}"/usr/lib/ruby/${rubyver}/{rdoc,rdoc.rb}`
		`rm "${pkgdir}"/usr/bin/{rdoc,ri}`
		`- rm "${pkgdir}"/usr/lib/ruby/gems/${rubyver}/specifications/default/rdoc-*.gemspec`
		`rm "${pkgdir}"/usr/share/man/man1/ri.1`

		`# remove irb as it is a separate package now`
		`- rm -r "${pkgdir}"/usr/lib/ruby/${rubyver}/{irb,irb.rb}`
		`rm "${pkgdir}"/usr/bin/irb`
		`- rm "${pkgdir}"/usr/lib/ruby/gems/${rubyver}/specifications/default/irb-*.gemspec`
		`rm "${pkgdir}"/usr/share/man/man1/irb.1`

		`# remove other binaries that are shipped as separate packages`
		`@@ -136,6 +133,72 @@`
		`rm -r "${pkgdir}"/usr/lib/ruby/gems/${rubyver}/gems/*`
		`rm "${pkgdir}"/usr/lib/ruby/gems/${rubyver}/specifications/*.gemspec`
		`rm "${pkgdir}"/usr/lib/ruby/gems/${rubyver}/cache/*.gem`
		`+`
		`+ # remove already packaged stdlib gems (needs to be as dependency in ruby-stdlib)`
		`+ local stdlib_gems=(`
		`+ abbrev`
		`+ base64`
		`+ benchmark`
		`+ bigdecimal`
		`+ bundler`
		`+ cgi`
		`+ csv`
		`+ date`
		`+ delegate`
		`+ did_you_mean`
		`+ digest`
		`+ drb`
		`+ english`
		`+ erb`
		`+ etc`
		`+ fcntl`
		`+ fiddle`
		`+ fileutils`
		`+ find`
		`+ forwardable`
		`+ getoptlong`
		`+ io-console`
		`+ io-nonblock`
		`+ io-wait`
		`+ ipaddr`
		`+ irb`
		`+ json`
		`+ logger`
		`+ mutex_m`
		`+ net-http`
		`+ open-uri`
		`+ psych`
		`+ rdoc`
		`+ reline`
		`+ stringio`
		`+ time`
		`+ tmpdir`
		`+ uri`
		`+ )`
		`+`
		`+ for stdlib_gem in "${stdlib_gems[@]}"; do`
		`+ rm --force --recursive --verbose \`
		`+ "${pkgdir}"/usr/lib/ruby/${rubyver}/${stdlib_gem} \`
		`+ "${pkgdir}"/usr/lib/ruby/${rubyver}/${stdlib_gem}.rb \`
		`+ "${pkgdir}"/usr/lib/ruby/${rubyver}/-linux/${stdlib_gem}.so \`
		`+ "${pkgdir}"/usr/lib/ruby/gems/${rubyver}/specifications/default/${stdlib_gem}-*.gemspec`
		`+ done`
		`+`
		`+ touch "$(ls -d "${pkgdir}"/usr/lib/ruby/${rubyver}/-linux)"/json # kludge to minimize the diff below`
		`+`
		`+ rm --recursive --verbose \`
		`+ "${pkgdir}"/usr/lib/ruby/${rubyver}/English.rb \`
		`+ "${pkgdir}"/usr/lib/ruby/${rubyver}/io/console \`
		`+ "${pkgdir}"/usr/lib/ruby/${rubyver}/net/http \`
		`+ "${pkgdir}"/usr/lib/ruby/${rubyver}/net/http.rb \`
		`+ "${pkgdir}"/usr/lib/ruby/${rubyver}/net/https.rb \`
		`+ "${pkgdir}"/usr/lib/ruby/${rubyver}/-linux/cgi \`
		`+ "${pkgdir}"/usr/lib/ruby/${rubyver}/-linux/date_core.so \`
		`+ "${pkgdir}"/usr/lib/ruby/${rubyver}/-linux/digest \`
		`+ "${pkgdir}"/usr/lib/ruby/${rubyver}/-linux/io/console.so \`
		`+ "${pkgdir}"/usr/lib/ruby/${rubyver}/-linux/io/nonblock.so \`
		`+ "${pkgdir}"/usr/lib/ruby/${rubyver}/-linux/io/wait.so \`
		`+ "${pkgdir}"/usr/lib/ruby/${rubyver}/-linux/json`
		`}`

		`package_ruby-docs() {`
		`@@ -147,8 +210,118 @@`

		`install -D -m644 COPYING "${pkgdir}/usr/share/licenses/ruby-docs/LICENSE"`
		`install -D -m644 BSDL "${pkgdir}/usr/share/licenses/ruby-docs/BSDL"`
		`+ }`
		`+`
		`+ package_ruby-stdlib() {`
		`+ # upstream list of gems contained in stdlib ( https://github.com/ruby/ruby/tree/master/{ext,lib} )`
		`+ pkgdesc='A vast collection of classes and modules that you can require in your code for additional features'`
		`+`
		`+ depends=(`
		`+ ruby-abbrev`
		`+ ruby-base64`
		`+ ruby-benchmark`
		`+ ruby-bigdecimal`
		`+ ruby-bundler`
		`+ ruby-cgi`
		`+ ruby-csv`
		`+ ruby-date`
		`+ #ruby-dbm # removed in 3.1.2`
		`+ #ruby-debug # removed in 3.1.2`
		`+ ruby-delegate`
		`+ ruby-did_you_mean`
		`+ ruby-digest`
		`+ ruby-drb`
		`+ ruby-english`
		`+ ruby-erb`
		`+ ruby-etc`
		`+ ruby-fcntl`
		`+ ruby-fiddle`
		`+ ruby-fileutils`
		`+ ruby-find`
		`+ ruby-forwardable`
		`+ #ruby-gdbm # removed in 3.1.2`
		`+ ruby-getoptlong`
		`+ ruby-io-console`
		`+ ruby-io-nonblock`
		`+ ruby-io-wait`
		`+ ruby-ipaddr`
		`+ ruby-irb`
		`+ ruby-json`
		`+ ruby-logger`
		`+ #ruby-matrix # removed in 3.1.2`
		`+ ruby-mutex_m`
		`+ #ruby-net-ftp # removed in 3.1.2`
		`+ ruby-net-http`
		`+ #ruby-net-imap # removed in 3.1.2`
		`+ #ruby-net-pop # removed in 3.1.2`
		`+ #ruby-net-protocol`
		`+ #ruby-net-smtp # removed in 3.1.2`
		`+ #ruby-nkf`
		`+ #ruby-observer`
		`+ ruby-open-uri`
		`+ #ruby-open3`
		`+ #ruby-openssl`
		`+ #ruby-optparse`
		`+ #ruby-ostruct`
		`+ #ruby-pathname`
		`+ #ruby-pp`
		`+ #ruby-prettyprint`
		`+ #ruby-prime # removed in 3.1.2`
		`+ #ruby-pstore`
		`+ ruby-psych`
		`+ #ruby-racc`
		`+ ruby-rdoc`
		`+ #ruby-readline`
		`+ #ruby-readline-ext`
		`+ ruby-reline`
		`+ #ruby-resolv`
		`+ #ruby-resolv-replace`
		`+ #ruby-rinda`
		`+ #ruby-securerandom`
		`+ #ruby-set`
		`+ #ruby-shellwords`
		`+ #ruby-singleton`
		`+ ruby-stringio`
		`+ #ruby-strscan`
		`+ #ruby-syslog`
		`+ #ruby-tempfile`
		`+ ruby-time`
		`+ #ruby-timeout`
		`+ ruby-tmpdir`
		`+ #ruby-tracer # removed in 3.1.2`
		`+ #ruby-tsort`
		`+ #ruby-un`
		`+ ruby-uri`
		`+ #ruby-weakref`
		`+ #ruby-yaml`
		`+ #ruby-zlib`

		`- # sometimes it installs ruby/capi/doxygen_objdb_XXXXXXX.tmp;`
		`- # otherwise /usr/share/doc is empty`
		`- rm -rf "$pkgdir/usr/share/doc"`
		`+ #ruby-error_highlight # new in 3.2.1`
		`+ #ruby2_keywords # new in 3.1.2 - already exists in [community]`
		`+ )`
		`+ }`
		`+`
		`+ package_ruby-bundledgems() {`
		`+ # upstream list of bundled gems ( https://github.com/ruby/ruby/blob/master/gems/bundled_gems )`
		`+ pkgdesc='Ruby Gems (third-party libraries) that are installed by default when Ruby is installed'`
		`+`
		`+ depends=(`
		`+ ruby-minitest`
		`+ ruby-power_assert`
		`+ ruby-rake`
		`+ #ruby-rbs`
		`+ ruby-rexml`
		`+ #ruby-rss`
		`+ ruby-test-unit`
		`+ #ruby-typeprof`
		`+`
		`+ # --- new in 3.1.2`
		`+ #ruby-debug`
		`+ #ruby-matrix`
		`+ #ruby-net-ftp`
		`+ #ruby-net-imap`
		`+ #ruby-net-pop`
		`+ #ruby-net-smtp`
		`+ #ruby-prime`
		`+ )`
		`}`

libre/ruby2.7/PKGBUILD

file modified

+1 -1

		`@@ -1,4 +1,4 @@`
		`- # Contributor (arch): Thomas Dziedzic <gostrc@gmail.com>`
		`+ # Contributor: Thomas Dziedzic <gostrc@gmail.com>`
		`# Contributor: Allan McRae <allan@archlinux.org>`
		`# Contributor: John Proctor <jproctor@prium.net>`
		`# Contributor: Jeramy Rutley <jrutley@gmail.com>`

libre/rz-cutter/PKGBUILD

file modified

+22 -20

		`@@ -4,40 +4,41 @@`
		`# Maintainer: bill-auger <bill-auger@programmer.net>`

		`pkgname=rz-cutter`
		`- _gitcommit=6dab092b515024ba769e81554c91c0d8b9883264`
		`- pkgver=2.0.3`
		`- pkgrel=2`
		`+ _upstream_name=cutter`
		`+ pkgver=2.1.2`
		`+ pkgrel=1`
		`pkgrel+=.parabola1`
		`pkgdesc='Qt and C++ GUI for rizin reverse engineering framework'`
		`url='https://github.com/rizinorg/cutter'`
		`arch=('x86_64')`
		`arch+=('armv7h' 'i686')`
		`license=('GPL3')`
		`- depends=('rizin' 'capstone' 'qt5-base' 'qt5-svg' 'qt5-webengine' 'icu' 'python' 'jupyter'`
		`+ depends=('rizin' 'capstone' 'qt5-base' 'qt5-svg' 'qt5-webengine' 'icu' 'python'`
		`'pyside2' 'python-shiboken2' 'graphviz' 'gcc-libs' 'syntax-highlighting')`
		`depends=( ${depends[@]/qt5-webengine/} )`
		`makedepends=('git' 'cmake' 'ninja' 'shiboken2' 'qt5-tools')`
		`+ makedepends=( ${makedepends[*]/git/} )`
		`+ [[ "${CARCH}" == i686 ]] && makedepends+=( llvm13 ) # /usr/bin/shiboken2: error while loading shared libraries: libLLVM-13.so: cannot open shared object file: No such file or directory`
		`+ [[ "${CARCH}" == i686 ]] && makedepends=( ${makedepends[*]/rizin/rizin=0.4.0} ) # CMake Error at CMakeLists.txt:54 (find_package): Could not find a package configuration file provided by "Rizin" with any of`
		`+ # FTBS armv7h and i686 - /usr/include/librz/rz_util/../rz_types.h:10:10: fatal error: 'stddef.h' file not found`
		`optdepends=('rz-ghidra: ghidra decompiler plugin')`
		`- source=("git+https://github.com/rizinorg/cutter#commit=${_gitcommit}"`
		`- "git+https://github.com/rizinorg/cutter-translations")`
		`- sha512sums=('SKIP'`
		`- 'SKIP')`
		`- b2sums=('SKIP'`
		`- 'SKIP')`
		`-`
		`- pkgver() {`
		`- cd cutter`
		`- git describe --tags --match 'v' \| sed 's/^v//;s/$[^-]-g$/r\1/;s/-/./g'`
		`- }`
		`+ source=(${_upstream_name}-${pkgver}.tar.gz::https://github.com/rizinorg/${_upstream_name}/archive/refs/tags/v${pkgver}.tar.gz`
		`+ ${_upstream_name}-translations-git.tar.gz::https://github.com/rizinorg/${_upstream_name}-translations/archive/refs/heads/master.tar.gz)`
		`+ sha512sums=('0a8e2443c149e4d81d8e91bdf209420ad0a13bcb072c5a41c4d20bc5ea91ff62793cebd7c1aa0c37699c2653cc868598b5fb6d6b45db88c093c96ef672016dcf'`
		`+ '4cc46a1b79aca9fe0a8d5983ef85d11ff25648f5138156aa729255147e60d8e66f5546134dfd3fc96e24c4080a0001fe429785cdd813079c247e3ad315865c6e')`
		`+ b2sums=('bd36e2d2b4db044fee2df97eb4a1e8950b68673b59c5eb91435c5d36a47b4ada9122868c019adec7255421fc3de0c44d1ab260cbdd16e24d5fb129c589686b8d'`
		`+ 'f11e955d6ce2940e69433a96187116504c59306aad2edd8931d6593aa8b576d430b01cce5b6ca4497afad92455f4e830d0bf85e2eae8cb5de426f0b8c048193f')`

		`prepare() {`
		`- cd cutter`
		`- git config 'submodule.src/translations.url' "${srcdir}/cutter-translations"`
		`- git submodule update --init src/translations`
		`+ cd ${_upstream_name}-${pkgver}/`
		`+`
		`+ rmdir src/translations`
		`+ cp -a "${srcdir}"/${_upstream_name}-translations-master src/translations`
		`}`

		`build() {`
		`- cd cutter`
		`+ cd ${_upstream_name}-${pkgver}/`
		`+`
		`cmake -B build \`
		`-DCMAKE_INSTALL_PREFIX=/usr \`
		`-DCMAKE_BUILD_TYPE=None \`
		`@@ -53,7 +54,8 @@`
		`}`

		`package() {`
		`- cd cutter`
		`+ cd ${_upstream_name}-${pkgver}/`
		`+`
		`DESTDIR="${pkgdir}" ninja -C build install`
		`install -d "${pkgdir}/usr/share/doc/${pkgname}"`
		`cp -a docs/* "${pkgdir}/usr/share/doc/${pkgname}"`

libre/sensors-applet/PKGBUILD

file modified

+1 -1

		`@@ -1,4 +1,4 @@`
		`- # Maintainer (Arch): Balló György <ballogyor+arch at gmail dot com>`
		`+ # Maintainer (arch): Balló György <ballogyor+arch at gmail dot com>`
		`# Maintainer: Omar Vega Ramos <ovruni@gnu.org.pe>`

		`pkgname=sensors-applet`

libre/sh-elf-binutils/PKGBUILD

file modified

+5 -6

		`@@ -2,18 +2,17 @@`

		`_target=sh-elf`
		`pkgname=$_target-binutils`
		`- pkgver=2.37`
		`+ pkgver=2.39`
		`pkgrel=1`
		`pkgdesc='A set of programs to assemble and manipulate binary and object files for the SuperH (bare-metal) target'`
		`- arch=('x86_64' 'i686' 'armv7h')`
		`+ arch=(x86_64 i686 armv7h)`
		`url='http://www.gnu.org/software/binutils/'`
		`license=(GPL)`
		`- depends=(zlib)`
		`+ depends=(zlib libelf)`
		`source=(https://ftp.gnu.org/gnu/binutils/binutils-$pkgver.tar.bz2{,.sig})`
		`- sha512sums=('b3f5184697f77e94c95d48f6879de214eb5e17aa6ef8e96f65530d157e515b1ae2f290e98453e4ff126462520fa0f63852b6e1c8fbb397ed2e41984336bc78c6'`
		`+ sha512sums=('faa592dd48fc715901ad704ac96dbd34b1792c51e77c7a92a387964b0700703c74be07de45cc4751945c8c0674368c73dc17bbc563d1d2cd235b5ebd8c6e7efb'`
		`'SKIP')`
		`- validpgpkeys=('EAF1C276A747E9ED86210CBAC3126D3B4AE55E93' # Tristan Gingold <gingold@adacore.com>`
		`- '3A24BC1E8FB409FA9F14371813FCEF89DD9E3C4F') # Nick Clifton (Chief Binutils Maintainer) <nickc@redhat.com>`
		`+ validpgpkeys=('3A24BC1E8FB409FA9F14371813FCEF89DD9E3C4F') # Nick Clifton (Chief Binutils Maintainer) <nickc@redhat.com>`

		`prepare() {`
		`cd binutils-$pkgver`

libre/shntool/PKGBUILD

file removed

-46

		`@@ -1,46 +0,0 @@`
		`- # Maintainer (Arch): schuay <jakob.gruber@gmail.com>`
		`- # Contributor (Arch): Michal Hybner <dta081@gmail.com>`
		`- # Maintainer: Omar Vega Ramos <ovruni@gnu.org.pe>`
		`-`
		`- pkgname=shntool`
		`- pkgver=3.0.10`
		`- pkgrel=5`
		`- pkgrel+=.parabola1`
		`- pkgdesc="A multi-purpose WAVE data processing and reporting utility"`
		`- pkgdesc+=", without nonfree mac recommendation"`
		`- arch=('x86_64')`
		`- arch+=('i686' 'armv7h')`
		`- url="http://shnutils.freeshell.org/shntool/"`
		`- license=('GPL')`
		`- options=(!emptydirs)`
		`- depends=('glibc')`
		`- optdepends=('flac: support for flac format'`
		`- 'wavpack: support for wv format')`
		`- source=("http://shnutils.freeshell.org/shntool/dist/src/${pkgname}-${pkgver}.tar.gz"`
		`- 'shntool-3.0.10-large-size.diff'`
		`- 'shntool-3.0.10-large-times.diff')`
		`-`
		`- # Patches taken from https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=684600`
		`-`
		`- prepare() {`
		`- cd "${srcdir}"/${pkgname}-${pkgver}`
		`- patch -Np1 < "${srcdir}/shntool-3.0.10-large-size.diff"`
		`- patch -Np1 < "${srcdir}/shntool-3.0.10-large-times.diff"`
		`- }`
		`-`
		`- build() {`
		`- cd "${srcdir}"/${pkgname}-${pkgver}`
		`- ./configure --prefix=/usr`
		`- make`
		`- }`
		`-`
		`- package() {`
		`- cd "${srcdir}"/${pkgname}-${pkgver}`
		`- make DESTDIR="${pkgdir}" install`
		`- }`
		`-`
		`- md5sums=('5d41f8f42c3c15e3145a7a43539c3eae'`
		`- '4265935ef1d684a4b49041278ffda7de'`
		`- '6f0d61ddbf8cbee5c0b51a99e987ddda')`
		`-`
		`- # vim:set ts=2 sw=2 et:`

libre/shntool/shntool-3.0.10-large-size.diff

file removed

-22

		`@@ -1,22 +0,0 @@`
		`- diff -aur shntool-3.0.10-clean/src/core_fileio.c shntool-3.0.10-size/src/core_fileio.c`
		`- --- shntool-3.0.10-clean/src/core_fileio.c 2009-03-11 17:18:01.000000000 +0000`
		`- +++ shntool-3.0.10-size/src/core_fileio.c 2012-08-11 17:20:14.000000000 +0100`
		`- @@ -110,10 +110,16 @@`
		`- buf[4] = 0;`
		`-`
		`- if (be_val)`
		`- - *be_val = (buf[0] << 24) \| (buf[1] << 16) \| (buf[2] << 8) \| buf[3];`
		`- + *be_val = (((unsigned long)buf[0]) << 24)`
		`- + \| (((unsigned long)buf[1]) << 16)`
		`- + \| (((unsigned long)buf[2]) << 8)`
		`- + \| ((unsigned long)buf[3]);`
		`-`
		`- if (le_val)`
		`- - *le_val = (buf[3] << 24) \| (buf[2] << 16) \| (buf[1] << 8) \| buf[0];`
		`- + *le_val = (((unsigned long)buf[3]) << 24)`
		`- + \| (((unsigned long)buf[2]) << 16)`
		`- + \| (((unsigned long)buf[1]) << 8)`
		`- + \| ((unsigned long)buf[0]);`
		`-`
		`- if (tag_val)`
		`- tagcpy(tag_val,buf);`

libre/shntool/shntool-3.0.10-large-times.diff

file removed

-39

		`@@ -1,39 +0,0 @@`
		`- diff -aur shntool-3.0.10-clean/src/core_mode.c shntool-3.0.10/src/core_mode.c`
		`- --- shntool-3.0.10-clean/src/core_mode.c 2009-03-30 06:55:33.000000000 +0100`
		`- +++ shntool-3.0.10/src/core_mode.c 2012-08-11 16:37:58.000000000 +0100`
		`- @@ -310,8 +310,8 @@`
		`- if (sec >= 60)`
		`- st_error("invalid value for seconds: [%d]",sec);`
		`-`
		`- - bytes = (wlong)(min * info->rate * 60) +`
		`- - (wlong)(sec * info->rate);`
		`- + bytes = (((wlong)min) * info->rate * 60) +`
		`- + (((wlong)sec) * info->rate);`
		`-`
		`- return bytes;`
		`- }`
		`- @@ -358,9 +358,9 @@`
		`- if (frames >= 75)`
		`- st_error("invalid value for frames: [%d]",frames);`
		`-`
		`- - bytes = (wlong)(min * CD_RATE * 60) +`
		`- - (wlong)(sec * CD_RATE) +`
		`- - (wlong)(frames * CD_BLOCK_SIZE);`
		`- + bytes = (((wlong)min) * CD_RATE * 60) +`
		`- + (((wlong)sec) * CD_RATE) +`
		`- + (((wlong)frames) * CD_BLOCK_SIZE);`
		`-`
		`- return bytes;`
		`- }`
		`- @@ -403,8 +403,8 @@`
		`-`
		`- nearest_byte = (int)((((double)ms * (double)info->rate) / 1000.0) + 0.5);`
		`-`
		`- - bytes = (wlong)(min * info->rate * 60) +`
		`- - (wlong)(sec * info->rate);`
		`- + bytes = (((wlong)min) * info->rate * 60) +`
		`- + (((wlong)sec) * info->rate);`
		`-`
		`- if (PROB_NOT_CD(info)) {`
		`- bytes += nearest_byte;`
		`-`

libre/smplayer/PKGBUILD

file modified

+5 -5

		`@@ -1,8 +1,8 @@`
		`- # Maintainer (Arch): Levente Polyak <anthraxx[at]archlinux[dot]org>`
		`- # Contributor (Arch): Ionut Biru <ibiru@archlinux.org>`
		`- # Contributor (Arch): Allan McRae <allan@archlinux.org>`
		`- # Contributor (Arch): Alessio 'mOLOk' Bolognino <themolok@gmail.com>`
		`- # Contributor (Arch): shamrok <szamrok@gmail.com>`
		`+ # Maintainer (arch): Levente Polyak <anthraxx[at]archlinux[dot]org>`
		`+ # Contributor: Ionut Biru <ibiru@archlinux.org>`
		`+ # Contributor: Allan McRae <allan@archlinux.org>`
		`+ # Contributor: Alessio 'mOLOk' Bolognino <themolok@gmail.com>`
		`+ # Contributor: shamrok <szamrok@gmail.com>`
		`# Maintainer: Omar Vega Ramos <ovruni@gnu.org.pe>`
		`# Contributor: Andreas Grapentin <andreas@grapentin.org>`
		`# Contributor: André Silva <emulatorman@hyperbola.info>`

libre/soundkonverter/PKGBUILD

file modified

+4 -4

		`@@ -1,8 +1,8 @@`
		`# $Id$`
		`- # Maintainer (Arch): Lukas Jirkovsky <l.jirkovsky@gmail.com>`
		`- # Contributor (Arch): Mateusz Herych <heniekk@gmail.com>`
		`- # Contributor (Arch): Eric Belanger <eric@archlinux.org>`
		`- # Contributor (Arch): Darwin Bautista <djclue917@gmail.com>`
		`+ # Maintainer (arch): Lukas Jirkovsky <l.jirkovsky@gmail.com>`
		`+ # Contributor: Mateusz Herych <heniekk@gmail.com>`
		`+ # Contributor: Eric Belanger <eric@archlinux.org>`
		`+ # Contributor: Darwin Bautista <djclue917@gmail.com>`
		`# Contributor: André Silva <emulatorman@hyperbola.info>`

		`pkgname=soundkonverter`

libre/syslinux/PKGBUILD

file modified

+5 -5

		`@@ -1,8 +1,8 @@`
		`- # Maintainer (Arch): Tobias Powalowski <tpowa@archlinux.org>`
		`- # Maintainer (Arch): Thomas Bächler <thomas@archlinux.org>`
		`- # Maintainer (Arch): Anatol Pomozov <anatol.pomozov@gmail.com>`
		`- # Contributor (Arch): Keshav Amburay <(the ddoott ridikulus ddoott rat) (aatt) (gemmaeiil) (ddoott) (ccoomm)>`
		`- # Maintainer (Hyperbola): André Silva <emulatorman@hyperbola.info>`
		`+ # Maintainer (arch): Tobias Powalowski <tpowa@archlinux.org>`
		`+ # Maintainer (arch): Thomas Bächler <thomas@archlinux.org>`
		`+ # Maintainer (arch): Anatol Pomozov <anatol.pomozov@gmail.com>`
		`+ # Contributor: Keshav Amburay <(the ddoott ridikulus ddoott rat) (aatt) (gemmaeiil) (ddoott) (ccoomm)>`
		`+ # Contributor: André Silva <emulatorman@hyperbola.info>`
		`# Maintainer: Omar Vega Ramos <ovruni@gnu.org.pe>`

		`pkgname=syslinux`

libre/systemd/0001-FSDG-man-Refer-to-the-operating-system-as-GNU-Linux.patch

file modified

+16 -19

		`@@ -155,16 +155,16 @@`
		`expose DNSSEC validation status information however, and is synchronous only. This API is backed by the`
		`glibc Name Service Switch`
		`(<citerefentry project='man-pages'><refentrytitle>nss</refentrytitle><manvolnum>5</manvolnum></citerefentry>).`
		`- @@ -227,7 +227,7 @@`
		`+ @@ -315,7 +315,7 @@`
		`<itemizedlist>`
		`<listitem><para><command>systemd-resolved</command> maintains the`
		`<filename>/run/systemd/resolve/stub-resolv.conf</filename> file for compatibility with traditional`
		`- - Linux programs. This file may be symlinked from <filename>/etc/resolv.conf</filename>. This file lists`
		`- + GNU/Linux programs. This file may be symlinked from <filename>/etc/resolv.conf</filename>. This file lists`
		`- the 127.0.0.53 DNS stub (see above) as the only DNS server. It also contains a list of search domains`
		`- that are in use by systemd-resolved. The list of search domains is always kept up-to-date. Note that`
		`- <filename>/run/systemd/resolve/stub-resolv.conf</filename> should not be used directly by applications,`
		`- @@ -243,7 +243,7 @@`
		`+ - Linux programs. This file lists the 127.0.0.53 DNS stub (see above) as the only DNS server. It also`
		`+ + GNU/Linux programs. This file lists the 127.0.0.53 DNS stub (see above) as the only DNS server. It also`
		`+ contains a list of search domains that are in use by systemd-resolved. The list of search domains is`
		`+ always kept up-to-date. Note that <filename>/run/systemd/resolve/stub-resolv.conf</filename> should not`
		`+ be used directly by applications, but only through a symlink from`
		`+ @@ -331,7 +331,7 @@`
		`</para></listitem>`

		`<listitem><para><command>systemd-resolved</command> maintains the`
		`@@ -212,18 +212,15 @@`
		`boot (as PID 1), it acts as init system that brings up and maintains userspace services. Separate`
		`instances are started for logged-in users to start their services.</para>`

		`- @@ -703,9 +703,9 @@`
		`- <title>Kernel Command Line</title>`
		`-`
		`- <para>When run as the system instance systemd parses a number of options listed below. They can be`
		`- - specified as kernel command line arguments<footnote><para>If run inside a Linux container these arguments`
		`- + specified as kernel command line arguments<footnote><para>If run inside a container these arguments`
		`- may be passed as command line arguments to systemd itself, next to any of the command line options listed`
		`- - in the Options section above. If run outside of Linux containers, these arguments are parsed from`
		`- + in the Options section above. If run outside of containers, these arguments are parsed from`
		`- <filename>/proc/cmdline</filename> instead.</para></footnote>, or through the`
		`- <literal>SystemdOptions</literal> EFI variable (on EFI systems). The kernel command line has higher`
		`- priority. Following variables are understood:</para>`
		`+ @@ -744,7 +744,7 @@`
		`+`
		`+ <para>When run as the system instance, systemd parses a number of options listed below. They can be`
		`+ specified as kernel command line arguments which are parsed from a number of sources depending on the`
		`+ - environment in which systemd is executed. If run inside a Linux container, these options are parsed from`
		`+ + environment in which systemd is executed. If run inside a container, these options are parsed from`
		`+ the command line arguments passed to systemd itself, next to any of the command line options listed in`
		`+ the Options section above. If run outside of Linux containers, these arguments are parsed from`
		`+ <filename>/proc/cmdline</filename> and from the <literal>SystemdOptions</literal> EFI variable`

		`--`
		`2.18.0`

libre/systemd/0001-Use-Arch-Linux-device-access-groups.patch

file modified

+35 -30

		`@@ -1,7 +1,10 @@`
		`- From f7d07e298c819a81eab965efbdbf53a2ce67fc0e Mon Sep 17 00:00:00 2001`
		`+ From 0e8c18bc2639da328274d02d9222ee2c1f6bf696 Mon Sep 17 00:00:00 2001`
		`From: "Jan Alexander Steffens (heftig)" <jan.steffens@gmail.com>`
		`Date: Tue, 6 Mar 2018 23:39:47 +0100`
		`Subject: [PATCH] Use Arch Linux' device access groups`
		`+ MIME-Version: 1.0`
		`+ Content-Type: text/plain; charset=UTF-8`
		`+ Content-Transfer-Encoding: 8bit`

		`cdrom → optical`
		`dialout → uucp`
		`@@ -14,10 +17,10 @@`
		`4 files changed, 19 insertions(+), 19 deletions(-)`

		`diff --git a/meson.build b/meson.build`
		`- index 32e5413a62..f781e06fed 100644`
		`+ index 76ad51d3fb..5cf679b088 100644`
		`--- a/meson.build`
		`+++ b/meson.build`
		`- @@ -796,19 +796,19 @@ conf.set_quoted('NOBODY_GROUP_NAME', nobody_group)`
		`+ @@ -915,19 +915,19 @@ conf.set_quoted('NOBODY_GROUP_NAME', nobody_group)`
		`static_ugids = []`
		`foreach option : ['adm-gid',`
		`'audio-gid',`
		`@@ -41,50 +44,50 @@`
		`'wheel-gid',`
		`'systemd-journal-gid',`
		`diff --git a/meson_options.txt b/meson_options.txt`
		`- index 5048de755d..676e5e2e0d 100644`
		`+ index 814f340840..253a77ecb3 100644`
		`--- a/meson_options.txt`
		`+++ b/meson_options.txt`
		`- @@ -235,10 +235,6 @@ option('adm-gid', type : 'integer', value : '-1',`
		`+ @@ -257,10 +257,6 @@ option('adm-gid', type : 'integer', value : 0,`
		`description : 'soft-static allocation for the "adm" group')`
		`- option('audio-gid', type : 'integer', value : '-1',`
		`+ option('audio-gid', type : 'integer', value : 0,`
		`description : 'soft-static allocation for the "audio" group')`
		`- -option('cdrom-gid', type : 'integer', value : '-1',`
		`+ -option('cdrom-gid', type : 'integer', value : 0,`
		`- description : 'soft-static allocation for the "cdrom" group')`
		`- -option('dialout-gid', type : 'integer', value : '-1',`
		`+ -option('dialout-gid', type : 'integer', value : 0,`
		`- description : 'soft-static allocation for the "dialout" group')`
		`- option('disk-gid', type : 'integer', value : '-1',`
		`+ option('disk-gid', type : 'integer', value : 0,`
		`description : 'soft-static allocation for the "disk" group')`
		`- option('input-gid', type : 'integer', value : '-1',`
		`- @@ -249,18 +245,22 @@ option('kvm-gid', type : 'integer', value : '-1',`
		`+ option('input-gid', type : 'integer', value : 0,`
		`+ @@ -271,18 +267,22 @@ option('kvm-gid', type : 'integer', value : 0,`
		`description : 'soft-static allocation for the "kvm" group')`
		`- option('lp-gid', type : 'integer', value : '-1',`
		`+ option('lp-gid', type : 'integer', value : 0,`
		`description : 'soft-static allocation for the "lp" group')`
		`- +option('optical-gid', type : 'integer', value : '-1',`
		`+ +option('optical-gid', type : 'integer', value : '0',`
		`+ description : 'soft-static allocation for the "optical" group')`
		`- option('render-gid', type : 'integer', value : '-1',`
		`+ option('render-gid', type : 'integer', value : 0,`
		`description : 'soft-static allocation for the "render" group')`
		`- option('sgx-gid', type : 'integer', value : '-1',`
		`+ option('sgx-gid', type : 'integer', value : 0,`
		`description : 'soft-static allocation for the "sgx" group')`
		`- -option('tape-gid', type : 'integer', value : '-1',`
		`+ -option('tape-gid', type : 'integer', value : 0,`
		`- description : 'soft-static allocation for the "tape" group')`
		`- +option('storage-gid', type : 'integer', value : '-1',`
		`+ +option('storage-gid', type : 'integer', value : '0',`
		`+ description : 'soft-static allocation for the "storage" group')`
		`option('tty-gid', type : 'integer', value : 5,`
		`description : 'the numeric GID of the "tty" group')`
		`- option('users-gid', type : 'integer', value : '-1',`
		`+ option('users-gid', type : 'integer', value : 0,`
		`description : 'soft-static allocation for the "users" group')`
		`- option('utmp-gid', type : 'integer', value : '-1',`
		`+ option('utmp-gid', type : 'integer', value : 0,`
		`description : 'soft-static allocation for the "utmp" group')`
		`- +option('uucp-gid', type : 'integer', value : '-1',`
		`+ +option('uucp-gid', type : 'integer', value : '0',`
		`+ description : 'soft-static allocation for the "uucp" group')`
		`- option('video-gid', type : 'integer', value : '-1',`
		`+ option('video-gid', type : 'integer', value : 0,`
		`description : 'soft-static allocation for the "video" group')`
		`- option('wheel-gid', type : 'integer', value : '-1',`
		`+ option('wheel-gid', type : 'integer', value : 0,`
		`diff --git a/rules.d/50-udev-default.rules.in b/rules.d/50-udev-default.rules.in`
		`- index 18a3cf46bf..f3c440fd89 100644`
		`+ index 843bdaf9ce..a192f091df 100644`
		`--- a/rules.d/50-udev-default.rules.in`
		`+++ b/rules.d/50-udev-default.rules.in`
		`- @@ -22,7 +22,7 @@ SUBSYSTEM=="tty", KERNEL=="sclp_line[0-9]*", GROUP="tty", MODE="0620"`
		`+ @@ -26,7 +26,7 @@ SUBSYSTEM=="tty", KERNEL=="sclp_line[0-9]*", GROUP="tty", MODE="0620"`
		`SUBSYSTEM=="tty", KERNEL=="ttysclp[0-9]*", GROUP="tty", MODE="0620"`
		`SUBSYSTEM=="tty", KERNEL=="3270/tty[0-9]*", GROUP="tty", MODE="0620"`
		`SUBSYSTEM=="vc", KERNEL=="vcs\|vcsa", GROUP="tty"`
		`@@ -93,7 +96,7 @@`

		`SUBSYSTEM=="mem", KERNEL=="mem\|kmem\|port", GROUP="kmem", MODE="0640"`

		`- @@ -67,13 +67,13 @@ KERNEL=="irlpt[0-9]*", GROUP="lp"`
		`+ @@ -72,13 +72,13 @@ KERNEL=="irlpt[0-9]*", GROUP="lp"`
		`SUBSYSTEM=="usb", ENV{DEVTYPE}=="usb_device", ENV{ID_USB_INTERFACES}==":0701??:", GROUP="lp"`

		`SUBSYSTEM=="block", GROUP="disk"`
		`@@ -114,10 +117,10 @@`
		`KERNEL=="qft[0-9]\|nqft[0-9]\|zqft[0-9]\|nzqft[0-9]\|rawqft[0-9]\|nrawqft[0-9]", GROUP="disk"`
		`KERNEL=="loop-control", GROUP="disk", OPTIONS+="static_node=loop-control"`
		`diff --git a/sysusers.d/basic.conf.in b/sysusers.d/basic.conf.in`
		`- index 8cc1a7cad2..21bb6d8948 100644`
		`+ index a602b872e4..8d38febb6a 100644`
		`--- a/sysusers.d/basic.conf.in`
		`+++ b/sysusers.d/basic.conf.in`
		`- @@ -22,17 +22,17 @@ g utmp {{UTMP_GID }} - -`
		`+ @@ -23,17 +23,17 @@ g utmp {{UTMP_GID }} - -`

		`# Physical and virtual hardware access groups`
		`g audio {{AUDIO_GID }} - -`
		`@@ -138,10 +141,12 @@`
		`g video {{VIDEO_GID }} - -`

		`# Default group for normal users`
		`- From 14de5ced41edc9fa8e380330c03adc89ef257fbc Mon Sep 17 00:00:00 2001`
		`+`
		`+ From 9e2987a7b4d09d7b554141e9ef2c911cb3fda570 Mon Sep 17 00:00:00 2001`
		`From: Christian Hesse <mail@eworm.de>`
		`Date: Mon, 27 Dec 2021 23:32:42 +0100`
		`Subject: [PATCH] generate tmpfiles.d/legacy.conf`
		`+`
		`---`
		`tmpfiles.d/legacy.conf.in \| 3 ---`
		`tmpfiles.d/meson.build \| 2 +-`
		`@@ -162,10 +167,10 @@`
		`# /run/lock/subsys is used for serializing SysV service execution, and`
		`# hence without use on SysV-less systems.`
		`diff --git a/tmpfiles.d/meson.build b/tmpfiles.d/meson.build`
		`- index b8d3919025..000bd0bd22 100644`
		`+ index ca1abbf3fe..25e2b53402 100644`
		`--- a/tmpfiles.d/meson.build`
		`+++ b/tmpfiles.d/meson.build`
		`- @@ -27,7 +27,7 @@ foreach pair : files`
		`+ @@ -29,7 +29,7 @@ foreach pair : files`
		`endforeach`

		`in_files = [['etc.conf', ''],`

libre/systemd/0002-FSDG-os-release-Default-PRETTY_NAME-to-GNU-Linux-ins.patch

file modified

+21 -39

		`@@ -17,15 +17,15 @@`
		`index 34bb5d2f1e..d22945b5c4 100644`
		`--- a/man/kernel-install.xml`
		`+++ b/man/kernel-install.xml`
		`- @@ -94,7 +94,7 @@`
		`- <filename>$BOOT/loader/entries/<replaceable>MACHINE-ID</replaceable>-<replaceable>KERNEL-VERSION</replaceable>.conf</filename>.`
		`+ @@ -100,7 +100,7 @@`
		`+ <filename>$BOOT/loader/entries/<replaceable>ENTRY-TOKEN</replaceable>-<replaceable>KERNEL-VERSION</replaceable>.conf</filename>.`
		`The title of the entry is the <replaceable>PRETTY_NAME</replaceable> parameter specified in`
		`- <filename>/etc/os-release</filename> or <filename>/usr/lib/os-release</filename> (if the former is`
		`- - missing), or "Linux <replaceable>KERNEL-VERSION</replaceable>", if unset.</para>`
		`- + missing), or "GNU/Linux <replaceable>KERNEL-VERSION</replaceable>", if unset.</para>`
		`+ <filename>/etc/os-release</filename> or <filename>/usr/lib/os-release</filename> (if the former`
		`+ - is missing), or "Linux <replaceable>KERNEL-VERSION</replaceable>", if unset.</para>`
		`+ + is missing), or "GNU/Linux <replaceable>KERNEL-VERSION</replaceable>", if unset.</para>`

		`- <para>If the entry directory`
		`- <filename>$BOOT/<replaceable>MACHINE-ID</replaceable>/<replaceable>KERNEL-VERSION</replaceable>/</filename>`
		`+ <para>If <varname>$KERNEL_INSTALL_LAYOUT</varname> is not "bls", this plugin does nothing.</para></listitem>`
		`+ </itemizedlist>`
		`diff --git a/man/os-release.xml b/man/os-release.xml`
		`index 5a5e318f75..1afaa679c9 100644`
		`--- a/man/os-release.xml`
		`@@ -39,37 +39,19 @@`

		`<para>Example: <literal>PRETTY_NAME="Fedora 17 (Beefy Miracle)"</literal>.</para></listitem>`
		`</varlistentry>`
		`- diff --git a/src/analyze/analyze.c b/src/analyze/analyze.c`
		`- index 4d81026084..f18bd92289 100644`
		`- --- a/src/analyze/analyze.c`
		`- +++ b/src/analyze/analyze.c`
		`- @@ -747,7 +747,7 @@ static int analyze_plot(int argc, char argv[], void userdata) {`
		`- svg("<text x=\"20\" y=\"50\">%s</text>", pretty_times);`
		`- if (host)`
		`- svg("<text x=\"20\" y=\"30\">%s %s (%s %s %s) %s %s</text>",`
		`- - isempty(host->os_pretty_name) ? "Linux" : host->os_pretty_name,`
		`- + isempty(host->os_pretty_name) ? "GNU/Linux" : host->os_pretty_name,`
		`- strempty(host->hostname),`
		`- strempty(host->kernel_name),`
		`- strempty(host->kernel_release),`
		`diff --git a/src/core/main.c b/src/core/main.c`
		`index bcce7178a8..7bebcc9e28 100644`
		`--- a/src/core/main.c`
		`+++ b/src/core/main.c`
		`- @@ -1242,11 +1242,11 @@ static int status_welcome(void) {`
		`- return status_printf(NULL, 0,`
		`- "\nWelcome to \x1B[%sm%s\x1B[0m!\n",`
		`- isempty(ansi_color) ? "1" : ansi_color,`
		`- - isempty(pretty_name) ? "Linux" : pretty_name);`
		`- + isempty(pretty_name) ? "GNU/Linux" : pretty_name);`
		`- else`
		`- return status_printf(NULL, 0,`
		`- "\nWelcome to %s!\n",`
		`- - isempty(pretty_name) ? "Linux" : pretty_name);`
		`- + isempty(pretty_name) ? "GNU/Linux" : pretty_name);`
		`- }`
		`+ @@ -1339,7 +1339,7 @@`
		`+ return log_full_errno(r == -ENOENT ? LOG_DEBUG : LOG_WARNING, r,`
		`+ "Failed to read os-release file, ignoring: %m");`

		`- static int write_container_id(void) {`
		`+ - const char *label = empty_to_null(pretty_name) ?: empty_to_null(name) ?: "Linux";`
		`+ + const char *label = empty_to_null(pretty_name) ?: empty_to_null(name) ?: "GNU/Linux";`
		`+`
		`+ if (show_status_on(arg_show_status)) {`
		`+ if (log_get_show_color())`
		`diff --git a/src/firstboot/firstboot.c b/src/firstboot/firstboot.c`
		`index c9fc8dd5cd..ffaa1c1c13 100644`
		`--- a/src/firstboot/firstboot.c`
		`@@ -87,15 +69,15 @@`
		`index 47a0cd224a..9ff48a9d5c 100644`
		`--- a/src/kernel-install/90-loaderentry.install`
		`+++ b/src/kernel-install/90-loaderentry.install`
		`- @@ -42,7 +42,7 @@ elif [[ -f /usr/lib/os-release ]]; then`
		`+ @@ -60,7 +60,7 @@`
		`+ . /usr/lib/os-release`
		`fi`

		`- if ! [[ $PRETTY_NAME ]]; then`
		`- - PRETTY_NAME="Linux $KERNEL_VERSION"`
		`- + PRETTY_NAME="GNU/Linux $KERNEL_VERSION"`
		`- fi`
		`+ -[ -n "$PRETTY_NAME" ] \|\| PRETTY_NAME="Linux $KERNEL_VERSION"`
		`+ +[ -n "$PRETTY_NAME" ] \|\| PRETTY_NAME="GNU/Linux $KERNEL_VERSION"`

		`- if [[ -f /etc/kernel/cmdline ]]; then`
		`+ SORT_KEY="$IMAGE_ID"`
		`+ [ -z "$SORT_KEY" ] && SORT_KEY="$ID"`
		`--`
		`2.18.0`

libre/systemd/0006-FSDG-man-Use-FSDG-operating-systems-as-examples.patch

file modified

+8 -8

		`@@ -130,7 +130,7 @@`
		`index 588924ee61..34ff6a7e96 100644`
		`--- a/man/systemd-nspawn.xml`
		`+++ b/man/systemd-nspawn.xml`
		`- @@ -1461,11 +1461,12 @@`
		`+ @@ -1628,11 +1628,12 @@`
		`<refsect1>`
		`<title>Examples</title>`

		`@@ -144,7 +144,7 @@`
		`https://download.fedoraproject.org/pub/fedora/linux/releases/&fedora_latest_version;/Cloud/x86_64/images/Fedora-Cloud-Base-&fedora_latest_version;-&fedora_cloud_release;.x86_64.raw.xz \`
		`Fedora-Cloud-Base-&fedora_latest_version;-&fedora_cloud_release;.x86-64`
		`# systemd-nspawn -M Fedora-Cloud-Base-&fedora_latest_version;-&fedora_cloud_release;.x86-64</programlisting>`
		`- @@ -1474,37 +1475,36 @@`
		`+ @@ -1641,37 +1642,36 @@`
		`<citerefentry><refentrytitle>machinectl</refentrytitle><manvolnum>1</manvolnum></citerefentry>`
		`and opens a shell in it.</para>`
		`</example>`
		`@@ -155,8 +155,8 @@`
		`+ <title>Build and boot a minimal BLAG distribution in a container</title>`

		`- <programlisting># dnf -y --releasever=&fedora_latest_version; --installroot=/var/lib/machines/f&fedora_latest_version; \`
		`- - --disablerepo='*' --enablerepo=fedora --enablerepo=updates install \`
		`- - systemd passwd dnf fedora-release vim-minimal glibc-minimal-langpack`
		`+ - --repo=fedora --repo=updates --setopt=install_weak_deps=False install \`
		`+ - passwd dnf fedora-release vim-minimal systemd systemd-networkd`
		`-# systemd-nspawn -bD /var/lib/machines/f&fedora_latest_version;</programlisting>`
		`+ <programlisting># dnf -y --releasever=&blag_latest_version;k --installroot=/var/lib/machines/blag&blag_latest_version; \`
		`+ --disablerepo='*' --enablerepo=blag --enablerepo=updates install \`
		`@@ -176,7 +176,7 @@`

		`<example>`
		`- <title>Spawn a shell in a container of a minimal Debian unstable distribution</title>`
		`- + <title>Spawn a shell in a container of a minimal gNewSense Ucclia distribution</title>`
		`+ + <title>Spawn a shell in a container of a minimal gNewSense unstable distribution</title>`

		`- <programlisting># debootstrap unstable ~/debian-tree/`
		`-# systemd-nspawn -D ~/debian-tree/</programlisting>`
		`@@ -197,7 +197,7 @@`
		`out of the box, so the same command can be used to install any of those. For other`
		`distributions from the Debian family, a mirror has to be specified, see`
		`<citerefentry project='die-net'><refentrytitle>debootstrap</refentrytitle><manvolnum>8</manvolnum></citerefentry>.`
		`- @@ -1513,29 +1513,31 @@`
		`+ @@ -1680,29 +1680,31 @@`

		`<example>`
		`<title>Boot a minimal`
		`@@ -245,8 +245,8 @@`
		`<!ENTITY HIGH_RLIMIT_NOFILE "{{HIGH_RLIMIT_NOFILE}}">`
		`<!ENTITY DEFAULT_DNSSEC_MODE "{{DEFAULT_DNSSEC_MODE_STR}}">`
		`<!ENTITY DEFAULT_DNS_OVER_TLS_MODE "{{DEFAULT_DNS_OVER_TLS_MODE_STR}}">`
		`- -<!ENTITY fedora_latest_version "35">`
		`- -<!ENTITY fedora_cloud_release "1.2">`
		`+ -<!ENTITY fedora_latest_version "36">`
		`+ -<!ENTITY fedora_cloud_release "1.5">`
		`+<!ENTITY blag_latest_version "140">`
		`diff --git a/man/machinectl.xml b/man/machinectl.xml`
		`index 9026849559..7b3b130763 100644`

libre/systemd/0007-FSDG-bootctl-Say-Systemd-Boot-Manager-instead-of-Lin.patch

file modified

+7 -14

		`@@ -12,22 +12,15 @@`
		`index 2832a39dd7..534870ee50 100644`
		`--- a/src/boot/bootctl.c`
		`+++ b/src/boot/bootctl.c`
		`- @@ -665,13 +665,13 @@ static int install_variables(const char *esp_path,`
		`- "Failed to determine current boot order: %m");`
		`+ @@ -107,7 +107,7 @@`
		`+ }`

		`- if (first \|\| r == 0) {`
		`- - r = efi_add_boot_option(slot, "Linux Boot Manager",`
		`- + r = efi_add_boot_option(slot, "Systemd Boot Manager",`
		`- part, pstart, psize,`
		`- uuid, path);`
		`- if (r < 0)`
		`- return log_error_errno(r, "Failed to create EFI Boot variable entry: %m");`
		`+ static const char *pick_efi_boot_option_description(void) {`
		`+ - return arg_efi_boot_option_description ?: "Linux Boot Manager";`
		`+ + return arg_efi_boot_option_description ?: "Systemd Boot Manager";`
		`+ }`

		`- - log_info("Created EFI boot entry \"Linux Boot Manager\".");`
		`- + log_info("Created EFI boot entry \"Systemd Boot Manager\".");`
		`- }`
		`-`
		`- return insert_into_order(slot, first);`
		`+ static int acquire_esp(`
		`--`
		`2.18.0`

libre/systemd/PKGBUILD

file modified

+23 -23

		`@@ -1,6 +1,4 @@`
		`- # Maintainer (Arch): Christian Hesse <mail@eworm.de>`
		`- # Maintainer (Arch): Dave Reisner <dreisner@archlinux.org>`
		`- # Maintainer (Arch): Tom Gundersen <teg@jklm.no>`
		`+ # Maintainer (arch): Christian Hesse <mail@eworm.de>`
		`# Maintainer: Luke Shumaker <lukeshu@parabola.nu>`
		`# Contributor: Omar Vega Ramos <ovruni@gnu.org.pe>`
		`# Contributor: Denis 'GNUtoo' Carikli <GNUtoo@cyberdimension.org>`
		`@@ -11,10 +9,10 @@`
		`# We split Arch's systemd-libs into systemd-$X, for the following $X:`
		`_systemd_libs=('libsystemd' 'libudev' 'nss-systemd' 'nss-myhostname' 'nss-mymachines' 'nss-resolve')`
		`pkgname+=("${_systemd_libs[@]/#/systemd-}")`
		`- _tag='d066a4f747b225d47c5f5c97a8843d30878995b8' # git rev-parse v${_tag_name}`
		`- _tag_name=250.3`
		`+ _tag='472b4e59c3c095248b316ccceac5565fcaae9d3a' # git rev-parse v${_tag_name}`
		`+ _tag_name=252.1`
		`pkgver="${_tag_name/-/}"`
		`- pkgrel=4`
		`+ pkgrel=1`
		`pkgrel+=.parabola1`
		`arch=('x86_64')`
		`arch+=('i686' 'armv7h' 'ppc64le')`
		`@@ -30,6 +28,7 @@`
		`options=('debug' 'strip')`
		`validpgpkeys=('63CDA1E5D3FC22B998D20DD6327F26951A015CC4' # Lennart Poettering <lennart@poettering.net>`
		`'A9EA9081724FFAE0484C35A1A81CEA22BC8C7E2E' # Luca Boccassi <luca.boccassi@gmail.com>`
		`+ '9A774DB5DB996C154EBBFBFDA0099A18E29326E1' # Yu Watanabe <watanabe.yu+github@gmail.com>`
		`'5C251B5FC54EB2F80F407AAAC54CA336CFEB557E') # Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>`
		`source=("git+https://github.com/systemd/systemd-stable#tag=${_tag}?signed"`
		`"git+https://github.com/systemd/systemd#tag=v${_tag_name%.*}?signed"`
		`@@ -61,9 +60,9 @@`
		`'0007-FSDG-bootctl-Say-Systemd-Boot-Manager-instead-of-Lin.patch')`
		`sha512sums=('SKIP'`
		`'SKIP'`
		`- 'cc0c2ffb5f7c3a7176cd68f3dddd85ca000dcc4cdf3044746a20147234adb6811800fd28a4713faa6a59bf8c02be9fd43c2d6aa6695fd1dbf03ae773a91d090c'`
		`+ '3ccf783c28f7a1c857120abac4002ca91ae1f92205dcd5a84aff515d57e706a3f9240d75a0a67cff5085716885e06e62597baa86897f298662ec36a940cf410e'`
		`'f0d933e8c6064ed830dec54049b0a01e27be87203208f6ae982f10fb4eddc7258cb2919d594cbfb9a33e74c3510cfd682f3416ba8e804387ab87d1a217eb4b73'`
		`- '8167dd8f610fd98e3de4360cacd0020d3691cd1a989591a6db2f0d1277ce96880e64753bdbed759c6cf4b95d39b5d2415b4d9810e369e50e59655742174ff51c'`
		`+ 'aeefb607471cffb5ed4c3d9f36dc0954a9a08cee4b7b4ff55468b561e089e3d8448398906a7df328049ba51b712e4d50698b96bc152bdb03a35ce39c3f51a7cb'`
		`'a8c7e4a2cc9c9987e3c957a1fc3afe8281f2281fffd2e890913dcf00cf704024fb80d86cb75f9314b99b0e03bac275b22de93307bfc226d8be9435497e95b7e6'`
		`'70b3f1d6aaa9cd4b6b34055a587554770c34194100b17b2ef3aaf4f16f68da0865f6b3ae443b3252d395e80efabd412b763259ffb76c902b60e23b6b522e3cc8'`
		`'6c6f579644ea2ebb6b46ee274ab15110718b0de40def8c30173ba8480b045d403f2aedd15b50ad9b96453f4ad56920d1350ff76563755bb9a80b10fa7f64f1d9'`
		`@@ -80,17 +79,15 @@`
		`'da7a97d5d3701c70dd5388b0440da39006ee4991ce174777931fea2aa8c90846a622b2b911f02ae4d5fffb92680d9a7e211c308f0f99c04896278e2ee0d9a4dc'`
		`'5aa475f37d35752a95e73417c38c4d3bc4d15d5f1052e95d75b4c4144b74c79af94da1d1e954be536339f9829a1ceb3a1bc5c6adceb187df7a8e5f5a83e4a850'`
		`'825b9dd0167c072ba62cabe0677e7cd20f2b4b850328022540f122689d8b25315005fa98ce867cf6e7460b2b26df16b88bb3b5c9ebf721746dce4e2271af7b97'`
		`- 'e963859d9958e527802f118a5ac5f2051343a2ee987f60cae256fc4e8c71f5fe16439375a5d1caf0338f1156775ad087eaab9e8bf9d18633e62ea4d32e713e7f'`
		`- '8466d1945d72a7605e3a9c3402ddb8c67272506ffba89a35f3e7787e03d0e8895b6d52d9390899381b6763da00e49703953794696366b6c510e037c67aff96ac'`
		`+ 'a277bef64318f91747b8b9c74282e6f346690712ed7296d102688173409f7987673619fb44f3c6609bd38781d382871f56a89be771279e610a5437520183c9b9'`
		`+ '6784f8d84e7f6063f3ea189eede45725ca913cd2140858416ba097f0dbb8cfff8bbe5c6a52715086e720b11351803f9eb18d71a6f63bc59dd44f9e24a4d45176'`
		`'1c93f6641d537290786137138db1ff8e23de754ce7dc20aaed458e13763f29cdddf699eeb9bb2cdaa244495ae1611784dcde7ef32846d2c4043d691ca682ea23'`
		`'f24191e6331b58dc4f1c1b7b28b854ba94c6de53b2dc97e5721c208abe7543efab4b8519013bdb02ebeb5058dd5c56a8318bf99a972772de188b40861c88e349'`
		`'c6a8a56c54415a266dcb57cc24fd91d085ca7298aca6b522e626f41ed216b13c9695ff4d209f7e60d24fb5e65e40ef5151c8d95db6950eda8a4150d28fcd56be'`
		`- 'a5c099a29005f5cac20c3673d29f8c17fbb4480c4d49c5c97b373636882413db1252d9794eb995774f27f6b41ec17c85a277709b35c6f016e1cd9806160b90d0'`
		`- '28a5b3fc9e2c5cec9267bb96725c73ee77788514f140c0cf8df765af64bc8130dd02f4863d9128ac45d54256b2ab4f2b06d1a3f65660ce1dfba5727618cd1839')`
		`+ '8a7d9be0482307efaf290a9c764802e0fae557a6017b893c054e60ea3938aaa5d6a996161828fbd3340177b2f1ad1f523493975c9ed25c6d8dcd7606b112a81e'`
		`+ '10c366c0d8922c26ac7e57cf907a449e05084cb33ef4d2c79243364c8827634a5c92f7108fb40c39199a1013bd5dde3e58bf37d03a497843861d13abe94431f7')`

		`_backports=(`
		`- # bus: Use OrderedSet for introspection`
		`- 'acac88340ace3cd631126eebb6d0390cd54e8231'`
		`)`

		`_reverts=(`
		`@@ -104,8 +101,12 @@`

		`local _c`
		`for _c in "${_backports[@]}"; do`
		`- git log --oneline -1 "${_c}"`
		`- git cherry-pick -n "${_c}"`
		`+ if [[ $_c == .. ]]; then`
		`+ git log --oneline --reverse "${_c}"`
		`+ else`
		`+ git log --oneline -1 "${_c}"`
		`+ fi`
		`+ git cherry-pick -n -m1 "${_c}"`
		`done`
		`for _c in "${_reverts[@]}"; do`
		`git log --oneline -1 "${_c}"`
		`@@ -129,12 +130,10 @@`
		`# * Cloudflare (https://1.1.1.1/)`
		`# * Quad9 (https://www.quad9.net/)`
		`# * Google (https://developers.google.com/speed/public-dns/)`
		`- # TODO: go back to cloudflare? Currently it is unusable with systemd-resolved...`
		`- # https://community.cloudflare.com/t/ttl-for-cnames/354506`
		`- #'1.1.1.1#cloudflare-dns.com'`
		`+ '1.1.1.1#cloudflare-dns.com'`
		`'9.9.9.9#dns.quad9.net'`
		`'8.8.8.8#dns.google'`
		`- #'2606:4700:4700::1111#cloudflare-dns.com'`
		`+ '2606:4700:4700::1111#cloudflare-dns.com'`
		`'2620:fe::9#dns.quad9.net'`
		`'2001:4860:4860::8888#dns.google'`
		`)`
		`@@ -149,6 +148,7 @@`
		`# internal version comparison is incompatible with pacman:`
		`# 249~rc1 < 249 < 249.1 < 249rc`
		`-Dversion-tag="${_tag_name/-/\~}-${pkgrel}-parabola"`
		`+ # -Dshared-lib-tag="${pkgver}-${pkgrel}"`
		`-Dmode=release`

		`-Dima=false`
		`@@ -163,7 +163,7 @@`
		`-Ddefault-dnssec=no`
		`-Ddefault-hierarchy=unified`
		`-Ddefault-kill-user-processes=false`
		`- -Ddefault-locale=C`
		`+ -Ddefault-locale='C.UTF-8'`
		`-Dlocalegen-path=/usr/bin/locale-gen`
		`-Ddns-over-tls=openssl`
		`-Dfallback-hostname='parabola'`
		`@@ -193,7 +193,7 @@`
		`rm -rf "$srcdir/dest"`

		`# Put things in the main systemd package by default`
		`- DESTDIR="$srcdir/dest/systemd" meson install -C build`
		`+ meson install -C build --destdir "$srcdir/dest/systemd"`

		`install -dm755 "$srcdir/dest/common"/usr/lib/systemd`
		`mv -T "$srcdir/dest"/{systemd,common}/usr/lib/systemd/libsystemd-shared-${pkgver%%.*}.so`
		`@@ -323,7 +323,7 @@`
		`'glibc' 'iptables' 'libcap' 'libcap.so'`
		`'libgcrypt' 'libxcrypt' 'libcrypt.so' 'libidn2' 'libseccomp' 'libseccomp.so' 'libsystemd.so'`
		`'libudev.so' 'libblkid.so' 'libmount.so' 'libuuid.so' 'lz4'`
		`- 'xz' 'audit' 'libaudit.so' 'libp11-kit' 'libp11-kit.so' 'openssl')`
		`+ 'xz' 'audit' 'libaudit.so' 'libp11-kit' 'libp11-kit.so' 'openssl' 'libcrypto.so' 'libssl.so')`

		`cp -rT -d --no-preserve=ownership,timestamp "$srcdir/dest/${pkgname#systemd-}" "$pkgdir"`
		`}`

libre/systemd/initcpio-install-systemd

file modified

-5

		`@@ -121,11 +121,6 @@`
		`add_symlink "/usr/lib/systemd/system/default.target" "initrd.target"`
		`add_symlink "/usr/lib/systemd/system/ctrl-alt-del.target" "reboot.target"`

		`- # This code moved to glibc with 2.35-1, so the shared library is just empty.`
		`- # Keep it for the time being - but with final file name - for older glibc packages.`
		`- # TODO: Remove once settled!`
		`- add_binary '/usr/lib/libnss_files.so.2'`
		`-`
		`printf '%s\n' >"$BUILDROOT/etc/nsswitch.conf" \`
		`'passwd: files' \`
		`'group: files' \`

libre/texlive-core/PKGBUILD

file modified

+2 -2

		`@@ -1,5 +1,5 @@`
		`- # Maintainer (Arch): Rémy Oudompheng <remy@archlinux.org>`
		`- # Contributor (Hyperbola): André Silva <emulatorman@hyperbola.info>`
		`+ # Maintainer (arch): Rémy Oudompheng <remy@archlinux.org>`
		`+ # Contributor: André Silva <emulatorman@hyperbola.info>`
		`# Maintainer: Omar Vega Ramos <ovruni@gnu.org.pe>`
		`# Contributor: Michał Masłowski <mtjm@mtjm.eu>`
		`# Contributor: Isaac David <isacdaavid@at@isacdaavid@dot@info>`

libre/texlive-fontsextra/PKGBUILD

file modified

+2 -2

		`@@ -1,5 +1,5 @@`
		`- # Maintainer (Arch): Rémy Oudompheng <remy.archlinux.org>`
		`- # Contributor (Hyperbola): André Silva <emulatorman@hyperbola.info>`
		`+ # Maintainer (arch): Rémy Oudompheng <remy.archlinux.org>`
		`+ # Contributor: André Silva <emulatorman@hyperbola.info>`
		`# Maintainer: Omar Vega Ramos <ovruni@gnu.org.pe>`
		`# Contributor: Isaac David <isacdaavid@at@isacdaavid@dot@info>`
		`# Contributor: Michał Masłowski <mtjm@mtjm.eu>`

libre/texlive-latexextra/PKGBUILD

file modified

+3 -3

		`@@ -1,6 +1,6 @@`
		`- # Maintainer (Arch): Firmicus <firmicus āt gmx dōt net>`
		`- # Maintainer (Arch): Rémy Oudompheng <remy@archlinux.org>`
		`- # Contributor (Hyperbola): André Silva <emulatorman@hyperbola.info>`
		`+ # Maintainer (arch): Firmicus <firmicus āt gmx dōt net>`
		`+ # Maintainer (arch): Rémy Oudompheng <remy@archlinux.org>`
		`+ # Contributor: André Silva <emulatorman@hyperbola.info>`
		`# Maintainer: Michał Masłowski <mtjm@mtjm.eu>`
		`# Contributor: Isaac David <isacdaavid@at@isacdaavid@dot@info>`

libre/tokyocabinet/PKGBUILD

file modified

+3 -3

		`@@ -1,7 +1,7 @@`
		`# Maintainer: Luke Shumaker <lukeshu@parabola.nu>`
		`- # Maintainer (AUR): Mark Foxwell <fastfret79@archlinux.org.uk>`
		`- # Contributor (AUR): Nicolas Martyanoff <khaelin@gmail.com>`
		`- # Contributor (AUR): Rick Chen <stuffcorpse@archlinux.us>`
		`+ # Maintainer (aur): Mark Foxwell <fastfret79@archlinux.org.uk>`
		`+ # Contributor: Nicolas Martyanoff <khaelin@gmail.com>`
		`+ # Contributor: Rick Chen <stuffcorpse@archlinux.us>`


		`# parabola changes and rationale:`

libre/tp_smapi-lts/PKGBUILD

file modified

+24 -11

		`@@ -1,17 +1,30 @@`
		`- # Maintainer (Arch): Lukas Fleischer <lfleischer@archlinux.org>`
		`- # Contributor (Arch): xduugu`
		`- # Contributor (Arch): nh2`
		`- # Contributor (Arch): Steven Davidovitz <steviedizzle ð gmail đ com>`
		`- # Contributor (Arch): Nick B <Shirakawasuna ð gmail đ com>`
		`- # Contributor (Arch): Christof Musik <christof ð senfdax đ de>`
		`- # Contributor (Arch): Stefan Rupp <archlinux ð stefanrupp đ de>`
		`- # Contributor (Arch): Ignas Anikevicius <anikevicius ð gmail đ com>`
		`- # Contributor (Hyperbola): André Silva <emulatorman@hyperbola.info>`
		`- # Contributor (Hyperbola): Márcio Silva <coadde@hyperbola.info>`
		`+ # Maintainer (arch): Lukas Fleischer <lfleischer@archlinux.org>`
		`+ # Contributor: xduugu`
		`+ # Contributor: nh2`
		`+ # Contributor: Steven Davidovitz <steviedizzle ð gmail đ com>`
		`+ # Contributor: Nick B <Shirakawasuna ð gmail đ com>`
		`+ # Contributor: Christof Musik <christof ð senfdax đ de>`
		`+ # Contributor: Stefan Rupp <archlinux ð stefanrupp đ de>`
		`+ # Contributor: Ignas Anikevicius <anikevicius ð gmail đ com>`
		`+ # Contributor: André Silva <emulatorman@hyperbola.info>`
		`+ # Contributor: Márcio Silva <coadde@hyperbola.info>`
		`# Maintainer: Omar Vega Ramos <ovruni@gnu.org.pe>`


		`- _basekernel=5.10.89`
		`+ # build order:`
		`+ # acpi_call-dkms <- acpi_call-lts`
		`+ # acpi_call`
		`+ # linux-libre-lts-headers <- acpi_call-lts`
		`+ # tp_smapi-lts`
		`+ # linux-libre-headers <- acpi_call`
		`+ # tp_smapi`
		`+ #`
		`+ # these packages may be built as a batch, with the helper script:`
		`+ # 'scripts/package-all-acpi_call-tp_smapi'`
		`+ # simply edit '_basekernel' in each # TODO: automate that too`
		`+`
		`+`
		`+ _basekernel=5.15.41`

		`pkgname=tp_smapi-lts`
		`pkgver=0.43`

libre/tp_smapi/PKGBUILD

file modified

+24 -11

		`@@ -1,17 +1,30 @@`
		`- # Maintainer (Arch): Lukas Fleischer <lfleischer@archlinux.org>`
		`- # Contributor (Arch): xduugu`
		`- # Contributor (Arch): nh2`
		`- # Contributor (Arch): Steven Davidovitz <steviedizzle ð gmail đ com>`
		`- # Contributor (Arch): Nick B <Shirakawasuna ð gmail đ com>`
		`- # Contributor (Arch): Christof Musik <christof ð senfdax đ de>`
		`- # Contributor (Arch): Stefan Rupp <archlinux ð stefanrupp đ de>`
		`- # Contributor (Arch): Ignas Anikevicius <anikevicius ð gmail đ com>`
		`- # Contributor (Hyperbola): André Silva <emulatorman@hyperbola.info>`
		`- # Contributor (Hyperbola): Márcio Silva <coadde@hyperbola.info>`
		`+ # Maintainer (arch): Lukas Fleischer <lfleischer@archlinux.org>`
		`+ # Contributor: xduugu`
		`+ # Contributor: nh2`
		`+ # Contributor: Steven Davidovitz <steviedizzle ð gmail đ com>`
		`+ # Contributor: Nick B <Shirakawasuna ð gmail đ com>`
		`+ # Contributor: Christof Musik <christof ð senfdax đ de>`
		`+ # Contributor: Stefan Rupp <archlinux ð stefanrupp đ de>`
		`+ # Contributor: Ignas Anikevicius <anikevicius ð gmail đ com>`
		`+ # Contributor: André Silva <emulatorman@hyperbola.info>`
		`+ # Contributor: Márcio Silva <coadde@hyperbola.info>`
		`# Maintainer: Omar Vega Ramos <ovruni@gnu.org.pe>`


		`- _basekernel=5.15.12`
		`+ # build order:`
		`+ # acpi_call-dkms <- acpi_call-lts`
		`+ # acpi_call`
		`+ # linux-libre-lts-headers <- acpi_call-lts`
		`+ # tp_smapi-lts`
		`+ # linux-libre-headers <- acpi_call`
		`+ # tp_smapi`
		`+ #`
		`+ # these packages may be built as a batch, with the helper script:`
		`+ # 'scripts/package-all-acpi_call-tp_smapi'`
		`+ # simply edit '_basekernel' in each # TODO: automate that too`
		`+`
		`+`
		`+ _basekernel=5.18.14`

		`pkgname=tp_smapi`
		`pkgver=0.43`

libre/uboot4extlinux-imx/PKGBUILD

file modified

+1 -1

		`@@ -2,7 +2,7 @@`
		`# Contributor: Isaac David <isacdaavid@at@isacdaavid@dot@info>`
		`# Contributor: André Silva <emulatorman@hyperbola.info>`
		`# Contributor: Timothy Redaelli <timothy.redaelli@gmail.com>`
		`- # Maintainers: Parabola hackers <dev@lists.parabola.nu>`
		`+ # Maintainer: Parabola Hackers <dev@lists.parabola.nu>`

		`# TODO:`
		`# - Add the following boards`

libre/uboot4extlinux-sunxi/PKGBUILD

file modified

+1 -1

		`@@ -3,7 +3,7 @@`
		`# Contributor: André Silva <emulatorman@hyperbola.info>`
		`# Contributor: Timothy Redaelli <timothy.redaelli@gmail.com>`
		`# Contributor: Denis 'GNUtoo' Carikli <GNUtoo@cyberdimension.org>`
		`- # Maintainers: Parabola hackers <dev@lists.parabola.nu>`
		`+ # Maintainer: Parabola Hackers <dev@lists.parabola.nu>`

		`# To add a new board (that uses an Allwinner System On a Chip) you need:`
		`# - The package name. Example: uboot4extlinux-a20-olinuxino_micro`

libre/uefi-shell/PKGBUILD

file modified

+1 -1

		`@@ -1,4 +1,4 @@`
		`- # Maintainer (Hyperbola): André Silva <emulatorman@hyperbola.info>`
		`+ # Maintainer (hyperbola): André Silva <emulatorman@hyperbola.info>`
		`# Maintainer: David P. <megver83@parabola.nu>`

		`# based in Hyperbola's edk2-uefi-shell, but without i686/IA32`

libre/unp/PKGBUILD

file modified

+6 -6

		`@@ -1,9 +1,9 @@`
		`- # Maintainer (Arch): Anatol Pomozov <anatol.pomozov@gmail.com>`
		`- # Contributor (Arch): Michael Düll <mail@akurei.me> PGP-Key: AAAEE882`
		`- # Contributor (Arch): TDY <tdy@gmx.com>`
		`- # Contributor (Arch): Sergio Rubio <rubiojr.ml@gmail.com>`
		`- # Contributor (Arch): Hannes Rist <cowider@gmail.com>`
		`- # Maintainer (Hyperbola): André Silva <emulatorman@hyperbola.info>`
		`+ # Maintainer (arch): Anatol Pomozov <anatol.pomozov@gmail.com>`
		`+ # Contributor: Michael Düll <mail@akurei.me> PGP-Key: AAAEE882`
		`+ # Contributor: TDY <tdy@gmx.com>`
		`+ # Contributor: Sergio Rubio <rubiojr.ml@gmail.com>`
		`+ # Contributor: Hannes Rist <cowider@gmail.com>`
		`+ # Contributor: André Silva <emulatorman@hyperbola.info>`
		`# Maintainer: Omar Vega Ramos <ovruni@gnu.org.pe>`

		`pkgname=unp`

libre/unzip/PKGBUILD

file modified

+5 -5

		`@@ -1,8 +1,8 @@`
		`- # Maintainer (Arch): Lukas Fleischer <lfleischer@archlinux.org>`
		`- # Contributor (Arch): Gaetan Bisson <bisson@archlinux.org>`
		`- # Contributor (Arch): Douglas Soares de Andrade <douglas@archlinux.org>`
		`- # Contributor (Arch): Robson Peixoto`
		`- # Maintainer (Hyperbola): André Silva <emulatorman@hyperbola.info>`
		`+ # Maintainer (arch): Lukas Fleischer <lfleischer@archlinux.org>`
		`+ # Contributor: Gaetan Bisson <bisson@archlinux.org>`
		`+ # Contributor: Douglas Soares de Andrade <douglas@archlinux.org>`
		`+ # Contributor: Robson Peixoto`
		`+ # Contributor: André Silva <emulatorman@hyperbola.info>`
		`# Maintainer: Omar Vega Ramos <ovruni@gnu.org.pe>`

		`_pkgname=unzip-libre`

libre/vboot-utils/PKGBUILD

file modified

+1 -1

		`@@ -1,4 +1,4 @@`
		`- # Maintainer (ArchArm): Kevin Mihelich <kevin@archlinuxarm.org`
		`+ # Maintainer (archarm): Kevin Mihelich <kevin@archlinuxarm.org`
		`# Maintainer: Omar Vega Ramos <ovruni@gnu.org.pe>`

		`buildarch=12`

libre/vhba-module/PKGBUILD

file modified

+5 -5

		`@@ -1,8 +1,8 @@`
		`- # Contributor (Arch): Ray Rashif <schiv@archlinux.org>`
		`- # Contributor (Arch): Mateusz Herych <heniekk@gmail.com>`
		`- # Contributor (Arch): Charles Lindsay <charles@chaoslizard.org>`
		`- # Contributor (Hyperbola): André Silva <emulatorman@hyperbola.info>`
		`- # Contributor (Hyperbola): Márcio Silva <coadde@hyperbola.info>`
		`+ # Contributor: Ray Rashif <schiv@archlinux.org>`
		`+ # Contributor: Mateusz Herych <heniekk@gmail.com>`
		`+ # Contributor: Charles Lindsay <charles@chaoslizard.org>`
		`+ # Contributor: André Silva <emulatorman@hyperbola.info>`
		`+ # Contributor: Márcio Silva <coadde@hyperbola.info>`
		`# Maintainer: Omar Vega Ramos <ovruni@gnu.org.pe>`

		`_basekernel=5.12.6`

libre/vim-colorsamplerpack/PKGBUILD

file modified

+3 -3

		`@@ -1,7 +1,7 @@`
		`# $Id: PKGBUILD 189356 2016-09-15 20:21:37Z svenstaro $`
		`- # Contributor (Arch): Aaron Griffin <aaron@archlinux.org>`
		`- # Maintainer (Arch): Sven-Hendrik Haase <sh@lutzhaase.com>`
		`- # Maintainer (Hyperbola): André Silva <emulatorman@hyperbola.info>`
		`+ # Contributor: Aaron Griffin <aaron@archlinux.org>`
		`+ # Maintainer (arch): Sven-Hendrik Haase <sh@lutzhaase.com>`
		`+ # Contributor: André Silva <emulatorman@hyperbola.info>`
		`# Maintainer: Omar Vega Ramos <ovruni@gnu.org.pe>`

		`_pkgname=vim-colorsamplerpack-libre`

libre/virt-manager/PKGBUILD

file modified

+4 -4

		`@@ -1,7 +1,7 @@`
		`- # Maintainer (Arch): Christian Rebischke <chris.rebischke@archlinux.org>`
		`- # Contributor (Arch): Sergej Pupykin <pupykin.s+arch@gmail.com>`
		`- # Contributor (Arch): Daniel Micay <danielmicay@gmail.com>`
		`- # Contributor (Arch): Jonathan Wiersma <archaur at jonw dot org>`
		`+ # Maintainer (arch): Christian Rebischke <chris.rebischke@archlinux.org>`
		`+ # Contributor: Sergej Pupykin <pupykin.s+arch@gmail.com>`
		`+ # Contributor: Daniel Micay <danielmicay@gmail.com>`
		`+ # Contributor: Jonathan Wiersma <archaur at jonw dot org>`
		`# Maintainer: Omar Vega Ramos <ovruni@gnu.org.pe>`
		`# Contributor: André Silva <emulatorman@hyperbola.info>`
		`# Contributor: grizzlyuser <grizzlyuser@protonmail.com>`

libre/winetricks-libre/PKGBUILD

file modified

+4 -4

		`@@ -1,9 +1,9 @@`
		`# $Id: PKGBUILD 107291 2014-03-16 16:05:59Z lfleischer $`
		`# Maintainer: Luke R. <g4jc@openmailbox.org> GPG: rsa4096/3EAE8697`
		`- # Maintainer (Arch): Lukas Fleischer <archlinux at cryptocrack dot de>`
		`- # Contributor (Arch): Laurent Carlier <lordheavym@gmail.com>`
		`- # Contributor (Arch): DsTr <dstr@gmail.com>`
		`- # Contributor (Arch): Allan McRae <allan@archlinux.org>`
		`+ # Maintainer (arch): Lukas Fleischer <archlinux at cryptocrack dot de>`
		`+ # Contributor: Laurent Carlier <lordheavym@gmail.com>`
		`+ # Contributor: DsTr <dstr@gmail.com>`
		`+ # Contributor: Allan McRae <allan@archlinux.org>`
		`# Contibutor: André Silva <emulatorman@hyperbola.info>`
		`# Contributor: Freemor <freemor@freemor.ca>`

libre/wings3d/PKGBUILD

file removed

-54

		`@@ -1,54 +0,0 @@`
		`- # Maintainer (Arch): Alexander F. Rødseth <xyproto@archlinux.org>`
		`- # Contributor (Arch): kappa <kappacurve@gmail.com>`
		`- # Maintainer: Márcio Silva <coadde@hyperbola.info>`
		`-`
		`- pkgname=wings3d`
		`- pkgver=2.2.5`
		`- pkgrel=1`
		`- pkgrel+=.parabola1`
		`- pkgdesc='3D modeler using the winged edge data structure'`
		`- pkgdesc+=', without nonfree kerkythea render support'`
		`- arch=(x86_64)`
		`- arch+=(i686 armv7h)`
		`- # https is not available`
		`- url='http://www.wings3d.com/'`
		`- license=(GPL)`
		`- depends=(erlang erlang-cl erlang-sdl)`
		`- makedepends=(gendesk)`
		`- optdepends=('povray: render scenes with POV-Ray')`
		`- conflicts=("${pkgname}-libre")`
		`- replaces=("${pkgname}-libre")`
		`- source=("https://downloads.sourceforge.net/project/wings/wings/$pkgver/wings-$pkgver.tar.bz2"`
		`- "$pkgname.sh")`
		`- sha256sums=('95ecf84a8f49bc00b983643e7ccd807f64a3b8b88253037a8ccefbe7a3bedff8'`
		`- '8e5e8f31d47ea55a0e9d311b7cc0eaac4e6050ac40506d3548b6ebae5d3618be')`
		`- _p=${pkgname%3d}-$pkgver`
		`-`
		`- prepare() {`
		`- gendesk -f -n \`
		`- --name Wings3D \`
		`- --pkgname $pkgname \`
		`- --pkgdesc "$pkgdesc" \`
		`- --genericname '3D Modeler' \`
		`- --categories 'Graphics;3DGraphics'`
		`- }`
		`-`
		`- build() {`
		`- export ERL_LIBS="$srcdir"`
		`- make -C "${pkgname%3d}-$pkgver" unix`
		`- }`
		`-`
		`- package() {`
		`- install -Dm755 $pkgname.sh "$pkgdir/usr/bin/$pkgname"`
		`- install -Dm644 -t "$pkgdir/usr/share/applications" $pkgname.desktop`
		`- cd "${pkgname%3d}-$pkgver/icons"`
		`- install -Dm644 wings_icon_48x48.png "$pkgdir/usr/share/pixmaps/$pkgname.png"`
		`- cd ../build`
		`- install -d "$pkgdir/usr/lib/$pkgname"`
		`- cp -r "wings-$pkgver-linux/lib/wings-$pkgver"/* "$pkgdir/usr/lib/$pkgname/"`
		`- msg 'remove nonfree kerkythea render support plugin'`
		`- rm -v $pkgdir/usr/lib/$pkgname/plugins/import_export/wpc_kerky.beam`
		`- }`
		`-`
		`- # getver: -u=2 github.com/dgud/wings/releases`
		`- # vim: ts=2 sw=2 et:`

libre/wings3d/wings3d.png

file removed

libre/wings3d/wings3d.sh

file removed

-4

		`@@ -1,4 +0,0 @@`
		`- #!/bin/sh`
		`- exec /usr/bin/erl -noinput -smp \`
		`- -pa /usr/lib/erlang/lib/esdl-*/ebin /usr/lib/wings3d/ebin \`
		`- -run wings_start start_halt ${1+"$@"}`

libre/x86_64-pc-linux-gnu-binutils/PKGBUILD

file modified

+1 -1

		`@@ -1,4 +1,4 @@`
		`- # Maintainers: Parabola hackers <dev@lists.parabola.nu>`
		`+ # Maintainer: Parabola Hackers <dev@lists.parabola.nu>`

		`_target=x86_64-pc-linux-gnu`
		`pkgname=$_target-binutils`

libre/x86_64-pc-linux-gnu-gcc/PKGBUILD

file modified

+1 -1

		`@@ -1,4 +1,4 @@`
		`- # Maintainers: Parabola hackers <dev@lists.parabola.nu>`
		`+ # Maintainer: Parabola Hackers <dev@lists.parabola.nu>`

		`_target=x86_64-pc-linux-gnu`
		`pkgname=$_target-gcc`

libre/xalan-java/PKGBUILD

file removed

-69

		`@@ -1,69 +0,0 @@`
		`- # Maintainer: Omar Vega Ramos <ovruni@gnu.org.pe>`
		`-`
		`- _libname=xalan`
		`- pkgname=${_libname}-java`
		`- pkgver=2.7.2`
		`- pkgrel=1.parabola1`
		`- pkgdesc="XSLT processor for transforming XML documents into HTML, text, or other XML document types"`
		`- arch=('any')`
		`- license=('APACHE')`
		`- url="http://xalan.apache.org/xalan-j/index.html"`
		`- depends=('java-runtime' 'xerces2-java')`
		`- makedepends=('apache-ant' 'jakarta-regexp' 'java-bcel' 'java-cup' 'jlex' 'jh' 'xerces2-java')`
		`- source=("http://archive.apache.org/dist/${_libname}/${_libname}-j/source/${_libname}-j_${pkgver//./_}-src.tar.gz"`
		`- "http://repo.maven.apache.org/maven2/${_libname}/${_libname}/${pkgver}/${_libname}-${pkgver}.pom"`
		`- "http://repo.maven.apache.org/maven2/${_libname}/serializer/${pkgver}/serializer-${pkgver}.pom")`
		`- md5sums=('74e6ab12dda778a4b26da67438880736'`
		`- '32d9a54317a2495ec8c7f4d9d89dd656'`
		`- '89a3a32915a378a87a113b917dd1144b')`
		`-`
		`- prepare() {`
		`- cd "${srcdir}/${_libname}-j_${pkgver//./_}"`
		`- rm -rv lib/*.jar`
		`- rm -rv tools/*.jar`
		`- sed -i 's/-static //g' build.xml`
		`-`
		`- ln -sf /usr/share/java/java_cup.jar tools/java_cup.jar`
		`- ln -sf /usr/share/java/JLex.jar tools/JLex.jar`
		`- ln -sf /usr/share/java/bcel.jar lib/BCEL.jar`
		`- ln -sf /usr/share/java/regexp.jar lib/regexp.jar`
		`- ln -sf /usr/share/java/java_cup.jar lib/runtime.jar`
		`- # ln -sf /usr/share/java/xercesImpl.jar lib/xercesImpl.jar`
		`- }`
		`-`
		`- build() {`
		`- cd "${srcdir}/${_libname}-j_${pkgver//./_}"`
		`-`
		`- ant clean xsltc.clean jar xsltc.unbundledjar javadocs docs \`
		`- -Dendorsed.dir=/usr/share/java/`
		`- }`
		`-`
		`- package() {`
		`- cd "${srcdir}/${_libname}-j_${pkgver//./_}"`
		`-`
		`- # Install license file`
		`- install -Dm644 LICENSE.txt "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE.txt"`
		`-`
		`- # Install documentation`
		`- install -d "${pkgdir}/usr/share/doc/${pkgname}"`
		`- cp -r "build/docs" "${pkgdir}/usr/share/doc/${pkgname}"`
		`- cp -r "samples" "${pkgdir}/usr/share/doc/${pkgname}/examples"`
		`-`
		`- # Install Maven artifacts`
		`- export DESTDIR=${pkgdir}`
		`- jh mvn-install ${_libname} ${_libname} ${pkgver} \`
		`- "${srcdir}/${_libname}-${pkgver}.pom" \`
		`- "build/${_libname}.jar" \`
		`- "${_libname}.jar"`
		`- jh mvn-install ${_libname} serializer ${pkgver} \`
		`- "${srcdir}/serializer-${pkgver}.pom" \`
		`- "build/serializer.jar" \`
		`- "serializer.jar"`
		`-`
		`- ln -s "/usr/share/java/${_libname}.jar" \`
		`- "${pkgdir}/usr/share/java/${_libname}-${pkgver}.jar"`
		`- ln -s "/usr/share/java/serializer.jar" \`
		`- "${pkgdir}/usr/share/java/serializer-${pkgver}.jar"`
		`-`
		`- install -m644 "build/xsltc.jar" "${pkgdir}/usr/share/java/"`
		`- }`

libre/xarchiver/PKGBUILD

file modified

+4 -4

		`@@ -1,7 +1,7 @@`
		`- # Maintainer (Arch): Balló György <ballogyor+arch at gmail dot com>`
		`- # Contributor (Arch): Alexander Fehr <pizzapunk gmail com>`
		`- # Contributor (Arch): Andrew Simmons <andrew.simmons@gmail.com>`
		`- # Maintainer (Hyperbola): André Silva <emulatorman@hyperbola.info>`
		`+ # Maintainer (arch): Balló György <ballogyor+arch at gmail dot com>`
		`+ # Contributor: Alexander Fehr <pizzapunk gmail com>`
		`+ # Contributor: Andrew Simmons <andrew.simmons@gmail.com>`
		`+ # Contributor: André Silva <emulatorman@hyperbola.info>`
		`# Maintainer: Omar Vega Ramos <ovruni@gnu.org.pe>`

		`pkgbase=xarchiver`

libre/xerces2-java/PKGBUILD

file removed

-63

		`@@ -1,63 +0,0 @@`
		`- # Maintainer: Omar Vega Ramos <ovruni@gnu.org.pe>`
		`-`
		`- _libname=xerces2`
		`- pkgname=${_libname}-java`
		`- pkgver=2.11.0`
		`- pkgrel=3.parabola1`
		`- pkgdesc="High performance fully compliant Java XML parser"`
		`- arch=('any')`
		`- url="http://xml.apache.org/xerces2-j"`
		`- license=('APACHE')`
		`- depends=('java-runtime' 'java-resolver' 'java-xml-commons-external')`
		`- makedepends=('apache-ant' 'java-resolver' 'java-xml-commons-external' 'jh')`
		`- provides=("java-xerces2=${pkgver}")`
		`- conflicts=('java-xerces2')`
		`- replaces=('java-xerces2')`
		`- source=("http://archive.apache.org/dist/xerces/j/Xerces-J-src.${pkgver}.tar.gz"`
		`- "http://repo.maven.apache.org/maven2/xerces/xercesImpl/${pkgver}/xercesImpl-${pkgver}.pom"`
		`- "xerces2-java-taskdef.patch"`
		`- "xerces2-java-dont_unzip.patch"`
		`- "xerces2-java-HTMLObjectElementImpl.patch")`
		`- md5sums=('d01fc11eacbe43b45681cb85ac112ebf'`
		`- '64288948e6420e49679348b0ce1963f8'`
		`- '600788add1665864495e2bd0ab015613'`
		`- '3bd20b2ea82f14d77031bf0e49c03516'`
		`- 'e1c26eeaedd33dc0a7af493a07a17211')`
		`-`
		`- prepare() {`
		`- cd "${srcdir}/xerces-${pkgver//./_}"`
		`- mkdir -p tools`
		`- patch -Np1 -i ../xerces2-java-taskdef.patch`
		`- patch -Np1 -i ../xerces2-java-dont_unzip.patch`
		`- patch -Np1 -i ../xerces2-java-HTMLObjectElementImpl.patch`
		`- }`
		`-`
		`- build() {`
		`- cd "${srcdir}/xerces-${pkgver//./_}"`
		`- ln -sf /usr/share/java/resolver.jar tools/resolver.jar`
		`- ln -sf /usr/share/java/xml-apis.jar tools/xml-apis.jar`
		`-`
		`- ant clean jar sampjar javadocs`
		`- }`
		`-`
		`- package() {`
		`- cd "${srcdir}/xerces-${pkgver//./_}"`
		`-`
		`- # Install license file`
		`- install -Dm644 LICENSE "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE.txt"`
		`-`
		`- # Install documentation`
		`- install -d "${pkgdir}/usr/share/doc/${pkgname}"`
		`- cp -r "build/docs/javadocs" "${pkgdir}/usr/share/doc/${pkgname}"`
		`- cp -r "build/samples" "${pkgdir}/usr/share/doc/${pkgname}/examples"`
		`-`
		`- # Install Maven artifacts`
		`- export DESTDIR=${pkgdir}`
		`- jh mvn-install xerces xercesImpl ${pkgver} \`
		`- "${srcdir}/xercesImpl-${pkgver}.pom" \`
		`- "build/xercesImpl.jar" \`
		`- "xercesImpl.jar"`
		`-`
		`- ln -s "/usr/share/java/xercesImpl.jar" \`
		`- "${pkgdir}/usr/share/java/xercesImpl-${pkgver}.jar"`
		`- }`

libre/xerces2-java/xerces2-java-HTMLObjectElementImpl.patch

file removed

-18

		`@@ -1,18 +0,0 @@`
		`- --- xerces-2_11_0.orig/src/org/apache/html/dom/HTMLElementImpl.java 2010-11-26 15:42:05.000000000 -0500`
		`- +++ xerces-2_11_0/src/org/apache/html/dom/HTMLElementImpl.java 2015-12-02 09:54:52.042144620 -0500`
		`- @@ -20,6 +20,7 @@`
		`-`
		`- import org.apache.xerces.dom.ElementImpl;`
		`- import org.w3c.dom.Attr;`
		`- +import org.w3c.dom.Document;`
		`- import org.w3c.dom.Node;`
		`- import org.w3c.dom.NodeList;`
		`- import org.w3c.dom.html.HTMLElement;`
		`- @@ -254,4 +255,7 @@`
		`- return null;`
		`- }`
		`-`
		`- + public Document getContentDocument() {`
		`- + throw new UnsupportedOperationException();`
		`- + }`
		`- }`

libre/xerces2-java/xerces2-java-dont_unzip.patch

file removed

-65

		`@@ -1,65 +0,0 @@`
		`- --- xerces-2_11_0.orig/build.xml 2010-11-26 15:42:11.000000000 -0500`
		`- +++ xerces-2_11_0/build.xml 2015-12-03 02:10:02.884516544 -0500`
		`- @@ -246,30 +246,6 @@`
		`- tofile="${build.src}/org/apache/xerces/impl/msg/XPointerMessages_en.properties"/>`
		`- <copy file="${src.dir}/org/apache/xerces/impl/xpath/regex/message.properties"`
		`- tofile="${build.src}/org/apache/xerces/impl/xpath/regex/message_en.properties"/>`
		`- -`
		`- - <!-- now deal with API's: -->`
		`- - <unzip src="${src.apis.zip}" dest="${build.src}">`
		`- - <patternset`
		`- - includes="org/xml/sax/**`
		`- - javax/xml/**`
		`- - javax/xml/datatype/**`
		`- - javax/xml/namespace/**`
		`- - javax/xml/parsers/**`
		`- - javax/xml/stream/**`
		`- - javax/xml/transform/**`
		`- - javax/xml/validation/**`
		`- - javax/xml/xpath/**`
		`- - org/w3c/dom/*`
		`- - org/w3c/dom/bootstrap/**`
		`- - org/w3c/dom/events/**`
		`- - org/w3c/dom/html/**`
		`- - org/w3c/dom/ls/**`
		`- - org/w3c/dom/ranges/**`
		`- - org/w3c/dom/traversal/**`
		`- - org/w3c/dom/views/**`
		`- - org/w3c/dom/xpath/**"`
		`- - />`
		`- - </unzip>`
		`-`
		`- <!-- substitute tokens as needed -->`
		`- <replace file="${build.dir}/src/org/apache/xerces/impl/Version.java"`
		`- @@ -1231,31 +1207,6 @@`
		`- <!-- HACK: Remove reference to XML11Configurable from SAX parser -->`
		`- <replace file="${build.dir}/src/org/apache/xerces/parsers/AbstractSAXParser.java"`
		`- token="return (fConfiguration instanceof XML11Configurable);" value="return false;"/>`
		`- -`
		`- - <!-- now deal with API's: -->`
		`- - <unzip src="${src.apis.zip}" dest="${build.src}">`
		`- - <patternset`
		`- - includes="org/xml/sax/**`
		`- - javax/xml/**`
		`- - javax/xml/datatype/**`
		`- - javax/xml/namespace/**`
		`- - javax/xml/parsers/**`
		`- - javax/xml/stream/**`
		`- - javax/xml/transform/**`
		`- - javax/xml/validation/**`
		`- - javax/xml/xpath/**`
		`- - org/w3c/dom/*`
		`- - org/w3c/dom/bootstrap/**`
		`- - org/w3c/dom/events/**`
		`- - org/w3c/dom/html/**`
		`- - org/w3c/dom/ls/**`
		`- - org/w3c/dom/ranges/**`
		`- - org/w3c/dom/traversal/**`
		`- - org/w3c/dom/views/**`
		`- - org/w3c/dom/xpath/**"`
		`- - />`
		`- - </unzip>`
		`- -`
		`-`
		`- <!-- substitute tokens as needed -->`
		`- <replace file="${build.dir}/src/org/apache/xerces/impl/Version.java"`

libre/xerces2-java/xerces2-java-taskdef.patch

file removed

-38

		`@@ -1,38 +0,0 @@`
		`- --- xerces-2_11_0.orig/build.xml 2010-11-26 15:42:11.000000000 -0500`
		`- +++ xerces-2_11_0/build.xml 2015-09-07 21:19:33.401435351 -0500`
		`- @@ -39,7 +39,7 @@`
		`- <property name="tools.dir" value="./tools"/>`
		`-`
		`- <!-- enable compilation under JDK 1.4 and above -->`
		`- - <taskdef name="xjavac" classname="org.apache.xerces.util.XJavac">`
		`- + <taskdef name="xjavac" classname="org.apache.tools.ant.taskdefs.Javac">`
		`- <classpath>`
		`- <pathelement location="${tools.dir}/bin/xjavac.jar"/>`
		`- </classpath>`
		`- @@ -291,7 +291,7 @@`
		`- source="${javac.source}"`
		`- target="${javac.target}"`
		`- classpath="${build.dir}/classes:${tools.dir}/${jar.apis}:${tools.dir}/${jar.resolver}:${tools.dir}/${jar.serializer}"`
		`- - debug="${debug}"`
		`- + debug="${debug}" nowarn="true"`
		`- debuglevel="${debuglevel}"`
		`- deprecation="${deprecation}"`
		`- optimize="${optimize}"`
		`- @@ -359,7 +359,7 @@`
		`- source="${javac.source}"`
		`- target="${javac.target}"`
		`- classpath="${build.dir}/classes:${tools.dir}/${jar.apis}"`
		`- - debug="${debug}"`
		`- + debug="${debug}" nowarn="true"`
		`- debuglevel="${debuglevel}"`
		`- includeAntRuntime="false"`
		`- includeJavaRuntime="true"/>`
		`- @@ -379,7 +379,7 @@`
		`- source="${javac.source}"`
		`- target="${javac.target}"`
		`- classpath="${tools.dir}/${jar.apis}:${build.dir}/classes:./tools/junit.jar"`
		`- - debug="${debug}"`
		`- + debug="${debug}" nowarn="true"`
		`- debuglevel="${debuglevel}"`
		`- includeAntRuntime="false"`
		`- includeJavaRuntime="true"/>`

libre/xmms2/PKGBUILD

file modified

+7 -7

		`@@ -1,11 +1,11 @@`
		`- # Maintainer (Arch):`
		`+ # Maintainer (arch):`
		`# Contributor: (Arch) Storm Dragon <stormdragon2976@gmail.com>`
		`- # Contributor (Arch): Aaron 'venisonslurpee' Laursen <venisonslurpee@gmail.com>`
		`- # Contributor (Arch): Christopher Rosell <chrippa@tanuki.se>`
		`- # Contributor (Arch): lh <jarryson@gmail.com>`
		`- # Contributor (Arch): Sebastian Schwarz <seschwar@gmail.com>`
		`- # Contributor (Arch): Sergej Pupykin <pupykin.s+arch@gmail.com>`
		`- # Contributor (Arch): Xilon <xilon@gmail.com>`
		`+ # Contributor: Aaron 'venisonslurpee' Laursen <venisonslurpee@gmail.com>`
		`+ # Contributor: Christopher Rosell <chrippa@tanuki.se>`
		`+ # Contributor: lh <jarryson@gmail.com>`
		`+ # Contributor: Sebastian Schwarz <seschwar@gmail.com>`
		`+ # Contributor: Sergej Pupykin <pupykin.s+arch@gmail.com>`
		`+ # Contributor: Xilon <xilon@gmail.com>`
		`# Maintainer: Omar Vega Ramos <ovruni@gnu.org.pe>`

		`pkgname=xmms2`

libre/xscreensaver/PKGBUILD

file modified

+30 -18

		`@@ -1,21 +1,24 @@`
		`- # Maintainer (Arch): Levente Polyak <anthraxx[at]archlinux[dot]org>`
		`- # Contributor (Arch): Eric Bélanger <eric@archlinux.org>`
		`+ # Maintainer (arch): Levente Polyak <anthraxx[at]archlinux[dot]org>`
		`+ # Contributor: Eric Bélanger <eric@archlinux.org>`
		`# Maintainer: Omar Vega Ramos <ovruni@gnu.org.pe>`
		`# Contributor: André Silva <emulatorman@hyperbola.info>`
		`# Contributor: freemor <freemor@freemor.ca>`

		`+`
		`# parabola changes and rationale:`
		`- # removed nonfree asm files`
		`+ # - remove non-free asm files`
		`+ # - remove references to non-free software`
		`+ # - remove nag warnings`
		`+`

		`pkgname=xscreensaver`
		`- pkgver=6.00`
		`- pkgrel=2`
		`+ pkgver=6.04`
		`+ pkgrel=1`
		`pkgrel+=.parabola1`
		`pkgdesc='Screen saver and locker for the X Window System'`
		`- pkgdesc+=", without nonfree asm files"`
		`url='https://www.jwz.org/xscreensaver/'`
		`arch=('x86_64')`
		`- arch+=('i686' 'armv7h')`
		`+ arch+=(armv7h i686)`
		`license=('BSD')`
		`depends=(`
		`'gtk2' 'glu' 'xorg-appres' 'libglvnd' 'libjpeg-turbo' 'libjpeg.so'`
		`@@ -27,22 +30,33 @@`
		`optdepends=('gdm: for login manager support')`
		`backup=('etc/pam.d/xscreensaver')`
		`source=(https://www.jwz.org/xscreensaver/${pkgname}-${pkgver}.tar.gz`
		`- LICENSE`
		`- Remove_bsod.patch)`
		`- sha512sums=('7292bacf633137b5c0eb2de9a99dc238b2012a113e62c86d4be19fc2fd4fea7133bd950253ca2d3a4ab27af4b4dc9a40a857e8d3dc714946ccfa7efcd043ded6'`
		`- '863c699479b2ec2775a0d1cba22e615929194a14af164b3513e46a0c04229da6547255a4da8f7f1bbb40906898c124ed3c9ec2436b76b62affcb62385af9783e'`
		`- '1b63c91ae8ef74b9fe34ddf098620299fcf791140468240eeebbdc00a1d34f176d3a67ba90b942bfece0c76c2239eea02d86b5405e5397c7cff6e021c5bf72e3')`
		`- b2sums=('228f176915f0f62bc782d43b19c767bd58f72820665ed1c0602fc5f7de4b58898de2c087905fab6bca886452a996985c361e844854dfb864066699db9c4e7235'`
		`- 'cacb6ba39d6ecb8703ef5f5a7dc74de0ca805cce73b43a8b9b6b4c255c909aa9b5e692de76c2fbd4da26ce6efb5f2a46138c43b1b37f53cee6d20fd6ed41f4a9'`
		`- '1152d9141f994bb1494a4583460529ff607d3cb1ab5b53e8f2fa65d1bf9c9552c4d8e246dc5ce28c6e63735b46234baad6768d89c85c159f0ff089da66cc319a')`
		`+ LICENSE)`
		`+ source+=(remove_bsod.patch`
		`+ remove-nagging.patch)`
		`+ sha512sums=('7e8f01853b3d9252ce0120894db7dd4fa3cd19114602a09aa770ec750e2f3742585ca4daf19b009e97386f8c0e3cc89330fe760148c6388f41de8cc1f48f8071'`
		`+ '863c699479b2ec2775a0d1cba22e615929194a14af164b3513e46a0c04229da6547255a4da8f7f1bbb40906898c124ed3c9ec2436b76b62affcb62385af9783e')`
		`+ sha512sums+=('1b63c91ae8ef74b9fe34ddf098620299fcf791140468240eeebbdc00a1d34f176d3a67ba90b942bfece0c76c2239eea02d86b5405e5397c7cff6e021c5bf72e3'`
		`+ 'da0d2dc10fda9e95950269367ff8b275c8262036e2d1302918c313a0bff79c35cacbb818c8f7b77b7b1f9d05aec91ecfaa78049d4dabb7c400aabeeb9af55b68')`
		`+ b2sums=('42411d5f63a99d4aaccbc3bc34f8c31a1f25f1806eaf513a1ba59c2f24722e27fa2a7b1970c82a591502627224c4b4269176bda3475aba58bb945d5cd9a9464b'`
		`+ 'cacb6ba39d6ecb8703ef5f5a7dc74de0ca805cce73b43a8b9b6b4c255c909aa9b5e692de76c2fbd4da26ce6efb5f2a46138c43b1b37f53cee6d20fd6ed41f4a9')`
		`+ b2sums+=('1152d9141f994bb1494a4583460529ff607d3cb1ab5b53e8f2fa65d1bf9c9552c4d8e246dc5ce28c6e63735b46234baad6768d89c85c159f0ff089da66cc319a'`
		`+ '607040a87be8b1dbefb3fa4897de33f2f712946a68bf4e5af90888b1783bca40bfd2cf5365ec75bfc61e71c09abcb95b59406501e7659cebf12cdae29592e326')`
		`+`

		`prepare() {`
		`cd ${pkgname}-${pkgver}`
		`+`
		`# Deleting dmsc.asm file due which don't have source code supplied`
		`rm -v hacks/images/m6502/dmsc.asm`
		`+`
		`# Remove BSOD for references to non-free (Issue #2391)`
		`- patch -Nup1 hacks/Makefile.in ../Remove_bsod.patch`
		`+ echo "applying remove_bsod.patch"`
		`+ patch -Nup1 hacks/Makefile.in ../remove_bsod.patch`
		`rm -v hacks/bsod*`
		`+`
		`+ # remove annoying "this program is too old" messages`
		`+ echo "applying remove-nagging.patch"`
		`+ patch -Nup1 -i ../remove-nagging.patch`
		`}`

		`build() {`
		`@@ -52,9 +66,7 @@`
		`--sysconfdir=/etc \`
		`--localstatedir=/var \`
		`--libexecdir=/usr/lib \`
		`- --with-x-app-defaults=/usr/share/X11/app-defaults \`
		`--without-setuid-hacks \`
		`- --without-setcap-hacks \`
		`--with-pam \`
		`--with-login-manager \`
		`--with-gtk \`

libre/xscreensaver/remove-nagging.patch

file added

+40

		`@@ -0,0 +1,40 @@`
		`+ diff --git a/driver/demo-Gtk.c b/driver/demo-Gtk.c`
		`+ index 0406d31..002c010 100644`
		`+ --- a/driver/demo-Gtk.c`
		`+ +++ b/driver/demo-Gtk.c`
		`+ @@ -5012,6 +5012,7 @@ main (int argc, char **argv)`
		`+ gtk_timeout_add (5 * 1000, the_network_is_not_the_computer, s);`
		`+`
		`+`
		`+ +#ifdef I_LOVE_NAG_SCREENS`
		`+ if (time ((time_t ) 0) - XSCREENSAVER_RELEASED > 60602430*17)`
		`+ warning_dialog (s->toplevel_widget,`
		`+ _("Warning:\n\n"`
		`+ @@ -5024,6 +5025,7 @@ main (int argc, char **argv)`
		`+ "your distro is doing you a disservice. Build from source.)\n"`
		`+ ),`
		`+ D_NONE, 7);`
		`+ +#endif // I_LOVE_NAG_SCREENS`
		`+`
		`+ /* Run the Gtk event loop, and not the Xt event loop. This means that`
		`+ if there were Xt timers or fds registered, they would never get serviced,`
		`+ diff --git a/driver/dialog.c b/driver/dialog.c`
		`+ index 1ab6ee4..027a1ed 100644`
		`+ --- a/driver/dialog.c`
		`+ +++ b/driver/dialog.c`
		`+ @@ -1372,6 +1372,7 @@ window_draw (window_state *ws)`
		`+ lines[i].align = CENTER;`
		`+ i++;`
		`+`
		`+ +#ifdef I_LOVE_NAG_SCREENS`
		`+ if (time ((time_t ) 0) - XSCREENSAVER_RELEASED > 60602430*17)`
		`+ {`
		`+ lines[i].text = _("Update available!\nThis version is very old.\n");`
		`+ @@ -1395,6 +1396,7 @@ window_draw (window_state *ws)`
		`+ lines[i].align = CENTER;`
		`+ i++;`
		`+ }`
		`+ +#endif // I_LOVE_NAG_SCREENS`
		`+`
		`+ if (ws->hostname_label && *ws->hostname_label)`
		`+ {`

libre/xscreensaver/remove_bsod.patch ~~libre/xscreensaver/Remove_bsod.patch~~

file renamed

file was moved with no change to the file

libre/xtensa-elf-binutils/PKGBUILD

file modified

+6 -7

		`@@ -2,22 +2,21 @@`

		`_target=xtensa-elf`
		`pkgname=$_target-binutils`
		`- pkgver=2.37`
		`+ pkgver=2.39`
		`pkgrel=1`
		`pkgdesc='A set of programs to assemble and manipulate binary and object files for the Xtensa (bare-metal) target'`
		`- arch=('x86_64' 'i686' 'armv7h')`
		`+ arch=(x86_64 i686 armv7h)`
		`url="https://www.gnu.org/software/binutils/"`
		`- license=('GPL')`
		`- depends=('zlib')`
		`+ license=(GPL)`
		`+ depends=(zlib libelf)`
		`source=(https://ftp.gnu.org/gnu/binutils/binutils-$pkgver.tar.bz2{,.sig}`
		`binutils-2.36_fixup.patch binutils-2.34_fixup.patch binutils.patch)`
		`- sha512sums=('b3f5184697f77e94c95d48f6879de214eb5e17aa6ef8e96f65530d157e515b1ae2f290e98453e4ff126462520fa0f63852b6e1c8fbb397ed2e41984336bc78c6'`
		`+ sha512sums=('faa592dd48fc715901ad704ac96dbd34b1792c51e77c7a92a387964b0700703c74be07de45cc4751945c8c0674368c73dc17bbc563d1d2cd235b5ebd8c6e7efb'`
		`'SKIP'`
		`'fa1e3e1b30d625eae4e59f1396079cc3fa4d77ec4f119ad20c52db1e1ff1819989ff16dc583d7c719caeb7c0ece48d76fe7c08a85b960c7bc924fe780ffa4ac2'`
		`'4e5bbba907eec565f5c3ea00fa5a19c146ec19b1f2db38c6581f80a524475ad9b066839ca671da05c6fab9af402f2bb76e01d227e7456b3ef48c6d685605c8d1'`
		`'e10ed358794d7aa32ac25087afd804dc4c3028c4664d7608eb86147f041561d16209afa6501bc8a19e02386674011d567640175f6b8bf89275c243dc3b3a9980')`
		`- validpgpkeys=('EAF1C276A747E9ED86210CBAC3126D3B4AE55E93' # Tristan Gingold <gingold@adacore.com>`
		`- '3A24BC1E8FB409FA9F14371813FCEF89DD9E3C4F') # Nick Clifton (Chief Binutils Maintainer) <nickc@redhat.com>`
		`+ validpgpkeys=('3A24BC1E8FB409FA9F14371813FCEF89DD9E3C4F') # Nick Clifton (Chief Binutils Maintainer) <nickc@redhat.com>`

		`prepare() {`
		`cd binutils-$pkgver`

libre/xtensa-elf-gcc/PKGBUILD

file modified

+13 -14

		`@@ -2,27 +2,26 @@`

		`_target=xtensa-elf`
		`pkgname=$_target-gcc`
		`- pkgver=11.2.0`
		`- _islver=0.24`
		`+ pkgver=12.2.0`
		`pkgrel=1`
		`#_snapshot=8-20210107`
		`pkgdesc='The GNU Compiler Collection - cross compiler for Xtensa (bare-metal) target'`
		`arch=(x86_64 i686 armv7h)`
		`url='http://gcc.gnu.org/'`
		`license=(GPL LGPL FDL)`
		`- depends=($_target-binutils libmpc zlib)`
		`+ depends=($_target-binutils libmpc zlib libisl zstd)`
		`makedepends=(gmp mpfr)`
		`- options=(!emptydirs !strip)`
		`+ options=(!emptydirs !strip !lto)`
		`source=(https://gcc.gnu.org/pub/gcc/releases/gcc-$pkgver/gcc-$pkgver.tar.xz{,.sig}`
		`#https://gcc.gnu.org/pub/gcc/snapshots/$_snapshot/gcc-$_snapshot.tar.xz`
		`- https://libisl.sourceforge.io/isl-$_islver.tar.bz2`
		`gcc.patch)`
		`- sha512sums=('d53a0a966230895c54f01aea38696f818817b505f1e2bfa65e508753fcd01b2aedb4a61434f41f3a2ddbbd9f41384b96153c684ded3f0fa97c82758d9de5c7cf'`
		`+ sha512sums=('e9e857bd81bf7a370307d6848c81b2f5403db8c7b5207f54bce3f3faac3bde63445684092c2bc1a2427cddb6f7746496d9fbbef05fbbd77f2810b2998f1f9173'`
		`'SKIP'`
		`- 'aab3bddbda96b801d0f56d2869f943157aad52a6f6e6a61745edd740234c635c38231af20bc3f1a08d416a5e973a90e18249078ed8e4ae2f1d5de57658738e95'`
		`'7637408259cef4b14a2f41690bbc769ad0dc6cf4d1c782405526aeb58f68193269af6882b23fb57c3521174e45709ed2d54f0af1f835646e70a3bfd9f626aad9')`
		`- validpgpkeys=(33C235A34C46AA3FFB293709A328C3A2C3C45C06 # Jakub Jelinek <jakub@redhat.com>`
		`+ validpgpkeys=(D3A93CAD751C2AF4F8C7AD516C35B99309B5FA62 # Jakub Jelinek <jakub@redhat.com>`
		`+ 33C235A34C46AA3FFB293709A328C3A2C3C45C06 # Jakub Jelinek <jakub@redhat.com>`
		`13975A70E63C361C73AE69EF6EEB81F8981C74C7) # Richard Guenther <richard.guenther@gmail.com>`
		`+`
		`if [ -n "$_snapshot" ]; then`
		`_basedir=gcc-$_snapshot`
		`else`
		`@@ -35,14 +34,8 @@`
		`# https://github.com/qca/open-ath9k-htc-firmware/tree/master/local/patches`
		`patch -Np1 -i ../gcc.patch`

		`- # link isl for in-tree builds`
		`- ln -sf ../isl-$_islver isl`
		`-`
		`echo $pkgver > gcc/BASE-VER`

		`- # hack! - some configure tests for header files using "$CPP $CPPFLAGS"`
		`- sed -i "/ac_cpp=/s/\$CPPFLAGS/\$CPPFLAGS -O2/" "$srcdir"/$_basedir/{libiberty,gcc}/configure`
		`-`
		`mkdir $srcdir/gcc-build`
		`}`

		`@@ -54,6 +47,12 @@`
		`CFLAGS=${CFLAGS/-pipe/}`
		`CXXFLAGS=${CXXFLAGS/-pipe/}`

		`+ # Credits @allanmcrae`
		`+ # https://github.com/allanmcrae/toolchain/blob/f18604d70c5933c31b51a320978711e4e6791cf1/gcc/PKGBUILD`
		`+ # TODO: properly deal with the build issues resulting from this`
		`+ CFLAGS=${CFLAGS/-Werror=format-security/}`
		`+ CXXFLAGS=${CXXFLAGS/-Werror=format-security/}`
		`+`
		`if [ "$CARCH" = i686 ]; then`
		`# using -Werror=format-security causes i686 build to fail`
		`CXXFLAGS+=' -Wno-error=format-security'`

libre/your-freedom/PKGBUILD

file modified

+11 -11

		`@@ -12,27 +12,27 @@`


		`pkgname=your-freedom`
		`- pkgver=20220508`
		`- _gitver=c3a0d49f9f95503ed41feed32efbfd8b38401852`
		`+ pkgver=20221212`
		`+ _gitver=fc418f69715d79600b405a86eb19382ddfdf11c6`
		`pkgrel=1`
		`- pkgdesc="This package conflicts with every nonfree package known to date to ensure your system is free."`
		`- license=(GPL3)`
		`- url=https://wiki.parabola.nu/Blacklist`
		`+ pkgdesc="This meta-package conflicts with every known non-free Arch package, to ensure that your system is libre"`
		`arch=(any)`
		`- install=${pkgname}.install`
		`+ url=https://wiki.parabola.nu/Blacklist`
		`+ license=(GPL3)`

		`makedepends=(librelib)`
		`- source=(blacklist-${_gitver}.txt::https://git.parabola.nu/blacklist.git/plain/blacklist.txt?id=${_gitver})`
		`+ install=${pkgname}.install`
		`+ source=(${pkgname}-blacklist-${_gitver}.txt::https://git.parabola.nu/blacklist.git/plain/blacklist.txt?id=${_gitver})`

		`- sha256sums=('53e27f1b6ef1042e2377a710b5faf8edfa4a63efeee082702dac15aa1cb1e550')`
		`+ sha256sums=('59f28500a4037350d7764805bb9ff5a8f252cf7d5ea7acb180b34a0545b5c469')`


		`package()`
		`{`
		`# collect blacklisted package names as pacman conflicts,`
		`# also to be excluded by the repo importer, and rejected by libremakepkg`
		`- conflicts=( $( libreblacklist normalize < blacklist-${_gitver}.txt \| \`
		`- cut -d: -f1,2 \| sed -n 's/:$//p' \| sort -u ) )`
		`+ conflicts=( $( libreblacklist normalize < ${pkgname}-blacklist-${_gitver}.txt \| \`
		`+ cut -d: -f1,2 \| sed -n 's/:$//p' \| sort -u ) )`

		`- install -Dm644 blacklist-${_gitver}.txt "${pkgdir}"/usr/share/doc/${pkgname}/blacklist.txt`
		`+ install -Dm644 ${pkgname}-blacklist-${_gitver}.txt "${pkgdir}"/usr/share/doc/${pkgname}/blacklist.txt`
		`}`

libre/your-freedom/your-freedom.install

file modified

+21 -30

		`@@ -1,32 +1,23 @@`
		`-`
		`- pre_install() {`
		`- cat <<EOM`
		`- == IMPORTANT NOTICE ==`
		`-`
		`- This package will help you identify nonfree packages that are installed`
		`- on your system at the time of its installation, as well as protecting`
		`- you from (accidentally) installing them.`
		`-`
		`- Also, if any other nonfree package is identified, later updates will ask`
		`- you for its removal.`
		`-`
		`- Have in mind that, if you want to retain certain nonfree packages`
		`- installed on your system, you'll have to remove your-freedom :)`
		`-`
		`- If you find out any of the following:`
		`- * Cascade package removal due to nonfree dependencies,`
		`- * Your-freedom conflicting with a libre package,`
		`- * Etc.`
		`-`
		`- Please report back to the Parabola Project on the usual channels:`
		`- * https://labs.parabola.nu`
		`- * mailto:assist@lists.parabola.nu`
		`- * irc://irc.libera.chat/#parabola`
		`- EOM`
		`- }`
		`-`
		`- pre_upgrade() {`
		`- pre_install`
		`+ notice()`
		`+ {`
		`+ cat <<EOF`
		`+ The 'your-freedom' package detects other packages on your system,`
		`+ which are known to be non-free or depend on other non-free packages,`
		`+ and protects you from (accidentally) installing those in the future.`
		`+`
		`+ Also, as any other such packages are identified in the future,`
		`+ an updated 'your-freedom' package will prompt you for their removal.`
		`+`
		`+ Your feedback/participation is important. It is _your_ freedom, after all.`
		`+ If you notice any problems caused by this package, or notice some package`
		`+ which does or does not deserve to be guarded, please do start a discussion.`
		`+`
		`+ * Bugs: https://labs.parabola.nu`
		`+ * Forum: https://forum.parabola.nu`
		`+ * Email: mailto:assist@lists.parabola.nu`
		`+ * Chat: ircs://irc.libera.chat/#parabola`
		`+ EOF`
		`}`

		`- # vim:set ts=2 sw=2 et:`
		`+ pre_install() { notice ; }`
		`+ pre_upgrade() { notice ; }`

libre/your-freedom_emu/PKGBUILD

file modified

+25 -18

		`@@ -1,30 +1,37 @@`
		`- # Maintainer: Parabola Project <dev@lists.parabola.nu>`
		`+ # SPDX-License-Identifier: CC0-1.0`
		`+ # Maintainer: Parabola Hackers <dev@lists.parabola.nu>`
		`+`
		`+`
		`+ # NOTE: This PKGBUILD does not need to be edited manually.`
		`+ # The package is normally built automatically by autobuilder.`
		`+ # To generate a new package, simply push changes to blacklist.git.`
		`+ # The autobuilder will modify this PKGBUILD,`
		`+ # replacing $pkgver, $_gitver, and the checksum (updpkgsums),`
		`+ # build and publish the package,`
		`+ # and commit the modified PKGBUILD to abslibre.`
		`+`

		`pkgname=your-freedom_emu`
		`- pkgdesc="This package removes free software emulators for which no free software games, OS or applications exist (yet)."`
		`- license=('GPL3')`
		`- url="https://git.parabola.nu/blacklist.git"`
		`pkgver=20210421`
		`- _gitver=095aa1e09cfc51d31b3bb04cb83b29a418346b72`
		`pkgrel=1`
		`+ _gitver=095aa1e09cfc51d31b3bb04cb83b29a418346b72`
		`+ pkgdesc="This package removes free software emulators for which no free software games, OS or applications exist (yet)."`
		`+ arch=(any)`
		`+ url=https://wiki.parabola.nu/Blacklist`
		`+ license=(GPL3)`

		`- arch=('any')`
		`+ makedepends=(librelib)`
		`install=${pkgname}.install`
		`+ source=(${pkgname}-blacklist-${_gitver}.txt::https://git.parabola.nu/blacklist.git/plain/${pkgname}-blacklist.txt?id=${_gitver})`

		`- makedepends=(librelib)`
		`- source=(blacklist-${_gitver}.txt::https://git.parabola.nu/blacklist.git/plain/${pkgname}-blacklist.txt?id=${_gitver})`
		`sha512sums=('736b2e8bc9f766b72787851a7f2bc9914ef1e1234040e954098568b62c561b09de753206e24439df796f7f9117b1e5fe748d5a4c7f691818c61d415be75c3488')`

		`- package() {`
		`- cd "$srcdir"`

		`- conflicts=($( \`
		`- < blacklist-${_gitver}.txt \`
		`- libreblacklist normalize \| \`
		`- cut -d: -f1,2 \| \`
		`- sed -n 's/:$//p' \| \`
		`- sort -u \`
		`- ))`
		`+ package()`
		`+ {`
		`+ # collect blacklisted package names as pacman conflicts`
		`+ conflicts=( $( libreblacklist normalize < blacklist-${_gitver}.txt \| \`
		`+ cut -d: -f1,2 \| sed -n 's/:$//p' \| sort -u ) )`

		`- install -Dm644 blacklist-${_gitver}.txt "$pkgdir"/usr/share/doc/${pkgname}/blacklist.txt`
		`+ install -Dm644 ${pkgname}-blacklist-${_gitver}.txt "${pkgdir}"/usr/share/doc/${pkgname}/blacklist.txt`
		`}`

libre/your-freedom_emu/your-freedom_emu.install

file modified

+18 -22

		`@@ -1,27 +1,23 @@`
		`+ notice()`
		`+ {`
		`+ cat <<EOF`
		`+ The 'your-freedom_emu' package detects other packages on your system,`
		`+ which implement emulators of computers with no known libre software,`
		`+ and protects you from (accidentally) installing those in the future.`

		`- pre_install() {`
		`- cat <<EOM`
		`- == IMPORTANT NOTICE ==`
		`+ Also, as any other such packages are identified in the future,`
		`+ an updated 'your-freedom_emu' package will prompt you for their removal.`

		`- This package will help you identify emulator packages that are installed`
		`- on your system at the time of its installation, as well as protecting`
		`- you from (accidentally) installing them.`
		`+ Your feedback/participation is important. It is _your_ freedom, after all.`
		`+ If you notice any problems caused by this package, or notice some package`
		`+ which does or does not deserve to be guarded, please do start a discussion.`

		`- Also, if any other emulator package is identified, later updates will ask`
		`- you for its removal.`
		`-`
		`- Have in mind that, if you want to retain certain emulator packages`
		`- installed on your system, you'll have to remove your-freedom_emu :)`
		`-`
		`- Please report back to the Parabola Project on the usual channels:`
		`- * https://labs.parabola.nu`
		`- * irc://freenode.net/#parabola`
		`- * mailto:dev@lists.parabola.nu`
		`- EOM`
		`- }`
		`-`
		`- pre_upgrade() {`
		`- pre_install`
		`+ * Bugs: https://labs.parabola.nu`
		`+ * Forum: https://forum.parabola.nu`
		`+ * Email: mailto:assist@lists.parabola.nu`
		`+ * Chat: ircs://irc.libera.chat/#parabola`
		`+ EOF`
		`}`

		`- # vim:set ts=2 sw=2 et:`
		`+ pre_install() { notice ; }`
		`+ pre_upgrade() { notice ; }`

nonprism-testing/geoclue/PKGBUILD

file modified

+1 -1

		`@@ -1,4 +1,4 @@`
		`- # Maintainer (Arch): Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>`
		`+ # Maintainer (arch): Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>`
		`# Contributor: György Balló <ballogy@freestart.hu>`
		`# Maintainer: Freemor freemor@freemor.ca`

nonprism/bitlbee/PKGBUILD

file modified

+6 -6

		`@@ -1,10 +1,10 @@`
		`# $Id: PKGBUILD 287876 2017-02-01 15:04:41Z bpiotrowski $`
		`- # Maintainer (Arch): Dave Reisner <dreisner@archlinux.org>`
		`- # Contributor (Arch): Gaetan Bisson <bisson@archlinux.org>`
		`- # Contributor (Arch): Daniel J Griffiths <ghost1227@archlinux.us>`
		`- # Contributor (Arch): Jeff 'codemac' Mickey <jeff@archlinux.org>`
		`- # Contributor (Arch): simo <simo@archlinux.org>`
		`- # Contributor (Arch): FUBAR <mrfubar@gmail.com>`
		`+ # Maintainer (arch): Dave Reisner <dreisner@archlinux.org>`
		`+ # Contributor: Gaetan Bisson <bisson@archlinux.org>`
		`+ # Contributor: Daniel J Griffiths <ghost1227@archlinux.us>`
		`+ # Contributor: Jeff 'codemac' Mickey <jeff@archlinux.org>`
		`+ # Contributor: simo <simo@archlinux.org>`
		`+ # Contributor: FUBAR <mrfubar@gmail.com>`
		`# Maintainer: Márcio Silva <coadde@hyperbola.info>`

		`pkgname=bitlbee`

nonprism/bti/PKGBUILD

file modified

+4 -4

		`@@ -1,7 +1,7 @@`
		`- # Maintainer (Arch): Jaroslav Lichtblau <dragonlord@aur.archlinux.org>`
		`- # Contributor (Arch): Kaiting Chen <kaitocracy@gmail.com>`
		`- # Contributor (Arch): uvok <uvok at online dot de>`
		`- # Contributor (Arch): Urist <9362773 at gmail.com>`
		`+ # Maintainer (arch): Jaroslav Lichtblau <dragonlord@aur.archlinux.org>`
		`+ # Contributor: Kaiting Chen <kaitocracy@gmail.com>`
		`+ # Contributor: uvok <uvok at online dot de>`
		`+ # Contributor: Urist <9362773 at gmail.com>`

		`pkgname=bti`
		`pkgver=034`

nonprism/california/PKGBUILD

file modified

+2 -2

		`@@ -1,5 +1,5 @@`
		`- # Maintainer (Arch): Martin Poehlmann <mpdeimos@outlook.com>`
		`- # Contributor (Hyperbola): André Silva <emulatorman@hyperbola.info>`
		`+ # Maintainer (arch): Martin Poehlmann <mpdeimos@outlook.com>`
		`+ # Contributor: André Silva <emulatorman@hyperbola.info>`
		`# Maintainer: Omar Vega Ramos <ovruni@gnu.org.pe>`

		`pkgname=california`

nonprism/choqok/PKGBUILD

file modified

+5 -5

		`@@ -1,9 +1,9 @@`
		`- # Contributor (Arch): Peter Richard Lewis <plewis@aur.archlinux.org>`
		`- # Contributor (Arch): Andrea Scarpino <andrea@archlinux.org>`
		`- # Contributor (Arch): Emanuele Rossi <newdna1510@yahoo.it>`
		`- # Contributor (Arch): Bram Schoenmakers <me@bramschoenmakers.nl>`
		`+ # Contributor: Peter Richard Lewis <plewis@aur.archlinux.org>`
		`+ # Contributor: Andrea Scarpino <andrea@archlinux.org>`
		`+ # Contributor: Emanuele Rossi <newdna1510@yahoo.it>`
		`+ # Contributor: Bram Schoenmakers <me@bramschoenmakers.nl>`
		`# Contributor: Márcio Silva <coadde@hyperbola.info>`
		`- # Maintainers: Parabola hackers <dev@lists.parabola.nu>`
		`+ # Maintainer: Parabola Hackers <dev@lists.parabola.nu>`

		`pkgname=choqok`
		`pkgver=1.6.0`

nonprism/darktable/PKGBUILD

file modified

+3 -3

		`@@ -1,8 +1,8 @@`
		`# Maintainer: Andreas Grapentin <andreas@grapentin.org>`
		`- # Maintainer (Arch): Sergej Pupykin <pupykin.s+arch@gmail.com>`
		`+ # Maintainer (arch): Sergej Pupykin <pupykin.s+arch@gmail.com>`
		`# Contributor: Márcio Silva <coadde@hyperbola.info>`
		`- # Contributor (Arch): Christian Himpel <chressie at gmail dot com>`
		`- # Contributor (Arch): Johannes Hanika <hanatos at gmail dot com>`
		`+ # Contributor: Christian Himpel <chressie at gmail dot com>`
		`+ # Contributor: Johannes Hanika <hanatos at gmail dot com>`
		`# Contributor: Freemor <freemor@freemor.ca>`

		`pkgname=darktable`

nonprism/digikam/0001-optionally-enable-OpenGL.patch

file removed

-34

		`@@ -1,34 +0,0 @@`
		`- From 9b37ca152cbae4b86ce2b93f7b1af58f092d1ccf Mon Sep 17 00:00:00 2001`
		`- From: Kevin Mihelich <kevin@archlinuxarm.org>`
		`- Date: Tue, 5 Jul 2016 18:47:56 -0600`
		`- Subject: [PATCH] optionally enable OpenGL`
		`-`
		`- Signed-off-by: Kevin Mihelich <kevin@archlinuxarm.org>`
		`- ---`
		`- CMakeLists.txt \| 3 ++-`
		`- 1 file changed, 2 insertions(+), 1 deletion(-)`
		`-`
		`- diff --git a/CMakeLists.txt b/CMakeLists.txt`
		`- index 89e0682..b60d0b4 100644`
		`- --- a/CMakeLists.txt`
		`- +++ b/CMakeLists.txt`
		`- @@ -105,6 +105,7 @@ option(ENABLE_KFILEMETADATASUPPORT "Build digiKam with KDE files indexer suppor`
		`- option(ENABLE_AKONADICONTACTSUPPORT "Build digiKam with KDE Mail Contacts support (default=OFF)" OFF)`
		`- option(ENABLE_MEDIAPLAYER "Build digiKam with Media Player support (default=OFF)" OFF)`
		`- option(ENABLE_DBUS "Build digiKam with DBUS support (default=ON)" ON)`
		`- +option(ENABLE_OPENGL "Build digiKam with OpenGL support (default=ON)" ON)`
		`- option(ENABLE_APPSTYLES "Build digiKam with support for changing the widget application style (default=OFF)" OFF)`
		`-`
		`- # Mysql support options (experimental):`
		`- @@ -293,7 +294,7 @@ else()`
		`- endif()`
		`-`
		`- # decide if Presentation tool can be built with OpenGL`
		`- -if(OPENGL_FOUND AND OPENGL_GLU_FOUND AND Qt5OpenGL_FOUND)`
		`- +if(OPENGL_FOUND AND OPENGL_GLU_FOUND AND Qt5OpenGL_FOUND AND ENABLE_OPENGL)`
		`- set(HAVE_OPENGL TRUE)`
		`- elseif()`
		`- set(HAVE_OPENGL FALSE)`
		`- --`
		`- 2.10.2`
		`-`

nonprism/digikam/PKGBUILD

file removed

-73

		`@@ -1,73 +0,0 @@`
		`- # $Id$`
		`- # Maintainer (Arch): Ronald van Haren <ronald@archlinux.org>`
		`- # Maintainer (Arch): Antonio Rojas <arojas@archlinux.org>`
		`- # Contributor (Arch): Andrea Scarpino <andrea@archlinux.org>`
		`- # Contributor (Arch): Tobias Powalowski <tpowa@archlinux.org>`
		`- # Contributor: Andreas Grapentin <andreas@grapentin.org>`
		`- # Contributor: André Silva <emulatorman@hyperbola.info>`
		`- # Contributor: Márcio Silva <coadde@hyperbola.info>`
		`- # Contributor: jc_gargma <jc_gargma@iserlohn-fortress.net>`
		`-`
		`- # parabola changes and rationale:`
		`- # - remove libkvkontakte support for kipi-plugins`
		`-`
		`- pkgbase=digikam`
		`- pkgname=(kipi-plugins)`
		`- _pkgver=5.9.0`
		`- pkgver=${_pkgver//-/_} # for beta versions`
		`- pkgrel=1`
		`- pkgrel+=.nonprism1`
		`- pkgdesc="An advanced digital photo management application"`
		`- arch=(x86_64)`
		`- arch+=(i686 armv7h)`
		`- license=(GPL)`
		`- url="http://www.digikam.org/"`
		`- makedepends=(extra-cmake-modules libkipi libksane liblqr opencv doxygen lensfun eigen boost kdoctools marble-common`
		`- kfilemetadata akonadi-contacts qtav threadweaver kcalcore knotifyconfig libmediawiki libkvkontakte glu)`
		`- source=("http://download.kde.org/stable/${pkgbase}/${pkgbase}-${_pkgver}.tar.xz")`
		`- source+=("libre.patch" "nonprism.patch")`
		`- sha256sums=('660d32eedcfd6fe1a75170a651fab068ae62f7f092ae710771a2f32a1c550d1b'`
		`- '80fbe434d326551f3dc029c5db3ad1b50e87870b03185467aa25a5c03764cc89'`
		`- 'e3d8ec4fd041a5545b7efef167d3b2ae6efc1f510832dabc7430ddfeb6b3c4ac')`
		`-`
		`- prepare() {`
		`- mkdir -p build`
		`-`
		`- # fix freedom issues`
		`- cd $pkgbase-$_pkgver`
		`- patch -Np1 -i "$srcdir"/libre.patch`
		`- patch -Np1 -i "$srcdir"/nonprism.patch`
		`- }`
		`-`
		`- build() {`
		`- cd build`
		`-`
		`- cmake ../$pkgbase-${_pkgver} \`
		`- -DCMAKE_INSTALL_PREFIX=/usr \`
		`- -DCMAKE_INSTALL_LIBDIR=lib \`
		`- -DBUILD_TESTING=OFF \`
		`- -DENABLE_KFILEMETADATASUPPORT=ON \`
		`- -DENABLE_MEDIAPLAYER=ON \`
		`- -DENABLE_AKONADICONTACTSUPPORT=ON \`
		`- -DENABLE_MYSQLSUPPORT=ON \`
		`- -DENABLE_OPENCV3=ON \`
		`- -DENABLE_APPSTYLES=ON \`
		`- -DENABLE_LEGACY=ON \`
		`- -DDIGIKAMSC_COMPILE_LIBKVKONTAKTE=OFF`
		`- make`
		`- }`
		`-`
		`- package_kipi-plugins() {`
		`- pkgdesc="A collection of plugins extending the KDE graphics and image applications as digiKam"`
		`- pkgdesc+=", without nonfree suggestions and support for unsafe and dangerous for privacy protocols"`
		`- depends=(kio libkipi)`
		`- optdepends=('libmediawiki: MediaWiki Export plugin')`
		`-`
		`- cd build/extra`
		`- make DESTDIR="$pkgdir" install`
		`- cd $srcdir/build/po`
		`- make DESTDIR="$pkgdir" install`
		`-`
		`- # Provided by digikam`
		`- rm "$pkgdir"/usr/share/locale/*/LC_MESSAGES/digikam.mo`
		`- }`

nonprism/digikam/libre.patch

file removed

-58

		`@@ -1,58 +0,0 @@`
		`- diff --git a/extra/kipi-plugins/sendimages/emailsettings.h b/extra/kipi-plugins/sendimages/emailsettings.h`
		`- index 0f58cc4..b497299 100644`
		`- --- a/extra/kipi-plugins/sendimages/emailsettings.h`
		`- +++ b/extra/kipi-plugins/sendimages/emailsettings.h`
		`- @@ -64,10 +64,9 @@ public:`
		`- CLAWSMAIL,`
		`- EVOLUTION,`
		`- KMAIL,`
		`- - NETSCAPE,`
		`- SYLPHEED,`
		`- SYLPHEEDCLAWS,`
		`- - THUNDERBIRD`
		`- + ICEDOVE`
		`- };`
		`-`
		`- enum ImageSize`
		`- diff --git a/extra/kipi-plugins/sendimages/sendimages.cpp b/extra/kipi-plugins/sendimages/sendimages.cpp`
		`- index 1be65d6..68094de 100644`
		`- --- a/extra/kipi-plugins/sendimages/sendimages.cpp`
		`- +++ b/extra/kipi-plugins/sendimages/sendimages.cpp`
		`- @@ -589,18 +589,13 @@ bool SendImages::invokeMailAgent()`
		`- // More info about command lines options with Mozilla & co:`
		`- // http://www.mozilla.org/docs/command-line-args.html#Syntax_Rules`
		`-`
		`- - case EmailSettings::NETSCAPE:`
		`- - case EmailSettings::THUNDERBIRD:`
		`- + case EmailSettings::ICEDOVE:`
		`- {`
		`- QString prog;`
		`-`
		`- - if (d->settings.emailProgram == EmailSettings::NETSCAPE)`
		`- + if (d->settings.emailProgram == EmailSettings::ICEDOVE)`
		`- {`
		`- - prog = QLatin1String("netscape");`
		`- - }`
		`- - else`
		`- - {`
		`- - prog = QLatin1String("thunderbird");`
		`- + prog = QLatin1String("icedove");`
		`- }`
		`-`
		`- QStringList args;`
		`- diff --git a/extra/kipi-plugins/sendimages/settingswidget.cpp b/extra/kipi-plugins/sendimages/settingswidget.cpp`
		`- index b8416a4..f160310 100644`
		`- --- a/extra/kipi-plugins/sendimages/settingswidget.cpp`
		`- +++ b/extra/kipi-plugins/sendimages/settingswidget.cpp`
		`- @@ -97,10 +97,9 @@ SettingsWidget::SettingsWidget(QWidget* const parent)`
		`- d->mailAgentName->insertItem(EmailSettings::CLAWSMAIL, QLatin1String("Claws Mail"));`
		`- d->mailAgentName->insertItem(EmailSettings::EVOLUTION, QLatin1String("Evolution"));`
		`- d->mailAgentName->insertItem(EmailSettings::KMAIL, QLatin1String("KMail"));`
		`- - d->mailAgentName->insertItem(EmailSettings::NETSCAPE, QLatin1String("Netscape"));`
		`- d->mailAgentName->insertItem(EmailSettings::SYLPHEED, QLatin1String("Sylpheed"));`
		`- d->mailAgentName->insertItem(EmailSettings::SYLPHEEDCLAWS, QLatin1String("Sylpheed-Claws"));`
		`- - d->mailAgentName->insertItem(EmailSettings::THUNDERBIRD, QLatin1String("Thunderbird"));`
		`- + d->mailAgentName->insertItem(EmailSettings::ICEDOVE, QLatin1String("Icedove"));`
		`- #endif`
		`- d->mailAgentName->setCurrentIndex(EmailSettings::DEFAULT);`
		`- d->mailAgentName->setWhatsThis(i18n("Select your preferred external email program here. "`

nonprism/digikam/nonprism.patch

file removed

-225

		`@@ -1,225 +0,0 @@`
		`- diff --git a/doc/TODO b/doc/TODO`
		`- index a0ac4f4c6..23bf7450f 100644`
		`- --- a/doc/TODO`
		`- +++ b/doc/TODO`
		`- @@ -78,16 +78,10 @@ menu-mainwindow.docbook * * Gi`
		`- tool-acquireimages.docbook`
		`- tool-advrename.docbook Need to be created`
		`- tool-calendar.docbook Need to be created`
		`- -tool-dropbox.docbook Need to be created`
		`- tool-expoblending.docbook Need to be created`
		`- -tool-facebook.docbook Need to be created`
		`- tool-findduplicates.docbook Need to be created`
		`- tool-flashexport.docbook Need to be created`
		`- -tool-flickrexport.docbook`
		`- tool-geolocationeditor.docbook Need to be created`
		`- -tool-googleexport.docbook Need to be created`
		`- -tool-imageshack.docbook Need to be created`
		`- -tool-imgur.docbook Need to be created`
		`- tool-kmlexport.docbook Need to be created`
		`- tool-maintenance.docbook Need to be created`
		`- tool-mediawiki.docbook Need to be created`
		`- @@ -97,12 +91,8 @@ tool-panorama.docbook`
		`- tool-piwigoexport.docbook Need to be created`
		`- tool-presentation.docbook`
		`- tool-printwizard.docbook`
		`- -tool-rajce.docbook Need to be created`
		`- tool-remotestorage.docbook Need to be created`
		`- tool-sendimages.docbook`
		`- -tool-smug.docbook Need to be created`
		`- -tool-vkontakte.docbook Need to be created`
		`- -tool-yandexfotki.docbook Need to be created`
		`- using-bqm.docbook`
		`- using-camera.docbook DONE DONE Gilles`
		`- using-camera-intro.docbook`
		`- diff --git a/doc/digikam/index.docbook b/doc/digikam/index.docbook`
		`- index 080275044..0fe7027c9 100644`
		`- --- a/doc/digikam/index.docbook`
		`- +++ b/doc/digikam/index.docbook`
		`- @@ -172,21 +172,11 @@`
		`- <!-- plugins -->`
		`- <!ENTITY doc-tool-printwizard SYSTEM "tool-printwizard.docbook">`
		`- <!ENTITY doc-tool-sendimages SYSTEM "tool-sendimages.docbook">`
		`- - <!ENTITY doc-tool-flickrexport SYSTEM "tool-flickrexport.docbook">`
		`- <!ENTITY doc-tool-piwigoexport SYSTEM "tool-piwigoexport.docbook">`
		`- <!ENTITY doc-tool-kmlexport SYSTEM "tool-kmlexport.docbook">`
		`- - <!ENTITY doc-tool-googleexport SYSTEM "tool-googleexport.docbook">`
		`- <!ENTITY doc-tool-flashexport SYSTEM "tool-flashexport.docbook">`
		`- - <!ENTITY doc-tool-dropbox SYSTEM "tool-dropbox.docbook">`
		`- - <!ENTITY doc-tool-facebook SYSTEM "tool-facebook.docbook">`
		`- - <!ENTITY doc-tool-imageshack SYSTEM "tool-imageshack.docbook">`
		`- - <!ENTITY doc-tool-imgur SYSTEM "tool-imgur.docbook">`
		`- <!ENTITY doc-tool-mediawiki SYSTEM "tool-mediawiki.docbook">`
		`- - <!ENTITY doc-tool-rajce SYSTEM "tool-rajce.docbook">`
		`- <!ENTITY doc-tool-remotestorage SYSTEM "tool-remotestorage.docbook">`
		`- - <!ENTITY doc-tool-smug SYSTEM "tool-smug.docbook">`
		`- - <!ENTITY doc-tool-vkontakte SYSTEM "tool-vkontakte.docbook">`
		`- - <!ENTITY doc-tool-yandexfotki SYSTEM "tool-yandexfotki.docbook">`
		`-`
		`- <!-- Menus Chapter -->`
		`-`
		`- @@ -311,21 +301,11 @@`
		`- <!-- plugins -->`
		`- &doc-tool-printwizard;`
		`- &doc-tool-sendimages;`
		`- - &doc-tool-flickrexport;`
		`- &doc-tool-piwigoexport;`
		`- &doc-tool-kmlexport;`
		`- - &doc-tool-googleexport;`
		`- &doc-tool-flashexport;`
		`- - &doc-tool-dropbox;`
		`- - &doc-tool-facebook;`
		`- - &doc-tool-imageshack;`
		`- - &doc-tool-imgur;`
		`- &doc-tool-mediawiki;`
		`- - &doc-tool-rajce;`
		`- &doc-tool-remotestorage;`
		`- - &doc-tool-smug;`
		`- - &doc-tool-vkontakte;`
		`- - &doc-tool-yandexfotki;`
		`-`
		`- <!-- ****** MENUS ****************************************************** -->`
		`-`
		`- diff --git a/doc/digikam/menu-mainwindow.docbook b/doc/digikam/menu-mainwindow.docbook`
		`- index 5c8e8e2b2..acdef13a2 100644`
		`- --- a/doc/digikam/menu-mainwindow.docbook`
		`- +++ b/doc/digikam/menu-mainwindow.docbook`
		`- @@ -943,22 +943,6 @@`
		`-`
		`- <varlistentry>`
		`- <term><menuchoice>`
		`- - <guimenu>Export</guimenu><guimenuitem>KML Export...</guimenuitem>`
		`- - </menuchoice></term>`
		`- - <listitem>`
		`- - <para><action>`
		`- - Tool to export the images series into a KML structure. KML files can then be opened and displayed with GoogleEarth.`
		`- - </action></para>`
		`- - <para>`
		`- - See the dedicated`
		`- - <link linkend="tool-flickrexport">KML Export Tool</link>`
		`- - for more information.`
		`- - </para>`
		`- - </listitem>`
		`- - </varlistentry>`
		`- -`
		`- - <varlistentry>`
		`- - <term><menuchoice>`
		`- <guimenu>Tools</guimenu><guimenuitem>Export to Piwigo</guimenuitem>`
		`- </menuchoice></term>`
		`- <listitem>`
		`- @@ -973,21 +957,6 @@`
		`- </listitem>`
		`- </varlistentry>`
		`-`
		`- - <varlistentry>`
		`- - <term><menuchoice>`
		`- - <guimenu>Export</guimenu><guimenuitem>Export to Flickr...</guimenuitem>`
		`- - </menuchoice></term>`
		`- - <listitem>`
		`- - <para><action>`
		`- - Tool to upload or update images to <ulink url="http://www.flickr.com/">Flickr</ulink> server.`
		`- - </action></para>`
		`- - <para>`
		`- - See the dedicated`
		`- - <link linkend="tool-flickrexport">Flickr Export Tool</link>`
		`- - for more information.`
		`- - </para>`
		`- - </listitem>`
		`- - </varlistentry>`
		`- <!-- not ported to Qt5`
		`- <varlistentry>`
		`- <term><menuchoice>`
		`- @@ -1005,37 +974,6 @@`
		`- </listitem>`
		`- </varlistentry>`
		`- -->`
		`- - <varlistentry>`
		`- - <term><menuchoice>`
		`- - <guimenu>Export</guimenu><guimenuitem>Export to Google Photos...</guimenuitem>`
		`- - </menuchoice></term>`
		`- - <listitem>`
		`- - <para><action>`
		`- - Tool upload or update images to <ulink url="https://photos.google.com/">Google Photos galleries</ulink>.`
		`- - </action></para>`
		`- - <para>`
		`- - See the dedicated`
		`- - <link linkend="tool-googleexport">Google Services Tool</link>`
		`- - for more information.`
		`- - </para>`
		`- - </listitem>`
		`- - </varlistentry>`
		`- -`
		`- - <varlistentry>`
		`- - <term><menuchoice>`
		`- - <guimenu>Export</guimenu><guimenuitem>Export to Google Drive...</guimenuitem>`
		`- - </menuchoice></term>`
		`- - <listitem>`
		`- - <para><action>`
		`- - Tool upload images to <ulink url="https://www.google.com/drive/">Google Drive</ulink>.`
		`- - </action></para>`
		`- - <para>`
		`- - See the dedicated`
		`- - <link linkend="tool-googleexport">Google Services Tool</link>`
		`- - for more information.`
		`- - </para>`
		`- - </listitem>`
		`- - </varlistentry>`
		`- <!-- not ported to Qt5`
		`- <varlistentry>`
		`- <term><menuchoice>`
		`- diff --git a/extra/kipi-plugins/CMakeLists.txt b/extra/kipi-plugins/CMakeLists.txt`
		`- index 63579cae7..9b8171ca3 100644`
		`- --- a/extra/kipi-plugins/CMakeLists.txt`
		`- +++ b/extra/kipi-plugins/CMakeLists.txt`
		`- @@ -145,7 +145,6 @@ if(KF5Kipi_FOUND)`
		`- # -- Optional dependencies detection required by some plugins -------------------------------------`
		`-`
		`- DETECT_LIBMEDIAWIKI(5.0.0) # For Mediawiki.`
		`- - DETECT_LIBKVKONTAKTE(4.70.0) # For VKontakte.`
		`-`
		`- # ==================================================================================================`
		`- # Log messages`
		`- @@ -166,7 +165,6 @@ if(KF5Kipi_FOUND)`
		`- PRINT_OPTIONAL_LIBRARY_STATUS("libkio" "https://projects.kde.org/projects/frameworks/kio" "(version >= ${KF5_MIN_VERSION})" "Kipi-plugins will be compiled without libkio support." KF5KIO_FOUND)`
		`- PRINT_OPTIONAL_LIBRARY_STATUS("libkarchive" "https://projects.kde.org/projects/frameworks/karchive" "(version >= ${KF5_MIN_VERSION})" "Kipi-plugins will be compiled without libkarchive support." KF5Archive_FOUND)`
		`- PRINT_OPTIONAL_LIBRARY_STATUS("libmediawiki" "https://projects.kde.org/projects/extragear/libs/libmediawiki" "(version >= ${KF5_MIN_VERSION})" "Kipi-plugins will be compiled without libmediawiki support." KF5MediaWiki_FOUND)`
		`- - PRINT_OPTIONAL_LIBRARY_STATUS("libkvkontakte" "https://projects.kde.org/projects/extragear/libs/libkvkontakte" "(version >= 4.70.0)" "Kipi-plugins will be compiled without libkvkontakte support." KF5Vkontakte_FOUND)`
		`-`
		`- # Optional plugins results ----------------------------------------------------------------------------`
		`-`
		`- @@ -183,7 +181,6 @@ if(KF5Kipi_FOUND)`
		`- endif()`
		`-`
		`- PRINT_COMPONENT_COMPILE_STATUS("Legacy plugins" ENABLE_LEGACY)`
		`- - PRINT_COMPONENT_COMPILE_STATUS("VKontakte" KF5Vkontakte_FOUND)`
		`- PRINT_COMPONENT_COMPILE_STATUS("Mediawiki" KF5MediaWiki_FOUND)`
		`- PRINT_COMPONENT_COMPILE_STATUS("FlashExport" KF5Archive_FOUND)`
		`-`
		`- @@ -243,16 +240,7 @@ if(KF5Kipi_FOUND)`
		`- add_definitions(-DQT_NO_URL_CAST_FROM_STRING)`
		`-`
		`- add_subdirectory(common)`
		`- - add_subdirectory(flickr)`
		`- - add_subdirectory(dropbox)`
		`- - add_subdirectory(facebook)`
		`- - add_subdirectory(imgur)`
		`- add_subdirectory(piwigo)`
		`- - add_subdirectory(rajce)`
		`- - add_subdirectory(smug)`
		`- - add_subdirectory(imageshack)`
		`- - add_subdirectory(yandexfotki)`
		`- - add_subdirectory(googleservices)`
		`-`
		`- if(ENABLE_LEGACY)`
		`- add_subdirectory(printimages)`
		`- @@ -266,10 +254,6 @@ if(KF5Kipi_FOUND)`
		`-`
		`- endif()`
		`-`
		`- - if(KF5Vkontakte_FOUND)`
		`- - add_subdirectory(vkontakte)`
		`- - endif()`
		`- -`
		`- if(KF5MediaWiki_FOUND)`
		`- add_subdirectory(mediawiki)`
		`- endif()`

nonprism/duplicity/PKGBUILD

file modified

+3 -3

		`@@ -1,6 +1,6 @@`
		`- # Maintainer (Arch): Lukas Fleischer <lfleischer@archlinux.org>`
		`- # Contributor (Arch): Kaiting Chen <kaitocracy@gmail.com>`
		`- # Contributor (Arch): Aaron Schaefer <aaron@elasticdog.com>`
		`+ # Maintainer (arch): Lukas Fleischer <lfleischer@archlinux.org>`
		`+ # Contributor: Kaiting Chen <kaitocracy@gmail.com>`
		`+ # Contributor: Aaron Schaefer <aaron@elasticdog.com>`
		`# Contributor: André Silva <emulatorman@hyperbola.info>`

		`# parabola changes and rationale:`

nonprism/empathy/PKGBUILD

file modified

+2 -2

		`@@ -1,8 +1,8 @@`
		`# $Id$`
		`- # Contributor (Arch): Ionut Biru <ibiru@archlinux.org>`
		`+ # Contributor: Ionut Biru <ibiru@archlinux.org>`
		`# Contributor: Andreas Grapentin <andreas@grapentin.org>`
		`# Contributor: André Silva <emulatorman@hyperbola.info>`
		`- # Maintainers: Parabola hackers <dev@lists.parabola.nu>`
		`+ # Maintainer: Parabola Hackers <dev@lists.parabola.nu>`

		`# parabola changes and rationale`
		`# - removed geoclue2 support`

nonprism/eog-plugins/PKGBUILD

file modified

+1 -1

		`@@ -1,5 +1,5 @@`
		`# $Id$`
		`- # Maintainer (Arch): Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>`
		`+ # Maintainer (arch): Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>`
		`# Contributor: Andreas Grapentin <andreas@grapentin.org>`
		`# Contributor: Márcio Silva <coadde@hyperbola.info>`

nonprism/evolution-data-server/PKGBUILD

file modified

+40 -25

		`@@ -1,5 +1,5 @@`
		`# Maintainer (arch): Jan Alexander Steffens (heftig) <heftig@archlinux.org>`
		`- # Contributor (arch): Jan de Groot <jgc@archlinux.org>`
		`+ # Contributor: Jan de Groot <jgc@archlinux.org>`
		`# Contributor: Andreas Grapentin <andreas@grapentin.org>`
		`# Contributor: Márcio Silva <coadde@hyperbola.info>`
		`# Contributor: Isaac David <isacdaavid@at@isacdaavid@dot@info>`
		`@@ -8,61 +8,76 @@`


		`# parabola changes and rationale:`
		`+ # - removed libgweather support`
		`# - removed libgdata support`
		`+ # - removed google support`
		`# - pinned to 'icu' sodep`
		`+ # - build from versioned source-ball, not VCS`


		`pkgname=evolution-data-server`
		`- pkgver=3.38.2`
		`- pkgrel=2`
		`+ pkgver=3.44.4`
		`+ [[ "${CARCH}" == i686 ]] && pkgver=3.40.4`
		`+ pkgrel=1`
		`pkgrel+=.nonprism1`
		`pkgdesc="Centralized access to appointments and contacts"`
		`- pkgdesc+=", without libgdata support"`
		`+ pkgdesc+=", without google, libgweather, and libgdata support"`
		`url="https://wiki.gnome.org/Apps/Evolution"`
		`arch=(x86_64)`
		`arch+=(armv7h i686)`
		`- depends=(gnome-online-accounts nss krb5 libgweather libical db libgdata libphonenumber)`
		`- depends=(${depends[@]/libgdata/})`
		`+ depends=(gnome-online-accounts nss krb5 libgweather-4 libical db libgdata libphonenumber`
		`+ libcanberra)`
		`+ depends=(${depends[*]/libgweather-4/})`
		`+ depends=(${depends[*]/libgdata/})`
		`makedepends=(intltool gperf gobject-introspection vala gtk-doc boost git cmake ninja)`
		`+ makedepends=( ${makedepends[*]/git/} )`
		`+ [[ "${CARCH}" == i686 ]] && depends+=( glib2=2.74.0 ) # Package dependency requirement 'glib-2.0 >= 2.74.0' could not be satisfied. If you want to disable GObject introspection, please use -DENABLE_INTROSPECTION=OFF`
		`provides=(libcamel-1.2.so libebackend-1.2.so libebook-1.2.so libebook-contacts-1.2.so`
		`libecal-2.0.so libedata-book-1.2.so libedata-cal-2.0.so libedataserver-1.2.so`
		`libedataserverui-1.2.so)`
		`license=(GPL)`
		`- _commit=e5135dcf71a7f4ac0e60acb7ba2b3ac551e9578e # tags/3.38.2^0`
		`- source=("git+https://gitlab.gnome.org/GNOME/evolution-data-server.git#commit=$_commit")`
		`- sha256sums=('SKIP')`
		`+ options=(debug)`
		`+ source=(https://gitlab.gnome.org/GNOME/${pkgname}/-/archive/${pkgver}/${pkgname}-${pkgver}.tar.gz)`
		`+ sha256sums=('9ee2f008c713102730d49ff8f56c1873ac9fa9c0210856cab094cfce5f4cfb33')`
		`+ [[ "${CARCH}" == i686 ]] && sha256sums=('3adaba3e7b0f72d8f65b955995cb30373bbcfe71ab3f81f6260c2c8b80bd18cb')`

		`- pkgver() {`
		`- cd $pkgname`
		`- git describe --tags \| sed 's/^EVOLUTION_DATA_SERVER_//;s/_/./g;s/-/+/g'`
		`- }`

		`prepare() {`
		`- cd $pkgname`
		`+ cd ${pkgname}-${pkgver}`
		`}`

		`build() {`
		`- CFLAGS+=" $CPPFLAGS"`
		`- CXXFLAGS+=" $CPPFLAGS"`
		`- cmake -S $pkgname -B build -G Ninja \`
		`+ local privacy_options=( -DENABLE_UOA=OFF \`
		`+ -DENABLE_GOOGLE=OFF \`
		`+ -DHAVE_LIBGDATA=OFF \`
		`+ -DENABLE_GOOGLE_AUTH=OFF \`
		`+ -DENABLE_WEATHER=OFF \`
		`+ -DWITH_GWEATHER4=OFF )`
		`+ [[ "${CARCH}" == i686 ]] && privacy_options+=( -DWITH_PHONENUMBER=OFF ) # libphonenumber cannot be used. Use -DWITH_PHONENUMBER=PATH to specify the library prefix, or -DWITH_PHONENUMBER=OFF to disable it.`
		`+`
		`+ cmake -S ${pkgname}-${pkgver} -B build -G Ninja \`
		`-DCMAKE_INSTALL_PREFIX=/usr \`
		`-DLIBEXEC_INSTALL_DIR=/usr/lib \`
		`-DSYSCONF_INSTALL_DIR=/etc \`
		`-DENABLE_INTROSPECTION=ON \`
		`-DENABLE_VALA_BINDINGS=ON \`
		`- -DENABLE_UOA=OFF \`
		`- -DENABLE_GOOGLE=OFF \`
		`- -DHAVE_LIBGDATA=OFF \`
		`- -DENABLE_GOOGLE_AUTH=OFF \`
		`-DENABLE_GTK_DOC=ON \`
		`- -DWITH_PHONENUMBER=ON`
		`+ -DWITH_PHONENUMBER=ON \`
		`+ ${privacy_options[*]}`
		`cmake --build build`
		`}`

		`check() {`
		`- # libedata-book tests fail because they try to`
		`- # mkdir /usr/lib/evolution-data-server/camel-providers`
		`- cmake --build build --target test \|\| :`
		`+ # with networking disabled:`
		`+ # \| The following tests FAILED:`
		`+ # \| 56 - test-cal-component (Subprocess aborted)`
		`+ # with networking enabled:`
		`+ # \| The following tests FAILED:`
		`+ # \| 34 - test-book-client-suppress-notifications (SIGTRAP)`
		`+ return 0`
		`+`
		`+ cd build`
		`+ ctest --output-on-failure --stop-on-failure`
		`}`

		`package() {`

nonprism/gnome-online-accounts/PKGBUILD

file modified

+2 -2

		`@@ -1,9 +1,9 @@`
		`# $Id$`
		`- # Contributor (Arch): Ionut Biru <ibiru@archlinux.org>`
		`+ # Contributor: Ionut Biru <ibiru@archlinux.org>`
		`# Contributor: Andreas Grapentin <andreas@grapentin.org>`
		`# Contributor: Márcio Silva <coadde@hyperbola.info>`
		`# Contributor: Isaac David <isacdaavid@at@isacdaavid@dot@info>`
		`- # Maintainers: Parabola hackers <dev@lists.parabola.nu>`
		`+ # Maintainer: Parabola Hackers <dev@lists.parabola.nu>`

		`# parabola changes and rationale:`
		`# - removed support for possibly unsafe protocols`

nonprism/gnome-settings-daemon/PKGBUILD

file modified

+2 -2

		`@@ -1,5 +1,5 @@`
		`- # Maintainer (Arch): Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>`
		`- # Contributor (Hyperbola): André Silva <emulatorman@hyperbola.info>`
		`+ # Maintainer (arch): Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>`
		`+ # Contributor: André Silva <emulatorman@hyperbola.info>`
		`# Contributor: Andreas Grapentin <andreas@grapentin.org>`
		`# Contributor: Isaac David <isacdaavid@at@isacdaavid.info>`
		`# Contributor: Omar Vega Ramos <ovruni@gnu.org.pe>`

nonprism/gnome-weather/PKGBUILD

file modified

+1 -1

		`@@ -1,5 +1,5 @@`
		`# Maintainer: Andreas Grapentin <andreas@grapentin.org>`
		`- # Maintainer (Arch): Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>`
		`+ # Maintainer (arch): Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>`
		`# Contributor: André Silva <emulatorman@hyperbola.info>`

		`pkgname=gnome-weather`

nonprism/grilo-plugins/PKGBUILD

file modified

+1 -1

		`@@ -1,5 +1,5 @@`
		`# $Id$`
		`- # Maintainer (Arch): Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>`
		`+ # Maintainer (arch): Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>`
		`# Contributor: Andreas Grapentin <andreas@grapentin.org>`
		`# Contributor: André Silva <emulatorman@hyperbola.info>`

nonprism/gthumb/PKGBUILD

file modified

+3 -3

		`@@ -1,7 +1,7 @@`
		`# $Id$`
		`- # Maintainer (Arch): Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>`
		`- # Contributor (Arch): Jan de Groot <jgc@archlinux.org>`
		`- # Contributor (Arch): Tobias Kieslich <tobias@justdreams.de>`
		`+ # Maintainer (arch): Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>`
		`+ # Contributor: Jan de Groot <jgc@archlinux.org>`
		`+ # Contributor: Tobias Kieslich <tobias@justdreams.de>`
		`# Contributor: Andreas Grapentin <andreas@grapentin.org>`
		`# Contributor: André Silva <emulatorman@hyperbola.info>`
		`# Contributor: Márcio Silva <coadde@hyperbola.info>`

nonprism/icedove/PKGBUILD

file modified

+6 -6

		`@@ -1,9 +1,9 @@`
		`- # Maintainer (Arch): Levente Polyak <anthraxx[at]archlinux[dot]org>`
		`- # Contributor (Arch): Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>`
		`- # Contributor (Arch): Ionut Biru <ibiru@archlinux.org>`
		`- # Contributor (Arch): Alexander Baldeck <alexander@archlinux.org>`
		`- # Contributor (Arch): Dale Blount <dale@archlinux.org>`
		`- # Contributor (Arch): Anders Bostrom <anders.bostrom@home.se>`
		`+ # Maintainer (arch): Levente Polyak <anthraxx[at]archlinux[dot]org>`
		`+ # Contributor: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>`
		`+ # Contributor: Ionut Biru <ibiru@archlinux.org>`
		`+ # Contributor: Alexander Baldeck <alexander@archlinux.org>`
		`+ # Contributor: Dale Blount <dale@archlinux.org>`
		`+ # Contributor: Anders Bostrom <anders.bostrom@home.se>`
		`# Maintainer: Andreas Grapentin <andreas@grapentin.org>`
		`# Contributor: André Silva <emulatorman@hyperbola.info>`
		`# Contributor: Márcio Silva <coadde@hyperbola.info>`

nonprism/jitsi/PKGBUILD

file modified

+2 -2

		`@@ -1,5 +1,5 @@`
		`- # Maintainer (Arch): Xavier Devlamynck <magicrhesus@ouranos.be>`
		`- # Contributors (Arch): Keshav P R, atommix aka Aleks Lifey, Xavion, Ananda Samaddar, Dan Serban, Xyne`
		`+ # Maintainer (arch): Xavier Devlamynck <magicrhesus@ouranos.be>`
		`+ # Contributor: Keshav P R, atommix aka Aleks Lifey, Xavion, Ananda Samaddar, Dan Serban, Xyne`
		`# Contributor: Andreas Grapentin <andreas@grapentin.org>`
		`# Contributor: André Silva <emulatorman@hyperbola.info>`
		`# Contributor: Márcio Silva <coadde@hyperbola.info>`

nonprism/kio/PKGBUILD

file modified

+18 -17

		`@@ -11,18 +11,17 @@`

		`# parabola changes and rationale:`
		`# - replace non-privacy search engines`
		`+ # - pin to strongly-coupled dependency versions`


		`pkgname=kio`
		`- pkgver=5.94.0`
		`+ pkgver=5.100.0`
		`pkgrel=1`
		`pkgrel+=.parabola1`
		`- _pkgver_armv7h=5.82.0`
		`- _pkgver_i686=5.94.0`
		`- _pkgrel_armv7h=1.parabola1`
		`+ _pkgver_i686=5.99.0`
		`_pkgrel_i686=1.0.parabola1`
		`- [[ "${CARCH}" != 'x86_64' ]] && eval "pkgver=\$_pkgver_${CARCH}" # our different arches do not`
		`- [[ "${CARCH}" != 'x86_64' ]] && eval "pkgrel=\$_pkgrel_${CARCH}" # always roll at the same speed`
		`+ [[ "${CARCH}" == i686 ]] && eval "pkgver=\$_pkgver_${CARCH}" # our different arches do not`
		`+ [[ "${CARCH}" == i686 ]] && eval "pkgrel=\$_pkgrel_${CARCH}" # always roll at the same speed`
		`pkgdesc='Resource and network access abstraction'`
		`pkgdesc+=', with privacy-respecting search engines only'`
		`arch=(x86_64)`
		`@@ -30,7 +29,9 @@`
		`url='https://community.kde.org/Frameworks'`
		`license=(LGPL)`
		`depends=(solid kjobwidgets kbookmarks libxslt kwallet ktextwidgets kded)`
		`+ depends=( ${depends[*]/kded/kded=$pkgver} ) # pin version to other k-things`
		`makedepends=(extra-cmake-modules kdoctools doxygen qt5-tools qt5-doc)`
		`+ makedepends+=(gettext=0.21.1-2.6) # /usr/bin/msgfmt: error while loading shared libraries: libunistring.so.2: cannot open shared object file: No such file or directory`
		`optdepends=('kio-extras: extra protocols support (sftp, fish and more)' 'kdoctools: for the help kioslave'`
		`'kio-fuse: to mount remote filesystems via FUSE')`
		`groups=(kf5)`
		`@@ -43,20 +44,20 @@`
		`parabola-wiki.desktop`
		`searx.desktop`
		`yacy.desktop)`
		`- sha256sums=('85c0bf8e49d845730d95c85c0292330a5bf03ed63a008cbf02ec9d02f990d09b'`
		`+ sha256sums=('088788d32eb38016d92c2fdfe29f337332089efa1f0d3a810cf807c2646d7cb6'`
		`'SKIP')`
		`sha256sums+=('31910ab7393e67609f15e04a57f6406f63e6dae58b01bce0787741bc5958f292'`
		`- '40466a9dad7075f2525e9e024720da7d7b49a22892b6fca8b81cc0e6408d2f7d'`
		`- '57ded4375e1ddfe747bc55e3c52f4f39d1688f583c6af77da3479f544d262b71'`
		`- '5e57f0978b3429dfd2e97f215ab58394dd4c19c5b7e1b6bea9733eae92253e1a'`
		`- '7960cfc6b5a4030898cdd9d4699732fd7c1995983a0762ed1121aa2589beedc3'`
		`- '45af1a8588246c64c2e306237ef605406c5289c2ff53b5f459315c40c8e5099b'`
		`- '0264268855ac59872fe6bde4ce5c7d5f4a9b4d6936f3c2f870fc9a34de323c54'`
		`- '0a494a6bd652533b2ac1ea6a139e8b7295da29f840e5d0d7b2aa7e18886887ef')`
		`- _sha256sum_armv7h='96be2b732faf97a484edc5238049ad22f0f233b9e404468f4da40c5ec839e0d3' # upstream source-ball`
		`- _sha256sum_i686='85c0bf8e49d845730d95c85c0292330a5bf03ed63a008cbf02ec9d02f990d09b' # upstream source-ball`
		`- [[ "${CARCH}" != 'x86_64' ]] && eval "sha256sums[0]=\$_sha256sum_${CARCH}" # upstream source-ball`
		`+ '40466a9dad7075f2525e9e024720da7d7b49a22892b6fca8b81cc0e6408d2f7d'`
		`+ '57ded4375e1ddfe747bc55e3c52f4f39d1688f583c6af77da3479f544d262b71'`
		`+ '5e57f0978b3429dfd2e97f215ab58394dd4c19c5b7e1b6bea9733eae92253e1a'`
		`+ '7960cfc6b5a4030898cdd9d4699732fd7c1995983a0762ed1121aa2589beedc3'`
		`+ '45af1a8588246c64c2e306237ef605406c5289c2ff53b5f459315c40c8e5099b'`
		`+ '0264268855ac59872fe6bde4ce5c7d5f4a9b4d6936f3c2f870fc9a34de323c54'`
		`+ '0a494a6bd652533b2ac1ea6a139e8b7295da29f840e5d0d7b2aa7e18886887ef')`
		`+ _sha256sum_i686='efd2bf49ba5233c82983309af3b93e59b185ed9d1f9b6e1a6de2f556f33fa87c' # upstream source-ball`
		`+ [[ "${CARCH}" == i686 ]] && eval "sha256sums[0]=\$_sha256sum_${CARCH}" # upstream source-ball`
		`validpgpkeys=(53E6B47B45CEA3E0D5B7457758D0EE648A48B3BB) # David Faure <faure@kde.org>`
		`+ options=(debug)`


		`prepare() {`

nonprism/kopete/PKGBUILD

file modified

+3 -3

		`@@ -1,6 +1,6 @@`
		`- # Maintainer (Arch): Felix Yan <felixonmars@archlinux.org>`
		`- # Maintainer (Arch): Antonio Rojas <arojas@archlinux.org>`
		`- # Contributor (Arch): Andrea Scarpino <andrea@archlinux.org>`
		`+ # Maintainer (arch): Felix Yan <felixonmars@archlinux.org>`
		`+ # Maintainer (arch): Antonio Rojas <arojas@archlinux.org>`
		`+ # Contributor: Andrea Scarpino <andrea@archlinux.org>`
		`# Contributor: André Silva <emulatorman@hyperbola.info>`

		`# rationale for inclusion in nonprism:`

nonprism/openshot/PKGBUILD

file modified

+4 -4

		`@@ -1,7 +1,7 @@`
		`- # Maintainer (Arch): David Runge <dvzrv@archlinux.org>`
		`- # Contributor (Arch): Sergej Pupykin <pupykin.s+arch@gmail.com>`
		`- # Contributor (Arch): Florian Pritz <bluewind@xinu.at>`
		`- # Contributor (Arch): Asa Marco <marcoasa90[at]gmail[.]com>`
		`+ # Maintainer (arch): David Runge <dvzrv@archlinux.org>`
		`+ # Contributor: Sergej Pupykin <pupykin.s+arch@gmail.com>`
		`+ # Contributor: Florian Pritz <bluewind@xinu.at>`
		`+ # Contributor: Asa Marco <marcoasa90[at]gmail[.]com>`
		`# Contributor: Andreas Grapentin <andreas@grapentin.org>`
		`# Contributor: André Silva <emulatorman@hyperbola.info>`
		`# Contributor: Freemor <freemor@freemor.ca>`

nonprism/redshift/PKGBUILD

file modified

+5 -5

		`@@ -1,8 +1,8 @@`
		`- # Maintainer (Arch): Lukas Fleischer <lfleischer@archlinux.org>`
		`- # Contributor (Arch): Geoffrey Teale <tealeg@stop-squark>`
		`- # Contributor (Arch): Mark, Huo Mian <markhuomian[at]gmail[dot]com>`
		`- # Contributor (Arch): Biginoz <biginoz a free dot fr>`
		- # Contributor (Arch): Mattias Andrée <`base64 -d`(bWFhbmRyZWUK)@member.fsf.org>
		`+ # Maintainer (arch): Lukas Fleischer <lfleischer@archlinux.org>`
		`+ # Contributor: Geoffrey Teale <tealeg@stop-squark>`
		`+ # Contributor: Mark, Huo Mian <markhuomian[at]gmail[dot]com>`
		`+ # Contributor: Biginoz <biginoz a free dot fr>`
		+ # Contributor: Mattias Andrée <`base64 -d`(bWFhbmRyZWUK)@member.fsf.org>
		`# Maintainer: André Silva <emulatorman@hyperbola.info>`

		`pkgname=redshift`

nonprism/sylpheed/PKGBUILD

file modified

+3 -3

		`@@ -1,7 +1,7 @@`
		`# Maintainer: (Arch) David Runge <dave@sleepmap.de>`
		`- # Contributor (Arch): speps <speps at aur dot archlinux dot org>`
		`- # Contributor (Arch): Alexander Fehr <pizzapunk gmail com>`
		`- # Contributor (Arch): dorphell <dorphell@archlinux.org>`
		`+ # Contributor: speps <speps at aur dot archlinux dot org>`
		`+ # Contributor: Alexander Fehr <pizzapunk gmail com>`
		`+ # Contributor: dorphell <dorphell@archlinux.org>`
		`# Contributor: Andreas Grapentin <andreas@grapentin.org>`
		`# Contributor: André Silva <emulatorman@hyperbola.info>`
		`# Contributor: Aditya Som <icarious@hacari.org>"`

nonprism/webkit2gtk/PKGBUILD

file modified

+1 -1

		`@@ -1,5 +1,5 @@`
		`# Maintainer (arch): Jan Alexander Steffens (heftig) <heftig@archlinux.org>`
		`- # Contributor (arch): Eric Bélanger <eric@archlinux.org>`
		`+ # Contributor: Eric Bélanger <eric@archlinux.org>`
		`# Contributor: Andreas Grapentin <andreas@grapentin.org>`
		`# Contributor: Jesús E. <heckyel@parabola.nu>`
		`# Contributor: André Silva <emulatorman@hyperbola.info>`

nonprism/your-privacy/PKGBUILD

file modified

+50 -20

		`@@ -1,30 +1,60 @@`
		`- # Maintainer: Parabola Project <dev@lists.parabola.nu>`
		`+ # SPDX-License-Identifier: CC0-1.0`
		`+ # Maintainer: Parabola Hackers <dev@lists.parabola.nu>`
		`+`
		`+`
		`+ # NOTE: This PKGBUILD does not need to be edited manually.`
		`+ # The package is normally built automatically by autobuilder.`
		`+ # To generate a new package, simply push changes to blacklist.git.`
		`+ # The autobuilder will modify this PKGBUILD,`
		`+ # replacing $pkgver, $_gitver, and the checksum (updpkgsums),`
		`+ # build and publish the package,`
		`+ # and commit the modified PKGBUILD to abslibre.`
		`+`

		`pkgname=your-privacy`
		`- pkgdesc="This package will remove support for protocols and services known to endanger privacy."`
		`- license=('GPL3')`
		`- url="https://git.parabola.nu/blacklist.git"`
		`- pkgver=20211130`
		`- _gitver=ab32447a5a47a2a5ec5a3fa6043dc6b9024e3674`
		`+ pkgver=20221006`
		`pkgrel=1`
		`+ _gitver=ab32447a5a47a2a5ec5a3fa6043dc6b9024e3674`
		`+ pkgdesc="This package will remove support for protocols and services known to endanger privacy."`
		`+ arch=(any)`
		`+ url=https://wiki.parabola.nu/Blacklist`
		`+ license=(GPL3)`

		`- arch=('any')`
		`+ makedepends=(librelib)`
		`+ backup=(etc/NetworkManager/conf.d/20-connectivity.conf)`
		`install=${pkgname}.install`

		`- makedepends=(librelib)`
		`- source=(blacklist-${_gitver}.txt::https://git.parabola.nu/blacklist.git/plain/${pkgname}-blacklist.txt?id=${_gitver})`
		`- sha512sums=('9ab837a9ca351bb844ecdfc147d69ec1f0d1971fbe12ceeed3b837fc59c54b10d2476901e60f677b0f53166a805b493b0a8bcd638e9e6638012dd454c7930cf8')`
		`+ source=(${pkgname}-blacklist-${_gitver}.txt::https://git.parabola.nu/blacklist.git/plain/${pkgname}-blacklist.txt?id=${_gitver}`
		`+ archlinux-keyring.hook)`
		`+`
		`+ sha512sums=('9ab837a9ca351bb844ecdfc147d69ec1f0d1971fbe12ceeed3b837fc59c54b10d2476901e60f677b0f53166a805b493b0a8bcd638e9e6638012dd454c7930cf8'`
		`+ '4f0e63c89ceb06ac976902355e2b0f9607abc3f910ac16cf90fefb46b70ba5a8c7b4c196a1767bf9b4a274da3b97faa54bed039e83f483dc2bc6d7daa3f20d91')`
		`+`
		`+`
		`+ package()`
		`+ {`
		`+ # collect blacklisted package names as pacman conflicts`
		`+ conflicts=( $( libreblacklist normalize < blacklist-${_gitver}.txt \| \`
		`+ cut -d: -f1,2 \| \`
		`+ sed -n 's/:$//p' \| \`
		`+ sort -u ) )`

		`- package() {`
		`- cd "$srcdir"`
		`+ install -Dm644 ${pkgname}-blacklist-${_gitver}.txt "${pkgdir}"/usr/share/doc/${pkgname}/blacklist.txt`

		`- conflicts=($( \`
		`- < blacklist-${_gitver}.txt \`
		`- libreblacklist normalize \| \`
		`- cut -d: -f1,2 \| \`
		`- sed -n 's/:$//p' \| \`
		`- sort -u \`
		`- ))`
		`+ # disable automatic archlinux-keyring refresh`
		`+ install -Dm644 archlinux-keyring.hook "${pkgdir}"/usr/share/libalpm/hooks/archlinux-keyring.hook`

		`- install -Dm644 blacklist-${_gitver}.txt "$pkgdir"/usr/share/doc/${pkgname}/blacklist.txt`
		`+ # disable NetworkManager connectviity check`
		`+ # TODO: This may disable some user-friendliness features.`
		`+ # Something a bit more sophisticated may be needed,`
		`+ # such as a source-level replacement check:`
		`+ # $ dns_ip=$(sed 's\|^nameserver \|\|p;d' /etc/resolv.conf) ; [[ -n "${dns_ip}" ]] && ping -c 1 ${dns_ip} &> /dev/null ;`
		`+ # As of now, we are over-riding 'networkmanager' only for [nonsystemd],`
		`+ # which already changes the target URI to parabola.nu.`
		`+ # This simple solution is an attempt to avoid also packaging it for [nonprism].`
		`+ install -Dm644 /dev/stdin "${pkgdir}"/etc/NetworkManager/conf.d/20-connectivity.conf <<EOF`
		`+ [connectivity]`
		`+ uri=https://www.parabola.nu/static/nm-check.txt`
		`+ enabled=false`
		`+ EOF`
		`}`

nonprism/your-privacy/archlinux-keyring.hook

file added

+12

		`@@ -0,0 +1,12 @@`
		`+ [Trigger]`
		`+ Operation = Install`
		`+ Operation = Upgrade`
		`+ Operation = Remove`
		`+ Type = Package`
		`+ Target = *`
		`+`
		`+ [Action]`
		`+ Description = disable automatic archlinux-keyring refresh`
		`+ Depends = archlinux-keyring`
		`+ When = PostTransaction`
		`+ Exec = /usr/bin/chmod a-x /usr/bin/archlinux-keyring-wkd-sync`

nonprism/your-privacy/your-privacy.install

file modified

+18 -25

		`@@ -1,30 +1,23 @@`
		`+ notice()`
		`+ {`
		`+ cat <<EOF`
		`+ The 'your-privacy' package detects other packages on your system,`
		`+ which are known to support privacy-unsafe protocols/services,`
		`+ and protects you from (accidentally) installing those in the future.`

		`- pre_install() {`
		`- cat <<EOM`
		`- == IMPORTANT NOTICE ==`
		`+ Also, as any other such packages are identified in the future,`
		`+ an updated 'your-privacy' package will prompt you for their removal.`

		`- This package will help you identify if packages that support`
		`- unsafe/dangerous for privacy protocols/services are installed on your`
		`- system at the time of its installation, as well as protecting you from`
		`- (accidentally) installing them.`
		`+ Your feedback/participation is important. It is _your_ privacy, after all.`
		`+ If you notice any problems caused by this package, or notice some package`
		`+ which does or does not deserve to be guarded, please do start a discussion.`

		`- Also, if any other package that support unsafe/dangerous for privacy`
		`- protocols/services is identified, later updates will ask you for its`
		`- removal.`
		`-`
		`- Have in mind that, if you want to retain certain packages that support`
		`- unsafe/dangerous for privacy protocols/services installed on your system,`
		`- you'll have to remove your-privacy :)`
		`-`
		`- Please report back to the Parabola Project on the usual channels:`
		`- * https://labs.parabola.nu`
		`- * irc://irc.libera.chat/#parabola`
		`- * mailto:dev@lists.parabola.nu`
		`- EOM`
		`- }`
		`-`
		`- pre_upgrade() {`
		`- pre_install`
		`+ * Bugs: https://labs.parabola.nu`
		`+ * Forum: https://forum.parabola.nu`
		`+ * Email: mailto:assist@lists.parabola.nu`
		`+ * Chat: ircs://irc.libera.chat/#parabola`
		`+ EOF`
		`}`

		`- # vim:set ts=2 sw=2 et:`
		`+ pre_install() { notice ; }`
		`+ pre_upgrade() { notice ; }`

nonsystemd-multilib/lib32-dbus/PKGBUILD

file modified

+2 -2

		`@@ -1,6 +1,6 @@`
		`# Maintainer: David P. <megver83@parabola.nu>`
		`- # Maintainer (Arch): Jan Alexander Steffens (heftig) <heftig@archlinux.org>`
		`- # Contributor (Arch): Ionut Biru <ibiru@archlinux.org>`
		`+ # Maintainer (arch): Jan Alexander Steffens (heftig) <heftig@archlinux.org>`
		`+ # Contributor: Ionut Biru <ibiru@archlinux.org>`

		`pkgname=lib32-dbus`
		`pkgver=1.12.20`

nonsystemd-multilib/lib32-elogind/PKGBUILD

file modified

+1 -1

		`@@ -1,5 +1,5 @@`
		`# Maintainer: David P. <megver83@parabola.nu>`
		`- # Maintainer (Artix): artoo <artoo@artixlinux.org>`
		`+ # Maintainer (artix): artoo <artoo@artixlinux.org>`

		`_pkgname=elogind`
		`pkgname=lib32-elogind`

nonsystemd-multilib/lib32-eudev/PKGBUILD

file modified

+1 -1

		`@@ -1,5 +1,5 @@`
		`# Maintainer: David P. <megver83@parabola.nu>`
		`- # Maintainer (Artix): Chris Cromer <cromer@artixlinux.org>`
		`+ # Maintainer (artix): Chris Cromer <cromer@artixlinux.org>`

		`_udevver=246`
		`_pkgname=eudev`

nonsystemd-multilib/lib32-libgudev/PKGBUILD

file modified

+3 -3

		`@@ -1,7 +1,7 @@`
		`# Maintainer: David P. <megver83@parabola.nu>`
		`- # Maintainer (Arch): Maxime Gauduin <alucryd@archlinux.org>`
		`- # Contributor (Arch): FadeMind <fademind@gmail.com>`
		`- # Contributor (Arch): Evangelos Foutras <evangelos@foutrelis.com>`
		`+ # Maintainer (arch): Maxime Gauduin <alucryd@archlinux.org>`
		`+ # Contributor: FadeMind <fademind@gmail.com>`
		`+ # Contributor: Evangelos Foutras <evangelos@foutrelis.com>`

		`pkgname=lib32-libgudev`
		`pkgver=233`

nonsystemd-multilib/lib32-libpulse/PKGBUILD

file modified

+4 -4

		`@@ -1,8 +1,8 @@`
		`# Maintainer: David P. <megver83@parabola.nu>`
		`- # Maintainer (Arch): Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>`
		`- # Contributor (Arch): Daniel J Griffiths <ghost1227@archlinux.us>`
		`- # Contributor (Arch): Corrado Primier <bardo@aur.archlinux.org>`
		`- # Contributor (Arch): William Rea <sillywilly@gmail.com>`
		`+ # Maintainer (arch): Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>`
		`+ # Contributor: Daniel J Griffiths <ghost1227@archlinux.us>`
		`+ # Contributor: Corrado Primier <bardo@aur.archlinux.org>`
		`+ # Contributor: William Rea <sillywilly@gmail.com>`

		`_pkgbasename=libpulse`
		`pkgname=lib32-$_pkgbasename`

nonsystemd-multilib/lib32-libudev0-shim/PKGBUILD

file modified

+1 -1

		`@@ -1,4 +1,4 @@`
		`- # Maintainer (Arch): Levente Polyak <anthraxx[at]archlinux[dot]org>`
		`+ # Maintainer (arch): Levente Polyak <anthraxx[at]archlinux[dot]org>`
		`# Maintainer: David P. <megver83@parabola.nu>`

		`_basepkgname=libudev0-shim`

nonsystemd-multilib/lib32-libusb/PKGBUILD

file modified

+2 -2

		`@@ -1,5 +1,5 @@`
		`- # Maintainer (Arch): Sven-Hendrik Haase <sh@lutzhaase.com>`
		`- # Contributor (Arch): 3V0LU710N <db_eee-at-hotmail-dot-com>`
		`+ # Maintainer (arch): Sven-Hendrik Haase <sh@lutzhaase.com>`
		`+ # Contributor: 3V0LU710N <db_eee-at-hotmail-dot-com>`
		`# Maintainer: David P. <megver83@parabola.nu>`

		`pkgname=lib32-libusb`

nonsystemd-multilib/lib32-p11-kit/PKGBUILD

file modified

+3 -3

		`@@ -1,7 +1,7 @@`
		`# Maintainer: David P. <megver83@parabola.nu>`
		`- # Maintainer (Arch): Jan Alexander Steffens (heftig) <heftig@archlinux.org>`
		`- # Contributor (Arch): Florian Pritz <bluewind@xinu.at>`
		`- # Contributor (Arch): Christoph Vigano <mail@cvigano.de>`
		`+ # Maintainer (arch): Jan Alexander Steffens (heftig) <heftig@archlinux.org>`
		`+ # Contributor: Florian Pritz <bluewind@xinu.at>`
		`+ # Contributor: Christoph Vigano <mail@cvigano.de>`

		`pkgname=lib32-p11-kit`
		`pkgver=0.24.0`

nonsystemd-multilib/lib32-polkit/PKGBUILD

file modified

+4 -4

		`@@ -1,8 +1,8 @@`
		`# Maintainer: David P. <megver83@parabola.nu>`
		`- # Maintainer (Arch): Maxime Gauduin <alucryd@archlinux.org>`
		`- # Contributor (Arch): Jan de Groot <jgc@archlinux.org>`
		`- # Contributor (Arch): jtts <jussaar@mbnet.fi>`
		`- # Contributor (Arch): GordonGR <gordongr@freemail.gr>`
		`+ # Maintainer (arch): Maxime Gauduin <alucryd@archlinux.org>`
		`+ # Contributor: Jan de Groot <jgc@archlinux.org>`
		`+ # Contributor: jtts <jussaar@mbnet.fi>`
		`+ # Contributor: GordonGR <gordongr@freemail.gr>`

		`pkgname=lib32-polkit`
		`pkgver=0.116`

nonsystemd-multilib/lib32-udev/PKGBUILD

file modified

+3 -3

		`@@ -1,7 +1,7 @@`
		`# Maintainer: David P. <megver83@parabola.nu>`
		`- # Maintainer (Artix): Christian Hesse <mail@eworm.de>`
		`- # Maintainer (Artix): Dave Reisner <dreisner@archlinux.org>`
		`- # Maintainer (Artix): Tom Gundersen <teg@jklm.no>`
		`+ # Maintainer (artix): Christian Hesse <mail@eworm.de>`
		`+ # Maintainer (artix): Dave Reisner <dreisner@archlinux.org>`
		`+ # Maintainer (artix): Tom Gundersen <teg@jklm.no>`

		`pkgname=lib32-udev`
		`_pkgbasename=systemd`

nonsystemd-multilib/lib32-v4l-utils/PKGBUILD

file modified

+1 -1

		`@@ -1,5 +1,5 @@`
		`# Maintainer: David P. <megver83@parabola.nu>`
		`- # Maintainer (Arch): Jan "heftig" Steffens <jan.steffens@gmail.com>`
		`+ # Maintainer (arch): Jan "heftig" Steffens <jan.steffens@gmail.com>`

		`_pkgbasename=v4l-utils`
		`pkgname=lib32-$_pkgbasename`

nonsystemd/accountsservice/PKGBUILD

file modified

+2 -2

		`@@ -1,5 +1,5 @@`
		`- # Maintainer (Arch): Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>`
		`- # Contributor (Arch): Ionut Biru <ibiru@archlinux.org>`
		`+ # Maintainer (arch): Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>`
		`+ # Contributor: Ionut Biru <ibiru@archlinux.org>`
		`# Maintainer: David P. <megver83@parabola.nu>`

		`pkgname=accountsservice`

nonsystemd/acpid-openrc/PKGBUILD

file added

+27

		`@@ -0,0 +1,27 @@`
		`+ # Maintainer: David P. <megver83@parabola.nu>`
		`+ # Maintainer (artix): Rafli Akmal <rafliakmaltejakusuma@gmail.com>`
		`+ # Contributor: artoo <artoo@artixlinux.org>`
		`+ # Contributor: Oscar Campos <damnwidget@artixlinux.org>`
		`+`
		`+`
		`+ pkgname=acpid-openrc`
		`+ pkgver=20210506`
		`+ pkgrel=1`
		`+ pkgdesc="OpenRC acpid init script"`
		`+ arch=('any')`
		`+ url="https://gitea.artixlinux.org/packagesA/acpid-openrc"`
		`+ license=('GPL2')`
		`+ groups=('openrc-galaxy')`
		`+ provides=('init-acpid')`
		`+ conflicts=('init-acpid')`
		`+ backup=('etc/conf.d/acpid')`
		`+ source=("acpid.confd"`
		`+ "acpid.initd")`
		`+ sha256sums=('3755d4eb8bb64a1304e5defedb949305ac550565da36fe4f94d5f31beee821ba'`
		`+ 'c784a8b8ceceb3a453808a860a8dd9e0f8847f96cc82a7cc8410bc682aaadb06')`
		`+`
		`+ package() {`
		`+ depends=('openrc' 'acpid')`
		`+ install -Dm755 "$srcdir/acpid.initd" "$pkgdir/etc/init.d/acpid"`
		`+ install -Dm644 "$srcdir/acpid.confd" "$pkgdir/etc/conf.d/acpid"`
		`+ }`

nonsystemd/acpid-openrc/acpid.confd ~~nonsystemd/openrc-desktop/acpid.confd~~

file renamed

file was moved with no change to the file

nonsystemd/acpid-openrc/acpid.initd ~~nonsystemd/openrc-desktop/acpid.initd~~

file renamed

+6 -3

		`@@ -1,11 +1,14 @@`
		`- #!/sbin/openrc-run`
		`+ #!/usr/bin/openrc-run`
		`# Copyright 1999-2016 Gentoo Foundation`
		`# Distributed under the terms of the GNU General Public License v2`

		`extra_started_commands="reload"`
		`- command="/usr/sbin/acpid"`
		`+ command="/usr/bin/acpid"`
		`command_args="${ACPID_ARGS}"`
		`description="Daemon for Advanced Configuration and Power Interface"`
		`+ supervisor="supervise-daemon"`
		`+ command_args_foreground="--foreground"`
		`+ #pidfile="/run/acpid.pid"`

		`depend() {`
		`need localmount`
		`@@ -14,6 +17,6 @@`

		`reload() {`
		`ebegin "Reloading acpid configuration"`
		`- start-stop-daemon --exec $command --signal HUP`
		`+ ${supervisor} ${RC_SVCNAME} --signal HUP --pidfile /run/acpid.pid`
		`eend $?`
		`}`

nonsystemd/alsa-utils-openrc/PKGBUILD

file added

+25

		`@@ -0,0 +1,25 @@`
		`+ # Maintainer: David P. <megver83@parabola.nu>`
		`+ # Maintainer (artix): artoo <artoo@artixlinux.org>`
		`+`
		`+ pkgname=alsa-utils-openrc`
		`+ pkgver=20210505`
		`+ pkgrel=2`
		`+ pkgdesc="OpenRC alsa-utils init script"`
		`+ arch=('any')`
		`+ url="https://gitea.artixlinux.org/packagesA/alsa-utils-openrc"`
		`+ license=('GPL2')`
		`+ groups=('openrc-world')`
		`+ provides=('init-alsa-utils')`
		`+ conflicts=('init-alsa-utils')`
		`+ backup=('etc/conf.d/alsasound')`
		`+ source=("alsasound.confd"`
		`+ "alsasound.initd")`
		`+ sha256sums=('d1c55400b701a72dcb8bb85e016b5013fa3eb6a2766ffc20dae278d0ee4c1a43'`
		`+ '40c9f0e8d00b88ebd28bba9dcd91323549a77aeda12a5a86c532bddca7dae8d1')`
		`+`
		`+ package() {`
		`+ depends=('openrc' 'alsa-utils')`
		`+ install -Dm755 "${srcdir}"/alsasound.initd "${pkgdir}"/etc/init.d/alsasound`
		`+ install -Dm644 "${srcdir}"/alsasound.confd "${pkgdir}"/etc/conf.d/alsasound`
		`+ }`
		`+`

nonsystemd/alsa-utils-openrc/alsasound.confd

file added

+15

		`@@ -0,0 +1,15 @@`
		`+ # RESTORE_ON_START:`
		`+ # Do you want to restore your mixer settings? If not, your cards will be`
		`+ # muted.`
		`+ # no - Do not restore state`
		`+ # yes - Restore state`
		`+`
		`+ RESTORE_ON_START="yes"`
		`+`
		`+ # SAVE_ON_STOP:`
		`+ # Do you want to save changes made to your mixer volumes when alsasound`
		`+ # stops?`
		`+ # no - Do not save state`
		`+ # yes - Save state`
		`+`
		`+ SAVE_ON_STOP="yes"`

nonsystemd/alsa-utils-openrc/alsasound.initd

file added

+87

		`@@ -0,0 +1,87 @@`
		`+ #!/usr/bin/openrc-run`
		`+ # Copyright 1999-2019 Gentoo Authors`
		`+ # Distributed under the terms of the GNU General Public License v2`
		`+`
		`+ alsastatedir=/var/lib/alsa`
		`+ alsascrdir=/etc/alsa.d`
		`+ alsahomedir=/run/alsasound`
		`+`
		`+ extra_commands="save restore"`
		`+`
		`+ depend() {`
		`+ need localmount`
		`+ after bootmisc modules isapnp coldplug hotplug`
		`+ }`
		`+`
		`+ restore() {`
		`+ ebegin "Restoring Mixer Levels"`
		`+`
		`+ checkpath -q -d -m 0700 -o root:root ${alsahomedir} \|\| return 1`
		`+`
		`+ if [ ! -r "${alsastatedir}/asound.state" ] ; then`
		`+ ewarn "No mixer config in ${alsastatedir}/asound.state, you have to unmute your card!"`
		`+ eend 0`
		`+ return 0`
		`+ fi`
		`+`
		`+ local cards="$(sed -n -e 's/^ $[[:digit:]]$ .*/\1/p' /proc/asound/cards)"`
		`+ local CARDNUM`
		`+ for cardnum in ${cards}; do`
		`+ [ -e /dev/snd/controlC${cardnum} ] \|\| sleep 2`
		`+ [ -e /dev/snd/controlC${cardnum} ] \|\| sleep 2`
		`+ [ -e /dev/snd/controlC${cardnum} ] \|\| sleep 2`
		`+ [ -e /dev/snd/controlC${cardnum} ] \|\| sleep 2`
		`+ alsactl -E HOME="${alsahomedir}" -I -f "${alsastatedir}/asound.state" restore ${cardnum} \`
		`+ \|\| ewarn "Errors while restoring defaults, ignoring"`
		`+ done`
		`+`
		`+ for ossfile in "${alsastatedir}"/oss/card_pcm ; do`
		`+ [ -e "${ossfile}" ] \|\| continue`
		`+ # We use cat because I'm not sure if cp works properly on /proc`
		`+ local procfile=${ossfile##${alsastatedir}/oss}`
		`+ procfile="$(echo "${procfile}" \| sed -e 's,_,/,g')"`
		`+ if [ -e /proc/asound/"${procfile}"/oss ] ; then`
		`+ cat "${ossfile}" > /proc/asound/"${procfile}"/oss`
		`+ fi`
		`+ done`
		`+`
		`+ eend 0`
		`+ }`
		`+`
		`+ save() {`
		`+ ebegin "Storing ALSA Mixer Levels"`
		`+`
		`+ checkpath -q -d -m 0700 -o root:root ${alsahomedir} \|\| return 1`
		`+`
		`+ mkdir -p "${alsastatedir}"`
		`+ if ! alsactl -E HOME="${alsahomedir}" -f "${alsastatedir}/asound.state" store; then`
		`+ eerror "Error saving levels."`
		`+ eend 1`
		`+ return 1`
		`+ fi`
		`+`
		`+ for ossfile in /proc/asound/card/pcm/oss; do`
		`+ [ -e "${ossfile}" ] \|\| continue`
		`+ local device=${ossfile##/proc/asound/} ; device=${device%%/oss}`
		`+ device="$(echo "${device}" \| sed -e 's,/,_,g')"`
		`+ mkdir -p "${alsastatedir}/oss/"`
		`+ cp "${ossfile}" "${alsastatedir}/oss/${device}"`
		`+ done`
		`+`
		`+ eend 0`
		`+ }`
		`+`
		`+ start() {`
		`+ if [ "${RESTORE_ON_START}" = "yes" ]; then`
		`+ restore`
		`+ fi`
		`+`
		`+ return 0`
		`+ }`
		`+`
		`+ stop() {`
		`+ if [ "${SAVE_ON_STOP}" = "yes" ]; then`
		`+ save`
		`+ fi`
		`+ return 0`
		`+ }`

nonsystemd/apparmor-openrc/PKGBUILD

file added

+20

		`@@ -0,0 +1,20 @@`
		`+ # Maintainer: David P. <megver83@parabola.nu>`
		`+ # Maintainer (artix): artoo <artoo@artixlinux.org>`
		`+`
		`+ pkgname=apparmor-openrc`
		`+ pkgver=20210506`
		`+ pkgrel=1`
		`+ pkgdesc="OpenRC apparmor init script"`
		`+ arch=('any')`
		`+ url="https://gitea.artixlinux.org/packagesA/apparmor-openrc"`
		`+ license=('GPL2')`
		`+ groups=('openrc-world')`
		`+ provides=('init-apparmor')`
		`+ conflicts=('init-apparmor')`
		`+ source=("apparmor.initd")`
		`+ sha256sums=('ba7601a738761a3f27278a7508ae32463f7097c597f0806931983ef6af2a5d3a')`
		`+`
		`+ package() {`
		`+ depends=('openrc' 'apparmor')`
		`+ install -Dm755 "${srcdir}"/apparmor.initd "${pkgdir}"/etc/init.d/apparmor`
		`+ }`

nonsystemd/apparmor-openrc/apparmor.initd

file added

+91

		`@@ -0,0 +1,91 @@`
		`+ #!/usr/bin/openrc-run`
		`+ # Copyright 1999-2013 Gentoo Foundation`
		`+ # Distributed under the terms of the GNU General Public License v2`
		`+`
		`+ description="Load all configured profiles for the AppArmor security module."`
		`+ description_reload="Reload all profiles"`
		`+`
		`+ extra_started_commands="reload"`
		`+`
		`+ aa_action() {`
		`+ local arg=$1`
		`+ local return`
		`+`
		`+ shift`
		`+ $*`
		`+ return=$?`
		`+`
		`+ if [ ${return} -eq 0 ]; then`
		`+ aa_log_success_msg $arg`
		`+ else`
		`+ aa_log_failure_msg arg`
		`+ fi`
		`+`
		`+ return $return`
		`+ }`
		`+`
		`+ aa_log_action_start() {`
		`+ ebegin $1`
		`+ }`
		`+`
		`+ aa_log_action_end() {`
		`+ eend $1`
		`+ }`
		`+`
		`+ aa_log_success_msg() {`
		`+ einfo $1`
		`+ }`
		`+`
		`+ aa_log_warning_msg() {`
		`+ ewarn $1`
		`+ }`
		`+`
		`+ aa_log_failure_msg() {`
		`+ eerror $1`
		`+ }`
		`+`
		`+ aa_log_skipped_msg() {`
		`+ einfo $1`
		`+ }`
		`+`
		`+ aa_log_daemon_msg() {`
		`+ einfo $1`
		`+ }`
		`+`
		`+ aa_log_end_msg() {`
		`+ eend $1`
		`+ }`
		`+`
		`+ . /usr/lib/apparmor/rc.apparmor.functions`
		`+`
		`+ start() {`
		`+ ebegin "Starting AppArmor"`
		`+ eindent`
		`+`
		`+ if ! is_apparmor_loaded ; then`
		`+ load_module`
		`+ if [ $? -ne 0 ]; then`
		`+ eerror "AppArmor kernel support is not present"`
		`+ eend 1`
		`+ return 1`
		`+ fi`
		`+ fi`
		`+`
		`+ parse_profiles load`
		`+`
		`+ eoutdent`
		`+ }`
		`+`
		`+ stop() {`
		`+ ebegin "Stopping AppArmor"`
		`+ eindent`
		`+ apparmor_stop`
		`+ eoutdent`
		`+ }`
		`+`
		`+ reload() {`
		`+ # todo: split out clean_profiles into its own function upstream`
		`+ # so we can do parse_profiles reload && clean_profiles`
		`+ # and do a proper reload instead of restart`
		`+ apparmor_restart`
		`+ }`

nonsystemd/avahi-openrc/PKGBUILD

file added

+27

		`@@ -0,0 +1,27 @@`
		`+ # Maintainer: David P. <megver83@parabola.nu>`
		`+ # Maintainer (artix): artoo <artoo@artixlinux.org>`
		`+`
		`+ pkgname=avahi-openrc`
		`+ pkgver=20210505`
		`+ pkgrel=2`
		`+ pkgdesc="OpenRC avahi init script"`
		`+ arch=('any')`
		`+ url="https://gitea.artixlinux.org/packagesA/avahi-openrc"`
		`+ license=('GPL2')`
		`+ groups=('openrc-world')`
		`+ provides=('init-avahi')`
		`+ conflicts=('init-avahi')`
		`+ source=('avahi-daemon.initd'`
		`+ 'avahi-dnsconfd.initd'`
		`+ 'autoipd-openrc.sh')`
		`+ sha256sums=('0e6513b19d79edfe8d3a124e15fe48ee3cfa073fa93971c2265d82c4df7caa10'`
		`+ 'a359e718f6c0be654ded4f27e2215067564358d43e17d9a99d5d65c8379eb815'`
		`+ '064a4cedc00f67e93a6f2ef99489e2614305a673a75a2135010283e99da6d6bf')`
		`+`
		`+ package() {`
		`+ depends=('avahi' 'openrc')`
		`+ install -Dm755 "${srcdir}"/avahi-daemon.initd "${pkgdir}"/etc/init.d/avahi-daemon`
		`+ install -Dm755 "${srcdir}"/avahi-dnsconfd.initd "${pkgdir}"/etc/init.d/avahi-dnsconfd`
		`+`
		`+ install -Dm755 autoipd-openrc.sh "${pkgdir}"/usr/lib/netifrc/net/autoipd.sh`
		`+ }`

nonsystemd/avahi-openrc/autoipd-openrc.sh ~~nonsystemd/openrc-desktop/autoipd-openrc.sh~~

file renamed

file was moved with no change to the file

nonsystemd/avahi-openrc/avahi-daemon.initd ~~nonsystemd/openrc-desktop/avahi-daemon.initd~~

file renamed

+14 -12

		`@@ -3,6 +3,8 @@`
		`# Distributed under the terms of the GNU General Public License v2`

		`extra_started_commands="reload"`
		`+ command="/usr/sbin/avahi-daemon"`
		`+ supervisor="supervise-daemon"`

		`depend() {`
		`before netmount nfsmount`
		`@@ -10,20 +12,20 @@`
		`need dbus`
		`}`

		`- start() {`
		`- ebegin "Starting avahi-daemon"`
		`- /usr/bin/avahi-daemon -D`
		`- eend $?`
		`- }`
		`-`
		`- stop() {`
		`- ebegin "Stopping avahi-daemon"`
		`- /usr/bin/avahi-daemon -k`
		`- eend $?`
		`- }`
		`+ # start() {`
		`+ # ebegin "Starting avahi-daemon"`
		`+ # /usr/bin/avahi-daemon -D`
		`+ # eend $?`
		`+ # }`
		`+ #`
		`+ # stop() {`
		`+ # ebegin "Stopping avahi-daemon"`
		`+ # /usr/bin/avahi-daemon -k`
		`+ # eend $?`
		`+ # }`

		`reload() {`
		`ebegin "Reloading avahi-daemon"`
		`- /usr/bin/avahi-daemon -r`
		`+ ${command} -r`
		`eend $?`
		`}`

nonsystemd/avahi-openrc/avahi-dnsconfd.initd

file added

+30

		`@@ -0,0 +1,30 @@`
		`+ #!/usr/bin/openrc-run`
		`+ # Copyright 1999-2007 Gentoo Foundation`
		`+ # Distributed under the terms of the GNU General Public License v2`
		`+`
		`+ extra_started_commands="reload"`
		`+ supervisor="supervise-daemon"`
		`+ command="/usr/bin/avahi-dnsconfd"`
		`+`
		`+ depend() {`
		`+ need avahi-daemon`
		`+ use net`
		`+ }`
		`+`
		`+ # start() {`
		`+ # ebegin "Starting avahi-dnsconfd"`
		`+ # /usr/bin/avahi-dnsconfd -D`
		`+ # eend $?`
		`+ # }`
		`+ #`
		`+ # stop() {`
		`+ # ebegin "Stopping avahi-dnsconfd"`
		`+ # /usr/bin/avahi-dnsconfd -k`
		`+ # eend $?`
		`+ # }`
		`+`
		`+ reload() {`
		`+ ebegin "Reloading avahi-dnsconfd"`
		`+ ${command} -r`
		`+ eend $?`
		`+ }`

nonsystemd/base/PKGBUILD

file modified

+4 -4

		`@@ -1,6 +1,6 @@`
		`- # Maintainer (Arch): Arch Linux Team`
		`- # Contributor (Arch): Levente Polyak <anthraxx[at]archlinux[dot]org>`
		`- # Contributor (Arch): Eli Schwartz <eschwartz@archlinux.org>`
		`+ # Maintainer (arch): Arch Linux Team`
		`+ # Contributor: Levente Polyak <anthraxx[at]archlinux[dot]org>`
		`+ # Contributor: Eli Schwartz <eschwartz@archlinux.org>`
		`# Maintainer: David P. <megver83@parabola.nu>`

		`pkgname=base`
		`@@ -29,6 +29,6 @@`
		`'iputils' 'iproute2'`

		`# parabola`
		`- 'your-freedom' 'your-initfreedom'`
		`+ 'your-freedom' 'your-init-freedom'`
		`)`
		`optdepends=('linux-libre: bare metal support')`

nonsystemd/bluez-openrc/PKGBUILD

file added

+20

		`@@ -0,0 +1,20 @@`
		`+ # Maintainer: David P. <megver83@parabola.nu>`
		`+ # Maintainer (artix): artoo <artoo@artixlinux.org>`
		`+`
		`+ pkgname=bluez-openrc`
		`+ pkgver=20210506`
		`+ pkgrel=1`
		`+ pkgdesc="OpenRC bluez init script"`
		`+ arch=('any')`
		`+ url="https://gitea.artixlinux.org/packagesB/bluez-openrc"`
		`+ license=('GPL2')`
		`+ groups=('openrc-world')`
		`+ provides=('init-bluez')`
		`+ conflicts=('init-bluez')`
		`+ source=("bluetoothd.initd")`
		`+ sha256sums=('b99147767d339b0d6707bbd8cd4da51e795835b7519e7d6d2fcf70dabcaeeb9a')`
		`+`
		`+ package() {`
		`+ depends=('bluez' 'openrc')`
		`+ install -Dm755 "${srcdir}"/bluetoothd.initd "${pkgdir}"/etc/init.d/bluetoothd`
		`+ }`

nonsystemd/bluez-openrc/bluetoothd.initd ~~nonsystemd/openrc-desktop/bluetoothd.initd~~

file renamed

+3 -2

		`@@ -2,9 +2,10 @@`
		`# Copyright 1999-2019 Gentoo Authors`
		`# Distributed under the terms of the GNU General Public License v2`

		`- pidfile="/run/bluetoothd.pid"`
		`+ supervisor="supervise-daemon"`
		`+ #pidfile="/run/bluetoothd.pid"`
		`command="/usr/lib/bluetooth/bluetoothd"`
		`- command_background=1`
		`+ #command_background=1`

		`depend() {`
		`after coldplug`

nonsystemd/brltty/PKGBUILD

file modified

+5 -5

		`@@ -1,8 +1,8 @@`
		`- # Maintainer (Arch): David Runge <dvzrv@archlinux.org>`
		`- # Contributor (Arch): Alexander Epaneshnikov <aarnaarn2@gmail.com>`
		`- # Contributor (Arch): Tom Gundersen <teg@jklm.no>`
		`- # Contributor (Arch): Jan de Groot <jgc@archlinux.org>`
		`- # Contributor (Arch): Giovanni Scafora <giovanni@archlinux.org>`
		`+ # Maintainer (arch): David Runge <dvzrv@archlinux.org>`
		`+ # Contributor: Alexander Epaneshnikov <aarnaarn2@gmail.com>`
		`+ # Contributor: Tom Gundersen <teg@jklm.no>`
		`+ # Contributor: Jan de Groot <jgc@archlinux.org>`
		`+ # Contributor: Giovanni Scafora <giovanni@archlinux.org>`
		`# Maintainer: David P. <megver83@parabola.nu>`

		`pkgname=brltty`

nonsystemd/chrony-openrc/PKGBUILD

file added

+27

		`@@ -0,0 +1,27 @@`
		`+ # Maintainer: David P. <megver83@parabola.nu>`
		`+ # Maintainer (artix): Nathan Owens <ndowens@artixlinux.org>`
		`+`
		`+ pkgname=chrony-openrc`
		`+ pkgver=20210506`
		`+ pkgrel=2`
		`+ pkgdesc="OpenRC chrony init"`
		`+ arch=('any')`
		`+ url="https://gitea.artixlinux.org/packagesC/chrony-openrc"`
		`+ license=('GPL2')`
		`+ groups=('openrc-galaxy')`
		`+ provides=('init-chrony' 'init-timed')`
		`+ conflicts=('init-chrony' 'init-timed')`
		`+ backup=('etc/conf.d/chrony')`
		`+ source=("chrony.confd"`
		`+ "chrony.initd")`
		`+ sha256sums=('e65e4cf13bf00d6e7378f86f4513b5b3312b1d8b181bedbef6d8f55e8037f1de'`
		`+ '149b12adabd0ab5358de1b3d8674dd5ecde7acd7d14310ee83dae4a72bc84f0b')`
		`+ b2sums=('496483539b15a55c15287178b7df730fe33fe8d7ceda164f362c0dd6cd833bbee84a0a0496586489659075fc10aafed0f221fb78d60804ddd9edd24e71f6d49b'`
		`+ '4e8f80b060bcc7f6f3b0d702f1b85387f6e545c31f315232574bf8ebd5ad2a6604a80a994ba629ffe419776a29339d894f0c1c7db78e9cd6fb4dc4761cf2c398')`
		`+`
		`+`
		`+ package() {`
		`+ depends=('openrc' 'chrony')`
		`+ install -Dm755 "${srcdir}"/chrony.initd "${pkgdir}"/etc/init.d/chrony`
		`+ install -Dm644 "${srcdir}"/chrony.confd "${pkgdir}"/etc/conf.d/chrony`
		`+ }`

nonsystemd/chrony-openrc/chrony.confd

file added

+17

		`@@ -0,0 +1,17 @@`
		`+ # /etc/conf.d/chronyd`
		`+`
		`+ CFGFILE="/etc/chrony.conf"`
		`+`
		`+ # chronyd takes some time to perform a second fork, by enabling this`
		`+ # option chronyd is deamonized through start-stop-daemon(1) thereby`
		`+ # significantly reducing the startup time.`
		`+ FAST_STARTUP=yes`
		`+`
		`+ # Configuration dependant options :`
		`+ # -s - Set system time from RTC if rtcfile directive present`
		`+ # -r - Reload sample histories if dumponexit directive present`
		`+ #`
		`+ # The combination of "-s -r" allows chronyd to perform long term averaging of`
		`+ # the gain or loss rate across system reboots and shutdowns.`
		`+`
		`+ ARGS=""`

nonsystemd/chrony-openrc/chrony.initd

file added

+78

		`@@ -0,0 +1,78 @@`
		`+ #!/usr/bin/openrc-run`
		`+ # Copyright 1999-2007 Gentoo Foundation`
		`+ # Distributed under the terms of the GNU General Public License v2`
		`+ # $Header: /var/cvsroot/gentoo-x86/net-misc/chrony/files/chronyd.rc,v 1.8 2007/03/22 14:32:09 tove Exp $`
		`+`
		`+ command="/usr/bin/chronyd"`
		`+ description="NTP daemon"`
		`+ pidfile="/run/chrony/chronyd.pid"`
		`+`
		`+ depend() {`
		`+ need net`
		`+ after firewall`
		`+ provide ntp-client ntp-server`
		`+ use dns`
		`+ }`
		`+`
		`+ checkconfig() {`
		`+ # Note that /etc/chrony/chrony.keys is NOT checked. This`
		`+ # is because the user may have specified another key`
		`+ # file, and we don't want to force the user to use that`
		`+ # exact name for the key file.`
		`+ if [ ! -f "${CFGFILE}" ] ; then`
		`+ eerror "Please create ${CFGFILE} and the"`
		`+ eerror "chrony key file (usually /etc/chrony/chrony.keys)"`
		`+ eerror "by using the"`
		`+ eerror ""`
		`+ eerror " chrony.conf.example"`
		`+ eerror " chrony.keys.example"`
		`+ eerror ""`
		`+ eerror "files (from the documentation directory)"`
		`+ eerror "as templates."`
		`+ return 1`
		`+ else`
		`+ # Actually, I tried it, and chrony seems to ignore the pidfile`
		`+ # option. I'm going to leave it here anyway, since you never`
		`+ # know if it might be handy`
		+ _cfg_pidfile=`awk '/^ *pidfile/{print $2}' "${CFGFILE}"`
		`+ if [ -n "$_cfg_pidfile" ] ; then`
		`+ pidfile="$_cfg_pidfile"`
		`+ fi`
		`+ fi`
		`+ return 0`
		`+ }`
		`+`
		`+ setxtrarg() {`
		`+ if [ -c /dev/rtc ]; then`
		`+ grep -q '^rtcfile' "${CFGFILE}" && ARGS="${ARGS} -s"`
		`+ fi`
		`+ grep -q '^dumponexit$' "${CFGFILE}" && ARGS="${ARGS} -r"`
		`+ return 0`
		`+ }`
		`+`
		`+ start() {`
		`+ checkconfig \|\| return $?`
		`+ setxtrarg`
		`+`
		`+ local daemon_args=`
		`+ if yesno "$FAST_STARTUP"; then`
		`+ ARGS="${ARGS} -n"`
		`+ daemon_args="--background"`
		`+ fi`
		`+`
		`+ ebegin "Starting chronyd"`
		`+ start-stop-daemon $daemon_args --start --quiet \`
		`+ --exec "${command}" \`
		`+ --pidfile "${pidfile}" \`
		`+ -- -f "${CFGFILE}" ${ARGS}`
		`+ eend $? "Failed to start chronyd"`
		`+ }`
		`+`
		`+ stop() {`
		`+ checkconfig \|\| return $?`
		`+`
		`+ ebegin "Stopping chronyd"`
		`+ start-stop-daemon --stop --quiet \`
		`+ --pidfile "${pidfile}"`
		`+ eend $? "Failed to stop chronyd"`
		`+ }`

nonsystemd/dbus-openrc/80-dbus

file added

+12

		`@@ -0,0 +1,12 @@`
		`+ #!/bin/bash`
		`+`
		`+ # launches a session dbus instance`
		`+`
		`+ dbuslaunch="$(which dbus-launch 2>/dev/null)"`
		`+ if [ -n "$dbuslaunch" ] && [ -x "$dbuslaunch" ] && [ -z "$DBUS_SESSION_BUS_ADDRESS" ]; then`
		`+ if [ -n "$command" ]; then`
		`+ command="$dbuslaunch --exit-with-session $command"`
		`+ else`
		`+ eval $($dbuslaunch --sh-syntax --exit-with-session)`
		`+ fi`
		`+ fi`

nonsystemd/dbus-openrc/PKGBUILD

file added

+30

		`@@ -0,0 +1,30 @@`
		`+ # Maintainer: David P. <megver83@parabola.nu>`
		`+ # Maintainer (artix): artoo <artoo@artixlinux.org>`
		`+`
		`+ pkgname=dbus-openrc`
		`+ pkgver=20210418`
		`+ pkgrel=2`
		`+ pkgdesc="OpenRC dbus init script"`
		`+ arch=('any')`
		`+ url="https://gitea.artixlinux.org/packagesD/dbus-openrc"`
		`+ license=('GPL2')`
		`+ provides=('init-dbus')`
		`+ conflicts=('init-dbus')`
		`+ source=('dbus.initd'`
		`+ 'dbus-reload.hook'`
		`+ '80-dbus')`
		`+ sha256sums=('3801358d1fe65db3711851c4a2d7c491c8750c899d8effdf37eb64d34683e91b'`
		`+ '517cb12a30f84ba9580532d5485ce219ad96668480db99fcd4954c7017a0ea47'`
		`+ '6d637acae40368db9e7c005b2e53483882014caef281fe9e801633ba7cc3b7dd')`
		`+`
		`+ package() {`
		`+ depends=('dbus' 'openrc')`
		`+ install -Dm755 "${srcdir}"/dbus.initd "${pkgdir}"/etc/init.d/dbus`
		`+`
		`+ install -d "${pkgdir}"/etc/runlevels/default`
		`+ ln -sf /etc/init.d/dbus "${pkgdir}"/etc/runlevels/default/dbus`
		`+`
		`+ install -Dt "${pkgdir}"/usr/share/libalpm/hooks -m644 *.hook`
		`+`
		`+ install -Dm755 "${srcdir}"/80-dbus "${pkgdir}"/etc/X11/xinit/xinitrc.d/80-dbus.sh`
		`+ }`

nonsystemd/dbus-openrc/dbus-reload.hook ~~nonsystemd/dbus/dbus-reload.hook~~

file renamed

+1 -1

		`@@ -1,5 +1,5 @@`
		`[Trigger]`
		`- Type = File`
		`+ Type = Path`
		`Operation = Install`
		`Operation = Upgrade`
		`Operation = Remove`

nonsystemd/dbus-openrc/dbus.initd ~~nonsystemd/dbus/dbus.initd~~

file renamed

+3 -3

		`@@ -2,12 +2,12 @@`
		`# Copyright 1999-2019 Gentoo Authors`
		`# Distributed under the terms of the GNU General Public License, v2 or later`

		`- extra_started_commands="reload"`
		`-`
		`+ supervisor=supervise-daemon`
		`description="An IPC message bus daemon"`
		`- pidfile="/run/dbus/pid"`
		`command="/usr/bin/dbus-daemon"`
		`command_args="--system"`
		`+ command_args_foreground="--nofork --nopidfile"`
		`+ extra_started_commands="reload"`

		`dbus_socket="/run/dbus/system_bus_socket"`

nonsystemd/dbus/PKGBUILD

file modified

+34 -29

		`@@ -1,40 +1,33 @@`
		`- # Maintainer: David P. <megver83@parabola.nu>`
		`- # Maintainer (Arch): Jan Alexander Steffens (heftig) <heftig@archlinux.org>`
		`- # Contributor (Arch): Jan de Groot <jgc@archlinux.org>`
		`- # Contributor (Arch): Tom Gundersen <teg@jklm.no>`
		`- # Contributor (Arch): Link Dupont <link@subpop.net>`
		`-`
		`- pkgname=dbus`
		`- pkgver=1.12.20`
		`+ # Maintainer: Jan Alexander Steffens (heftig) <heftig@archlinux.org>`
		`+ # Contributor: Jan de Groot <jgc@archlinux.org>`
		`+ # Contributor: Tom Gundersen <teg@jklm.no>`
		`+ # Contributor: Link Dupont <link@subpop.net>`
		`+`
		`+ pkgbase=dbus`
		`+ pkgname=(dbus dbus-docs)`
		`+ pkgver=1.14.0`
		`pkgrel=1`
		`- pkgrel+=.nonsystemd2`
		`+ pkgrel+=.nonsystemd1`
		`pkgdesc="Freedesktop.org message bus system"`
		`url="https://wiki.freedesktop.org/www/Software/dbus/"`
		`arch=(x86_64)`
		`arch+=(i686 armv7h)`
		`license=(GPL custom)`
		`depends=(libx11 libelogind expat audit)`
		`- depends+=(libelogind.so libaudit.so)`
		`makedepends=(elogind xmlto docbook-xsl python yelp-tools doxygen git autoconf-archive)`
		`- provides=(libdbus libdbus-1.so)`
		`- provides+=(dbus-elogind dbus-openrc)`
		`- conflicts=(libdbus dbus-elogind dbus-openrc)`
		`- replaces=(${conflicts[@]})`
		`source=("git+https://gitlab.freedesktop.org/dbus/dbus.git?signed#tag=dbus-$pkgver"`
		`dbus-enable-elogind.patch`
		`- no-fatal-warnings.diff`
		`- dbus-reload.hook`
		`- dbus.initd)`
		`+ no-fatal-warnings.diff)`
		`sha256sums=('SKIP'`
		`'faffcaa5b295f49fcedeed2c9ece5298949096be3062fd99a4bf1a6ac3ad1ea0'`
		`- '6958eeec07557b92a28419eb1702331ee2f0a6fd17285e37dfb6130b9fa4cf6e'`
		`- '1335a86bb5eb68614bf13af314f1a7f5f6f68253584986e9c5b492a4585ab722'`
		`- '9964aa935b4a7d64f5970bcfcd561b06013a85ae2712444bc4c5f644364dab3b')`
		`+ 'c10395be67e1127a58d7173b587fbbf16f8a8b271c41293558fcf9e27c185478')`
		`validpgpkeys=('DA98F25C0871C49A59EAFF2C4DE8FF2A63C7CC90') # Simon McVittie <simon.mcvittie@collabora.co.uk>`

		`prepare() {`
		`cd dbus`
		`+`
		`patch -Np 1 -i ../dbus-enable-elogind.patch`
		`+`
		`# Allow us to enable checks without them being fatal`
		`patch -Np1 -i ../no-fatal-warnings.diff`

		`@@ -48,6 +41,7 @@`
		`--sysconfdir=/etc \`
		`--localstatedir=/var \`
		`--libexecdir=/usr/lib/dbus-1.0 \`
		`+ --runstatedir=/run \`
		`--with-console-auth-dir=/run/console/ \`
		`--with-dbus-user=dbus \`
		`--with-system-pid-file=/run/dbus/pid \`
		`@@ -67,10 +61,15 @@`
		`}`

		`check() {`
		`- make -C dbus check`
		`+ make -C dbus -j1 check`
		`}`

		`- package() {`
		`+ package_dbus() {`
		`+ depends+=(libelogind.so libaudit.so)`
		`+ provides=(libdbus libdbus-1.so)`
		`+ conflicts=(libdbus)`
		`+ replaces=(libdbus)`
		`+`
		`DESTDIR="$pkgdir" make -C dbus install`

		`rm -r "$pkgdir"/{etc,var}`
		`@@ -79,14 +78,20 @@`
		`echo 'u dbus 81 "System Message Bus"' \|`
		`install -Dm644 /dev/stdin "$pkgdir/usr/lib/sysusers.d/dbus.conf"`

		`+ # Split docs`
		`+ mkdir -p doc/usr/share`
		`+ mv {"$pkgdir",doc}/usr/share/doc`
		`+`
		`install -Dt "$pkgdir/usr/share/licenses/$pkgname" -m644 dbus/COPYING`
		`+ }`
		`+`
		`+ package_dbus-docs() {`
		`+ pkgdesc+=" (documentation)"`
		`+ depends=()`

		`- # Remove docs`
		`- rm -r "$pkgdir/usr/share/doc"`
		`+ mv doc/* "$pkgdir"`

		`- # Init script`
		`- install -Dt "$pkgdir/usr/share/libalpm/hooks" -m644 *.hook`
		`- install -Dm755 "$srcdir/dbus.initd" "$pkgdir/etc/init.d/dbus"`
		`- install -d "${pkgdir}/etc/runlevels/default"`
		`- ln -sf "/etc/init.d/dbus" "${pkgdir}/etc/runlevels/default/dbus"`
		`+ install -Dt "$pkgdir/usr/share/licenses/$pkgname" -m644 dbus/COPYING`
		`}`
		`+`
		`+ # vim:set sw=2 et:`

nonsystemd/dbus/no-fatal-warnings.diff

file modified

+4 -4

		`@@ -1,10 +1,10 @@`
		`diff --git i/dbus/dbus-internals.c w/dbus/dbus-internals.c`
		`- index 267aef97..b1064e85 100644`
		`+ index ab498b15..cf86f4ae 100644`
		`--- i/dbus/dbus-internals.c`
		`+++ w/dbus/dbus-internals.c`
		`- @@ -185,7 +185,7 @@ const char *_dbus_no_memory_message = "Not enough memory";`
		`-`
		`- static dbus_bool_t warn_initted = FALSE;`
		`+ @@ -193,7 +193,7 @@ static dbus_bool_t warn_initted = FALSE;`
		`+ * threads, the worst that will happen is that warnings get their default`
		`+ * fatal/non-fatal nature. */`
		`static dbus_bool_t fatal_warnings = FALSE;`
		`-static dbus_bool_t fatal_warnings_on_check_failed = TRUE;`
		`+static dbus_bool_t fatal_warnings_on_check_failed = FALSE;`

nonsystemd/devtools/PKGBUILD

file modified

+2 -2

		`@@ -1,5 +1,5 @@`
		`- # Maintainer (Arch): Levente Polyak <anthraxx[at]archlinux[dot]org>`
		`- # Maintainer (Arch): Pierre Schmitz <pierre@archlinux.de>`
		`+ # Maintainer (arch): Levente Polyak <anthraxx[at]archlinux[dot]org>`
		`+ # Maintainer (arch): Pierre Schmitz <pierre@archlinux.de>`
		`# Maintainer: David P. <megver83@parabola.nu>`

		`pkgname=devtools`

nonsystemd/docker-openrc/PKGBUILD

file added

+26

		`@@ -0,0 +1,26 @@`
		`+ # Maintainer: David P. <megver83@parabola.nu>`
		`+ # Maintainer (artix): Rafli Akmal <rafliakmaltejakusuma@gmail.com>`
		`+ # Contributor: artoo <artoo@artixlinux.org>`
		`+ # Contributor: Oscar Campos <damnwidget@artixlinux.org>`
		`+`
		`+ pkgname=docker-openrc`
		`+ pkgver=20210505`
		`+ pkgrel=1`
		`+ pkgdesc="OpenRC docker init script"`
		`+ arch=('any')`
		`+ url="https://gitea.artixlinux.org/packagesD/docker-openrc"`
		`+ license=('GPL2')`
		`+ groups=('openrc-galaxy')`
		`+ provides=('init-docker')`
		`+ conflicts=('init-docker')`
		`+ backup=('etc/conf.d/docker')`
		`+ source=("docker.confd"`
		`+ "docker.initd")`
		`+ sha256sums=('3f661c0032dda93d448f138308b1d70b35ef9297bc43816891bbcd1ab5d7cc5e'`
		`+ 'd891f5ba66b5a8dd472b7b19db774af7a22a7a1c0766cb57c3422c098a82c493')`
		`+`
		`+ package() {`
		`+ depends=('openrc' 'docker')`
		`+ install -Dm755 "$srcdir/docker.initd" "$pkgdir/etc/init.d/docker"`
		`+ install -Dm644 "$srcdir/docker.confd" "$pkgdir/etc/conf.d/docker"`
		`+ }`

nonsystemd/docker-openrc/docker.confd

file added

+29

		`@@ -0,0 +1,29 @@`
		`+ # /etc/conf.d/docker: config file for /etc/init.d/docker`
		`+`
		`+ # where the docker daemon output gets piped`
		`+ # this contains both stdout and stderr. If you need to separate them,`
		`+ # see the settings below`
		`+ #DOCKER_LOGFILE="/var/log/docker.log"`
		`+`
		`+ # where the docker daemon stdout gets piped`
		`+ # if this is not set, DOCKER_LOGFILE is used`
		`+ #DOCKER_OUTFILE="/var/log/docker-out.log"`
		`+`
		`+ # where the docker daemon stderr gets piped`
		`+ # if this is not set, DOCKER_LOGFILE is used`
		`+ #DOCKER_ERRFILE="/var/log/docker-err.log"`
		`+`
		`+ # where docker's pid get stored`
		`+ #DOCKER_PIDFILE="/run/docker.pid"`
		`+`
		`+ # Settings for process limits (ulimit)`
		`+ #DOCKER_ULIMIT="-c unlimited -n 1048576 -u unlimited"`
		`+`
		`+ # seconds to wait for sending SIGTERM and SIGKILL signals when stopping docker`
		`+ #DOCKER_RETRY="TERM/60/KILL/10"`
		`+`
		`+ # where the docker daemon itself is run from`
		`+ #DOCKERD_BINARY="/usr/bin/dockerd"`
		`+`
		`+ # any other random options you want to pass to docker`
		`+ DOCKER_OPTS=""`

nonsystemd/docker-openrc/docker.initd

file added

+28

		`@@ -0,0 +1,28 @@`
		`+ #!/usr/bin/openrc-run`
		`+ # Copyright 1999-2013 Gentoo Foundation`
		`+ # Distributed under the terms of the GNU General Public License v2`
		`+`
		`+ command="${DOCKERD_BINARY:-/usr/bin/dockerd}"`
		`+ pidfile="${DOCKER_PIDFILE:-/run/${RC_SVCNAME}.pid}"`
		`+ command_args="-p \"${pidfile}\" ${DOCKER_OPTS}"`
		`+ DOCKER_LOGFILE="${DOCKER_LOGFILE:-/var/log/${RC_SVCNAME}.log}"`
		`+ DOCKER_ERRFILE="${DOCKER_ERRFILE:-${DOCKER_LOGFILE}}"`
		`+ DOCKER_OUTFILE="${DOCKER_OUTFILE:-${DOCKER_LOGFILE}}"`
		`+ start_stop_daemon_args="--background \`
		`+ --stderr \"${DOCKER_ERRFILE}\" --stdout \"${DOCKER_OUTFILE}\""`
		`+`
		`+ extra_started_commands="reload"`
		`+`
		`+ rc_ulimit="${DOCKER_ULIMIT:--c unlimited -n 1048576 -u unlimited}"`
		`+`
		`+ retry="${DOCKER_RETRY:-TERM/60/KILL/10}"`
		`+`
		`+ start_pre() {`
		`+ checkpath -f -m 0644 -o root:docker "$DOCKER_LOGFILE"`
		`+ }`
		`+`
		`+ reload() {`
		`+ ebegin "Reloading ${RC_SVCNAME}"`
		`+ start-stop-daemon --signal HUP --pidfile "${pidfile}"`
		`+ eend $? "Failed to stop ${RC_SVCNAME}"`
		`+ }`

nonsystemd/elogind-openrc/PKGBUILD

file added

+24

		`@@ -0,0 +1,24 @@`
		`+ # Maintainer: David P. <megver83@parabola.nu>`
		`+ # Maintainer (artix): artoo <artoo@artixlinux.org>`
		`+`
		`+ pkgname=elogind-openrc`
		`+ pkgver=20210704`
		`+ pkgrel=1`
		`+ pkgdesc="OpenRC elogind init script"`
		`+ arch=('any')`
		`+ url="https://gitea.artixlinux.org/packagesE/elogind-openrc"`
		`+ license=('GPL2')`
		`+ provides=('init-logind' 'init-elogind')`
		`+ conflicts=('init-logind' 'init-elogind')`
		`+ source=(#"elogind.confd"`
		`+ "elogind.sv.initd")`
		`+ sha256sums=('b4097e85f81f37d8529eb57563813e94b7c7afb9931d892907d805093187761b')`
		`+`
		`+ package() {`
		`+ depends=('elogind' 'dbus-openrc')`
		`+ # install -Dm755 "${srcdir}"/elogind.confd "${pkgdir}"/etc/conf.d/elogind`
		`+ install -Dm755 "${srcdir}"/elogind.sv.initd "${pkgdir}"/etc/init.d/elogind`
		`+`
		`+ install -d "${pkgdir}"/etc/runlevels/boot`
		`+ ln -sf /etc/init.d/elogind "${pkgdir}"/etc/runlevels/boot/elogind`
		`+ }`

nonsystemd/elogind-openrc/elogind.sv.initd ~~nonsystemd/elogind/elogind.sv.initd~~

file renamed

file was moved with no change to the file

nonsystemd/elogind/PKGBUILD

file modified

+26 -32

		`@@ -1,20 +1,10 @@`
		`- # Maintainer: Omar Vega Ramos <ovruni@gnu.org.pe>`
		`# Maintainer: David P. <megver83@parabola.nu>`
		`- # Contributor: Luke Shumaker <lukeshu@parabola.nu>`
		`- # Maintainer (Artix): artoo <artoo@artixlinux.org>`
		`-`
		`- # This package comes from Artix`
		`- # Parabola changes:`
		`- # - elogind and libelogind: do not provide {lib,}elogind=$pkgver, it's ridiculous`
		`- # - libelogind: make libsystemd.so a copy of libelogind.so instead of linking it,`
		`- # so in that way it will provide the correct version according to the`
		`- # architecture (libsystemd.so=0-64 or libsystemd.so=0-32)`
		`- # - remove prepare()`
		`+ # Maintainer (artix): artoo <artoo@artixlinux.org>`

		`pkgbase=elogind`
		`pkgname=('elogind' 'libelogind')`
		`pkgver=246.10`
		`- pkgrel=2`
		`+ pkgrel=7`
		`pkgdesc="The systemd project's logind, extracted to a standalone package"`
		`arch=('x86_64')`
		`arch+=('i686' 'armv7h')`
		`@@ -24,10 +14,17 @@`
		`'libseccomp' 'meson' 'kexec-tools' 'openrc' 'libcap')`
		`options=('!libtool')`
		`source=("${pkgbase}-${pkgver}.tar.gz::https://github.com/elogind/elogind/archive/v${pkgver}.tar.gz"`
		`- #'elogind.confd' 'elogind.initd'`
		`- 'elogind.sv.initd')`
		`+ dbus-exit.patch::https://github.com/pierre-labastie/elogind/commit/04d76bc0f087640bedc6ee52525529ccfdc6ae78.patch`
		`+ fix-p-opt.patch::https://github.com/njhanley/elogind/commit/850797eaf482d7f1ada051730eeeca53676ca43e.patch)`
		`sha256sums=('c490dc158c8f5bca8d00ecfcc7ad5af24d1c7b9e59990a0b3b1323996221a922'`
		`- 'b4097e85f81f37d8529eb57563813e94b7c7afb9931d892907d805093187761b')`
		`+ 'cccbbe6bf6603d81c307ad670994fe058ff630b37c218041c4ca877ef0486843'`
		`+ '5d39f9d9edd6fb0e9e93bae004ca47bb0973c7570c8dd840f98cda3348bddd7f')`
		`+`
		`+ prepare() {`
		`+ cd ${pkgbase}-${pkgver}`
		`+ patch -Np 1 -i ../dbus-exit.patch`
		`+ patch -Np 1 -i ../fix-p-opt.patch`
		`+ }`

		`build() {`
		`local meson_options=(`
		`@@ -43,7 +40,7 @@`

		`arch-meson "$pkgbase-${pkgver}" build "${meson_options[@]}"`

		`- ninja -C build`
		`+ meson compile -C build`
		`}`

		`check(){`
		`@@ -52,14 +49,14 @@`

		`package_elogind() {`
		`pkgdesc="The systemd project's logind, extracted to a standalone package"`
		`- provides=("systemd=${pkgver}" 'logind')`
		`+ provides=('logind')`
		`depends=('acl' 'dbus' 'libseccomp' 'libelogind' 'kexec-tools' 'udev')`
		`optdepends=('polkit: polkit support')`
		`backup=('etc/elogind/logind.conf')`

		`- provides+=("${pkgname}-openrc")`
		`- conflicts=('systemd-udev' "${pkgname}-openrc")`
		`- replaces=("${pkgname}-openrc")`
		`+ # systemd compatibility`
		`+ provides+=("systemd=$pkgver")`
		`+ conflicts+=('systemd')`

		`DESTDIR="$pkgdir" meson install -C build`

		`@@ -69,29 +66,26 @@`
		`mv -v "${pkgdir}"/usr/lib/libelogind.so "${srcdir}"/_libelogind`

		`install -d "${pkgdir}"/{etc,usr/lib}/elogind/{logind,sleep}.conf.d`
		`-`
		`- # Init script`
		`- #install -Dm755 "${srcdir}"/elogind.initd "${pkgdir}"/etc/init.d/elogind`
		`- #install -Dm755 "${srcdir}"/elogind.confd "${pkgdir}"/etc/conf.d/elogind`
		`- install -Dm755 "${srcdir}"/elogind.sv.initd "${pkgdir}"/etc/init.d/elogind`
		`-`
		`- install -d "${pkgdir}"/etc/runlevels/boot`
		`- ln -sf /etc/init.d/elogind "${pkgdir}"/etc/runlevels/boot/elogind`
		`}`

		`package_libelogind(){`
		`pkgdesc="elogind client libraries"`
		`provides=('libelogind.so' 'liblogind')`
		`- provides+=("libsystemd=${pkgver}" "systemd-libs=${pkgver}"`
		`- 'libsystemd.so')`
		`- conflicts=('libsystemd.so')`
		`depends=('libcap' 'libudev')`

		`+ # libsystemd compatibility`
		`+ provides+=('libsystemd.so' "libsystemd=${pkgver}" "systemd-libs=${pkgver}")`
		`+ conflicts+=('libsystemd.so' 'libsystemd' 'systemd-libs')`
		`+`
		`cd "${pkgbase}-${pkgver}"`

		`install -dm755 "${pkgdir}"/usr/lib`
		`mv "${srcdir}"/_libelogind/libelogind.so "${pkgdir}"/usr/lib`

		`- install -m755 "${pkgdir}"/usr/lib/libelogind.so "${pkgdir}"/usr/lib/libsystemd.so`
		`+ #ln -sfv libelogind.so "${pkgdir}"/usr/lib/libsystemd.so`
		`ln -sfv libsystemd.so "${pkgdir}"/usr/lib/libsystemd.so.0`
		`+`
		`+ # libsystemd compatibility`
		`+ # HACK: (re)install libelogind.so as libsystemd.so so their lib versions match`
		`+ install -m755 "${pkgdir}"/usr/lib/libelogind.so "${pkgdir}"/usr/lib/libsystemd.so`
		`}`

nonsystemd/firewalld-openrc/PKGBUILD

file added

+21

		`@@ -0,0 +1,21 @@`
		`+ # Maintainer: David P. <megver83@parabola.nu>`
		`+ # Maintainer (artix): Nathan Owens <ndowens @ artixlinux.org>`
		`+ # Submitter (Artix): alium@artixlinux.org`
		`+`
		`+ pkgname=firewalld-openrc`
		`+ pkgver=20210505`
		`+ pkgrel=1`
		`+ pkgdesc="OpenRC firewalld init script"`
		`+ arch=('any')`
		`+ url="https://gitea.artixlinux.org/packagesF/firewalld-openrc"`
		`+ license=('GPL2')`
		`+ groups=('openrc-galaxy')`
		`+ provides=('init-firewalld')`
		`+ conflicts=('init-firewalld')`
		`+ source=("firewalld.initd")`
		`+ sha256sums=('53ed08a1e2a45fae27e3dd30022b91f71801092332d158af0467f78723d56fd1')`
		`+`
		`+ package() {`
		`+ depends=('openrc' 'firewalld')`
		`+ install -Dm755 "$srcdir/firewalld.initd" "$pkgdir/etc/init.d/firewalld"`
		`+ }`

nonsystemd/firewalld-openrc/firewalld.initd

file added

+14

		`@@ -0,0 +1,14 @@`
		`+ #!/usr/bin/openrc-run`
		`+ # Copyright 1999-2018 Gentoo Authors`
		`+ # Distributed under the terms of the GNU General Public License v2`
		`+`
		`+ description="FirewallD"`
		`+`
		`+ supervisor=supervise-daemon`
		`+ command=/usr/sbin/firewalld`
		`+ command_args="--nofork"`
		`+`
		`+ depend() {`
		`+ need dbus`
		`+ provide firewall`
		`+ }`

nonsystemd/gdm-openrc/PKGBUILD

file added

+20

		`@@ -0,0 +1,20 @@`
		`+ # Maintainer: David P. <megver83@parabola.nu>`
		`+ # Maintainer (artix): artoo <artoo@artixlinux.org>`
		`+`
		`+ pkgname=gdm-openrc`
		`+ pkgver=20220104`
		`+ pkgrel=1`
		`+ pkgdesc="OpenRC gdm init script"`
		`+ arch=('any')`
		`+ url="https://gitea.artixlinux.org/packagesG/gdm-openrc"`
		`+ license=('GPL2')`
		`+ groups=('openrc-world')`
		`+ provides=('init-displaymanager')`
		`+ conflicts=('init-displaymanager')`
		`+ source=("gdm.initd")`
		`+ sha256sums=('b46bb53bf9eb0c8d292133216af3c451060e8acc278e837d2bb5a58d548baec0')`
		`+`
		`+ package() {`
		`+ depends=('gdm' 'openrc')`
		`+ install -Dm755 "$srcdir/gdm.initd" "$pkgdir/etc/init.d/gdm"`
		`+ }`

nonsystemd/gdm-openrc/gdm.initd

file added

+17

		`@@ -0,0 +1,17 @@`
		`+ #!/usr/bin/openrc-run`
		`+`
		`+ supervisor=supervise-daemon`
		`+ command="/usr/bin/gdm"`
		`+`
		`+ depend() {`
		`+ need localmount`
		`+`
		`+ after bootmisc consolefont modules netmount`
		`+ after readahead-list ypbind autofs openvpn gpm lircmd`
		`+ after quota keymaps`
		`+ before alsasound`
		`+ want logind`
		`+ use xfs`
		`+`
		`+ provide xdm display-manager`
		`+ }`

nonsystemd/gpm-openrc/PKGBUILD

file added

+24

		`@@ -0,0 +1,24 @@`
		`+ # Maintainer: David P. <megver83@parabola.nu>`
		`+ # Maintainer (artix): artoo <artoo@artixlinux.org>`
		`+`
		`+ pkgname=gpm-openrc`
		`+ pkgver=20210505`
		`+ pkgrel=2`
		`+ pkgdesc="OpenRC gpm init script"`
		`+ arch=('any')`
		`+ url="https://gitea.artixlinux.org/packagesG/gpm-openrc"`
		`+ license=('GPL2')`
		`+ groups=('openrc-system')`
		`+ provides=('init-gpm')`
		`+ conflicts=('init-gpm')`
		`+ backup=('etc/conf.d/gpm')`
		`+ source=("gpm.confd"`
		`+ "gpm.initd")`
		`+ sha256sums=('73e7483fdc4b12ab4225a4cb13bbe7da71b07b9e69b17e3a6a4c63cb5e2287c8'`
		`+ 'b0a698c19a699b66375b39ad10e59a1e565c67b4c2dbf281f571d185654cf711')`
		`+`
		`+ package() {`
		`+ depends=('openrc' 'gpm')`
		`+ install -Dm755 "${srcdir}"/gpm.initd "${pkgdir}"/etc/init.d/gpm`
		`+ install -Dm755 "${srcdir}"/gpm.confd "${pkgdir}"/etc/conf.d/gpm`
		`+ }`

nonsystemd/gpm-openrc/gpm.confd

file added

+23

		`@@ -0,0 +1,23 @@`
		`+ # /etc/init.d/gpm`
		`+`
		`+ # Please uncomment the type of mouse you have and the appropriate MOUSEDEV entry`
		`+`
		`+ MOUSE=ps2`
		`+ #MOUSE=imps2`
		`+ #MOUSEDEV=/dev/psaux`
		`+ MOUSEDEV=/dev/input/mice`
		`+`
		`+ # Extra settings`
		`+`
		`+ #RESPONSIVENESS=`
		`+ #REPEAT_TYPE=raw`
		`+`
		`+ # Please uncomment this line if you want gpm to understand charsets used`
		`+ # in URLs and names with ~ or : in them, etc. This is a good idea to turn on!`
		`+`
		`+ #APPEND="-l \"a-zA-Z0-9_.:~/\300-\326\330-\366\370-\377\""`
		`+`
		`+ # Various other options, see gpm(8) manpage for more.`
		`+`
		`+ #APPEND="-g 1 -A60"`
		`+ #APPEND="-l \"a-zA-Z0-9_.:~/\300-\326\330-\366\370-\377\" -g 1 -A60"`

nonsystemd/gpm-openrc/gpm.initd

file added

+28

		`@@ -0,0 +1,28 @@`
		`+ #!/usr/bin/openrc-run`
		`+ # Copyright 1999-2012 Gentoo Foundation`
		`+ # Distributed under the terms of the GNU General Public License v2`
		`+`
		`+ #NB: Config is in /etc/conf.d/gpm`
		`+`
		`+ command=/usr/bin/gpm`
		`+ command_args="`
		`+ -m ${MOUSEDEV}`
		`+ -t ${MOUSE}`
		`+ ${RESPONSIVENESS:+ -r ${RESPONSIVENESS}}`
		`+ ${REPEAT_TYPE:+ -R${REPEAT_TYPE}}`
		`+ ${APPEND}`
		`+ "`
		`+`
		`+ pidfile=/var/run/gpm.pid`
		`+`
		`+ depend() {`
		`+ need localmount`
		`+ use hotplug logger`
		`+ }`
		`+`
		`+ start_pre() {`
		`+ if [ -z "${MOUSEDEV}" ] \|\| [ -z "${MOUSE}" ] ; then`
		`+ eerror "You need to setup MOUSEDEV and MOUSE in /etc/conf.d/gpm first"`
		`+ return 1`
		`+ fi`
		`+ }`

nonsystemd/i2pd-openrc/PKGBUILD

file added

+20

		`@@ -0,0 +1,20 @@`
		`+ # Maintainer (artix): linuxer <https://gitea.artixlinux.org/linuxer>`
		`+ # Maintainer: Parabola Hackers <dev@lists.parabola.nu>`
		`+`
		`+ pkgname=i2pd-openrc`
		`+ pkgdesc="i2pd OpenRC init script"`
		`+ pkgver=20210505`
		`+ pkgrel=1`
		`+ arch=('any')`
		`+ url="https://gitea.artixlinux.org/artixlinux/packages-openrc"`
		`+ groups=('openrc-galaxy')`
		`+ license=('GPL2')`
		`+ depends=('openrc' 'i2pd')`
		`+ provides=('init-i2pd')`
		`+ conflicts=('init-i2pd')`
		`+ source=("i2pd.initd")`
		`+ b2sums=('6ff6e7d3a8d159258350da731d6c19cda171474b2bee163dd12ebb78538ac1d97fdbb0ba3ea6b45df8c93c9eaacf77e825b135e53b23bf91b48bff74af318f12')`
		`+`
		`+ package() {`
		`+ install -Dm755 i2pd.initd "$pkgdir/etc/init.d/i2pd"`
		`+ }`

nonsystemd/i2pd-openrc/i2pd.initd

file added

		`@@ -0,0 +1,6 @@`
		`+ #!/usr/bin/openrc-run`
		`+`
		`+ supervisor="supervise-daemon"`
		`+ command="/usr/bin/i2pd"`
		`+ command_args=" --conf=/var/lib/i2pd/i2pd.conf --service /usr/bin/i2pd"`
		`+ command_user="i2pd:i2pd"`

nonsystemd/iptables-openrc/PKGBUILD

file added

+39

		`@@ -0,0 +1,39 @@`
		`+ # Maintainer: David P. <megver83@parabola.nu>`
		`+ # Maintainer (artix): artoo <artoo@artixlinux.org>`
		`+`
		`+ pkgname=iptables-openrc`
		`+ pkgver=20210505`
		`+ pkgrel=2`
		`+ pkgdesc="OpenRC iptables init script"`
		`+ arch=('any')`
		`+ url="https://gitea.artixlinux.org/artixlinux/packagesI/iptables-openrc"`
		`+ license=('GPL2')`
		`+ groups=('openrc-system')`
		`+ provides=('init-iptables' 'ebtables-openrc')`
		`+ conflicts=('init-iptables' 'ebtables-openrc')`
		`+ backup=('etc/conf.d/iptables'`
		`+ 'etc/conf.d/ip6tables')`
		`+ source=("iptables.confd"`
		`+ "ip6tables.confd"`
		`+ "iptables.initd"`
		`+ "ebtables.confd"`
		`+ "ebtables.initd")`
		`+ sha256sums=('7e2341211ca14997b7a8a1f930f94db855291af597c568f680f80031c20d45b6'`
		`+ 'c1f5bb4ea36bb7c0a7b7abeb8169cb8547f43d348faef70c61f2daa9033c318b'`
		`+ 'e5c6164a0ffa24501d5b3fa6425f0e24a2da73891b4dd62a25b083f9f5b731af'`
		`+ 'c05a6c1ba6add3881068584074681b04bfb2ad43284d7bdd67f47f3da842de58'`
		`+ '6eb00de3cf18f36f909cb95f1aa345de16d1cd9c8b92acb944691ac720bf3cb5')`
		`+`
		`+ package() {`
		`+ depends=('openrc' 'iptables')`
		`+`
		`+ for f in iptables ebtables; do`
		`+ install -Dm755 "${srcdir}"/"$f".initd "${pkgdir}"/etc/init.d/"$f"`
		`+ install -Dm644 "${srcdir}"/"$f".confd "${pkgdir}"/etc/conf.d/"$f"`
		`+ done`
		`+`
		`+ install -Dm644 "${srcdir}"/ip6tables.confd "${pkgdir}"/etc/conf.d/ip6tables`
		`+`
		`+ install -Dm755 "${srcdir}"/iptables.initd "${pkgdir}"/etc/init.d/ip6tables`
		`+`
		`+ }`

nonsystemd/iptables-openrc/ebtables.confd

file added

+11

		`@@ -0,0 +1,11 @@`
		`+ # /etc/conf.d/ebtables`
		`+`
		`+ # Location in which ebtables initscript will save set rules on`
		`+ # service shutdown`
		`+ EBTABLES_SAVE="/var/lib/ebtables/rules-save"`
		`+`
		`+ # Options to pass to ebtables-save and ebtables-restore`
		`+ SAVE_RESTORE_OPTIONS=""`
		`+`
		`+ # Save state on stopping ebtables`
		`+ SAVE_ON_STOP="yes"`

nonsystemd/iptables-openrc/ebtables.initd

file added

+101

		`@@ -0,0 +1,101 @@`
		`+ #!/sbin/openrc-run`
		`+ # Copyright 1999-2020 Gentoo Authors`
		`+ # Distributed under the terms of the GNU General Public License v2`
		`+`
		`+ extra_commands="save panic"`
		`+ extra_started_commands="reload"`
		`+`
		`+ ebtables_bin="/sbin/ebtables"`
		`+ ebtables_save=${EBTABLES_SAVE}`
		`+`
		`+ depend() {`
		`+ before net`
		`+ use logger`
		`+ }`
		`+`
		`+ ebtables_tables() {`
		`+ for table in filter nat broute; do`
		`+ if ${ebtables_bin} -t ${table} -L > /dev/null 2>&1; then`
		`+ printf '%s' "${table} "`
		`+ fi`
		`+ done`
		`+ }`
		`+`
		`+ set_table_policy() {`
		`+ local chains table=$1 policy=$2`
		`+ case ${table} in`
		`+ nat) chains="PREROUTING POSTROUTING OUTPUT";;`
		`+ broute) chains="BROUTING";;`
		`+ filter) chains="INPUT FORWARD OUTPUT";;`
		`+ *) chains="";;`
		`+ esac`
		`+ local chain`
		`+ for chain in ${chains} ; do`
		`+ ${ebtables_bin} -t ${table} -P ${chain} ${policy}`
		`+ done`
		`+ }`
		`+`
		`+ checkconfig() {`
		`+ if [ ! -f ${ebtables_save} ] ; then`
		`+ eerror "Not starting ebtables. First create some rules then run:"`
		`+ eerror "/etc/init.d/ebtables save"`
		`+ return 1`
		`+ fi`
		`+ return 0`
		`+ }`
		`+`
		`+ start() {`
		`+ checkconfig \|\| return 1`
		`+ ebegin "Loading ebtables state and starting bridge firewall"`
		`+ ${ebtables_bin}-restore ${SAVE_RESTORE_OPTIONS} < "${ebtables_save}"`
		`+ eend $?`
		`+ }`
		`+`
		`+ stop() {`
		`+ if [ "${SAVE_ON_STOP}" = "yes" ] ; then`
		`+ save \|\| return 1`
		`+ fi`
		`+ ebegin "Stopping bridge firewall"`
		`+ local a`
		`+ for a in $(ebtables_tables); do`
		`+ set_table_policy $a ACCEPT`
		`+`
		`+ ${ebtables_bin} -t $a -F`
		`+ ${ebtables_bin} -t $a -X`
		`+ done`
		`+ eend $?`
		`+ }`
		`+`
		`+ reload() {`
		`+ ebegin "Flushing bridge firewall"`
		`+ local a`
		`+ for a in $(ebtables_tables); do`
		`+ ${ebtables_bin} -t $a -F`
		`+ ${ebtables_bin} -t $a -X`
		`+ done`
		`+ eend $?`
		`+`
		`+ start`
		`+ }`
		`+`
		`+ save() {`
		`+ ebegin "Saving ebtables state"`
		`+ touch "${ebtables_save}"`
		`+ chmod 0600 "${ebtables_save}"`
		`+ ${ebtables_bin}-save $(ebtables_tables) ${SAVE_RESTORE_OPTIONS} > "${ebtables_save}"`
		`+ eend $?`
		`+ }`
		`+`
		`+ panic() {`
		`+ service_started ebtables && svc_stop`
		`+`
		`+ local a`
		`+ ebegin "Dropping all packets forwarded on bridges"`
		`+ for a in $(ebtables_tables); do`
		`+ ${ebtables_bin} -t $a -F`
		`+ ${ebtables_bin} -t $a -X`
		`+`
		`+ set_table_policy $a DROP`
		`+ done`
		`+ eend $?`
		`+ }`

nonsystemd/iptables-openrc/ip6tables.confd

file added

+27

		`@@ -0,0 +1,27 @@`
		`+ # /etc/conf.d/ip6tables`
		`+`
		`+ # Set wait option for xtables lock in seconds`
		`+ # DEFAULT: 60`
		`+ #IPTABLES_LOCK_WAIT_TIME="60"`
		`+`
		`+ # Set wait interval option for xtables lock in microseconds`
		`+ # DEFAULT: 1000`
		`+ #IPTABLES_LOCK_WAIT_INTERVAL="1000"`
		`+`
		`+ # Location in which ip6tables initscript will save set rules on`
		`+ # service shutdown`
		`+ IP6TABLES_SAVE="/var/lib/ip6tables/rules-save"`
		`+`
		`+ # Options to pass to ip6tables-save and ip6tables-restore`
		`+ SAVE_RESTORE_OPTIONS="-c"`
		`+`
		`+ # Save state on stopping ip6tables`
		`+ SAVE_ON_STOP="yes"`
		`+`
		`+ # If you need to log ip6tables messages as soon as ip6tables starts,`
		`+ # AND your logger does NOT depend on the network, then you may wish`
		`+ # to uncomment the next line.`
		`+ # If your logger depends on the network, and you uncomment this line`
		`+ # you will create an unresolvable circular dependency during startup.`
		`+ # After commenting or uncommenting this line, you must run 'rc-update -u'.`
		`+ #rc_use="logger"`

nonsystemd/iptables-openrc/iptables.confd

file added

+19

		`@@ -0,0 +1,19 @@`
		`+ # /etc/conf.d/iptables`
		`+`
		`+ # Location in which iptables initscript will save set rules on`
		`+ # service shutdown`
		`+ IPTABLES_SAVE="/var/lib/iptables/rules-save"`
		`+`
		`+ # Options to pass to iptables-save and iptables-restore`
		`+ SAVE_RESTORE_OPTIONS="-c"`
		`+`
		`+ # Save state on stopping iptables`
		`+ SAVE_ON_STOP="yes"`
		`+`
		`+ # If you need to log iptables messages as soon as iptables starts,`
		`+ # AND your logger does NOT depend on the network, then you may wish`
		`+ # to uncomment the next line.`
		`+ # If your logger depends on the network, and you uncomment this line`
		`+ # you will create an unresolvable circular dependency during startup.`
		`+ # After commenting or uncommenting this line, you must run 'rc-update -u'.`
		`+ #rc_use="logger"`

nonsystemd/iptables-openrc/iptables.initd

file added

+165

		`@@ -0,0 +1,165 @@`
		`+ #!/sbin/openrc-run`
		`+ # Copyright 1999-2018 Gentoo Authors`
		`+ # Distributed under the terms of the GNU General Public License v2`
		`+`
		`+ extra_commands="check save panic"`
		`+ extra_started_commands="reload"`
		`+`
		`+ iptables_lock_wait_time=${IPTABLES_LOCK_WAIT_TIME:-"60"}`
		`+ iptables_lock_wait_interval=${IPTABLES_LOCK_WAIT_INTERVAL:-"1000"}`
		`+`
		`+ iptables_name=${SVCNAME}`
		`+ case ${iptables_name} in`
		`+ iptables\|ip6tables) ;;`
		`+ *) iptables_name="iptables" ;;`
		`+ esac`
		`+`
		`+ iptables_bin="/sbin/${iptables_name}"`
		`+ case ${iptables_name} in`
		`+ iptables) iptables_proc="/proc/net/ip_tables_names"`
		`+ iptables_save=${IPTABLES_SAVE};;`
		`+ ip6tables) iptables_proc="/proc/net/ip6_tables_names"`
		`+ iptables_save=${IP6TABLES_SAVE};;`
		`+ esac`
		`+`
		`+ depend() {`
		`+ need localmount #434774`
		`+ before net`
		`+ }`
		`+`
		`+ set_table_policy() {`
		`+ local has_errors=0 chains table=$1 policy=$2`
		`+ case ${table} in`
		`+ nat) chains="PREROUTING POSTROUTING OUTPUT";;`
		`+ mangle) chains="PREROUTING INPUT FORWARD OUTPUT POSTROUTING";;`
		`+ filter) chains="INPUT FORWARD OUTPUT";;`
		`+ *) chains="";;`
		`+ esac`
		`+`
		`+ local chain`
		`+ for chain in ${chains} ; do`
		`+ ${iptables_bin} --wait ${iptables_lock_wait_time} --wait-interval ${iptables_lock_wait_interval} -t ${table} -P ${chain} ${policy}`
		`+ [ $? -ne 0 ] && has_errors=1`
		`+ done`
		`+`
		`+ return ${has_errors}`
		`+ }`
		`+`
		`+ checkkernel() {`
		`+ if [ ! -e ${iptables_proc} ] ; then`
		`+ eerror "Your kernel lacks ${iptables_name} support, please load"`
		`+ eerror "appropriate modules and try again."`
		`+ return 1`
		`+ fi`
		`+ return 0`
		`+ }`
		`+`
		`+ checkconfig() {`
		`+ if [ -z "${iptables_save}" -o ! -f "${iptables_save}" ] ; then`
		`+ eerror "Not starting ${iptables_name}. First create some rules then run:"`
		`+ eerror "/etc/init.d/${iptables_name} save"`
		`+ return 1`
		`+ fi`
		`+ return 0`
		`+ }`
		`+`
		`+ start_pre() {`
		`+ checkconfig \|\| return 1`
		`+ }`
		`+`
		`+ start() {`
		`+ ebegin "Loading ${iptables_name} state and starting firewall"`
		`+ ${iptables_bin}-restore --wait ${iptables_lock_wait_time} --wait-interval ${iptables_lock_wait_interval} ${SAVE_RESTORE_OPTIONS} < "${iptables_save}"`
		`+ eend $?`
		`+ }`
		`+`
		`+ stop_pre() {`
		`+ checkkernel \|\| return 1`
		`+ }`
		`+`
		`+ stop() {`
		`+ if [ "${SAVE_ON_STOP}" = "yes" ] ; then`
		`+ save \|\| return 1`
		`+ fi`
		`+`
		`+ ebegin "Stopping firewall"`
		`+ local has_errors=0 a`
		`+ for a in $(cat ${iptables_proc}) ; do`
		`+ set_table_policy $a ACCEPT`
		`+ [ $? -ne 0 ] && has_errors=1`
		`+`
		`+ ${iptables_bin} --wait ${iptables_lock_wait_time} --wait-interval ${iptables_lock_wait_interval} -F -t $a`
		`+ [ $? -ne 0 ] && has_errors=1`
		`+`
		`+ ${iptables_bin} --wait ${iptables_lock_wait_time} --wait-interval ${iptables_lock_wait_interval} -X -t $a`
		`+ [ $? -ne 0 ] && has_errors=1`
		`+ done`
		`+ eend ${has_errors}`
		`+ }`
		`+`
		`+ reload() {`
		`+ checkkernel \|\| return 1`
		`+ checkrules \|\| return 1`
		`+ ebegin "Flushing firewall"`
		`+ local has_errors=0 a`
		`+ for a in $(cat ${iptables_proc}) ; do`
		`+ ${iptables_bin} --wait ${iptables_lock_wait_time} --wait-interval ${iptables_lock_wait_interval} -F -t $a`
		`+ [ $? -ne 0 ] && has_errors=1`
		`+`
		`+ ${iptables_bin} --wait ${iptables_lock_wait_time} --wait-interval ${iptables_lock_wait_interval} -X -t $a`
		`+ [ $? -ne 0 ] && has_errors=1`
		`+ done`
		`+ eend ${has_errors}`
		`+`
		`+ start`
		`+ }`
		`+`
		`+ checkrules() {`
		`+ ebegin "Checking rules"`
		`+ ${iptables_bin}-restore --test ${SAVE_RESTORE_OPTIONS} < "${iptables_save}"`
		`+ eend $?`
		`+ }`
		`+`
		`+ check() {`
		`+ # Short name for users of init.d script.`
		`+ checkrules`
		`+ }`
		`+`
		`+ save() {`
		`+ ebegin "Saving ${iptables_name} state"`
		`+ checkpath -q -d "$(dirname "${iptables_save}")"`
		`+ checkpath -q -m 0600 -f "${iptables_save}"`
		`+ ${iptables_bin}-save ${SAVE_RESTORE_OPTIONS} > "${iptables_save}"`
		`+ eend $?`
		`+ }`
		`+`
		`+ panic() {`
		`+ # use iptables autoload capability to load at least all required`
		`+ # modules and filter table`
		`+ ${iptables_bin} --wait ${iptables_lock_wait_time} --wait-interval ${iptables_lock_wait_interval} -S >/dev/null`
		`+ if [ $? -ne 0 ] ; then`
		`+ eerror "${iptables_bin} failed to load"`
		`+ return 1`
		`+ fi`
		`+`
		`+ if service_started ${iptables_name}; then`
		`+ rc-service ${iptables_name} stop`
		`+ fi`
		`+`
		`+ local has_errors=0 a`
		`+ ebegin "Dropping all packets"`
		`+ for a in $(cat ${iptables_proc}) ; do`
		`+ ${iptables_bin} --wait ${iptables_lock_wait_time} --wait-interval ${iptables_lock_wait_interval} -F -t $a`
		`+ [ $? -ne 0 ] && has_errors=1`
		`+`
		`+ ${iptables_bin} --wait ${iptables_lock_wait_time} --wait-interval ${iptables_lock_wait_interval} -X -t $a`
		`+ [ $? -ne 0 ] && has_errors=1`
		`+`
		`+ if [ "${a}" != "nat" ]; then`
		`+ # The "nat" table is not intended for filtering, the use of DROP is therefore inhibited.`
		`+ set_table_policy $a DROP`
		`+ [ $? -ne 0 ] && has_errors=1`
		`+ fi`
		`+ done`
		`+ eend ${has_errors}`
		`+ }`

nonsystemd/libusb/PKGBUILD

file modified

+2 -2

		`@@ -1,5 +1,5 @@`
		`- # Maintainer (Arch): Bartłomiej Piotrowski <bpiotrowski@archlinux.org>`
		`- # Contributor (Arch): Tobias Powalowski <tpowa@archlinux.org>`
		`+ # Maintainer (arch): Bartłomiej Piotrowski <bpiotrowski@archlinux.org>`
		`+ # Contributor: Tobias Powalowski <tpowa@archlinux.org>`
		`# Maintainer: David P. <megver83@parabola.nu>`

		`pkgname=libusb`

nonsystemd/lightdm-openrc/PKGBUILD

file added

+20

		`@@ -0,0 +1,20 @@`
		`+ # Maintainer: David P. <megver83@parabola.nu>`
		`+ # Maintainer (artix): artoo <artoo@artixlinux.org>`
		`+`
		`+ pkgname=lightdm-openrc`
		`+ pkgver=20220104`
		`+ pkgrel=1`
		`+ pkgdesc="OpenRC lightdm init script"`
		`+ arch=('any')`
		`+ url="https://gitea.artixlinux.org/packagesL/lightdm-openrc"`
		`+ license=('GPL2')`
		`+ groups=('openrc-world')`
		`+ provides=('init-displaymanager')`
		`+ conflicts=('init-displaymanager')`
		`+ source=("lightdm.initd")`
		`+ sha256sums=('a33a505b49088a5d5c8388da03c826e40699694fcbfd22775b15a957a07880dc')`
		`+`
		`+ package() {`
		`+ depends=('lightdm' 'openrc')`
		`+ install -Dm755 "$srcdir/lightdm.initd" "$pkgdir/etc/init.d/lightdm"`
		`+ }`

nonsystemd/lightdm-openrc/lightdm.initd

file added

+16

		`@@ -0,0 +1,16 @@`
		`+ #!/usr/bin/openrc-run`
		`+`
		`+ supervisor=supervise-daemon`
		`+ command="/usr/bin/lightdm"`
		`+`
		`+ depend() {`
		`+ need localmount`
		`+`
		`+ after bootmisc consolefont modules netmount`
		`+ after ypbind autofs openvpn gpm lircmd`
		`+ after quota keymaps acpid`
		`+ before alsasound`
		`+ want logind`
		`+ use xfs`
		`+ provide xdm display-manager`
		`+ }`

nonsystemd/lxdm-openrc/PKGBUILD

file added

+20

		`@@ -0,0 +1,20 @@`
		`+ # Maintainer: David P. <megver83@parabola.nu>`
		`+ # Maintainer (artix): artoo <artoo@artixlinux.org>`
		`+`
		`+ pkgname=lxdm-openrc`
		`+ pkgver=20220104`
		`+ pkgrel=1`
		`+ pkgdesc="OpenRC lxdm init script"`
		`+ arch=('any')`
		`+ url="https://gitea.artixlinux.org/packagesL/lxdm-openrc"`
		`+ license=('GPL2')`
		`+ groups=('openrc-galaxy')`
		`+ provides=('init-displaymanager')`
		`+ conflicts=('init-displaymanager')`
		`+ source=("lxdm.initd")`
		`+ sha256sums=('57ec70f482e606961971978565fc268fba9388b277ce751c2d0a16f44d081e42')`
		`+`
		`+ package() {`
		`+ depends=('lxdm-gtk3' 'openrc')`
		`+ install -Dm755 "$srcdir/lxdm.initd" "$pkgdir/etc/init.d/lxdm"`
		`+ }`

nonsystemd/lxdm-openrc/lxdm.initd

file added

+18

		`@@ -0,0 +1,18 @@`
		`+ #!/usr/bin/openrc-run`
		`+`
		`+ command="/usr/bin/lxdm-binary"`
		`+ command_args="-d"`
		`+ pidfile="/run/${RC_SVCNAME}.pid"`
		`+`
		`+ depend() {`
		`+ need localmount dbus logind`
		`+`
		`+ after bootmisc consolefont modules netmount`
		`+ after readahead-list ypbind autofs openvpn gpm lircmd`
		`+ after quota keymaps`
		`+ before alsasound`
		`+`
		`+ use xfs`
		`+`
		`+ provide xdm display-manager`
		`+ }`

nonsystemd/mariadb-openrc/PKGBUILD

file added

+23

		`@@ -0,0 +1,23 @@`
		`+ # Maintainer (artix): nous <nous@artixlinux.org>`
		`+ # Maintainer: Parabola Hackers <dev@lists.parabola.nu>`
		`+`
		`+ pkgname=mariadb-openrc`
		`+ pkgver=20210505`
		`+ pkgrel=2`
		`+ pkgdesc="OpenRC mariadb init script"`
		`+ arch=('any')`
		`+ url="https://gitea.artixlinux.org/artixlinux/packages-openrc"`
		`+ license=('GPL2')`
		`+ groups=('openrc-world')`
		`+ provides=('mysql-openrc' 'init-mariadb')`
		`+ depends=('mariadb' 'openrc')`
		`+ conflicts=('init-mariadb')`
		`+ replaces=('mysql-openrc')`
		`+ source=('mariadb.initd' 'mariadb-supervise.initd')`
		`+ sha256sums=('e047da01dcf47692f01daf0f37eba2e9669f459bba265bd75337f187f097e40c'`
		`+ 'bb5281b04e7a8dd6048b8e7756969d683c6fa2231434615b540cf5310e63efb8')`
		`+`
		`+ package() {`
		`+ install -Dm755 "${srcdir}"/mariadb.initd "${pkgdir}"/etc/init.d/mariadb`
		`+ install -Dm755 "${srcdir}"/mariadb-supervise.initd "${pkgdir}"/etc/init.d/mariadb-supervise`
		`+ }`

nonsystemd/mariadb-openrc/mariadb-supervise.initd

file added

+38

		`@@ -0,0 +1,38 @@`
		`+ #!/usr/bin/openrc-run`
		`+ extra_stopped_commands="setup"`
		`+ supervisor=supervise-daemon`
		`+ #healthcheck_timer=10`
		`+`
		`+ retry="60"`
		`+ pidfile="/run/mysqld/$RC_SVCNAME.pid"`
		`+ command="/usr/bin/mysqld"`
		`+ command_args="--basedir=/usr --datadir=/var/lib/mysql --plugin-dir=/usr/lib64/mysql/plugin --user=mysql --pid-file=/run/mysqld/mariadb.pid"`
		`+`
		`+ depend() {`
		`+ use net`
		`+ need localmount`
		`+ }`
		`+`
		`+ start_pre() {`
		`+ required_dirs=$(getconf datadir "/var/lib/mysql")`
		`+`
		`+ if [ ! -d $required_dirs/mysql ]; then`
		`+ eerror "Datadir '$required_dirs' is empty or invalid."`
		`+ eerror "Run '/etc/init.d/mariadb setup' to create new database."`
		`+ fi`
		`+ }`
		`+`
		`+ start_post() {`
		`+ ewaitfile 10 $(getconf socket "/run/mysqld/mysqld.sock")`
		`+ }`
		`+`
		`+ setup() {`
		`+ ebegin "Creating a new MySQL database"`
		`+ mysql_install_db --user=mysql --datadir=/var/lib/mysql`
		`+ eend $?`
		`+ }`
		`+`
		`+ getconf() {`
		`+ v=$(my_print_defaults --mysqld \| grep ^--$1)`
		`+ [ -z $v ] && echo $2 \|\| echo ${v#*=}`
		`+ }`

nonsystemd/mariadb-openrc/mariadb.initd

file added

+36

		`@@ -0,0 +1,36 @@`
		`+ #!/usr/bin/openrc-run`
		`+ extra_stopped_commands="setup"`
		`+`
		`+ retry="60"`
		`+ pidfile="/run/mysqld/$RC_SVCNAME.pid"`
		`+ command="/usr/bin/mysqld_safe"`
		`+ command_args="--syslog --nowatch --pid-file=$pidfile"`
		`+`
		`+ depend() {`
		`+ use net`
		`+ need localmount`
		`+ }`
		`+`
		`+ start_pre() {`
		`+ required_dirs=$(getconf datadir "/var/lib/mysql")`
		`+`
		`+ if [ ! -d $required_dirs/mysql ]; then`
		`+ eerror "Datadir '$required_dirs' is empty or invalid."`
		`+ eerror "Run '/etc/init.d/mariadb setup' to create new database."`
		`+ fi`
		`+ }`
		`+`
		`+ start_post() {`
		`+ ewaitfile 10 $(getconf socket "/run/mysqld/mysqld.sock")`
		`+ }`
		`+`
		`+ setup() {`
		`+ ebegin "Creating a new MySQL database"`
		`+ mysql_install_db --user=mysql --datadir=/var/lib/mysql`
		`+ eend $?`
		`+ }`
		`+`
		`+ getconf() {`
		`+ v=$(my_print_defaults --mysqld \| grep ^--$1)`
		`+ [ -z $v ] && echo $2 \|\| echo ${v#*=}`
		`+ }`

nonsystemd/mkinitcpio-paralogo/PKGBUILD

file modified

+1 -1

		`@@ -1,4 +1,4 @@`
		`- # Maintainer: Aurélien DESBRIÈRES <aurelien@hackers.camp>`
		`+ # Maintainer: Aurélien Desbrières <aurelien@hackers.camp>`

		`pkgname=mkinitcpio-paralogo`
		`pkgver=0.0.2`

nonsystemd/mkinitcpio/PKGBUILD

file modified

+3 -3

		`@@ -1,6 +1,6 @@`
		`- # Maintainer (Arch): Giancarlo Razzolini <grazzolini@archlinux.org>`
		`- # Maintainer (Arch): Dave Reisner <dreisner@archlinux.org>`
		`- # Maintainer (Arch): Thomas Bächler <thomas@archlinux.org>`
		`+ # Maintainer (arch): Giancarlo Razzolini <grazzolini@archlinux.org>`
		`+ # Maintainer (arch): Dave Reisner <dreisner@archlinux.org>`
		`+ # Maintainer (arch): Thomas Bächler <thomas@archlinux.org>`
		`# Maintainer: David P. <megver83@parabola.nu>`

nonsystemd/networkmanager-openrc/10-openrc-status ~~nonsystemd/networkmanager/10-openrc-status~~

file renamed

file was moved with no change to the file

nonsystemd/networkmanager-openrc/NetworkManager.confd ~~nonsystemd/networkmanager/NetworkManager.confd~~

file renamed

file was moved with no change to the file

nonsystemd/networkmanager-openrc/NetworkManager.initd ~~nonsystemd/networkmanager/NetworkManager.initd~~

file renamed

file was moved with no change to the file

nonsystemd/networkmanager-openrc/PKGBUILD

file added

+27

		`@@ -0,0 +1,27 @@`
		`+ # Maintainer: David P. <megver83@parabola.nu>`
		`+ # Maintainer (artix): artoo <artoo@artixlinux.org>`
		`+`
		`+ pkgname=networkmanager-openrc`
		`+ pkgver=20210505`
		`+ pkgrel=6`
		`+ pkgdesc="OpenRC networkmanager init script"`
		`+ arch=('any')`
		`+ url="https://gitea.artixlinux.org/packagesN/networkmanager-openrc"`
		`+ license=('GPL2')`
		`+ groups=('openrc-world')`
		`+ provides=('init-networkmanager')`
		`+ conflicts=('init-networkmanager')`
		`+ backup=('etc/conf.d/NetworkManager')`
		`+ source=("NetworkManager".{initd,confd}`
		`+ '10-openrc-status')`
		`+ sha256sums=('eaf7d210540ed9f4c6b4ba81ddbb30a2aa5ce8b528057f7d64ce3478981f88e4'`
		`+ '4594573f01fe5e04b6dde4525796acf909158591bdcefd662ec23fe0d1c3e1bd'`
		`+ 'd32a21c0683cf7a09370b35b7e3d3b3f28f5d4d242ecde2c866cfb400b94bcbe')`
		`+`
		`+ package() {`
		`+ depends=('openrc' 'networkmanager')`
		`+ install -Dm755 "${srcdir}"/NetworkManager.initd "${pkgdir}"/etc/init.d/NetworkManager`
		`+ install -Dm644 "${srcdir}"/NetworkManager.confd "${pkgdir}"/etc/conf.d/NetworkManager`
		`+`
		`+ install -Dm755 "${srcdir}"/10-openrc-status "${pkgdir}"/etc/NetworkManager/dispatcher.d/10-openrc-status`
		`+ }`

nonsystemd/networkmanager/PKGBUILD

file modified

+48 -51

		`@@ -1,39 +1,38 @@`
		`- # Maintainer: David P. <megver83@parabola.nu>`
		`- # Maintainer (Arch): Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>`
		`- # Maintainer (Arch): Jan de Groot <jgc@archlinxu.org>`
		`- # Contributor (Arch): Wael Nasreddine <gandalf@siemens-mobiles.org>`
		`- # Contributor (Arch): Tor Krill <tor@krill.nu>`
		`- # Contributor (Arch): Will Rea <sillywilly@gmail.com>`
		`- # Contributor (Arch): Valentine Sinitsyn <e_val@inbox.ru>`
		`+ # Maintainer (arch): Jan Alexander Steffens (heftig) <heftig@archlinux.org>`
		`+ # Maintainer (artix): Nathan Owens <ndowens@artixlinux.org>`
		`+ # Contributor: Jan de Groot <jgc@archlinxu.org>`
		`+ # Contributor: Wael Nasreddine <gandalf@siemens-mobiles.org>`
		`+ # Contributor: Tor Krill <tor@krill.nu>`
		`+ # Contributor: Will Rea <sillywilly@gmail.com>`
		`+ # Contributor: Valentine Sinitsyn <e_val@inbox.ru>`
		`+ # Maintainer: Parabola Hackers <dev@lists.parabola.nu>`

		`pkgbase=networkmanager`
		`pkgname=(networkmanager libnm nm-cloud-setup)`
		`- pkgver=1.32.2`
		`- pkgrel=1`
		`+ pkgver=1.38.2`
		`+ pkgrel=2`
		`pkgrel+=.nonsystemd1`
		`pkgdesc="Network connection manager and user applications"`
		`- url="https://wiki.gnome.org/Projects/NetworkManager"`
		`+ url="https://networkmanager.dev/"`
		`arch=(x86_64)`
		`- arch+=(i686 armv7h)`
		`- license=(GPL2)`
		`+ arch+=(armv7h i686)`
		`+ license=(GPL)`
		`_pppver=2.4.9`
		`makedepends=(intltool dhclient dhcpcd iptables-nft gobject-introspection gtk-doc`
		`"ppp=$_pppver" modemmanager iproute2 nss polkit wpa_supplicant curl`
		`- logind libmm-glib libnewt libndp libteam nftables vala perl-yaml`
		`+ systemd libmm-glib libnewt libndp libteam nftables vala perl-yaml`
		`python-gobject git vala jansson bluez-libs glib2-docs iwd dnsmasq`
		`openresolv libpsl audit meson)`
		`+ makedepends=( ${makedepends[*]/systemd/elogind} )`
		`checkdepends=(libx11 python-dbus)`
		`- _commit=bf1b09702ed442a3efe426c8ceba4ef1e6bb1902 # tags/1.20.6^0`
		`- source=("git+https://gitlab.freedesktop.org/NetworkManager/NetworkManager.git#commit=$_commit"`
		`- NetworkManager.{confd,initd} 10-openrc-status)`
		`- sha256sums=('SKIP'`
		`- '4594573f01fe5e04b6dde4525796acf909158591bdcefd662ec23fe0d1c3e1bd'`
		`- 'eaf7d210540ed9f4c6b4ba81ddbb30a2aa5ce8b528057f7d64ce3478981f88e4'`
		`- 'd32a21c0683cf7a09370b35b7e3d3b3f28f5d4d242ecde2c866cfb400b94bcbe')`
		`+ options=(debug)`
		`+ _commit=abfd2d6ea729926bff0ddafa1367a54f6d6f4230 # tags/1.38.2^0`
		`+ source=("git+https://gitlab.freedesktop.org/NetworkManager/NetworkManager.git#commit=$_commit")`
		`+ b2sums=('SKIP')`

		`pkgver() {`
		`cd NetworkManager`
		`- git describe --abbrev=10 \| sed 's/-dev/dev/;s/-rc/rc/;s/-/+/g'`
		`+ git describe --tags \| sed 's/-dev/dev/;s/-rc/rc/;s/[^-]*-g/r&/;s/-/+/g'`
		`}`

		`prepare() {`
		`@@ -41,7 +40,7 @@`
		`}`

		`build() {`
		`- local meson_args=(`
		`+ local meson_options=(`
		`# system paths`
		`-D dbus_conf_dir=/usr/share/dbus-1/system.d`

		`@@ -50,7 +49,6 @@`
		`-D session_tracking_consolekit=false`
		`-D suspend_resume=elogind`
		`-D modify_system=true`
		`- -D polkit_agent=true`
		`-D selinux=false`
		`-D systemdsystemunitdir=no`
		`-D session_tracking=elogind`
		`@@ -79,7 +77,7 @@`
		`-D qt=false`
		`)`

		`- arch-meson NetworkManager build "${meson_args[@]}"`
		`+ arch-meson NetworkManager build "${meson_options[@]}"`
		`meson compile -C build`
		`}`

		`@@ -98,21 +96,23 @@`
		`}`

		`package_networkmanager() {`
		`- depends=(libnm iproute2 polkit wpa_supplicant libmm-glib libnewt libndp libteam curl`
		`- bluez-libs libpsl audit mobile-broadband-provider-info elogind)`
		`- optdepends=('dnsmasq: connection sharing'`
		`- 'nftables: connection sharing'`
		`- 'iptables: connection sharing'`
		`- 'bluez: Bluetooth support'`
		`- 'ppp: dialup connection support'`
		`- 'modemmanager: cellular network support'`
		`- 'iwd: wpa_supplicant alternative'`
		`- 'dhclient: alternative DHCP client'`
		`- 'dhcpcd: alternative DHCP client'`
		`- 'openresolv: alternative resolv.conf manager'`
		`- 'firewalld: firewall support')`
		`- provides=($pkgname-{elogind,openrc})`
		`- replaces=($pkgname-{elogind,openrc})`
		`+ depends=(libnm iproute2 wpa_supplicant libmm-glib libnewt libndp libteam curl`
		`+ bluez-libs libpsl audit mobile-broadband-provider-info)`
		`+ depends+=(elogind)`
		`+ optdepends=(`
		`+ 'polkit: let non-root users control networking'`
		`+ 'dnsmasq: connection sharing'`
		`+ 'nftables: connection sharing'`
		`+ 'iptables: connection sharing'`
		`+ 'bluez: Bluetooth support'`
		`+ 'ppp: dialup connection support'`
		`+ 'modemmanager: cellular network support'`
		`+ 'iwd: wpa_supplicant alternative'`
		`+ 'dhclient: alternative DHCP client'`
		`+ 'dhcpcd: alternative DHCP client'`
		`+ 'openresolv: alternative resolv.conf manager'`
		`+ 'firewalld: firewall support'`
		`+ )`
		`backup=(etc/NetworkManager/NetworkManager.conf)`

		`meson install -C build --destdir "$pkgdir"`
		`@@ -125,12 +125,16 @@`
		`install -m644 /dev/stdin etc/NetworkManager/NetworkManager.conf <<END`
		`# Configuration file for NetworkManager.`
		`# See "man 5 NetworkManager.conf" for details.`
		`+ [main]`
		`+ plugins=keyfile`
		`+ hostname-node=none`
		`END`

		`# packaged configuration`
		`install -Dm644 /dev/stdin usr/lib/NetworkManager/conf.d/20-connectivity.conf <<END`
		`[connectivity]`
		`- uri=http://ping.archlinux.org/nm-check.txt`
		`+ uri=https://www.parabola.nu/static/nm-check.txt`
		`+ enabled=false`
		`END`

		`shopt -s globstar`
		`@@ -144,22 +148,17 @@`
		`_pick libnm usr/share/vala/vapi/libnm.*`

		`_pick nm-cloud-setup "$pkgdir"/usr/lib/*/nm-cloud-setup*`
		`- # _pick nm-cloud-setup "$pkgdir"/usr/share/man//nm-cloud-setup (Parabola)`
		`+ # _pick nm-cloud-setup "$pkgdir"/usr/share/man//nm-cloud-setup (Artix)`

		`# Restore empty dir`
		`- # mkdir "$pkgdir/usr/lib/NetworkManager/dispatcher.d/no-wait.d" (Parabola)`
		`-`
		`- # Init script`
		`- install -Dm755 ${srcdir}/NetworkManager.confd ${pkgdir}/etc/conf.d/NetworkManager`
		`- install -Dm755 ${srcdir}/NetworkManager.initd ${pkgdir}/etc/init.d/NetworkManager`
		`- install -Dm755 "${srcdir}/10-openrc-status" "${pkgdir}/etc/NetworkManager/dispatcher.d/10-openrc-status"`
		`-`
		`+ # mkdir "$pkgdir/usr/lib/NetworkManager/dispatcher.d/no-wait.d" (Artix)`
		`}`

		`package_libnm() {`
		`pkgdesc="NetworkManager client library"`
		`- depends=(glib2 nss util-linux-libs jansson libelogind)`
		`license=(LGPL)`
		`+ depends=(glib2 nss util-linux-libs jansson systemd-libs)`
		`+ depends=( ${depends[*]/systemd-libs/libelogind} )`
		`provides=(libnm.so)`

		`mv libnm/* "$pkgdir"`
		`@@ -171,5 +170,3 @@`

		`mv nm-cloud-setup/* "$pkgdir"`
		`}`
		`-`
		`- # vim:set sw=2 et:`

nonsystemd/nftables-openrc/PKGBUILD

file added

+34

		`@@ -0,0 +1,34 @@`
		`+ # Maintainer: David P. <megver83@parabola.nu>`
		`+ # Maintainer (artix): artoo <artoo@artixlinux.org>`
		`+`
		`+ pkgname=nftables-openrc`
		`+ pkgver=20210505`
		`+ pkgrel=2`
		`+ pkgdesc="OpenRC nftables init script"`
		`+ arch=('any')`
		`+ url="https://gitea.artixlinux.org/packagesN/nftables-openrc"`
		`+ license=('GPL2')`
		`+ groups=('openrc-world')`
		`+ provides=('init-nftables')`
		`+ conflicts=('init-nftables')`
		`+ backup=('etc/conf.d/nftables'`
		`+ 'etc/conf.d/nftables-mk')`
		`+ source=("nftables"{,-mk}.{initd,confd}`
		`+ "nftables"{,-mk}.sh)`
		`+ sha256sums=('d99250bf4e54545d978041819b94ea27634ee1812e9b56f15f287ca68640dec8'`
		`+ 'd5e3077345dfea02849a70aea220396322a10c3808f0303b988119adbc56fdbd'`
		`+ '155be88ef6cddf95841f629264d8d4b42d15b4f7e8e572e5159e2cc17f8258b1'`
		`+ '5ea765fce16e2ee6a760760a1cfde9994bef24e9a788ab83750e96ac2bc9533a'`
		`+ 'e3b1423f877871c649e7da15352f2abb489900f05b022a87292ff92d36203b67'`
		`+ '041b5fb2d42d6245459fd581a3b7ad39aa898caaefb2178595606b38391fc4db')`
		`+`
		`+ package() {`
		`+ depends=('openrc' 'nftables')`
		`+`
		`+ for _i in nftables-mk nftables ; do`
		`+ install -Dm755 "$srcdir/$_i.initd" "$pkgdir/etc/init.d/$_i"`
		`+ install -Dm644 "$srcdir/$_i.confd" "$pkgdir/etc/conf.d/$_i"`
		`+ done`
		`+ install -Dm755 "$srcdir"/nftables-mk.sh "$pkgdir"/usr/lib/nftables/nftables-mk.sh`
		`+ install -Dm755 "$srcdir"/nftables.sh "$pkgdir"/usr/lib/nftables/nftables.sh`
		`+ }`

nonsystemd/nftables-openrc/nftables-mk.confd

file added

+26

		`@@ -0,0 +1,26 @@`
		`+ # /etc/conf.d/nftables`
		`+`
		`+ # Location in which nftables initscript will save set rules on`
		`+ # service shutdown`
		`+ NFTABLES_SAVE="/var/lib/nftables/rules-save"`
		`+`
		`+ # Options to pass to nft on save`
		`+ SAVE_OPTIONS="-n"`
		`+`
		`+ # Save state on stopping nftables`
		`+ SAVE_ON_STOP="yes"`
		`+`
		`+ # Only for OpenRC systems.`
		`+ # Set to "hard" or "soft" to panic when stopping instead of`
		`+ # clearing the rules`
		`+ # Soft panic loads a ruleset dropping any new or invalid connections`
		`+ # Hard panic loads a ruleset dropping all traffic`
		`+ PANIC_ON_STOP=""`
		`+`
		`+ # If you need to log nftables messages as soon as nftables starts,`
		`+ # AND your logger does NOT depend on the network, then you may wish`
		`+ # to uncomment the next line.`
		`+ # If your logger depends on the network, and you uncomment this line`
		`+ # you will create an unresolvable circular dependency during startup.`
		`+ # After commenting or uncommenting this line, you must run 'rc-update -u'.`
		`+ #rc_use="logger"`

nonsystemd/nftables-openrc/nftables-mk.initd

file added

+104

		`@@ -0,0 +1,104 @@`
		`+ #!/usr/bin/openrc-run`
		`+ # Copyright 1999-2019 Gentoo Authors`
		`+ # Distributed under the terms of the GNU General Public License v2`
		`+`
		`+ extra_commands="check clear list panic save soft_panic"`
		`+ extra_started_commands="reload"`
		`+`
		`+ depend() {`
		`+ need localmount #434774`
		`+ before net`
		`+ }`
		`+`
		`+ checkkernel() {`
		`+ if ! /sbin/nft list ruleset >/dev/null 2>/dev/null ; then`
		`+ eerror "Your kernel lacks nftables support, please load"`
		`+ eerror "appropriate modules and try again."`
		`+ return 1`
		`+ fi`
		`+ return 0`
		`+ }`
		`+`
		`+ checkconfig() {`
		`+ if [ -z "${NFTABLES_SAVE}" -o ! -f "${NFTABLES_SAVE}" ] ; then`
		`+ eerror "Not starting nftables. First create some rules then run:"`
		`+ eerror "/etc/init.d/${SVCNAME} save"`
		`+ return 1`
		`+ fi`
		`+ return 0`
		`+ }`
		`+`
		`+ start_pre() {`
		`+ checkconfig \|\| return 1`
		`+ checkkernel \|\| return 1`
		`+ check \|\| return 1`
		`+ }`
		`+`
		`+ start() {`
		`+ ebegin "Loading ${SVCNAME} state and starting firewall"`
		`+ /usr/lib/nftables/nftables.sh load "${NFTABLES_SAVE}"`
		`+ eend $?`
		`+ }`
		`+`
		`+ stop() {`
		`+ if [ "${SAVE_ON_STOP}" = "yes" ] ; then`
		`+ save \|\| return 1`
		`+ fi`
		`+`
		`+ ebegin "Stopping firewall"`
		`+ if [ "${PANIC_ON_STOP}" = "hard" ]; then`
		`+ /usr/lib/nftables/nftables.sh panic`
		`+ elif [ "${PANIC_ON_STOP}" = "soft" ]; then`
		`+ /usr/lib/nftables/nftables.sh soft_panic`
		`+ else`
		`+ /usr/lib/nftables/nftables.sh clear`
		`+ fi`
		`+ eend $?`
		`+ }`
		`+`
		`+ reload() {`
		`+ start_pre \|\| return 1`
		`+ start`
		`+ }`
		`+`
		`+ clear() {`
		`+ ebegin "Clearing rules"`
		`+ /usr/lib/nftables/nftables.sh clear`
		`+ eend $?`
		`+ }`
		`+`
		`+ list() {`
		`+ /usr/lib/nftables/nftables.sh list`
		`+ }`
		`+`
		`+ check() {`
		`+ ebegin "Checking rules"`
		`+ /usr/lib/nftables/nftables.sh check "${NFTABLES_SAVE}"`
		`+ eend $?`
		`+ }`
		`+`
		`+ save() {`
		`+ ebegin "Saving ${SVCNAME} state"`
		`+ checkpath -q -d "$(dirname "${NFTABLES_SAVE}")"`
		`+ checkpath -q -m 0600 -f "${NFTABLES_SAVE}"`
		`+ /usr/lib/nftables/nftables.sh store "${NFTABLES_SAVE}"`
		`+ eend $?`
		`+ }`
		`+`
		`+ panic() {`
		`+ if service_started ${SVCNAME}; then`
		`+ rc-service ${SVCNAME} zap`
		`+ fi`
		`+ ebegin "Dropping all packets"`
		`+ /usr/lib/nftables/nftables.sh panic`
		`+ eend $?`
		`+ }`
		`+`
		`+ soft_panic() {`
		`+ if service_started ${SVCNAME}; then`
		`+ rc-service ${SVCNAME} zap`
		`+ fi`
		`+ ebegin "Dropping new connections"`
		`+ /usr/lib/nftables/nftables.sh soft_panic`
		`+ eend $?`
		`+ }`

nonsystemd/nftables-openrc/nftables-mk.sh

file added

+60

		`@@ -0,0 +1,60 @@`
		`+ #!/bin/sh`
		`+`
		`+ main() {`
		`+ local NFTABLES_SAVE=${2:-'/var/lib/nftables/rules-save'}`
		`+ case "$1" in`
		`+ "check")`
		`+ nft -c -f "${NFTABLES_SAVE}"`
		`+ ;;`
		`+ "clear")`
		`+ nft flush ruleset`
		`+ ;;`
		`+ "list")`
		`+ nft ${SAVE_OPTIONS} list ruleset`
		`+ ;;`
		`+ "load")`
		`+ # We use an include because cat fails with long rulesets see #675188`
		`+ printf 'flush ruleset\ninclude "%s"\n' "${NFTABLES_SAVE}" \| nft -f -`
		`+ ;;`
		`+ "panic")`
		`+ panic hard \| nft -f -`
		`+ ;;`
		`+ "soft_panic")`
		`+ panic soft \| nft -f -`
		`+ ;;`
		`+ "store")`
		`+ local tmp_save="${NFTABLES_SAVE}.tmp"`
		`+ umask 177`
		`+ (`
		`+ printf '#!/sbin/nft -f\nflush ruleset\n'`
		`+ nft ${SAVE_OPTIONS} list ruleset`
		`+ ) > "$tmp_save" && mv ${tmp_save} ${NFTABLES_SAVE}`
		`+ ;;`
		`+ esac`
		`+ }`
		`+`
		`+ panic() {`
		`+ local erule;`
		`+ [ "$1" = soft ] && erule="ct state established,related accept;" \|\| erule="";`
		`+ cat <<EOF`
		`+ flush ruleset`
		`+ table inet filter {`
		`+ chain input {`
		`+ type filter hook input priority 0;`
		`+ $erule`
		`+ drop`
		`+ }`
		`+ chain forward {`
		`+ type filter hook forward priority 0;`
		`+ drop`
		`+ }`
		`+ chain output {`
		`+ type filter hook output priority 0;`
		`+ $erule`
		`+ drop`
		`+ }`
		`+ }`
		`+ EOF`
		`+ }`
		`+`
		`+ main "$@"`

nonsystemd/nftables-openrc/nftables.confd

file added

+19

		`@@ -0,0 +1,19 @@`
		`+ # /etc/conf.d/nftables`
		`+`
		`+ # Location in which nftables initscript will save set rules on`
		`+ # service shutdown`
		`+ NFTABLES_SAVE="/var/lib/nftables/rules-save"`
		`+`
		`+ # Options to pass to nft on save`
		`+ SAVE_OPTIONS="-n"`
		`+`
		`+ # Save state on stopping nftables`
		`+ SAVE_ON_STOP="yes"`
		`+`
		`+ # If you need to log nftables messages as soon as nftables starts,`
		`+ # AND your logger does NOT depend on the network, then you may wish`
		`+ # to uncomment the next line.`
		`+ # If your logger depends on the network, and you uncomment this line`
		`+ # you will create an unresolvable circular dependency during startup.`
		`+ # After commenting or uncommenting this line, you must run 'rc-update -u'.`
		`+ #rc_use="logger"`

nonsystemd/nftables-openrc/nftables.initd

file added

+124

		`@@ -0,0 +1,124 @@`
		`+ #!/usr/bin/openrc-run`
		`+ # Copyright 2014-2017 Nicholas Vinson`
		`+ # Copyright 1999-2017 Gentoo Foundation`
		`+ # Distributed under the terms of the GNU General Public License v2`
		`+`
		`+ extra_commands="clear list panic save"`
		`+ extra_started_commands="reload"`
		`+ depend() {`
		`+ need localmount #434774`
		`+ before net`
		`+ }`
		`+`
		`+ start_pre() {`
		`+ checkkernel \|\| return 1`
		`+ checkconfig \|\| return 1`
		`+ return 0`
		`+ }`
		`+`
		`+ clear() {`
		`+ /usr/lib/nftables/nftables.sh clear \|\| return 1`
		`+ return 0`
		`+ }`
		`+`
		`+ list() {`
		`+ /usr/lib/nftables/nftables.sh list \|\| return 1`
		`+ return 0`
		`+ }`
		`+`
		`+ panic() {`
		`+ checkkernel \|\| return 1`
		`+ if service_started ${RC_SVCNAME}; then`
		`+ rc-service ${RC_SVCNAME} stop`
		`+ fi`
		`+`
		`+ ebegin "Dropping all packets"`
		`+ clear`
		`+ if nft create table ip filter >/dev/null 2>&1; then`
		`+ nft -f /dev/stdin <<-EOF`
		`+ table ip filter {`
		`+ chain input {`
		`+ type filter hook input priority 0;`
		`+ drop`
		`+ }`
		`+ chain forward {`
		`+ type filter hook forward priority 0;`
		`+ drop`
		`+ }`
		`+ chain output {`
		`+ type filter hook output priority 0;`
		`+ drop`
		`+ }`
		`+ }`
		`+ EOF`
		`+ fi`
		`+ if nft create table ip6 filter >/dev/null 2>&1; then`
		`+ nft -f /dev/stdin <<-EOF`
		`+ table ip6 filter {`
		`+ chain input {`
		`+ type filter hook input priority 0;`
		`+ drop`
		`+ }`
		`+ chain forward {`
		`+ type filter hook forward priority 0;`
		`+ drop`
		`+ }`
		`+ chain output {`
		`+ type filter hook output priority 0;`
		`+ drop`
		`+ }`
		`+ }`
		`+ EOF`
		`+ fi`
		`+ }`
		`+`
		`+ reload() {`
		`+ checkkernel \|\| return 1`
		`+ ebegin "Flushing firewall"`
		`+ clear`
		`+ start`
		`+ }`
		`+`
		`+ save() {`
		`+ ebegin "Saving nftables state"`
		`+ checkpath -q -d "$(dirname "${NFTABLES_SAVE}")"`
		`+ checkpath -q -m 0600 -f "${NFTABLES_SAVE}"`
		`+ export SAVE_OPTIONS`
		`+ /usr/lib/nftables/nftables.sh store ${NFTABLES_SAVE}`
		`+ return $?`
		`+ }`
		`+`
		`+ start() {`
		`+ ebegin "Loading nftables state and starting firewall"`
		`+ clear`
		`+ /usr/lib/nftables/nftables.sh load ${NFTABLES_SAVE}`
		`+ eend $?`
		`+ }`
		`+`
		`+ stop() {`
		`+ if yesno ${SAVE_ON_STOP:-yes}; then`
		`+ save \|\| return 1`
		`+ fi`
		`+`
		`+ ebegin "Stopping firewall"`
		`+ clear`
		`+ eend $?`
		`+ }`
		`+`
		`+ checkconfig() {`
		`+ if [ ! -f ${NFTABLES_SAVE} ]; then`
		`+ eerror "Not starting nftables. First create some rules then run:"`
		`+ eerror "rc-service nftables save"`
		`+ return 1`
		`+ fi`
		`+ return 0`
		`+ }`
		`+`
		`+ checkkernel() {`
		`+ if ! nft list tables >/dev/null 2>&1; then`
		`+ eerror "Your kernel lacks nftables support, please load"`
		`+ eerror "appropriate modules and try again."`
		`+ return 1`
		`+ fi`
		`+ return 0`
		`+ }`

nonsystemd/nftables-openrc/nftables.sh

file added

+150

		`@@ -0,0 +1,150 @@`
		`+ #! /bin/sh`
		`+`
		`+ main() {`
		`+ local NFTABLES_SAVE=${2:-'/var/lib/nftables/rules-save'}`
		`+ local retval`
		`+ case "$1" in`
		`+ "clear")`
		`+ if ! use_legacy; then`
		`+ nft flush ruleset`
		`+ else`
		`+ clear_legacy`
		`+ fi`
		`+ retval=$?`
		`+ ;;`
		`+ "list")`
		`+ if ! use_legacy; then`
		`+ nft list ruleset`
		`+ else`
		`+ list_legacy`
		`+ fi`
		`+ retval=$?`
		`+ ;;`
		`+ "load")`
		`+ nft -f ${NFTABLES_SAVE}`
		`+ retval=$?`
		`+ ;;`
		`+ "store")`
		`+ umask 177`
		`+ local tmp_save="${NFTABLES_SAVE}.tmp"`
		`+ if ! use_legacy; then`
		`+ nft ${SAVE_OPTIONS} list ruleset > ${tmp_save}`
		`+ else`
		`+ save_legacy ${tmp_save}`
		`+ fi`
		`+ retval=$?`
		`+ if [ ${retval} ]; then`
		`+ mv ${tmp_save} ${NFTABLES_SAVE}`
		`+ fi`
		`+ ;;`
		`+ esac`
		`+ return ${retval}`
		`+ }`
		`+`
		`+ clear_legacy() {`
		`+ local l3f line table chain first_line`
		`+`
		`+ first_line=1`
		`+ if manualwalk; then`
		`+ for l3f in $(getfamilies); do`
		`+ nft list tables ${l3f} \| while read line; do`
		`+ table=$(echo ${line} \| sed "s/table[ \t]*//")`
		`+ deletetable ${l3f} ${table}`
		`+ done`
		`+ done`
		`+ else`
		`+ nft list tables \| while read line; do`
		`+ l3f=$(echo ${line} \| cut -d ' ' -f2)`
		`+ table=$(echo ${line} \| cut -d ' ' -f3)`
		`+ deletetable ${l3f} ${table}`
		`+ done`
		`+ fi`
		`+ }`
		`+`
		`+ list_legacy() {`
		`+ local l3f`
		`+`
		`+ if manualwalk; then`
		`+ for l3f in $(getfamilies); do`
		`+ nft list tables ${l3f} \| while read line; do`
		`+ line=$(echo ${line} \| sed "s/table/table ${l3f}/")`
		`+ echo "$(nft list ${line})"`
		`+ done`
		`+ done`
		`+ else`
		`+ nft list tables \| while read line; do`
		`+ echo "$(nft list ${line})"`
		`+ done`
		`+ fi`
		`+ }`
		`+`
		`+ save_legacy() {`
		`+ tmp_save=$1`
		`+ touch "${tmp_save}"`
		`+ if manualwalk; then`
		`+ for l3f in $(getfamilies); do`
		`+ nft list tables ${l3f} \| while read line; do`
		`+ line=$(echo ${line} \| sed "s/table/table ${l3f}/")`
		`+ nft ${SAVE_OPTIONS} list ${line} >> ${tmp_save}`
		`+ done`
		`+ done`
		`+ else`
		`+ nft list tables \| while read line; do`
		`+ nft ${SAVE_OPTIONS} list ${line} >> "${tmp_save}"`
		`+ done`
		`+ fi`
		`+ }`
		`+`
		`+ use_legacy() {`
		`+ local major_ver minor_ver`
		`+`
		`+ major_ver=$(uname -r \| cut -d '.' -f1)`
		`+ minor_ver=$(uname -r \| cut -d '.' -f2)`
		`+`
		`+ [ $major_ver -ge 4 -o $major_ver -eq 3 -a $minor_ver -ge 18 ] && return 1`
		`+ return 0`
		`+ }`
		`+`
		`+ CHECK_TABLE_NAME="GENTOO_CHECK_TABLE"`
		`+`
		`+ getfamilies() {`
		`+ local l3f families`
		`+`
		`+ for l3f in ip arp ip6 bridge inet; do`
		`+ if nft create table ${l3f} ${CHECK_TABLE_NAME} > /dev/null 2>&1; then`
		`+ families="${families}${l3f} "`
		`+ nft delete table ${l3f} ${CHECK_TABLE_NAME}`
		`+ fi`
		`+ done`
		`+ echo ${families}`
		`+ }`
		`+`
		`+ manualwalk() {`
		+ local result l3f=`getfamilies \| cut -d ' ' -f1`
		`+`
		`+ nft create table ${l3f} ${CHECK_TABLE_NAME}`
		`+ nft list tables \| read line`
		`+ if [ $(echo $line \| wc -w) -lt 3 ]; then`
		`+ result=0`
		`+ fi`
		`+ result=1`
		`+ nft delete table ${l3f} ${CHECK_TABLE_NAME}`
		`+`
		`+ return $result`
		`+ }`
		`+`
		`+ deletetable() {`
		`+ # family is $1`
		`+ # table name is $2`
		`+ nft flush table $1 $2`
		`+ nft list table $1 $2 \| while read l; do`
		`+ chain=$(echo $l \| grep -o 'chain [^[:space:]]\+' \| cut -d ' ' -f2)`
		`+ if [ -n "${chain}" ]; then`
		`+ nft flush chain $1 $2 ${chain}`
		`+ nft delete chain $1 $2 ${chain}`
		`+ fi`
		`+ done`
		`+ nft delete table $1 $2`
		`+ }`
		`+`
		`+ main "$@"`

nonsystemd/notsystemd/0001-FSDG-man-Refer-to-the-operating-system-as-GNU-Linux.patch

file removed

-243

		`@@ -1,243 +0,0 @@`
		`- From dec7ae52e9352345e5627d02676b51f2facdd488 Mon Sep 17 00:00:00 2001`
		`- From: Luke Shumaker <lukeshu@parabola.nu>`
		`- Date: Wed, 25 May 2016 12:19:20 -0400`
		`- Subject: [PATCH 1/7] FSDG: man/: Refer to the operating system as GNU/Linux`
		`-`
		`- This is not a blind replacement of "Linux" with "GNU/Linux". In some`
		`- cases, "Linux" is (correctly) used to refer to just the kernel. In others,`
		`- it is in a string for which code must also be adjusted; these instances`
		`- are not included in this commit.`
		`- ---`
		`- man/daemon.xml \| 4 ++--`
		`- man/journald.conf.xml \| 2 +-`
		`- man/machinectl.xml \| 2 +-`
		`- man/sd-bus-errors.xml \| 2 +-`
		`- man/sd-login.xml \| 2 +-`
		`- man/sd_bus_error_add_map.xml \| 2 +-`
		`- man/sd_uid_get_state.xml \| 2 +-`
		`- man/systemd-detect-virt.xml \| 4 ++--`
		`- man/systemd-machine-id-setup.xml \| 2 +-`
		`- man/systemd-resolved.service.xml \| 6 +++---`
		`- man/systemd.exec.xml \| 2 +-`
		`- man/systemd.socket.xml \| 2 +-`
		`- man/systemd.xml \| 6 +++---`
		`- 13 files changed, 19 insertions(+), 19 deletions(-)`
		`-`
		`- diff --git a/man/daemon.xml b/man/daemon.xml`
		`- index 36c7c09db1..730507ed7e 100644`
		`- --- a/man/daemon.xml`
		`- +++ b/man/daemon.xml`
		`- @@ -144,7 +144,7 @@`
		`- <refsect2>`
		`- <title>New-Style Daemons</title>`
		`-`
		`- - <para>Modern services for Linux should be implemented as`
		`- + <para>Modern services for GNU/Linux should be implemented as`
		`- new-style daemons. This makes it easier to supervise and control`
		`- them at runtime and simplifies their implementation.</para>`
		`-`
		`- @@ -285,7 +285,7 @@`
		`- as detailed in the <ulink`
		`- url="http://refspecs.linuxbase.org/LSB_3.1.1/LSB-Core-generic/LSB-Core-generic/iniscrptact.html">LSB`
		`- Linux Standard Base Core Specification</ulink>. This method of`
		`- - activation is supported ubiquitously on Linux init systems, both`
		`- + activation is supported ubiquitously on GNU/Linux init systems, both`
		`- old-style and new-style systems. Among other issues, SysV init`
		`- scripts have the disadvantage of involving shell scripts in the`
		`- boot process. New-style init systems generally employ updated`
		`- diff --git a/man/journald.conf.xml b/man/journald.conf.xml`
		`- index ee8e8b7faf..28324ac102 100644`
		`- --- a/man/journald.conf.xml`
		`- +++ b/man/journald.conf.xml`
		`- @@ -111,7 +111,7 @@`
		`- <term><varname>SplitMode=</varname></term>`
		`-`
		`- <listitem><para>Controls whether to split up journal files per user, either <literal>uid</literal> or`
		`- - <literal>none</literal>. Split journal files are primarily useful for access control: on UNIX/Linux access`
		`- + <literal>none</literal>. Split journal files are primarily useful for access control: on GNU/Linux access`
		`- control is managed per file, and the journal daemon will assign users read access to their journal files. If`
		`- <literal>uid</literal>, all regular users will each get their own journal files, and system users will log to`
		`- the system journal. If <literal>none</literal>, journal files are not split up by user and all messages are`
		`- diff --git a/man/machinectl.xml b/man/machinectl.xml`
		`- index affca1dec1..278ca8d677 100644`
		`- --- a/man/machinectl.xml`
		`- +++ b/man/machinectl.xml`
		`- @@ -867,7 +867,7 @@`
		`- <para>The <command>machinectl</command> tool operates on machines`
		`- and images whose names must be chosen following strict`
		`- rules. Machine names must be suitable for use as host names`
		`- - following a conservative subset of DNS and UNIX/Linux`
		`- + following a conservative subset of DNS and GNU/Linux`
		`- semantics. Specifically, they must consist of one or more`
		`- non-empty label strings, separated by dots. No leading or trailing`
		`- dots are allowed. No sequences of multiple dots are allowed. The`
		`- diff --git a/man/sd-bus-errors.xml b/man/sd-bus-errors.xml`
		`- index c834bde292..fdd2261fe9 100644`
		`- --- a/man/sd-bus-errors.xml`
		`- +++ b/man/sd-bus-errors.xml`
		`- @@ -102,7 +102,7 @@`
		`-`
		`- <para>In addition to this list, in sd-bus, the special error`
		`- namespace <literal>System.Error.</literal> is used to map`
		`- - arbitrary Linux system errors (as defined by <citerefentry`
		`- + arbitrary GNU/Linux system errors (as defined by <citerefentry`
		`- project='man-pages'><refentrytitle>errno</refentrytitle><manvolnum>3</manvolnum></citerefentry>)`
		`- to D-Bus errors and back. For example, the error`
		`- <constant>EUCLEAN</constant> is mapped to`
		`- diff --git a/man/sd-login.xml b/man/sd-login.xml`
		`- index 83ef0b7307..93fd9ea782 100644`
		`- --- a/man/sd-login.xml`
		`- +++ b/man/sd-login.xml`
		`- @@ -244,7 +244,7 @@`
		`-`
		`- <para>`
		`- <ulink url="https://www.freedesktop.org/wiki/Software/systemd/multiseat">Multi-Seat on Linux</ulink>`
		`- - for an introduction to multi-seat support on Linux and the background for this set of APIs.`
		`- + for an introduction to multi-seat support on GNU/Linux and the background for this set of APIs.`
		`- </para>`
		`- </refsect1>`
		`-`
		`- diff --git a/man/sd_bus_error_add_map.xml b/man/sd_bus_error_add_map.xml`
		`- index 3eacbab660..b4b3b1bd17 100644`
		`- --- a/man/sd_bus_error_add_map.xml`
		`- +++ b/man/sd_bus_error_add_map.xml`
		`- @@ -58,7 +58,7 @@`
		`-`
		`- <para>The <function>sd_bus_error_add_map()</function> call may be`
		`- used to register additional mappings for converting D-Bus errors`
		`- - to Linux <varname>errno</varname>-style errors. The mappings`
		`- + to GNU/Linux <varname>errno</varname>-style errors. The mappings`
		`- defined with this call are consulted by calls such as`
		`- <citerefentry><refentrytitle>sd_bus_error_set</refentrytitle><manvolnum>3</manvolnum></citerefentry>`
		`- or`
		`- diff --git a/man/sd_uid_get_state.xml b/man/sd_uid_get_state.xml`
		`- index 02670e1bce..6f4ff77130 100644`
		`- --- a/man/sd_uid_get_state.xml`
		`- +++ b/man/sd_uid_get_state.xml`
		`- @@ -174,7 +174,7 @@`
		`- <listitem><para>An input parameter was invalid (out of range,`
		`- or NULL, where that is not accepted). This is also returned if`
		`- the passed user ID is 0xFFFF or 0xFFFFFFFF, which are`
		`- - undefined on Linux.</para></listitem>`
		`- + undefined on GNU/Linux.</para></listitem>`
		`- </varlistentry>`
		`-`
		`- <varlistentry>`
		`- diff --git a/man/systemd-detect-virt.xml b/man/systemd-detect-virt.xml`
		`- index c4763fd561..54bba23666 100644`
		`- --- a/man/systemd-detect-virt.xml`
		`- +++ b/man/systemd-detect-virt.xml`
		`- @@ -133,12 +133,12 @@`
		`-`
		`- <row>`
		`- <entry><varname>lxc</varname></entry>`
		`- - <entry>Linux container implementation by LXC</entry>`
		`- + <entry>Container implementation by LXC</entry>`
		`- </row>`
		`-`
		`- <row>`
		`- <entry><varname>lxc-libvirt</varname></entry>`
		`- - <entry>Linux container implementation by libvirt</entry>`
		`- + <entry>Container implementation by libvirt</entry>`
		`- </row>`
		`-`
		`- <row>`
		`- diff --git a/man/systemd-machine-id-setup.xml b/man/systemd-machine-id-setup.xml`
		`- index 9e84fd8ccb..7f0dcd14d7 100644`
		`- --- a/man/systemd-machine-id-setup.xml`
		`- +++ b/man/systemd-machine-id-setup.xml`
		`- @@ -58,7 +58,7 @@`
		`- and is different for every booted instance of the`
		`- VM.</para></listitem>`
		`-`
		`- - <listitem><para>Similarly, if run inside a Linux container`
		`- + <listitem><para>Similarly, if run inside a container`
		`- environment and a UUID is configured for the container, this is`
		`- used to initialize the machine ID. For details, see the`
		`- documentation of the <ulink`
		`- diff --git a/man/systemd-resolved.service.xml b/man/systemd-resolved.service.xml`
		`- index c895adaaf3..d2dc0538ca 100644`
		`- --- a/man/systemd-resolved.service.xml`
		`- +++ b/man/systemd-resolved.service.xml`
		`- @@ -47,7 +47,7 @@`
		`- <citerefentry project='man-pages'><refentrytitle>getaddrinfo</refentrytitle><manvolnum>3</manvolnum></citerefentry> API as defined`
		`- by <ulink url="https://tools.ietf.org/html/rfc3493">RFC3493</ulink> and its related resolver functions,`
		`- including <citerefentry project='man-pages'><refentrytitle>gethostbyname</refentrytitle><manvolnum>3</manvolnum></citerefentry>. This`
		`- - API is widely supported, including beyond the Linux platform. In its current form it does not expose DNSSEC`
		`- + API is widely supported, including beyond the GNU/Linux platform. In its current form it does not expose DNSSEC`
		`- validation status information however, and is synchronous only. This API is backed by the glibc Name Service`
		`- Switch (<citerefentry project='man-pages'><refentrytitle>nss</refentrytitle><manvolnum>5</manvolnum></citerefentry>). Usage of the`
		`- glibc NSS module <citerefentry><refentrytitle>nss-resolve</refentrytitle><manvolnum>8</manvolnum></citerefentry>`
		`- @@ -153,7 +153,7 @@`
		`-`
		`- <itemizedlist>`
		`- <listitem><para><command>systemd-resolved</command> maintains the`
		`- - <filename>/run/systemd/resolve/stub-resolv.conf</filename> file for compatibility with traditional Linux`
		`- + <filename>/run/systemd/resolve/stub-resolv.conf</filename> file for compatibility with traditional GNU/Linux`
		`- programs. This file may be symlinked from <filename>/etc/resolv.conf</filename>. This file lists the 127.0.0.53`
		`- DNS stub (see above) as the only DNS server. It also contains a list of search domains that are in use by`
		`- systemd-resolved. The list of search domains is always kept up-to-date. Note that`
		`- @@ -169,7 +169,7 @@`
		`- <command>systemd-resolved</command>. This file does not contain any search domains.</para></listitem>`
		`-`
		`- <listitem><para><command>systemd-resolved</command> maintains the`
		`- - <filename>/run/systemd/resolve/resolv.conf</filename> file for compatibility with traditional Linux`
		`- + <filename>/run/systemd/resolve/resolv.conf</filename> file for compatibility with traditional GNU/Linux`
		`- programs. This file may be symlinked from <filename>/etc/resolv.conf</filename> and is always kept up-to-date,`
		`- containing information about all known DNS servers. Note the file format's limitations: it does not know a`
		`- concept of per-interface DNS servers and hence only contains system-wide DNS server definitions. Note that`
		`- diff --git a/man/systemd.exec.xml b/man/systemd.exec.xml`
		`- index 3bd790b485..a532b74a6e 100644`
		`- --- a/man/systemd.exec.xml`
		`- +++ b/man/systemd.exec.xml`
		`- @@ -191,7 +191,7 @@`
		`- which must be one of a-z, A-Z or <literal>_</literal> (i.e. numbers and <literal>-</literal> are not permitted`
		`- as first character). The user/group name must have at least one character, and at most 31. These restrictions`
		`- are enforced in order to avoid ambiguities and to ensure user/group names and unit files remain portable among`
		`- - Linux systems.</para>`
		`- + GNU/Linux systems.</para>`
		`-`
		`- <para>When used in conjunction with <varname>DynamicUser=</varname> the user/group name specified is`
		`- dynamically allocated at the time the service is started, and released at the time the service is stopped —`
		`- diff --git a/man/systemd.socket.xml b/man/systemd.socket.xml`
		`- index 19c2ca9907..5fd6c1598f 100644`
		`- --- a/man/systemd.socket.xml`
		`- +++ b/man/systemd.socket.xml`
		`- @@ -280,7 +280,7 @@`
		`- <listitem><para>Specifies a POSIX message queue name to listen`
		`- on. This expects a valid message queue name (i.e. beginning`
		`- with /). Behavior otherwise is very similar to the`
		`- - <varname>ListenFIFO=</varname> directive above. On Linux`
		`- + <varname>ListenFIFO=</varname> directive above. On GNU/Linux`
		`- message queue descriptors are actually file descriptors and`
		`- can be inherited between processes.</para></listitem>`
		`- </varlistentry>`
		`- diff --git a/man/systemd.xml b/man/systemd.xml`
		`- index 17ab59beb5..89086558c7 100644`
		`- --- a/man/systemd.xml`
		`- +++ b/man/systemd.xml`
		`- @@ -40,7 +40,7 @@`
		`- <refsect1>`
		`- <title>Description</title>`
		`-`
		`- - <para>systemd is a system and service manager for Linux operating`
		`- + <para>systemd is a system and service manager for GNU/Linux operating`
		`- systems. When run as first process on boot (as PID 1), it acts as`
		`- init system that brings up and maintains userspace`
		`- services.</para>`
		`- @@ -888,10 +888,10 @@`
		`- <title>Kernel Command Line</title>`
		`-`
		`- <para>When run as system instance systemd parses a number of`
		`- - kernel command line arguments<footnote><para>If run inside a Linux`
		`- + kernel command line arguments<footnote><para>If run inside a`
		`- container these arguments may be passed as command line arguments`
		`- to systemd itself, next to any of the command line options listed`
		`- - in the Options section above. If run outside of Linux containers,`
		`- + in the Options section above. If run outside of a container,`
		`- these arguments are parsed from <filename>/proc/cmdline</filename>`
		`- instead.</para></footnote>:</para>`
		`-`
		`- --`
		`- 2.18.0`
		`-`

nonsystemd/notsystemd/0001-Use-Arch-Linux-device-access-groups.patch

file removed

-75

		`@@ -1,75 +0,0 @@`
		`- From 34e4b4953cb99642e9144d97823edf32b06ffe93 Mon Sep 17 00:00:00 2001`
		`- Message-Id: <34e4b4953cb99642e9144d97823edf32b06ffe93.1520376078.git.jan.steffens@gmail.com>`
		`- From: "Jan Alexander Steffens (heftig)" <jan.steffens@gmail.com>`
		`- Date: Tue, 6 Mar 2018 23:39:47 +0100`
		`- Subject: [PATCH] Use Arch Linux' device access groups`
		`- MIME-Version: 1.0`
		`- Content-Type: text/plain; charset=UTF-8`
		`- Content-Transfer-Encoding: 8bit`
		`-`
		`- cdrom → optical`
		`- dialout → uucp`
		`- tape → storage`
		`- ---`
		`- rules/50-udev-default.rules.in \| 14 +++++++-------`
		`- sysusers.d/basic.conf.in \| 6 +++---`
		`- 2 files changed, 10 insertions(+), 10 deletions(-)`
		`-`
		`- diff --git a/rules/50-udev-default.rules.in b/rules/50-udev-default.rules.in`
		`- index 191f56f42..f81c4d0fc 100644`
		`- --- a/rules/50-udev-default.rules.in`
		`- +++ b/rules/50-udev-default.rules.in`
		`- @@ -22,7 +22,7 @@ SUBSYSTEM=="tty", KERNEL=="sclp_line[0-9]*", GROUP="tty", MODE="0620"`
		`- SUBSYSTEM=="tty", KERNEL=="ttysclp[0-9]*", GROUP="tty", MODE="0620"`
		`- SUBSYSTEM=="tty", KERNEL=="3270/tty[0-9]*", GROUP="tty", MODE="0620"`
		`- SUBSYSTEM=="vc", KERNEL=="vcs\|vcsa", GROUP="tty"`
		`- -KERNEL=="tty[A-Z][0-9]\|ttymxc[0-9]\|pppox[0-9]\|ircomm[0-9]\|noz[0-9]\|rfcomm[0-9]", GROUP="dialout"`
		`- +KERNEL=="tty[A-Z][0-9]\|ttymxc[0-9]\|pppox[0-9]\|ircomm[0-9]\|noz[0-9]\|rfcomm[0-9]", GROUP="uucp"`
		`-`
		`- SUBSYSTEM=="mem", KERNEL=="mem\|kmem\|port", GROUP="kmem", MODE="0640"`
		`-`
		`- @@ -57,13 +57,13 @@ KERNEL=="irlpt[0-9]*", GROUP="lp"`
		`- SUBSYSTEM=="usb", ENV{DEVTYPE}=="usb_device", ENV{ID_USB_INTERFACES}==":0701??:", GROUP="lp"`
		`-`
		`- SUBSYSTEM=="block", GROUP="disk"`
		`- -SUBSYSTEM=="block", KERNEL=="sr[0-9]*", GROUP="cdrom"`
		`- -SUBSYSTEM=="scsi_generic", SUBSYSTEMS=="scsi", ATTRS{type}=="4\|5", GROUP="cdrom"`
		`- -KERNEL=="sch[0-9]*", GROUP="cdrom"`
		`- -KERNEL=="pktcdvd[0-9]*", GROUP="cdrom"`
		`- -KERNEL=="pktcdvd", GROUP="cdrom"`
		`- +SUBSYSTEM=="block", KERNEL=="sr[0-9]*", GROUP="optical"`
		`- +SUBSYSTEM=="scsi_generic", SUBSYSTEMS=="scsi", ATTRS{type}=="4\|5", GROUP="optical"`
		`- +KERNEL=="sch[0-9]*", GROUP="optical"`
		`- +KERNEL=="pktcdvd[0-9]*", GROUP="optical"`
		`- +KERNEL=="pktcdvd", GROUP="optical"`
		`-`
		`- -SUBSYSTEM=="scsi_generic\|scsi_tape", SUBSYSTEMS=="scsi", ATTRS{type}=="1\|8", GROUP="tape"`
		`- +SUBSYSTEM=="scsi_generic\|scsi_tape", SUBSYSTEMS=="scsi", ATTRS{type}=="1\|8", GROUP="storage"`
		`- SUBSYSTEM=="scsi_generic", SUBSYSTEMS=="scsi", ATTRS{type}=="0", GROUP="disk"`
		`- KERNEL=="qft[0-9]\|nqft[0-9]\|zqft[0-9]\|nzqft[0-9]\|rawqft[0-9]\|nrawqft[0-9]", GROUP="disk"`
		`- KERNEL=="loop-control", GROUP="disk", OPTIONS+="static_node=loop-control"`
		`- diff --git a/sysusers.d/basic.conf.in b/sysusers.d/basic.conf.in`
		`- index 8e358c02d..33e513a36 100644`
		`- --- a/sysusers.d/basic.conf.in`
		`- +++ b/sysusers.d/basic.conf.in`
		`- @@ -24,14 +24,14 @@ g utmp - - -`
		`-`
		`- # Hardware access groups`
		`- g audio - - -`
		`- -g cdrom - - -`
		`- -g dialout - - -`
		`- g disk - - -`
		`- g input - - -`
		`- g kvm - - -`
		`- g lp - - -`
		`- +g optical - - -`
		`- g render - - -`
		`- -g tape - - -`
		`- +g storage - - -`
		`- +g uucp - - -`
		`- g video - - -`
		`-`
		`- # Default group for normal users`
		`- --`
		`- 2.16.2`
		`-`

nonsystemd/notsystemd/0002-FSDG-os-release-Default-PRETTY_NAME-to-GNU-Linux-ins.patch

file removed

-101

		`@@ -1,101 +0,0 @@`
		`- From 301445311b5161c61270163c8921b729ab9e10d8 Mon Sep 17 00:00:00 2001`
		`- From: Luke Shumaker <lukeshu@parabola.nu>`
		`- Date: Wed, 25 May 2016 12:23:40 -0400`
		`- Subject: [PATCH 2/7] FSDG: os-release: Default PRETTY_NAME to "GNU/Linux"`
		`- instead of "Linux"`
		`-`
		`- ---`
		`- man/kernel-install.xml \| 2 +-`
		`- man/os-release.xml \| 2 +-`
		`- src/analyze/analyze.c \| 2 +-`
		`- src/core/main.c \| 4 ++--`
		`- src/firstboot/firstboot.c \| 2 +-`
		`- src/kernel-install/90-loaderentry.install \| 2 +-`
		`- 6 files changed, 7 insertions(+), 7 deletions(-)`
		`-`
		`- diff --git a/man/kernel-install.xml b/man/kernel-install.xml`
		`- index cd9756662a..9ead6ea39b 100644`
		`- --- a/man/kernel-install.xml`
		`- +++ b/man/kernel-install.xml`
		`- @@ -88,7 +88,7 @@`
		`- <replaceable>PRETTY_NAME</replaceable> parameter specified`
		`- in <filename>/etc/os-release</filename> or`
		`- <filename>/usr/lib/os-release</filename> (if the former is`
		`- - missing), or "Linux`
		`- + missing), or "GNU/Linux`
		`- <replaceable>KERNEL-VERSION</replaceable>", if unset. If`
		`- the file <filename>initrd</filename> is found next to the`
		`- <filename>linux</filename> file, the initrd will be added to`
		`- diff --git a/man/os-release.xml b/man/os-release.xml`
		`- index a51edf3b8a..9ff4b7e8c2 100644`
		`- --- a/man/os-release.xml`
		`- +++ b/man/os-release.xml`
		`- @@ -187,7 +187,7 @@`
		`- suitable for presentation to the user. May or may not contain`
		`- a release code name or OS version of some kind, as suitable.`
		`- If not set, defaults to`
		`- - <literal>PRETTY_NAME="Linux"</literal>. Example:`
		`- + <literal>PRETTY_NAME="GNU/Linux"</literal>. Example:`
		`- <literal>PRETTY_NAME="Fedora 17 (Beefy`
		`- Miracle)"</literal>.</para></listitem>`
		`- </varlistentry>`
		`- diff --git a/src/analyze/analyze.c b/src/analyze/analyze.c`
		`- index de0fe6eba8..9f239c8eeb 100644`
		`- --- a/src/analyze/analyze.c`
		`- +++ b/src/analyze/analyze.c`
		`- @@ -712,7 +712,7 @@ static int analyze_plot(int argc, char argv[], void userdata) {`
		`- svg("<text x=\"20\" y=\"50\">%s</text>", pretty_times);`
		`- if (use_full_bus)`
		`- svg("<text x=\"20\" y=\"30\">%s %s (%s %s %s) %s %s</text>",`
		`- - isempty(host->os_pretty_name) ? "Linux" : host->os_pretty_name,`
		`- + isempty(host->os_pretty_name) ? "GNU/Linux" : host->os_pretty_name,`
		`- strempty(host->hostname),`
		`- strempty(host->kernel_name),`
		`- strempty(host->kernel_release),`
		`- diff --git a/src/core/main.c b/src/core/main.c`
		`- index 44dd8348be..9a4fc26425 100644`
		`- --- a/src/core/main.c`
		`- +++ b/src/core/main.c`
		`- @@ -1234,11 +1234,11 @@ static int status_welcome(void) {`
		`- return status_printf(NULL, false, false,`
		`- "\nWelcome to \x1B[%sm%s\x1B[0m!\n",`
		`- isempty(ansi_color) ? "1" : ansi_color,`
		`- - isempty(pretty_name) ? "Linux" : pretty_name);`
		`- + isempty(pretty_name) ? "GNU/Linux" : pretty_name);`
		`- else`
		`- return status_printf(NULL, false, false,`
		`- "\nWelcome to %s!\n",`
		`- - isempty(pretty_name) ? "Linux" : pretty_name);`
		`- + isempty(pretty_name) ? "GNU/Linux" : pretty_name);`
		`- }`
		`-`
		`- static int write_container_id(void) {`
		`- diff --git a/src/firstboot/firstboot.c b/src/firstboot/firstboot.c`
		`- index a98e53b3a3..41b212e32d 100644`
		`- --- a/src/firstboot/firstboot.c`
		`- +++ b/src/firstboot/firstboot.c`
		`- @@ -87,7 +87,7 @@ static void print_welcome(void) {`
		`- "Failed to read os-release file, ignoring: %m");`
		`-`
		`- printf("\nWelcome to your new installation of %s!\nPlease configure a few basic system settings:\n\n",`
		`- - isempty(pretty_name) ? "Linux" : pretty_name);`
		`- + isempty(pretty_name) ? "GNU/Linux" : pretty_name);`
		`-`
		`- press_any_key();`
		`-`
		`- diff --git a/src/kernel-install/90-loaderentry.install b/src/kernel-install/90-loaderentry.install`
		`- index a271cdb8a0..29047ccbff 100644`
		`- --- a/src/kernel-install/90-loaderentry.install`
		`- +++ b/src/kernel-install/90-loaderentry.install`
		`- @@ -40,7 +40,7 @@ elif [[ -f /usr/lib/os-release ]]; then`
		`- fi`
		`-`
		`- if ! [[ $PRETTY_NAME ]]; then`
		`- - PRETTY_NAME="Linux $KERNEL_VERSION"`
		`- + PRETTY_NAME="GNU/Linux $KERNEL_VERSION"`
		`- fi`
		`-`
		`- declare -a BOOT_OPTIONS`
		`- --`
		`- 2.18.0`
		`-`

nonsystemd/notsystemd/0003-FSDG-os-release-Default-NAME-to-GNU-Linux-instead-of.patch

file removed

-40

		`@@ -1,40 +0,0 @@`
		`- From a6be5d2b2cd02f302ef70c76b601e7af912c3022 Mon Sep 17 00:00:00 2001`
		`- From: Luke Shumaker <lukeshu@parabola.nu>`
		`- Date: Wed, 25 May 2016 12:24:56 -0400`
		`- Subject: [PATCH 3/7] FSDG: os-release: Default NAME to "GNU/Linux" instead of`
		`- "Linux"`
		`-`
		`- ---`
		`- man/os-release.xml \| 2 +-`
		`- src/journal-remote/journal-gatewayd.c \| 2 +-`
		`- 2 files changed, 2 insertions(+), 2 deletions(-)`
		`-`
		`- diff --git a/man/os-release.xml b/man/os-release.xml`
		`- index 9ff4b7e8c2..1c069275c8 100644`
		`- --- a/man/os-release.xml`
		`- +++ b/man/os-release.xml`
		`- @@ -98,7 +98,7 @@`
		`- <listitem><para>A string identifying the operating system,`
		`- without a version component, and suitable for presentation to`
		`- the user. If not set, defaults to`
		`- - <literal>NAME=Linux</literal>. Example:`
		`- + <literal>NAME=GNU/Linux</literal>. Example:`
		`- <literal>NAME=Fedora</literal> or <literal>NAME="Debian`
		`- GNU/Linux"</literal>.</para></listitem>`
		`- </varlistentry>`
		`- diff --git a/src/journal-remote/journal-gatewayd.c b/src/journal-remote/journal-gatewayd.c`
		`- index 9e77e314ff..3d0c3aafd7 100644`
		`- --- a/src/journal-remote/journal-gatewayd.c`
		`- +++ b/src/journal-remote/journal-gatewayd.c`
		`- @@ -788,7 +788,7 @@ static int request_handler_machine(`
		`- SD_ID128_FORMAT_VAL(mid),`
		`- SD_ID128_FORMAT_VAL(bid),`
		`- hostname_cleanup(hostname),`
		`- - os_name ? os_name : "Linux",`
		`- + os_name ? os_name : "GNU/Linux",`
		`- v ? v : "bare",`
		`- usage,`
		`- cutoff_from,`
		`- --`
		`- 2.18.0`
		`-`

nonsystemd/notsystemd/0004-FSDG-os-release-Default-ID-to-gnu-linux-instead-of-l.patch

file removed

-28

		`@@ -1,28 +0,0 @@`
		`- From 8dab19e27e7d8c81cf3fec4413172a7597c9da44 Mon Sep 17 00:00:00 2001`
		`- From: Luke Shumaker <lukeshu@parabola.nu>`
		`- Date: Wed, 25 May 2016 12:28:30 -0400`
		`- Subject: [PATCH 4/7] FSDG: os-release: Default ID to "gnu-linux" instead of`
		`- "linux"`
		`-`
		`- As far as I can tell, no code in this repository actually uses the ID`
		`- field, so this is just a man page change.`
		`- ---`
		`- man/os-release.xml \| 2 +-`
		`- 1 file changed, 1 insertion(+), 1 deletion(-)`
		`-`
		`- diff --git a/man/os-release.xml b/man/os-release.xml`
		`- index 1c069275c8..272258b4e1 100644`
		`- --- a/man/os-release.xml`
		`- +++ b/man/os-release.xml`
		`- @@ -122,7 +122,7 @@`
		`- the operating system, excluding any version information and`
		`- suitable for processing by scripts or usage in generated`
		`- filenames. If not set, defaults to`
		`- - <literal>ID=linux</literal>. Example:`
		`- + <literal>ID=gnu-linux</literal>. Example:`
		`- <literal>ID=fedora</literal> or`
		`- <literal>ID=debian</literal>.</para></listitem>`
		`- </varlistentry>`
		`- --`
		`- 2.18.0`
		`-`

nonsystemd/notsystemd/0005-FSDG-systemd-resolved-Fallback-hostname-to-gnu-linux.patch

file removed

-30

		`@@ -1,30 +0,0 @@`
		`- From 50b001e3d034825142c03e612af9d4a5a307472f Mon Sep 17 00:00:00 2001`
		`- From: Luke Shumaker <lukeshu@parabola.nu>`
		`- Date: Wed, 25 May 2016 12:31:20 -0400`
		`- Subject: [PATCH 5/7] FSDG: systemd-resolved: Fallback hostname to "gnu-linux"`
		`- instead of "linux"`
		`-`
		`- ---`
		`- src/resolve/resolved-manager.c \| 4 ++--`
		`- 1 file changed, 2 insertions(+), 2 deletions(-)`
		`-`
		`- diff --git a/src/resolve/resolved-manager.c b/src/resolve/resolved-manager.c`
		`- index 01372fc66b..9155ce5c2e 100644`
		`- --- a/src/resolve/resolved-manager.c`
		`- +++ b/src/resolve/resolved-manager.c`
		`- @@ -387,10 +387,10 @@ static int determine_hostname(char full_hostname, char llmnr_hostname, char`
		`- static const char *fallback_hostname(void) {`
		`-`
		`- /* Determine the fall back hostname. For exposing this system to the outside world, we cannot have it to be`
		`- - * "localhost" even if that's the compiled in hostname. In this case, let's revert to "linux" instead. */`
		`- + * "localhost" even if that's the compiled in hostname. In this case, let's revert to "gnu-linux" instead. */`
		`-`
		`- if (is_localhost(FALLBACK_HOSTNAME))`
		`- - return "linux";`
		`- + return "gnu-linux";`
		`-`
		`- return FALLBACK_HOSTNAME;`
		`- }`
		`- --`
		`- 2.18.0`
		`-`

nonsystemd/notsystemd/0006-FSDG-man-Use-FSDG-operating-systems-as-examples.patch

file removed

-248

		`@@ -1,248 +0,0 @@`
		`- From 35af892f1dffbb0daa9aa721f908f7c38b064ebe Mon Sep 17 00:00:00 2001`
		`- From: Luke Shumaker <lukeshu@parabola.nu>`
		`- Date: Wed, 25 May 2016 12:32:21 -0400`
		`- Subject: [PATCH 6/7] FSDG: man/: Use FSDG operating systems as examples`
		`-`
		`- ---`
		`- man/os-release.xml \| 49 +++++++++++++++++++++--------------------`
		`- man/systemd-nspawn.xml \| 50 +++++++++++++++++++++++-------------------`
		`- 2 files changed, 52 insertions(+), 47 deletions(-)`
		`-`
		`- diff --git a/man/os-release.xml b/man/os-release.xml`
		`- index 272258b4e1..6cea40cb99 100644`
		`- --- a/man/os-release.xml`
		`- +++ b/man/os-release.xml`
		`- @@ -99,7 +99,7 @@`
		`- without a version component, and suitable for presentation to`
		`- the user. If not set, defaults to`
		`- <literal>NAME=GNU/Linux</literal>. Example:`
		`- - <literal>NAME=Fedora</literal> or <literal>NAME="Debian`
		`- + <literal>NAME=BLAG</literal> or <literal>NAME="gNewSense`
		`- GNU/Linux"</literal>.</para></listitem>`
		`- </varlistentry>`
		`-`
		`- @@ -110,8 +110,8 @@`
		`- version, excluding any OS name information, possibly including`
		`- a release code name, and suitable for presentation to the`
		`- user. This field is optional. Example:`
		`- - <literal>VERSION=17</literal> or <literal>VERSION="17 (Beefy`
		`- - Miracle)"</literal>.</para></listitem>`
		`- + <literal>VERSION=210k</literal> or <literal>VERSION="210k`
		`- + (Spartakus)"</literal>.</para></listitem>`
		`- </varlistentry>`
		`-`
		`- <varlistentry>`
		`- @@ -123,8 +123,8 @@`
		`- suitable for processing by scripts or usage in generated`
		`- filenames. If not set, defaults to`
		`- <literal>ID=gnu-linux</literal>. Example:`
		`- - <literal>ID=fedora</literal> or`
		`- - <literal>ID=debian</literal>.</para></listitem>`
		`- + <literal>ID=blag</literal> or`
		`- + <literal>ID=gnewsense</literal>.</para></listitem>`
		`- </varlistentry>`
		`-`
		`- <varlistentry>`
		`- @@ -145,9 +145,9 @@`
		`- should be listed in order of how closely the local operating`
		`- system relates to the listed ones, starting with the closest.`
		`- This field is optional. Example: for an operating system with`
		`- - <literal>ID=centos</literal>, an assignment of`
		`- + <literal>ID=blag</literal>, an assignment of`
		`- <literal>ID_LIKE="rhel fedora"</literal> would be appropriate.`
		`- - For an operating system with <literal>ID=ubuntu</literal>, an`
		`- + For an operating system with <literal>ID=gnewsense</literal>, an`
		`- assignment of <literal>ID_LIKE=debian</literal> is`
		`- appropriate.</para></listitem>`
		`- </varlistentry>`
		`- @@ -176,8 +176,8 @@`
		`- identifying the operating system version, excluding any OS`
		`- name information or release code name, and suitable for`
		`- processing by scripts or usage in generated filenames. This`
		`- - field is optional. Example: <literal>VERSION_ID=17</literal>`
		`- - or <literal>VERSION_ID=11.04</literal>.</para></listitem>`
		`- + field is optional. Example: <literal>VERSION_ID=210k</literal>`
		`- + or <literal>VERSION_ID=7.0</literal>.</para></listitem>`
		`- </varlistentry>`
		`-`
		`- <varlistentry>`
		`- @@ -188,8 +188,8 @@`
		`- a release code name or OS version of some kind, as suitable.`
		`- If not set, defaults to`
		`- <literal>PRETTY_NAME="GNU/Linux"</literal>. Example:`
		`- - <literal>PRETTY_NAME="Fedora 17 (Beefy`
		`- - Miracle)"</literal>.</para></listitem>`
		`- + <literal>PRETTY_NAME="BLAG 210k`
		`- + (Spartakus)"</literal>.</para></listitem>`
		`- </varlistentry>`
		`-`
		`- <varlistentry>`
		`- @@ -212,7 +212,7 @@`
		`- <ulink url="http://scap.nist.gov/specifications/cpe/">Common`
		`- Platform Enumeration Specification</ulink> as proposed by the`
		`- NIST. This field is optional. Example:`
		`- - <literal>CPE_NAME="cpe:/o:fedoraproject:fedora:17"</literal>`
		`- + <literal>CPE_NAME="cpe:/o:blagblagblag:blag:210k"</literal>`
		`- </para></listitem>`
		`- </varlistentry>`
		`-`
		`- @@ -247,8 +247,8 @@`
		`- one URL shall be listed in each setting. If multiple resources`
		`- need to be referenced, it is recommended to provide an online`
		`- landing page linking all available resources. Examples:`
		`- - <literal>HOME_URL="https://fedoraproject.org/"</literal> and`
		`- - <literal>BUG_REPORT_URL="https://bugzilla.redhat.com/"</literal></para></listitem>`
		`- + <literal>HOME_URL="https://www.blagblagblag.org/"</literal> and`
		`- + <literal>BUG_REPORT_URL="https://blag.fsf.org/"</literal></para></listitem>`
		`- </varlistentry>`
		`-`
		`- <varlistentry>`
		`- @@ -323,21 +323,22 @@`
		`- recommended to prefix new fields with an OS specific`
		`- name in order to avoid name clashes. Applications`
		`- reading this file must ignore unknown fields. Example:`
		`- - <literal>DEBIAN_BTS="debbugs://bugs.debian.org/"</literal></para>`
		`- + <literal>DEBIAN_BTS="debbugs://bugs.gnewsense.org/"</literal></para>`
		`- </refsect1>`
		`-`
		`- <refsect1>`
		`- <title>Example</title>`
		`-`
		`- - <programlisting>NAME=Fedora`
		`- -VERSION="17 (Beefy Miracle)"`
		`- -ID=fedora`
		`- -VERSION_ID=17`
		`- -PRETTY_NAME="Fedora 17 (Beefy Miracle)"`
		`- -ANSI_COLOR="0;34"`
		`- -CPE_NAME="cpe:/o:fedoraproject:fedora:17"`
		`- -HOME_URL="https://fedoraproject.org/"`
		`- -BUG_REPORT_URL="https://bugzilla.redhat.com/"</programlisting>`
		`- + <programlisting>NAME=Parabola`
		`- +VERSION="rolling-release"`
		`- +ID=parabola`
		`- +ID_LIKE=arch`
		`- +VERSION_ID=rolling-release`
		`- +PRETTY_NAME="Parabola GNU/Linux-libre"`
		`- +ANSI_COLOR="1;35"`
		`- +CPE_NAME="cpe:/o:parabola:parabola:rolling-release"`
		`- +HOME_URL="https://www.parabola.nu/"`
		`- +BUG_REPORT_URL="https://labs.parabola.nu/"</programlisting>`
		`- </refsect1>`
		`-`
		`- <refsect1>`
		`- diff --git a/man/systemd-nspawn.xml b/man/systemd-nspawn.xml`
		`- index 284c9b294b..7b3d211161 100644`
		`- --- a/man/systemd-nspawn.xml`
		`- +++ b/man/systemd-nspawn.xml`
		`- @@ -1,7 +1,7 @@`
		`- <?xml version='1.0'?> <!--- Mode: nxml; nxml-child-indent: 2; indent-tabs-mode: nil --->`
		`- <!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"`
		`- "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" [`
		`- -<!ENTITY fedora_latest_version "28">`
		`- +<!ENTITY blag_latest_version "140">`
		`- <!ENTITY fedora_cloud_release "1.1">`
		`- ]>`
		`-`
		`- @@ -1176,11 +1176,12 @@`
		`- <refsect1>`
		`- <title>Examples</title>`
		`-`
		`- +<!-- TODO: This example needs switched to an FSDG OS; but I'm not sure of a good machinectl-compatible image to use.`
		`- <example>`
		`- <title>Download a`
		`- <ulink url="https://getfedora.org">Fedora</ulink> image and start a shell in it</title>`
		`-`
		`- - <programlisting># machinectl pull-raw --verify=no \`
		`- + <programlisting># machinectl pull-raw -&2D;verify=no \`
		`- https://download.fedoraproject.org/pub/fedora/linux/releases/&fedora_latest_version;/Cloud/x86_64/images/Fedora-Cloud-Base-&fedora_latest_version;-&fedora_cloud_release;.x86_64.raw.xz`
		`- # systemd-nspawn -M Fedora-Cloud-Base-&fedora_latest_version;-&fedora_cloud_release;.x86_64.raw</programlisting>`
		`-`
		`- @@ -1188,31 +1189,32 @@`
		`- <citerefentry><refentrytitle>machinectl</refentrytitle><manvolnum>1</manvolnum></citerefentry>`
		`- and opens a shell in it.</para>`
		`- </example>`
		`- +-->`
		`-`
		`- <example>`
		`- - <title>Build and boot a minimal Fedora distribution in a container</title>`
		`- + <title>Build and boot a minimal BLAG distribution in a container</title>`
		`-`
		`- - <programlisting># dnf -y --releasever=&fedora_latest_version; --installroot=/var/lib/machines/f&fedora_latest_version; \`
		`- - --disablerepo='*' --enablerepo=fedora --enablerepo=updates install \`
		`- - systemd passwd dnf fedora-release vim-minimal`
		`- -# systemd-nspawn -bD /var/lib/machines/f&fedora_latest_version;</programlisting>`
		`- + <programlisting># dnf -y --releasever=&blag_latest_version;k --installroot=/var/lib/machines/blag&blag_latest_version; \`
		`- + --disablerepo='*' --enablerepo=blag --enablerepo=updates install \`
		`- + systemd passwd dnf blag-release vim-minimal`
		`- +# systemd-nspawn -bD /var/lib/machines/blag&blag_latest_version;</programlisting>`
		`-`
		`- - <para>This installs a minimal Fedora distribution into the`
		`- - directory <filename noindex='true'>/var/lib/machines/f&fedora_latest_version;</filename>`
		`- + <para>This installs a minimal BLAG distribution into the`
		`- + directory <filename noindex='true'>/var/lib/machines/blag&blag_latest_version;</filename>`
		`- and then boots an OS in a namespace container in it. Because the installation`
		`- is located underneath the standard <filename>/var/lib/machines/</filename>`
		`- directory, it is also possible to start the machine using`
		`- - <command>systemd-nspawn -M f&fedora_latest_version;</command>.</para>`
		`- + <command>systemd-nspawn -M blag&blag_latest_version;</command>.</para>`
		`- </example>`
		`-`
		`- <example>`
		`- - <title>Spawn a shell in a container of a minimal Debian unstable distribution</title>`
		`- + <title>Spawn a shell in a container of a minimal gNewSense Ucclia distribution</title>`
		`-`
		`- - <programlisting># debootstrap unstable ~/debian-tree/`
		`- -# systemd-nspawn -D ~/debian-tree/</programlisting>`
		`- + <programlisting># debootstrap ucclia ~/gnewsense-tree/`
		`- +# systemd-nspawn -D ~/gnewsense-tree/</programlisting>`
		`-`
		`- - <para>This installs a minimal Debian unstable distribution into`
		`- - the directory <filename>~/debian-tree/</filename> and then`
		`- + <para>This installs a minimal gNewSense unstable distribution into`
		`- + the directory <filename>~/gnewsense-tree/</filename> and then`
		`- spawns a shell in a namespace container in it.</para>`
		`-`
		`- <para><command>debootstrap</command> supports`
		`- @@ -1227,29 +1229,31 @@`
		`-`
		`- <example>`
		`- <title>Boot a minimal`
		`- - <ulink url="https://www.archlinux.org">Arch Linux</ulink> distribution in a container</title>`
		`- + <ulink url="https://www.parabola.nu">Parabola GNU/Linux-libre</ulink> distribution in a container</title>`
		`-`
		`- - <programlisting># pacstrap -c -d ~/arch-tree/ base`
		`- -# systemd-nspawn -bD ~/arch-tree/</programlisting>`
		`- + <programlisting># pacstrap -c -d ~/parabola-tree/ base`
		`- +# systemd-nspawn -bD ~/parabola-tree/</programlisting>`
		`-`
		`- - <para>This installs a minimal Arch Linux distribution into the`
		`- - directory <filename>~/arch-tree/</filename> and then boots an OS`
		`- + <para>This installs a minimal Parabola distribution into the`
		`- + directory <filename>~/parabola-tree/</filename> and then boots an OS`
		`- in a namespace container in it.</para>`
		`- </example>`
		`-`
		`- +<!-- TODO: This example needs switched to an FSDG OS`
		`- <example>`
		`- <title>Install the`
		`- <ulink url="https://software.opensuse.org/distributions/tumbleweed">OpenSUSE Tumbleweed</ulink>`
		`- rolling distribution</title>`
		`-`
		`- - <programlisting># zypper --root=/var/lib/machines/tumbleweed ar -c \`
		`- + <programlisting># zypper -&2Droot=/var/lib/machines/tumbleweed ar -c \`
		`- https://download.opensuse.org/tumbleweed/repo/oss tumbleweed`
		`- -# zypper --root=/var/lib/machines/tumbleweed refresh`
		`- -# zypper --root=/var/lib/machines/tumbleweed install --no-recommends \`
		`- +# zypper -&2Droot=/var/lib/machines/tumbleweed refresh`
		`- +# zypper -&2Droot=/var/lib/machines/tumbleweed install -&2Dno-recommends \`
		`- systemd shadow zypper openSUSE-release vim`
		`- # systemd-nspawn -M tumbleweed passwd root`
		`- # systemd-nspawn -M tumbleweed -b</programlisting>`
		`- </example>`
		`- +-->`
		`-`
		`- <example>`
		`- <title>Boot into an ephemeral snapshot of the host system</title>`
		`- --`
		`- 2.18.0`
		`-`

nonsystemd/notsystemd/0007-FSDG-bootctl-Say-Systemd-Boot-Manager-instead-of-Lin.patch

file removed

-33

		`@@ -1,33 +0,0 @@`
		`- From 31e5d50f17d3993839d8f7c9f344a620e3871812 Mon Sep 17 00:00:00 2001`
		`- From: Luke Shumaker <lukeshu@parabola.nu>`
		`- Date: Sat, 17 Dec 2016 00:56:43 -0500`
		`- Subject: [PATCH 7/7] FSDG: bootctl: Say "Systemd Boot Manager" instead of`
		`- "Linux Boot Manager"`
		`-`
		`- ---`
		`- src/boot/bootctl.c \| 4 ++--`
		`- 1 file changed, 2 insertions(+), 2 deletions(-)`
		`-`
		`- diff --git a/src/boot/bootctl.c b/src/boot/bootctl.c`
		`- index 2832a39dd7..534870ee50 100644`
		`- --- a/src/boot/bootctl.c`
		`- +++ b/src/boot/bootctl.c`
		`- @@ -665,13 +665,13 @@ static int install_variables(const char *esp_path,`
		`- "Failed to determine current boot order: %m");`
		`-`
		`- if (first \|\| r == 0) {`
		`- - r = efi_add_boot_option(slot, "Linux Boot Manager",`
		`- + r = efi_add_boot_option(slot, "Systemd Boot Manager",`
		`- part, pstart, psize,`
		`- uuid, path);`
		`- if (r < 0)`
		`- return log_error_errno(r, "Failed to create EFI Boot variable entry: %m");`
		`-`
		`- - log_info("Created EFI boot entry \"Linux Boot Manager\".");`
		`- + log_info("Created EFI boot entry \"Systemd Boot Manager\".");`
		`- }`
		`-`
		`- return insert_into_order(slot, first);`
		`- --`
		`- 2.18.0`
		`-`

nonsystemd/notsystemd/PKGBUILD

file removed

-334

		`@@ -1,334 +0,0 @@`
		`- # Maintainer (Arch:systemd): Christian Hesse <mail@eworm.de>`
		`- # Maintainer (Arch:systemd): Dave Reisner <dreisner@archlinux.org>`
		`- # Maintainer (Arch:systemd): Tom Gundersen <teg@jklm.no>`
		`- # Maintainer: Luke Shumaker <lukeshu@parabola.nu>`
		`- # Contributor: Omar Vega Ramos <ovruni@gnu.org.pe>`
		`-`
		`- # Justification for being in [libre]: Potential dependency of`
		`- # libretools.`
		`-`
		`- _pkgbase=systemd`
		`- # Can be from either systemd or systemd-stable`
		`- _commit='de7436b02badc82200dc127ff190b8155769b8e7'`
		`- _pkgver=239.0`
		`-`
		`- pkgbase=notsystemd`
		`- # Include only split packages that link against libsystemd-shared-XXX.so`
		`- pkgname=('notsystemd' 'notsystemd-udev' 'notsystemd-common')`
		`- pkgver=239.1`
		`- pkgrel=3`
		`- arch=('x86_64')`
		`- arch+=('i686' 'armv7h')`
		`- url="https://repo.parabola.nu/other/${pkgname}"`
		`- makedepends=('acl' 'cryptsetup' 'docbook-xsl' 'gperf' 'lz4' 'xz' 'pam' 'libelf'`
		`- 'intltool' 'iptables' 'kmod' 'libcap' 'libidn' 'libgcrypt'`
		`- 'libmicrohttpd' 'libxslt' 'util-linux' 'linux-api-headers'`
		`- 'python-lxml' 'quota-tools' 'shadow' 'git'`
		`- 'meson' 'libseccomp' 'pcre2')`
		`- makedepends_i686=('gnu-efi-libs')`
		`- makedepends_x86_64=('gnu-efi-libs')`
		`- options=('strip')`
		`- validpgpkeys=('63CDA1E5D3FC22B998D20DD6327F26951A015CC4' # Lennart Poettering <lennart@poettering.net>`
		`- '5C251B5FC54EB2F80F407AAAC54CA336CFEB557E' # Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>`
		`- '99195DD3BB6FE10A2F36ED8445698744D4FFBFC9') # Luke Shumaker`
		`- source=(# fragment is latest tag for source verification, final merge in prepare()`
		`- "git+https://github.com/systemd/systemd-stable#tag=v${_pkgver%.*}?signed"`
		`- "git+https://github.com/systemd/systemd#tag=v${_pkgver%.*}?signed"`
		`- '0001-Use-Arch-Linux-device-access-groups.patch'`
		`- "https://repo.parabola.nu/other/${pkgname}/${pkgbase}-${pkgver}.tar.gz"{,.sig}`
		`- 'initcpio-hook-udev'`
		`- 'initcpio-install-systemd'`
		`- 'initcpio-install-udev'`
		`- 'parabola.conf'`
		`- 'loader.conf'`
		`- 'splash-parabola.bmp'`
		`- 'systemd-user.pam'`
		`- 'systemd-hook'`
		`- 'udev-hook'`
		`- 'systemd-binfmt.hook'`
		`- 'systemd-catalog.hook'`
		`- 'systemd-daemon-reload.hook'`
		`- 'systemd-hwdb.hook'`
		`- 'systemd-sysctl.hook'`
		`- 'systemd-sysusers.hook'`
		`- 'systemd-tmpfiles.hook'`
		`- 'systemd-udev-reload.hook'`
		`- 'systemd-update.hook'`
		`- '0001-FSDG-man-Refer-to-the-operating-system-as-GNU-Linux.patch'`
		`- '0002-FSDG-os-release-Default-PRETTY_NAME-to-GNU-Linux-ins.patch'`
		`- '0003-FSDG-os-release-Default-NAME-to-GNU-Linux-instead-of.patch'`
		`- '0004-FSDG-os-release-Default-ID-to-gnu-linux-instead-of-l.patch'`
		`- '0005-FSDG-systemd-resolved-Fallback-hostname-to-gnu-linux.patch'`
		`- '0006-FSDG-man-Use-FSDG-operating-systems-as-examples.patch'`
		`- '0007-FSDG-bootctl-Say-Systemd-Boot-Manager-instead-of-Lin.patch')`
		`- sha512sums=('SKIP'`
		`- 'SKIP'`
		`- '9348683829190628e25b7b3300fd880c426d555bde330d5fc5150a9a54b3ad9d4d1f2e69ea1dc6d6f086693dacc53c5af30f1fa7ad9b479791fd77bcdafa430e'`
		`- 'b51d9ac5b6dd9893f2b6654cf0ae96a5576b1ae0a5e03b9a491d6ca51a4ba6138e0839396c8526ab293091ec1c8e02e3ec0ef80f67c965d94bfaa47b6ac20319'`
		`- 'SKIP'`
		`- 'f0d933e8c6064ed830dec54049b0a01e27be87203208f6ae982f10fb4eddc7258cb2919d594cbfb9a33e74c3510cfd682f3416ba8e804387ab87d1a217eb4b73'`
		`- '01de24951a05d38eca6b615a7645beb3677ca0e0f87638d133649f6dc14dcd2ea82594a60b793c31b14493a286d1d11a0d25617f54dbfa02be237652c8faa691'`
		`- 'a25b28af2e8c516c3a2eec4e64b8c7f70c21f974af4a955a4a9d45fd3e3ff0d2a98b4419fe425d47152d5acae77d64e69d8d014a7209524b75a81b0edb10bf3a'`
		`- '70b3f1d6aaa9cd4b6b34055a587554770c34194100b17b2ef3aaf4f16f68da0865f6b3ae443b3252d395e80efabd412b763259ffb76c902b60e23b6b522e3cc8'`
		`- '6c6f579644ea2ebb6b46ee274ab15110718b0de40def8c30173ba8480b045d403f2aedd15b50ad9b96453f4ad56920d1350ff76563755bb9a80b10fa7f64f1d9'`
		`- 'a50bc85061a9a16d776235099867bc1a17c17dddb74c1ecf5614c849735a9779c5e34e5ddca8ca6af4b59a40f57c08ecf219b98cab09476ddb0f110e6a35e45c'`
		`- 'b90c99d768dc2a4f020ba854edf45ccf1b86a09d2f66e475de21fe589ff7e32c33ef4aa0876d7f1864491488fd7edb2682fc0d68e83a6d4890a0778dc2d6fe19'`
		`- '12abea62121f4e0867ffbcf6ba96bb1540dd7d86775556fc180ae6c844abfd13310b6782ff6d0e665c8d875446c17b40495d6c2fbc7ddcb42f9a13e1b57a8c40'`
		`- 'b7ee4f212c910df62c3472103a64a3cdf0d31292bc2f8fa839e5c86f34faa3ef1a3693601f5716779c4552a0d2b1d57538d45610f4c2e1c80e155ffbf0af187d'`
		`- '5a6b6beef8c31c79018884d948de840f4d3dfb07d9a87081ebf65e2b8fe595bc8c96dbd7742920ccf948c233213ed0026abc913650cefd77ad90c6f8c89bddb8'`
		`- '4cff2ebd962e26e2f516d8b4ac45c839dbfa54dd0588b423c224a328b9f7c62306ca7b2f6cb55240c564caf9972d5bcd2e0efaf2de49d64729aeb3bc1560c9eb'`
		`- '872de70325e9798f0b5a77e991c85bd2ab6de24d9b9ba4e35002d2dd5df15f8b30739a0042a624776177ffc14a838cde7ee98622016ed41df3efda9a659730b2'`
		`- '96bb157de6921086a2bfc45a650414fbffa787bccff2cbd838cbe05c6fc635cbabd533360608eb7ca2f80ab7df795065a27abf4a1b1ea2b406612a3fcf420bdc'`
		`- 'da783e3bfc6469b92dee4064a13e2b427520d3d96b57c95a4e07aaca3e844d95210a8b16122b022080f5452d65096f274dd1c1467725bbdb2e40ef304b78774a'`
		`- '08a590d08043a21f30f04252164b94df972b1ff1022a0469d6aef713e14484a3a037cce290a2a582851e6fac3e64add69d6cc8fc130bbeeaea08626ebf3e1763'`
		`- '577e33a1c50b4b41157a67f64162b035dd0c4a541e19cee55a100048bdb50cb2c82852741b1372989a0fe4c4782ba477522747fcc81d72aed99b3db512a86447'`
		`- 'c4463fdd25e14a836ac3b874109861a55a0169c4206b6356b53974dd4621f645652087ebf4c738b18734a718fe7fd9ec6b700ce8dd9736525274eb16b10385e6'`
		`- '209b01b044877cc986757fa4009a92ea98f480306c2530075d153203c3cd2b3afccab6aacc1453dee8857991e04270572f1700310705d7a0f4d5bed27fab8c67'`
		`- 'a40678af1cd677535fb71084f70a10b74e61592c48a7f3901d6b51429c0bae179208b4aebd6700871fdf334d67703c955f01a0cd5165571f53435783c457d568'`
		`- 'ae00ccf95c8cf5b6051d7c316eed36a450939d40d0d2c62aaa0ba16eb6fe3a3b1d703ea73593ff2e73f2268d30fb3dce3810528b15c9259353c3a4c158b0cc38'`
		`- 'fd0df3d365892d4d461a78bb0b728201e81c1269af07a38e134fadfc0ffb29aade7642142d128abcf88803b86494d7629ff5990359ef067feea3d476c7238a67'`
		`- 'e9e884015a40dc796fd8cbd8f79b3b9eebc7e48a332b22d52104c21c492be9982b35b7dd30bc29f2c2d274707ffd043eda059659844a4cd50eb433b8a3f7648c'`
		`- '0d6b894149ec8d0612d1be1dee5daa1768345232e450435ddc750e36a8309dd96782a92f0220169c69103b1c4632af708e4a737cb7ba817944c92dcb61379a30'`
		`- 'cf0dd60f56160f6add80ecebf698632bde55ed25e54ffa6cd0fa18da4aa2d446d3e4394295446555db22d32bf3b5f563c7e77a52eeb342a8ddaabd1347032e83'`
		`- '28a5b3fc9e2c5cec9267bb96725c73ee77788514f140c0cf8df765af64bc8130dd02f4863d9128ac45d54256b2ab4f2b06d1a3f65660ce1dfba5727618cd1839')`
		`-`
		`- _backports=(`
		`- '75720bff62a84896e9a0654afc7cf9408cf89a38' # (for glibc 2.28) build-sys: Detect whether struct statx is defined in sys/stat.h`
		`- )`
		`-`
		`- _reverts=(`
		`- )`
		`-`
		`- prepare() {`
		`- cd "$_pkgbase-stable"`
		`-`
		`- # add upstream repository for cherry-picking`
		`- git remote add -f upstream ../systemd`
		`- # merge the latest stable commit (fast-foward only to make sure`
		`- # the verified tag is in)`
		`- git merge --ff-only "${_commit}"`
		`-`
		`- local c`
		`- for c in "${_backports[@]}"; do`
		`- git cherry-pick -n "$c"`
		`- done`
		`- for c in "${_reverts[@]}"; do`
		`- git revert -n "$c"`
		`- done`
		`-`
		`- # Replace cdrom/dialout/tape groups with optical/uucp/storage`
		`- patch -Np1 -i ../0001-Use-Arch-Linux-device-access-groups.patch`
		`-`
		`- # apply FSDG patches`
		`- local _patch`
		`- for _patch in "$srcdir"/????-FSDG-*.patch; do`
		`- patch -Np1 -i "$_patch"`
		`- done`
		`-`
		`- # apply notsystemd patches`
		`- for _patch in "$srcdir/$pkgname-$pkgver"/????-*.patch; do`
		`- patch -Np1 -i "$_patch"`
		`- done`
		`- }`
		`-`
		`- build() {`
		`- local timeservers=({0..3}.arch.pool.ntp.org)`
		`-`
		`- if [ "$CARCH" = "armv7h" ]; then`
		`- LDFLAGS+=" -Wl,-fuse-ld=bfd"`
		`- CFLAGS+=" -fno-lto"`
		`- CXXFLAGS+=" -fno-lto"`
		`- fi`
		`-`
		`- local meson_options=(`
		`- -Daudit=false`
		`- -Dima=false`
		`- -Dlz4=true`
		`-`
		`- -Ddbuspolicydir=/usr/share/dbus-1/system.d`
		`- -Ddefault-dnssec=no`
		`- # TODO(dreisner): consider changing this to unified`
		`- -Ddefault-hierarchy=hybrid`
		`- -Ddefault-kill-user-processes=false`
		`- -Dfallback-hostname='parabola'`
		`- -Dntp-servers="${timeservers[*]}"`
		`- -Drpmmacrosdir=no`
		`- -Dsysvinit-path=`
		`- -Dsysvrcnd-path=`
		`- )`
		`- if [ "$CARCH" != "armv7h" ]; then`
		`- meson_options+=(-Dgnuefi=true)`
		`- fi`
		`-`
		`- arch-meson "$_pkgbase-stable" build "${meson_options[@]}"`
		`-`
		`- ninja -C build`
		`-`
		`- # Go ahead and split the package now. It's easier this way, because`
		`- # we can use mv instead of awkward, error-prone rm/cp pairs.`
		`- rm -rf "$srcdir/dest"`
		`-`
		`- # Put things in the main systemd package by default`
		`- DESTDIR="$srcdir/dest/systemd" ninja -C build install`
		`-`
		`- install -dm755 "$srcdir/dest/common"/usr/lib/systemd`
		`- mv -T "$srcdir/dest"/{systemd,common}/usr/lib/systemd/libsystemd-shared-${pkgver%%.*}.so`
		`-`
		`- install -dm755 "$srcdir/dest/libsystemd"/usr/{lib/pkgconfig,share/man/man3,include}`
		`- mv -T "$srcdir/dest"/{systemd,libsystemd}/usr/include/systemd`
		`- mv -T "$srcdir/dest"/{systemd,libsystemd}/usr/lib/pkgconfig/libsystemd.pc`
		`- mv "$srcdir/dest"/systemd/usr/lib/libsystemd.so* -t "$srcdir/dest"/libsystemd/usr/lib/`
		`- mv "$srcdir/dest"/systemd/usr/share/man/man3/{SD,sd}* -t "$srcdir/dest"/libsystemd/usr/share/man/man3/`
		`-`
		`- install -dm755 "$srcdir/dest/libudev"/usr/{lib/pkgconfig,share/man/man3,include}`
		`- mv -T "$srcdir/dest"/{systemd,libudev}/usr/include/libudev.h`
		`- mv -T "$srcdir/dest"/{systemd,libudev}/usr/lib/pkgconfig/libudev.pc`
		`- mv "$srcdir/dest"/systemd/usr/lib/libudev.so* -t "$srcdir/dest"/libudev/usr/lib/`
		`- mv "$srcdir/dest"/systemd/usr/share/man/man3/udev -t "$srcdir/dest"/libudev/usr/share/man/man3/`
		`-`
		`- install -dm755 "$srcdir/dest/udev"/{etc,usr/lib}`
		`- mv -T "$srcdir/dest"/{systemd,udev}/etc/udev/`
		`- mv -T "$srcdir/dest"/{systemd,udev}/usr/lib/udev/`
		`- while read -d '' -r file; do`
		`- install -dm755 "$srcdir/dest/udev/${file%/*}"`
		`- mv -T "$srcdir/dest/systemd/$file" "$srcdir/dest/udev/$file"`
		`- done < <(find "$srcdir/dest/systemd" $ -name 'udev' -o -name 'hwdb' $ -printf '%P\0')`
		`-`
		`- local nssmodule`
		`- for nssmodule in systemd myhostname mymachines resolve; do`
		`- install -dm755 "$srcdir/dest/nss-$nssmodule"/usr/{lib,share/man/man8}`
		`- mv -t "$srcdir/dest"/nss-$nssmodule/usr/share/man/man8/ -- \`
		`- "$srcdir/dest"/systemd/usr/share/man/man8/nss-$nssmodule.8 \`
		`- "$srcdir/dest"/systemd/usr/share/man/man8/libnss_$nssmodule.*.8`
		`- mv "$srcdir/dest"/systemd/usr/lib/libnss_$nssmodule.so* -t "$srcdir/dest"/nss-$nssmodule/usr/lib/`
		`- done`
		`-`
		`- install -dm755 "$srcdir/dest/systemd-sysvcompat"/usr/share/man/man8`
		`- mv "$srcdir/dest/systemd"/usr/share/man/man8/{halt,poweroff,reboot,runlevel,shutdown,telinit}.8 \`
		`- -t "$srcdir/dest/systemd-sysvcompat"/usr/share/man/man8`
		`-`
		`- rmdir "$srcdir/dest"/systemd/usr/{share/man/man3,lib/pkgconfig,include}`
		`- }`
		`-`
		`- check() {`
		`- cd build`
		`- meson test`
		`- }`
		`-`
		`- package_notsystemd() {`
		`- pkgdesc='system and service manager'`
		`- license=('LGPL2.1')`
		`- depends=('bash' 'dbus' 'kbd' 'kmod'`
		`- 'libsystemd' 'pam' 'libelf'`
		`- 'util-linux' 'pcre2')`
		`- depends+=("notsystemd-common=$pkgver-$pkgrel" 'udev')`
		`- provides=("systemd-tools=$_pkgver")`
		`- conflicts=('systemd-tools')`
		`- optdepends=('libmicrohttpd: remote journald capabilities'`
		`- 'quota-tools: kernel-level quota management'`
		`- 'systemd-sysvcompat: symlink package to provide sysvinit binaries'`
		`- 'polkit: allow administration as unprivileged user')`
		`- backup=(etc/pam.d/systemd-user`
		`- etc/systemd/coredump.conf`
		`- etc/systemd/journald.conf`
		`- etc/systemd/journal-remote.conf`
		`- etc/systemd/journal-upload.conf`
		`- etc/systemd/logind.conf`
		`- etc/systemd/system.conf`
		`- etc/systemd/timesyncd.conf`
		`- etc/systemd/resolved.conf`
		`- etc/systemd/user.conf)`
		`- install=systemd.install`
		`-`
		`- pkgdesc+=", modified to work with other init systems"`
		`- provides+=("${pkgname#not}=$_pkgver")`
		`- conflicts+=("${pkgname#not}")`
		`-`
		`- cp -rT -d --no-preserve=ownership,timestamp "$srcdir/dest/${pkgname#not}" "$pkgdir"`
		`-`
		`- # don't write units to /etc by default. some of these will be re-enabled on`
		`- # post_install.`
		`- rm -rv "$pkgdir"/etc/systemd/system/*`
		`-`
		`- # we'll create this on installation`
		`- rmdir "$pkgdir"/var/log/journal/remote`
		`-`
		`- # executable (symlinks) shipped with systemd-sysvcompat`
		`- rm "$pkgdir"/usr/bin/{halt,init,poweroff,reboot,runlevel,shutdown,telinit}`
		`-`
		`- # files shipped with systemd-resolvconf`
		`- rm "$pkgdir"/usr/{bin/resolvconf,share/man/man1/resolvconf.1}`
		`-`
		`- # avoid a potential conflict with [core]/filesystem`
		`- rm "$pkgdir"/usr/share/factory/etc/nsswitch.conf`
		`- sed -i '/^C \/etc\/nsswitch\.conf/d' "$pkgdir"/usr/lib/tmpfiles.d/etc.conf`
		`-`
		`- # add back tmpfiles.d/legacy.conf, normally omitted without sysv-compat`
		`- install -m0644 $_pkgbase-stable/tmpfiles.d/legacy.conf "$pkgdir"/usr/lib/tmpfiles.d`
		`-`
		`- # ship default policy to leave services disabled`
		`- echo 'disable *' >"$pkgdir"/usr/lib/systemd/system-preset/99-default.preset`
		`-`
		`- # add mkinitcpio hooks`
		`- install -D -m0644 initcpio-install-systemd "$pkgdir"/usr/lib/initcpio/install/systemd`
		`-`
		`- # ensure proper permissions for /var/log/journal`
		`- # The permissions are stored with named group by tar, so this works with`
		`- # users and groups populated by systemd-sysusers. This is only to prevent a`
		`- # warning from pacman as permissions are set by systemd-tmpfiles anyway.`
		`- install -d -o root -g systemd-journal -m 2755 "$pkgdir"/var/log/journal`
		`-`
		`- # match directory owner/group and mode from [extra]/polkit`
		`- install -d -o root -g 102 -m 0750 "$pkgdir"/usr/share/polkit-1/rules.d`
		`-`
		`- # add example bootctl configuration`
		`- install -D -m0644 parabola.conf "$pkgdir"/usr/share/systemd/bootctl/parabola.conf`
		`- install -D -m0644 loader.conf "$pkgdir"/usr/share/systemd/bootctl/loader.conf`
		`- install -D -m0644 splash-parabola.bmp "$pkgdir"/usr/share/systemd/bootctl/splash-parabola.bmp`
		`-`
		`- # pacman hooks`
		`- install -D -m0755 systemd-hook "$pkgdir"/usr/share/libalpm/scripts/systemd-hook`
		`- install -D -m0644 -t "$pkgdir"/usr/share/libalpm/hooks *.hook`
		`- rm -- "$pkgdir"/usr/share/libalpm/hooks/{udev,hwdb}`
		`-`
		`- # overwrite the systemd-user PAM configuration with our own`
		`- install -D -m0644 systemd-user.pam "$pkgdir"/etc/pam.d/systemd-user`
		`- }`
		`-`
		`- package_notsystemd-common() {`
		`- pkgdesc='systemd files shared between split packages'`
		`- license=('LGPL2.1')`
		`- depends=('acl' 'cryptsetup' 'libdbus' 'glibc' 'iptables' 'libcap'`
		`- 'libgcrypt' 'libidn' 'libseccomp' 'libsystemd.so'`
		`- 'libudev.so' 'libblkid.so' 'libmount.so' 'libuuid.so' 'lz4'`
		`- 'xz')`
		`-`
		`- pkgdesc="not${pkgdesc}"`
		`- conflicts+=("${pkgname#not}")`
		`-`
		`- cp -rT -d --no-preserve=ownership,timestamp "$srcdir/dest/${pkgname#notsystemd-}" "$pkgdir"`
		`- }`
		`-`
		`- package_notsystemd-udev() {`
		`- pkgdesc='Userspace device file manager'`
		`- license=('GPL2') # NB: different than the rest`
		`- depends=("notsystemd-common=$pkgver-$pkgrel" 'systemd-libudev'`
		`- 'hwids' 'kmod' 'util-linux' 'zlib')`
		`- backup=(etc/udev/udev.conf)`
		`-`
		`- provides+=("${pkgname#notsystemd-}=$_pkgver")`
		`- conflicts+=("${pkgname#notsystemd-}")`
		`-`
		`- provides+=("${pkgname#not}=$_pkgver")`
		`- conflicts+=("${pkgname#not}")`
		`-`
		`- cp -rT -d --no-preserve=ownership,timestamp "$srcdir/dest/${pkgname#notsystemd-}" "$pkgdir"`
		`-`
		`- # add mkinitcpio hooks`
		`- install -D -m0644 initcpio-install-udev "$pkgdir"/usr/lib/initcpio/install/udev`
		`- install -D -m0644 initcpio-hook-udev "$pkgdir"/usr/lib/initcpio/hooks/udev`
		`-`
		`- # pacman hooks`
		`- install -D -m0755 udev-hook "$pkgdir"/usr/share/libalpm/scripts/udev-hook`
		`- install -D -m0644 -t "$pkgdir"/usr/share/libalpm/hooks {udev,hwdb}.hook`
		`- }`

nonsystemd/notsystemd/initcpio-hook-udev

file removed

-22

		`@@ -1,22 +0,0 @@`
		`- #!/usr/bin/ash`
		`-`
		`- run_earlyhook() {`
		`- kmod static-nodes --format=tmpfiles --output=/run/tmpfiles.d/kmod.conf`
		`- systemd-tmpfiles --prefix=/dev --create --boot`
		`- /usr/lib/systemd/systemd-udevd --daemon --resolve-names=never`
		`- udevd_running=1`
		`- }`
		`-`
		`- run_hook() {`
		`- msg ":: Triggering uevents..."`
		`- udevadm trigger --action=add --type=subsystems`
		`- udevadm trigger --action=add --type=devices`
		`- udevadm settle`
		`- }`
		`-`
		`- run_cleanuphook() {`
		`- udevadm control --exit`
		`- udevadm info --cleanup-db`
		`- }`
		`-`
		`- # vim: set ft=sh ts=4 sw=4 et:`

nonsystemd/notsystemd/initcpio-install-systemd

file removed

-202

		`@@ -1,202 +0,0 @@`
		`- #!/bin/bash`
		`-`
		`- strip_quotes() {`
		`- local len=${#1} quotes=$'[\'"]' str=${!1}`
		`-`
		`- if [[ ${str:0:1} = ${str: -1} && ${str:0:1} = $quotes ]]; then`
		`- printf -v "$1" %s "${str:1:-1}"`
		`- fi`
		`- }`
		`-`
		`- add_udev_rule() {`
		`- # Add an udev rules file to the initcpio image. Dependencies on binaries`
		`- # will be discovered and added.`
		`- # $1: path to rules file (or name of rules file)`
		`-`
		`- local rules= rule= key= value= binary=`
		`-`
		`- rules=$(PATH=/usr/lib/udev/rules.d:/lib/udev/rules.d type -P "$1")`
		`- if [[ -z $rules ]]; then`
		`- # complain about not found rules`
		`- return 1`
		`- fi`
		`-`
		`- add_file "$rules"`
		`-`
		`- while IFS=, read -ra rule; do`
		`- # skip empty lines, comments`
		`- [[ -z $rule \|\| $rule = @(+([[:space:]])\|#*) ]] && continue`
		`-`
		`- for pair in "${rule[@]}"; do`
		`- IFS=' =' read -r key value <<< "$pair"`
		`- case $key in`
		`- RUN@({program}\|+)\|IMPORT{program}\|ENV{REMOVE_CMD})`
		`- strip_quotes 'value'`
		`- # just take the first word as the binary name`
		`- binary=${value%% *}`
		`- [[ ${binary:0:1} == '$' ]] && continue`
		`- if [[ ${binary:0:1} != '/' ]]; then`
		`- binary=$(PATH=/usr/lib/udev:/lib/udev type -P "$binary")`
		`- fi`
		`- add_binary "$binary"`
		`- ;;`
		`- esac`
		`- done`
		`- done <"$rules"`
		`- }`
		`-`
		`- add_systemd_unit() {`
		`- # Add a systemd unit file to the initcpio image. Hard dependencies on binaries`
		`- # and other unit files will be discovered and added.`
		`- # $1: path to rules file (or name of rules file)`
		`-`
		`- local unit= rule= entry= key= value= binary= dep=`
		`-`
		`- unit=$(PATH=/usr/lib/systemd/system:/lib/systemd/system type -P "$1")`
		`- if [[ -z $unit ]]; then`
		`- # complain about not found unit file`
		`- return 1`
		`- fi`
		`-`
		`- add_file "$unit"`
		`-`
		`- while IFS='=' read -r key values; do`
		`- read -ra values <<< "$values"`
		`-`
		`- case $key in`
		`- Requires\|OnFailure)`
		`- # only add hard dependencies (not Wants)`
		`- map add_systemd_unit "${values[@]}"`
		`- ;;`
		`- Exec*)`
		`- # don't add binaries unless they are required`
		`- if [[ ${values[0]:0:1} != '-' ]]; then`
		`- add_binary "${values[0]}"`
		`- fi`
		`- ;;`
		`- esac`
		`-`
		`- done <"$unit"`
		`-`
		`- # preserve reverse soft dependency`
		`- for dep in {/usr,}/lib/systemd/system/.wants/${unit##/}; do`
		`- if [[ -L $dep ]]; then`
		`- add_symlink "$dep"`
		`- fi`
		`- done`
		`-`
		`- # add hard dependencies`
		`- if [[ -d $unit.requires ]]; then`
		`- for dep in "$unit".requires/*; do`
		`- add_systemd_unit ${dep##*/}`
		`- done`
		`- fi`
		`- }`
		`-`
		`- add_systemd_drop_in() {`
		`- local unit=$1 dropin_name=$2`
		`-`
		`- mkdir -p "$BUILDROOT/etc/systemd/system/$unit.d"`
		`- cat >"$BUILDROOT/etc/systemd/system/$unit.d/$2.conf"`
		`- }`
		`-`
		`- build() {`
		`- local rules unit`
		`-`
		`- # from base`
		`- add_binary /bin/mount`
		`- add_binary /usr/bin/kmod /usr/bin/modprobe`
		`- add_binary /usr/lib/systemd/systemd /init`
		`- add_binary /usr/bin/sulogin`
		`-`
		`- map add_binary \`
		`- /usr/bin/systemd-tmpfiles \`
		`- /usr/lib/systemd/systemd-hibernate-resume \`
		`- /usr/lib/systemd/systemd-shutdown \`
		`- /usr/lib/systemd/systemd-sulogin-shell \`
		`- /usr/lib/systemd/system-generators/systemd-fstab-generator \`
		`- /usr/lib/systemd/system-generators/systemd-gpt-auto-generator \`
		`- /usr/lib/systemd/system-generators/systemd-hibernate-resume-generator`
		`-`
		`- # for journalctl in emergency shell`
		`- add_binary journalctl`
		`-`
		`- # udev rules and systemd units`
		`- map add_udev_rule "$rules" \`
		`- 50-udev-default.rules \`
		`- 60-persistent-storage.rules \`
		`- 64-btrfs.rules \`
		`- 80-drivers.rules \`
		`- 99-systemd.rules`
		`-`
		`- map add_systemd_unit \`
		`- initrd-cleanup.service \`
		`- initrd-fs.target \`
		`- initrd-parse-etc.service \`
		`- initrd-root-fs.target \`
		`- initrd-root-device.target \`
		`- initrd-switch-root.service \`
		`- initrd-switch-root.target \`
		`- initrd-udevadm-cleanup-db.service \`
		`- initrd.target \`
		`- kmod-static-nodes.service \`
		`- local-fs.target \`
		`- local-fs-pre.target \`
		`- paths.target \`
		`- reboot.target \`
		`- slices.target \`
		`- sockets.target \`
		`- swap.target \`
		`- systemd-fsck@.service \`
		`- systemd-hibernate-resume@.service \`
		`- systemd-journald.service \`
		`- systemd-journald-audit.socket \`
		`- systemd-journald-dev-log.socket \`
		`- systemd-modules-load.service \`
		`- systemd-tmpfiles-setup-dev.service \`
		`- systemd-udev-trigger.service \`
		`- systemd-udevd-control.socket \`
		`- systemd-udevd-kernel.socket \`
		`- systemd-udevd.service \`
		`- timers.target \`
		`- rescue.target \`
		`- emergency.target`
		`-`
		`- add_symlink "/usr/lib/systemd/system/default.target" "initrd.target"`
		`- add_symlink "/usr/lib/systemd/system/ctrl-alt-del.target" "reboot.target"`
		`-`
		`- add_binary "$(readlink -f /usr/lib/libnss_files.so)"`
		`- printf '%s\n' >"$BUILDROOT/etc/nsswitch.conf" \`
		`- 'passwd: files' \`
		`- 'group: files' \`
		`- 'shadow: files'`
		`-`
		`- echo "root:x:0:0:root:/:/bin/sh" >"$BUILDROOT/etc/passwd"`
		`- echo "root:x:0:root" >"$BUILDROOT/etc/group"`
		`- echo "root::::::::" >"$BUILDROOT/etc/shadow"`
		`-`
		`- add_systemd_drop_in systemd-udevd.service resolve-names <<EOF`
		`- [Service]`
		`- ExecStart=`
		`- ExecStart=/usr/lib/systemd/systemd-udevd --resolve-names=never`
		`- EOF`
		`-`
		`- add_dir "/etc/modules-load.d"`
		`- (`
		`- . "$_f_config"`
		`- set -f`
		`- printf '%s\n' ${MODULES[@]} >"$BUILDROOT/etc/modules-load.d/MODULES.conf"`
		`- )`
		`- }`
		`-`
		`- help() {`
		`- cat <<HELPEOF`
		`- This will install a basic systemd setup in your initramfs, and is meant to`
		`- replace the 'base', 'usr', 'udev' and 'resume' hooks. Other hooks with runtime`
		`- components will need to be ported, and will not work as intended. You also may`
		`- wish to still include the 'base' hook (before this hook) to ensure that a`
		`- rescue shell exists on your initramfs.`
		`- HELPEOF`
		`- }`
		`-`
		`- # vim: set ft=sh ts=4 sw=4 et:`

nonsystemd/notsystemd/initcpio-install-udev

file removed

-29

		`@@ -1,29 +0,0 @@`
		`- #!/bin/bash`
		`-`
		`- build() {`
		`- local rules tool`
		`-`
		`- add_binary /usr/lib/systemd/systemd-udevd`
		`- add_binary /usr/bin/udevadm`
		`- add_binary /usr/bin/systemd-tmpfiles`
		`-`
		`- for rules in 50-udev-default.rules 60-persistent-storage.rules 64-btrfs.rules 80-drivers.rules; do`
		`- add_file "/usr/lib/udev/rules.d/$rules"`
		`- done`
		`- for tool in ata_id scsi_id; do`
		`- add_file "/usr/lib/udev/$tool"`
		`- done`
		`-`
		`- add_runscript`
		`- }`
		`-`
		`- help() {`
		`- cat <<HELPEOF`
		`- This hook adds the udev daemon to the initramfs, allowing for dynamic loading`
		`- of modules and reliable detection of the root device via tags (e.g. UUID or`
		`- LABEL). Do not remove this hook unless you are using the systemd hook, or you`
		`- know what you're doing.`
		`- HELPEOF`
		`- }`
		`-`
		`- # vim: set ft=sh ts=4 sw=4 et:`

nonsystemd/notsystemd/loader.conf

file removed

-1

		`@@ -1,1 +0,0 @@`
		`- default parabola`

nonsystemd/notsystemd/parabola.conf

file removed

-7

		`@@ -1,7 +0,0 @@`
		`- ## This is just an example config file.`
		`- ## Please edit the paths and kernel parameters according to your system.`
		`-`
		`- title Parabola GNU/Linux-libre`
		`- linux /vmlinuz-linux-libre`
		`- initrd /initramfs-linux-libre.img`
		`- options root=PARTUUID=XXXX rootfstype=XXXX add_efi_memmap`

nonsystemd/notsystemd/splash-parabola.bmp

file removed

nonsystemd/notsystemd/systemd-binfmt.hook

file removed

-10

		`@@ -1,10 +0,0 @@`
		`- [Trigger]`
		`- Type = File`
		`- Operation = Install`
		`- Operation = Upgrade`
		`- Target = usr/lib/binfmt.d/*.conf`
		`-`
		`- [Action]`
		`- Description = Registering binary formats...`
		`- When = PostTransaction`
		`- Exec = /usr/share/libalpm/scripts/systemd-hook binfmt`

nonsystemd/notsystemd/systemd-catalog.hook

file removed

-11

		`@@ -1,11 +0,0 @@`
		`- [Trigger]`
		`- Type = File`
		`- Operation = Install`
		`- Operation = Upgrade`
		`- Operation = Remove`
		`- Target = usr/lib/systemd/catalog/*`
		`-`
		`- [Action]`
		`- Description = Updating journal message catalog...`
		`- When = PostTransaction`
		`- Exec = /usr/share/libalpm/scripts/systemd-hook catalog`

nonsystemd/notsystemd/systemd-daemon-reload.hook

file removed

-11

		`@@ -1,11 +0,0 @@`
		`- [Trigger]`
		`- Type = File`
		`- Operation = Install`
		`- Operation = Upgrade`
		`- Operation = Remove`
		`- Target = usr/lib/systemd/system/*`
		`-`
		`- [Action]`
		`- Description = Reloading system manager configuration...`
		`- When = PostTransaction`
		`- Exec = /usr/share/libalpm/scripts/systemd-hook daemon-reload`

nonsystemd/notsystemd/systemd-hook

file removed

-23

		`@@ -1,23 +0,0 @@`
		`- #!/bin/sh -e`
		`-`
		`- systemd_live() {`
		`- if [ ! -d /run/systemd/system ]; then`
		`- echo >&2 " Skipped: Current root is not booted."`
		`- exit 0`
		`- fi`
		`- }`
		`-`
		`- case $1 in`
		`- catalog) /usr/bin/journalctl --update-catalog ;;`
		`- update) touch -c /usr ;;`
		`- sysusers) /usr/bin/systemd-sysusers ;;`
		`- tmpfiles) /usr/bin/systemd-tmpfiles --create ;;`
		`-`
		`- daemon-reload) systemd_live; /usr/bin/systemctl daemon-reload ;;`
		`- binfmt) systemd_live; /usr/lib/systemd/systemd-binfmt ;;`
		`- sysctl) systemd_live; /usr/lib/systemd/systemd-sysctl ;;`
		`-`
		`- *) echo >&2 " Invalid operation '$1'"; exit 1 ;;`
		`- esac`
		`-`
		`- exit 0`

nonsystemd/notsystemd/systemd-hwdb.hook

file removed

-11

		`@@ -1,11 +0,0 @@`
		`- [Trigger]`
		`- Type = File`
		`- Operation = Install`
		`- Operation = Upgrade`
		`- Operation = Remove`
		`- Target = usr/lib/udev/hwdb.d/*`
		`-`
		`- [Action]`
		`- Description = Updating udev hardware database...`
		`- When = PostTransaction`
		`- Exec = /usr/share/libalpm/scripts/udev-hook hwdb`

nonsystemd/notsystemd/systemd-sysctl.hook

file removed

-10

		`@@ -1,10 +0,0 @@`
		`- [Trigger]`
		`- Type = File`
		`- Operation = Install`
		`- Operation = Upgrade`
		`- Target = usr/lib/sysctl.d/*.conf`
		`-`
		`- [Action]`
		`- Description = Applying kernel sysctl settings...`
		`- When = PostTransaction`
		`- Exec = /usr/share/libalpm/scripts/systemd-hook sysctl`

nonsystemd/notsystemd/systemd-sysusers.hook

file removed

-10

		`@@ -1,10 +0,0 @@`
		`- [Trigger]`
		`- Type = File`
		`- Operation = Install`
		`- Operation = Upgrade`
		`- Target = usr/lib/sysusers.d/*.conf`
		`-`
		`- [Action]`
		`- Description = Creating system user accounts...`
		`- When = PostTransaction`
		`- Exec = /usr/share/libalpm/scripts/systemd-hook sysusers`

nonsystemd/notsystemd/systemd-tmpfiles.hook

file removed

-10

		`@@ -1,10 +0,0 @@`
		`- [Trigger]`
		`- Type = File`
		`- Operation = Install`
		`- Operation = Upgrade`
		`- Target = usr/lib/tmpfiles.d/*.conf`
		`-`
		`- [Action]`
		`- Description = Creating temporary files...`
		`- When = PostTransaction`
		`- Exec = /usr/share/libalpm/scripts/systemd-hook tmpfiles`

nonsystemd/notsystemd/systemd-udev-reload.hook

file removed

-11

		`@@ -1,11 +0,0 @@`
		`- [Trigger]`
		`- Type = File`
		`- Operation = Install`
		`- Operation = Upgrade`
		`- Operation = Remove`
		`- Target = usr/lib/udev/rules.d/*`
		`-`
		`- [Action]`
		`- Description = Reloading device manager configuration...`
		`- When = PostTransaction`
		`- Exec = /usr/share/libalpm/scripts/udev-hook udev-reload`

nonsystemd/notsystemd/systemd-update.hook

file removed

-11

		`@@ -1,11 +0,0 @@`
		`- [Trigger]`
		`- Type = File`
		`- Operation = Install`
		`- Operation = Upgrade`
		`- Operation = Remove`
		`- Target = usr/`
		`-`
		`- [Action]`
		`- Description = Arming ConditionNeedsUpdate...`
		`- When = PostTransaction`
		`- Exec = /usr/share/libalpm/scripts/systemd-hook update`

nonsystemd/notsystemd/systemd-user.pam

file removed

-5

		`@@ -1,5 +0,0 @@`
		`- # Used by systemd --user instances.`
		`-`
		`- account include system-login`
		`- session required pam_loginuid.so`
		`- session include system-login`

nonsystemd/notsystemd/systemd.install

file removed

-99

		`@@ -1,99 +0,0 @@`
		`- #!/bin/bash`
		`-`
		`- sd_booted() {`
		`- [[ -d run/systemd/system && ! -L run/systemd/system ]]`
		`- }`
		`-`
		`- add_journal_acls() {`
		`- # ignore errors, since the filesystem might not support ACLs`
		`- setfacl -Rnm g:wheel:rx,d:g:wheel:rx,g:adm:rx,d:g:adm:rx var/log/journal/ 2>/dev/null`
		`- :`
		`- }`
		`-`
		`- post_common() {`
		`- systemd-sysusers`
		`- journalctl --update-catalog`
		`- }`
		`-`
		`- _216_2_changes() {`
		`- echo ':: Coredumps are handled by systemd by default. Collection behavior can be'`
		`- echo ' tuned in /etc/systemd/coredump.conf.'`
		`- }`
		`-`
		`- _219_2_changes() {`
		`- if mkdir -m2755 var/log/journal/remote 2>/dev/null; then`
		`- chgrp systemd-journal-remote var/log/journal/remote`
		`- fi`
		`- }`
		`-`
		`- _219_4_changes() {`
		`- if ! systemctl is-enabled -q remote-fs.target; then`
		`- systemctl enable -q remote-fs.target`
		`- fi`
		`- }`
		`-`
		`- _230_1_changes() {`
		`- echo ':: systemd-bootchart is no longer included with systemd'`
		`- }`
		`-`
		`- _232_8_changes() {`
		`- # paper over possible effects of CVE-2016-10156`
		`- local stamps=(/var/lib/systemd/timers/*.timer)`
		`-`
		`- if [[ -f ${stamps[0]} ]]; then`
		`- chmod 0644 "${stamps[@]}"`
		`- fi`
		`- }`
		`-`
		`- _233_75_3_changes() {`
		`- # upstream installs services to /etc, which we remove`
		`- # to keep bus activation we re-enable systemd-resolved`
		`- if systemctl is-enabled -q systemd-resolved.service; then`
		`- systemctl reenable systemd-resolved.service 2>/dev/null`
		`- fi`
		`- }`
		`-`
		`- post_install() {`
		`- systemd-machine-id-setup`
		`-`
		`- post_common "$@"`
		`-`
		`- add_journal_acls`
		`-`
		`- # enable some services by default, but don't track them`
		`- systemctl enable getty@tty1.service remote-fs.target`
		`-`
		`- echo ":: Append 'init=/usr/lib/systemd/systemd' to your kernel command line in your"`
		`- echo " bootloader to replace sysvinit with systemd, or install systemd-sysvcompat"`
		`-`
		`- # group 'systemd-journal-remote' is created by systemd-sysusers`
		`- mkdir -m2755 var/log/journal/remote`
		`- chgrp systemd-journal-remote var/log/journal/remote`
		`- }`
		`-`
		`- post_upgrade() {`
		`- post_common "$@"`
		`-`
		`- # don't reexec if the old version is 231-1 or 231-2.`
		`- # https://github.com/systemd/systemd/commit/bd64d82c1c`
		`- if [[ $1 != 231-[12] ]] && sd_booted; then`
		`- systemctl --system daemon-reexec`
		`- fi`
		`-`
		`- local v upgrades=(`
		`- 216-2`
		`- 219-2`
		`- 219-4`
		`- 230-1`
		`- 232-8`
		`- 233.75-3`
		`- )`
		`-`
		`- for v in "${upgrades[@]}"; do`
		`- if [[ $(vercmp "$v" "$2") -eq 1 ]]; then`
		`- "_${v//[.-]/_}_changes"`
		`- fi`
		`- done`
		`- }`
		`-`
		`- # vim:set ts=2 sw=2 et:`

nonsystemd/notsystemd/udev-hook

file removed

-18

		`@@ -1,18 +0,0 @@`
		`- #!/bin/sh -e`
		`-`
		`- udevd_live() {`
		`- if [ ! -d /run/udev ]; then`
		`- echo >&2 " Skipped: Device manager is not running."`
		`- exit 0`
		`- fi`
		`- }`
		`-`
		`- case $1 in`
		`- hwdb) /usr/bin/systemd-hwdb --usr update ;;`
		`-`
		`- udev-reload) udevd_live; /usr/bin/udevadm control --reload ;;`
		`-`
		`- *) echo >&2 " Invalid operation '$1'"; exit 1 ;;`
		`- esac`
		`-`
		`- exit 0`

nonsystemd/openrc-desktop/PKGBUILD

file removed

-174

		`@@ -1,174 +0,0 @@`
		`- # Maintainer (Artix): artoo <artoo@cromnix.org>`
		`- # Maintainer: Omar Vega Ramos <ovruni@gnu.org.pe>`
		`- # Maintainer: David P <megver83@parabola.nu>`
		`-`
		`- pkgver=20201202 # date +%Y%m%d`
		`- _commit=5cf13c1eee7fdb74078d79a2c85d1fe2fdde192c`
		`- _url="https://raw.githubusercontent.com/gentoo/gentoo/${_commit}"`
		`-`
		`- pkgbase=openrc-desktop`
		`- pkgname=('acpid-openrc'`
		`- 'alsa-utils-openrc'`
		`- 'avahi-openrc'`
		`- 'bluez-openrc'`
		`- 'displaymanager-openrc'`
		`- 'gpm-openrc'`
		`- 'wpa_supplicant-openrc'`
		`- 'chrony-openrc'`
		`- 'tlp-openrc')`
		`- pkgrel=1`
		`- arch=('any')`
		`- url='https://github.com/gentoo/gentoo'`
		`- license=('GPL2')`
		`- groups=('openrc-desktop')`
		`- source=('acpid.confd'`
		`- 'acpid.initd'`
		`- "alsasound.confd::${_url}/media-sound/alsa-utils/files/alsasound.confd-r4"`
		`- "alsasound.initd::${_url}/media-sound/alsa-utils/files/alsasound.initd-r8"`
		`- 'avahi-daemon.initd'`
		`- 'avahi-dnsconfd.initd'`
		`- 'autoipd-openrc.sh'`
		`- 'bluetoothd.initd'`
		`- 'xdm.confd'`
		`- 'xdm.initd'`
		`- 'xdm-setup.initd'`
		`- 'startDM.sh'`
		`- "gpm.confd::${_url}/sys-libs/gpm/files/gpm.conf.d"`
		`- "gpm.initd::${_url}/sys-libs/gpm/files/gpm.rc6-2"`
		`- "wpa_supplicant.confd::${_url}/net-wireless/wpa_supplicant/files/wpa_supplicant-conf.d"`
		`- "wpa_supplicant.initd::${_url}/net-wireless/wpa_supplicant/files/wpa_supplicant-init.d"`
		`- "${_url}/net-wireless/wpa_supplicant/files/wpa_cli.sh"`
		`- "chronyd.confd::${_url}/net-misc/chrony/files/chronyd.conf-r1"`
		`- "chronyd.initd::${_url}/net-misc/chrony/files/chronyd.init-r2"`
		`- "tlp.initd::https://git.hyperbola.info:50100/packages/community.git/plain/tlp/tlp.initd?id=241231d55f767d87e9cc883feb84b7f42a44434e")`
		`- sha256sums=('3755d4eb8bb64a1304e5defedb949305ac550565da36fe4f94d5f31beee821ba'`
		`- '5dcf5721a129b3782c13fc453853c390c34e2ad4ee00706388ce014454b063ee'`
		`- 'd1c55400b701a72dcb8bb85e016b5013fa3eb6a2766ffc20dae278d0ee4c1a43'`
		`- '37495f08f2aeb934180c1fb0ef6528f8108a41b614be1fe4f596c783871ce68b'`
		`- '876788303553fe773e64917f76f0208f5e8adf7b91d4af24aa9d6a68a147d646'`
		`- 'e128576d72981e402ff106bb481108ab6d5ba941ab1b0f5f53e96a7831fc1d15'`
		`- '064a4cedc00f67e93a6f2ef99489e2614305a673a75a2135010283e99da6d6bf'`
		`- 'b80a38737be3a1112bc52d2474e8ece3adb405a92623cfb36c3df5aed99ebf51'`
		`- '24dc07139087bd2261eb2de268ae5228a37a4db4fc695a7d9e647d95c36044df'`
		`- 'a65d8c3a0210e4ec336f6b19900122d3a27c097893773aaf5c7de91d96399b36'`
		`- 'cb49240e32b5bb22d7764890e765c94276ec66b597caeacd5121618f614c3bec'`
		`- '28dbefc67b332712273047ff0a5776b379217368f9a572665b43c2f486591058'`
		`- '73e7483fdc4b12ab4225a4cb13bbe7da71b07b9e69b17e3a6a4c63cb5e2287c8'`
		`- 'b48fd8ef0c4e64ca3f3ada72e8e2148a276f86bf3cbb1a165504058bd15385c1'`
		`- '27833f60a091464612e74e6171cc98c3e3f994e2fde0ccc4535dd0d84ed041fa'`
		`- '98985142371d39ea6294d757e85a3d3fc9fc21718063afbf81869e1d2ca648a7'`
		`- 'f3aa34b99a90213c53496f8ea014c487266338791f3526043a7fd97adc651fc6'`
		`- 'a55216d5bc267004ebfd16f3371acaf04953b9cfdbc55518b26c80492584f647'`
		`- 'fc2ff6922c4b64686bba9c6f482a64b2bebc1156d63e09f49adb0ffcfb240a1c'`
		`- '10428455ffe5812d45d9008f1cacbb5351b71566faf6329b8101ba71e213d36a')`
		`-`
		`- _inst_initd(){`
		`- install -Dm755 ${srcdir}/$1.initd ${pkgdir}/etc/init.d/$1`
		`-`
		`- local _sed_args=()`
		`- sed -e 's\|#!/sbin/openrc-run\|#!/usr/bin/openrc-run\|g' \`
		`- -e 's\|/var/run\|/run\|g' \`
		`- -e 's\|/usr/sbin\|/usr/bin\|g' \`
		`- -e 's\|/sbin\|/usr/bin\|g' \`
		`- -i ${pkgdir}/etc/init.d/$1`
		`- }`
		`-`
		`- _inst_confd(){`
		`- install -Dm755 ${srcdir}/$1.confd ${pkgdir}/etc/conf.d/$1`
		`- }`
		`-`
		`- package_acpid-openrc() {`
		`- pkgdesc="OpenRC acpid init script"`
		`- depends=('openrc' 'acpid')`
		`- backup=('etc/conf.d/acpid')`
		`-`
		`- _inst_confd 'acpid'`
		`- _inst_initd 'acpid'`
		`- }`
		`-`
		`- package_alsa-utils-openrc() {`
		`- pkgdesc="OpenRC alsa-utils init script"`
		`- depends=('openrc' 'alsa-utils')`
		`- backup=('etc/conf.d/alsasound')`
		`-`
		`- _inst_confd 'alsasound'`
		`- _inst_initd 'alsasound'`
		`- }`
		`-`
		`- package_avahi-openrc() {`
		`- pkgdesc="OpenRC avahi init script"`
		`- depends=('avahi' 'dbus-openrc')`
		`-`
		`- _inst_initd 'avahi-daemon'`
		`- _inst_initd 'avahi-dnsconfd'`
		`-`
		`- install -Dm755 autoipd-openrc.sh ${pkgdir}/usr/lib/netifrc/net/autoipd.sh`
		`- }`
		`-`
		`- package_bluez-openrc() {`
		`- pkgdesc="OpenRC bluez init script"`
		`- depends=('bluez' 'openrc')`
		`-`
		`- _inst_initd 'bluetoothd'`
		`- }`
		`-`
		`- package_displaymanager-openrc() {`
		`- pkgdesc="OpenRC display manager init script"`
		`- depends=('xorg-server' 'xorg-xinit' 'openrc')`
		`- backup=('etc/conf.d/xdm')`
		`- install=displaymanager.install`
		`-`
		`- _inst_confd 'xdm'`
		`- _inst_initd 'xdm'`
		`- _inst_initd 'xdm-setup'`
		`-`
		`- install -Dm755 "${srcdir}/startDM.sh" "${pkgdir}/etc/X11/startDM.sh"`
		`- }`
		`-`
		`- package_gpm-openrc() {`
		`- pkgdesc="OpenRC gpm init script"`
		`- depends=('openrc' 'gpm')`
		`- backup=('etc/conf.d/gpm')`
		`-`
		`- _inst_confd 'gpm'`
		`- _inst_initd 'gpm'`
		`- }`
		`-`
		`- package_wpa_supplicant-openrc() {`
		`- pkgdesc="OpenRC wpa_supplicant init script"`
		`- depends=('openrc' 'wpa_supplicant')`
		`- backup=('etc/conf.d/wpa_supplicant')`
		`-`
		`- _inst_confd 'wpa_supplicant'`
		`- _inst_initd 'wpa_supplicant'`
		`-`
		`- install -Dm755 "${srcdir}/wpa_cli.sh" "${pkgdir}/etc/wpa_supplicant/wpa_cli.sh"`
		`-`
		`- sed -e "s\|gentoo-release\|parabola-release\|" -i "${pkgdir}/etc/wpa_supplicant/wpa_cli.sh"`
		`- }`
		`-`
		`- package_chrony-openrc() {`
		`- pkgdesc="OpenRC chrony init script"`
		`- depends=('openrc' 'chrony')`
		`- backup=('etc/conf.d/chronyd')`
		`-`
		`- _inst_confd 'chronyd'`
		`- sed -e 's\|ARGS=".*"\|ARGS=""\|' \`
		`- -e 's\|CFGFILE=".*"\|CFGFILE="/etc/chrony.conf"\|' \`
		`- -i "${pkgdir}/etc/conf.d/chronyd"`
		`-`
		`- _inst_initd 'chronyd'`
		`- sed -e 's\|/sbin\|/usr/bin\|' \`
		`- -e 's\|/etc/chrony/\|/etc/\|' \`
		`- -i "${pkgdir}/etc/init.d/chronyd"`
		`- }`
		`-`
		`- package_tlp-openrc() {`
		`- pkgdesc="OpenRC tlp init script"`
		`- depends=('openrc' 'tlp')`
		`-`
		`- _inst_initd 'tlp'`
		`- sed -e 's\|/usr/sbin\|/usr/bin\|' \`
		`- -e 's\|/sbin/openrc-run\|/usr/bin/openrc-run\|' \`
		`- -i "${pkgdir}/etc/init.d/tlp"`
		`- }`

nonsystemd/openrc-desktop/avahi-dnsconfd.initd

file removed

-28

		`@@ -1,28 +0,0 @@`
		`- #!/usr/bin/openrc-run`
		`- # Copyright 1999-2007 Gentoo Foundation`
		`- # Distributed under the terms of the GNU General Public License v2`
		`-`
		`- extra_started_commands="reload"`
		`-`
		`- depend() {`
		`- need avahi-daemon`
		`- use net`
		`- }`
		`-`
		`- start() {`
		`- ebegin "Starting avahi-dnsconfd"`
		`- /usr/bin/avahi-dnsconfd -D`
		`- eend $?`
		`- }`
		`-`
		`- stop() {`
		`- ebegin "Stopping avahi-dnsconfd"`
		`- /usr/bin/avahi-dnsconfd -k`
		`- eend $?`
		`- }`
		`-`
		`- reload() {`
		`- ebegin "Reloading avahi-dnsconfd"`
		`- /usr/bin/avahi-dnsconfd -r`
		`- eend $?`
		`- }`

nonsystemd/openrc-desktop/displaymanager.install

file removed

-3

		`@@ -1,3 +0,0 @@`
		`- post_install() {`
		`- echo " ==> Edit /etc/conf.d/xdm to set DM."`
		`- }`

nonsystemd/openrc-desktop/startDM.sh

file removed

-25

		`@@ -1,25 +0,0 @@`
		`- #!/bin/sh`
		`- # Copyright 1999-2011 Gentoo Foundation`
		`- # Distributed under the terms of the GNU General Public License, v2`
		`-`
		`- # We need to source /etc/profile for stuff like $LANG to work`
		`- # bug #10190.`
		`- . /etc/profile`
		`-`
		`- . /etc/init.d/functions.sh`
		`-`
		`- # Great new Gnome2 feature, AA`
		`- # We enable this by default`
		`- export GDK_USE_XFT=1`
		`-`
		`- export SVCNAME=xdm`
		`- EXEC="$(get_options service)"`
		`- NAME="$(get_options name)"`
		`- PIDFILE="$(get_options pidfile)"`
		`- START_STOP_ARGS="$(get_options start_stop_args)"`
		`-`
		`- start-stop-daemon --start --exec ${EXEC} \`
		`- ${NAME:+--name} ${NAME} ${PIDFILE:+--pidfile} ${PIDFILE} ${START_STOP_ARGS} \|\| \`
		`- eerror "ERROR: could not start the Display Manager"`
		`-`
		`- # vim:ts=4`

nonsystemd/openrc-desktop/xdm-setup.initd

file removed

-13

		`@@ -1,13 +0,0 @@`
		`- #!/usr/bin/openrc-run`
		`- # Copyright 1999-2009 Gentoo Foundation`
		`- # Distributed under the terms of the GNU General Public License v2`
		`-`
		`- depend() {`
		`- need localmount`
		`- }`
		`-`
		`- start() {`
		`- if get_bootparam "nox" ; then`
		`- touch /etc/.noxdm`
		`- fi`
		`- }`

nonsystemd/openrc-desktop/xdm.confd

file removed

-10

		`@@ -1,10 +0,0 @@`
		`- # We always try and start X on a static VT. The various DMs normally default`
		`- # to using VT7. If you wish to use the xdm init script, then you should ensure`
		`- # that the VT checked is the same VT your DM wants to use. We do this check to`
		`- # ensure that you haven't accidentally configured something to run on the VT`
		`- # in your /etc/inittab file so that you don't get a dead keyboard.`
		`- CHECKVT=7`
		`-`
		`- # What display manager do you use ? [ xdm \| gdm \| sddm \| gpe \| entrance \| lightdm \| lxdm ]`
		`- # NOTE: If this is set in /etc/rc.conf, that setting will override this one.`
		`- DISPLAYMANAGER="xdm"`

nonsystemd/openrc-desktop/xdm.initd

file removed

-132

		`@@ -1,132 +0,0 @@`
		`- #!/usr/bin/openrc-run`
		`- # Copyright 1999-2014 Gentoo Foundation`
		`- # Distributed under the terms of the GNU General Public License, v2`
		`-`
		`- depend() {`
		`- need localmount xdm-setup`
		`-`
		`- # this should start as early as possible`
		`- after bootmisc consolefont modules netmount`
		`- after readahead-list ypbind autofs openvpn gpm lircmd`
		`- after quota keymaps`
		`- before alsasound`
		`-`
		`- # Start before X`
		`- use elogind dbus xfs`
		`- }`
		`-`
		`- setup_dm() {`
		`- local MY_XDM`
		`-`
		`- MY_XDM=$(echo "${DISPLAYMANAGER}" \| tr '[:upper:]' '[:lower:]')`
		`-`
		`- NAME=`
		`- case "${MY_XDM}" in`
		`- entrance*)`
		`- EXE=/usr/bin/entrance`
		`- PIDFILE=/run/entrance.pid`
		`- ;;`
		`- gdm\|gnome)`
		`- EXE=/usr/bin/gdm`
		`- PIDFILE=/run/gdm/gdm.pid`
		`- START_STOP_ARGS="--background"`
		`- AUTOCLEAN_CGROUP="yes"`
		`- ;;`
		`- wdm)`
		`- EXE=/usr/bin/wdm`
		`- PIDFILE=`
		`- ;;`
		`- gpe)`
		`- EXE=/usr/bin/gpe-dm`
		`- PIDFILE=/run/gpe-dm.pid`
		`- ;;`
		`- lxdm)`
		`- EXE=/usr/bin/lxdm-binary`
		`- PIDFILE=/run/lxdm.pid`
		`- START_STOP_ARGS="--background"`
		`- ;;`
		`- lightdm)`
		`- EXE=/usr/bin/lightdm`
		`- PIDFILE=/run/lightdm.pid`
		`- START_STOP_ARGS="--background"`
		`- ;;`
		`- sddm)`
		`- EXE="/usr/bin/sddm"`
		`- START_STOP_ARGS="-m --background"`
		`- PIDFILE=/run/sddm.pid`
		`- ;;`
		`- *)`
		`- # first find out if there is such executable`
		`- EXE="$(command -v ${MY_XDM} 2>/dev/null)"`
		`- PIDFILE="/run/${MY_XDM}.pid"`
		`-`
		`- # warn user that he is doing sick things if the exe was not found`
		`- if [ -z "${EXE}" ]; then`
		`- echo "ERROR: Your XDM value is invalid."`
		`- echo " No ${MY_XDM} executable could be found on your system."`
		`- fi`
		`- ;;`
		`- esac`
		`-`
		`- if ! [ -x "${EXE}" ]; then`
		`- EXE=/usr/bin/xdm`
		`- PIDFILE=/run/xdm.pid`
		`- if ! [ -x "/usr/bin/xdm" ]; then`
		`- echo "ERROR: Please set your DISPLAYMANAGER variable in /etc/conf.d/xdm,"`
		`- echo " or install x11-apps/xdm package"`
		`- eend 255`
		`- fi`
		`- fi`
		`- }`
		`-`
		`- start() {`
		`- local EXE NAME PIDFILE AUTOCLEAN_CGROUP`
		`- setup_dm`
		`-`
		`- if [ -f /etc/.noxdm ]; then`
		`- einfo "Skipping ${EXE##*/}, /etc/.noxdm found or \"nox\" bootparam passed."`
		`- rm /etc/.noxdm`
		`- return 0`
		`- fi`
		`-`
		`- ebegin "Setting up ${EXE##*/}"`
		`-`
		`- # save the prefered DM`
		`- save_options "service" "${EXE}"`
		`- save_options "name" "${NAME}"`
		`- save_options "pidfile" "${PIDFILE}"`
		`- save_options "start_stop_args" "${START_STOP_ARGS}"`
		`- save_options "autoclean_cgroup" "${AUTOCLEAN_CGROUP:-no}"`
		`-`
		`- /etc/X11/startDM.sh`
		`- eend 0`
		`- }`
		`-`
		`- stop() {`
		`- local retval`
		`-`
		`- retval=0`
		`-`
		`- local myexe myname mypidfile myservice`
		`- myexe=$(get_options "service")`
		`- myname=$(get_options "name")`
		`- mypidfile=$(get_options "pidfile")`
		`- myservice=${myexe##*/}`
		`- yesno "${rc_cgroup_cleanup:-no}" \|\| rc_cgroup_cleanup=$(get_options "autoclean_cgroup")`
		`-`
		`- [ -z "${myexe}" ] && return 0`
		`-`
		`- ebegin "Stopping ${myservice}"`
		`-`
		`- if start-stop-daemon --quiet --test --stop --exec "${myexe}"; then`
		`- start-stop-daemon --stop --exec "${myexe}" --retry TERM/5/TERM/5 \`
		`- ${mypidfile:+--pidfile} ${mypidfile} \`
		`- ${myname:+--name} ${myname}`
		`- retval=${?}`
		`- fi`
		`-`
		`- eend ${retval} "Error stopping ${myservice}"`
		`- return ${retval}`
		`- }`
		`-`
		`- # vim: set ts=4 :`

nonsystemd/openrc-security/PKGBUILD

file removed

-136

		`@@ -1,136 +0,0 @@`
		`- # Maintainer: David P. <megver83@parabola.nu>`
		`- # Maintainer: Omar Vega Ramos <ovruni@gnu.org.pe>`
		`- # Contributor: Luke Shumaker <lukeshu@parabola.nu>`
		`-`
		`- pkgver=20201202`
		`- _commit=bfce6ac47f7b46a3d89a73b9a24c196713914d83`
		`- _url="https://raw.githubusercontent.com/gentoo/gentoo/${_commit}"`
		`-`
		`- pkgbase=openrc-security`
		`- pkgname=('apparmor-openrc'`
		`- 'iptables-openrc'`
		`- 'shorewall-openrc'`
		`- 'shorewall6-openrc'`
		`- 'firewalld-openrc'`
		`- 'nftables-openrc')`
		`- pkgrel=2`
		`- pkgdesc="OpenRC init scripts"`
		`- arch=('any')`
		`- url="https://github.com/gentoo/gentoo"`
		`- license=('GPL2')`
		`- groups=('openrc-security')`
		`- source=("iptables.confd::${_url}/net-firewall/iptables/files/iptables-1.4.13.confd"`
		`- "ip6tables.confd::${_url}/net-firewall/iptables/files/ip6tables-1.4.13.confd"`
		`- "iptables.initd::${_url}/net-firewall/iptables/files/iptables.init"`
		`- "ebtables.confd::${_url}/net-firewall/ebtables/files/ebtables.confd-r1"`
		`- "ebtables.initd::${_url}/net-firewall/ebtables/files/ebtables.initd-r1"`
		`- "firewalld.initd::${_url}/net-firewall/firewalld/files/firewalld.init"`
		`- "apparmor.initd::${_url}/sys-apps/apparmor/files/apparmor-init"`
		`- "shorewall.initd::${_url}/net-firewall/shorewall/files/shorewall.initd-r3"`
		`- "shorewall.confd::${_url}/net-firewall/shorewall/files/shorewall.confd-r1"`
		`- "shorewall6.initd::${_url}/net-firewall/shorewall/files/shorewall.initd-r3"`
		`- "shorewall6.confd::${_url}/net-firewall/shorewall/files/shorewall.confd-r1"`
		`- "nftables.shd::${_url}/net-firewall/nftables/files/libexec/nftables.sh"`
		`- "nftables.confd::${_url}/net-firewall/nftables/files/nftables.confd"`
		`- "nftables.initd::${_url}/net-firewall/nftables/files/nftables.init"`
		`- )`
		`- sha512sums=('bd67d53e997ea65755148ba071fe6e3856d6e604b9167c666900721bc3dc24f63d395bc33a1a34ae50f95e72760da630db1a8d35afc81ec5973e60ba5343dc70'`
		`- '8de9a5de4061bef217fbc07577688a8110f1116af7f3b936dfd18100a6a7a47ec6e70c456b24cf3432fb4f2034b741a487fe6af8d9740f174d51c6eb16945c6e'`
		`- '317c71bee98f5b1bbfd17ea961e5e268532c2320fc865b7876f7cc4e02a66b6a012fc336f8880045a83e101f161197c0a1d106220af6240407cebafbf38022db'`
		`- '088308eba077fcec35299c8aaad0492024173504a361c2ba7e29dce106888a78c72818a791f3d3655aed3f6df26a3319c42e2b2c54760cdbad036d46b89b97f3'`
		`- 'ceceaf33d6f6bfa89a5d81932e3ec76a26d09d67150efd3de587520ea47984f618d4fc55e799c58a2e5e236caec5bd81e2fde31a7e5aa328e629cdabbd29339b'`
		`- '457cda01449f38563e98e1db937fe1c50745eab91797f52687e3ab9f5d94dd42d129740ae6669e99666a3f096d631dd3a44e66010b638b31b9c6ba798362403e'`
		`- '4ee4747ec98a0828beb690bf5e01bc112d958bff4c68d60fc0cbb9f0707bd8daecc011dba3916aa6e6368f460eedce7f2ce42aad9ccea49a5d898dcae3d01148'`
		`- '4cf71fd8087fa6c81a2ef4845da108df08f03c63f5a1312e79ec7f32cdae0d14d4d21a2af2ab696cc9be3c6d9215f097461b46b398db2a18067987cac00e5771'`
		`- 'fee275ba8089b0abda5239edb06a3ab70c96acbbcd715c1a3aa5e92ba976294525c251b67b00d876e45f7c827767db45bd7623df42cc68c822234a7ea13d527b'`
		`- '4cf71fd8087fa6c81a2ef4845da108df08f03c63f5a1312e79ec7f32cdae0d14d4d21a2af2ab696cc9be3c6d9215f097461b46b398db2a18067987cac00e5771'`
		`- 'fee275ba8089b0abda5239edb06a3ab70c96acbbcd715c1a3aa5e92ba976294525c251b67b00d876e45f7c827767db45bd7623df42cc68c822234a7ea13d527b'`
		`- '6cb1ac0928ae2da5c69764d45c52a661a6d72698bb9edd6a603580d2f9bd82b59f2a2661e7569ade3a3b729459d115004f251ad6a5eac8cdf1d38c65bfa9349e'`
		`- '8370abcdc89fcd9da5dc7d1620be6afb4633b8bcd0a8a120b464cc1a7e1fab6f34956c293da3f6d3cbe1f7a2e03038fd0c94a614137ae5657d29ffdb5f3fa144'`
		`- 'ca761be0440945b21d5b002468baffb3299d0a3ac244aa895734dfdfaf442e7a73b757bcda99d958582064411d1b80b2cbcb4eb532bb219b4df407c9ed892661')`
		`-`
		`- _inst_initd(){`
		`- install -Dm755 ${srcdir}/$1.initd ${pkgdir}/etc/init.d/$1`
		`-`
		`- local _sed_args=()`
		`- sed -e 's\|#!/sbin/openrc-run\|#!/usr/bin/openrc-run\|g' \`
		`- -e 's\|/var/run\|/run\|g' \`
		`- -e 's\|/sbin\|/usr/bin\|g' \`
		`- -i ${pkgdir}/etc/init.d/$1`
		`- }`
		`-`
		`- _inst_confd(){`
		`- install -Dm755 ${srcdir}/$1.confd ${pkgdir}/etc/conf.d/$1`
		`- }`
		`-`
		`- package_iptables-openrc() {`
		`- pkgdesc="OpenRC iptables init script"`
		`- depends=('openrc' 'iptables')`
		`- backup=('etc/conf.d/iptables'`
		`- 'etc/conf.d/ip6tables'`
		`- 'etc/conf.d/ebtables')`
		`-`
		`- _inst_confd 'iptables'`
		`- _inst_initd 'iptables'`
		`-`
		`- _inst_confd 'ebtables'`
		`- _inst_initd 'ebtables'`
		`-`
		`- _inst_confd 'ip6tables'`
		`-`
		`- install -Dm755 "${srcdir}/iptables.initd" "${pkgdir}/etc/init.d/ip6tables"`
		`-`
		`- sed -e 's\|#!/sbin/openrc-run\|#!/usr/bin/openrc-run\|g' \`
		`- -e 's\|/var/run\|/run\|g' \`
		`- -e 's\|/sbin\|/usr/bin\|g' \`
		`- -i ${pkgdir}/etc/init.d/ip6tables`
		`- }`
		`-`
		`- package_firewalld-openrc() {`
		`- pkgdesc="OpenRC firewalld init script"`
		`- depends=('firewalld' 'openrc')`
		`-`
		`- _inst_initd 'firewalld'`
		`- sed -e 's\|/usr/sbin\|/usr/bin\|g' -i ${pkgdir}/etc/init.d/firewalld`
		`- }`
		`-`
		`- package_apparmor-openrc() {`
		`- pkgdesc="OpenRC apparmor init script"`
		`- depends=('apparmor' 'openrc')`
		`-`
		`- _inst_initd 'apparmor'`
		`- sed 's\|libexec\|lib/apparmor\|' -i ${pkgdir}/etc/init.d/apparmor`
		`- }`
		`-`
		`- package_shorewall-openrc() {`
		`- pkgdes="OpenRC shorewall init script"`
		`- depends=('shorewall' 'openrc')`
		`- backup=('etc/conf.d/shorewall')`
		`-`
		`- _inst_initd 'shorewall'`
		`- _inst_confd 'shorewall'`
		`- }`
		`-`
		`- package_shorewall6-openrc() {`
		`- pkgdes="OpenRC shorewall6 init script"`
		`- depends=('shorewall6' 'openrc')`
		`- backup=('etc/conf.d/shorewall6')`
		`-`
		`- _inst_initd 'shorewall6'`
		`- _inst_confd 'shorewall6'`
		`- sed -e 's\|/usr/sbin\|/usr/bin\|g' -i ${pkgdir}/etc/init.d/shorewall6`
		`- }`
		`-`
		`- package_nftables-openrc() {`
		`- pkgdes="OpenRC nftables init script"`
		`- depends=('nftables' 'openrc')`
		`- backup=('etc/conf.d/nftables')`
		`-`
		`- _inst_confd 'nftables'`
		`-`
		`- install -Dm755 "${srcdir}/nftables.shd" "${pkgdir}/usr/lib/nftables/nftables.sh"`
		`- _inst_initd 'nftables'`
		`- sed -e 's\|/sbin\|/usr/bin\|g' \`
		`- -e 's\|libexec\|lib\|g' \`
		`- -i "${pkgdir}/etc/init.d/nftables"`
		`- }`

nonsystemd/openrc/PKGBUILD

file modified

+3 -3

		`@@ -2,9 +2,9 @@`
		`# Maintainer: David P. <megver83@parabola.nu>`
		`# Contributor: Luke Shumaker <lukeshu@parabola.nu>`

		`- # Maintainer (Artix): artoo <artoo@artixlinux.org>`
		`- # Maintainer (Artix): Chris Cromer <cromer@artixlinux.org>`
		`- # Contributor (Artix): williamh <williamh@gentoo.org>`
		`+ # Maintainer (artix): artoo <artoo@artixlinux.org>`
		`+ # Maintainer (artix): Chris Cromer <cromer@artixlinux.org>`
		`+ # Contributor: williamh <williamh@gentoo.org>`

		`pkgbase=openrc`
		`pkgname=('openrc' 'openrc-bash-completions' 'openrc-zsh-completions'`

nonsystemd/p11-kit/PKGBUILD

file modified

+2 -2

		`@@ -1,6 +1,6 @@`
		`# Maintainer: David P. <megver83@parabola.nu>`
		`- # Maintainer (Arch): Jan Alexander Steffens (heftig) <heftig@archlinux.org>`
		`- # Contributor (Arch): Ionut Biru <ibiru@archlinux.org>`
		`+ # Maintainer (arch): Jan Alexander Steffens (heftig) <heftig@archlinux.org>`
		`+ # Contributor: Ionut Biru <ibiru@archlinux.org>`

		`pkgbase=p11-kit`
		`pkgname=(p11-kit libp11-kit)`

nonsystemd/pambase/PKGBUILD

file modified

+1 -1

		`@@ -1,5 +1,5 @@`
		`# Maintainer: David P. <megver83@parabola.nu>`
		`- # Maintainer (Arch): Dave Reisner <dreisner@archlinux.org>`
		`+ # Maintainer (arch): Dave Reisner <dreisner@archlinux.org>`

		`pkgname=pambase`
		`pkgver=20210605`

nonsystemd/parabola-base/PKGBUILD

file modified

+2 -1

		`@@ -1,5 +1,6 @@`
		`# Contributor: bill-auger <bill-auger@programmer.net>`
		`- # Maintainers: Parabola hackers <dev@lists.parabola.nu>`
		`+ # Maintainer: Parabola Hackers <dev@lists.parabola.nu>`
		`+`

		`# this is the canonical definition of the standard Parabola non-systemd CLI system`
		`# as installed onto the non-systemd CLI LiveISOs, and installed by the installers`

nonsystemd/pcsclite/PKGBUILD

file modified

+4 -4

		`@@ -1,8 +1,8 @@`
		`# Maintainer: David P. <megver83@parabola.nu>`
		`- # Maintainer (Arch): Alad Wenter <alad@archlinux.org>`
		`- # Maintainer (Arch): Christian Hesse <mail@eworm.de>`
		`- # Contributor (Arch): Giovanni Scafora <giovanni@archlinux.org>`
		`- # Contributor (Arch): Daniel Plaza <daniel.plaza.espi@gmail.com>`
		`+ # Maintainer (arch): Alad Wenter <alad@archlinux.org>`
		`+ # Maintainer (arch): Christian Hesse <mail@eworm.de>`
		`+ # Contributor: Giovanni Scafora <giovanni@archlinux.org>`
		`+ # Contributor: Daniel Plaza <daniel.plaza.espi@gmail.com>`

		`pkgname=pcsclite`
		`pkgver=1.9.0`

nonsystemd/pipewire-media-session/PKGBUILD

file modified

+1 -1

		`@@ -1,5 +1,5 @@`
		`# Maintainer: David P. <megver83@parabola.nu>`
		`- # Maintainer (Arch): Jan Alexander Steffens (heftig) <heftig@archlinux.org>`
		`+ # Maintainer (arch): Jan Alexander Steffens (heftig) <heftig@archlinux.org>`

		`pkgbase=pipewire-media-session`
		`pkgname=(pipewire-media-session pipewire-media-session-docs)`

nonsystemd/pipewire/PKGBUILD

file modified

+3 -3

		`@@ -1,7 +1,7 @@`
		`# Maintainer: David P. <megver83@parabola.nu>`
		`- # Maintainer (Arch): David Runge <dvzrv@archlinux.org>`
		`- # Maintainer (Arch): Jan Alexander Steffens (heftig) <heftig@archlinux.org>`
		`- # Contributor (Arch): Jan de Groot <jgc@archlinux.org>`
		`+ # Maintainer (arch): David Runge <dvzrv@archlinux.org>`
		`+ # Maintainer (arch): Jan Alexander Steffens (heftig) <heftig@archlinux.org>`
		`+ # Contributor: Jan de Groot <jgc@archlinux.org>`

		`# differences with the Artix package:`
		`# - install an XDG autostart script to launch pipewire-pulse, like Gentoo`

nonsystemd/polkit/PKGBUILD

file modified

+37 -36

		`@@ -1,64 +1,62 @@`
		`- # Maintainer: David P. <megver83@parabola.nu>`
		`- # Maintainer (Arch): Jan de Groot <jgc@archlinux.org>`
		`+ # Maintainer: Nathan Owens <ndowens@artixlinux.org>`
		`+ # Contributor: Jan de Groot <jgc@archlinux.org>`

		`pkgname=polkit`
		`- pkgver=0.118`
		`+ pkgver=121`
		`pkgrel=1`
		`pkgrel+=.nonsystemd1`
		`pkgdesc="Application development toolkit for controlling system-wide privileges"`
		`- arch=(x86_64 i686 armv7h)`
		`+ url="https://gitlab.freedesktop.org/polkit/polkit"`
		`+ arch=(x86_64)`
		`+ arch+=(i686 armv7h)`
		`license=(LGPL)`
		`- url="https://www.freedesktop.org/wiki/Software/polkit/"`
		`- depends=(glib2 pam expat elogind js78)`
		`- makedepends=(intltool gtk-doc gobject-introspection git autoconf-archive)`
		`+ depends=(glib2 pam expat elogind js78 duktape)`
		`+ makedepends=(meson gtk-doc gobject-introspection git)`
		`+ checkdepends=(python-dbusmock)`
		`+ provides=(libpolkit-{agent,gobject}-1.so)`
		`backup=(etc/pam.d/polkit-1)`
		`- provides=(polkit-elogind)`
		`- replaces=(polkit-elogind polkit-consolekit)`
		`- _commit=ff4c2144f0fb1325275887d9e254117fcd8a1b52 # git tag 0.118`
		`+ options=(debug)`
		`+ _commit=827b0ddac5b1ef00a47fca4526fcf057bee5f1db # tags/121`
		`source=("git+https://gitlab.freedesktop.org/polkit/polkit.git#commit=$_commit"`
		`'99-parabola.rules'`
		`- 'elogind-configure-fix.patch')`
		`- sha256sums=('SKIP'`
		`- 'd28d6ecaf7682860e2b3768bb266bd94313546b7cd0ef3c2eace7b1576c47adb'`
		`- 'd90b2a95aa3e9e1ebf9369c038c144e04900e095c5405bc4ba4901c31bf3f59b')`
		`+ meson-0.61.diff)`
		`+ b2sums=('SKIP'`
		`+ 'd320d928b5480b5b8143717e6f88101912709020efc9583fbb233a2cc11aff51d36226b94cf69104db06f330e04d4dcfd6e4c7b027df75a3c72c43adec625fb2'`
		`+ '29cef1cf9265ec0b70bf5a46655ee51b9855ce64e47636809b9704ca80edaf5777060d7469eea15a4126791d9290d44901726b6496acf83e41f46a96fe137ead')`

		`pkgver() {`
		`- cd $pkgname`
		`- git describe --tags \| sed 's/-/+/g'`
		`+ cd polkit`
		`+ git describe --tags \| sed 's/[^-]*-g/r&/;s/-/+/g'`
		`}`

		`prepare() {`
		`- cd $pkgname`
		`- patch -Np 1 -i ${srcdir}/elogind-configure-fix.patch`
		`- NOCONFIGURE=1 ./autogen.sh`
		`+ cd polkit`
		`}`

		`build() {`
		`- cd $pkgname`
		`+ local meson_options=(`
		`+ -D examples=true`
		`+ -D gtk_doc=true`
		`+ -D man=true`
		`+ -D os_type=redhat`
		`+ -D session_tracking=libelogind`
		`+ -D tests=true`
		`+ -D systemdsystemunitdir=foo`
		`+ )`

		`- ./configure --prefix=/usr --sysconfdir=/etc \`
		`- --localstatedir=/var --libexecdir=/usr/lib \`
		`- --enable-libsystemd-login=no --disable-static \`
		`- --enable-libelogind=yes --with-systemdsystemunitdir=no \`
		`- --enable-gtk-doc --with-os-type=redhat`
		`-`
		`- sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool`
		`-`
		`- make`
		`+ arch-meson polkit build "${meson_options[@]}"`
		`+ meson compile -C build`
		`}`

		`check() {`
		`- cd $pkgname`
		`- make -k check \|\| :`
		`+ meson test -C build --print-errorlogs -t 3`
		`}`

		`package() {`
		`- cd $pkgname`
		`- make DESTDIR="$pkgdir" install \`
		`- dbusconfdir=/usr/share/dbus-1/system.d \`
		`- rulesdir=/usr/share/polkit-1/rules.d`
		`+ meson install -C build --destdir "$pkgdir"`

		`install -d -o root -g 102 -m 750 "$pkgdir"/{etc,usr/share}/polkit-1/rules.d`
		`+ mv "$pkgdir"/{etc,usr/share}/polkit-1/rules.d/50-default.rules`

		`install -Dm644 /dev/stdin "$pkgdir/usr/lib/sysusers.d/$pkgname.conf" <<END`
		`u polkitd 102 "PolicyKit daemon"`
		`@@ -66,6 +64,9 @@`
		`END`

		`install -m0644 "${srcdir}"/99-parabola.rules "${pkgdir}"/etc/polkit-1/rules.d`
		`+`
		`+ # workaround the unit enforcement, atm can't be disabled, needs patching`
		`+ rm -rf "${pkgdir}"/usr/foo`
		`}`

		`- # vim: ts=2 sw=2 et:`
		`+ # vim:set sw=2 et:`

nonsystemd/polkit/elogind-configure-fix.patch

file removed

-28

		`@@ -1,28 +0,0 @@`
		`- From 08bb656496cd3d6213bbe9473f63f2d4a110da6e Mon Sep 17 00:00:00 2001`
		`- From: Rasmus Thomsen <cogitri@exherbo.org>`
		`- Date: Wed, 11 Apr 2018 13:14:14 +0200`
		`- Subject: [PATCH] configure: fix elogind support`
		`-`
		`- HAVE_LIBSYSTEMD is used to determine which source files to use.`
		`- We have to check if either have_libsystemd or have_libelogind is`
		`- true, as both of these need the source files which are used when`
		`- HAVE_LIBSYSTEMD is true.`
		`- ---`
		`- configure.ac \| 2 +-`
		`- 1 file changed, 1 insertion(+), 1 deletion(-)`
		`-`
		`- diff --git a/configure.ac b/configure.ac`
		`- index 36df239..da47ecb 100644`
		`- --- a/configure.ac`
		`- +++ b/configure.ac`
		`- @@ -221,7 +221,7 @@ AS_IF([test "x$cross_compiling" != "xyes" ], [`
		`-`
		`- AC_SUBST(LIBSYSTEMD_CFLAGS)`
		`- AC_SUBST(LIBSYSTEMD_LIBS)`
		`- -AM_CONDITIONAL(HAVE_LIBSYSTEMD, [test "$have_libsystemd" = "yes"], [Using libsystemd])`
		`- +AM_CONDITIONAL(HAVE_LIBSYSTEMD, [test "$have_libsystemd" = "yes" \|\| test "$have_libelogind" = "yes" ], [Using libsystemd])`
		`-`
		`- dnl ---------------------------------------------------------------------------`
		`- dnl - systemd unit / service files`
		`- --`
		`- 2.17.0`

nonsystemd/polkit/meson-0.61.diff

file added

+24

		`@@ -0,0 +1,24 @@`
		`+ diff --git i/actions/meson.build w/actions/meson.build`
		`+ index 2abaaf3..1e3f370 100644`
		`+ --- i/actions/meson.build`
		`+ +++ w/actions/meson.build`
		`+ @@ -1,7 +1,6 @@`
		`+ policy = 'org.freedesktop.policykit.policy'`
		`+`
		`+ i18n.merge_file(`
		`+ - policy,`
		`+ input: policy + '.in',`
		`+ output: '@BASENAME@',`
		`+ po_dir: po_dir,`
		`+ diff --git i/src/examples/meson.build w/src/examples/meson.build`
		`+ index c6305ab..8c18de5 100644`
		`+ --- i/src/examples/meson.build`
		`+ +++ w/src/examples/meson.build`
		`+ @@ -1,7 +1,6 @@`
		`+ policy = 'org.freedesktop.policykit.examples.pkexec.policy'`
		`+`
		`+ i18n.merge_file(`
		`+ - policy,`
		`+ input: policy + '.in',`
		`+ output: '@BASENAME@',`
		`+ po_dir: po_dir,`

nonsystemd/sddm-openrc/PKGBUILD

file added

+20

		`@@ -0,0 +1,20 @@`
		`+ # Maintainer: David P. <megver83@parabola.nu>`
		`+ # Maintainer (artix): artoo <artoo@artixlinux.org>`
		`+`
		`+ pkgname=sddm-openrc`
		`+ pkgver=20220104`
		`+ pkgrel=1`
		`+ pkgdesc="OpenRC sddm init script"`
		`+ arch=('any')`
		`+ url="https://gitea.artixlinux.org/packagesS/sddm-openrc"`
		`+ license=('GPL2')`
		`+ groups=('openrc-world')`
		`+ provides=('init-displaymanager')`
		`+ conflicts=('init-displaymanager')`
		`+ source=("sddm.initd")`
		`+ sha256sums=('0d24660f022b3e5e1f8196a4022981045d9dd79eb74531d19d6981a5ba735f1e')`
		`+`
		`+ package() {`
		`+ depends=('sddm' 'openrc')`
		`+ install -Dm755 "$srcdir/sddm.initd" "$pkgdir/etc/init.d/sddm"`
		`+ }`

nonsystemd/sddm-openrc/sddm.initd

file added

+17

		`@@ -0,0 +1,17 @@`
		`+ #!/usr/bin/openrc-run`
		`+`
		`+ supervisor=supervise-daemon`
		`+ command="/usr/bin/sddm"`
		`+`
		`+ depend() {`
		`+ need localmount`
		`+`
		`+ after bootmisc consolefont modules netmount`
		`+ after ypbind autofs openvpn gpm lircmd`
		`+ after quota keymaps`
		`+ before alsasound`
		`+ want logind`
		`+ use xfs`
		`+`
		`+ provide xdm display-manager`
		`+ }`

nonsystemd/sddm/PKGBUILD

file modified

+3 -3

		`@@ -1,7 +1,7 @@`
		`# Maintainer: David P. <megver83@parabola.nu>`
		`- # Maintainer (Arch): Felix Yan <felixonmars@archlinux.org>`
		`- # Maintainer (Arch): Antonio Rojas <arojas@archlinux.org>`
		`- # Contributor (Arch): Andrea Scarpino <andrea@archlinux.org>`
		`+ # Maintainer (arch): Felix Yan <felixonmars@archlinux.org>`
		`+ # Maintainer (arch): Antonio Rojas <arojas@archlinux.org>`
		`+ # Contributor: Andrea Scarpino <andrea@archlinux.org>`

		`pkgname=sddm`
		`pkgver=0.19.0`

nonsystemd/tlp-openrc/PKGBUILD

file added

+22

		`@@ -0,0 +1,22 @@`
		`+ # Maintainer: David P. <megver83@parabola.nu>`
		`+ # Maintainer (artix): Rafli Akmal <rafliakmaltejakusuma@gmail.com>`
		`+ # Contributor: artoo <artoo@artixlinux.org>`
		`+ # Contributor: Oscar Campos <damnwidget@artixlinux.org>`
		`+`
		`+ pkgname=tlp-openrc`
		`+ pkgver=20210505`
		`+ pkgrel=1`
		`+ pkgdesc="OpenRC tlp init script"`
		`+ arch=('any')`
		`+ url="https://gitea.artixlinux.org/packagesT/tlp-openrc"`
		`+ license=('GPL2')`
		`+ groups=('openrc-galaxy')`
		`+ provides=('init-tlp')`
		`+ conflicts=('init-tlp')`
		`+ source=('tlp.initd')`
		`+ sha256sums=('4fc771f1ce9423b1f5facc006845d3ab5cbce3bfdf1aa0737b2ed8e7d6f8c3ac')`
		`+`
		`+ package() {`
		`+ depends=('openrc' 'tlp')`
		`+ install -Dm755 "$srcdir/tlp.initd" "$pkgdir/etc/init.d/tlp"`
		`+ }`

nonsystemd/tlp-openrc/tlp.initd

file added

+25

		`@@ -0,0 +1,25 @@`
		`+ #!/usr/bin/openrc-run`
		`+ # Copyright 1999-2015 Gentoo Foundation`
		`+ # Distributed under the terms of the GNU General Public License v2`
		`+ # $Header: $`
		`+`
		`+ description="TLP start/stop actions"`
		`+`
		`+ depend() {`
		`+ after modules`
		`+`
		`+ # sysfs is required (bat thresholds); localmount:/usr`
		`+ need sysfs localmount`
		`+`
		`+ # thinkpad-radiosw (USE=deprecated)`
		`+ use acpid`
		`+`
		`+ after NetworkManager dbus bluetooth`
		`+`
		`+ # run after xdm to avoid bluetooth/wwan/... race-condition with gdm`
		`+ after xdm`
		`+ }`
		`+`
		`+ start() { /usr/bin/tlp init start; }`
		`+ stop() { /usr/bin/tlp init stop; }`
		`+ restart() { /usr/bin/tlp init restart; }`

nonsystemd/udev/PKGBUILD

file modified

+4 -4

		`@@ -1,8 +1,8 @@`
		`# Maintainer: David P. <megver83@parabola.nu>`
		`- # Maintainer (Artix): Artoo <artoo@artixlinux.org>`
		`- # Contributor (Artix): Christian Hesse <mail@eworm.de>`
		`- # Contributor (Artix): Dave Reisner <dreisner@archlinux.org>`
		`- # Contributor (Artix): Tom Gundersen <teg@jklm.no>`
		`+ # Maintainer (artix): Artoo <artoo@artixlinux.org>`
		`+ # Contributor: Christian Hesse <mail@eworm.de>`
		`+ # Contributor: Dave Reisner <dreisner@archlinux.org>`
		`+ # Contributor: Tom Gundersen <teg@jklm.no>`

		`_pkgbase=systemd-stable`

nonsystemd/util-linux/PKGBUILD

file modified

+3 -3

		`@@ -1,7 +1,7 @@`
		`# Maintainer: David P. <megver83@parabola.nu>`
		`- # Maintainer (Artix): Tom Gundersen <teg@jklm.no>`
		`- # Maintainer (Artix): Dave Reisner <dreisner@archlinux.org>`
		`- # Contributor (Artix): judd <jvinet@zeroflux.org>`
		`+ # Maintainer (artix): Tom Gundersen <teg@jklm.no>`
		`+ # Maintainer (artix): Dave Reisner <dreisner@archlinux.org>`
		`+ # Contributor: judd <jvinet@zeroflux.org>`

		`pkgbase=util-linux`
		`pkgname=(util-linux util-linux-libs)`

nonsystemd/wireplumber/PKGBUILD

file modified

+2 -2

		`@@ -1,6 +1,6 @@`
		`# Maintainer: David P. <megver83@parabola.nu>`
		`- # Maintainer (Arch): David Runge <dvzrv@archlinux.org>`
		`- # Maintainer (Arch): Jan Alexander Steffens (heftig) <heftig@archlinux.org>`
		`+ # Maintainer (arch): David Runge <dvzrv@archlinux.org>`
		`+ # Maintainer (arch): Jan Alexander Steffens (heftig) <heftig@archlinux.org>`

		`pkgbase=wireplumber`
		`pkgname=(wireplumber wireplumber-docs)`

nonsystemd/wpa_supplicant-openrc/PKGBUILD

file added

+30

		`@@ -0,0 +1,30 @@`
		`+ # Maintainer: David P. <megver83@parabola.nu>`
		`+ # Maintainer (artix): artoo <artoo@artixlinux.org>`
		`+`
		`+ pkgname=wpa_supplicant-openrc`
		`+ pkgver=20210505`
		`+ pkgrel=1`
		`+ pkgdesc="OpenRC wpa_supplicant init script"`
		`+ arch=('any')`
		`+ url="https://gitea.artixlinux.org/packagesW/wpa_supplicant-openrc"`
		`+ license=('GPL2')`
		`+ groups=('openrc-system')`
		`+ provides=('init-wpa_supplicant')`
		`+ conflicts=('init-wpa_supplicant')`
		`+ backup=('etc/conf.d/wpa_supplicant')`
		`+ source=("wpa_supplicant.confd"`
		`+ "wpa_supplicant.initd"`
		`+ "wpa_cli.sh")`
		`+ sha256sums=('27833f60a091464612e74e6171cc98c3e3f994e2fde0ccc4535dd0d84ed041fa'`
		`+ '7789b54cabb7317d9368531f4832ae7b256e26ce0e5ac7ab8d0a251ade18342a'`
		`+ '300d0b54280c2582e74f78087edad3b0da19b9e4e0440f7f320f523a46da8373')`
		`+`
		`+ package() {`
		`+ depends=('openrc' 'wpa_supplicant')`
		`+ install -Dm755 "${srcdir}"/wpa_supplicant.initd "${pkgdir}"/etc/init.d/wpa_supplicant`
		`+ install -Dm644 "${srcdir}"/wpa_supplicant.confd "${pkgdir}"/etc/conf.d/wpa_supplicant`
		`+`
		`+ install -Dm755 "${srcdir}"/wpa_cli.sh "${pkgdir}"/etc/wpa_supplicant/wpa_cli.sh`
		`+ }`
		`+`
		`+`

nonsystemd/wpa_supplicant-openrc/wpa_cli.sh

file added

+46

		`@@ -0,0 +1,46 @@`
		`+ #!/bin/sh`
		`+ # Copyright 1999-2011 Gentoo Foundation`
		`+ # Written by Roy Marples <uberlord@gentoo.org>`
		`+ # Distributed under the terms of the GNU General Public License v2`
		`+ # Alternatively, this file may be distributed under the terms of the BSD License`
		`+`
		`+ if [ -z "$1" -o -z "$2" ]; then`
		`+ logger -t wpa_cli "Insufficient parameters"`
		`+ exit 1`
		`+ fi`
		`+`
		`+ INTERFACE="$1"`
		`+ ACTION="$2"`
		`+`
		`+ # Note, the below action must NOT mark the interface down via ifconfig, ip or`
		`+ # similar. Addresses can be removed, changed and daemons can be stopped, but`
		`+ # the interface must remain up for wpa_supplicant to work.`
		`+`
		`+ if [ -f /etc/parabola-release ]; then`
		`+ EXEC="/etc/init.d/net.${INTERFACE} --quiet"`
		`+ else`
		`+ logger -t wpa_cli "I don't know what to do with this distro!"`
		`+ exit 1`
		`+ fi`
		`+`
		`+ case ${ACTION} in`
		`+ CONNECTED)`
		`+ EXEC="${EXEC} start"`
		`+ ;;`
		`+ DISCONNECTED)`
		`+ # Deactivated, since stopping /etc/init.d/net.wlanX`
		`+ # stops the network completly.`
		`+ EXEC="false ${EXEC} stop"`
		`+ ;;`
		`+ *)`
		`+ logger -t wpa_cli "Unknown action ${ACTION}"`
		`+ exit 1`
		`+ ;;`
		`+ esac`
		`+`
		`+ # ${EXEC} can use ${IN_BACKGROUND} so that it knows that the user isn't`
		`+ # stopping the interface and a background process - like wpa_cli - is.`
		`+ export IN_BACKGROUND=true`
		`+`
		`+ logger -t wpa_cli "interface ${INTERFACE} ${ACTION}"`
		`+ ${EXEC} \|\| logger -t wpa_cli "executing '${EXEC}' failed"`

nonsystemd/wpa_supplicant-openrc/wpa_supplicant.confd

file added

+10

		`@@ -0,0 +1,10 @@`
		`+ # conf.d file for wpa_supplicant`
		`+`
		`+ # uncomment this if wpa_supplicant starts up before your network interface`
		`+ # is ready and it causes issues`
		`+ # rc_want="dev-settle"`
		`+`
		`+ # Please check man 8 wpa_supplicant for more information about the options`
		`+ # wpa_supplicant accepts.`
		`+ #`
		`+ wpa_supplicant_args=""`

nonsystemd/wpa_supplicant-openrc/wpa_supplicant.initd

file added

+70

		`@@ -0,0 +1,70 @@`
		`+ #!/usr/bin/openrc-run`
		`+ # Copyright (c) 2009 Roy Marples <roy@marples.name>`
		`+ # All rights reserved. Released under the 2-clause BSD license.`
		`+`
		`+ command=/usr/bin/wpa_supplicant`
		`+ : ${wpa_supplicant_conf:=/etc/wpa_supplicant/wpa_supplicant.conf}`
		`+ wpa_supplicant_if=${wpa_supplicant_if:+-i}$wpa_supplicant_if`
		`+ command_args="$wpa_supplicant_args -B -c$wpa_supplicant_conf $wpa_supplicant_if"`
		`+ name="WPA Supplicant Daemon"`
		`+`
		`+ depend()`
		`+ {`
		`+ need localmount`
		`+ use logger`
		`+ after bootmisc modules`
		`+ before dns dhcpcd net`
		`+ keyword -shutdown`
		`+ }`
		`+`
		`+ find_wireless()`
		`+ {`
		`+ local iface=`
		`+`
		`+ case "$RC_UNAME" in`
		`+ Linux)`
		`+ for iface in /sys/class/net/*; do`
		`+ if [ -e "$iface"/wireless -o \`
		`+ -e "$iface"/phy80211 ]`
		`+ then`
		`+ echo "${iface##*/}"`
		`+ return 0`
		`+ fi`
		`+ done`
		`+ ;;`
		`+ *)`
		`+ for iface in /dev/net/* $(ifconfig -l 2>/dev/null); do`
		`+ if ifconfig "${iface##*/}" 2>/dev/null \| \`
		`+ grep -q "[ ]*ssid "`
		`+ then`
		`+ echo "${iface##*/}"`
		`+ return 0`
		`+ fi`
		`+ done`
		`+ ;;`
		`+ esac`
		`+`
		`+ return 1`
		`+ }`
		`+`
		`+ append_wireless()`
		`+ {`
		`+ local iface= i=`
		`+`
		`+ iface=$(find_wireless)`
		`+ if [ -n "$iface" ]; then`
		`+ for i in $iface; do`
		`+ command_args="$command_args -i$i"`
		`+ done`
		`+ else`
		`+ eerror "Could not find a wireless interface"`
		`+ fi`
		`+ }`
		`+`
		`+ start_pre()`
		`+ {`
		`+ case " $command_args" in`
		`+ " -i") ;;`
		`+ *) append_wireless;;`
		`+ esac`
		`+ }`

nonsystemd/xdg-user-dirs/PKGBUILD

file modified

+1 -1

		`@@ -1,7 +1,7 @@`
		`# $Id$`
		`# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>`
		`# Contributor: Stefan Husmann <stefan-husmann@t-online.de>`
		`- # Contributor: <mathieu.clabaut@gmail.com>`
		`+ # Contributor: <mathieu.clabaut@gmail.com>`
		`# Maintainer: David P. <megver83@parabola.nu>`

		`pkgname=xdg-user-dirs`

nonsystemd/xdm-openrc/PKGBUILD

file added

+20

		`@@ -0,0 +1,20 @@`
		`+ # Maintainer: David P. <megver83@parabola.nu>`
		`+ # Maintainer (artix): artoo <artoo@artixlinux.org>`
		`+`
		`+ pkgname=xdm-openrc`
		`+ pkgver=20220104`
		`+ pkgrel=1`
		`+ pkgdesc="OpenRC xdm init script"`
		`+ arch=('any')`
		`+ url="https://gitea.artixlinux.org/packagesX/xdm-openrc"`
		`+ license=('GPL2')`
		`+ groups=('openrc-world')`
		`+ provides=('init-xdm')`
		`+ conflicts=('init-xdm')`
		`+ source=("xdm.initd")`
		`+ sha256sums=('d0ec3cf9ca3a010e3ef6e36b66c98bbb1102d9f203a595b642c554952f71d467')`
		`+`
		`+ package() {`
		`+ depends=('xorg-xdm' 'openrc')`
		`+ install -Dm755 "$srcdir/xdm.initd" "$pkgdir/etc/init.d/xdm"`
		`+ }`

nonsystemd/xdm-openrc/xdm.initd

file added

+16

		`@@ -0,0 +1,16 @@`
		`+ #!/usr/bin/openrc-run`
		`+`
		`+ supervisor=supervise-daemon`
		`+ command="/usr/bin/xdm"`
		`+`
		`+ depend() {`
		`+ need localmount`
		`+`
		`+ after bootmisc consolefont modules netmount`
		`+ after readahead-list ypbind autofs openvpn gpm lircmd`
		`+ after quota keymaps`
		`+ before alsasound`
		`+`
		`+ use logind dbus xfs`
		`+ provide display-manager`
		`+ }`

nonsystemd/your-init-freedom/PKGBUILD

file added

+31

		`@@ -0,0 +1,31 @@`
		`+ # SPDX-License-Identifier: CC0-1.0`
		`+ # Maintainer: Parabola Hackers <dev@lists.parabola.nu>`
		`+`
		`+`
		`+ pkgname=your-init-freedom`
		`+ pkgver=20220719`
		`+ pkgrel=1`
		`+ _gitver=daf9eebc77cc719c818165e256efd5e0d5dee7aa`
		`+ pkgdesc="This package conflicts with every package known to work only for/with systemd."`
		`+ arch=(any)`
		`+ url=https://wiki.parabola.nu/Blacklist`
		`+ license=(GPL3)`
		`+`
		`+ provides=(your-initfreedom)`
		`+ replaces=(your-initfreedom)`
		`+`
		`+ makedepends=(librelib)`
		`+ install=${pkgname}.install`
		`+ source=(${pkgname}-blacklist-${_gitver}.txt::https://git.parabola.nu/blacklist.git/plain/${pkgname}-blacklist.txt?id=${_gitver})`
		`+`
		`+ sha512sums=('0060ebc516b1aee1149186e53a1c665d6790da2db7e43ade136731c8b5bd7ab24c4ce9431af8c5a06f3ad569ab73bcd2e5ff0179ac3c8f332ae78fdc266addeb')`
		`+`
		`+`
		`+ package()`
		`+ {`
		`+ # collect blacklisted package names as pacman conflicts`
		`+ conflicts=( $( libreblacklist normalize < blacklist-${_gitver}.txt \| \`
		`+ cut -d: -f1,2 \| sed -n 's/:$//p' \| sort -u ) )`
		`+`
		`+ install -Dm644 ${pkgname}-blacklist-${_gitver}.txt "${pkgdir}"/usr/share/doc/${pkgname}/blacklist.txt`
		`+ }`

nonsystemd/your-init-freedom/your-init-freedom.install

file added

+23

		`@@ -0,0 +1,23 @@`
		`+ notice()`
		`+ {`
		`+ cat <<EOF`
		`+ The 'your-init-freedom' package detects other packages on your system,`
		`+ which are known to have a hard dependency on systemd,`
		`+ and protects you from (accidentally) installing those in the future.`
		`+`
		`+ Also, as any other such packages are identified in the future,`
		`+ an updated 'your-init-freedom' package will prompt you for their removal.`
		`+`
		`+ Your feedback/participation is important. It is _your_ freedom, after all.`
		`+ If you notice any problems caused by this package, or notice some package`
		`+ which does or does not deserve to be guarded, please do start a discussion.`
		`+`
		`+ * Bugs: https://labs.parabola.nu`
		`+ * Forum: https://forum.parabola.nu`
		`+ * Email: mailto:assist@lists.parabola.nu`
		`+ * Chat: ircs://irc.libera.chat/#parabola`
		`+ EOF`
		`+ }`
		`+`
		`+ pre_install() { notice ; }`
		`+ pre_upgrade() { notice ; }`

nonsystemd/your-initfreedom/PKGBUILD

file removed

-30

		`@@ -1,30 +0,0 @@`
		`- # Maintainer: Parabola Project <dev@lists.parabola.nu>`
		`-`
		`- pkgname=your-initfreedom`
		`- pkgdesc="This package conflicts with every package known to work only for/with systemd."`
		`- license=('GPL3')`
		`- url="https://git.parabola.nu/blacklist.git"`
		`- pkgver=20210628`
		`- _gitver=50cf92a24fa5e2a6e4d70b90fbabd161dc2554e3`
		`- pkgrel=1`
		`-`
		`- arch=('any')`
		`- install=${pkgname}.install`
		`-`
		`- makedepends=(librelib)`
		`- source=(blacklist-${_gitver}.txt::https://git.parabola.nu/blacklist.git/plain/${pkgname}-blacklist.txt?id=${_gitver})`
		`- sha512sums=('b0a421a21eedde392d77d1b2264e7d71f4725e89481bca7a01afb25e95a51edeb10a4e7f5fadd31bd243cfdfcdb40d32215f497c994d938c5907223ef8ce9e28')`
		`-`
		`- package() {`
		`- cd "$srcdir"`
		`-`
		`- conflicts=($( \`
		`- < blacklist-${_gitver}.txt \`
		`- libreblacklist normalize \| \`
		`- cut -d: -f1,2 \| \`
		`- sed -n 's/:$//p' \| \`
		`- sort -u \`
		`- ))`
		`-`
		`- install -Dm644 blacklist-${_gitver}.txt "$pkgdir"/usr/share/doc/${pkgname}/blacklist.txt`
		`- }`

nonsystemd/your-initfreedom/your-initfreedom.install

file removed

-27

		`@@ -1,27 +0,0 @@`
		`-`
		`- pre_install() {`
		`- cat <<EOM`
		`- == IMPORTANT NOTICE ==`
		`-`
		`- This package will help you identify if packages that support or have a hard`
		`- dependency on systemd are installed on your system at the time of its`
		`- installation, as well as protecting you from (accidentally) installing them.`
		`-`
		`- Also, if any other package that supports or needs systemd is identified,`
		`- later updates will ask you for its removal.`
		`-`
		`- Have in mind that, if you want to retain certain packages that support`
		`- systemd installed on your system, you'll have to remove your-initfreedom :)`
		`-`
		`- Please report back to the Parabola Project on the usual channels:`
		`- * https://labs.parabola.nu`
		`- * irc://irc.libera.chat/#parabola`
		`- * mailto:dev@lists.parabola.nu`
		`- EOM`
		`- }`
		`-`
		`- pre_upgrade() {`
		`- pre_install`
		`- }`
		`-`
		`- # vim:set ts=2 sw=2 et:`

pcr-multilib/lib32-eudev/PKGBUILD

file modified

+1 -1

		`@@ -1,4 +1,4 @@`
		`- # Maintainer (Artix): Chris Cromer <cromer@artixlinux.org>`
		`+ # Maintainer (artix): Chris Cromer <cromer@artixlinux.org>`
		`# Maintainer: David P. <megver83@parabola.nu>`

		`_udevver=220`

pcr-testing/alsaequal/PKGBUILD

file modified

+8 -9

		`@@ -1,13 +1,12 @@`
		`# Maintainer: bill-auger <bill-auger@programmer.net>`
		`- # Maintainer (AUR): Jens John <asterisk@2ion.de>`
		`- # Past maintainer: Alad Wenter <https://wiki.archlinux.org/index.php/Special:EmailUser/Alad>`
		`- # Contributors:`
		`- # * Alireza Savand <alireza.savand@gmail.com>`
		`- # * Maxime de Roucy <maxime.deroucy@gmail.com>`
		`- # * Xyne <ac xunilhcra enyx, backwards>`
		`- # * speeddefrost`
		`- # * stefanr`
		`- # * Bjorn Neergaard <bjorn@neersighted.com>`
		`+ # Maintainer (aur): Jens John <asterisk@2ion.de>`
		`+ # Contributor: Alad Wenter <https://wiki.archlinux.org/index.php/Special:EmailUser/Alad>`
		`+ # Contributor: Alireza Savand <alireza.savand@gmail.com>`
		`+ # Contributor: Maxime de Roucy <maxime.deroucy@gmail.com>`
		`+ # Contributor: Xyne <ac xunilhcra enyx, backwards>`
		`+ # Contributor: speeddefrost`
		`+ # Contributor: stefanr`
		`+ # Contributor: Bjorn Neergaard <bjorn@neersighted.com>`


		`pkgname=alsaequal`

pcr-testing/anki-ccbc/PKGBUILD

file modified

+1 -1

		`@@ -1,4 +1,4 @@`
		`- # Contributor (AUR): Sławomir Kowalski <suawekk+aur@gmail.com>`
		`+ # Contributor: Sławomir Kowalski <suawekk+aur@gmail.com>`
		`# Contributor: bill-auger <bill-auger@programmer.net>`

pcr-testing/django-allauth/PKGBUILD

file modified

+1 -1

		`@@ -1,5 +1,5 @@`
		`# Maintainer: bill-auger <bill-auger@programmer.net>`
		`- # Maintainer (AUR): Simon Hanna <simon dot hanna AT serve-me DOT info>`
		`+ # Maintainer (aur): Simon Hanna <simon dot hanna AT serve-me DOT info>`
		`# Contributor: Jakob Gahde <j5lx@fmail.co.uk>`

		`pkgbase='django-allauth'`

pcr-testing/django-gravatar/PKGBUILD

file modified

+1 -1

		`@@ -1,5 +1,5 @@`
		`# Maintainer: bill-auger <bill-auger@programmer.net>`
		`- # Maintainer (AUR): Simon Hanna <simon dot hanna AT serve-me DOT info>`
		`+ # Maintainer (aur): Simon Hanna <simon dot hanna AT serve-me DOT info>`

		`pkgbase='django-gravatar'`
		`pkgname=('python-django-gravatar' 'python2-django-gravatar')`

pcr-testing/gsequencer/PKGBUILD

file modified

+1 -1

		`@@ -1,5 +1,5 @@`
		`# Maintainer: bill-auger <bill-auger@programmer.net>`
		`- # Maintainer (AUR): JoëlKrähemann <jkraehemann@gmail.com>`
		`+ # Maintainer (aur): JoëlKrähemann <jkraehemann@gmail.com>`


		`pkgname=gsequencer`

pcr-testing/lbreakouthd/PKGBUILD

file modified

+2 -2

		`@@ -1,6 +1,6 @@`
		`# Maintainer: Freemor <freemor@freemor.ca>`
		`- # Contributor (Arch): Giovanni Scafora <giovanni@archlinux.org>`
		`- # Contributor (Arch): Tom Newsom <Jeepster@gmx.co.uk>`
		`+ # Contributor: Giovanni Scafora <giovanni@archlinux.org>`
		`+ # Contributor: Tom Newsom <Jeepster@gmx.co.uk>`

		`pkgname=lbreakouthd`
		`pkgver=1.0.4`

pcr-testing/mailman-core/PKGBUILD

file modified

+1 -1

		`@@ -1,5 +1,5 @@`
		`# Maintainer: bill-auger <bill-auger@programmer.net>`
		`- # Maintainer (AUR): Simon Hanna <simon dot hanna AT serve-me DOT info>`
		`+ # Maintainer (aur): Simon Hanna <simon dot hanna AT serve-me DOT info>`

		`pkgname=('mailman-core')`
		`pkgver=3.2.0`

pcr-testing/mhwaveedit/PKGBUILD

file modified

+1 -1

		`@@ -1,4 +1,4 @@`
		`- # Maintainer (AUR): Christopher Arndt <aur -at- chrisarndt -dot- de>`
		`+ # Maintainer (aur): Christopher Arndt <aur -at- chrisarndt -dot- de>`
		`# Contributor: bill-auger <bill-auger@programmer.net>`

pcr-testing/pcsclite-openrc/PKGBUILD

file modified

+1 -1

		`@@ -1,4 +1,4 @@`
		`- # Maintainer (Artix): artoo <artoo@artixlinux.org>`
		`+ # Maintainer (artix): artoo <artoo@artixlinux.org>`
		`# Maintainer: bill-auger <bill-auger@programmer.net>`

pcr-testing/plymouth/PKGBUILD

file modified

+4 -4

		`@@ -1,10 +1,10 @@`
		`# Maintainer: David P. <megver83@parabola.nu>`
		`# Contributor: Luke Shumaker <lukeshu@parabola.nu>`
		`# Contributor: Freemor <freemor@freemor.ca>`
		`- # Maintainer (AUR:plymouth-nosystemd): Chris Cromer <chris@cromer.cl>`
		`- # Maintainer (AUR:plymouth): Sebastian Lau <lauseb644@gmail.com>`
		`- # Contributor (AUR:plymouth): Damian01w <damian01w@gmail.com>`
		`- # Contributor (AUR:plymouth): Padfoot <padfoot@exemail.com.au>`
		`+ # Maintainer (aur:plymouth-nosystemd): Chris Cromer <chris@cromer.cl>`
		`+ # Maintainer (aur:plymouth): Sebastian Lau <lauseb644@gmail.com>`
		`+ # Contributor: Damian01w <damian01w@gmail.com>`
		`+ # Contributor: Padfoot <padfoot@exemail.com.au>`

		`pkgbase=plymouth`
		`pkgname=(plymouth plymouth-nosystemd)`

pcr-testing/python-aiosmtpd/PKGBUILD

file modified

+1 -1

		`@@ -1,5 +1,5 @@`
		`# Maintainer: bill-auger <bill-auger@programmer.net>`
		`- # Maintainer (AUR): Simon Hanna <simon dot hanna AT serve-me DOT info>`
		`+ # Maintainer (aur): Simon Hanna <simon dot hanna AT serve-me DOT info>`


		`pkgname=('python-aiosmtpd')`

pcr-testing/python-atpublic/PKGBUILD

file modified

+1 -1

		`@@ -1,5 +1,5 @@`
		`# Maintainer: bill-auger <bill-auger@programmer.net>`
		`- # Maintainer (AUR): Simon Hanna <simon dot hanna AT serve-me DOT info>`
		`+ # Maintainer (aur): Simon Hanna <simon dot hanna AT serve-me DOT info>`


		`pkgname=('python-atpublic')`

pcr-testing/python-falcon/PKGBUILD

file modified

+1 -1

		`@@ -1,5 +1,5 @@`
		`# Maintainer: bill-auger <bill-auger@programmer.net>`
		`- # Maintainer (AUR): tocic <tocic at protonmail dot ch>`
		`+ # Maintainer (aur): tocic <tocic at protonmail dot ch>`
		`# Contributor: Carl George < arch at cgtx dot us >`

pcr-testing/python-flufl-bounce/PKGBUILD

file modified

+1 -1

		`@@ -1,5 +1,5 @@`
		`# Maintainer: bill-auger <bill-auger@programmer.net>`
		`- # Maintainer (AUR): Simon Hanna <simon dot hanna AT serve-me DOT info>`
		`+ # Maintainer (aur): Simon Hanna <simon dot hanna AT serve-me DOT info>`


		`pkgname=('python-flufl-bounce' 'python2-flufl-bounce')`

pcr-testing/python-flufl-i18n/PKGBUILD

file modified

+1 -1

		`@@ -1,5 +1,5 @@`
		`# Maintainer: bill-auger <bill-auger@programmer.net>`
		`- # Maintainer (AUR): Simon Hanna <simon dot hanna AT serve-me DOT info>`
		`+ # Maintainer (aur): Simon Hanna <simon dot hanna AT serve-me DOT info>`


		`pkgname=('python-flufl-i18n' 'python2-flufl-i18n')`

pcr-testing/python-flufl-lock/PKGBUILD

file modified

+1 -1

		`@@ -1,5 +1,5 @@`
		`# Maintainer: bill-auger <bill-auger@programmer.net>`
		`- # Maintainer (AUR): Simon Hanna <simon dot hanna AT serve-me DOT info>`
		`+ # Maintainer (aur): Simon Hanna <simon dot hanna AT serve-me DOT info>`


		`pkgname=('python-flufl-lock' 'python2-flufl-lock')`

pcr-testing/python-lazr-config/PKGBUILD

file modified

+1 -1

		`@@ -1,5 +1,5 @@`
		`# Maintainer: bill-auger <bill-auger@programmer.net>`
		`- # Maintainer (AUR): Simon Hanna <simon dot hanna AT serve-me DOT info>`
		`+ # Maintainer (aur): Simon Hanna <simon dot hanna AT serve-me DOT info>`


		`pkgname=('python-lazr-config' 'python2-lazr-config')`

pcr-testing/python-lazr-delegates/PKGBUILD

file modified

+1 -1

		`@@ -1,5 +1,5 @@`
		`# Maintainer: bill-auger <bill-auger@programmer.net>`
		`- # Maintainer (AUR): Simon Hanna <simon dot hanna AT serve-me DOT info>`
		`+ # Maintainer (aur): Simon Hanna <simon dot hanna AT serve-me DOT info>`


		`pkgname=('python-lazr-delegates' 'python2-lazr-delegates')`

pcr-testing/python-lazr-smtptest/PKGBUILD

file modified

+1 -1

		`@@ -1,5 +1,5 @@`
		`# Maintainer: bill-auger <bill-auger@programmer.net>`
		`- # Maintainer (AUR): Simon Hanna <simon dot hanna AT serve-me DOT info>`
		`+ # Maintainer (aur): Simon Hanna <simon dot hanna AT serve-me DOT info>`


		`pkgname=('python-lazr-smtptest' 'python2-lazr-smtptest')`

pcr-testing/python-mailman-client/PKGBUILD

file modified

+1 -1

		`@@ -1,5 +1,5 @@`
		`# Maintainer: bill-auger <bill-auger@programmer.net>`
		`- # Maintainer (AUR): Simon Hanna <simon dot hanna AT serve-me DOT info>`
		`+ # Maintainer (aur): Simon Hanna <simon dot hanna AT serve-me DOT info>`


		`pkgname=('python-mailman-client' 'python2-mailman-client')`

pcr-testing/python-mailman-hyperkitty-plugin/PKGBUILD

file modified

+1 -1

		`@@ -1,5 +1,5 @@`
		`# Maintainer: bill-auger <bill-auger@programmer.net>`
		`- # Maintainer (AUR): Simon Hanna <simon dot hanna AT serve-me DOT info>`
		`+ # Maintainer (aur): Simon Hanna <simon dot hanna AT serve-me DOT info>`

		`pkgname=('python-mailman-hyperkitty-plugin')`
		`pkgver=1.1.0`

pcr-testing/python2-django-hyperkitty/PKGBUILD

file modified

+1 -1

		`@@ -1,5 +1,5 @@`
		`# Maintainer: bill-auger <bill-auger@programmer.net>`
		`- # Maintainer (AUR): Simon Hanna <simon dot hanna AT serve-me DOT info>`
		`+ # Maintainer (aur): Simon Hanna <simon dot hanna AT serve-me DOT info>`

		`pkgname=('python2-django-hyperkitty')`
		`pkgver=1.2.1`

pcr-testing/python2-django-mailman3/PKGBUILD

file modified

+1 -1

		`@@ -1,5 +1,5 @@`
		`# Maintainer: bill-auger <bill-auger@programmer.net>`
		`- # Maintainer (AUR): Simon Hanna <simon dot hanna AT serve-me DOT info>`
		`+ # Maintainer (aur): Simon Hanna <simon dot hanna AT serve-me DOT info>`

		`pkgname=('python2-django-mailman3')`
		`pkgver=1.2.0`

pcr-testing/python2-django-postorius/PKGBUILD

file modified

+1 -1

		`@@ -1,5 +1,5 @@`
		`# Maintainer: bill-auger <bill-auger@programmer.net>`
		`- # Maintainer (AUR): Simon Hanna <simon dot hanna AT serve-me DOT info>`
		`+ # Maintainer (aur): Simon Hanna <simon dot hanna AT serve-me DOT info>`

		`pkgname=('python2-django-postorius')`
		`pkgver=1.2.2`

pcr/3proxy/PKGBUILD

file modified

+2 -2

		`@@ -1,7 +1,7 @@`
		`- # Contributor (AUR): d0wn`
		`+ # Contributor: d0wn`
		`# Contributor: André Silva <emulatorman@hyperbola.info>`
		`# Contributor: Márcio Silva <coadde@hyperbola.info>`
		`- # Maintainers: Parabola hackers <dev@lists.parabola.nu>`
		`+ # Maintainer: Parabola Hackers <dev@lists.parabola.nu>`

		`# parabola changes and rationale:`
		`# - no changes.`

pcr/9mount/PKGBUILD

file modified

+1 -1

		`@@ -1,5 +1,5 @@`
		`# Maintainer: Luke Shumaker <lukeshu@sbcglobal.net>`
		`- # Maintainer (AUR): Fazlul Shahriar <fshahriar@gmail.com>`
		`+ # Maintainer (aur): Fazlul Shahriar <fshahriar@gmail.com>`

		`pkgname=9mount`
		`pkgver=1.3`

pcr/abootimg/PKGBUILD

file modified

+1 -1

		`@@ -3,7 +3,7 @@`
		`# Contributor: Benoit Favre <benoit.favre@gmail.com>`
		`# Contributor: Thomas Hebb <tommyhebb@gmail.com>`
		`# Contributor: Denis 'GNUtoo' Carikli <GNUtoo@cyberdimension.org>`
		`- # Maintainers: Parabola hackers <dev@lists.parabola.nu>`
		`+ # Maintainer: Parabola Hackers <dev@lists.parabola.nu>`

		`pkgname=abootimg`
		`pkgver=0.6`

pcr/adplug/PKGBUILD

file modified

+1 -1

		`@@ -1,5 +1,5 @@`
		`# Maintainer: Luke Shumaker <lukeshu@sbcglobal.net>`
		`- # Maintainer (AUR): Mikael Eriksson <mikael_eriksson@miffe.org>`
		`+ # Maintainer (aur): Mikael Eriksson <mikael_eriksson@miffe.org>`

		`pkgname=adplug`
		`pkgver=2.2.1`

pcr/aflplusplus/PKGBUILD

file modified

+2 -2

		`@@ -1,5 +1,5 @@`
		`- # Maintainer (Aur): GI Jack <GI_Jack@hackermail.com>`
		`- # Maintainers: Parabola hackers <dev@lists.parabola.nu>`
		`+ # Maintainer (aur): GI Jack <GI_Jack@hackermail.com>`
		`+ # Maintainer: Parabola Hackers <dev@lists.parabola.nu>`

		`# parabola changes and rationale:`
		`# - Added armv7h and i686 architectures`

pcr/agent-transfer/PKGBUILD

file modified

+1 -1

		`@@ -1,4 +1,4 @@`
		`- # Maintainer (AUR): svalo <valo@eigenlab.org>`
		`+ # Maintainer (aur): svalo <valo@eigenlab.org>`

		`# parabola changes and rationale:`
		`# no changes.`

pcr/ahcpd/PKGBUILD

file modified

+1 -1

		`@@ -1,4 +1,4 @@`
		`- # Maintainer (Arch): Yann Lopez <arch at lonewulf dot net>`
		`+ # Maintainer (arch): Yann Lopez <arch at lonewulf dot net>`
		`pkgname=ahcpd`
		`pkgver=0.53`
		`pkgrel=2`

pcr/alarm-clock-applet/PKGBUILD

file modified

+3 -3

		`@@ -1,6 +1,6 @@`
		`- # Maintainer (Arch): Tobias Frilling <tobias@frilling-online.de>`
		`- # Contributor (Arch): Ekenbrand <jesu dot critos at gmail>`
		`- # Contributor (Arch): Alessandro Nakamuta <alessandro dot ufms at gmail dot com>`
		`+ # Maintainer (arch): Tobias Frilling <tobias@frilling-online.de>`
		`+ # Contributor: Ekenbrand <jesu dot critos at gmail>`
		`+ # Contributor: Alessandro Nakamuta <alessandro dot ufms at gmail dot com>`
		`# Maintainer: Omar Vega Ramos <ovruni@gnu.org.pe>`

		`pkgname=alarm-clock-applet`

pcr/alpm_octopi_utils/PKGBUILD

file modified

+1 -1

		`@@ -1,4 +1,4 @@`
		`- # Maintainer (AUR): MatMoul <matmoul@gmail.com>`
		`+ # Maintainer (aur): MatMoul <matmoul@gmail.com>`
		`# Maintainer: Omar Vega Ramos <ovruni@gnu.org.pe>`

		`pkgname=alpm_octopi_utils`

pcr/ambiance-radiance-colors-suite/PKGBUILD

file modified

+3 -3

		`@@ -1,6 +1,6 @@`
		`- # Maintainer (Arch): ThePilot <afuturepilotis at gmail dot com>`
		`- # Contributor (Arch): Padfoot <padfoot at exemail dot com dot au>`
		`- # Contributor (Arch): Louis Tim Larsen <louis(a)louis.dk>`
		`+ # Maintainer (arch): ThePilot <afuturepilotis at gmail dot com>`
		`+ # Contributor: Padfoot <padfoot at exemail dot com dot au>`
		`+ # Contributor: Louis Tim Larsen <louis(a)louis.dk>`
		`# Maintainer: Márcio Silva <coadde@hyperbola.info>`

		`pkgname='ambiance-radiance-colors-suite'`

pcr/angrysearch/PKGBUILD

file modified

+1 -1

		`@@ -1,4 +1,4 @@`
		`- # Maintainer (AUR): DoTheEvolution <DoTheEvo@gmail.com>`
		`+ # Maintainer (aur): DoTheEvolution <DoTheEvo@gmail.com>`

		`# parabola changes and rationale:`
		`# no changes.`

pcr/antimicro/PKGBUILD

file modified

+2 -2

		`@@ -1,5 +1,5 @@`
		`- # Maintainer (Arch): grimi <grimi at poczta dot fm>`
		`- # Maintainer (Arch): Thomas Nordenmark <t.nordenmark@gmail.com>`
		`+ # Maintainer (arch): grimi <grimi at poczta dot fm>`
		`+ # Maintainer (arch): Thomas Nordenmark <t.nordenmark@gmail.com>`
		`# Developer (Arch): Travis Nickles <nickles.travis@gmail.com>`

		`pkgname=antimicro`

pcr/anubis/PKGBUILD

file modified

+1 -1

		`@@ -1,5 +1,5 @@`
		`# Maintainer: Nicolás Reynolds <fauno@kiwwwi.com.ar>`
		`- # Contributor (Arch): Nathan Owe <ndowens04 at gmail>`
		`+ # Contributor: Nathan Owe <ndowens04 at gmail>`
		`pkgname=anubis`
		`pkgver=4.2`
		`pkgrel=1`

pcr/anyremote/PKGBUILD

file modified

+1 -1

		`@@ -1,4 +1,4 @@`
		`- # Maintainer : Aurélien DESBRIÈRES <aurelien@hackers.camp>`
		`+ # Maintainer: Aurélien Desbrières <aurelien@hackers.camp>`
		`# Contributor: Andrea Fagiani <andfagiani_at_gmail_dot_com>`
		`# Contributor: hb <hb.at.spamers.dot.net>`
		`# Contributor: Lisa Denia <eiffel56@gmail.com>`

pcr/apenwarr-redo/PKGBUILD

file modified

+1 -1

		`@@ -1,5 +1,5 @@`
		`# Maintainer: Luke Shumaker <lukeshu@sbcglobal.net>`
		`- # Maintainer (AUR:redo-git): Tim Diels <timdiels.m@gmail.com>`
		`+ # Maintainer (aur:redo-git): Tim Diels <timdiels.m@gmail.com>`

		`pkgname='apenwarr-redo'`
		`pkgdesc="Avery Pennarun's implmentation of the redo build system"`

pcr/apertium-eng-spa-git/PKGBUILD

file modified

+2 -2

		`@@ -1,5 +1,5 @@`
		`- # Contributor (AUR): Kevin Brubeck Unhammer <unhammer@fsfe.org>`
		`- # Maintainer (AUR): Kevin Brubeck Unhammer <unhammer@fsfe.org>`
		`+ # Contributor: Kevin Brubeck Unhammer <unhammer@fsfe.org>`
		`+ # Maintainer (aur): Kevin Brubeck Unhammer <unhammer@fsfe.org>`

		`_commit=27d1ba848361684ba074e018d65b0282c4c84163`

pcr/apertium-lex-tools/PKGBUILD

file modified

+2 -2

		`@@ -1,5 +1,5 @@`
		`- # Contributor (AUR): Kevin Brubeck Unhammer <unhammer@fsfe.org>`
		`- # Maintainer (AUR): Kevin Brubeck Unhammer <unhammer@fsfe.org>`
		`+ # Contributor: Kevin Brubeck Unhammer <unhammer@fsfe.org>`
		`+ # Maintainer (aur): Kevin Brubeck Unhammer <unhammer@fsfe.org>`

		`pkgname=apertium-lex-tools`
		`pkgver=0.2.1`

pcr/apertium-viewer/PKGBUILD

file modified

+1 -1

		`@@ -1,4 +1,4 @@`
		`- # Maintainer (AUR): ValHue <vhuelamo at gmail dot com>`
		`+ # Maintainer (aur): ValHue <vhuelamo at gmail dot com>`
		`# https://github.com/ValHue/AUR-PKGBUILDs`

		`# parabola changes and rationale:`

pcr/apertium/PKGBUILD

file modified

+2 -2

		`@@ -1,5 +1,5 @@`
		`- # Contributor (AUR): Kevin Brubeck Unhammer <unhammer@fsfe.org>`
		`- # Maintainer (AUR): Kevin Brubeck Unhammer <unhammer@fsfe.org>`
		`+ # Contributor: Kevin Brubeck Unhammer <unhammer@fsfe.org>`
		`+ # Maintainer (aur): Kevin Brubeck Unhammer <unhammer@fsfe.org>`

		`pkgname=apertium`
		`pkgver=3.5.2`

pcr/apiguardian/PKGBUILD

file modified

+1 -1

		`@@ -1,7 +1,7 @@`
		`# Copyright (C) 2022 Denis 'GNUtoo' Carikli <GNUtoo@cyberdimension.org>`
		`# This program is free software: you can redistribute it and/or modify`
		`# it under the terms of the CC0 1.0 License.`
		`- # Maintainers: Parabola hackers <dev@lists.parabola.nu>`
		`+ # Maintainer: Parabola Hackers <dev@lists.parabola.nu>`

		`pkgname=apiguardian`
		`pkgver=1.1.2`

pcr/arno-iptables-firewall/PKGBUILD

file modified

+3 -3

		`@@ -1,6 +1,6 @@`
		`- # Maintainer (AUR): Jaroslav Lichtblau <dragonlord@aur.archlinux.org>`
		`- # Contributor (AUR): Arto Puranen <purcher@gmail.com>`
		`- # Maintainer : Aurélien DESBRIÈRES <aurelien@hackers.camp>`
		`+ # Maintainer (aur): Jaroslav Lichtblau <dragonlord@aur.archlinux.org>`
		`+ # Contributor: Arto Puranen <purcher@gmail.com>`
		`+ # Maintainer: Aurélien Desbrières <aurelien@hackers.camp>`

		`# parabola changes and rationale:`
		`# no changes.`

pcr/arora/PKGBUILD

file modified

+3 -3

		`@@ -1,7 +1,7 @@`
		`# $Id: PKGBUILD 188496 2013-06-15 04:38:11Z bisson $`
		`- # Maintainer (AUR): Gaetan Bisson <bisson@archlinux.org>`
		`- # Contributor (AUR): Pierre Schmitz <pierre@archlinux.de>`
		`- # Contributor (AUR): Daniel J Griffiths <ghost1227@archlinux.us>`
		`+ # Maintainer (aur): Gaetan Bisson <bisson@archlinux.org>`
		`+ # Contributor: Pierre Schmitz <pierre@archlinux.de>`
		`+ # Contributor: Daniel J Griffiths <ghost1227@archlinux.us>`
		`# Contributor: André Silva <emulatorman@hyperbola.info>`

		`# parabola changes and rationale:`

pcr/art/PKGBUILD

file modified

+1 -1

		`@@ -1,4 +1,4 @@`
		`- # Maintainer (AUR): Stefan Majewsky <majewsky@gmx.net>`
		`+ # Maintainer (aur): Stefan Majewsky <majewsky@gmx.net>`
		`# Maintainer: Luke Shumaker <lukeshu@parabola.nu>`

		`pkgname='art'`

pcr/assh/PKGBUILD

file modified

+1 -1

		`@@ -1,4 +1,4 @@`
		`- # Maintainer : Aurelien Desbrieres <aurelien@hackers.camp>`
		`+ # Maintainer: Aurélien Desbrières <aurelien@hackers.camp>`
		`# Contributor: Jaroslav Lichtblau <dragonlord@aur.archlinux.org>`
		`# Contributor: Bartek Piotrowski <barthalion@gmail.com>`

pcr/asterisk/PKGBUILD

file modified

+5 -5

		`@@ -1,9 +1,9 @@`
		`# Maintainer (AUR): Maxim Kurnosenko <asusx2@mail.ru>`
		`- # Contributor (AUR): Caleb Maclennan <caleb@alerque.com>`
		`- # Contributor (AUR): Xavier Devlamynck <magicrhesus@ouranos.be>`
		`- # Contributor (AUR): Alessio Biancalana <dottorblaster@gmail.com>`
		`- # Contributor (AUR): Maik Broemme <mbroemme@libmpq.org>`
		`- # Contributor (Parabola): Denis 'GNUtoo' Carikli <GNUtoo@cyberdimension.org>`
		`+ # Contributor: Caleb Maclennan <caleb@alerque.com>`
		`+ # Contributor: Xavier Devlamynck <magicrhesus@ouranos.be>`
		`+ # Contributor: Alessio Biancalana <dottorblaster@gmail.com>`
		`+ # Contributor: Maik Broemme <mbroemme@libmpq.org>`
		`+ # Contributor: Denis 'GNUtoo' Carikli <GNUtoo@cyberdimension.org>`

		`# parabola changes and rationale:`
		`# - added pjproject as explicit dependency`

pcr/awf-git/PKGBUILD

file modified

+1 -1

		`@@ -1,4 +1,4 @@`
		`- # Maintainer (AUR): Valère Monseur <valere dot monseur@ymail dot com>`
		`+ # Maintainer (aur): Valère Monseur <valere dot monseur@ymail dot com>`

		`# parabola changes and rationale:`
		`# - added install file for icon cache and desktop database maintenance`

pcr/bamf2/PKGBUILD

file modified

+2 -2

		`@@ -1,5 +1,5 @@`
		`- # Maintainer (Arch): Ivan de Jesús Pompa García <ivan.pompa@gmx.com>`
		`- # Contributors (Arch): niQo ???`
		`+ # Maintainer (arch): Ivan de Jesús Pompa García <ivan.pompa@gmx.com>`
		`+ # Contributor: niQo ???`

		`pkgname=bamf2`
		`_dname=bamf`

pcr/barnyard2/PKGBUILD

file modified

+1 -1

		`@@ -1,5 +1,5 @@`
		`# Contributor: Commiebstrd<spenserreinhardt@gmail.com>`
		`- # Maintainer : Parabola Aurélien DESBRIÈRES <aurelien@hackers.camp>`
		`+ # Maintainer: Aurélien Desbrières <aurelien@hackers.camp>`

		`pkgname=barnyard2`
		`pkgver=2`

pcr/base91/PKGBUILD

file modified

+4 -4

		`@@ -1,8 +1,8 @@`
		`# Maintainer: Luke R. <g4jc@openmailbox.org> GPG: rsa4096/3EAE8697`
		`- # Contributor (Arch): Christian Hesse <mail@eworm.de>`
		`- # Contributor (Arch): Christoph Zeiler <rabyteNOSPAM _at_ gmx.d0t.net>`
		`- # Contributor (Arch): Nathan Owe <ndowens04+AUR at gmail.com>`
		`- # Contributor (Arch): Daniel J Griffiths <ghost1227@archlinux.us>`
		`+ # Contributor: Christian Hesse <mail@eworm.de>`
		`+ # Contributor: Christoph Zeiler <rabyteNOSPAM _at_ gmx.d0t.net>`
		`+ # Contributor: Nathan Owe <ndowens04+AUR at gmail.com>`
		`+ # Contributor: Daniel J Griffiths <ghost1227@archlinux.us>`

		`pkgname=base91`
		`pkgver=0.6.0`

pcr/bashmount/PKGBUILD

file modified

+2 -2

		`@@ -1,6 +1,6 @@`
		`- # Maintainer (AUR): Bill Sun <cap.sensitive at gmail dot com>`
		`+ # Maintainer (aur): Bill Sun <cap.sensitive at gmail dot com>`
		`# Contributer (AUR): Jamie Nguyen <jamie at tomoyolinux dot co dot uk>`
		`- # Maintainer : Parabola Aurélien DESBRIERES <aurelien@hackers.camp>`
		`+ # Maintainer: Aurélien DESBRIERES <aurelien@hackers.camp>`

		`# parabola changes and rationale:`
		`# no changes.`

pcr/bbb-gadgets/PKGBUILD

file modified

+2 -2

		`@@ -1,5 +1,5 @@`
		`- # Maintainer: Aurélien DESBRIÈRES <aurelien@hackers.camp>`
		`- # Contributor (AUR3): Brice Waegeneire <brice.wge@gmail.com>`
		`+ # Maintainer: Aurélien Desbrières <aurelien@hackers.camp>`
		`+ # Contributor: Brice Waegeneire <brice.wge@gmail.com>`

		`pkgname=bbb-gadgets`
		`pkgver=20130905`

pcr/bbswitch-lts/PKGBUILD

file modified

+6 -6

		`@@ -1,9 +1,9 @@`
		`- # Maintainer (AUR): e5ten <e5ten.arch@gmail.com>`
		`- # Contributor (AUR): Sven-Hendrik Haase <sh@lutzhaase.com>`
		`- # Contributor (AUR): M0Rf30`
		`- # Contributor (AUR): Samsagax <samsagax@gmail.com>`
		`- # Contributor (Hyperbola): André Silva <emulatorman@hyperbola.info>`
		`- # Contributor (Hyperbola): Márcio Silva <coadde@hyperbola.info>`
		`+ # Maintainer (aur): e5ten <e5ten.arch@gmail.com>`
		`+ # Contributor: Sven-Hendrik Haase <sh@lutzhaase.com>`
		`+ # Contributor: M0Rf30`
		`+ # Contributor: Samsagax <samsagax@gmail.com>`
		`+ # Contributor: André Silva <emulatorman@hyperbola.info>`
		`+ # Contributor: Márcio Silva <coadde@hyperbola.info>`
		`# Maintainer: Omar Vega Ramos <ovruni@gnu.org.pe>`

		`_basekernel=5.4.78`

pcr/beast2/PKGBUILD

file modified

+2 -2

		`@@ -1,5 +1,5 @@`
		`- # Maintainer (AUR): Christian Krause ("wookietreiber") <christian.krause@mailbox.org>`
		`- # Maintainer : Aurelien Desbrieres <aurelien@hackers.camp>`
		`+ # Maintainer (aur): Christian Krause ("wookietreiber") <christian.krause@mailbox.org>`
		`+ # Maintainer: Aurélien Desbrières <aurelien@hackers.camp>`

		`# parabola changes and rationale:`
		`# no changes.`

pcr/beecrypt/PKGBUILD

file modified

+2 -2

		`@@ -1,5 +1,5 @@`
		`- # Contributor (Arch): Jaroslav Lichtblau <dragonlord@aur.archlinux.org>`
		`- # Maintainer : Omar Vega Ramos <ovruni@gnu.org.pe>`
		`+ # Contributor: Jaroslav Lichtblau <dragonlord@aur.archlinux.org>`
		`+ # Maintainer: Omar Vega Ramos <ovruni@gnu.org.pe>`

		`pkgname=beecrypt`
		`pkgver=4.2.1`

pcr/bison++/PKGBUILD

file modified

+2 -2

		`@@ -1,5 +1,5 @@`
		`- # Contributor (Arch): Antonio Garcia-Dominguez <antonio.garciadominguez@uca.es>`
		`- # Maintainer : Parabola GNU / Linux-libre Aurelien Desbrieres <aurelien@cwb.io>`
		`+ # Contributor: Antonio Garcia-Dominguez <antonio.garciadominguez@uca.es>`
		`+ # Maintainer: Aurélien Desbrières <aurelien@cwb.io>`

		`pkgname=bison++`
		`pkgver=1.21.11`

pcr/bitlbee-libpurple/PKGBUILD

file modified

+8 -8

		`@@ -1,12 +1,12 @@`

		`- # Contributor (Arch): Fernando Jiménez Solano (fjim) <fjim@sdfeu.org>`
		`- # Contributor (Arch): FUBAR <mrfubar@gmail.com>`
		`- # Contributor (Arch): simo <simo@archlinux.org>`
		`- # Contributor (Arch): Jeff 'codemac' Mickey <jeff@archlinux.org>`
		`- # Contributor (Arch): Daniel J Griffiths <ghost1227@archlinux.us>`
		`- # Contributor (Arch): Gaetan Bisson <bisson@archlinux.org>`
		`- # Contributor (Arch): Dave Reisner <dreisner@archlinux.org>`
		`- # Maintainer (Arch): dx <dx@dxzone.com.ar>`
		`+ # Contributor: Fernando Jiménez Solano (fjim) <fjim@sdfeu.org>`
		`+ # Contributor: FUBAR <mrfubar@gmail.com>`
		`+ # Contributor: simo <simo@archlinux.org>`
		`+ # Contributor: Jeff 'codemac' Mickey <jeff@archlinux.org>`
		`+ # Contributor: Daniel J Griffiths <ghost1227@archlinux.us>`
		`+ # Contributor: Gaetan Bisson <bisson@archlinux.org>`
		`+ # Contributor: Dave Reisner <dreisner@archlinux.org>`
		`+ # Maintainer (arch): dx <dx@dxzone.com.ar>`
		`# Maintainer: Márcio Silva <coadde@hyperbola.info>`

		`pkgname=bitlbee-libpurple`

pcr/blender-ogre-exporter/PKGBUILD

file modified

+2 -2

		`@@ -1,6 +1,6 @@`
		`- # Contributor (AUR): giacomogiorgianni@gmail.com`
		`+ # Contributor: giacomogiorgianni@gmail.com`
		`# Contributor: Márcio Silva <coadde@hyperbola.info>`
		`- # Maintainers: Parabola hackers <dev@lists.parabola.nu>`
		`+ # Maintainer: Parabola Hackers <dev@lists.parabola.nu>`

		`# parabola changes and rationale:`
		`# - adapted from blender26-ogre-exporter`

pcr/bombadillo/001-Makefile.patch

file added

+51

		`@@ -0,0 +1,51 @@`
		`+ diff --git a/Makefile b/Makefile`
		`+ index cca7657..b3296c4 100644`
		`+ --- a/Makefile`
		`+ +++ b/Makefile`
		`+ @@ -22,42 +22,33 @@ install: install-bin install-man install-desktop clean`
		`+`
		`+ .PHONY: install-man`
		`+ install-man: bombadillo.1`
		`+ - gzip -k ./bombadillo.1`
		`+ - install -d ${DESTDIR}${MAN1DIR}`
		`+ - install -m 0644 ./bombadillo.1.gz ${DESTDIR}${MAN1DIR}`
		`+ + install -Dm 0644 ./bombadillo.1 -t ${DESTDIR}${MAN1DIR}`
		`+`
		`+ .PHONY: install-desktop`
		`+ install-desktop:`
		`+ ifeq ($(shell uname), Linux)`
		`+ # These steps will not work on Darwin, Plan9, or Windows`
		`+ # They would likely work on BSD systems`
		`+ - install -d ${DESTDIR}${DATAROOTDIR}/applications`
		`+ - install -m 0644 ./bombadillo.desktop ${DESTDIR}${DATAROOTDIR}/applications`
		`+ - install -d ${DESTDIR}${DATAROOTDIR}/pixmaps`
		`+ - install -m 0644 ./bombadillo-icon.png ${DESTDIR}${DATAROOTDIR}/pixmaps`
		`+ - -update-desktop-database 2> /dev/null`
		`+ + install -Dm 0644 ./bombadillo.desktop -t ${DESTDIR}${DATAROOTDIR}/applications`
		`+ + install -Dm 0644 ./bombadillo-icon.png -t ${DESTDIR}${DATAROOTDIR}/pixmaps`
		`+ else`
		`+ @echo "* Skipping protocol handler associations and desktop file creation for non-linux system *"`
		`+ endif`
		`+`
		`+ .PHONY: install-bin`
		`+ install-bin: build`
		`+ - install -d ${DESTDIR}${BINDIR}`
		`+ - install -m 0755 ./${BINARY} ${DESTDIR}${BINDIR}`
		`+ + install -Dm 0755 ./${BINARY} -t ${DESTDIR}${BINDIR}`
		`+`
		`+ .PHONY: clean`
		`+ clean:`
		`+ ${GOCMD} clean`
		`+ - rm -f ./bombadillo.1.gz 2> /dev/null`
		`+ rm -f ./${BINARY}_* 2> /dev/null`
		`+`
		`+ .PHONY: uninstall`
		`+ uninstall: clean`
		`+ - rm -f ${DESTDIR}${MAN1DIR}/bombadillo.1.gz`
		`+ rm -f ${DESTDIR}${BINDIR}/${BINARY}`
		`+ rm -f ${DESTDIR}${DATAROOTDIR}/applications/bombadillo.desktop`
		`+ rm -f ${DESTDIR}${DATAROOTDIR}/pixmaps/bombadillo-icon.png`
		`+ - -update-desktop-database 2> /dev/null`
		`+`
		`+ .PHONY: release`
		`+ release:`

pcr/bombadillo/PKGBUILD

file added

+44

		`@@ -0,0 +1,44 @@`
		`+ # Maintainer: Wael Karram <wael@waelk.tech>`
		`+ # Maintainer (aur): Luis Martinez <luis dot martinez at disroot dot org>`
		`+ # Contributor: Emilio Reggi <nag@mailbox.org>`
		`+`
		`+`
		`+ # Parabola changes and rationale:`
		`+ # - Add option for armv7h builds.`
		`+`
		`+`
		`+ pkgname=bombadillo`
		`+ pkgver=2.3.3`
		`+ pkgrel=1`
		`+ pkgdesc="A non-web client for the terminal, supporting Gopher, Gemini and much more."`
		`+ arch=('x86_64' 'i686' 'arm')`
		`+ arch=( ${arch[*]/arm/armv7h} )`
		`+ url="https://bombadillo.colorfield.space"`
		`+ license=('GPL3')`
		`+ depends=('glibc')`
		`+ makedepends=('go')`
		`+ source=("$pkgname-$pkgver.tar.gz::https://tildegit.org/sloum/bombadillo/archive/$pkgver.tar.gz"`
		`+ 001-Makefile.patch)`
		`+ sha256sums=('2d4ec15cac6d3324f13a4039cca86fecf3141503f556a6fa48bdbafb86325f1c'`
		`+ 'a379b36f6ba85a689942f90f9f4f4d416678f34c1e99bdbb8eaeadaaf6f0b788')`
		`+`
		`+ prepare() {`
		`+ cd "$pkgname"`
		`+ patch --forward --strip=1 --input="${srcdir}/001-Makefile.patch"`
		`+ }`
		`+`
		`+ build() {`
		`+ export CGO_CPPFLAGS="${CPPFLAGS}"`
		`+ export CGO_CFLAGS="${CFLAGS}"`
		`+ export CGO_CXXFLAGS="${CXXFLAGS}"`
		`+ export CGO_LDFLAGS="${LDFLAGS}"`
		`+ export GOFLAGS="-buildmode=pie -trimpath -ldflags=-linkmode=external -mod=readonly -modcacherw"`
		`+`
		`+ cd "$pkgname"`
		`+ make PREFIX=/usr`
		`+ }`
		`+`
		`+ package() {`
		`+ cd "$pkgname"`
		`+ make VERSION="$pkgver" DESTDIR="$pkgdir/" PREFIX=/usr install`
		`+ }`

pcr/boost-65-compat/PKGBUILD

file modified

+3 -3

		`@@ -1,6 +1,6 @@`
		`- # Maintainer (AUR): Dmitry Kharitonov <darksab0r at gmail com>`
		`- # Contributor (AUR): Marcin Kornat <rarvolt+aur@gmail.com>`
		`- # Contributor (AUR): Bartłomiej Piotrowski <bpiotrowski@archlinux.org>`
		`+ # Maintainer (aur): Dmitry Kharitonov <darksab0r at gmail com>`
		`+ # Contributor: Marcin Kornat <rarvolt+aur@gmail.com>`
		`+ # Contributor: Bartłomiej Piotrowski <bpiotrowski@archlinux.org>`

		`# parabola changes and rationale:`
		`# no changes.`

pcr/boswars/PKGBUILD

file modified

+3 -3

		`@@ -1,6 +1,6 @@`
		`- # Maintainer (AUR): carstene1ns <arch carsten-teibes de> - http://git.io/ctPKG`
		`- # Contributor (AUR): Diogo Leal <estranho@diogoleal.com>`
		`- # Maintainer : Aurélien DESBRIÈRES <aurelien@hackers.camp>`
		`+ # Maintainer (aur): carstene1ns <arch carsten-teibes de> - http://git.io/ctPKG`
		`+ # Contributor: Diogo Leal <estranho@diogoleal.com>`
		`+ # Maintainer: Aurélien Desbrières <aurelien@hackers.camp>`

		`# parabola changes and rationale:`
		`# no changes.`

pcr/breeze-plymouth/PKGBUILD

file modified

+1 -1

		`@@ -1,5 +1,5 @@`
		`# Maintainer: David P. <megver83@parabola.nu>`
		`- # Maintainer (AUR): Jameson Pugh <imntreal@gmail.com>`
		`+ # Maintainer (aur): Jameson Pugh <imntreal@gmail.com>`

		`pkgname=breeze-plymouth`
		`pkgver=5.12.4`

pcr/brutalchess/PKGBUILD

file modified

+5 -5

		`@@ -1,8 +1,8 @@`
		`- # Contributor (Arch) : boenki <boenki at gmx dot de>`
		`- # Contributor (Arch) : Arkham <arkham at archlinux dot us>`
		`- # Contributor (Arch) : Rick Rein <jeebusroxors@gmail.com>`
		`- # Contributor (Arch) : Stefano Esposito <ragnarok@email.it>`
		`- # Maintainer (Parabola) : Aurélien DESBRIÈRES <aurelien@hackers.camp>`
		`+ # Contributor: boenki <boenki at gmx dot de>`
		`+ # Contributor: Arkham <arkham at archlinux dot us>`
		`+ # Contributor: Rick Rein <jeebusroxors@gmail.com>`
		`+ # Contributor: Stefano Esposito <ragnarok@email.it>`
		`+ # Maintainer: Aurélien Desbrières <aurelien@hackers.camp>`

		`pkgname=brutalchess`
		`pkgver=0.5.2`

pcr/byaccj/PKGBUILD

file modified

+1 -1

		`@@ -1,4 +1,4 @@`
		`- # Maintainer (AUR): Cristian Baldi crisbal <bld.cris.96@gmail.com>`
		`+ # Maintainer (aur): Cristian Baldi crisbal <bld.cris.96@gmail.com>`
		`# Maintainer: Luke Shumaker <lukeshu@sbcglobal.net>`

		`pkgname=byaccj`

pcr/c-algorithms/PKGBUILD

file modified

+2 -2

		`@@ -1,6 +1,6 @@`
		`# $Id: pkgbuild-mode.el,v 1.23 2007/10/20 16:02:14 juergen Exp $`
		`- # Contributor : Sebastien Binet <binet@farnsworth>`
		`- # Maintainer : Aurélien DESBRIERES <aurelien@hackers.camp>`
		`+ # Contributor: Sebastien Binet <binet@farnsworth>`
		`+ # Maintainer: Aurélien DESBRIERES <aurelien@hackers.camp>`
		`pkgname=c-algorithms`
		`pkgver=1.2.0`
		`pkgrel=2.1`

pcr/c-icap/PKGBUILD

file modified

+1 -1

		`@@ -1,4 +1,4 @@`
		`- # Maintainer (AUR): Amish <contact at via dot aur>`
		`+ # Maintainer (aur): Amish <contact at via dot aur>`

		`# parabola changes and rationale:`
		`# no changes.`

pcr/cadabra/PKGBUILD

file modified

+1 -1

		`@@ -1,4 +1,4 @@`
		`- # Contributor (Arch): Dariusz 'quasi' Panchyrz <quasi@aur.archlinux.org>`
		`+ # Contributor: Dariusz 'quasi' Panchyrz <quasi@aur.archlinux.org>`
		`# Maintainer: André Silva <emulatorman@hyperbola.info>`

		`pkgbase=cadabra`

pcr/cairo-compmgr/PKGBUILD

file modified

+8 -8

		`@@ -1,11 +1,11 @@`
		`- # Maintainer (Arch): Cedric Girard <girard.cedric@gmail.com>`
		`- # Contributor (Arch): Florian Pritz <flo@xinu.at>`
		`- # Contributor (Arch): Adam Hani Schakaki (krzd) <krzd@krzd.net>`
		`- # Contributor (Arch): Det <nimetonmaili at gmail a-dot com>`
		`- # Contributor (Arch): catalyst <catalyst@xaker.ru>`
		`- # Contributor (Arch): Devin Cofer <ranguvar{AT]archlinux[DOT}us>`
		`- # Contributor (Arch): jackobw`
		`- # Contributor (Arch): Gianni Vialetto <g dot vialetto at gmail dot com>`
		`+ # Maintainer (arch): Cedric Girard <girard.cedric@gmail.com>`
		`+ # Contributor: Florian Pritz <flo@xinu.at>`
		`+ # Contributor: Adam Hani Schakaki (krzd) <krzd@krzd.net>`
		`+ # Contributor: Det <nimetonmaili at gmail a-dot com>`
		`+ # Contributor: catalyst <catalyst@xaker.ru>`
		`+ # Contributor: Devin Cofer <ranguvar{AT]archlinux[DOT}us>`
		`+ # Contributor: jackobw`
		`+ # Contributor: Gianni Vialetto <g dot vialetto at gmail dot com>`

		`pkgname=cairo-compmgr`
		`pkgver=0.3.1`

pcr/california/PKGBUILD

file modified

+2 -2

		`@@ -1,5 +1,5 @@`
		`- # Maintainer (Arch): Martin Poehlmann <mpdeimos@outlook.com>`
		`- # Contributor (Hyperbola): André Silva <emulatorman@hyperbola.info>`
		`+ # Maintainer (arch): Martin Poehlmann <mpdeimos@outlook.com>`
		`+ # Contributor: André Silva <emulatorman@hyperbola.info>`
		`# Maintainer: Omar Vega Ramos <ovruni@gnu.org.pe>`

		`pkgname=california`

pcr/cardpeek/PKGBUILD

file modified

+1 -1

		`@@ -1,5 +1,5 @@`
		`# Maintainer(AUR): lemust83 <lemust83420@gmail.com>`
		`- # Contributor(AUR): Pierre-Olivier Vauboin <povauboin@gmail.com>`
		`+ # Contributor: Pierre-Olivier Vauboin <povauboin@gmail.com>`

		`# parabola changes and rationale:`
		`# - Added armv7h, patch sent upstream, not reviewed yet`

pcr/cc65/PKGBUILD

file modified

+1 -1

		`@@ -1,4 +1,4 @@`
		`- # Maintainer (AUR): Mike Swanson <mikeonthecomputer@gmail.com>`
		`+ # Maintainer (aur): Mike Swanson <mikeonthecomputer@gmail.com>`

		`# parabola changes and rationale:`
		`# correct used license`

pcr/ccextractor/PKGBUILD

file modified

+1 -1

		`@@ -1,4 +1,4 @@`
		`- # Maintainer : Nicolas Perrin <booloki@lokizone.net>`
		`+ # Maintainer: Nicolas Perrin <booloki@lokizone.net>`
		`# Contributor: Chris Clonch <chris at theclonchs dot com>`
		`# Contributor: Nathan Owe <ndowens04 at gmail>`
		`# Contributor: Chris Allison <daemon@cca.me.uk>`

pcr/cdw/PKGBUILD

file modified

+1 -1

		`@@ -1,4 +1,4 @@`
		`- # Maintainer : Aurelien Desbrieres <aurelien@hackers.camp>`
		`+ # Maintainer: Aurélien Desbrières <aurelien@hackers.camp>`
		`# Contributor: kfgz <kfgz at interia pl>`
		`# Contributor: Joey Mazzarelli <mazzarelli at gmail dot com>`

pcr/cedet-git/PKGBUILD

file modified

+2 -2

		`@@ -1,5 +1,5 @@`
		`- # Maintainer (Arch): Stefan Husmann <stefan-husmann@t-online.de>`
		`- # Contributor (Arch): Jed Brown <jed@59A2.org>`
		`+ # Maintainer (arch): Stefan Husmann <stefan-husmann@t-online.de>`
		`+ # Contributor: Jed Brown <jed@59A2.org>`
		`# Maintainer: Omar Vega Ramos <ovruni@gnu.org.pe>`

		`pkgname=cedet-git`

pcr/check-pacman-mtree/PKGBUILD

file modified

+1 -1

		`@@ -1,5 +1,5 @@`
		`# Maintainer: Luke R. <g4jc@openmailbox.org> GPG: rsa4096/3EAE8697`
		`- # Maintainer (AUR): https://aur.archlinux.org/account/999cgm`
		`+ # Maintainer (aur): https://aur.archlinux.org/account/999cgm`
		`# Contributor: Freemor <freemor@freemor.ca>`

		`pkgname=check-pacman-mtree`

pcr/checkpolicy/PKGBUILD

file modified

+4 -4

		`@@ -1,7 +1,7 @@`
		`- # Maintainer (AUR): Nicolas Iooss (nicolas <dot> iooss <at> m4x <dot> org)`
		`- # Contributor (AUR): Timothée Ravier <tim@siosm.fr>`
		`- # Contributor (AUR): Nicky726 (Nicky726 <at> gmail <dot> com)`
		`- # Contributor (AUR): Sergej Pupykin (pupykin <dot> s+arch <at> gmail <dot> com)`
		`+ # Maintainer (aur): Nicolas Iooss (nicolas <dot> iooss <at> m4x <dot> org)`
		`+ # Contributor: Timothée Ravier <tim@siosm.fr>`
		`+ # Contributor: Nicky726 (Nicky726 <at> gmail <dot> com)`
		`+ # Contributor: Sergej Pupykin (pupykin <dot> s+arch <at> gmail <dot> com)`

		`# parabola changes and rationale:`
		`# - Added armv7h`

pcr/cherokee/PKGBUILD

file modified

+6 -6

		`@@ -1,9 +1,9 @@`
		`- # Maintainer (AUR): Chris Severance aur.severach aATt spamgourmet dott com`
		`- # Contributor (AUR): vorbote`
		`- # Contributor (AUR): Fernando Jiménez Solano <fjim@sdfeu.org>`
		`- # Contributor (AUR): Evangelos Foutras <evangelos@foutrelis.com>`
		`- # Contributor (AUR): Link Dupont <link@subpop.net>`
		`- # Contributor (AUR): Pierre Bourdin <pierre@pi3rrot.net>`
		`+ # Maintainer (aur): Chris Severance aur.severach aATt spamgourmet dott com`
		`+ # Contributor: vorbote`
		`+ # Contributor: Fernando Jiménez Solano <fjim@sdfeu.org>`
		`+ # Contributor: Evangelos Foutras <evangelos@foutrelis.com>`
		`+ # Contributor: Link Dupont <link@subpop.net>`
		`+ # Contributor: Pierre Bourdin <pierre@pi3rrot.net>`

		`# parabola changes and rationale:`
		`# - removed superfluous 'set -u'`

pcr/chm2pdf/PKGBUILD

file modified

+6 -6

		`@@ -1,9 +1,9 @@`
		`- # Maintainer (AUR): Giovanni Santini <giovannisantini93@yahoo.it>`
		`- # Contributor (AUR): Ognjen Vidovic <ognjen.vidovic at gmail dot com>`
		`- # Contributor (AUR): Mariusz Libera <mariusz.libera@gmail.com>`
		`- # Contributor (AUR): fes0`
		`- # Contributor (AUR): Rodrigo Coacci <rcoacci@gmail.com>`
		`- # Maintainer : Parabola Aurélien DESBRIÈRES <aurelien@hackers.camp>`
		`+ # Maintainer (aur): Giovanni Santini <giovannisantini93@yahoo.it>`
		`+ # Contributor: Ognjen Vidovic <ognjen.vidovic at gmail dot com>`
		`+ # Contributor: Mariusz Libera <mariusz.libera@gmail.com>`
		`+ # Contributor: fes0`
		`+ # Contributor: Rodrigo Coacci <rcoacci@gmail.com>`
		`+ # Maintainer: Aurélien Desbrières <aurelien@hackers.camp>`

		`# parabola changes and rationale:`
		`# no changes.`

pcr/chroot-nspawn/PKGBUILD

file modified

+2 -2

		`@@ -1,5 +1,5 @@`
		`- # Maintainer (Hyperbola): André Silva <emulatorman@hyperbola.info>`
		`- # Maintainer (Hyperbola): Márcio Silva <coadde@hyperbola.info>`
		`+ # Maintainer (hyperbola): André Silva <emulatorman@hyperbola.info>`
		`+ # Maintainer (hyperbola): Márcio Silva <coadde@hyperbola.info>`
		`# Maintainer: Omar Vega Ramos <ovruni@gnu.org.pe>`
		`# Maintainer: David P. <megver83@parabola.nu>`

pcr/cinclude2dot/PKGBUILD

file modified

+1 -1

		`@@ -1,4 +1,4 @@`
		`- # Maintainer (AUR): Yuexuan Gu <lastavengers@outlook.com>`
		`+ # Maintainer (aur): Yuexuan Gu <lastavengers@outlook.com>`
		`# Maintainer: Luke Shumaker <lukeshu@sbcglobal.net>`

		`# parabola changes and rationale:`

pcr/cl-ppcre/PKGBUILD

file modified

+5 -5

		`@@ -1,8 +1,8 @@`
		`- # Maintainer (Arch): Aaron France <aaron.l.france@gmail.com>`
		`- # Contributor (Arch): veox <cy at wre dot ath dot cx>`
		`- # Contributor (Arch): joyfulgirl <joyfulgirl (at) archlinux.us>`
		`- # Contributor (Arch): Jonathan Friedman <jonf@gojon.com>`
		`- # Contributor (Arch): Aaron France <aaron.l.france@gmail.com>`
		`+ # Maintainer (arch): Aaron France <aaron.l.france@gmail.com>`
		`+ # Contributor: veox <cy at wre dot ath dot cx>`
		`+ # Contributor: joyfulgirl <joyfulgirl (at) archlinux.us>`
		`+ # Contributor: Jonathan Friedman <jonf@gojon.com>`
		`+ # Contributor: Aaron France <aaron.l.france@gmail.com>`
		`# Maintainer: Omar Vega Ramos <ovruni@gnu.org.pe>`
		`pkgname=cl-ppcre`
		`pkgver=2.0.11`

pcr/clearlooks-colors-gtk-theme/PKGBUILD

file modified

+1 -1

		`@@ -1,4 +1,4 @@`
		`- # Maintainer (Arch): Travis Lyons <travis.lyons@gmail.com>`
		`+ # Maintainer (arch): Travis Lyons <travis.lyons@gmail.com>`

		`pkgname=clearlooks-colors-gtk-theme`
		`pkgver=2.0`

pcr/coccinella/PKGBUILD

file modified

+1 -1

		`@@ -1,4 +1,4 @@`
		`- # Maintainer (Arch): SpepS <dreamspepser at yahoo dot it>`
		`+ # Maintainer (arch): SpepS <dreamspepser at yahoo dot it>`
		`# Maintainer: Omar Vega Ramos <ovruni@gnu.org.pe>`

		`# parabola changes and rationale:`

pcr/collada-dom/PKGBUILD

file modified

+1 -1

		`@@ -1,4 +1,4 @@`
		`- # Maintainer (AUR): Zachary Koesters <zkoesters@utdallas.edu>`
		`+ # Maintainer (aur): Zachary Koesters <zkoesters@utdallas.edu>`

		`# parabola changes and rationale:`
		`# - corrected used license`

pcr/command-not-found/PKGBUILD

file modified

+2 -2

		`@@ -1,5 +1,5 @@`
		`- # Maintainer (Arch): Bernhard Landauer <oberon@manjaro.org>`
		`- # Contributor (Arch): Matthias Maennich <arch@maennich.net>`
		`+ # Maintainer (arch): Bernhard Landauer <oberon@manjaro.org>`
		`+ # Contributor: Matthias Maennich <arch@maennich.net>`
		`# Maintainer: Omar Vega Ramos <ovruni@gnu.org.pe>`
		`# Contributor: Luke Shumaker <lukeshu@parabola.nu>`

pcr/compiz/PKGBUILD

file modified

+36 -27

		`@@ -1,56 +1,61 @@`
		`- # Maintainer (Arch): Charles Bos <charlesbos1 AT gmail>`
		`- # Contributor (Arch): Rob McCathie <archaur at rmcc dot com dot au`
		`- # Contributor (Arch): /dev/rs0 <rs0@secretco.de.com>`
		`- # Contributor (Arch): Iven Hsu <ivenvd AT gmail>`
		`- # Contributor (Arch): Nathan Hulse <nat.hulse@gmail.com>`
		`+ # Maintainer (aur): Robert Brzozowski <robson75@linux.pl>`
		`+ # Maintainer (aur): Charles Bos <charlesbos1 AT gmail>`
		`+ # Contributor: Rob McCathie <archaur at rmcc dot com dot au`
		`+ # Contributor: /dev/rs0 <rs0@secretco.de.com>`
		`+ # Contributor: Iven Hsu <ivenvd AT gmail>`
		`+ # Contributor: Nathan Hulse <nat.hulse@gmail.com>`

		`pkgname=compiz`
		`- pkgver=0.9.13.0`
		`- pkgrel=2`
		`+ pkgver=0.9.14.2`
		`+ pkgrel=1`
		`pkgdesc="Composite manager for Aiglx and Xgl, with plugins and CCSM"`
		`arch=('i686' 'x86_64')`
		`+ arch+=('armv7h')`
		`url="https://launchpad.net/compiz"`
		`license=('GPL' 'LGPL' 'MIT')`
		`- depends=('boost' 'xorg-server' 'libxcomposite' 'startup-notification' 'librsvg' 'dbus' 'mesa' 'libxslt' 'fuse' 'glibmm' 'libxrender' 'libwnck3' 'pygtk' 'desktop-file-utils' 'pyrex' 'protobuf' 'metacity' 'glu' 'libsm' 'dconf')`
		`- makedepends=('cmake' 'intltool')`
		`+ depends=('boost-libs' 'xorg-server' 'fuse2' 'glibmm' 'libwnck3' 'python-gobject' 'python-cairo' 'protobuf' 'metacity' 'glu')`
		`+ makedepends=('boost' 'cmake' 'intltool' 'cython')`
		`optdepends=(`
		`'xorg-xprop: grab various window properties for use in window matching rules'`
		`)`
		`- conflicts=('compiz-core')`
		`- source=("https://launchpad.net/${pkgname}/${pkgver:0:6}/${pkgver}/+download/${pkgname}-${pkgver}.tar.bz2"`
		`+ conflicts=('compiz-core' 'compiz-gtk' 'compiz-bcop' 'ccsm' 'compiz-fusion-plugins-main' 'compiz-fusion-plugins-extra' 'compiz-fusion-plugins-experimental' 'compizconfig-python' 'libcompizconfig' 'simple-ccsm')`
		`+ provides=("compiz-core=${pkgver}" "compiz-bcop=${pkgver}" "ccsm=${pkgver}" "compiz-plugins-main=${pkgver}" "compiz-plugins-extra=${pkgver}" "compizconfig-python=${pkgver}" "libcompizconfig=${pkgver}")`
		`+ source=("https://launchpad.net/${pkgname}/${pkgver:0:6}/${pkgver}/+download/${pkgname}-${pkgver}.tar.xz"`
		`"focus-prevention-disable.patch"`
		`"gtk-extents.patch"`
		`- "trailfocus-fix.patch")`
		`- sha256sums=('f08eb54d578be559e3e723f3fe4291a56f5c96b2fdfb9c9e74ebb6596a1ca702'`
		`+ "reverse-unity-config.patch"`
		`+ "screenshot-launch-fix.patch"`
		`+ "no-compile-gschemas.patch")`
		`+ sha256sums=('cfa061e93b032275ff9e7041f582a8f6d5ae271cf8a89e6bc74e3d3635999d3c'`
		`'f4897590b0f677ba34767a29822f8f922a750daf66e8adf47be89f7c2550cf4b'`
		`'16ddb6311ce42d958505e21ca28faae5deeddce02cb558d55e648380274ba4d9'`
		`- '01e94ac52cd39eb5462a8505c7df61c7b14b05159de64f8700dfadb524bdb2ce')`
		`+ '6ec9c04540ca1649c687d9ab2c8311caea7075831e2cffe719ec7958c9ebab7b'`
		`+ '89ee91a8ea6b1424ef76661ea9a2db43412366aacddc12d24a7adf5e04bfbc61'`
		`+ '4ab3277da201314b3f65e30128bc30704ddee584fdbbfc8d0d83c7e0de91fa9a')`

		`prepare() {`
		`cd "${pkgname}-${pkgver}"`

		`- # Fix decorator start command`
		`- sed -i 's/exec \\"${COMPIZ_BIN_PATH}compiz-decorator\\"/exec \/usr\/bin\/compiz-decorator/g' plugins/decor/decor.xml.in`
		`+ # Reverse Unity specific configuration patches`
		`+ patch -p1 -i "${srcdir}/reverse-unity-config.patch"`

		`# Set focus prevention level to off which means that new windows will always get focus`
		`- patch -Np1 -i "${srcdir}/focus-prevention-disable.patch"`
		`-`
		`- # Use Python 2`
		`- find -type f $ -name 'CMakeLists.txt' -or -name '*.cmake' $ -exec sed -e 's/COMMAND python/COMMAND python2/g' -i {} \;`
		`- find compizconfig/ccsm -type f -exec sed -e 's\|^#!.*python\|#!/usr/bin/env python2\|g' -i {} \;`
		`+ patch -p1 -i "${srcdir}/focus-prevention-disable.patch"`

		`# Fix incorrect extents for GTK+ tooltips, csd etc`
		`- patch -Np1 -i "${srcdir}/gtk-extents.patch"`
		`+ patch -p1 -i "${srcdir}/gtk-extents.patch"`
		`+`
		`+ # Fix application launching for the screenshot plugin`
		`+ patch -p1 -i "${srcdir}/screenshot-launch-fix.patch"`
		`+`
		`+ # Don't try to compile gschemas during make install`
		`+ patch -p1 -i "${srcdir}/no-compile-gschemas.patch"`

		`- # Fix ambiguous function call in trailfocus plugin`
		`- patch -Np1 -i "${srcdir}/trailfocus-fix.patch"`
		`}`

		`build() {`
		`cd "${pkgname}-${pkgver}"`

		`- export PYTHON="/usr/bin/python2"`
		`-`
		`mkdir build; cd build`

		`cmake .. \`
		`@@ -65,7 +70,7 @@`
		`-DBUILD_KDE4=Off \`
		`-DCOMPIZ_BUILD_TESTING=Off \`
		`-DCOMPIZ_WERROR=Off \`
		`- -DCOMPIZ_DEFAULT_PLUGINS="composite,opengl,decor,resize,place,move,compiztoolbox,staticswitcher,regex,animation,wall,ccp" \`
		`+ -DCOMPIZ_DEFAULT_PLUGINS="composite,opengl,decor,resize,place,move,compiztoolbox,staticswitcher,regex,animation,wall,ccp"`

		`make`
		`}`
		`@@ -89,4 +94,8 @@`
		`install -dm755 "${pkgdir}/usr/share/glib-2.0/schemas/"`
		`install -m644 generated/glib-2.0/schemas/*.gschema.xml "${pkgdir}/usr/share/glib-2.0/schemas/"`
		`fi`
		`+`
		`+ # Install licenses`
		`+ install -dm755 "${pkgdir}/usr/share/licenses/${pkgname}"`
		`+ install -m644 "${srcdir}/${pkgname}-${pkgver}"/{COPYING,COPYING.GPL,COPYING.LGPL,COPYING.MIT} "${pkgdir}/usr/share/licenses/${pkgname}"`
		`}`

pcr/compiz/no-compile-gschemas.patch

file added

+19

		`@@ -0,0 +1,19 @@`
		`+ diff -Nur original/cmake/recompile_gsettings_schemas_in_dir_user_env.cmake modified/cmake/recompile_gsettings_schemas_in_dir_user_env.cmake`
		`+ --- original/cmake/recompile_gsettings_schemas_in_dir_user_env.cmake 2019-02-16 12:44:41.000000000 +0000`
		`+ +++ modified/cmake/recompile_gsettings_schemas_in_dir_user_env.cmake 2019-02-16 23:36:58.589706824 +0000`
		`+ @@ -15,9 +15,9 @@`
		`+`
		`+ find_program (GLIB_COMPILE_SCHEMAS glib-compile-schemas)`
		`+`
		`+ -if (GLIB_COMPILE_SCHEMAS)`
		`+ -`
		`+ - message ("-- Recompiling GSettings schemas in ${SCHEMADIR}")`
		`+ - execute_process (COMMAND ${GLIB_COMPILE_SCHEMAS} ${SCHEMADIR})`
		`+ -`
		`+ -endif (GLIB_COMPILE_SCHEMAS)`
		`+ +#if (GLIB_COMPILE_SCHEMAS)`
		`+ +#`
		`+ +# message ("-- Recompiling GSettings schemas in ${SCHEMADIR}")`
		`+ +# execute_process (COMMAND ${GLIB_COMPILE_SCHEMAS} ${SCHEMADIR})`
		`+ +#`
		`+ +#endif (GLIB_COMPILE_SCHEMAS)`

pcr/compiz/reverse-unity-config.patch

file added

+871

		`@@ -0,0 +1,871 @@`
		`+ diff -Nur original/compizconfig/integration/gnome/gsettings/org.compiz.integrated.gschema.xml modified/compizconfig/integration/gnome/gsettings/org.compiz.integrated.gschema.xml`
		`+ --- original/compizconfig/integration/gnome/gsettings/org.compiz.integrated.gschema.xml 2019-02-16 12:44:41.000000000 +0000`
		`+ +++ modified/compizconfig/integration/gnome/gsettings/org.compiz.integrated.gschema.xml 2019-02-17 14:11:58.762747647 +0000`
		`+ @@ -10,9 +10,6 @@`
		`+ <key type="s" name="command-screenshot">`
		`+ <default>"gnome-screenshot"</default>`
		`+ </key>`
		`+ - <key type="as" name="run-command-21">`
		`+ - <default>["<Control><Alt>Delete"]</default>`
		`+ - </key>`
		`+ <key type="as" name="run-command-12">`
		`+ <default>["Disabled"]</default>`
		`+ </key>`
		`+ @@ -49,9 +46,6 @@`
		`+ <key type="as" name="run-command-1">`
		`+ <default>["Disabled"]</default>`
		`+ </key>`
		`+ - <key type="s" name="command-21">`
		`+ - <default>"/usr/bin/gnome-system-monitor -p"</default>`
		`+ - </key>`
		`+ <key type="s" name="command-12">`
		`+ <default>""</default>`
		`+ </key>`
		`+ diff -Nur original/metadata/core.xml.in modified/metadata/core.xml.in`
		`+ --- original/metadata/core.xml.in 2019-02-16 12:44:41.000000000 +0000`
		`+ +++ modified/metadata/core.xml.in 2019-02-17 14:11:58.762747647 +0000`
		`+ @@ -144,7 +144,7 @@`
		`+ <option name="focus_prevention_match" type="match">`
		`+ <_short>Focus Prevention Windows</_short>`
		`+ <_long>Focus prevention windows</_long>`
		`+ - <default>!(class=Polkit-gnome-authentication-agent-1)</default>`
		`+ + <default>any</default>`
		`+ </option>`
		`+ </group>`
		`+ <group>`
		`+ @@ -179,7 +179,7 @@`
		`+ <option name="minimize_window_key" type="key">`
		`+ <_short>Minimize Window</_short>`
		`+ <_long>Minimize active window</_long>`
		`+ - <default><Control><Alt>KP_0</default>`
		`+ + <default><Alt>F9</default>`
		`+ </option>`
		`+ <option name="minimize_window_button" type="button">`
		`+ <_short>Minimize Window</_short>`
		`+ @@ -188,16 +188,16 @@`
		`+ <option name="maximize_window_key" type="key">`
		`+ <_short>Maximize Window</_short>`
		`+ <_long>Maximize active window</_long>`
		`+ - <default><Control><Super>Up</default>`
		`+ + <default><Alt>F10</default>`
		`+ </option>`
		`+ <option name="unmaximize_window_key" type="key">`
		`+ <_short>Unmaximize Window</_short>`
		`+ <_long>Unmaximize active window</_long>`
		`+ + <default><Alt>F5</default>`
		`+ </option>`
		`+ <option name="unmaximize_or_minimize_window_key" type="key">`
		`+ <_short>Unmaximize or Minimize Window</_short>`
		`+ <_long>Unmaximize or minimize active window</_long>`
		`+ - <default><Control><Super>Down</default>`
		`+ </option>`
		`+ <option name="maximize_window_horizontally_key" type="key">`
		`+ <_short>Maximize Window Horizontally</_short>`
		`+ @@ -220,6 +220,7 @@`
		`+ <option name="show_desktop_key" type="key">`
		`+ <_short>Show Desktop</_short>`
		`+ <_long>Hide all windows and focus desktop</_long>`
		`+ + <default><Control><Alt>d</default>`
		`+ </option>`
		`+ <option name="show_desktop_edge" type="edge">`
		`+ <_short>Show Desktop</_short>`
		`+ @@ -229,7 +230,6 @@`
		`+ <option name="toggle_window_maximized_key" type="key">`
		`+ <_short>Toggle Window Maximized</_short>`
		`+ <_long>Toggle active window maximized</_long>`
		`+ - <default><Control><Alt>KP_5</default>`
		`+ </option>`
		`+ <option name="toggle_window_maximized_button" type="button">`
		`+ <_short>Toggle Window Maximized</_short>`
		`+ @@ -254,7 +254,7 @@`
		`+ <option name="hsize" type="int">`
		`+ <_short>Horizontal Virtual Size</_short>`
		`+ <_long>Screen size multiplier for horizontal virtual size</_long>`
		`+ - <default>1</default>`
		`+ + <default>4</default>`
		`+ <min>1</min>`
		`+ <max>32</max>`
		`+ </option>`
		`+ diff -Nur original/plugins/animation/animation.xml.in modified/plugins/animation/animation.xml.in`
		`+ --- original/plugins/animation/animation.xml.in 2019-02-16 12:44:41.000000000 +0000`
		`+ +++ modified/plugins/animation/animation.xml.in 2019-02-17 14:11:58.766082647 +0000`
		`+ @@ -36,7 +36,7 @@`
		`+ <extensible/>`
		`+ <sort start="2"/>`
		`+ <default>`
		`+ - <value>animation:Glide 2</value>`
		`+ + <value>animation:Zoom</value>`
		`+ <value>animation:Fade</value>`
		`+ <value>animation:Fade</value>`
		`+ </default>`
		`+ @@ -48,9 +48,9 @@`
		`+ <min>50</min>`
		`+ <max>4000</max>`
		`+ <default>`
		`+ - <value>120</value>`
		`+ - <value>80</value>`
		`+ - <value>80</value>`
		`+ + <value>200</value>`
		`+ + <value>150</value>`
		`+ + <value>150</value>`
		`+ </default>`
		`+ </option>`
		`+ <option name="open_matches" type="list">`
		`+ @@ -58,8 +58,8 @@`
		`+ <_long>The windows that will be animated.</_long>`
		`+ <type>match</type>`
		`+ <default>`
		`+ - <value>((type=Normal \| Unknown) \| name=sun-awt-X11-XFramePeer \| name=sun-awt-X11-XDialogPeer) & !(role=toolTipTip \| role=qtooltip_label) & !(type=Normal & override_redirect=1) & !(name=gnome-screensaver)</value>`
		`+ - <value>((type=Menu \| PopupMenu \| DropdownMenu \| Combo \| Dialog \| ModalDialog \| Normal) & !(class=\\.exe$))</value>`
		`+ + <value>(type=Normal \| Dialog \| ModalDialog \| Unknown) & !(name=gnome-screensaver)</value>`
		`+ + <value>(type=Menu \| PopupMenu \| DropdownMenu \| Combo)</value>`
		`+ <value>(type=Tooltip \| Notification \| Utility) & !(name=compiz) & !(title=notify-osd)</value>`
		`+ </default>`
		`+ </option>`
		`+ @@ -102,7 +102,7 @@`
		`+ <extensible/>`
		`+ <sort start="2"/>`
		`+ <default>`
		`+ - <value>animation:Glide 2</value>`
		`+ + <value>animation:Zoom</value>`
		`+ <value>animation:Fade</value>`
		`+ <value>animation:Fade</value>`
		`+ </default>`
		`+ @@ -114,9 +114,9 @@`
		`+ <min>50</min>`
		`+ <max>4000</max>`
		`+ <default>`
		`+ - <value>120</value>`
		`+ - <value>80</value>`
		`+ - <value>50</value>`
		`+ + <value>200</value>`
		`+ + <value>150</value>`
		`+ + <value>150</value>`
		`+ </default>`
		`+ </option>`
		`+ <option name="close_matches" type="list">`
		`+ @@ -124,8 +124,8 @@`
		`+ <_long>The windows that will be animated.</_long>`
		`+ <type>match</type>`
		`+ <default>`
		`+ - <value>((type=Normal \| Unknown) \| name=sun-awt-X11-XFramePeer \| name=sun-awt-X11-XDialogPeer) & !(role=toolTipTip \| role=qtooltip_label) & !(type=Normal & override_redirect=1) & !(name=gnome-screensaver) & !(name=gnome-screenshot)</value>`
		`+ - <value>((type=Menu \| PopupMenu \| DropdownMenu \| Combo \| Dialog \| ModalDialog \| Normal) & !(class=\\.exe$))</value>`
		`+ + <value>(type=Normal \| Dialog \| ModalDialog \| Unknown) & !(name=gnome-screensaver)</value>`
		`+ + <value>(type=Menu \| PopupMenu \| DropdownMenu \| Combo)</value>`
		`+ <value>(type=Tooltip \| Notification \| Utility) & !(name=compiz) & !(title=notify-osd)</value>`
		`+ </default>`
		`+ </option>`
		`+ @@ -168,7 +168,7 @@`
		`+ <extensible/>`
		`+ <sort start="2"/>`
		`+ <default>`
		`+ - <value>animation:Zoom</value>`
		`+ + <value>animation:Magic Lamp</value>`
		`+ </default>`
		`+ </option>`
		`+ <option name="minimize_durations" type="list">`
		`+ @@ -178,7 +178,7 @@`
		`+ <min>50</min>`
		`+ <max>4000</max>`
		`+ <default>`
		`+ - <value>220</value>`
		`+ + <value>300</value>`
		`+ </default>`
		`+ </option>`
		`+ <option name="minimize_matches" type="list">`
		`+ @@ -341,7 +341,7 @@`
		`+ <extensible/>`
		`+ <sort start="1"/>`
		`+ <default>`
		`+ - <value>animation:Fade</value>`
		`+ + <value>animation:None</value>`
		`+ </default>`
		`+ </option>`
		`+ <option name="focus_durations" type="list">`
		`+ @@ -351,7 +351,7 @@`
		`+ <min>50</min>`
		`+ <max>4000</max>`
		`+ <default>`
		`+ - <value>150</value>`
		`+ + <value>300</value>`
		`+ </default>`
		`+ </option>`
		`+ <option name="focus_matches" type="list">`
		`+ @@ -385,7 +385,7 @@`
		`+ <option name="time_step" type="int">`
		`+ <_short>Animation Time Step</_short>`
		`+ <_long>The amount of time in milliseconds between each render of the animation. The higher the number, the jerkier the movements become.</_long>`
		`+ - <default>16</default>`
		`+ + <default>10</default>`
		`+ <min>1</min>`
		`+ <max>400</max>`
		`+ </option>`
		`+ @@ -473,7 +473,7 @@`
		`+ <option name="glide2_away_position" type="float">`
		`+ <_short>Away Position</_short>`
		`+ <_long>Closeness of window to camera at the end of the animation (1.0: Close to camera, -2.0: Away from camera).</_long>`
		`+ - <default>-0.1</default>`
		`+ + <default>-0.4</default>`
		`+ <min>-2</min>`
		`+ <max>1</max>`
		`+ <precision>0.05</precision>`
		`+ @@ -481,7 +481,7 @@`
		`+ <option name="glide2_away_angle" type="float">`
		`+ <_short>Away Angle</_short>`
		`+ <_long>Angle of window at the end of the animation.</_long>`
		`+ - <default>0</default>`
		`+ + <default>-45</default>`
		`+ <min>-540</min>`
		`+ <max>540</max>`
		`+ <precision>5</precision>`
		`+ @@ -686,7 +686,7 @@`
		`+ <option name="zoom_springiness" type="float">`
		`+ <_short>Springiness</_short>`
		`+ <_long>How spring-like the Zoom animation should be.</_long>`
		`+ - <default>0.08</default>`
		`+ + <default>0.0</default>`
		`+ <min>0</min>`
		`+ <max>1</max>`
		`+ <precision>0.01</precision>`
		`+ diff -Nur original/plugins/commands/commands.xml.in modified/plugins/commands/commands.xml.in`
		`+ --- original/plugins/commands/commands.xml.in 2019-02-16 12:44:41.000000000 +0000`
		`+ +++ modified/plugins/commands/commands.xml.in 2019-02-17 14:11:58.766082647 +0000`
		`+ @@ -117,7 +117,7 @@`
		`+ <option name="command20" type="string">`
		`+ <_short>Command line 20</_short>`
		`+ <_long>Command line to be executed in shell when run_command20 is invoked</_long>`
		`+ - <default>/usr/bin/gnome-system-monitor -p</default>`
		`+ + <default></default>`
		`+ </option>`
		`+ </group>`
		`+ <group>`
		`+ @@ -205,7 +205,6 @@`
		`+ <option name="run_command20_key" type="key">`
		`+ <_short>Run command 20</_short>`
		`+ <_long>A keybinding that when invoked, will run the shell command identified by command20</_long>`
		`+ - <default><Control><Alt>Delete</default>`
		`+ </option>`
		`+ </group>`
		`+ <group>`
		`+ diff -Nur original/plugins/decor/decor.xml.in modified/plugins/decor/decor.xml.in`
		`+ --- original/plugins/decor/decor.xml.in 2019-02-16 12:44:41.000000000 +0000`
		`+ +++ modified/plugins/decor/decor.xml.in 2019-02-17 14:13:24.345517674 +0000`
		`+ @@ -31,7 +31,7 @@`
		`+ <option name="active_shadow_opacity" type="float">`
		`+ <_short>Shadow Opacity</_short>`
		`+ <_long>Drop shadow opacity</_long>`
		`+ - <default>0.8</default>`
		`+ + <default>0.5</default>`
		`+ <min>0.01</min>`
		`+ <max>6.0</max>`
		`+ <precision>0.01</precision>`
		`+ @@ -66,7 +66,7 @@`
		`+ <option name="inactive_shadow_radius" type="float">`
		`+ <_short>Shadow Radius</_short>`
		`+ <_long>Drop shadow radius</_long>`
		`+ - <default>5.0</default>`
		`+ + <default>8.0</default>`
		`+ <min>0.1</min>`
		`+ <max>13.0</max>`
		`+ <precision>0.1</precision>`
		`+ @@ -74,7 +74,7 @@`
		`+ <option name="inactive_shadow_opacity" type="float">`
		`+ <_short>Shadow Opacity</_short>`
		`+ <_long>Drop shadow opacity</_long>`
		`+ - <default>0.4</default>`
		`+ + <default>0.5</default>`
		`+ <min>0.01</min>`
		`+ <max>6.0</max>`
		`+ <precision>0.01</precision>`
		`+ @@ -101,7 +101,7 @@`
		`+ <option name="command" type="string">`
		`+ <_short>Command</_short>`
		`+ <_long>Decorator command line that is executed if no decorator is already running.</_long>`
		`+ - <default>gtk-window-decorator</default>`
		`+ + <default>exec /usr/bin/compiz-decorator</default>`
		`+ </option>`
		`+ <option name="mipmap" type="bool">`
		`+ <_short>Mipmap</_short>`
		`+ diff -Nur original/plugins/expo/expo.xml.in modified/plugins/expo/expo.xml.in`
		`+ --- original/plugins/expo/expo.xml.in 2019-02-16 12:44:41.000000000 +0000`
		`+ +++ modified/plugins/expo/expo.xml.in 2019-02-17 14:11:58.766082647 +0000`
		`+ @@ -17,7 +17,6 @@`
		`+ <plugin>wobbly</plugin>`
		`+ <plugin>animation</plugin>`
		`+ <plugin>wallpaper</plugin>`
		`+ - <plugin>imgpng</plugin>`
		`+ </relation>`
		`+ </deps>`
		`+ <options>`
		`+ @@ -26,7 +25,7 @@`
		`+ <option name="expo_key" type="key">`
		`+ <_short>Expo Key</_short>`
		`+ <_long>Initiate or terminate Expo mode with this keyboard shortcut.</_long>`
		`+ - <default><Super>s</default>`
		`+ + <default><Super>e</default>`
		`+ </option>`
		`+ <option name="expo_button" type="button">`
		`+ <_short>Expo Button</_short>`
		`+ @@ -37,6 +36,7 @@`
		`+ <_short>Expo Corner/Edge</_short>`
		`+ <_long>Initiate or terminate Expo mode by moving the pointer to this corner or edge of your screen(s).</_long>`
		`+ <default>`
		`+ + <edge name="TopLeft"/>`
		`+ </default>`
		`+ </option>`
		`+ <option name="double_click_time" type="int">`
		`+ @@ -80,7 +80,7 @@`
		`+ <option name="zoom_time" type="float">`
		`+ <_short>Animation Duration</_short>`
		`+ <_long>Duration of the selected animation (in seconds).</_long>`
		`+ - <default>0.3</default>`
		`+ + <default>0.5</default>`
		`+ <min>0.1</min>`
		`+ <max>5.0</max>`
		`+ <precision>0.1</precision>`
		`+ @@ -146,12 +146,12 @@`
		`+ <option name="x_offset" type="int">`
		`+ <_short>X Offset</_short>`
		`+ <_long>Horizontal offset (in pixels).</_long>`
		`+ - <default>64</default>`
		`+ + <default>0</default>`
		`+ </option>`
		`+ <option name="y_offset" type="int">`
		`+ <_short>Y Offset</_short>`
		`+ <_long>Vertical offset (in pixels).</_long>`
		`+ - <default>24</default>`
		`+ + <default>0</default>`
		`+ </option>`
		`+ <option name="y_bottom_offset" type="int">`
		`+ <_short>Y Bottom Offset</_short>`
		`+ @@ -170,7 +170,7 @@`
		`+ <option name="vp_distance" type="float">`
		`+ <_short>Viewport Distance</_short>`
		`+ <_long>The distance between viewports in Expo mode.</_long>`
		`+ - <default>0.2</default>`
		`+ + <default>0.10</default>`
		`+ <min>0.0</min>`
		`+ <max>1.0</max>`
		`+ <precision>0.01</precision>`
		`+ @@ -198,7 +198,7 @@`
		`+ <_long>How the Expo wall should be displayed, if multiple output devices are used.</_long>`
		`+ <min>0</min>`
		`+ <max>1</max>`
		`+ - <default>1</default>`
		`+ + <default>0</default>`
		`+ <desc>`
		`+ <value>0</value>`
		`+ <_name>One big wall</_name>`
		`+ @@ -213,7 +213,7 @@`
		`+ <option name="vp_brightness" type="float">`
		`+ <_short>Brightness</_short>`
		`+ <_long>The brightness of unfocused viewports (in percent).</_long>`
		`+ - <default>40.0</default>`
		`+ + <default>75.0</default>`
		`+ <min>0.0</min>`
		`+ <max>100.0</max>`
		`+ <precision>0.1</precision>`
		`+ @@ -233,7 +233,7 @@`
		`+ <red>0xfbfb</red>`
		`+ <green>0x8b8b</green>`
		`+ <blue>0x0</blue>`
		`+ - <alpha>0xffff</alpha>`
		`+ + <alpha>0x0</alpha>`
		`+ </default>`
		`+ </option>`
		`+ </subgroup>`
		`+ @@ -242,7 +242,7 @@`
		`+ <option name="reflection" type="bool">`
		`+ <_short>Reflection</_short>`
		`+ <_long>Render a realtime reflection of the viewports on the ground.</_long>`
		`+ - <default>false</default>`
		`+ + <default>true</default>`
		`+ </option>`
		`+ <option name="ground_color1" type="color">`
		`+ <_short>Ground Color (near)</_short>`
		`+ diff -Nur original/plugins/ezoom/ezoom.xml.in modified/plugins/ezoom/ezoom.xml.in`
		`+ --- original/plugins/ezoom/ezoom.xml.in 2019-02-16 12:44:41.000000000 +0000`
		`+ +++ modified/plugins/ezoom/ezoom.xml.in 2019-02-17 14:11:58.766082647 +0000`
		`+ @@ -30,7 +30,7 @@`
		`+ <option type="button" name="zoom_in_button">`
		`+ <_short>Zoom In Button</_short>`
		`+ <_long>Mouse button shortcut to invoke zooming in.</_long>`
		`+ - <default></default>`
		`+ + <default><Super>Button4</default>`
		`+ </option>`
		`+ <option type="key" name="zoom_in_key">`
		`+ <_short>Zoom In Key</_short>`
		`+ @@ -39,7 +39,7 @@`
		`+ <option type="button" name="zoom_out_button">`
		`+ <_short>Zoom Out Button</_short>`
		`+ <_long>Mouse button shortcut to invoke zooming out.</_long>`
		`+ - <default></default>`
		`+ + <default><Super>Button5</default>`
		`+ </option>`
		`+ <option type="key" name="zoom_out_key">`
		`+ <_short>Zoom Out Key</_short>`
		`+ @@ -48,7 +48,7 @@`
		`+ <option type="button" name="zoom_box_button">`
		`+ <_short>Invoke Zoom Box Button</_short>`
		`+ <_long>Define a rectangle area and zoom into it.</_long>`
		`+ - <default></default>`
		`+ + <default><Super>Button2</default>`
		`+ </option>`
		`+ <option name="zoom_box_outline_color" type="color">`
		`+ <_short>Zoom Box Outline Color</_short>`
		`+ @@ -346,7 +346,7 @@`
		`+ <option type="key" name="fit_to_window_key">`
		`+ <_short>Fit zoomed area to window</_short>`
		`+ <_long>Zooms in/out so the focused window is zoomed to the maximum while still being fully visible.</_long>`
		`+ - <default></default>`
		`+ + <default><Super>r</default>`
		`+ </option>`
		`+ </subgroup>`
		`+ </group>`
		`+ diff -Nur original/plugins/fade/fade.xml.in modified/plugins/fade/fade.xml.in`
		`+ --- original/plugins/fade/fade.xml.in 2019-02-16 12:44:41.000000000 +0000`
		`+ +++ modified/plugins/fade/fade.xml.in 2019-02-17 14:11:58.772752647 +0000`
		`+ @@ -10,7 +10,6 @@`
		`+ </requirement>`
		`+ <relation type="after">`
		`+ <plugin>decor</plugin>`
		`+ - <plugin>staticswitcher</plugin>`
		`+ </relation>`
		`+ <relation type="before">`
		`+ <plugin>cube</plugin>`
		`+ @@ -51,7 +50,7 @@`
		`+ <option name="window_match" type="match">`
		`+ <_short>Fade windows</_short>`
		`+ <_long>Windows that should be fading</_long>`
		`+ - <default>any & !(title=notify-osd)</default>`
		`+ + <default>any</default>`
		`+ </option>`
		`+ <option name="visual_bell" type="bell">`
		`+ <_short>Visual Bell</_short>`
		`+ diff -Nur original/plugins/gnomecompat/gnomecompat.xml.in modified/plugins/gnomecompat/gnomecompat.xml.in`
		`+ --- original/plugins/gnomecompat/gnomecompat.xml.in 2019-02-16 12:44:41.000000000 +0000`
		`+ +++ modified/plugins/gnomecompat/gnomecompat.xml.in 2019-02-17 14:11:58.772752647 +0000`
		`+ @@ -57,7 +57,6 @@`
		`+ <option name="run_command_terminal_key" type="key">`
		`+ <_short>Open a terminal</_short>`
		`+ <_long>Open a terminal</_long>`
		`+ - <default><Control><Alt>T</default>`
		`+ </option>`
		`+ </group>`
		`+ </options>`
		`+ diff -Nur original/plugins/grid/grid.xml.in modified/plugins/grid/grid.xml.in`
		`+ --- original/plugins/grid/grid.xml.in 2019-02-16 12:44:41.000000000 +0000`
		`+ +++ modified/plugins/grid/grid.xml.in 2019-02-17 14:11:58.779422647 +0000`
		`+ @@ -68,12 +68,12 @@`
		`+ <option name="put_maximize_key" type="key">`
		`+ <_short>Maximize Key</_short>`
		`+ <_long>Maximize window.</_long>`
		`+ - <default><Control><Super>Up</default>`
		`+ + <default><Control><Alt>KP_0</default>`
		`+ </option>`
		`+ <option name="put_restore_key" type="key">`
		`+ <_short>Restore</_short>`
		`+ <_long>Restore window to it's original size. Note: Use the same shortcut you are using to unmaximize a window to be able to restore grid-maximized windows.</_long>`
		`+ - <default><Control><Super>Down</default>`
		`+ + <default><Alt>F5</default>`
		`+ </option>`
		`+ <option name="left_maximize" type="key">`
		`+ <_short>Left Maximize</_short>`
		`+ diff -Nur original/plugins/resize/resize.xml.in modified/plugins/resize/resize.xml.in`
		`+ --- original/plugins/resize/resize.xml.in 2019-02-16 12:44:41.000000000 +0000`
		`+ +++ modified/plugins/resize/resize.xml.in 2019-02-17 14:11:58.779422647 +0000`
		`+ @@ -56,7 +56,7 @@`
		`+ <option name="maximize_vertically" type="bool">`
		`+ <short>Maximize Vertically if screen edge hit</short>`
		`+ <long>Maximizes the window vertically if the top or bottom screen edge is hit while resizing</long>`
		`+ - <default>true</default>`
		`+ + <default>false</default>`
		`+ </option>`
		`+ <option name="increase_border_contrast" type="bool">`
		`+ <_short>Use a double-border in 'Rectangle' and 'Outline' modes</_short>`
		`+ @@ -72,9 +72,9 @@`
		`+ <_short>Border Color</_short>`
		`+ <_long>Border color used for outline and rectangle resize modes</_long>`
		`+ <default>`
		`+ - <red>0xfbfb</red>`
		`+ - <green>0x8b8b</green>`
		`+ - <blue>0x0</blue>`
		`+ + <red>0x2f2f</red>`
		`+ + <green>0x2f2f</green>`
		`+ + <blue>0x4f4f</blue>`
		`+ <alpha>0x9f9f</alpha>`
		`+ </default>`
		`+ </option>`
		`+ @@ -82,10 +82,10 @@`
		`+ <_short>Fill Color</_short>`
		`+ <_long>Fill color used for rectangle resize mode</_long>`
		`+ <default>`
		`+ - <red>0xfbfb</red>`
		`+ - <green>0x8b8b</green>`
		`+ - <blue>0x0</blue>`
		`+ - <alpha>0x1919</alpha>`
		`+ + <red>0x2f2f</red>`
		`+ + <green>0x2f2f</green>`
		`+ + <blue>0x4f4f</blue>`
		`+ + <alpha>0x4f4f</alpha>`
		`+ </default>`
		`+ </option>`
		`+ <option name="disable_blend" type="bool">`
		`+ diff -Nur original/plugins/scale/scale.xml.in modified/plugins/scale/scale.xml.in`
		`+ --- original/plugins/scale/scale.xml.in 2019-02-16 12:44:41.000000000 +0000`
		`+ +++ modified/plugins/scale/scale.xml.in 2019-02-17 14:11:58.779422647 +0000`
		`+ @@ -21,7 +21,7 @@`
		`+ <option name="spacing" type="int">`
		`+ <_short>Spacing</_short>`
		`+ <_long>Space between windows</_long>`
		`+ - <default>20</default>`
		`+ + <default>10</default>`
		`+ <min>0</min>`
		`+ <max>250</max>`
		`+ </option>`
		`+ @@ -46,7 +46,7 @@`
		`+ <option name="speed" type="float">`
		`+ <_short>Speed</_short>`
		`+ <_long>Scale speed</_long>`
		`+ - <default>5.0</default>`
		`+ + <default>1.5</default>`
		`+ <min>0.1</min>`
		`+ <max>50</max>`
		`+ <precision>0.1</precision>`
		`+ @@ -54,7 +54,7 @@`
		`+ <option name="timestep" type="float">`
		`+ <_short>Timestep</_short>`
		`+ <_long>Scale timestep</_long>`
		`+ - <default>0.1</default>`
		`+ + <default>1.2</default>`
		`+ <min>0.1</min>`
		`+ <max>50</max>`
		`+ <precision>0.1</precision>`
		`+ @@ -67,7 +67,7 @@`
		`+ <option name="opacity" type="int">`
		`+ <_short>Opacity</_short>`
		`+ <_long>Amount of opacity in percent</_long>`
		`+ - <default>100</default>`
		`+ + <default>75</default>`
		`+ <min>0</min>`
		`+ <max>100</max>`
		`+ </option>`
		`+ @@ -76,7 +76,7 @@`
		`+ <_long>Overlay an icon on windows once they are scaled</_long>`
		`+ <min>0</min>`
		`+ <max>2</max>`
		`+ - <default>0</default>`
		`+ + <default>1</default>`
		`+ <desc>`
		`+ <value>0</value>`
		`+ <_name>None</_name>`
		`+ @@ -129,7 +129,7 @@`
		`+ <_long>Selects where windows are scaled if multiple output devices are used.</_long>`
		`+ <min>0</min>`
		`+ <max>1</max>`
		`+ - <default>1</default>`
		`+ + <default>0</default>`
		`+ <desc>`
		`+ <value>0</value>`
		`+ <_name>On current output device</_name>`
		`+ @@ -150,7 +150,7 @@`
		`+ <option name="key_bindings_toggle" type="bool">`
		`+ <_short>Key Bindings Toggle Scale Mode</_short>`
		`+ <_long>Key bindings toggle scale mode instead of enabling it when pressed and disabling it when released.</_long>`
		`+ - <default>true</default>`
		`+ + <default>false</default>`
		`+ </option>`
		`+ <option name="button_bindings_toggle" type="bool">`
		`+ <_short>Button Bindings Toggle Scale Mode</_short>`
		`+ @@ -160,12 +160,15 @@`
		`+ <option name="initiate_edge" type="edge">`
		`+ <_short>Initiate Window Picker</_short>`
		`+ <_long>Layout and start transforming windows</_long>`
		`+ + <default>`
		`+ + <edge name="TopRight"/>`
		`+ + </default>`
		`+ <allowed edgednd="true"/>`
		`+ </option>`
		`+ <option name="initiate_key" type="key">`
		`+ <_short>Initiate Window Picker</_short>`
		`+ <_long>Layout and start transforming windows</_long>`
		`+ - <default><Super>w</default>`
		`+ + <default><Shift><Alt>Up</default>`
		`+ </option>`
		`+ <option name="initiate_button" type="button">`
		`+ <_short>Initiate Window Picker</_short>`
		`+ @@ -183,7 +186,6 @@`
		`+ <option name="initiate_all_key" type="key">`
		`+ <_short>Initiate Window Picker For All Windows</_short>`
		`+ <_long>Layout and start transforming all windows</_long>`
		`+ - <default><Super><Shift>w</default>`
		`+ </option>`
		`+ <option name="initiate_group_edge" type="edge">`
		`+ <_short>Initiate Window Picker For Window Group</_short>`
		`+ diff -Nur original/plugins/staticswitcher/staticswitcher.xml.in modified/plugins/staticswitcher/staticswitcher.xml.in`
		`+ --- original/plugins/staticswitcher/staticswitcher.xml.in 2019-02-16 12:44:41.000000000 +0000`
		`+ +++ modified/plugins/staticswitcher/staticswitcher.xml.in 2019-02-17 14:11:58.782757647 +0000`
		`+ @@ -11,6 +11,7 @@`
		`+ <relation type="after">`
		`+ <plugin>composite</plugin>`
		`+ <plugin>opengl</plugin>`
		`+ + <plugin>fade</plugin>`
		`+ <plugin>compiztoolbox</plugin>`
		`+ <plugin>decor</plugin>`
		`+ </relation>`
		`+ @@ -139,12 +140,12 @@`
		`+ <option name="auto_change_vp" type="bool">`
		`+ <_short>Auto Change Viewport</_short>`
		`+ <_long>Change to the viewport of the selected window while switching</_long>`
		`+ - <default>true</default>`
		`+ + <default>false</default>`
		`+ </option>`
		`+ <option name="popup_delay" type="float">`
		`+ <_short>Popup Window Delay</_short>`
		`+ <_long>Time (in s) the popup window should be delayed before appearing</_long>`
		`+ - <default>0.2</default>`
		`+ + <default>0.0</default>`
		`+ <min>0.0</min>`
		`+ <max>2.0</max>`
		`+ <precision>0.05</precision>`
		`+ @@ -152,7 +153,7 @@`
		`+ <option name="mouse_select" type="bool">`
		`+ <_short>Allow Mouse Selection</_short>`
		`+ <_long>Allow selection of windows from the switcher window with the mouse</_long>`
		`+ - <default>true</default>`
		`+ + <default>false</default>`
		`+ </option>`
		`+ </group>`
		`+ <group>`
		`+ @@ -160,14 +161,14 @@`
		`+ <option name="saturation" type="int">`
		`+ <_short>Saturation</_short>`
		`+ <_long>Amount of saturation in percent</_long>`
		`+ - <default>100</default>`
		`+ + <default>50</default>`
		`+ <min>0</min>`
		`+ <max>100</max>`
		`+ </option>`
		`+ <option name="brightness" type="int">`
		`+ <_short>Brightness</_short>`
		`+ <_long>Amount of brightness in percent</_long>`
		`+ - <default>100</default>`
		`+ + <default>50</default>`
		`+ <min>0</min>`
		`+ <max>100</max>`
		`+ </option>`
		`+ @@ -191,7 +192,7 @@`
		`+ <option name="mipmap" type="bool">`
		`+ <_short>Mipmap</_short>`
		`+ <_long>Generate mipmaps when possible for higher quality scaling</_long>`
		`+ - <default>false</default>`
		`+ + <default>true</default>`
		`+ </option>`
		`+ <option name="row_align" type="int">`
		`+ <_short>Row Alignment</_short>`
		`+ @@ -220,7 +221,7 @@`
		`+ <option name="bring_to_front" type="bool">`
		`+ <_short>Bring To Front</_short>`
		`+ <_long>Bring selected window to front</_long>`
		`+ - <default>false</default>`
		`+ + <default>true</default>`
		`+ </option>`
		`+ <_short>Selected Window Highlight</_short>`
		`+ <option name="highlight_mode" type="int">`
		`+ @@ -228,7 +229,7 @@`
		`+ <_long>Mode for highlighting the currently selected window</_long>`
		`+ <min>0</min>`
		`+ <max>2</max>`
		`+ - <default>0</default>`
		`+ + <default>1</default>`
		`+ <desc>`
		`+ <value>0</value>`
		`+ <_name>None</_name>`
		`+ diff -Nur original/plugins/vpswitch/vpswitch.xml.in modified/plugins/vpswitch/vpswitch.xml.in`
		`+ --- original/plugins/vpswitch/vpswitch.xml.in 2019-02-16 12:44:41.000000000 +0000`
		`+ +++ modified/plugins/vpswitch/vpswitch.xml.in 2019-02-17 14:11:58.782757647 +0000`
		`+ @@ -95,11 +95,13 @@`
		`+ <option name="next_button" type="button">`
		`+ <_short>Move Next</_short>`
		`+ <_long>Move to the next viewport</_long>`
		`+ + <default>Button5</default>`
		`+ <internal/>`
		`+ </option>`
		`+ <option name="prev_button" type="button">`
		`+ <_short>Move Prev</_short>`
		`+ <_long>Move to the previous viewport</_long>`
		`+ + <default>Button4</default>`
		`+ <internal/>`
		`+ </option>`
		`+ <option name="initiate_button" type="button">`
		`+ diff -Nur original/plugins/wall/wall.xml.in modified/plugins/wall/wall.xml.in`
		`+ --- original/plugins/wall/wall.xml.in 2019-02-16 12:44:41.000000000 +0000`
		`+ +++ modified/plugins/wall/wall.xml.in 2019-02-17 14:11:58.782757647 +0000`
		`+ @@ -30,12 +30,12 @@`
		`+ <option name="miniscreen" type="bool">`
		`+ <_short>Show Live Viewport Previews</_short>`
		`+ <_long>Show live viewport previews in switcher window</_long>`
		`+ - <default>true</default>`
		`+ + <default>false</default>`
		`+ </option>`
		`+ <option name="preview_timeout" type="float">`
		`+ <_short>Switch Target Preview Visibility Time</_short>`
		`+ <_long>Duration (in s) the switch target preview should remain visible after switching ends.</_long>`
		`+ - <default>0.2</default>`
		`+ + <default>0.4</default>`
		`+ <min>0.0</min>`
		`+ <max>2.0</max>`
		`+ <precision>0.05</precision>`
		`+ @@ -43,7 +43,7 @@`
		`+ <option name="preview_scale" type="int">`
		`+ <_short>Preview Scale</_short>`
		`+ <_long>Size of the preview in %</_long>`
		`+ - <default>130</default>`
		`+ + <default>100</default>`
		`+ <min>0</min>`
		`+ <max>400</max>`
		`+ </option>`
		`+ @@ -57,7 +57,7 @@`
		`+ <option name="border_width" type="int">`
		`+ <_short>Border Width</_short>`
		`+ <_long>Width of the border between the previews</_long>`
		`+ - <default>7</default>`
		`+ + <default>10</default>`
		`+ <min>0</min>`
		`+ <max>30</max>`
		`+ </option>`
		`+ @@ -65,10 +65,10 @@`
		`+ <_short>Outline Color</_short>`
		`+ <_long>Outline color of the switcher window.</_long>`
		`+ <default>`
		`+ - <red>0xffff</red>`
		`+ - <green>0xffff</green>`
		`+ - <blue>0xffff</blue>`
		`+ - <alpha>0x3232</alpha>`
		`+ + <red>0x3333</red>`
		`+ + <green>0x3333</green>`
		`+ + <blue>0x3333</blue>`
		`+ + <alpha>0xd998</alpha>`
		`+ </default>`
		`+ </option>`
		`+ <subgroup>`
		`+ @@ -78,30 +78,30 @@`
		`+ <_short>Base Color</_short>`
		`+ <_long>First color for the background gradient of the switcher window.</_long>`
		`+ <default>`
		`+ - <red>0x0000</red>`
		`+ - <green>0x0000</green>`
		`+ - <blue>0x0000</blue>`
		`+ - <alpha>0x6464</alpha>`
		`+ + <red>0xcccc</red>`
		`+ + <green>0xcccc</green>`
		`+ + <blue>0xe665</blue>`
		`+ + <alpha>0xd998</alpha>`
		`+ </default>`
		`+ </option>`
		`+ <option name="background_gradient_highlight_color" type="color">`
		`+ <_short>Highlight Color</_short>`
		`+ <_long>Second color for the background gradient of the switcher window.</_long>`
		`+ <default>`
		`+ - <red>0x0000</red>`
		`+ - <green>0x0000</green>`
		`+ - <blue>0x0000</blue>`
		`+ - <alpha>0x6464</alpha>`
		`+ + <red>0xf332</red>`
		`+ + <green>0xf332</green>`
		`+ + <blue>0xffff</blue>`
		`+ + <alpha>0xd998</alpha>`
		`+ </default>`
		`+ </option>`
		`+ <option name="background_gradient_shadow_color" type="color">`
		`+ <_short>Shadow Color</_short>`
		`+ <_long>Third color for the background gradient of the switcher window.</_long>`
		`+ <default>`
		`+ - <red>0x0000</red>`
		`+ - <green>0x0000</green>`
		`+ - <blue>0x0000</blue>`
		`+ - <alpha>0x6464</alpha>`
		`+ + <red>0xf332</red>`
		`+ + <green>0xf332</green>`
		`+ + <blue>0xffff</blue>`
		`+ + <alpha>0xd998</alpha>`
		`+ </default>`
		`+ </option>`
		`+ </subgroup>`
		`+ @@ -112,20 +112,20 @@`
		`+ <_short>Base Color</_short>`
		`+ <_long>First color for the thumb gradient of the switcher window.</_long>`
		`+ <default>`
		`+ - <red>0x5555</red>`
		`+ - <green>0x5555</green>`
		`+ - <blue>0x5555</blue>`
		`+ - <alpha>0x3232</alpha>`
		`+ + <red>0x3333</red>`
		`+ + <green>0x3333</green>`
		`+ + <blue>0x3333</blue>`
		`+ + <alpha>0x5999</alpha>`
		`+ </default>`
		`+ </option>`
		`+ <option name="thumb_gradient_highlight_color" type="color">`
		`+ <_short>Highlight Color</_short>`
		`+ <_long>Second color for the thumb gradient of the switcher window.</_long>`
		`+ <default>`
		`+ - <red>0x5555</red>`
		`+ - <green>0x5555</green>`
		`+ - <blue>0x5555</blue>`
		`+ - <alpha>0x3232</alpha>`
		`+ + <red>0x3fff</red>`
		`+ + <green>0x3fff</green>`
		`+ + <blue>0x3fff</blue>`
		`+ + <alpha>0x3fff</alpha>`
		`+ </default>`
		`+ </option>`
		`+ </subgroup>`
		`+ @@ -139,7 +139,7 @@`
		`+ <red>0xffff</red>`
		`+ <green>0xffff</green>`
		`+ <blue>0xffff</blue>`
		`+ - <alpha>0xffff</alpha>`
		`+ + <alpha>0xf332</alpha>`
		`+ </default>`
		`+ </option>`
		`+ <option name="thumb_highlight_gradient_shadow_color" type="color">`
		`+ @@ -149,7 +149,7 @@`
		`+ <red>0xdfff</red>`
		`+ <green>0xdfff</green>`
		`+ <blue>0xdfff</blue>`
		`+ - <alpha>0xffff</alpha>`
		`+ + <alpha>0xa665</alpha>`
		`+ </default>`
		`+ </option>`
		`+ </subgroup>`
		`+ @@ -201,7 +201,7 @@`
		`+ <option name="auto_switch_vp_and_window" type="bool">`
		`+ <_short>Auto Switch Vp And Window</_short>`
		`+ <_long>Auto switch the viewport and move window when Alt-Tab to window that is more than half contained in another viewport</_long>`
		`+ - <default>false</default>`
		`+ + <default>true</default>`
		`+ </option>`
		`+ </group>`
		`+ <group>`
		`+ @@ -356,7 +356,7 @@`
		`+ <option name="edgeflip_move" type="bool">`
		`+ <_short>Edge Flip Move</_short>`
		`+ <_long>Flip viewport when moving a window to a screen edge</_long>`
		`+ - <default>false</default>`
		`+ + <default>true</default>`
		`+ </option>`
		`+ <option name="edgeflip_dnd" type="bool">`
		`+ <_short>Edge Flip DnD</_short>`
		`+ diff -Nur original/tests/system/xorg-gtest/tests/compiz_xorg_gtest_ewmh.cpp modified/tests/system/xorg-gtest/tests/compiz_xorg_gtest_ewmh.cpp`
		`+ --- original/tests/system/xorg-gtest/tests/compiz_xorg_gtest_ewmh.cpp 2019-02-16 12:44:41.000000000 +0000`
		`+ +++ modified/tests/system/xorg-gtest/tests/compiz_xorg_gtest_ewmh.cpp 2019-02-17 14:11:58.782757647 +0000`
		`+ @@ -46,7 +46,7 @@`
		`+`
		`+ namespace`
		`+ {`
		`+ -unsigned int DEFAULT_VIEWPORT_WIDTH = 1;`
		`+ +unsigned int DEFAULT_VIEWPORT_WIDTH = 4;`
		`+ unsigned int DEFAULT_VIEWPORT_HEIGHT = 1;`
		`+`
		`+ bool Advance (Display *d, bool r)`

pcr/compiz/screenshot-launch-fix.patch

file added

+15

		`@@ -0,0 +1,15 @@`
		`+ diff -rupN compiz/plugins/screenshot/src/screenshot.cpp compiz.new/plugins/screenshot/src/screenshot.cpp`
		`+ --- compiz/plugins/screenshot/src/screenshot.cpp 2014-09-01 00:21:45.807271000 -0400`
		`+ +++ compiz.new/plugins/screenshot/src/screenshot.cpp 2014-09-01 00:52:30.634288167 -0400`
		`+ @@ -434,10 +434,10 @@ namespace`
		`+ compLogMessage ("screenshot", CompLogLevelWarn, "glReadPixels failed");`
		`+ }`
		`+`
		`+ - if (!success)`
		`+ + if (success)`
		`+ success =`
		`+ launchApplicationAndTakeScreenshot (alternativeApplication,`
		`+ - directory);`
		`+ + path);`
		`+`
		`+ return success;`
		`\ No newline at end of file`

pcr/compiz/trailfocus-fix.patch

file removed

-12

		`@@ -1,12 +0,0 @@`
		`- diff -Nur original/plugins/trailfocus/src/trailfocus.cpp modified/plugins/trailfocus/src/trailfocus.cpp`
		`- --- original/plugins/trailfocus/src/trailfocus.cpp 2015-08-20 14:01:09.000000000 +0100`
		`- +++ modified/plugins/trailfocus/src/trailfocus.cpp 2016-05-08 13:57:35.867366143 +0100`
		`- @@ -195,7 +195,7 @@`
		`- }`
		`- else`
		`- {`
		`- - distance = abs (cur->activeNum () - best->activeNum ());`
		`- + distance = abs ((int)(cur->activeNum () - best->activeNum ()));`
		`- if (distance < bestDist)`
		`- {`
		`- best = cur;`

pcr/conky-lua/PKGBUILD

file modified

+7 -7

		`@@ -1,10 +1,10 @@`
		`- # Contributor (Arch): Renato Garcia <fgarcia.renato@gmail.com>`
		`- # Contributor (Arch): Giovanni Scafora <giovanni@archlinux.org>`
		`- # Contributor (Arch): James Rayner <james@archlinux.org>`
		`- # Contributor (Arch): Partha Chowdhury <kira.laucas@gmail.com>`
		`- # Contributor (Arch): Gaetan Bisson <bisson@archlinux.org>`
		`- # Maintainer : Parabola GNU / Linux-libre Aurelien Desbrieres <aurelien@cwb.io>`
		`- # Contributor : Omar Vega Ramos <ovruni@gnu.org.pe>`
		`+ # Contributor: Renato Garcia <fgarcia.renato@gmail.com>`
		`+ # Contributor: Giovanni Scafora <giovanni@archlinux.org>`
		`+ # Contributor: James Rayner <james@archlinux.org>`
		`+ # Contributor: Partha Chowdhury <kira.laucas@gmail.com>`
		`+ # Contributor: Gaetan Bisson <bisson@archlinux.org>`
		`+ # Maintainer: Aurélien Desbrières <aurelien@cwb.io>`
		`+ # Contributor: Omar Vega Ramos <ovruni@gnu.org.pe>`

		`pkgname=conky-lua`
		`_pkgname=conky`

pcr/connman-ui-git/PKGBUILD

file modified

+2 -2

		`@@ -1,5 +1,5 @@`
		`- # Maintainer (Arch): Bertrand Bonnefoy-Claudet <bertrandbc@gmail.com>`
		`- # Contributor (Arch): Timothy Lee <timothy.ty.lee@gmail.com>`
		`+ # Maintainer (arch): Bertrand Bonnefoy-Claudet <bertrandbc@gmail.com>`
		`+ # Contributor: Timothy Lee <timothy.ty.lee@gmail.com>`
		`# Maintainer: Omar Vega Ramos <ovruni@gnu.org.pe>`

		`pkgname=connman-ui-git`

pcr/cpptest/PKGBUILD

file modified

+1 -1

		`@@ -1,5 +1,5 @@`
		`# Maintainer: Jorge Araya Navarro <jorgean@lavabit.com>`
		`- # Contributor (aur): Juan Pablo Gonzalez Tognarelli <lord_jotape@yahoo.com.ar>`
		`+ # Contributor: Juan Pablo Gonzalez Tognarelli <lord_jotape@yahoo.com.ar>`
		`pkgname=cpptest`
		`pkgver=1.1.2`
		`pkgrel=2`

pcr/cpuminer/PKGBUILD

file modified

+2 -2

		`@@ -1,5 +1,5 @@`
		`- # Contributor (Arch): gee`
		`- # Maintainer : Omar Vega Ramos <ovruni@gnu.org.pe>`
		`+ # Contributor: gee`
		`+ # Maintainer: Omar Vega Ramos <ovruni@gnu.org.pe>`

		`pkgname=cpuminer`
		`pkgver=2.4`

pcr/cronic/PKGBUILD

file modified

+1 -1

		`@@ -1,4 +1,4 @@`
		`- # Maintainer (AUR): Tom Hacohen <tom@stosb.com>`
		`+ # Maintainer (aur): Tom Hacohen <tom@stosb.com>`
		`# Maintainer: Luke Shumaker <lukeshu@sbcglobal.net>`

		`# parabola changes and rationale:`

pcr/crosstool-ng/PKGBUILD

file modified

+3 -3

		`@@ -1,6 +1,6 @@`
		`- # Maintainer (Arch): Bartłomiej Piotrowski <bpiotrowski@archlinux.org>`
		`- # Contributor (Arch): jwwolf <jwwolf+arch@gmail.com>`
		`- # Contributor (Arch): Bernhard Walle <bernhard@bwalle.de>`
		`+ # Maintainer (arch): Bartłomiej Piotrowski <bpiotrowski@archlinux.org>`
		`+ # Contributor: jwwolf <jwwolf+arch@gmail.com>`
		`+ # Contributor: Bernhard Walle <bernhard@bwalle.de>`
		`# Maintainer: fauno <fauno@kiwwwi.com.ar>`
		`# Contributor: André Silva <emulatorman@hyperbola.info>`
		`# Contributor: Márcio Silva <coadde@hyperbola.info>`

pcr/csound-blue/PKGBUILD

file modified

+3 -3

		`@@ -1,7 +1,7 @@`
		`# Maintainer (AUR): Ainola`
		`- # Contributor (AUR): Arch Linux Pro Audio`
		`- # Contributor (AUR): SpepS`
		`- # Contributor (AUR): Bernardo Barros`
		`+ # Contributor: Arch Linux Pro Audio`
		`+ # Contributor: SpepS`
		`+ # Contributor: Bernardo Barros`

		`# parabola changes and rationale:`
		`# no changes.`

pcr/ctpp2/PKGBUILD

file modified

+2 -2

		`@@ -1,5 +1,5 @@`
		`- # Maintainer (Arch): Daichi Shinozaki <dsdseg@gmail.com>`
		`- # Contributor (Arch): Valentin V. Bartenev <ne@vbart.ru> http://vbart.info/`
		`+ # Maintainer (arch): Daichi Shinozaki <dsdseg@gmail.com>`
		`+ # Contributor: Valentin V. Bartenev <ne@vbart.ru> http://vbart.info/`

		`pkgname=ctpp2`
		`pkgver=2.8.3`

pcr/cw/PKGBUILD

file modified

+2 -2

		`@@ -1,5 +1,5 @@`
		`- # Contributor (Arch): William Díaz <wdiaz[at]archlinux[dot]us>`
		`- # Maintainer : Parabola GNU / Linux-libre Aurelien Desbrieres <aurelien@cwb.io>`
		`+ # Contributor: William Díaz <wdiaz[at]archlinux[dot]us>`
		`+ # Maintainer: Aurélien Desbrières <aurelien@cwb.io>`

		`pkgname=cw`
		`pkgver=1.0.16`

pcr/cwiid/PKGBUILD

file modified

+5 -5

		`@@ -1,9 +1,9 @@`
		`# $Id: PKGBUILD 271927 2017-12-02 20:55:03Z dvzrv $`
		`- # Maintainer (AUR): David Runge <dave@sleepmap.de>`
		`- # Contributor (AUR): speps <speps at aur dot archlinux dot org>`
		`- # Contributor (AUR): Ray Rashif <schiv@archlinux.org>`
		`- # Contributor (AUR): Wieland Hoffmann <the_mineo@web.de>`
		`- # Contributor (AUR): Birger Moellering <bmoellering@googlemail.com>`
		`+ # Maintainer (aur): David Runge <dave@sleepmap.de>`
		`+ # Contributor: speps <speps at aur dot archlinux dot org>`
		`+ # Contributor: Ray Rashif <schiv@archlinux.org>`
		`+ # Contributor: Wieland Hoffmann <the_mineo@web.de>`
		`+ # Contributor: Birger Moellering <bmoellering@googlemail.com>`
		`# 2018/01/03: <dropped from community; upstream dead, unneeded>`
		`# 2012/06/05: <added into community as supercollider dependency>`
		`# 2012/03/21: <dropped from community; broken + see bug #28344>`

pcr/czmq/PKGBUILD

file modified

+2 -2

		`@@ -1,5 +1,5 @@`
		`- # Contributor (Arch): Aleksey Filippov <sarum9in@gmail.com>`
		`- # Contributor (Arch): Friedrich Weber <fred@reichbier.de>`
		`+ # Contributor: Aleksey Filippov <sarum9in@gmail.com>`
		`+ # Contributor: Friedrich Weber <fred@reichbier.de>`
		`# Maintainer: Omar Vega Ramos <ovruni@gnu.org.pe>`
		`pkgname=czmq`
		`pkgver=3.0.2`

pcr/darcsver/PKGBUILD

file modified

+3 -3

		`@@ -1,6 +1,6 @@`
		`- # Maintainer (AUR): Andreas B. Wagner <AndreasBWagner@pointfree.net>`
		`- # Maintainer (AUR): Nicolas Pouillard <nicolas.pouillard@gmail.com>`
		`- # Contributor (AUR): Peter Simons <simons@cryp.to>`
		`+ # Maintainer (aur): Andreas B. Wagner <AndreasBWagner@pointfree.net>`
		`+ # Maintainer (aur): Nicolas Pouillard <nicolas.pouillard@gmail.com>`
		`+ # Contributor: Peter Simons <simons@cryp.to>`

		`# parabola changes and rationale:`
		`# - adding license to package`

pcr/dbus-elogind/PKGBUILD

file modified

+5 -5

		`@@ -1,8 +1,8 @@`
		`- # Maintainer (Artix): artoo <artoo@manjaro.org>`
		`- # Contributor (Arch): Jan de Groot <jgc@archlinux.org>`
		`- # Contributor (Arch): Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>`
		`- # Contributor (Arch): Tom Gundersen <teg@jklm.no>`
		`- # Contributor (Arch): Link Dupont <link@subpop.net>`
		`+ # Maintainer (artix): artoo <artoo@manjaro.org>`
		`+ # Contributor: Jan de Groot <jgc@archlinux.org>`
		`+ # Contributor: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>`
		`+ # Contributor: Tom Gundersen <teg@jklm.no>`
		`+ # Contributor: Link Dupont <link@subpop.net>`
		`# Maintainer: Omar Vega Ramos <ovruni@gnu.org.pe>`
		`# Maintainer: David P. <megver83@parabola.nu>`

pcr/deutex/PKGBUILD

file modified

+1 -1

		`@@ -1,4 +1,4 @@`
		`- # Maintainer (Arch): Mike Swanson <mikeonthecomputer@gmail.com>`
		`+ # Maintainer (arch): Mike Swanson <mikeonthecomputer@gmail.com>`
		`# Maintainer: Omar Vega Ramos <ovruni@gnu.org.pe>`

		`pkgname=deutex`

pcr/devmem/PKGBUILD

file modified

+3 -3

		`@@ -1,6 +1,6 @@`
		`- # Contributor (Arch) : Brice Waegeneire < brice dot wge at gmail dot com >`
		`- # Contributor (Arch) : Alexander Lam <lambchop468 AT gmail.com>`
		`- # Maintainer (Parabola) : Aurélien DESBRIÈRES <aurelien@hackers.camp>`
		`+ # Contributor: Brice Waegeneire < brice dot wge at gmail dot com >`
		`+ # Contributor: Alexander Lam <lambchop468 AT gmail.com>`
		`+ # Maintainer: Aurélien Desbrières <aurelien@hackers.camp>`

		`# parabola changes and rationale:`
		`# - no longer maintained by Arch / AUR`

pcr/dianara/PKGBUILD

file modified

+3 -3

		`@@ -1,6 +1,6 @@`
		`- # Maintainer (Arch): Icaro Perseo <icaroperseo[at]protonmail[dot]com>`
		`- # Contributor (Arch): Eugenio M. Vigo <emvigo@gmail.com>`
		`- # Contributor (Arch): speps <speps at aur dot archlinux dot org>`
		`+ # Maintainer (arch): Icaro Perseo <icaroperseo[at]protonmail[dot]com>`
		`+ # Contributor: Eugenio M. Vigo <emvigo@gmail.com>`
		`+ # Contributor: speps <speps at aur dot archlinux dot org>`
		`# Maintainer: Omar Vega Ramos <ovruni@gnu.org.pe>`

		`pkgname=dianara`

pcr/discosrv/PKGBUILD

file modified

+1 -1

		`@@ -1,4 +1,4 @@`
		`- # Maintainer : fauno <fauno@parabola.nu>`
		`+ # Maintainer: fauno <fauno@parabola.nu>`

		`_pkgname=discosrv`
		`pkgname=${_pkgname}-git`

pcr/django-social-auth/PKGBUILD

file modified

+2 -2

		`@@ -1,6 +1,6 @@`
		`- # Maintainer (AUR): Benjamin A. Shelton <zancarius at gmail _ com>`
		`+ # Maintainer (aur): Benjamin A. Shelton <zancarius at gmail _ com>`
		`# Source (AUR): https://github.com/zancarius/archlinux-pkgbuilds`
		`- # Maintainer : Parabola GNU / Linux-libre Aurelien Desbrieres <aurelien@cwb.IO>`
		`+ # Maintainer: Aurélien Desbrières <aurelien@cwb.io>`

		`# parabola changes and rationale:`
		`# - corrected license`

pcr/dolphin-root/PKGBUILD

file modified

+2 -2

		`@@ -1,6 +1,6 @@`
		`# Maintainer: David P. <megver83@parabola.nu>`
		`- # Maintainer (Arch): Antonio Rojas <arojas@archlinux,org>`
		`- # Maintainer (Arch): Felix Yan <felixonmars@archlinux.org>`
		`+ # Maintainer (arch): Antonio Rojas <arojas@archlinux,org>`
		`+ # Maintainer (arch): Felix Yan <felixonmars@archlinux.org>`
		`# Contributor: Andrea Scarpino <andrea@archlinux.org>`
		`# Contributor: Pierre Schmitz <pierre@archlinux.de>`

pcr/dosfstools/PKGBUILD

file modified

+1 -1

		`@@ -1,5 +1,5 @@`
		`# Committer(Arch): Judd Vinet <jvinet@zeroflux.org>`
		`- # Maintainers: Parabola hackers <dev@lists.parabola.nu>`
		`+ # Maintainer: Parabola Hackers <dev@lists.parabola.nu>`
		`#`
		`# On armv7h the dosfstools is been missing from the official Parabola`
		`# repository for months. Since it was supposed to be fixed fast and it`

pcr/doxymacs/PKGBUILD

file modified

+2 -2

		`@@ -1,5 +1,5 @@`
		`- # Contributor (Arch): Limao Luo <luolimao+AUR@gmail.com>`
		`- # Maintainer : Parabola GNU / Linux-libre Aurelien Desbrieres <aurelien@cwb.io>`
		`+ # Contributor: Limao Luo <luolimao+AUR@gmail.com>`
		`+ # Maintainer: Aurélien Desbrières <aurelien@cwb.io>`

		`pkgname=doxymacs`
		`pkgver=1.8.0`

pcr/dratmenu/PKGBUILD

file modified

+1 -1

		`@@ -1,5 +1,5 @@`
		`# $Id: pkgbuild-mode.el,v 1.23 2007/10/20 16:02:14 juergen Exp $`
		`- # Maintainer : Parabola Aurélien DESBRIÈRES <aurelien@hackers.camp>`
		`+ # Maintainer: Aurélien Desbrières <aurelien@hackers.camp>`
		`# Contributor: ivoarch <ivkuzev@gmail.com>`

		`pkgname=dratmenu`

pcr/dreamchess-git/PKGBUILD

file modified

+1 -1

		`@@ -1,4 +1,4 @@`
		`- # Maintainer (AUR): Samuel Walladge <samuel at swalladge dot id dot au>`
		`+ # Maintainer (aur): Samuel Walladge <samuel at swalladge dot id dot au>`

		`pkgname=dreamchess-git`
		`_pkgname=dreamchess`

pcr/drm_info/PKGBUILD

file modified

+2 -2

		`@@ -1,5 +1,5 @@`
		`- # Maintainer (AUR): emersion <contact emersion fr>`
		`- # Maintainers: Parabola hackers <dev@lists.parabola.nu>`
		`+ # Maintainer (aur): emersion <contact emersion fr>`
		`+ # Maintainer: Parabola Hackers <dev@lists.parabola.nu>`

		`# parabola changes and rationale:`
		`# - Added armv7h and i686 support`

pcr/dsh/PKGBUILD

file modified

+1 -1

		`@@ -1,4 +1,4 @@`
		`- # Contributor (Arch): SkiltZ <skiltz@free.fr>`
		`+ # Contributor: SkiltZ <skiltz@free.fr>`
		`# Maintainer: Omar Vega Ramos <ovruni@gnu.org.pe>`
		`pkgname=dsh`
		`pkgver=0.25.9`

pcr/dunst-next/PKGBUILD

file modified

+2 -2

		`@@ -1,6 +1,6 @@`
		`# Maintainer: Luke Shumaker <lukeshu@parabola.nu>`
		`- # Maintainer (Arch:dunst): Daniel Wallace <danielwallace at gtmanfred dot com>`
		`- # Contributor (Arch:dunst): feuri`
		`+ # Maintainer (arch:dunst): Daniel Wallace <danielwallace at gtmanfred dot com>`
		`+ # Contributor: feuri`

		`_pkgname=dunst`
		`_pkgver=1.2.0`

pcr/econnman/PKGBUILD

file modified

+1 -1

		`@@ -1,4 +1,4 @@`
		`- # Maintainer (AUR): Doug Newgard <scimmia22 at outlook dot com>`
		`+ # Maintainer (aur): Doug Newgard <scimmia22 at outlook dot com>`
		`# Maintainer: Omar Vega Ramos <ovruni@gnu.org.pe>`

		`# parabola changes and rationale:`

pcr/egypt/PKGBUILD

file modified

+2 -2

		`@@ -1,5 +1,5 @@`
		`- # Maintainer (AUR): Baptiste Jonglez <baptiste--aur at jonglez dot org>`
		`- # Maintainer : Aurélien DESBRIÈRES <aurelien@hackers.camp>`
		`+ # Maintainer (aur): Baptiste Jonglez <baptiste--aur at jonglez dot org>`
		`+ # Maintainer: Aurélien Desbrières <aurelien@hackers.camp>`

		`# parabola changes and rationale:`
		`# no changes.`

pcr/eid-mw/PKGBUILD

file modified

+4 -4

		`@@ -1,7 +1,7 @@`
		`- # Maintainer (Arch): Emil Vanherp <emil DOT vanherp @ hot mail DOT com>`
		`- # Contributor (Arch): Alad Wenter <https://wiki.archlinux.org/index.php/Special:EmailUser/Alad>`
		`- # Contributor (Arch): Xavier D. <magicrhesus@ouranos.be>`
		`- # Contributor (Arch): Valere Monseur <valere.monseur@ymail.com>`
		`+ # Maintainer (arch): Emil Vanherp <emil DOT vanherp @ hot mail DOT com>`
		`+ # Contributor: Alad Wenter <https://wiki.archlinux.org/index.php/Special:EmailUser/Alad>`
		`+ # Contributor: Xavier D. <magicrhesus@ouranos.be>`
		`+ # Contributor: Valere Monseur <valere.monseur@ymail.com>`
		`# Maintainer: Omar Vega Ramos <ovruni@gnu.org.pe>`

		`pkgname=eid-mw`

pcr/elogind/PKGBUILD

file modified

+1 -1

		`@@ -1,4 +1,4 @@`
		`- # Maintainer (Artix): artoo <artoo@cromnix.org>`
		`+ # Maintainer (artix): artoo <artoo@cromnix.org>`
		`# Maintainer: Omar Vega Ramos <ovruni@gnu.org.pe>`
		`# Maintainer: David P. <megver83@parabola.nu>`
		`# Contributor: Luke Shumaker <lukeshu@parabola.nu>`

pcr/emacs-auto-complete/PKGBUILD

file modified

+2 -2

		`@@ -1,5 +1,5 @@`
		`- # Maintainer (AUR): Alex Whitt <alex.joseph.whitt@gmail.com>`
		`- # Maintainer : Parabola GNU / Linux-libre Aurelien Desbrieres <aurelien@cwb.io>`
		`+ # Maintainer (aur): Alex Whitt <alex.joseph.whitt@gmail.com>`
		`+ # Maintainer: Aurélien Desbrières <aurelien@cwb.io>`

		`# parabola changes and rationale:`
		`# - added replaces for previous pkgname auto-complete (2018-02-01)`

pcr/emacs-color-theme/PKGBUILD

file modified

+3 -5

		`@@ -1,8 +1,6 @@`
		`- # $Id: PKGBUILD 59903 2011-12-02 11:18:13Z andrea $`
		`- # Maintainer (AUR:`
		`- # Contributor (AUR): Stefan Husmann <stefan-husmann@t-online.de>`
		`- # Contributor (AUR): Cesar Romero <cesar.romero@gmail.com>`
		`- # Maintainer : Parabola GNU / Linux-libre <aurelien@cwb.io>`
		`+ # Maintainer (aur): Stefan Husmann <stefan-husmann@t-online.de>`
		`+ # Contributor: Cesar Romero <cesar.romero@gmail.com>`
		`+ # Maintainer: Aurélien Desbrières <aurelien@cwb.io>`

		`# parabola changes and rationale:`
		`# no changes.`

pcr/emacs-dash/PKGBUILD

file modified

+3 -3

		`@@ -1,7 +1,7 @@`
		`- # Contributor (AUR): ebiadsu`
		`+ # Contributor: ebiadsu`
		`# Previous Maintainer (AUR): holos`
		`- # Contributor (AUR): Sebastien Duthil <duthils@free.fr>`
		`- # Maintainer (AUR): Stefan Husmann <stefan-husmann@t-online.de>`
		`+ # Contributor: Sebastien Duthil <duthils@free.fr>`
		`+ # Maintainer (aur): Stefan Husmann <stefan-husmann@t-online.de>`

		`# parabola changes and rationale:`
		`# no changes.`

pcr/emacs-elib/PKGBUILD

file modified

+3 -3

		`@@ -1,6 +1,6 @@`
		`- # Contributor (Arch): J. Bromley <jbromley@gmail.com>`
		`- # Contributor (Arch): Stefan Husmann <stefan-husmann@t-online.de>`
		`- # Maintainer : Parabola GNU / Linux-libre Aurelien Desbrieres <aurelien@cwb.io>`
		`+ # Contributor: J. Bromley <jbromley@gmail.com>`
		`+ # Contributor: Stefan Husmann <stefan-husmann@t-online.de>`
		`+ # Maintainer: Aurélien Desbrières <aurelien@cwb.io>`

		`# parabola changes and rationale:`
		`# - upstream pkgbuild is gone, but we keep maintaining this.`

pcr/emacs-ess/PKGBUILD

file modified

+1 -1

		`@@ -1,4 +1,4 @@`
		`- # Maintainer (Arch): Stefan Husmann <Stefan-Husmann@t-online.de>`
		`+ # Maintainer (arch): Stefan Husmann <Stefan-Husmann@t-online.de>`
		`# Maintainer: Omar Vega Ramos <ovruni@gnu.org.pe>`
		`pkgname=emacs-ess`
		`pkgver=16.04`

pcr/emacs-fuzzy/PKGBUILD

file modified

+1 -1

		`@@ -1,4 +1,4 @@`
		`- # Maintainer (AUR): Alex Whitt <alex.joseph.whitt@gmail.com>`
		`+ # Maintainer (aur): Alex Whitt <alex.joseph.whitt@gmail.com>`

		`# parabola changes and rationale:`
		`# no changes`

pcr/emacs-jabber/PKGBUILD

file modified

+2 -2

		`@@ -1,5 +1,5 @@`
		`- # Maintainer (AUR): Stefan Husmann <stefan-husmann@t-online.de>`
		`- # Maintainer: Parabola Aurélien DESBRIÈRES <aurelien@hackers.camp>`
		`+ # Maintainer (aur): Stefan Husmann <stefan-husmann@t-online.de>`
		`+ # Maintainer: Aurélien Desbrières <aurelien@hackers.camp>`

		`# parabola changes and rationale:`
		`# no changes.`

pcr/emacs-js2-mode/PKGBUILD

file modified

+3 -3

		`@@ -1,6 +1,6 @@`
		`- # Contributor (Arch): Hauke Wesselmann <hauke@h-dawg.de>`
		`- # Contributor (Arch): xgdgsc <xgdgsc at gmail dot com>`
		`- # Maintainer (Arch): Stefan Husmann <stefan-husmann@t-online.de>`
		`+ # Contributor: Hauke Wesselmann <hauke@h-dawg.de>`
		`+ # Contributor: xgdgsc <xgdgsc at gmail dot com>`
		`+ # Maintainer (arch): Stefan Husmann <stefan-husmann@t-online.de>`
		`# Maintainer: Omar Vega Ramos <ovruni@gnu.org.pe>`

		`pkgname=emacs-js2-mode`

pcr/emacs-lucid/PKGBUILD

file modified

+2 -2

		`@@ -1,6 +1,6 @@`
		`# Maintainer: Luke Shumaker <lukeshu@parabola.nu>`
		`- # Maintainer (Arch:emacs): Juergen Hoetzel <juergen@archlinux.org>`
		`- # Contributor (Arch:emacs): Renchi Raju <renchi@green.tam.uiuc.edu>`
		`+ # Maintainer (arch:emacs): Juergen Hoetzel <juergen@archlinux.org>`
		`+ # Contributor: Renchi Raju <renchi@green.tam.uiuc.edu>`

		`_pkgname=emacs`
		`pkgname=emacs-lucid`

pcr/emacs-magit/PKGBUILD

file modified

+2 -2

		`@@ -1,5 +1,5 @@`
		`- # Maintainer (AUR): Esben Haabendal <esben@haabendal.dk>`
		`- # Maintainer : Parabola GNU / Linux-libre Aurelien Desbrieres <aurelien@cwb.io>`
		`+ # Maintainer (aur): Esben Haabendal <esben@haabendal.dk>`
		`+ # Maintainer: Aurélien Desbrières <aurelien@cwb.io>`

		`# parabola changes and rationale:`
		`# - added replaces for previous pkgname 'emacs-magit-git' (2018-02-02)`

pcr/emacs-newlisp-mode-git/PKGBUILD

file modified

+1 -1

		`@@ -1,4 +1,4 @@`
		`- # Maintainer (Arch): Stefan Husmann <stefan-husmann@t-online.de>`
		`+ # Maintainer (arch): Stefan Husmann <stefan-husmann@t-online.de>`
		`# Maintainer: Omar Vega Ramos <ovruni@gnu.org.pe>`

		`# parabola changes and rationale:`

pcr/emacs-org-mode/PKGBUILD

file modified

+4 -4

		`@@ -1,7 +1,7 @@`
		`- # Maintainer (AUR): Davor Balder <dbalder@ozemail.com.au>`
		`- # Contributor (AUR): Jiyunatori <tori_LEAVETHISOUT_@0xc29.net>`
		`- # Contributor (AUR): mdev`
		`- # Maintainer : Parabola GNU / Linux-libre Aurelien Desbrieres <aurelien@hackers.camp>`
		`+ # Maintainer (aur): Davor Balder <dbalder@ozemail.com.au>`
		`+ # Contributor: Jiyunatori <tori_LEAVETHISOUT_@0xc29.net>`
		`+ # Contributor: mdev`
		`+ # Maintainer: Aurélien Desbrières <aurelien@hackers.camp>`

		`# parabola changes and rationale:`
		`# no changes.`

pcr/emacs-popup-el/PKGBUILD

file modified

+1 -1

		`@@ -1,4 +1,4 @@`
		`- # Maintainer (AUR): yuki-san <yuki.from.akita@gmail.com>`
		`+ # Maintainer (aur): yuki-san <yuki.from.akita@gmail.com>`

		`# parabola changes and rationale:`
		`# no changes.`

pcr/emacs-tuareg-mode/PKGBUILD

file modified

+2 -2

		`@@ -1,5 +1,5 @@`
		`- # Contributor (Arch): Limao Luo <luolimao+AUR@gmail.com>`
		`- # Maintainer : Parabola GNU / Linux-libre Aurelien Desbrieres <aurelien@cwb.io>`
		`+ # Contributor: Limao Luo <luolimao+AUR@gmail.com>`
		`+ # Maintainer: Aurélien Desbrières <aurelien@cwb.io>`

		`# parabola changes and rationale:`
		`# - upstream pkgbuild is gone but we keep maintaining this.`

pcr/emacs-with-editor-git/PKGBUILD

file modified

+1 -1

		`@@ -1,4 +1,4 @@`
		`- # Maintainer (AUR): Esben Haabendal <esben@haabendal.dk>`
		`+ # Maintainer (aur): Esben Haabendal <esben@haabendal.dk>`

		`# parabola changes and rationale:`
		`# - added missing makedepends: git`

pcr/emhacks/PKGBUILD

file modified

+3 -3

		`@@ -1,6 +1,6 @@`
		`- # Contributor (Arch): Junmin Huang <junmin(dot)h(at)gmail(dot)com>`
		`- # Contributor (Arch): Stefan Husmann <stefan-husmann@t-online.de>`
		`- # Maintainer : Parabola GNU / Linux-libre Aurelien Desbrieres <aurelien@cwb.io>`
		`+ # Contributor: Junmin Huang <junmin(dot)h(at)gmail(dot)com>`
		`+ # Contributor: Stefan Husmann <stefan-husmann@t-online.de>`
		`+ # Maintainer: Aurélien Desbrières <aurelien@cwb.io>`

		`# parabola changes and rationale:`
		`# upstream pkgbuild is gone, but we keep maintaining this`

pcr/eterm/PKGBUILD

file modified

+5 -5

		`@@ -1,8 +1,8 @@`
		`- # Contributor (Arch): Andrea Scarpino <andrea@archlinux.org>`
		`- # Contributor (Arch): Adam 'battlemidget' Stokes <adam.stokes@gmail.com>`
		`- # Contributor (Arch): Daniel J Griffiths <ghost1227@archlinux.us>`
		`- # Contributor (Arch): Brad Fanella <bradfanella@archlinux.us>`
		`- # Maintainer : Parabola GNU / Linux-libre Aurelien Desbrieres <aurelien@cwb.io>`
		`+ # Contributor: Andrea Scarpino <andrea@archlinux.org>`
		`+ # Contributor: Adam 'battlemidget' Stokes <adam.stokes@gmail.com>`
		`+ # Contributor: Daniel J Griffiths <ghost1227@archlinux.us>`
		`+ # Contributor: Brad Fanella <bradfanella@archlinux.us>`
		`+ # Maintainer: Aurélien Desbrières <aurelien@cwb.io>`

		`pkgname=eterm`
		`pkgver=0.9.6`

pcr/eudev/PKGBUILD

file modified

+3 -3

		`@@ -1,6 +1,6 @@`
		`- # Maintainer (Artix): artoo <artoo@manjaro.org>`
		`- # Contributor (Arch): Alexey D. <lq07829icatm@rambler.ru>`
		`- # Contributor (Arch): Ivailo Monev <xakepa10@gmail.com>`
		`+ # Maintainer (artix): artoo <artoo@manjaro.org>`
		`+ # Contributor: Alexey D. <lq07829icatm@rambler.ru>`
		`+ # Contributor: Ivailo Monev <xakepa10@gmail.com>`
		`# Maintainer: Omar Vega Ramos <ovruni@gnu.org.pe>`

		`_udev_ver=220`

pcr/evolution-mapi/PKGBUILD

file modified

+3 -3

		`@@ -1,6 +1,6 @@`
		`- # Maintainer (Arch): Heenry78 <henry78@gmx.at>`
		`- # Contributor (Arch): ngoonee <ngoonee.talk@gmail.com>`
		`- # Contributor (Arch): Marco A Rojas <marquicus@gmail.com>`
		`+ # Maintainer (arch): Heenry78 <henry78@gmx.at>`
		`+ # Contributor: ngoonee <ngoonee.talk@gmail.com>`
		`+ # Contributor: Marco A Rojas <marquicus@gmail.com>`
		`# Maintainer: Omar Vega Ramos <ovruni@gnu.org.pe>`
		`pkgname=evolution-mapi`
		`pkgver=3.16.2`

pcr/evrouter/PKGBUILD

file modified

+1 -1

		`@@ -1,5 +1,5 @@`
		`# Contributor: Jonathan Liu <net147@gmail.com>`
		`- # Maintainer : Aurelien Desbrieres <aurelien@hackers.camp>`
		`+ # Maintainer: Aurélien Desbrières <aurelien@hackers.camp>`

		`pkgname=evrouter`
		`pkgver=0.4`

pcr/extremetuxracer/PKGBUILD

file modified

+4 -4

		`@@ -1,7 +1,7 @@`
		`- # Maintainer (Arch): Ronald van Haren <ronald.archlinux.org>`
		`- # Contributor (Arch): Eric Belanger <eric.archlinux.org>`
		`- # Contributor (Arch): Fabio Scotoni <CCuleX.gmail.com>`
		`- # Contributor (Arch): Alexander Rødseth <rodseth@gmail.com>`
		`+ # Maintainer (arch): Ronald van Haren <ronald.archlinux.org>`
		`+ # Contributor: Eric Belanger <eric.archlinux.org>`
		`+ # Contributor: Fabio Scotoni <CCuleX.gmail.com>`
		`+ # Contributor: Alexander Rødseth <rodseth@gmail.com>`

		`# parabola changes and rationale:`
		`# no changes.`

pcr/fair-coin/PKGBUILD

file modified

+1 -1

		`@@ -1,4 +1,4 @@`
		`- # Maintainer (Arch): Eugenio M. Vigo <emvigo@gmail.com>`
		`+ # Maintainer (arch): Eugenio M. Vigo <emvigo@gmail.com>`
		`# Co-mantainer (Arch): Rubén Fdes. Moreira <ruben.fdesmoreira@openmailbox.org>`
		`# Maintainer: Omar Vega Ramos <ovruni@gnu.org.pe>`

pcr/fcode-utils/PKGBUILD

file added

+31

		`@@ -0,0 +1,31 @@`
		`+ # Maintainer (aur): Jean Lucas <jean@4ray.co>`
		`+ # Maintainer: Parabola Hackers <dev@lists.parabola.nu>`
		`+`
		`+ # parabola changes and rationale:`
		`+ # - Updated to version 1.0.3`
		`+ # - Added armv7h support`
		`+`
		`+ pkgname=fcode-utils`
		`+ pkgver=1.0.3`
		`+ pkgrel=1`
		`+ pkgdesc="Utilities to process FCODE, OpenFirmware's byte code"`
		`+ arch=(armv7h i686 x86_64)`
		`+ url=https://www.openfirmware.info/FCODE_suite`
		`+ license=(GPL2)`
		`+ depends=(glibc)`
		`+ provides=(romheaders)`
		`+ conflicts=(fcode-utils-git)`
		`+ source=(https://github.com/openbios/fcode-utils/archive/v$pkgver.tar.gz)`
		`+ sha512sums=('7f64d3ac5c10184efc0993a748a5dcbf9aa0b71dee059c9b97b3656e61cdd7ed9395e830435eab5878ece80df001cf9420065b1611e8bb011274e26aad20f3f0')`
		`+`
		`+ build() {`
		`+ cd $pkgname-$pkgver`
		`+ make`
		`+ }`
		`+`
		`+ package() {`
		`+ cd $pkgname-$pkgver`
		`+ install -D detok/detok romheaders/romheaders toke/toke -t "$pkgdir"/usr/bin`
		`+ install -Dm 644 README -t "$pkgdir"/usr/share/doc/fcode-utils`
		`+ install -Dm 644 COPYING "$pkgdir"/usr/share/licenses/fcode-utils/LICENSE`
		`+ }`

pcr/ffingerd/PKGBUILD

file modified

+1 -1

		`@@ -1,4 +1,4 @@`
		`- # Maintainers: Parabola hackers <dev@lists.parabola.nu>`
		`+ # Maintainer: Parabola Hackers <dev@lists.parabola.nu>`

		`pkgname=ffingerd`
		`pkgver=1.28`

pcr/filemq/PKGBUILD

file modified

+1 -1

		`@@ -1,4 +1,4 @@`
		`- # Maintainers: Parabola hackers <dev@lists.parabola.nu>`
		`+ # Maintainer: Parabola Hackers <dev@lists.parabola.nu>`

		`pkgname=filemq`
		`pkgver=v1.0a.r180.g8940f34`

pcr/flashbench-git/PKGBUILD

file modified

+2 -2

		`@@ -1,5 +1,5 @@`
		`- # Maintainer (Arch): lestb <tkhdlstfl dot l plus aur at gmail dot com>`
		`- # Contributor (Arch): Marti Raudsepp <marti@juffo.org>`
		`+ # Maintainer (arch): lestb <tkhdlstfl dot l plus aur at gmail dot com>`
		`+ # Contributor: Marti Raudsepp <marti@juffo.org>`

		`pkgname=flashbench-git`
		`pkgver=r62.2e30b19`

pcr/flpsed/PKGBUILD

file modified

+3 -3

		`@@ -1,7 +1,7 @@`
		`# Contributor: Luke Shumaker <lukeshu@parabola.nu>`
		`- # Maintainer (AUR): Pekman <pekman@openmailbox.org>`
		`- # Contributor (AUR): Ivy Foster <joyfulgirl (at) archlinux.us>`
		`- # Contributor (AUR): Giorgio Lando <patroclo7@gmail.com>`
		`+ # Maintainer (aur): Pekman <pekman@openmailbox.org>`
		`+ # Contributor: Ivy Foster <joyfulgirl (at) archlinux.us>`
		`+ # Contributor: Giorgio Lando <patroclo7@gmail.com>`

		`pkgname=flpsed`
		`pkgver=0.7.3`

pcr/fomu-verilog-blink/PKGBUILD

file modified

+1 -1

		`@@ -1,7 +1,7 @@`
		`# Copyright (C) 2021 Denis 'GNUtoo' Carikli <GNUtoo@cyberdimension.org>`
		`# This program is free software: you can redistribute it and/or modify`
		`# it under the terms of the CC0 1.0 License.`
		`- # Maintainers: Parabola hackers <dev@lists.parabola.nu>`
		`+ # Maintainer: Parabola Hackers <dev@lists.parabola.nu>`

		`pkgname=fomu-verilog-blink`
		`pkgver=0.1`

pcr/font-manager/PKGBUILD

file modified

+5 -5

		`@@ -1,9 +1,9 @@`
		`# Author (AUR): Dies <JerryCasiano(at)gmail(dot)com>`
		`- # Maintainer (AUR): Joeny Ang <ang(dot)joeny(at)gmail(dot)com>`
		`- # Contributor (AUR): Guan 'kuno' Qing <neokuno(at)gmail(dot)com>`
		`- # Contributor (AUR): Guten Ye <ywzhaifei(at)gmail(dot)com>`
		`- # Contributor (AUR): i_magnific0 <i_magnific0(at)yahoo(dot)com>`
		`- # Contributor (AUR): Pavlo <pavlofreemen(at)gmail(dot)com>`
		`+ # Maintainer (aur): Joeny Ang <ang(dot)joeny(at)gmail(dot)com>`
		`+ # Contributor: Guan 'kuno' Qing <neokuno(at)gmail(dot)com>`
		`+ # Contributor: Guten Ye <ywzhaifei(at)gmail(dot)com>`
		`+ # Contributor: i_magnific0 <i_magnific0(at)yahoo(dot)com>`
		`+ # Contributor: Pavlo <pavlofreemen(at)gmail(dot)com>`
		`# Contributor: Esteban Carnevale <alfplayer@mailoo.org>`

		`# parabola changes and rationale:`

pcr/fonts-meta/PKGBUILD

file modified

		`@@ -18,11 +18,13 @@`
		`adobe-source-code-pro-fonts`
		`adobe-source-sans-pro-fonts`
		`adobe-source-serif-pro-fonts`
		`+ bdf-unifont`
		`cantarell-fonts`
		`dina-font`
		`gentium-plus-font`
		`gnu-free-fonts`
		`gsfonts`
		`+ hex-unifont`
		`inter-font`
		`noto-fonts-cjk`
		`noto-fonts-emoji`
		`@@ -42,7 +44,10 @@`
		`otf-league-gothic`
		`otf-overpass`
		`otf-stix`
		`+ otf-unifont`
		`+ pcf-unifont`
		`powerline-fonts`
		`+ psf-unifont`
		`tamsyn-font`
		`terminus-font`
		`tex-gyre-fonts`
		`@@ -90,6 +95,7 @@`
		`ttf-sarasa-gothic`
		`ttf-sazanami`
		`ttf-tibetan-machine`
		`+ ttf-unifont`
		`woff2-fira-code`
		`woff-fira-code`
		`wqy-bitmapfont`

pcr/fpdns/PKGBUILD

file modified

+1 -1

		`@@ -1,5 +1,5 @@`
		`# Maintainer: David P. <megver83@parabola.nu>`
		`- # Contributor (Arch): Ermak <ermak@email.it>`
		`+ # Contributor: Ermak <ermak@email.it>`
		`# Contributor: Omar Vega Ramos <ovruni@gnu.org.pe>`

		`pkgname='fpdns'`

pcr/frame/PKGBUILD

file modified

+2 -2

		`@@ -1,5 +1,5 @@`
		`- # Contributor (AUR): Nicolas Quiénot < niQo at aur >`
		`- # Maintainers: Parabola hackers <dev@lists.parabola.nu>`
		`+ # Contributor: Nicolas Quiénot < niQo at aur >`
		`+ # Maintainer: Parabola Hackers <dev@lists.parabola.nu>`

		`# parabola changes and rationale:`
		`# no changes.`

pcr/freecolor/PKGBUILD

file modified

+3 -3

		`@@ -1,6 +1,6 @@`
		`- # Contributor (Arch): Mariusz Libera <mariusz.libera@gmail.com>`
		`- # Contributor (Arch): Vinzenz Vietzke <vinz@archlinux.us>`
		`- # Maintainer : Omar Vega Ramos <ovruni@gnu.org.pe>`
		`+ # Contributor: Mariusz Libera <mariusz.libera@gmail.com>`
		`+ # Contributor: Vinzenz Vietzke <vinz@archlinux.us>`
		`+ # Maintainer: Omar Vega Ramos <ovruni@gnu.org.pe>`
		`pkgname=freecolor`
		`pkgver=0.8.8`
		`pkgrel=3`

pcr/freedoom/PKGBUILD

file modified

+2 -2

		`@@ -1,5 +1,5 @@`
		`- # Maintainer (Arch): Mike Swanson <mikeonthecomputer@gmail.com>`
		`- # Maintainer (Hyperbola): André Silva <emulatorman@hyperbola.info>`
		`+ # Maintainer (aur): Mike Swanson <mikeonthecomputer@gmail.com>`
		`+ # Contributor: André Silva <emulatorman@hyperbola.info>`
		`# Maintainer: Omar Vega Ramos <ovruni@gnu.org.pe>`

		`pkgname=(freedoom freedm)`

pcr/freefilesync/PKGBUILD

file modified

+4 -4

		`@@ -1,7 +1,7 @@`
		`- # Contributor (aur): chenxing <cxcxcxcx AT gmail DOT com>`
		`- # Contributor (aur): Michael Burkhard <Michael DOT Burkhard AT web DOT de>`
		`- # Contributor (aur): alexmo82 <25396682 AT live DOT it>`
		`- # Contributor (aur): Simon Brulhart <simon@brulhart.me>`
		`+ # Contributor: chenxing <cxcxcxcx AT gmail DOT com>`
		`+ # Contributor: Michael Burkhard <Michael DOT Burkhard AT web DOT de>`
		`+ # Contributor: alexmo82 <25396682 AT live DOT it>`
		`+ # Contributor: Simon Brulhart <simon@brulhart.me>`
		`# Maintainer (aur): jooch <jooch AT gmx DOT com>`
		`# Maintainer: Omar Vega Ramos <ovruni@gnu.org.pe>`
		`# Contributor: bill-auger <bill-auger@programmer.net>`

pcr/freeipmi/PKGBUILD

file modified

+2 -2

		`@@ -1,6 +1,6 @@`
		`- # Maintainer (Arch): Phillip Smith <pkgbuild@phs.id.au>`
		`+ # Maintainer (arch): Phillip Smith <pkgbuild@phs.id.au>`
		`# http://github.com/fukawi2/aur-packages`
		`- # Contributor (Arch): Nathan Owe <ndowens04 at gmail>`
		`+ # Contributor: Nathan Owe <ndowens04 at gmail>`
		`# Maintainer: Omar Vega Ramos <ovruni@gnu.org.pe>`

		`### I AM ONLY THE PACKAGER, NOT THE DEVELOPER`

pcr/freenet/PKGBUILD

file modified

+3 -5

		`@@ -1,8 +1,6 @@`
		`- # Maintainer (AUR): skydrome <skydrome at@at i2pmail do.t org>`
		`- # Contributors (AUR):`
		`-`
		`- # parabola changes and rationale:`
		`- # no changes.`
		`+ # Maintainer (aur): skydrome <skydrome at@at proton mail dot com>`
		`+ # Contributor: Thynix`
		`+ # Maintainer: Parabola Hackers <dev@lists.parabola.nu>`

		`_fred=#tag=build01478`
		`_contrib=#tag=v50`

pcr/freeradius-client/PKGBUILD

file modified

+2 -2

		`@@ -1,5 +1,5 @@`
		`- # Maintainer (AUR): Brian Bidulock <bidulock@openss7.org>`
		`- # Contributor (AUR): Kalidarn`
		`+ # Maintainer (aur): Brian Bidulock <bidulock@openss7.org>`
		`+ # Contributor: Kalidarn`

		`pkgname=freeradius-client`
		`pkgver=1.1.7`

pcr/freetuxtv/PKGBUILD

file modified

+2 -2

		`@@ -1,5 +1,5 @@`
		`- # Contributor (Arch): Bernard Baeyens (berbae) <berbae52 at sfr dot fr>`
		`- # Maintainer : Omar Vega Ramos <ovruni@gnu.org.pe>`
		`+ # Contributor: Bernard Baeyens (berbae) <berbae52 at sfr dot fr>`
		`+ # Maintainer: Omar Vega Ramos <ovruni@gnu.org.pe>`
		`pkgname=freetuxtv`
		`pkgver=0.6.6`
		`pkgrel=2`

pcr/frescobaldi/PKGBUILD

file modified

+4 -4

		`@@ -1,7 +1,7 @@`
		`- # Contributor (AUR): David Virgilio <drvirgilio@gmail.com>`
		`- # Contributor (AUR): David Zaragoza <david@zaragoza.com.ve>`
		`- # Contributor (AUR): Clément Démoulins <clement@archivel.fr>`
		`- # Maintainer (AUR): Raphaël Doursenaud <rdoursenaud@free.fr>`
		`+ # Contributor: David Virgilio <drvirgilio@gmail.com>`
		`+ # Contributor: David Zaragoza <david@zaragoza.com.ve>`
		`+ # Contributor: Clément Démoulins <clement@archivel.fr>`
		`+ # Maintainer (aur): Raphaël Doursenaud <rdoursenaud@free.fr>`

		`pkgname=frescobaldi`
		`pkgver=3.1.2`

pcr/fso-unbootimg/PKGBUILD

file modified

+1 -1

		`@@ -1,7 +1,7 @@`
		`# Copyright (C) 2020 Denis 'GNUtoo' Carikli <GNUtoo@cyberdimension.org>`
		`# This program is free software: you can redistribute it and/or modify`
		`# it under the terms of the CC0 1.0 License.`
		`- # Maintainers: Parabola hackers <dev@lists.parabola.nu>`
		`+ # Maintainer: Parabola Hackers <dev@lists.parabola.nu>`

		`pkgname=fso-unbootimg`
		`pkgver=0.1.2`

pcr/fwsnort/PKGBUILD

file modified

+2 -2

		`@@ -1,5 +1,5 @@`
		`- # Maintainer (AUR): Colin Shea <colin@evaryont.me>`
		`- # Maintainer : Aurélien DESBRIÈRES <aurelien@hackers.camp>`
		`+ # Maintainer (aur): Colin Shea <colin@evaryont.me>`
		`+ # Maintainer: Aurélien Desbrières <aurelien@hackers.camp>`

		`# parabola changes and rationale:`
		`# no changes.`

pcr/gajim-plugin-omemo/PKGBUILD

file modified

+13 -12

		`@@ -1,36 +1,37 @@`
		`- # Maintainer (AUR): Bjoern Franke <bjo+aur at schafweide.org>`
		`- # Contributor (AUR): Tommaso Sardelli <lacapannadelloziotom AT gmail DOT com>`
		`+ # Maintainer (aur): Bjoern Franke <bjo+aur at schafweide.org>`
		`+ # Contributor: Tommaso Sardelli <lacapannadelloziotom AT gmail DOT com>`

		`# Maintainer: David P. <megver83@parabola.nu>`
		`# Contributor: Denis 'GNUtoo' Carikli <GNUtoo@cyberdimension.org>`
		`+ # Contributor: Wael Karram <wael@waelk.tech>`
		`+`

		`# parabola changes and rationale:`
		`- # no changes.`
		`+ # - cleanup unnecessary files`
		`+`

		`pkgname=gajim-plugin-omemo`
		`_pkgname=omemo`
		`- pkgver=2.7.13`
		`+ pkgver=2.8.17`
		`pkgrel=1`
		`- _pythonversion=3.9`
		`+ _pythonversion=3.10`
		`pkgdesc='Gajim plugin for OMEMO Multi-End Message and Object Encryption.'`
		`arch=(any)`
		`url='https://dev.gajim.org/gajim/gajim-plugins/wikis/OmemoGajimPlugin'`
		`license=('GPL')`
		`- depends=('gajim>=1.2.91' 'gajim<=1.3.90' 'python-qrcode' 'python-setuptools' 'python-cryptography' 'python-axolotl')`
		`+ depends=('gajim>=1.5' 'gajim<=1.5.90' 'python-qrcode' 'python-setuptools' 'python-cryptography' 'python-axolotl')`
		`provides=('gajim-plugin-omemo')`
		`conflicts=('gajim-plugin-omemo-git')`
		`- source=("https://ftp.gajim.org/plugins_releases/${_pkgname}_${pkgver}.zip")`
		`- sha512sums=('33f7d1132ed9e218e17c8288ad2586b1a9c6d547db93b5b9bb97abcb8df2541bba35d9cc3fcef74d13b35353636cb4ef652805d69eda878d361b029e62fd9ee2')`
		`+ source=("https://ftp.gajim.org/plugins/master/${_pkgname}/${_pkgname}_${pkgver}.zip")`
		`+ sha512sums=('b3206865d5e9e5c44fe6b798992c2a8ca39c6920d7836d3c39cfd53ca6c0ba329ce4b494340c12e2cf5ca24f2fa8cacbb510f4a664bb588f7d3f6ff5e053172b')`

		`package() {`
		`- cd "${srcdir}/${_pkgname}"`
		`+ cd "${srcdir}"`

		`# Remove unnecessary files`
		`- rm -r CHANGELOG COPYING`
		`+ rm CHANGELOG COPYING \|\| ! echo "cleanup needs re-working"`

		`# Install the plugin`
		`install -d "${pkgdir}/usr/lib/python${_pythonversion}/site-packages/gajim/data/plugins/${_pkgname}"`
		`cp -r * "${pkgdir}/usr/lib/python${_pythonversion}/site-packages/gajim/data/plugins/${_pkgname}/"`
		`}`
		`-`
		`- # vim:set ts=2 sw=2 et:`

pcr/gconf-gtk2/PKGBUILD

file modified

+2 -2

		`@@ -1,6 +1,6 @@`
		`# Maintainer: bill-auger <bill-auger@programmer.net>`
		`- # Maintainer (AUR): Brian Bidulock <bidulock@openss7.org>`
		`- # Contributor (AUR): Jan de Groot <jan@archlinux.org>`
		`+ # Maintainer (aur): Brian Bidulock <bidulock@openss7.org>`
		`+ # Contributor: Jan de Groot <jan@archlinux.org>`


		`pkgname=gconf-gtk2`

pcr/gconfmm/PKGBUILD

file modified

+3 -3

		`@@ -1,7 +1,7 @@`
		`# Maintainer: bill-auger <bill-auger@programmer.net>`
		`- # Maintainer (AUR): Andrew Sun <adsun701 at gmail dot com>`
		`- # Contributor (AUR): Jan de Groot <jgc@archlinux.org>`
		`- # Contributor (AUR): Kritoke <typeolinux@yahoo.com>`
		`+ # Maintainer (aur): Andrew Sun <adsun701 at gmail dot com>`
		`+ # Contributor: Jan de Groot <jgc@archlinux.org>`
		`+ # Contributor: Kritoke <typeolinux@yahoo.com>`


		`pkgbase=gconfmm`

pcr/geis/PKGBUILD

file modified

+2 -2

		`@@ -1,5 +1,5 @@`
		`- # Maintainer (AUR): Nicolas Quiénot <niQo @ AUR >`
		`- # Contributor (AUR): Xiao-Long Chen <chenxiaolong@cxl.epac.to>`
		`+ # Maintainer (aur): Nicolas Quiénot <niQo @ AUR >`
		`+ # Contributor: Xiao-Long Chen <chenxiaolong@cxl.epac.to>`

		`# parabola changes and rationale:`
		`# no changes.`

pcr/gentoo-functions/PKGBUILD

file modified

+9 -8

		`@@ -1,19 +1,20 @@`
		`- # Maintainer (Manjaro): artoo <artoo@manjaro.org>`
		`- # Contributor (Manjaro): williamh <williamh@gentoo.org>`
		`+ # Contributor: artoo <artoo@manjaro.org>`
		`+ # Contributor: williamh <williamh@gentoo.org>`
		`# Maintainer: Omar Vega Ramos <ovruni@gnu.org.pe>`
		`# Contributor: Luke Shumaker <lukeshu@parabola.nu>`

		`# Gentoo's ebuild file:`
		`# https://gitweb.gentoo.org/repo/gentoo.git/tree/sys-apps/gentoo-functions/gentoo-functions-9999.ebuild`
		`+`
		`pkgname=gentoo-functions`
		`- pkgver=0.12`
		`+ pkgver=0.17`
		`pkgrel=1`
		`pkgdesc="Base functions for Gentoo systems"`
		`- arch=('i686' 'x86_64' 'armv7h')`
		`- url="https://github.com/gentoo/$pkgname"`
		`- license=('GPL2')`
		`- source=("$pkgname-$pkgver.tar.gz::https://github.com/gentoo/${pkgname}/archive/${pkgver}.tar.gz")`
		`- sha256sums=('4a6ddb1d8be7b52aae68761fb26546663b6b0e74b155df263cddfbfa72373965')`
		`+ arch=(armv7h i686 x86_64)`
		`+ url=https://gitweb.gentoo.org/proj/gentoo-functions`
		`+ license=(GPL2)`
		`+ source=(https://gitweb.gentoo.org/proj/gentoo-functions.git/snapshot/gentoo-functions-0.17.tar.gz)`
		`+ sha256sums=('721352753031f3214e5034ae12bc2fcc04b4b29bafcc22dab3c473afd9f33c99')`

		`_makeargs=(`
		`ROOTPREFIX=/usr`

pcr/gigolo/PKGBUILD

file modified

+1 -1

		`@@ -1,6 +1,6 @@`
		`# Maintainer: Jaroslav Lichtblau <dragonlord@aur.archlinux.org>`
		`# Contributor: Jan Misiak <fijam [at] archlinux.us>`
		`- # Maintainer:`
		`+ # Maintainer:`

		`pkgname=gigolo`
		`pkgver=0.4.2`

pcr/gimp-plugin-resynthesizer-git/PKGBUILD

file modified

+3 -3

		`@@ -1,6 +1,6 @@`
		`- # Contributor (Arch): Lex Black (autumn-wind at web.de)`
		`- # Contributor (Arch): andre.vmatos`
		`- # Maintainer : Omar Vega Ramos <ovruni@gnu.org.pe>`
		`+ # Contributor: Lex Black (autumn-wind at web.de)`
		`+ # Contributor: andre.vmatos`
		`+ # Maintainer: Omar Vega Ramos <ovruni@gnu.org.pe>`

		`_pkgname=resynthesizer`
		`pkgname=gimp-plugin-$_pkgname-git`

pcr/gimp-plugin-saveforweb/PKGBUILD

file modified

+3 -3

		`@@ -1,6 +1,6 @@`
		`- # Contributor (Arch): Cesar Alcalde <lambda512_at_gmail.com>`
		`- # Contributor (Arch): ValHue <vhuelamo_at_gmail_dot_com>`
		`- # Maintainer : Omar Vega Ramos <ovruni@gnu.org.pe>`
		`+ # Contributor: Cesar Alcalde <lambda512_at_gmail.com>`
		`+ # Contributor: ValHue <vhuelamo_at_gmail_dot_com>`
		`+ # Maintainer: Omar Vega Ramos <ovruni@gnu.org.pe>`

		`pkgname=gimp-plugin-saveforweb`
		`pkgver=0.29.3`

pcr/gimpfx-foundry/PKGBUILD

file modified

+2 -2

		`@@ -1,5 +1,5 @@`
		`- # Contributor (Arch): Vitaliy Berdinskikh <skipper13@root.ua>`
		`- # Maintainer : Omar Vega Ramos <ovruni@gnu.org.pe>`
		`+ # Contributor: Vitaliy Berdinskikh <skipper13@root.ua>`
		`+ # Maintainer: Omar Vega Ramos <ovruni@gnu.org.pe>`

		`# parabola changes and rationale:`
		`# - upstream pkgbuild is gone, but we keep maintaining this.`

pcr/ginn/PKGBUILD

file modified

+1 -1

		`@@ -1,4 +1,4 @@`
		`- # Maintainer (Arch): Nicolas Quiénot <niQo @ aur>`
		`+ # Maintainer (arch): Nicolas Quiénot <niQo @ aur>`

		`pkgname=ginn`
		`pkgver=0.2.6`

pcr/gitflow-avh/PKGBUILD

file modified

+1 -1

		`@@ -1,4 +1,4 @@`
		`- # Maintainer (Arch): Stefan Tatschner <stefan@sevenbyte.org>`
		`+ # Maintainer (arch): Stefan Tatschner <stefan@sevenbyte.org>`
		`# Maintainer: Omar Vega Ramos <ovruni@gnu.org.pe>`

		`pkgname=gitflow-avh`

pcr/glogg/PKGBUILD

file modified

+2 -2

		`@@ -1,5 +1,5 @@`
		`- # Maintainer (Arch): Lukas Jirkovsky <l.jirkovsky@gmail.com>`
		`- # Contributor (Arch): speps <speps at aur dot archlinux dot org>`
		`+ # Maintainer (arch): Lukas Jirkovsky <l.jirkovsky@gmail.com>`
		`+ # Contributor: speps <speps at aur dot archlinux dot org>`
		`# Maintainer: Omar Vega Ramos <ovruni@gnu.org.pe>`
		`pkgname=glogg`
		`pkgver=1.1.3`

pcr/gmid/PKGBUILD

file modified

+28 -12

		`@@ -1,6 +1,6 @@`
		`- # Maintainer (aur): Andrea Feletto <andrea@andreafeletto.com>`
		`- # Maintainer: Wael Karram <wael@waelk.tech>`
		`- # Contributor: bill-auger <bill-auger@programmer.net>`
		`+ # Maintainer (aur): Andrea Feletto <andrea at andreafeletto.com>`
		`+ # Maintainer: Wael Karram <wael at waelk.tech>`
		`+ # Contributor: bill-auger <bill-auger at programmer.net>`


		`# parabola changes and rationale:`
		`@@ -9,13 +9,13 @@`


		`pkgname=gmid`
		`- pkgver=1.8.3`
		`- pkgrel=3`
		`+ pkgver=1.8.5`
		`+ pkgrel=1`
		`pkgdesc='Fast Gemini server written with security in mind.'`
		`arch=('x86_64')`
		`arch+=('i686' 'armv7h')`
		`url='https://gmid.omarpolo.com'`
		`- license=('ISC')`
		`+ license=('custom:ISC')`
		`install=${pkgname}.install`
		`backup=(etc/conf.d/${pkgname}`
		`etc/${pkgname}.conf)`
		`@@ -30,9 +30,9 @@`
		`"gmid.conf"`
		`"index.gmi"`
		`)`
		`- mksha256sums=('f7b6cc1deaea6c5242301fa7440c0f5caaf282fea780ba1edcef480f7fa67fe1')`
		`+ mksha256sums=('c5fd6e5bb411a7baafe0b12b2e2bff35ea47231eff803c00c94e78f2bec3f82c')`
		`sha256sums=(`
		`- '5a7ad3ef93434b8a42f18bffe93444de9d30360e4c799dcadac844374e2046ca'`
		`+ 'bbdf37162add9be254dfd857f69595b5fe882a8a30647d62e7a030c2e2c87c5c'`
		`'SKIP'`
		`'946de0766343225068a0e3f38cb39a4a93ef312525dd775226b938cd08706b94'`
		`'4d943727a57dbf5f246963c0f90ccc54919cc2296538457e6b16f29f7580d9d6'`
		`@@ -44,23 +44,39 @@`
		`validpgpkeys=('3954A7AB837D0EA9CFA9798925DB7D9B5A8D4B40') # bill-auger`


		`+ # NOTE: The files removed in mksource() are not actually present in this release`
		`+ # However, mksource() is retained for now,`
		`+ # because it is not certain that the files will be absent in the next release;`
		`+ # or perhaps their omission from this release was a happy accident.`
		`+ _nonfree_files=( contrib site )`
		`+`
		`mksource() {`
		`cd "$srcdir/$pkgname-$pkgver"`

		`- # Remove unlicensed files.`
		`- rm -r contrib`
		`- rm -r site`
		`+ # Remove unlicensed files`
		`+ for nonfree_file in "${_nonfree_files[@]}"`
		`+ do`
		`+ if [[ -d ${nonfree_file} ]]`
		`+ then`
		`+ rm -r ${nonfree_file}`
		`+ else`
		`+ echo "ERROR: cannot delete '${nonfree_file}' - mksource() needs re-working"`
		`+ return 1`
		`+ fi`
		`+ done`
		`}`

		`build() {`
		`cd "$srcdir/$pkgname-$pkgver"`
		`+`
		`MANDIR='usr/share/man/' ./configure --prefix='usr/'`
		`make`
		`}`

		`package() {`
		`- # Install the config and service files.`
		`cd "$srcdir"`
		`+`
		`+ # Install the config and service files.`
		`install -Dm644 gmid.service -t "$pkgdir/usr/lib/systemd/system"`
		`install -Dm644 gmid.sysusers -t "$pkgdir/usr/lib/sysusers.d"`
		`install -Dm644 gmid.confd "$pkgdir/etc/conf.d/gmid"`

pcr/gmlive/PKGBUILD

file modified

+1 -1

		`@@ -1,4 +1,4 @@`
		`- # Maintainer : Aurelien Desbrieres <aurelien@hackers.camp>`
		`+ # Maintainer: Aurélien Desbrières <aurelien@hackers.camp>`
		`# Contributor: corvolino <corvolino@archlinux.com.br>`

		`pkgname=gmlive`

pcr/gmqcc-git/PKGBUILD

file modified

+2 -2

		`@@ -1,5 +1,5 @@`
		`- # Contributor (Arch): matthiaskrgr <matthiaskrgr _strange_curverd_character_ freedroid D0T org>`
		`- # Maintainers: Parabola hackers <dev@lists.parabola.nu>`
		`+ # Contributor: matthiaskrgr <matthiaskrgr _strange_curverd_character_ freedroid D0T org>`
		`+ # Maintainer: Parabola Hackers <dev@lists.parabola.nu>`

		`pkgname=gmqcc-git`
		`pkgver=20130214`

pcr/gmusicbrowser/PKGBUILD

file modified

+4 -4

		`@@ -1,8 +1,8 @@`
		`# Maintainer: Freemor <freemor@freemor.ca>`
		`- # Contributor (AUR): Fabio 'Lolix' Loli <fabio.loli@disroot.org> -> https://github.com/FabioLolix`
		`- # Contributor (AUR): Spike29 <leguen.yannick@gmail.com>`
		`- # Contributor (AUR): jsteel <mail at jsteel dot org>`
		`- # Contributor (AUR): Corrado Primier <bardo@aur.archlinux.org>`
		`+ # Contributor: Fabio 'Lolix' Loli <fabio.loli@disroot.org> -> https://github.com/FabioLolix`
		`+ # Contributor: Spike29 <leguen.yannick@gmail.com>`
		`+ # Contributor: jsteel <mail at jsteel dot org>`
		`+ # Contributor: Corrado Primier <bardo@aur.archlinux.org>`

		`pkgname=gmusicbrowser`
		`pkgver=1.1.16`

pcr/gnoduino/PKGBUILD

file modified

+1 -1

		`@@ -1,4 +1,4 @@`
		`- # Maintainer (Arch): speps <speps at aur dot archlinux dot org>`
		`+ # Maintainer (arch): speps <speps at aur dot archlinux dot org>`
		`# Maintainer: Omar Vega Ramos <ovruni@gnu.org.pe>`

		`pkgname=gnoduino`

pcr/gnome-colors-icon-theme-extras/PKGBUILD

file modified

+4 -4

		`@@ -1,7 +1,7 @@`
		`- # Maintainer (Arch): Christian Hesse <arch@eworm.de>`
		`- # Contributor (Arch): mattia.b89 <mattia DOT b89 AT gmail DOT com>`
		`- # Contributor (Arch): Devin Cofer <ranguvar{AT]archlinux[DOT}us>`
		`- # Contributor (Arch): Shae Smittle <starfall87@gmail.com>`
		`+ # Maintainer (arch): Christian Hesse <arch@eworm.de>`
		`+ # Contributor: mattia.b89 <mattia DOT b89 AT gmail DOT com>`
		`+ # Contributor: Devin Cofer <ranguvar{AT]archlinux[DOT}us>`
		`+ # Contributor: Shae Smittle <starfall87@gmail.com>`

		`pkgname=gnome-colors-icon-theme-extras`
		`pkgver=5.5.1`

pcr/gnome-colors-icon-theme/PKGBUILD

file modified

+6 -6

		`@@ -1,9 +1,9 @@`
		`- # Maintainer (Arch): Christian Hesse <arch@eworm.de>`
		`- # Contributor (Arch): BlackICE <manfredi at gmail.com>`
		`- # Contributor (Arch): jsteel <jsteel at aur.archlinux.org>`
		`- # Contributor (Arch): Arkham <arkham at archlinux dot us>`
		`- # Contributor (Arch): Artyom Smirnov <smirnoffjr@gmail.com>`
		`- # Contributor (Arch): Marius <marius at matamare dot ro>`
		`+ # Maintainer (arch): Christian Hesse <arch@eworm.de>`
		`+ # Contributor: BlackICE <manfredi at gmail.com>`
		`+ # Contributor: jsteel <jsteel at aur.archlinux.org>`
		`+ # Contributor: Arkham <arkham at archlinux dot us>`
		`+ # Contributor: Artyom Smirnov <smirnoffjr@gmail.com>`
		`+ # Contributor: Marius <marius at matamare dot ro>`

		`pkgname=gnome-colors-icon-theme`
		`pkgver=5.5.1`

pcr/gnome-colors-revival/PKGBUILD

file modified

+4 -4

		`@@ -1,7 +1,7 @@`
		`- # Maintainer (AUR): polyzen <polycitizen@gmail.com>`
		`- # Contributor (AUR): Lauri Niskanen <ape@ape3000.com>`
		`- # Contributor (AUR): Arkham <arkham at archlinux dot us>`
		`- # Contributor (AUR): Artyom Smirnov <smirnoffjr@gmail.com>`
		`+ # Maintainer (aur): polyzen <polycitizen@gmail.com>`
		`+ # Contributor: Lauri Niskanen <ape@ape3000.com>`
		`+ # Contributor: Arkham <arkham at archlinux dot us>`
		`+ # Contributor: Artyom Smirnov <smirnoffjr@gmail.com>`

		`# parabola changes and rationale:`
		`# no changes.`

pcr/gnome-rdp/PKGBUILD

file modified

+6 -6

		`@@ -1,9 +1,9 @@`
		`- # Maintainer (AUR): Wayne Hartmann (DH4) <wayne@bitstorm.pw>`
		`- # Contributor (AUR): György Balló <ballogy@freestart.hu>`
		`- # Contributor (AUR): Hyperair <hyperair@gmail.com>`
		`- # Contributor (AUR): kumico <norrian@gmail.com>`
		`- # Contributor (AUR): adamruss <mail@russ.co.il>`
		`- # Maintainer : Parabola GNU / Linux-libre Aurelien Desbrieres <aurelien@cwb.io>`
		`+ # Maintainer (aur): Wayne Hartmann (DH4) <wayne@bitstorm.pw>`
		`+ # Contributor: György Balló <ballogy@freestart.hu>`
		`+ # Contributor: Hyperair <hyperair@gmail.com>`
		`+ # Contributor: kumico <norrian@gmail.com>`
		`+ # Contributor: adamruss <mail@russ.co.il>`
		`+ # Maintainer: Aurélien Desbrières <aurelien@cwb.io>`

		`# parabola changes and rationale:`
		`# no changes.`

pcr/gnome-shell-pomodoro/PKGBUILD

file modified

+4 -4

		`@@ -1,7 +1,7 @@`
		`- # Maintainer (AUR): Marcin Wieczorek <marcin@marcin.co>`
		`- # Contributor (AUR): Andrejs Mivreņiks <gim at fastmail dot fm>`
		`- # Contributor (AUR): Janne Haapsaari <haaja@iki.fi>`
		`- # Contributor (AUR): maus25 <mirko378@gmail.com>`
		`+ # Maintainer (aur): Marcin Wieczorek <marcin@marcin.co>`
		`+ # Contributor: Andrejs Mivreņiks <gim at fastmail dot fm>`
		`+ # Contributor: Janne Haapsaari <haaja@iki.fi>`
		`+ # Contributor: maus25 <mirko378@gmail.com>`
		`# Contributor: André Silva <emulatorman@hyperbola.info>`

		`# parabola changes and rationale:`

pcr/gnuhealth/PKGBUILD

file modified

+2 -2

		`@@ -1,7 +1,7 @@`
		`# Maintainer: André Silva <emulatorman@hyperbola.info>`
		`# Contributor: Omar Vega Ramos <ovruni@gnu.org.pe>`
		`- # Contributor (Arch): SpepS <dreamspepser at yahoo dot it>`
		`- # Contributor (Arch): Ander <anderraso@gmail.com>`
		`+ # Contributor: SpepS <dreamspepser at yahoo dot it>`
		`+ # Contributor: Ander <anderraso@gmail.com>`

		`pkgname=gnuhealth`
		`pkgver=3.0.7`

pcr/gnuit/PKGBUILD

file modified

+3 -3

		`@@ -1,6 +1,6 @@`
		`- # Contributor (Arch): James Reed <supplantr at archlinux dot info>`
		`- # Contributor (Arch): Leslie P. Polzer <polzer at stardawn dot org>`
		`- # Maintainer : Parabola GNU / Linux-libre Aurélien Desbrières <aurelien@cwb.io>`
		`+ # Contributor: James Reed <supplantr at archlinux dot info>`
		`+ # Contributor: Leslie P. Polzer <polzer at stardawn dot org>`
		`+ # Maintainer: Aurélien Desbrières <aurelien@cwb.io>`

		`pkgname=gnuit`
		`pkgver=4.9.5`

pcr/gnupg1/PKGBUILD

file modified

+2 -2

		`@@ -1,7 +1,7 @@`
		`# $Id: PKGBUILD 148992 2012-02-05 12:21:23Z andyrtr $`
		`- # Contributor (AUR): Andreas Radke <andyrtr at archlinux.org>`
		`+ # Contributor: Andreas Radke <andyrtr at archlinux.org>`
		`# Committer (AUR): Judd Vinet <jvinet@zeroflux.org>`
		`- # Maintainers: Parabola hackers <dev@lists.parabola.nu>`
		`+ # Maintainer: Parabola Hackers <dev@lists.parabola.nu>`

		`# parabola changes and rationale:`
		`# - ignoring test suite failures`

pcr/gnuradio-osmosdr-xtrx/PKGBUILD

file modified

+2 -2

		`@@ -1,5 +1,5 @@`
		`- # Maintainer (Arch): Kyle Keen <keenerd@gmail.com?>`
		`- # Contributor (Arch): Dominik Heidler <dheidler@gmail.com>`
		`+ # Maintainer (arch): Kyle Keen <keenerd@gmail.com?>`
		`+ # Contributor: Dominik Heidler <dheidler@gmail.com>`
		`# Contributor: Denis 'GNUtoo' Carikli <GNUtoo@cyberdimension.org>`
		`pkgname=gnuradio-osmosdr-xtrx`
		`_pkgname=gr-osmosdr`

pcr/gnustep-back/PKGBUILD

file modified

+3 -3

		`@@ -1,7 +1,7 @@`
		`# $Id: PKGBUILD 266875 2017-11-15 14:29:11Z foutrelis $`
		`- # Maintainer (AUR): Sergej Pupykin <pupykin.s+arch@gmail.com>`
		`- # Maintainer (AUR): Vesa Kaihlavirta <vegai@iki.fi>`
		`- # Contributor (AUR): Sebastian Sareyko <public@nooms.de>`
		`+ # Maintainer (aur): Sergej Pupykin <pupykin.s+arch@gmail.com>`
		`+ # Maintainer (aur): Vesa Kaihlavirta <vegai@iki.fi>`
		`+ # Contributor: Sebastian Sareyko <public@nooms.de>`

		`# parabola changes and rationale:`
		`# no changes.`

pcr/gnustep-gui/PKGBUILD

file modified

+3 -3

		`@@ -1,7 +1,7 @@`
		`# $Id$`
		`- # Maintainer (AUR): Sergej Pupykin <pupykin.s+arch@gmail.com>`
		`- # Maintainer (AUR): Vesa Kaihlavirta <vegai@iki.fi>`
		`- # Contributor (AUR): Sebastian Sareyko <public@nooms.de>`
		`+ # Maintainer (aur): Sergej Pupykin <pupykin.s+arch@gmail.com>`
		`+ # Maintainer (aur): Vesa Kaihlavirta <vegai@iki.fi>`
		`+ # Contributor: Sebastian Sareyko <public@nooms.de>`

		`# parabola changes and rationale:`
		`# no changes.`

pcr/gophernicus/PKGBUILD ~~pcr-testing/gophernicus/PKGBUILD~~

file renamed

file was moved with no change to the file

pcr/gophernicus/fix-make-log-typo.patch ~~pcr-testing/gophernicus/fix-make-log-typo.patch~~

file renamed

file was moved with no change to the file

pcr/gophernicus/gophernicus.install ~~pcr-testing/gophernicus/gophernicus.install~~

file renamed

file was moved with no change to the file

pcr/gophernicus/preserve-existing-gophermap.patch ~~pcr-testing/gophernicus/preserve-existing-gophermap.patch~~

file renamed

file was moved with no change to the file

pcr/gophernicus/remove-DESTDIR-from-initscripts.patch ~~pcr-testing/gophernicus/remove-DESTDIR-from-initscripts.patch~~

file renamed

file was moved with no change to the file

pcr/gophernicus/xinetd-respect-custom-server-root.patch ~~pcr-testing/gophernicus/xinetd-respect-custom-server-root.patch~~

file renamed

file was moved with no change to the file

pcr/gpaint/PKGBUILD

file modified

+6 -6

		`@@ -1,9 +1,9 @@`
		`- # Maintainer (Arch): Brian Bidulock <bidulock@openss7.org>`
		`- # Contributor (Arch): Alexander Rødseth <rodseth@gmail.com>`
		`- # Contributor (Arch): Daniel J Griffiths <ghost1227@archlinux.us>`
		`- # Contributor (Arch): Allan McRae <allan@archlinux.org>`
		`- # Contributor (Arch): Stefan Husmann <stefan-husmann@t-online.de>`
		`- # Contributor (Arch): Aaditya Bagga <aaditya_gnulinux@zoho.com>`
		`+ # Maintainer (arch): Brian Bidulock <bidulock@openss7.org>`
		`+ # Contributor: Alexander Rødseth <rodseth@gmail.com>`
		`+ # Contributor: Daniel J Griffiths <ghost1227@archlinux.us>`
		`+ # Contributor: Allan McRae <allan@archlinux.org>`
		`+ # Contributor: Stefan Husmann <stefan-husmann@t-online.de>`
		`+ # Contributor: Aaditya Bagga <aaditya_gnulinux@zoho.com>`

		`pkgname=gpaint`
		`pkgver=0.3.3`

pcr/gqrx-xtrx/PKGBUILD

file modified

+2 -2

		`@@ -1,5 +1,5 @@`
		`- # Maintainer (Arch): Kyle Keen <keenerd@gmail.com>`
		`- # Contributor (Arch): Dominik Heidler <dheidler@gmail.com>`
		`+ # Maintainer (arch): Kyle Keen <keenerd@gmail.com>`
		`+ # Contributor: Dominik Heidler <dheidler@gmail.com>`
		`# Contributor: Denis 'GNUtoo' Carikli <GNUtoo@cyberdimension.org>`

		`_pkgname=gqrx`

pcr/gradio/PKGBUILD

file modified

+2 -2

		`@@ -1,5 +1,5 @@`
		`- # Maintainer (AUR): ELmoussaoui Bilal <bil.elmoussaoui@gmail.com>`
		`- # Maintainer (AUR): Julien Nicoulaud <julien dot nicoulaud at gmail dot com>`
		`+ # Maintainer (aur): ELmoussaoui Bilal <bil.elmoussaoui@gmail.com>`
		`+ # Maintainer (aur): Julien Nicoulaud <julien dot nicoulaud at gmail dot com>`
		`# Maintainer: Freemor <freemor@freemor.ca>`

		`pkgname=gradio`

pcr/grail/PKGBUILD

file modified

+3 -3

		`@@ -1,6 +1,6 @@`
		`- # Maintainer (AUR): Nicolas Quiénot <niQo @ aur>`
		`- # Contributor (AUR): Xiao-Long Chen <chenxiaolong@cxl.epac.to>`
		`- # Contributor (AUR): thn81 <root@scrat>`
		`+ # Maintainer (aur): Nicolas Quiénot <niQo @ aur>`
		`+ # Contributor: Xiao-Long Chen <chenxiaolong@cxl.epac.to>`
		`+ # Contributor: thn81 <root@scrat>`

		`# parabola changes and rationale:`
		`# no changes.`

pcr/grass/PKGBUILD

file modified

+2 -2

		`@@ -1,5 +1,5 @@`
		`- # Maintainer (Arch): Doug Newgard <scimmia at archlinux dot info>`
		`- # Contributor (Arch): Maciej Sieczka <msieczka at sieczka dot org>`
		`+ # Maintainer (arch): Doug Newgard <scimmia at archlinux dot info>`
		`+ # Contributor: Maciej Sieczka <msieczka at sieczka dot org>`
		`# Maintainer: Omar Vega Ramos <ovruni@gnu.org.pe>`

		`pkgname=grass`

pcr/gringo/PKGBUILD

file modified

+1 -1

		`@@ -1,4 +1,4 @@`
		`- # Maintainer (Arch): Vincent Bernardoff <vb@luminar.eu.org>`
		`+ # Maintainer (arch): Vincent Bernardoff <vb@luminar.eu.org>`
		`# Maintainer: Omar Vega Ramos <ovruni@gnu.org.pe>`

		`pkgname=gringo`

pcr/gtg/PKGBUILD

file modified

+2 -2

		`@@ -1,5 +1,5 @@`
		`- # Maintainer (Arch): Roy Zhang <pudh4418 at gmail [dot} com>`
		`- # Contributor (Arch): Алексей Гультяев <hokum83 at gmail {dot] com>`
		`+ # Maintainer (arch): Roy Zhang <pudh4418 at gmail [dot} com>`
		`+ # Contributor: Алексей Гультяев <hokum83 at gmail {dot] com>`

		`pkgname=gtg`
		`pkgver=0.3.1`

pcr/gtk-engine-equinox/PKGBUILD

file modified

+1 -1

		`@@ -1,5 +1,5 @@`
		`# Maintainer (AUR): SpepS <dreamspepser at yahoo dot it>`
		`- # Contributor (AUR): Frikilinux <frikilinux at frikilinux.com.ar>`
		`+ # Contributor: Frikilinux <frikilinux at frikilinux.com.ar>`

		`# parabola changes and rationale:`
		`# - fixed source url`

pcr/gtk-theme-numix/PKGBUILD

file modified

+2 -2

		`@@ -1,6 +1,6 @@`
		`# Mantainer: Diego`
		`- # Contributor (Arch): Aleessio Sergi`
		`- # Maintainers: Parabola hackers <dev@lists.parabola.nu>`
		`+ # Contributor: Aleessio Sergi`
		`+ # Maintainer: Parabola Hackers <dev@lists.parabola.nu>`

		`# parabola changes and rationale:`
		`# upstream pkgbuild is gone, but we keep maintaining this.`

pcr/gtkhtml4/PKGBUILD

file modified

+1 -1

		`@@ -1,4 +1,4 @@`
		`- # Maintainer (AUR): Stefan Husmann <stefan-husmann@t-online.de>`
		`+ # Maintainer (aur): Stefan Husmann <stefan-husmann@t-online.de>`
		`# Contributor: Ionut Biru <ibiru@archlinux.org>`
		`# Maintainer: Freemor <freemor@freemor.ca`

pcr/gtkmm-utils/PKGBUILD

file modified

+3 -3

		`@@ -1,6 +1,6 @@`
		`- # Contributor (Arch): TDY <tdy@gmx.com>`
		`- # Contributor (Arch): Michele Vascellari <michele.vascellari@gmail.com>`
		`- # Maintainer : Parabola GNU / Linux-libre Aurelien Desbrieres <aurelien@cwb.io>`
		`+ # Contributor: TDY <tdy@gmx.com>`
		`+ # Contributor: Michele Vascellari <michele.vascellari@gmail.com>`
		`+ # Maintainer: Aurélien Desbrières <aurelien@cwb.io>`

		`pkgname=gtkmm-utils`
		`pkgver=0.4.1`

pcr/guile-gcrypt/PKGBUILD

file modified

+2 -2

		`@@ -1,5 +1,5 @@`
		`- # Maintainer (AUR): Ting-Wei Lan <lantw44@gmail.com>`
		`- # Contributor (AUR): Joe Hillenbrand <joehillen@gmail.com>`
		`+ # Maintainer (aur): Ting-Wei Lan <lantw44@gmail.com>`
		`+ # Contributor: Joe Hillenbrand <joehillen@gmail.com>`

		`# parabola changes and rationale:`
		`# no changes.`

pcr/guile-git-lib/PKGBUILD

file modified

+1 -1

		`@@ -1,4 +1,4 @@`
		`- # Maintainer (AUR): lantw44 (at) gmail (dot) com`
		`+ # Maintainer (aur): lantw44 (at) gmail (dot) com`

		`# parabola changes and rationale:`
		`# - disabled tests due to faililng 'clone' test`

pcr/guile-json/PKGBUILD

file modified

+2 -2

		`@@ -1,5 +1,5 @@`
		`- # Maintainer (AUR): holos`
		`- # Contributor (AUR): tantalum`
		`+ # Maintainer (aur): holos`
		`+ # Contributor: tantalum`

		`# parabola changes and rationale:`
		`# no changes.`

pcr/guile-json1/PKGBUILD

file modified

+3 -3

		`@@ -1,8 +1,8 @@`
		`# Forked from guile-json 1.2.0 PKGBUILD`

		`- # Maintainer (AUR): lantw44`
		`- # Contributor (AUR): holos`
		`- # Contributor (AUR): tantalum`
		`+ # Maintainer (aur): lantw44`
		`+ # Contributor: holos`
		`+ # Contributor: tantalum`

		`# parabola changes and rationale:`
		`# no changes.`

pcr/guile-json3/PKGBUILD

file modified

+4 -4

		`@@ -1,7 +1,7 @@`
		`- # Maintainer (AUR): Ting-Wei Lan <lantw44 at gmail dot com>`
		`- # Contributor (AUR): Thomas Koller-Cherek <tk120 at protonmail dot com>`
		`- # Contributor (AUR): holos`
		`- # Contributor (AUR): tantalum`
		`+ # Maintainer (aur): Ting-Wei Lan <lantw44 at gmail dot com>`
		`+ # Contributor: Thomas Koller-Cherek <tk120 at protonmail dot com>`
		`+ # Contributor: holos`
		`+ # Contributor: tantalum`

		`# parabola changes and rationale:`
		`# no changes.`

pcr/guile-sqlite3/PKGBUILD

file modified

+1 -1

		`@@ -1,4 +1,4 @@`
		`- # Maintainer (AUR): lantw44 (at) gmail (dot) com`
		`+ # Maintainer (aur): lantw44 (at) gmail (dot) com`
		`# Maintainer: Omar Vega Ramos <ovruni@gnu.org.pe>`

		`pkgname=guile-sqlite3`

pcr/guile-ssh/PKGBUILD

file modified

+1 -1

		`@@ -1,4 +1,4 @@`
		`- # Maintainer (AUR): lantw44 (at) gmail (dot) com`
		`+ # Maintainer (aur): lantw44 (at) gmail (dot) com`

		`# parabola changes and rationale:`
		`# no changes.`

pcr/guix-installer/PKGBUILD

file modified

+1 -1

		`@@ -1,7 +1,7 @@`
		`# Copyright (C) 2019-2022 Denis 'GNUtoo' Carikli <GNUtoo@cyberdimension.org>`
		`# This program is free software: you can redistribute it and/or modify`
		`# it under the terms of the CC0 1.0 License.`
		`- # Maintainers: Parabola hackers <dev@lists.parabola.nu>`
		`+ # Maintainer: Parabola Hackers <dev@lists.parabola.nu>`

		`pkgname=guix-installer`
		`pkgver=v1.3.0`

pcr/guix/PKGBUILD

file modified

+1 -1

		`@@ -1,4 +1,4 @@`
		`- # Maintainer (AUR): lantw44 (at) gmail (dot) com`
		`+ # Maintainer (aur): lantw44 (at) gmail (dot) com`
		`# Modified from guix-git 20130119 PKGBUILD`

		`# parabola changes and rationale:`

pcr/gworkspace/PKGBUILD

file modified

+2 -2

		`@@ -1,5 +1,5 @@`
		`- # Maintainer (AUR): kusakata <shohei atmark kusakata period com>`
		`- # Contributor (AUR): jperry <sh.jperry@gmail.com>`
		`+ # Maintainer (aur): kusakata <shohei atmark kusakata period com>`
		`+ # Contributor: jperry <sh.jperry@gmail.com>`
		`# use versionpkg`

		`# parabola changes and rationale:`

pcr/gws/PKGBUILD

file modified

+1 -1

		`@@ -1,4 +1,4 @@`
		`- # Maintainer (AUR): Fabien Dubosson <fabien.dubosson@gmail.com>`
		`+ # Maintainer (aur): Fabien Dubosson <fabien.dubosson@gmail.com>`

		`# parabola changes and rationale:`
		`# no changes.`

pcr/gxmessage-gtk2/PKGBUILD

file modified

+4 -4

		`@@ -1,7 +1,7 @@`
		`- # Maintainer (Arch): Brian Bidulock <bidulock@openss7.org>`
		`- # Contributor (Arch): Sergej Pupykin <pupykin.s+arch@gmail.com>`
		`- # Contributor (Arch): Geoffroy Carrier <geoffroy.carrier@koon.fr>`
		`- # Contributor (Arch): Jaroslav Lichtblau <tu@dragonlord.cz>`
		`+ # Maintainer (arch): Brian Bidulock <bidulock@openss7.org>`
		`+ # Contributor: Sergej Pupykin <pupykin.s+arch@gmail.com>`
		`+ # Contributor: Geoffroy Carrier <geoffroy.carrier@koon.fr>`
		`+ # Contributor: Jaroslav Lichtblau <tu@dragonlord.cz>`
		`# Maintainer: Omar Vega Ramos <ovruni@gnu.org.pe>`

		`pkgname=gxmessage-gtk2`

pcr/h264enc/PKGBUILD

file modified

+5 -5

		`@@ -1,8 +1,8 @@`
		`- # Maintainer (AUR): Jose Riha <jose1711 gmail com>`
		`- # Contributor (AUR): AlexanderR <rvacheva at nxt dot ru>`
		`- # Contributor (AUR): Markus Heuser <markus.heuser@web.de>`
		`- # Contributor (AUR): Stefan Clarke <fm0nk3y@yahoo.co.uk>`
		`- # Maintainer : Parabola GNU / Linux-libre Aurélien DESBRIÈRES <aurelien@hackers.camp>`
		`+ # Maintainer (aur): Jose Riha <jose1711 gmail com>`
		`+ # Contributor: AlexanderR <rvacheva at nxt dot ru>`
		`+ # Contributor: Markus Heuser <markus.heuser@web.de>`
		`+ # Contributor: Stefan Clarke <fm0nk3y@yahoo.co.uk>`
		`+ # Maintainer: Aurélien Desbrières <aurelien@hackers.camp>`

		`# parabola changes and rationale:`
		`# no changes.`

pcr/holo/PKGBUILD

file modified

+1 -1

		`@@ -1,4 +1,4 @@`
		`- # Maintainer (AUR): Stefan Majewsky <majewsky@gmx.net>`
		`+ # Maintainer (aur): Stefan Majewsky <majewsky@gmx.net>`
		`# Maintainer: Luke Shumaker <lukeshu@parabola.nu>`

		`# parabola changes and rationale:`

pcr/hunspell-pt-br/PKGBUILD

file modified

+5 -5

		`@@ -1,8 +1,8 @@`
		`- # Maintainer (AUR): Pedro Gabriel Drumond Pereira <pedrogabriel@dcc.ufmg.br>`
		`- # Contributor (AUR): Rafael D Martins <raziel_takato at hotmail dotcom>`
		`- # Contributor (AUR): Daniel Felipe Reis Apolinario <dapolinario at gmail dotcom>`
		`- # Contributor (AUR): Bernardo Barros <bernardobarros at gmail dotcom>`
		`- # Contributor (AUR): Robson R S Peixoto <robsonpeixoto at gmail dotcom>`
		`+ # Maintainer (aur): Pedro Gabriel Drumond Pereira <pedrogabriel@dcc.ufmg.br>`
		`+ # Contributor: Rafael D Martins <raziel_takato at hotmail dotcom>`
		`+ # Contributor: Daniel Felipe Reis Apolinario <dapolinario at gmail dotcom>`
		`+ # Contributor: Bernardo Barros <bernardobarros at gmail dotcom>`
		`+ # Contributor: Robson R S Peixoto <robsonpeixoto at gmail dotcom>`
		`# Contributor: André Silva <emulatorman@hyperbola.info>`

		`# parabola changes and rationale:`

pcr/hyphen-pt-br/PKGBUILD

file modified

+2 -2

		`@@ -1,5 +1,5 @@`
		`- # Contributor (AUR): Robson R S Peixoto <robsonpeixoto@gmail.com>`
		`- # Maintainer (AUR): Davi da Silva Böger <dsboger@gmail.com>`
		`+ # Contributor: Robson R S Peixoto <robsonpeixoto@gmail.com>`
		`+ # Maintainer (aur): Davi da Silva Böger <dsboger@gmail.com>`
		`# Contributor: André Silva <emulatorman@hyperbola.info>`

		`# parabola changes and rationale:`

pcr/i3-gnome/PKGBUILD

file modified

+2 -2

		`@@ -1,5 +1,5 @@`
		`- # Maintainer (AUR): Jesús Castro <x51v4n@gmail.com>`
		`- # Contributors (AUR): @killajoe, @Snowmobil, @ThomasWeiser (GitHub)`
		`+ # Maintainer (aur): Jesús Castro <x51v4n@gmail.com>`
		`+ # Contributor: @killajoe, @Snowmobil, @ThomasWeiser (GitHub)`
		`# Maintainer: Omar Vega Ramos <ovruni@gnu.org.pe>`

		`# parabola changes and rationale:`

pcr/icestorm-git/PKGBUILD

file modified

+1 -1

		`@@ -1,4 +1,4 @@`
		`- # Maintainer (AUR): Sebastian Bøe <sebastianbooe@gmail.com>`
		`+ # Maintainer (aur): Sebastian Bøe <sebastianbooe@gmail.com>`
		`# parabola changes and rationale:`
		`# - Added armv7h and i686 architectures support`
		`# - Modified to use a fixed git revision`

pcr/icinga/PKGBUILD

file modified

+1 -1

		`@@ -1,4 +1,4 @@`
		`- # Maintainer (AUR): Foppe Hemminga <foppe@hemminga.net>`
		`+ # Maintainer (aur): Foppe Hemminga <foppe@hemminga.net>`
		`# Contributer (AUR): ralix <ralix@gmx.de>`
		`# Contributer (AUR): GutenYe <ywzhaifei@gmail.com>`

pcr/idjc/PKGBUILD

file modified

+4 -4

		`@@ -1,7 +1,7 @@`
		`- # Maintainer (Arch): M0Rf30`
		`- # Contributor (Arch): Tobias Luther <tobias [at] tonstrom [dot] de>`
		`- # Contributor (Arch): GraveDigger`
		`- # Contributor (Arch): Gaetan Bisson <bisson@archlinux.org>`
		`+ # Maintainer (arch): M0Rf30`
		`+ # Contributor: Tobias Luther <tobias [at] tonstrom [dot] de>`
		`+ # Contributor: GraveDigger`
		`+ # Contributor: Gaetan Bisson <bisson@archlinux.org>`
		`# Maintainer: Omar Vega Ramos <ovruni@gnu.org.pe>`

		`pkgname=idjc`

pcr/ii/PKGBUILD

file modified

+5 -5

		`@@ -1,8 +1,8 @@`
		`- # Contributor (Arch): Evan Gates <evan.gates@gmail.com>`
		`- # Contributor (Arch): Dag Odenhall <dag.odenhall@gmail.com>`
		`- # Contributor (Arch): Chris Brannon <cmbrannon@cox.net>`
		`- # Contributor (Arch): William Giokas <1007380@gmail.com>`
		`- # Maintainers: Parabola hackers <dev@lists.parabola.nu>`
		`+ # Contributor: Evan Gates <evan.gates@gmail.com>`
		`+ # Contributor: Dag Odenhall <dag.odenhall@gmail.com>`
		`+ # Contributor: Chris Brannon <cmbrannon@cox.net>`
		`+ # Contributor: William Giokas <1007380@gmail.com>`
		`+ # Maintainer: Parabola Hackers <dev@lists.parabola.nu>`

		`pkgname=ii`
		`pkgver=1.7`

pcr/imule/PKGBUILD

file modified

+2 -2

		`@@ -1,6 +1,6 @@`
		`# Maintainer (aur): Que Quotion <quequotion at gmail dot com>`
		`- # Contributor (aur): Black Dragon <blackdrg at i2pmail dot org>`
		`- # Contributor (aur): atterratio <atterratio at gmail dot com>`
		`+ # Contributor: Black Dragon <blackdrg at i2pmail dot org>`
		`+ # Contributor: atterratio <atterratio at gmail dot com>`

		`# NOTE: this PKGBUILD requires I2P to be running on the local machine`

pcr/imx_usb_loader-git/PKGBUILD

file modified

+1 -1

		`@@ -1,7 +1,7 @@`
		`# Copyright (C) 2020 Denis 'GNUtoo' Carikli <GNUtoo@cyberdimension.org>`
		`# This program is free software: you can redistribute it and/or modify`
		`# it under the terms of the CC0 1.0 License.`
		`- # Maintainers: Parabola hackers <dev@lists.parabola.nu>`
		`+ # Maintainer: Parabola Hackers <dev@lists.parabola.nu>`

		`_pkgname=imx_usb_loader`
		`pkgname=${_pkgname}-git`

pcr/inspircd/PKGBUILD

file modified

+4 -4

		`@@ -1,7 +1,7 @@`
		`- # Maintainer (AUR): Maxime Poulin <maxpoulin64@gmail.com>`
		`- # Contributor (AUR): Damian Nowak <damian.nowak@atlashost.eu>`
		`- # Contributor (AUR): Kyle Fuller <inbox@kylefuller.co.uk>`
		`- # Contributor (AUR): jibi <jibi@paranoici.org>`
		`+ # Maintainer (aur): Maxime Poulin <maxpoulin64@gmail.com>`
		`+ # Contributor: Damian Nowak <damian.nowak@atlashost.eu>`
		`+ # Contributor: Kyle Fuller <inbox@kylefuller.co.uk>`
		`+ # Contributor: jibi <jibi@paranoici.org>`

		`# parabola changes and rationale:`
		`# - fixed arch array`

pcr/ipmiutil/PKGBUILD

file modified

+5 -5

		`@@ -1,8 +1,8 @@`
		`- # Contributor (Arch): Florian Dejonckheere <florian@floriandejonckheere.be>`
		`- # Contributor (Arch): goodmen <goodmenlinux@gmail.com>`
		`- # Contributor (Arch): Gergely Imreh <imrehgATgmailDOTcom>`
		`- # Contributors: champus, madeye, Ranguvar and ninja_pt`
		`- # Maintainer: Aurélien DESBRIÈRES <aurelien@cwb.IO>`
		`+ # Contributor: Florian Dejonckheere <florian@floriandejonckheere.be>`
		`+ # Contributor: goodmen <goodmenlinux@gmail.com>`
		`+ # Contributor: Gergely Imreh <imrehgATgmailDOTcom>`
		`+ # Contributor: champus, madeye, Ranguvar and ninja_pt`
		`+ # Maintainer: Aurélien Desbrières <aurelien@cwb.io>`

		`pkgname=ipmiutil`
		`pkgver=3.1.3`

pcr/ipycli-git/PKGBUILD

file modified

+2 -2

		`@@ -1,5 +1,5 @@`
		`- # Maintainer (AUR): Francois Boulogne <fboulogne at april dot org>`
		`- # Maintainer : Parabola GNU / Linux-libre Aurélien DESBRIÈRES <aurelien@hackers.camp>`
		`+ # Maintainer (aur): Francois Boulogne <fboulogne at april dot org>`
		`+ # Maintainer: Aurélien Desbrières <aurelien@hackers.camp>`

		`# parabola changes and rationale:`
		`# no changes.`

pcr/italc/PKGBUILD

file modified

+2 -2

		`@@ -1,5 +1,5 @@`
		`- # Maintainer (AUR): robertfoster`
		`- # Contributor (AUR): sirocco`
		`+ # Maintainer (aur): robertfoster`
		`+ # Contributor: sirocco`
		`# Contributor: Esteban Carnevale <alfplayer@mailoo.org>`

		`# parabola changes and rationale:`

pcr/jack-rack/PKGBUILD

file modified

+5 -5

		`@@ -1,8 +1,8 @@`
		`- # Maintainer (Arch): Brian Bidulock <bidulock@openss7.org>`
		`- # Contributor (Arch): DonVla <donvla@users.sourceforge.net>`
		`- # Contributor (Arch): Patrick Leslie Polzer <leslie.polzer@gmx.net>`
		`- # Contributor (Arch): Berkus <berkus@madfire.net>`
		`- # Contributor (Arch): Daniele Paolella <danielepaolella@email.it>`
		`+ # Maintainer (arch): Brian Bidulock <bidulock@openss7.org>`
		`+ # Contributor: DonVla <donvla@users.sourceforge.net>`
		`+ # Contributor: Patrick Leslie Polzer <leslie.polzer@gmx.net>`
		`+ # Contributor: Berkus <berkus@madfire.net>`
		`+ # Contributor: Daniele Paolella <danielepaolella@email.it>`
		`# Maintainer: Omar Vega Ramos <ovruni@gnu.org.pe>`
		`pkgname=jack-rack`
		`pkgver=1.4.7`

pcr/java-service-wrapper/PKGBUILD

file modified

+2 -2

		`@@ -1,5 +1,5 @@`
		`- # Maintainer (AUR): skydrome <skydrome@i2pmail.org>`
		`- # Contributor (AUR): Artyom Olshevskiy <siasia@siasia>`
		`+ # Maintainer (aur): skydrome <skydrome@i2pmail.org>`
		`+ # Contributor: Artyom Olshevskiy <siasia@siasia>`

		`# parabola changes and rationale:`
		`# no changes.`

pcr/jbuilder/PKGBUILD

file modified

+1 -1

		`@@ -1,4 +1,4 @@`
		`- # Maintainer (AUR): Jakob Gahde <j5lx@fmail.co.uk>`
		`+ # Maintainer (aur): Jakob Gahde <j5lx@fmail.co.uk>`

		`# parabola changes and rationale:`
		`# - renamed tarball to avoid collisions`

pcr/jchroot-git/PKGBUILD

file modified

+1 -1

		`@@ -1,4 +1,4 @@`
		`- # Maintainer (Arch): aksr <aksr at t-com dot me>`
		`+ # Maintainer (arch): aksr <aksr at t-com dot me>`
		`pkgname=jchroot-git`
		`pkgver=r36.17f549c`
		`pkgrel=1`

pcr/jdee/PKGBUILD

file modified

+1 -1

		`@@ -1,4 +1,4 @@`
		`- # Maintainer : Omar Vega Ramos <ovruni@gnu.org.pe>`
		`+ # Maintainer: Omar Vega Ramos <ovruni@gnu.org.pe>`

		`pkgname=jdee`
		`pkgver=2.4.1`

pcr/jitsi/PKGBUILD

file modified

+2 -2

		`@@ -1,5 +1,5 @@`
		`- # Maintainer (AUR): Xavier Devlamynck <magicrhesus@ouranos.be>`
		`- # Contributors (AUR): Keshav P R, atommix aka Aleks Lifey, Xavion, Ananda Samaddar, Dan Serban, Xyne`
		`+ # Maintainer (aur): Xavier Devlamynck <magicrhesus@ouranos.be>`
		`+ # Contributor: Keshav P R, atommix aka Aleks Lifey, Xavion, Ananda Samaddar, Dan Serban, Xyne`
		`# Contributor: André Silva <emulatorman@hyperbola.info>`
		`# Contributor: Márcio Silva <coadde@hyperbola.info>`

pcr/jmtpfs/PKGBUILD

file modified

+1 -1

		`@@ -1,4 +1,4 @@`
		`- # Maintainer (Arch): Philipp 'TamCore' B. <philipp [at] tamcore [dot] eu>`
		`+ # Maintainer (arch): Philipp 'TamCore' B. <philipp [at] tamcore [dot] eu>`
		`# Maintainer: Omar Vega Ramos <ovruni@gnu.org.pe>`
		`pkgname=jmtpfs`
		`pkgver=0.5`

pcr/kamailio/PKGBUILD

file modified

+2 -2

		`@@ -1,5 +1,5 @@`
		`- # Maintainer (AUR): Josef Miegl <josef@miegl.cz>`
		`- # Contributor (AUR): Xavier Devlamynck <magicrhesus@ouranos.be>`
		`+ # Maintainer (aur): Josef Miegl <josef@miegl.cz>`
		`+ # Contributor: Xavier Devlamynck <magicrhesus@ouranos.be>`
		`# Maintainer: Omar Vega Ramos <ovruni@gnu.org.pe>`

		`pkgbase=kamailio`

pcr/kodi-standalone-service/PKGBUILD

file modified

+1 -1

		`@@ -1,4 +1,4 @@`
		`- # Maintainer (AUR): graysky <graysky AT archlinux DOT us>`
		`+ # Maintainer (aur): graysky <graysky AT archlinux DOT us>`
		`# Contributor: André Silva <emulatorman@hyperbola.info>`

		`# parabola changes and rationale:`

pcr/laptop-mode-tools/PKGBUILD

file modified

+5 -5

		`@@ -1,8 +1,8 @@`
		`- # Maintainer (Arch): Hyacinthe Cartiaux <hyacinthe.cartiaux@free.fr>`
		`- # Contributor (Arch): Lev Lybin <lev.lybin@gmail.com>`
		`- # Contributor (Arch): Aaditya Bagga <aaditya_gnulinux@zoho.com>`
		`- # Contributor (Arch): Lukas Jirkovsky <l.jirkovsky@gmail.com>`
		`- # Contributor (Arch): Eric Bélanger <eric@archlinux.org>`
		`+ # Maintainer (arch): Hyacinthe Cartiaux <hyacinthe.cartiaux@free.fr>`
		`+ # Contributor: Lev Lybin <lev.lybin@gmail.com>`
		`+ # Contributor: Aaditya Bagga <aaditya_gnulinux@zoho.com>`
		`+ # Contributor: Lukas Jirkovsky <l.jirkovsky@gmail.com>`
		`+ # Contributor: Eric Bélanger <eric@archlinux.org>`
		`# Maintainer: Omar Vega Ramos <ovruni@gnu.org.pe>`

		`pkgname=laptop-mode-tools`

pcr/lcmc/PKGBUILD

file modified

+1 -1

		`@@ -1,5 +1,5 @@`
		`# Contributor: Márcio Silva <coadde@hyperbola.info>`
		`- # Maintainers: Parabola hackers <dev@lists.parabola.nu>`
		`+ # Maintainer: Parabola Hackers <dev@lists.parabola.nu>`

		`pkgname=lcmc`
		`pkgver=1.5.1`

pcr/lcov/PKGBUILD

file removed

-35

		`@@ -1,35 +0,0 @@`
		`- # Maintainer: Luke Shumaker <lukeshu@parabola.nu>`
		`- # Contributor (AUR): Jordi De Groof <jordi.degroof@gmail.com>`
		`- # Contributor (AUR): Andre Klitzing <aklitzing@gmail.com>`
		`-`
		`- pkgname=lcov`
		`- pkgver=1.13`
		`- pkgrel=2`
		`- pkgdesc="front-end for GCC's coverage testing tool gcov"`
		`- arch=('any')`
		`- url="http://ltp.sourceforge.net/coverage/lcov.php"`
		`- license=('GPL')`
		`- depends=('perl')`
		`- source=("http://downloads.sourceforge.net/ltp/$pkgname-$pkgver.tar.gz"`
		`- "handle-equals-signs.patch"`
		`- "fix-undef-behaviour.patch"`
		`- )`
		`-`
		`- prepare()`
		`- {`
		`- cd "$srcdir/$pkgname-$pkgver"`
		`- patch -p1 -i $srcdir/handle-equals-signs.patch`
		`- patch -p1 -i $srcdir/fix-undef-behaviour.patch`
		`- }`
		`-`
		`-`
		`- package()`
		`- {`
		`- cd "$srcdir/$pkgname-$pkgver"`
		`-`
		`- make PREFIX="$pkgdir/usr" install`
		`- }`
		`-`
		`- sha256sums=('44972c878482cc06a05fe78eaa3645cbfcbad6634615c3309858b207965d8a23'`
		`- '54728aa4e244d3662c65ba91fb486dc1d5c64d9d55745ee334c4131109dc233c'`
		`- 'ceaf41f7cc9cea5a6fc4b0385ffef10d1ab8812acd2a5b16dcd8d7bca7120488')`

pcr/lcov/fix-undef-behaviour.patch

file removed

-37

		`@@ -1,37 +0,0 @@`
		`- Author: Alastair McKinstry <mckinstry@debian.org>`
		`- Description: Fix for undefined behavior in perl5.20`
		`- Origin: http://bugs.debian.org/761308`
		`- Forwarded: no`
		`- Last-Updated: 2014-09-13`
		`-`
		`- Index: lcov-1.12/bin/lcov`
		`- ===================================================================`
		`- --- lcov-1.12.orig/bin/lcov`
		`- +++ lcov-1.12/bin/lcov`
		`- @@ -224,7 +224,9 @@ Getopt::Long::Configure("default");`
		`- # Remove spaces around rc options`
		`- my %new_opt_rc;`
		`-`
		`- - while (my ($key, $value) = each(%opt_rc)) {`
		`- + my @keys = keys %opt_rc;`
		`- + for my $key (@keys) {`
		`- + my $value = $opt_rc{$key};`
		`- $key =~ s/^\s+\|\s+$//g;`
		`- $value =~ s/^\s+\|\s+$//g;`
		`-`
		`- Index: lcov-1.12/bin/geninfo`
		`- ===================================================================`
		`- --- lcov-1.12.orig/bin/geninfo`
		`- +++ lcov-1.12/bin/geninfo`
		`- @@ -284,8 +284,9 @@ Getopt::Long::Configure("default");`
		`- {`
		`- # Remove spaces around rc options`
		`- my %new_opt_rc;`
		`- -`
		`- - while (my ($key, $value) = each(%opt_rc)) {`
		`- + my @keys = keys %opt_rc;`
		`- + for my $key (@keys) {`
		`- + my $value = $opt_rc{$key};`
		`- $key =~ s/^\s+\|\s+$//g;`
		`- $value =~ s/^\s+\|\s+$//g;`
		`-`

pcr/lcov/handle-equals-signs.patch

file removed

-23

		`@@ -1,23 +0,0 @@`
		`- Description: Handle "=====" as another form of zero.`
		`- gcov prints "=====" instead of "######" when an unexecuted line is`
		`- "reachable only by exceptional paths such as C++ exception handlers."`
		`- This should be handled the same as "######" for our purposes.`
		`- Author: Zack Weinberg <zackw@panix.com>`
		`- Last-Update: 2013-02-01`
		`-`
		`- Index: lcov-1.12/bin/geninfo`
		`- ===================================================================`
		`- --- lcov-1.12.orig/bin/geninfo`
		`- +++ lcov-1.12/bin/geninfo`
		`- @@ -1771,8 +1771,9 @@ sub read_gcov_file($)`
		`- $number = (split(" ",substr($_, 0, 16)))[0];`
		`-`
		`- # Check for zero count which is indicated`
		`- - # by ######`
		`- - if ($number eq "######") { $number = 0; }`
		`- + # by ###### or =====`
		`- + if ($number eq "######" or`
		`- + $number eq "=====") { $number = 0; }`
		`-`
		`- if ($exclude_line) {`
		`- # Register uninstrumented line instead`

pcr/league-gothic-font/PKGBUILD

file modified

+4 -4

		`@@ -1,9 +1,9 @@`
		`- # Maintainer (AUR): Caleb Maclennan <caleb@alerque.com>`
		`- # Maintainer (AUR): LightDot <lightdot -a-t- g m a i l>`
		`- # Contributor (AUR): samæ <samæ at marvid dot fr>`
		`+ # Maintainer (aur): Caleb Maclennan <caleb@alerque.com>`
		`+ # Maintainer (aur): LightDot <lightdot -a-t- g m a i l>`
		`+ # Contributor: samæ <samæ at marvid dot fr>`
		`# Contributor: Denis 'GNUtoo' Carikli <GNUtoo@cyberdimension.org>`
		`# Contributor: bill-auger <bill-auger@programmer.net>`
		`- # Maintainers: Parabola hackers <dev@lists.parabola.nu>`
		`+ # Maintainer: Parabola Hackers <dev@lists.parabola.nu>`

		`_fnt_name=league-gothic`
		`pkgbase=$_fnt_name-font`

pcr/legit/PKGBUILD

file modified

+3 -3

		`@@ -1,6 +1,6 @@`
		`- # Contributor (AUR): Jan-Erik Rediger <badboy at archlinux dot us>`
		`- # Contributor (AUR): Khorne <khorne at khorne dot me>`
		`- # Maintainer (Parabola): Aurélien DESBRIÈRES <aurelien@hackers.camp>`
		`+ # Contributor: Jan-Erik Rediger <badboy at archlinux dot us>`
		`+ # Contributor: Khorne <khorne at khorne dot me>`
		`+ # Maintainer: Aurélien Desbrières <aurelien@hackers.camp>`


		`pkgname=legit`

pcr/lg-downloader-git/PKGBUILD

file modified

+1 -1

		`@@ -1,7 +1,7 @@`
		`# Copyright (C) 2020 Denis 'GNUtoo' Carikli <GNUtoo@cyberdimension.org>`
		`# This program is free software: you can redistribute it and/or modify`
		`# it under the terms of the CC0 1.0 License.`
		`- # Maintainers: Parabola hackers <dev@lists.parabola.nu>`
		`+ # Maintainer: Parabola Hackers <dev@lists.parabola.nu>`

		`pkgname=lg-downloader-git`
		`_pkgname=lg-downloader`

pcr/libaria2/PKGBUILD

file modified

+1 -1

		`@@ -1,4 +1,4 @@`
		`- # Maintainer (AUR): hashworks <mail@hashworks.net>`
		`+ # Maintainer (aur): hashworks <mail@hashworks.net>`

		`_pkgname=aria2`
		`pkgname=libaria2`

pcr/libast/PKGBUILD

file modified

+3 -3

		`@@ -1,7 +1,7 @@`
		`# $Id: PKGBUILD 40906 2011-03-01 14:45:04Z andrea $`
		`- # Contributor (Arch): Daniel J Griffiths <ghost1227@archlinux.us>`
		`- # Contributor (Arch): Adam 'battlemidget' Stokes <adam.stokes@gmail.com>`
		`- # Maintainer : Parabola GNU / Linux-libre Aurelien Desbrieres <aurelien@cwb.io>`
		`+ # Contributor: Daniel J Griffiths <ghost1227@archlinux.us>`
		`+ # Contributor: Adam 'battlemidget' Stokes <adam.stokes@gmail.com>`
		`+ # Maintainer: Aurélien Desbrières <aurelien@cwb.io>`

		`pkgname=libast`
		`pkgver=0.7`

pcr/libbinio/PKGBUILD

file modified

+1 -1

		`@@ -1,4 +1,4 @@`
		`- # Maintainer (Arch): Mikael Eriksson <mikael_eriksson@miffe.org>`
		`+ # Maintainer (arch): Mikael Eriksson <mikael_eriksson@miffe.org>`
		`# Maintainer: Omar Vega Ramos <ovruni@gnu.org.pe>`

		`pkgname=libbinio`

pcr/libcedrus-git/PKGBUILD

file modified

+1 -1

		`@@ -1,4 +1,4 @@`
		`- # Maintainer (AUR): Jens Kuske <jenskuske@gmail.com>`
		`+ # Maintainer (aur): Jens Kuske <jenskuske@gmail.com>`

		`# parabola changes and rationale:`
		`# no changes.`

pcr/libcgroup/PKGBUILD

file modified

+3 -3

		`@@ -1,6 +1,6 @@`
		`- # Maintainer (AUR): Christian Hesse <mail@eworm.de>`
		`- # Contributor (AUR): Jan "heftig" Steffens <jan.steffens@gmail.com>`
		`- # Maintainers: Parabola hackers <dev@lists.parabola.nu>`
		`+ # Maintainer (aur): Christian Hesse <mail@eworm.de>`
		`+ # Contributor: Jan "heftig" Steffens <jan.steffens@gmail.com>`
		`+ # Maintainer: Parabola Hackers <dev@lists.parabola.nu>`

		`# parabola changes and rationale:`
		`# - Added armv7h`

pcr/libdshconfig/PKGBUILD

file modified

+1 -1

		`@@ -1,4 +1,4 @@`
		`- # Contributor (Arch): SkiltZ <skiltz@free.fr>`
		`+ # Contributor: SkiltZ <skiltz@free.fr>`
		`# Maintainer: Omar Vega Ramos <ovruni@gnu.org.pe>`
		`pkgname=libdshconfig`
		`pkgver=0.20.9`

pcr/libfann/PKGBUILD

file modified

+2 -2

		`@@ -1,7 +1,7 @@`
		`- # Contributor (AUR): Oleksandr Natalenko aka post-factum <oleksandr@natalenko.name>`
		`+ # Contributor: Oleksandr Natalenko aka post-factum <oleksandr@natalenko.name>`
		`# Contributor: fauno <fauno@parabola.nu>`
		`# Contrbutor: bill-auger <bill-auger@programmer.net>`
		`- # Maintainers: Parabola hackers <dev@lists.parabola.nu>`
		`+ # Maintainer: Parabola Hackers <dev@lists.parabola.nu>`

		`pkgname=libfann`
		`_srcname=fann`

pcr/liblas/PKGBUILD

file modified

+3 -3

		`@@ -1,6 +1,6 @@`
		`- # Contributor (Arch) : Patryk Kowalczyk <patryk AT kowalczyk DOT WS>`
		`- # Contributor (Arch) : Maciej Sieczka <msieczka at sieczka dot org>`
		`- # Maintainer (Parabola) : Aurélien DESBRIÈRES <aurelien@hackers.camp>`
		`+ # Contributor: Patryk Kowalczyk <patryk AT kowalczyk DOT WS>`
		`+ # Contributor: Maciej Sieczka <msieczka at sieczka dot org>`
		`+ # Maintainer: Aurélien Desbrières <aurelien@hackers.camp>`

		`pkgname=liblas`
		`pkgver=1.8.0`

pcr/liblms7002m/PKGBUILD

file modified

+1 -1

		`@@ -1,6 +1,6 @@`
		`# $id$`
		`# Contributor: Denis 'GNUtoo' Carikli <GNUtoo@cyberdimension.org>`
		`- # Maintainers: Parabola hackers <dev@lists.parabola.nu>`
		`+ # Maintainer: Parabola Hackers <dev@lists.parabola.nu>`

		`pkgname=liblms7002m`
		`pkgver=r8.g91b5107`

pcr/libosmocore/PKGBUILD

file modified

+3 -3

		`@@ -1,6 +1,6 @@`
		`- # Maintainer (AUR): Matt Johnson <matt9j@cs.washington.edu>`
		`- # Contributor (AUR): Dominik Heidler <dominik@heidler.eu>`
		`- # Contributor (AUR): Denis 'GNUtoo' Carikli <GNUtoo@cyberdimension.org>`
		`+ # Maintainer (aur): Matt Johnson <matt9j@cs.washington.edu>`
		`+ # Contributor: Dominik Heidler <dominik@heidler.eu>`
		`+ # Contributor: Denis 'GNUtoo' Carikli <GNUtoo@cyberdimension.org>`

		`# parabola changes and rationale:`
		`# - Added libusb in makedepends, patch sent upstream, not reviewed yet`

pcr/libotr3/PKGBUILD

file modified

+4 -4

		`@@ -1,7 +1,7 @@`
		`- # Contributor (Arch): Gaetan Bisson <bisson@archlinux.org>`
		`- # Contributor (Arch): Pierre Schmitz <pierre@archlinux.de>`
		`- # Contributor (Arch): Bug <Bug2000@gmail.com>`
		`- # Maintainer : Omar Vega Ramos <ovruni@gnu.org.pe>`
		`+ # Contributor: Gaetan Bisson <bisson@archlinux.org>`
		`+ # Contributor: Pierre Schmitz <pierre@archlinux.de>`
		`+ # Contributor: Bug <Bug2000@gmail.com>`
		`+ # Maintainer: Omar Vega Ramos <ovruni@gnu.org.pe>`

		`pkgname=libotr3`
		`pkgver=3.2.1`

pcr/libowfat/PKGBUILD

file modified

+2 -2

		`@@ -1,5 +1,5 @@`
		`- # Contributor (Arch): gls < ghostlovescorebg at gmail dot com >`
		`- # Maintainer: Aurélien DESBRIÈRES <aurelien@hackers.camp>`
		`+ # Contributor: gls < ghostlovescorebg at gmail dot com >`
		`+ # Maintainer: Aurélien Desbrières <aurelien@hackers.camp>`

		`pkgname=libowfat`
		`pkgver=0.29`

pcr/libreboot-utils/PKGBUILD

file modified

+30 -12

		`@@ -1,26 +1,26 @@`
		`# Copyright (C) 2022 Denis 'GNUtoo' Carikli <GNUtoo@cyberdimension.org>`
		`# Copyright (C) 2022 Wael Karram <wael@waelk.tech>`
		`# SPDX-License-Identifier: CC0-1.0`
		`- # Maintainers: Parabola hackers <dev@lists.parabola.nu>`
		`+ # Maintainer: Parabola Hackers <dev@lists.parabola.nu>`

		`pkgname=libreboot-utils`
		`- pkgrel=14`
		`- _upstream_ver=20211122`
		`+ pkgrel=2`
		`+ _upstream_ver=20220710`
		`pkgver=4.15.libreboot${_upstream_ver}`
		`pkgdesc="Misc. Coreboot/Libreboot utils (bucts, cbfstool, ECtool, nvramtool, superiotool)"`
		`url="https://libreboot.org/"`
		`arch=('x86_64' 'i686' 'armv7h')`
		`license=('GPL2')`
		`- makedepends=('pciutils' 'python' 'python-setuptools')`
		`+ makedepends=('pciutils' 'python' 'python-setuptools' 'flex')`

		`_mirror="https://mirrors.mit.edu/libreboot" # use a mirror per libreboot's request`
		`- source=("${_mirror}/testing/${_upstream_ver}/libreboot-${_upstream_ver}_src.tar.xz"{,.sig}`
		`+ source=("${_mirror}/stable/${_upstream_ver}/libreboot-${_upstream_ver}_src.tar.xz"{,.sig}`
		`"0001-cbfstool-enable-to-disable-Werror-in-standalone-buil.patch")`
		`- sha256sums=('e8a610e51e668c34627a6d9c048c554592fd2c2ab4dbcad83c85c06d132e5ad1'`
		`- '4442fc225383e1edf8f45e1aecba81868ae43db19978f15c17828389364c0434'`
		`+ sha256sums=('92439034828aa66d52507c97d8260a7d0335abbeedb1a70e5e1466b92a903645'`
		`+ 'e8afb35e6d9328baa5cee5325c60cb40467559596e93a7ae218883ece3484b8f'`
		`'SKIP')`
		`- sha512sums=('3eac75b33bc6d2874c3ca1ad2392db7287992cf91d37879bb3244dbd6716bc7ffa3f8d31e15d821899e91a55b6fe665d918bea4e9da92e5e98345e9bcbe1bb95'`
		`- '3a532ecef550ef27b723845544e91ff6b13ed6f2f1188d40fdeb7b3c416be619ff58103c3b01cd52ff88c28df6d419d2113b92d0b8ba36d1a74cfc16f70e0e63'`
		`+ sha512sums=('73fe77983d30997295747e365a363f6fc4897f469d9b24640fc6a7105f0ddb623890e797723077222212695dbbe9abb5186b04d75dad39f99cb62733f4b0de60'`
		`+ 'aa4f35df0da8e93dda169034e906576db291ac2e6fe27b5c9693827ff99ecaa8c45b80892f0792505fb1d9c6d5190517a59309304f93c3e1f504ddacf95684c1'`
		`'SKIP')`
		`validpgpkeys=('98CCDDF8E56047F475C044BDD0C62464FA8B4856') # Leah Rowe`

		`@@ -39,6 +39,8 @@`
		`sed 's#/sbin#/bin#' -i Makefile`
		`cd "$srcdir/libreboot-${_upstream_ver}_src/coreboot/default/util/ectool/"`
		`sed 's#/sbin#/bin#' -i Makefile`
		`+ cd "$srcdir/libreboot-${_upstream_ver}_src/coreboot/default/util/intelmetool/"`
		`+ sed 's#/sbin#/bin#' -i Makefile`
		`cd "$srcdir/libreboot-${_upstream_ver}_src/coreboot/default/util/inteltool/"`
		`sed 's#/sbin#/bin#' -i Makefile`
		`cd "$srcdir/libreboot-${_upstream_ver}_src/coreboot/default/util/nvramtool/"`
		`@@ -55,6 +57,10 @@`
		`}`

		`build() {`
		`+ # Build ich9deblob, ich9gen, demefactory, ich9show, etc`
		`+ cd "$srcdir/libreboot-${_upstream_ver}_src"`
		`+ make -C ich9utils`
		`+`
		`# Get to the directory.`
		`cd "$srcdir/libreboot-${_upstream_ver}_src/coreboot/default/util/"`

		`@@ -69,6 +75,9 @@`
		`# Build ECtool.`
		`make -C ectool`

		`+ # Build intelmetool.`
		`+ make -C intelmetool`
		`+`
		`# Build inteltool.`
		`make -C inteltool`

		`@@ -101,12 +110,18 @@`
		`}`

		`package() {`
		`- # Get to the directory.`
		`- cd "$srcdir/libreboot-${_upstream_ver}_src/coreboot/default/util/"`
		`-`
		`# Set directories up.`
		`install -d "${pkgdir}"/usr/bin "${pkgdir}"/usr/share/man/man8`

		`+ # Install ich9deblob, ich9gen, demefactory, ich9show, etc`
		`+ cd "$srcdir/libreboot-${_upstream_ver}_src/ich9utils"`
		`+ for binary in ich9deblob ich9gen demefactory ich9show ; do`
		`+ install -Dm755 "${binary}" "${pkgdir}"/usr/bin/"${binary}"`
		`+ done`
		`+`
		`+ # Get to the directory.`
		`+ cd "$srcdir/libreboot-${_upstream_ver}_src/coreboot/default/util/"`
		`+`
		`# These tools uses port-mapped I/O which doesn't exist on armv7h,`
		`# so they fails to compile when including sys/io.h. So we also need`
		`# to skip their installation.`
		`@@ -117,6 +132,9 @@`
		`# Install ECtool.`
		`make -C ectool install PREFIX="${pkgdir}"/usr`

		`+ # Install intelmetool.`
		`+ make -C intelmetool install DESTDIR="${pkgdir}" PREFIX=/usr`
		`+`
		`# Install inteltool.`
		`make -C inteltool install DESTDIR="${pkgdir}" PREFIX=/usr`

pcr/libselinux/PKGBUILD

file modified

+5 -5

		`@@ -1,8 +1,8 @@`
		`- # Maintainer (AUR): Nicolas Iooss (nicolas <dot> iooss <at> m4x <dot> org)`
		`- # Contributor (AUR): Timothée Ravier <tim@siosm.fr>`
		`- # Contributor (AUR): Nicky726 (Nicky726 <at> gmail <dot> com)`
		`- # Contributor (AUR): Sergej Pupykin (pupykin <dot> s+arch <at> gmail <dot> com)`
		`- # Contributor (AUR): Zezadas`
		`+ # Maintainer (aur): Nicolas Iooss (nicolas <dot> iooss <at> m4x <dot> org)`
		`+ # Contributor: Timothée Ravier <tim@siosm.fr>`
		`+ # Contributor: Nicky726 (Nicky726 <at> gmail <dot> com)`
		`+ # Contributor: Sergej Pupykin (pupykin <dot> s+arch <at> gmail <dot> com)`
		`+ # Contributor: Zezadas`
		`# Maintainer: Luke Shumaker <lukeshu@parabola.nu>`

		`# parabola changes and rationale:`

pcr/libsemanage/PKGBUILD

file modified

+4 -4

		`@@ -1,7 +1,7 @@`
		`- # Maintainer (AUR): Nicolas Iooss (nicolas <dot> iooss <at> m4x <dot> org)`
		`- # Contributor (AUR): Timothée Ravier <tim@siosm.fr>`
		`- # Contributor (AUR): Nicky726 (Nicky726 <at> gmail <dot> com)`
		`- # Contributor (AUR): Sergej Pupykin (pupykin <dot> s+arch <at> gmail <dot> com)`
		`+ # Maintainer (aur): Nicolas Iooss (nicolas <dot> iooss <at> m4x <dot> org)`
		`+ # Contributor: Timothée Ravier <tim@siosm.fr>`
		`+ # Contributor: Nicky726 (Nicky726 <at> gmail <dot> com)`
		`+ # Contributor: Sergej Pupykin (pupykin <dot> s+arch <at> gmail <dot> com)`

		`# parabola changes and rationale:`
		`# - Added armv7h`

pcr/libsepol/PKGBUILD

file modified

+4 -4

		`@@ -1,7 +1,7 @@`
		`- # Maintainer (AUR): Nicolas Iooss (nicolas <dot> iooss <at> m4x <dot> org)`
		`- # Contributor (AUR): Timothée Ravier <tim@siosm.fr>`
		`- # Contributor (AUR): Nicky726 (Nicky726 <at> gmail <dot> com)`
		`- # Contributor (AUR): Sergej Pupykin (pupykin <dot> s+arch <at> gmail <dot> com)`
		`+ # Maintainer (aur): Nicolas Iooss (nicolas <dot> iooss <at> m4x <dot> org)`
		`+ # Contributor: Timothée Ravier <tim@siosm.fr>`
		`+ # Contributor: Nicky726 (Nicky726 <at> gmail <dot> com)`
		`+ # Contributor: Sergej Pupykin (pupykin <dot> s+arch <at> gmail <dot> com)`
		`# Maintainer: Luke Shumaker <lukeshu@parabola.nu>`

		`# parabola changes and rationale:`

pcr/libshout-idjc/PKGBUILD

file modified

+1 -1

		`@@ -1,4 +1,4 @@`
		`- # Maintainer (Arch): M0Rf30`
		`+ # Maintainer (arch): M0Rf30`
		`# Maintainer: Omar Vega Ramos <ovruni@gnu.org.pe>`

		`pkgname=libshout-idjc`

pcr/libsquish-svn/PKGBUILD

file modified

+2 -2

		`@@ -1,5 +1,5 @@`
		`- # Maintainer (AUR): Samuel Mesa <samuelmesa@linuxmail.org>`
		`- # Contributor (AUR): F0ruD<fzerorubigd{AT}gmail{DOT}com>`
		`+ # Maintainer (aur): Samuel Mesa <samuelmesa@linuxmail.org>`
		`+ # Contributor: F0ruD<fzerorubigd{AT}gmail{DOT}com>`
		`# Contributor: Jorge Araya Navarro <jorgean@lavabit.com>`

		`# parabola changes and rationale:`

pcr/libsrs_alt/PKGBUILD

file modified

+1 -1

		`@@ -1,5 +1,5 @@`
		`# Maintainer: Luke Shumaker <lukeshu@parabola.nu>`
		`- # Maintainer (AUR): Sergey Shatunov <me@prok.pw>`
		`+ # Maintainer (aur): Sergey Shatunov <me@prok.pw>`

		`pkgname=libsrs_alt`
		`pkgver=1.0`

pcr/libtorrent-extended/PKGBUILD

file modified

+5 -5

		`@@ -1,8 +1,8 @@`
		`- # Contributor (Arch): Lucky <aur.archlinux.org [at] lucky.take0ver [dot] net>`
		`- # Contributor (Arch): Daenyth <Daenyth+Arch [at] gmail [dot] com>`
		`- # Contributor (Arch): Jeff Mickey <jeff@archlinux.org>`
		`- # Contributor (Arch): sh__`
		`- # Maintainer : Omar Vega Ramos <ovruni@gnu.org.pe>`
		`+ # Contributor: Lucky <aur.archlinux.org [at] lucky.take0ver [dot] net>`
		`+ # Contributor: Daenyth <Daenyth+Arch [at] gmail [dot] com>`
		`+ # Contributor: Jeff Mickey <jeff@archlinux.org>`
		`+ # Contributor: sh__`
		`+ # Maintainer: Omar Vega Ramos <ovruni@gnu.org.pe>`

		`pkgname=libtorrent-extended`
		`_pkgname="libtorrent"`

pcr/libubox-lua-git/PKGBUILD

file modified

+1 -1

		`@@ -1,4 +1,4 @@`
		`- # Maintainer (Arch): Luka Perkov <luka.perkov@sartura.hr>`
		`+ # Maintainer (arch): Luka Perkov <luka.perkov@sartura.hr>`
		`# Maintainer: Omar Vega Ramos <ovruni@gnu.org.pe>`

		`pkgname=libubox-lua-git`

pcr/libvdpau-sunxi-git/PKGBUILD

file modified

+2 -2

		`@@ -1,5 +1,5 @@`
		`- # Maintainer (AUR): Jens Kuske <jenskuske@gmail.com>`
		`- # Contributor (AUR): smotocel69 <smotocel69@gmail.com>`
		`+ # Maintainer (aur): Jens Kuske <jenskuske@gmail.com>`
		`+ # Contributor: smotocel69 <smotocel69@gmail.com>`
		`# Contributor: André Silva <emulatorman@hyperbola.info>`

		`# parabola changes and rationale:`

pcr/libxtrx/PKGBUILD

file modified

+1 -1

		`@@ -1,6 +1,6 @@`
		`# $id$`
		`# Contributor: Denis 'GNUtoo' Carikli <GNUtoo@cyberdimension.org>`
		`- # Maintainers: Parabola hackers <dev@lists.parabola.nu>`
		`+ # Maintainer: Parabola Hackers <dev@lists.parabola.nu>`

		`pkgname=libxtrx`
		`pkgver=r49.g2443a10`

pcr/libxtrxdsp/PKGBUILD

file modified

+1 -1

		`@@ -1,6 +1,6 @@`
		`# $Id$`
		`# Contributor: Denis 'GNUtoo' Carikli <GNUtoo@cyberdimension.org>`
		`- # Maintainers: Parabola hackers <dev@lists.parabola.nu>`
		`+ # Maintainer: Parabola Hackers <dev@lists.parabola.nu>`

		`pkgname=libxtrxdsp`
		`pkgver=r7.g84c6f4c`

pcr/libxtrxll/PKGBUILD

file modified

+1 -1

		`@@ -1,6 +1,6 @@`
		`# $id$`
		`# Contributor: Denis 'GNUtoo' Carikli <GNUtoo@cyberdimension.org>`
		`- # Maintainers: Parabola hackers <dev@lists.parabola.nu>`
		`+ # Maintainer: Parabola Hackers <dev@lists.parabola.nu>`

		`pkgname=libxtrxll`
		`pkgver=r32.g9106b98`

pcr/lie/PKGBUILD

file modified

+1 -1

		`@@ -1,4 +1,4 @@`
		`- # Contributor (Arch): Dariusz 'quasi' Panchyrz <quasi@aur.archlinux.org>`
		`+ # Contributor: Dariusz 'quasi' Panchyrz <quasi@aur.archlinux.org>`
		`# Maintainer: asm <asm@member.fsf.org>`

		`pkgname=lie`

pcr/lightspark/PKGBUILD

file modified

+6 -6

		`@@ -1,9 +1,9 @@`
		`- # Maintainer (Arch): Daniel Landau <daniel+aur@landau.fi>`
		`- # Contributor (Arch): sekret, mail=$(echo c2VrcmV0QHBvc3Rlby5zZQo= \| base64 -d)`
		`- # Contributor (Arch): mmm`
		`- # Contributor (Arch): bslackr <brendan at vastactive dot com>`
		`- # Contributor (Arch): Jan "heftig" Steffens <jan.steffens@gmail.com>`
		`- # Contributor (Arch): Thomas Dziedzic < gostrc at gmail >`
		`+ # Maintainer (arch): Daniel Landau <daniel+aur@landau.fi>`
		`+ # Contributor: sekret, mail=$(echo c2VrcmV0QHBvc3Rlby5zZQo= \| base64 -d)`
		`+ # Contributor: mmm`
		`+ # Contributor: bslackr <brendan at vastactive dot com>`
		`+ # Contributor: Jan "heftig" Steffens <jan.steffens@gmail.com>`
		`+ # Contributor: Thomas Dziedzic < gostrc at gmail >`
		`# Maintainer: Omar Vega Ramos <ovruni@gnu.org.pe>`
		`# Contributor: bill-auger <bill-auger@programmer.net>`

pcr/lilo/PKGBUILD

file modified

+3 -3

		`@@ -1,6 +1,6 @@`
		`- # Maintainer (Arch): Connor Behan <connor.behan@gmail.com>`
		`- # Contributor (Arch): Eric Belanger <eric@archlinux.org>`
		`- # Contributor (Arch): judd <jvinet@zeroflux.org>`
		`+ # Maintainer (arch): Connor Behan <connor.behan@gmail.com>`
		`+ # Contributor: Eric Belanger <eric@archlinux.org>`
		`+ # Contributor: judd <jvinet@zeroflux.org>`
		`# Contributor: André Silva <emulatorman@hyperbola.info>`

		`# parabola changes and rationale:`

pcr/litecoin-qt/PKGBUILD

file modified

+2 -2

		`@@ -1,5 +1,5 @@`
		`- # Maintainer (Arch): Loïc Guitaut <flink at belfalas.eu>`
		`- # Contributor (Arch): Nicolas Doualot <packages at slubman.info>`
		`+ # Maintainer (arch): Loïc Guitaut <flink at belfalas.eu>`
		`+ # Contributor: Nicolas Doualot <packages at slubman.info>`
		`# Maintainer: Omar Vega Ramos <ovruni@gnu.org.pe>`

		`pkgname='litecoin-qt'`

pcr/llvm37/PKGBUILD

file modified

+10 -10

		`@@ -1,14 +1,14 @@`
		`# Maintainer: Isaac David <isacdaavid@at@isacdaavid@dot@info>`
		`- # Maintainer (Arch): Evangelos Foutras <evangelos@foutrelis.com>`
		`- # Contributor (Arch): Jan "heftig" Steffens <jan.steffens@gmail.com>`
		`- # Contributor (Arch): Sebastian Nowicki <sebnow@gmail.com>`
		`- # Contributor (Arch): Devin Cofer <ranguvar{AT]archlinux[DOT}us>`
		`- # Contributor (Arch): Tobias Kieslich <tobias@justdreams.de>`
		`- # Contributor (Arch): Geoffroy Carrier <geoffroy.carrier@aur.archlinux.org>`
		`- # Contributor (Arch): Tomas Lindquist Olsen <tomas@famolsen.dk>`
		`- # Contributor (Arch): Roberto Alsina <ralsina@kde.org>`
		`- # Contributor (Arch): Gerardo Exequiel Pozzi <vmlinuz386@yahoo.com.ar>`
		`- # Maintainer (ALARM): Kevin Mihelich <kevin@archlinuxarm.org>`
		`+ # Maintainer (arch): Evangelos Foutras <evangelos@foutrelis.com>`
		`+ # Contributor: Jan "heftig" Steffens <jan.steffens@gmail.com>`
		`+ # Contributor: Sebastian Nowicki <sebnow@gmail.com>`
		`+ # Contributor: Devin Cofer <ranguvar{AT]archlinux[DOT}us>`
		`+ # Contributor: Tobias Kieslich <tobias@justdreams.de>`
		`+ # Contributor: Geoffroy Carrier <geoffroy.carrier@aur.archlinux.org>`
		`+ # Contributor: Tomas Lindquist Olsen <tomas@famolsen.dk>`
		`+ # Contributor: Roberto Alsina <ralsina@kde.org>`
		`+ # Contributor: Gerardo Exequiel Pozzi <vmlinuz386@yahoo.com.ar>`
		`+ # Maintainer (archarm): Kevin Mihelich <kevin@archlinuxarm.org>`
		`# - v5: disable compiler-rt, don't install in clang package`
		`# - v8: disable lldb, unsupported architecture`
		`# - this package only exists for GHC`

pcr/log4c/PKGBUILD

file modified

+3 -3

		`@@ -1,6 +1,6 @@`
		`- # Contributor (Arch): Arthur Țițeică arthur.titeica/gmail/com`
		`- # Contributor (Arch): rockerzz <rockerzz@gmail.com>`
		`- # Maintainer : Omar Vega Ramos <ovruni@gnu.org.pe>`
		`+ # Contributor: Arthur Țițeică arthur.titeica/gmail/com`
		`+ # Contributor: rockerzz <rockerzz@gmail.com>`
		`+ # Maintainer: Omar Vega Ramos <ovruni@gnu.org.pe>`

		`pkgname=log4c`
		`pkgver=1.2.4`

pcr/lttoolbox/PKGBUILD

file modified

+2 -2

		`@@ -1,5 +1,5 @@`
		`- # Contributor (AUR): Kevin Brubeck Unhammer <unhammer@fsfe.org>`
		`- # Maintainer (AUR): Kevin Brubeck Unhammer <unhammer@fsfe.org>`
		`+ # Contributor: Kevin Brubeck Unhammer <unhammer@fsfe.org>`
		`+ # Maintainer (aur): Kevin Brubeck Unhammer <unhammer@fsfe.org>`

		`pkgname=lttoolbox`
		`pkgver=3.5.0`

pcr/lua-cyrussasl/PKGBUILD

file modified

+1 -1

		`@@ -1,4 +1,4 @@`
		`- # Maintainer (Arch): Dwayne Bent <dbb.1@liqd.org>`
		`+ # Maintainer (arch): Dwayne Bent <dbb.1@liqd.org>`

		`# parabola changes and rationale:`
		`# - upstream pkgbuild is gone, but we keep maintaining this.`

pcr/lua-ldap/PKGBUILD

file modified

+1 -1

		`@@ -1,4 +1,4 @@`
		`- # Maintainers: Parabola hackers <dev@lists.parabola.nu>`
		`+ # Maintainer: Parabola Hackers <dev@lists.parabola.nu>`

		`pkgname=lua-ldap`
		`_pkgname=lualdap`

pcr/lua51-sql-mysql/PKGBUILD

file modified

+3 -3

		`@@ -1,7 +1,7 @@`
		`# $Id$`
		`- # Maintainer (Arch): Sergej Pupykin <pupykin.s+arch@gmail.com>`
		`- # Contributor (Arch): Sébastien Luttringer <seblu@archlinux.org>`
		`- # Contributor (Arch): Anders Bergh <anders1@gmail.com>`
		`+ # Maintainer (arch): Sergej Pupykin <pupykin.s+arch@gmail.com>`
		`+ # Contributor: Sébastien Luttringer <seblu@archlinux.org>`
		`+ # Contributor: Anders Bergh <anders1@gmail.com>`

		`pkgname=lua51-sql-mysql`
		`pkgdesc='MySQL module for Lua 5.1'`

pcr/luadbi/PKGBUILD

file modified

+3 -3

		`@@ -1,6 +1,6 @@`
		`- # Maintainer (AUR): Aoibhinn di Tori <email@aoibh.in>`
		`- # Contributor (AUR): Lee T. Starnes <lstarnes1024@gmail.com>`
		`- # Maintainer (Parabola): fauno <fauno@parabola.nu>`
		`+ # Maintainer (aur): Aoibhinn di Tori <email@aoibh.in>`
		`+ # Contributor: Lee T. Starnes <lstarnes1024@gmail.com>`
		`+ # Maintainer: fauno <fauno@parabola.nu>`

		`# parabola changes and rationale:`
		`# - removed empty fields`

pcr/lv2-c++-tools/PKGBUILD

file modified

+2 -2

		`@@ -1,5 +1,5 @@`
		`- # Maintainer (Arch): speps <speps at aur dot archlinux dot org>`
		`- # Contributor (Arch): Philipp Überbacher <murks at lavabit dot com>`
		`+ # Maintainer (arch): speps <speps at aur dot archlinux dot org>`
		`+ # Contributor: Philipp Überbacher <murks at lavabit dot com>`
		`# Maintainer: Guest One <theguestone at gmail dot com>`

		`pkgname=lv2-c++-tools`

pcr/lzlib/PKGBUILD

file modified

+1 -1

		`@@ -1,5 +1,5 @@`
		`# Maintainer(AUR): Jaroslav Lichtblau <dragonlord@aur.archlinux.org>`
		`- # Contributor(AUR): Christoph Zeiler <archNOSPAM_at_moonblade.dot.org>`
		`+ # Contributor: Christoph Zeiler <archNOSPAM_at_moonblade.dot.org>`

		`pkgname=lzlib`
		`pkgver=1.11`

pcr/mailcrypt/PKGBUILD

file modified

+1 -1

		`@@ -1,4 +1,4 @@`
		`- # Maintainer (AUR): Stefan Husmann <stefan-husmann@t-online.de>`
		`+ # Maintainer (aur): Stefan Husmann <stefan-husmann@t-online.de>`
		`# Maintainer: Omar Vega Ramos <ovruni@gnu.org.pe>`

		`# parabola changes and rationale:`

pcr/mailpile/PKGBUILD

file modified

+2 -2

		`@@ -1,6 +1,6 @@`
		`- # Maintainer (AUR): Maxim Andersson <thesilentboatman@gmail.com>`
		`+ # Maintainer (aur): Maxim Andersson <thesilentboatman@gmail.com>`
		`# Based on the mailpile-git PKGBUILD`
		`- # Contributor (AUR): cornholio <vigo.the.unholy.carpathian@gmail.com>`
		`+ # Contributor: cornholio <vigo.the.unholy.carpathian@gmail.com>`

		`# parabola changes and rationale:`
		`# no changes.`

pcr/maliit-framework/PKGBUILD

file modified

+2 -2

		`@@ -1,5 +1,5 @@`
		`- # Contributor (Arch): Jon Nordby <jononor@gmail.com>`
		`- # Maintainer (Arch): Jon Nordby <jononor@gmail.com>`
		`+ # Contributor: Jon Nordby <jononor@gmail.com>`
		`+ # Maintainer (arch): Jon Nordby <jononor@gmail.com>`
		`# Contributor: André Silva <emulatorman@hyperbola.info>`

		`# parabola changes and rationale:`

pcr/maliit-plugins/PKGBUILD

file modified

+2 -2

		`@@ -1,5 +1,5 @@`
		`- # Contributor (Arch): Jon Nordby <jononor@gmail.com>`
		`- # Maintainer (Arch): Jon Nordby <jononor@gmail.com>`
		`+ # Contributor: Jon Nordby <jononor@gmail.com>`
		`+ # Maintainer (arch): Jon Nordby <jononor@gmail.com>`

		`# parabola changes and rationale:`
		`# - upstream pkgbuild is gone, but we keep maintaining this.`

pcr/mathics/PKGBUILD

file modified

+6 -6

		`@@ -1,9 +1,9 @@`
		`- # Maintainer (AUR): Victor <v1c70rp@gmail.com>`
		`- # Contributor (AUR): Stefan Husmann <stefan-husmann@t-online.de>`
		`- # Contributor (AUR): sn6uv mathics@angusgriffith.com`
		`- # Contributor (AUR): Lex Black <autumn-wind at web dot de>`
		`- # Contributor (AUR): rnestler`
		`- # Contributor (AUR): mefistofeles`
		`+ # Maintainer (aur): Victor <v1c70rp@gmail.com>`
		`+ # Contributor: Stefan Husmann <stefan-husmann@t-online.de>`
		`+ # Contributor: sn6uv mathics@angusgriffith.com`
		`+ # Contributor: Lex Black <autumn-wind at web dot de>`
		`+ # Contributor: rnestler`
		`+ # Contributor: mefistofeles`

		`# parabola changes and rationale:`
		`# no changes.`

pcr/md5deep/PKGBUILD

file modified

+2 -2

		`@@ -1,5 +1,5 @@`
		`- # Contributor (Arch): billycongo <billycongo@gmail.com>`
		`- # Maintainer (Arch): dkaylor <dpkaylor@gmail.com>`
		`+ # Contributor: billycongo <billycongo@gmail.com>`
		`+ # Maintainer (arch): dkaylor <dpkaylor@gmail.com>`
		`# Maintainer: Esteban Carnevale <alfplayer@mailoo.org>`

		`pkgname=md5deep`

pcr/mediagoblin/PKGBUILD

file modified

+1 -1

		`@@ -1,4 +1,4 @@`
		`- # Maintainer (AUR): Immae <ismael.bouya@normalesup.org>`
		`+ # Maintainer (aur): Immae <ismael.bouya@normalesup.org>`
		`# Maintainer: Isaac David <isacdaavid@at@isacdaavid@dot@info>`

pcr/mediatomb/PKGBUILD

file modified

+8 -8

		`@@ -1,11 +1,11 @@`
		`- # Maintainer (AUR): Jakob Gahde <j5lx@fmail.co.uk>`
		`- # Contributor (AUR): S Leduc <sebastien@sleduc.fr>`
		`- # Contributor (AUR): Martin Villagra <mvillagra0@gmail.com>`
		`- # Contributor (AUR): William Rea <sillywilly@gmail.com>`
		`- # Contributor (AUR): Nikhil Bysani <nikron@gmail.com>`
		`- # Contributor (AUR): Mika HynnÃ¤ <igheax@gmail.com>`
		`- # Contributor (AUR): Jonathan Conder <jonno.conder@gmail.com>`
		`- # Contributor (AUR): Peter Richard Lewis <plewis@aur.archlinux.org>`
		`+ # Maintainer (aur): Jakob Gahde <j5lx@fmail.co.uk>`
		`+ # Contributor: S Leduc <sebastien@sleduc.fr>`
		`+ # Contributor: Martin Villagra <mvillagra0@gmail.com>`
		`+ # Contributor: William Rea <sillywilly@gmail.com>`
		`+ # Contributor: Nikhil Bysani <nikron@gmail.com>`
		`+ # Contributor: Mika HynnÃ¤ <igheax@gmail.com>`
		`+ # Contributor: Jonathan Conder <jonno.conder@gmail.com>`
		`+ # Contributor: Peter Richard Lewis <plewis@aur.archlinux.org>`
		`# Maintainer: Omar Vega Ramos <ovruni@gnu.org.pe>`

		`# parabola changes and rationale:`

pcr/mednaffe/PKGBUILD

file modified

+2 -2

		`@@ -1,7 +1,7 @@`
		`# Maintainer: Andreas Grapentin <andreas@grapentin.org>`
		`- # Maintainer (AUR): Vaporeon <vaporeon@vaporeon.io>`
		`+ # Maintainer (aur): Vaporeon <vaporeon@vaporeon.io>`
		`# Contributor: Márcio Silva <coadde@hyperbola.info>`
		`- # Contributor (AUR): casa <sympho08@yandex.ru>`
		`+ # Contributor: casa <sympho08@yandex.ru>`

		`pkgbase=mednaffe`
		`pkgname=('mednaffe' 'mednaffe-gtk2')`

pcr/memlockd/PKGBUILD

file modified

+1 -1

		`@@ -1,5 +1,5 @@`
		`# Contributor: fauno <fauno@parabola.nu>`
		`- # Maintainers: Parabola hackers <dev@lists.parabola.nu>`
		`+ # Maintainer: Parabola Hackers <dev@lists.parabola.nu>`

		`pkgname=memlockd`
		`pkgver=1.1.1`

pcr/mhonarc/PKGBUILD

file modified

+5 -5

		`@@ -1,8 +1,8 @@`
		`- # Maintainer (AUR): Chris Severance aur.severach AatT spamgourmet.com`
		`- # Contributor (AUR): Abhishek Dasgupta <abhidg@gmail.com>`
		`- # Contributor (AUR): Billy Congo <billycongo@gmail.com>`
		`- # Contributor (AUR): froggie <sullivanva@gmail.com>`
		`- # Contributor (AUR): Lukas Martini <hello@lutoma.org>`
		`+ # Maintainer (aur): Chris Severance aur.severach AatT spamgourmet.com`
		`+ # Contributor: Abhishek Dasgupta <abhidg@gmail.com>`
		`+ # Contributor: Billy Congo <billycongo@gmail.com>`
		`+ # Contributor: froggie <sullivanva@gmail.com>`
		`+ # Contributor: Lukas Martini <hello@lutoma.org>`

		`# paraboal changes and rationale:`
		`# - removed superfluous set -u`

pcr/mimms/PKGBUILD

file modified

+1 -1

		`@@ -1,4 +1,4 @@`
		`- # Maintainer (AUR): Jaroslav Lichtblau <dragonlord@aur.archlinux.org>`
		`+ # Maintainer (aur): Jaroslav Lichtblau <dragonlord@aur.archlinux.org>`
		`# Maintainer: Alon Ivtsan <alonivtsan@lavabit.com>`

		`# parabola changes and rationale:`

pcr/mini18n-git/PKGBUILD

file modified

+1 -1

		`@@ -1,4 +1,4 @@`
		`- # Maintainer (Arch): Gustavo alvarez <sl1pkn07@gmail.com>`
		`+ # Maintainer (arch): Gustavo alvarez <sl1pkn07@gmail.com>`

		`pkgname=mini18n-git`
		`pkgver=20130213`

pcr/minicomputer/PKGBUILD

file modified

+3 -3

		`@@ -1,6 +1,6 @@`
		`- # Maintainer (Arch): speps <speps at aur dot archlinux dot org>`
		`- # Contributor (Arch): farid abdelnour <farid at archlinux-br.org>`
		`- # Contributor (Arch): DonVla <donvla@users.sourceforge.net>`
		`+ # Maintainer (arch): speps <speps at aur dot archlinux dot org>`
		`+ # Contributor: farid abdelnour <farid at archlinux-br.org>`
		`+ # Contributor: DonVla <donvla@users.sourceforge.net>`
		`# Maintainer: Omar Vega Ramos <ovruni@gnu.org.pe>`

		`pkgname=minicomputer`

pcr/minidjvu/PKGBUILD

file modified

+2 -2

		`@@ -1,5 +1,5 @@`
		`- # Contributor (Arch): Orivej Desh <masecretaire@gmx.fr>`
		`- # Maintainer (Arch): Orivej Desh <masecretaire@gmx.fr>`
		`+ # Contributor: Orivej Desh <masecretaire@gmx.fr>`
		`+ # Maintainer (arch): Orivej Desh <masecretaire@gmx.fr>`
		`pkgname=minidjvu`
		`pkgver=0.8`
		`pkgrel=3`

pcr/mkbootimg/PKGBUILD

file modified

+1 -1

		`@@ -5,7 +5,7 @@`
		`# Contributor: 謝致邦 <Yeking@Red54.com>`
		`# Contributor: Alucryd <alucryd at gmail dot com>`

		`- # Maintainer (AUR): Denis 'GNUtoo' Carikli <GNUtoo@cyberdimension.org>`
		`+ # Maintainer (aur): Denis 'GNUtoo' Carikli <GNUtoo@cyberdimension.org>`

		`# parabola changes and rationale:`
		`# no changes.`

pcr/mkinitcpio-openswap/PKGBUILD

file modified

+1 -1

		`@@ -1,5 +1,5 @@`
		`# Maintainer: David P. <megver83@parabola.nu>`
		`- # Maintainer (AUR): Jenya Sovetkin <e.sovetkin@gmail.com>`
		`+ # Maintainer (aur): Jenya Sovetkin <e.sovetkin@gmail.com>`
		`# Contributor: Fabio Tea <https://aur.archlinux.org/account/f4bio>`

		`# NOTE: since the time that this package was taken from the AUR at verion 0.1.0,`

pcr/mkinitcpio-paralogo/PKGBUILD

file modified

+1 -1

		`@@ -1,4 +1,4 @@`
		`- # Maintainer: Aurélien DESBRIÈRES <aurelien@hackers.camp>`
		`+ # Maintainer: Aurélien Desbrières <aurelien@hackers.camp>`

		`pkgname=mkinitcpio-paralogo`
		`pkgver=0.0.2`

pcr/moblock/PKGBUILD

file modified

+3 -3

		`@@ -1,6 +1,6 @@`
		`- # Contributor (Arch): Kevin Edmonds <edmondskevin@hotmail.com>`
		`- # Contributor (Arch): Filip Wojciechowski, filip at loka dot pl`
		`- # Maintainer : Parabola GNU / Linux-libre Aurelien Desbrieres <aurelien@cwb.io>`
		`+ # Contributor: Kevin Edmonds <edmondskevin@hotmail.com>`
		`+ # Contributor: Filip Wojciechowski, filip at loka dot pl`
		`+ # Maintainer: Aurélien Desbrières <aurelien@cwb.io>`

		`pkgname=moblock`
		`pkgver=0.9rc2`

pcr/modglue/PKGBUILD

file modified

+1 -1

		`@@ -1,4 +1,4 @@`
		`- # Contributor (Arch): Dariusz 'quasi' Panchyrz <quasi@aur.archlinux.org>`
		`+ # Contributor: Dariusz 'quasi' Panchyrz <quasi@aur.archlinux.org>`
		`# Maintainer: André Silva <emulatorman@hyperbola.info>`

		`pkgname=modglue`

pcr/monkeysign/PKGBUILD

file modified

+1 -1

		`@@ -1,4 +1,4 @@`
		`- # Maintainer (AUR): parazyd <parazyd AT dyne DOT org>`
		`+ # Maintainer (aur): parazyd <parazyd AT dyne DOT org>`
		`# Contributor: fauno <fauno@kiwwwi.com.ar>`

		`# parabola changes and rationale:`

pcr/monkeysphere/PKGBUILD

file modified

+4 -4

		`@@ -1,8 +1,8 @@`
		`- # Maintainer (AUR): svalo <valo@eigenlab.org>`
		`- # Contributor (AUR): David Costa <david@zarel.net>`
		`- # Contributor (AUR): fauno <fauno@kiwwwi.com.ar>`
		`+ # Maintainer (aur): svalo <valo@eigenlab.org>`
		`+ # Contributor: David Costa <david@zarel.net>`
		`+ # Contributor: fauno <fauno@kiwwwi.com.ar>`
		`# Based on monkeysphere-git from`
		`- # Contributor (AUR): Olivier Mehani <shtrom-arch@ssji.net>`
		`+ # Contributor: Olivier Mehani <shtrom-arch@ssji.net>`

		`# parabola changes and rationale:`
		`# no changes.`

pcr/mozilla-addon-sdk/PKGBUILD

file modified

+2 -2

		`@@ -1,5 +1,5 @@`
		`- # Contributor (AUR): Johannes Dewender <arch@JonnyJD.net>`
		`- # Contributor (AUR): trashstar`
		`+ # Contributor: Johannes Dewender <arch@JonnyJD.net>`
		`+ # Contributor: trashstar`
		`# Maintainer: Luke Shumaker <lukeshu@sbcglobal.net>`

		`# parabola changes and rationale:`

pcr/mpdscribble/PKGBUILD

file modified

+5 -5

		`@@ -1,8 +1,8 @@`
		`- # Maintainer (AUR): jason ryan <jasonwryan@gmail.com>`
		`- # Contributor (AUR): Bartłomiej Piotrowski <nospam@bpiotrowwski.pl>`
		`- # Contributor (AUR): Thomas Dziedzic < gostrc at gmail >`
		`- # Contributor (AUR): evr <evanroman at gmail>`
		`- # Contributor (AUR): Luiz Ribeiro <luizribeiro@gmail.com>`
		`+ # Maintainer (aur): jason ryan <jasonwryan@gmail.com>`
		`+ # Contributor: Bartłomiej Piotrowski <nospam@bpiotrowwski.pl>`
		`+ # Contributor: Thomas Dziedzic < gostrc at gmail >`
		`+ # Contributor: evr <evanroman at gmail>`
		`+ # Contributor: Luiz Ribeiro <luizribeiro@gmail.com>`

		`# parabola changes and rationale:`
		`# no changes.`

pcr/mrrescue/PKGBUILD

file modified

+2 -2

		`@@ -1,5 +1,5 @@`
		`- # Maintainer (Arch): Ainola`
		`- # Contributors (Arch): Pio, carstene1ns, MCMic`
		`+ # Maintainer (arch): Ainola`
		`+ # Contributor: Pio, carstene1ns, MCMic`

		`pkgname=mrrescue`
		`pkgver=1.02e`

pcr/msdl/PKGBUILD

file modified

+2 -2

		`@@ -1,5 +1,5 @@`
		`- # Contributor (Arch): Nathan Owe ndowens04 at gmail dot com`
		`- # Contributor (Arch): noonov <noonov@gmail.com>`
		`+ # Contributor: Nathan Owe ndowens04 at gmail dot com`
		`+ # Contributor: noonov <noonov@gmail.com>`
		`# Maintainer: Omar Vega Ramos <ovruni@gnu.org.pe>`

		`pkgname=msdl`

pcr/multiwatch/PKGBUILD

file modified

+1 -1

		`@@ -1,4 +1,4 @@`
		`- # Maintainer (Arch): Paul Dann <pdgiddie at gmail dot com>`
		`+ # Maintainer (arch): Paul Dann <pdgiddie at gmail dot com>`
		`pkgname=multiwatch`
		`pkgver='1.0.0'`
		`pkgrel=1`

pcr/mx44/PKGBUILD

file modified

+1 -1

		`@@ -1,4 +1,4 @@`
		`- # Maintainer (Arch): David Adler <david dot jo dot adler at gmail dot com>`
		`+ # Maintainer (arch): David Adler <david dot jo dot adler at gmail dot com>`
		`# Maintainer: Guest One <theguestone at gmail dot com>`
		`pkgname=mx44`
		`_pkgname=Mx44`

pcr/mycron-git/PKGBUILD

file modified

+3 -3

		`@@ -1,6 +1,6 @@`
		`- # Contributor (AUR): Dirk Sohler <spam@0x7be.de>`
		`- # Maintainer (AUR): Dirk Sohler <spam@0x7be.de>`
		`- # Maintainer : Aurélien DESBRIÈRES <aurelien@hackers.camp>`
		`+ # Contributor: Dirk Sohler <spam@0x7be.de>`
		`+ # Maintainer (aur): Dirk Sohler <spam@0x7be.de>`
		`+ # Maintainer: Aurélien Desbrières <aurelien@hackers.camp>`

		`# parabola changes and rationale:`
		`# no changes.`

pcr/naev/PKGBUILD

file modified

+2 -2

		`@@ -1,5 +1,5 @@`
		`- # Maintainer (Arch): Sven-Hendrik Haase <sh@lutzhaase.com>`
		`- # Contributor (Arch): Johan Rehnberg <cleanrock@gmail.com>`
		`+ # Maintainer (arch): Sven-Hendrik Haase <sh@lutzhaase.com>`
		`+ # Contributor: Johan Rehnberg <cleanrock@gmail.com>`
		`# This package is in Parabola only for architectures that don't have xonotic in`
		`# their feed. Here is the status of xonotic in the various upstream`
		`# GNU/Linux distributions Parabola is based on:`

pcr/nagios-nrpe-plugin/PKGBUILD

file modified

+3 -3

		`@@ -1,7 +1,7 @@`
		`- # Contributor (Arch): Mark Grimes <mgrimes at peculier dot com>`
		`+ # Contributor: Mark Grimes <mgrimes at peculier dot com>`
		`# https://github.com/mvgrimes/aur-nagios-npre-plugin`
		`- # Contributor (Arch): Idares <idares@seznam.cz>`
		`- # Maintainer : Parabola GNU / Linux-libre Aurelien Desbrieres <aurelien@cwb.IO>`
		`+ # Contributor: Idares <idares@seznam.cz>`
		`+ # Maintainer: Aurélien Desbrières <aurelien@cwb.io>`

		`pkgname=nagios-nrpe-plugin`
		`pkgver=2.15`

pcr/nagios-plugins/PKGBUILD

file modified

+2 -2

		`@@ -1,5 +1,5 @@`
		`- # Contributor (Arch): Idares <idares@seznam.cz>`
		`- # Maintainer : Parabola GNU / Linux-libre Aurelien Desbrieres <aurelien@cwb.IO>`
		`+ # Contributor: Idares <idares@seznam.cz>`
		`+ # Maintainer: Aurélien Desbrières <aurelien@cwb.io>`

		`pkgname=nagios-plugins`
		`pkgver=2.0.3`

pcr/nagios/PKGBUILD

file modified

+2 -2

		`@@ -1,5 +1,5 @@`
		`- # Contributor (Arch): Idares <idares@seznam.cz>`
		`- # Maintainer : Omar Vega Ramos <ovruni@gnu.org.pe>`
		`+ # Contributor: Idares <idares@seznam.cz>`
		`+ # Maintainer: Omar Vega Ramos <ovruni@gnu.org.pe>`

		`pkgname=nagios`
		`pkgver=4.0.8`

pcr/ncdc/PKGBUILD

file modified

+4 -4

		`@@ -1,7 +1,7 @@`
		`- # Maintainer (AUR): Robert Holt <holt.r94 at gmail dot com>`
		`- # Contributor (AUR): Anton Larionov <diffident dot cat at gmail dot com>`
		`- # Contributor (AUR): Yorhel <projects@yorhel.nl>`
		`- # Contributor (AUR): archtux <antonio.arias99999@gmail.com>`
		`+ # Maintainer (aur): Robert Holt <holt.r94 at gmail dot com>`
		`+ # Contributor: Anton Larionov <diffident dot cat at gmail dot com>`
		`+ # Contributor: Yorhel <projects@yorhel.nl>`
		`+ # Contributor: archtux <antonio.arias99999@gmail.com>`
		`# Maintainer: Luke R. <g4jc@openmailbox.org> GPG: rsa4096/3EAE8697`

		`# parabola changes and rationale:`

pcr/ncmatrix/PKGBUILD

file modified

+3 -3

		`@@ -1,6 +1,6 @@`
		`- # Contributor (Arch): Aka <aka@worstofevils.net>`
		`- # Contributor (Arch): Erus <erus.iluvatar@gmail.com>`
		`- # Maintainer : Aurelien Desbrieres <aurelien@hackers.camp>`
		`+ # Contributor: Aka <aka@worstofevils.net>`
		`+ # Contributor: Erus <erus.iluvatar@gmail.com>`
		`+ # Maintainer: Aurélien Desbrières <aurelien@hackers.camp>`

		`pkgname=ncmatrix`
		`pkgver=1.0`

pcr/ndoutils/PKGBUILD

file modified

+2 -2

		`@@ -1,5 +1,5 @@`
		`- # Maintainer (Arch): Muhkoenig`
		`- # Contributor (Arch): MisterG <mathieu.grzybek at gmail dot com>`
		`+ # Maintainer (arch): Muhkoenig`
		`+ # Contributor: MisterG <mathieu.grzybek at gmail dot com>`
		`# Maintainer: Omar Vega Ramos <ovruni@gnu.org.pe>`

		`pkgname=ndoutils`

pcr/netatalk/PKGBUILD

file modified

+5 -5

		`@@ -1,8 +1,8 @@`
		`- # Maintainer (Arch): Denis Yantarev <denis dot yantarev at gmail dot com>`
		`- # Contributor (Arch): SJ_UnderWater`
		`- # Contributor (Arch): Dominik Dingel <mail at wodar dot de>`
		`- # Contributor (Arch): William Udovich <nerdzrule7 at earthlink dot net>`
		`- # Contributor (Arch): Farhan Yousaf <farhany at xaviya dot com>`
		`+ # Maintainer (arch): Denis Yantarev <denis dot yantarev at gmail dot com>`
		`+ # Contributor: SJ_UnderWater`
		`+ # Contributor: Dominik Dingel <mail at wodar dot de>`
		`+ # Contributor: William Udovich <nerdzrule7 at earthlink dot net>`
		`+ # Contributor: Farhan Yousaf <farhany at xaviya dot com>`
		`# Maintainer: Omar Vega Ramos <ovruni@gnu.org.pe>`

		`pkgname=netatalk`

pcr/netcat6/PKGBUILD

file modified

+4 -4

		`@@ -1,7 +1,7 @@`
		`- # Maintainer (Arch): Aurelien Desbrieres <aurelien@hackers.camp>`
		`- # Maintainer (Arch): <kfgz at interia dot pl>`
		`- # Contributor (Arch): Elmo Todurov <todurov at gmail dot com>`
		`- # Contributor (Arch): henning mueller <henning at orgizm dot net>`
		`+ # Contributor: Aurélien Desbrières <aurelien@hackers.camp>`
		`+ # Contributor: <kfgz at interia dot pl>`
		`+ # Contributor: Elmo Todurov <todurov at gmail dot com>`
		`+ # Contributor: henning mueller <henning at orgizm dot net>`
		`# Maintainer: Omar Vega Ramos <ovruni@gnu.org.pe>`

		`pkgname=netcat6`

pcr/netifrc/PKGBUILD

file modified

+3 -2

		`@@ -1,10 +1,11 @@`
		`- # Maintainer (Manjaro): artoo <artoo@manjaro.org>`
		`- # Contributor (Manjaro): williamh <williamh@gentoo.org>`
		`+ # Maintainer (artix): artoo <artoo@artixlinux.org>`
		`+ # Contributor: williamh <williamh@gentoo.org>`
		`# Maintainer: Omar Vega Ramos <ovruni@gnu.org.pe>`
		`# Contributor: Luke Shumaker <lukeshu@parabola.nu>`

		`# Gentoo's ebuild file:`
		`# https://gitweb.gentoo.org/repo/gentoo.git/tree/net-misc/netifrc/netifrc-0.6.1.ebuild`
		`+`
		`pkgname=netifrc`
		`pkgver=0.6.1`
		`pkgrel=1`

pcr/networkmanager-openswan/PKGBUILD

file modified

+1 -1

		`@@ -1,4 +1,4 @@`
		`- # Contributor (Arch): Marti Raudsepp <marti@juffo.org>`
		`+ # Contributor: Marti Raudsepp <marti@juffo.org>`
		`# Maintainer: fauno <fauno@parabola.nu>`

		`pkgname=networkmanager-openswan`

pcr/nevow/PKGBUILD

file modified

+1 -1

		`@@ -1,4 +1,4 @@`
		`- # Maintainer (AUR): Nicolas Pouillard <nicolas.pouillard@gmail.com>`
		`+ # Maintainer (aur): Nicolas Pouillard <nicolas.pouillard@gmail.com>`
		`# Contributor: Peter Simons <simons@cryp.to>`
		`# Maintainer: Freemor <freemor@freemor.ca>`

pcr/newtonator/PKGBUILD

file modified

+1 -1

		`@@ -1,4 +1,4 @@`
		`- # Maintainer (Arch): speps <speps at aur dot archlinux dot org>`
		`+ # Maintainer (arch): speps <speps at aur dot archlinux dot org>`
		`# Maintainer: Guest One <theguestone at gmail dot com>`

		`pkgname=newtonator`

pcr/nginx-passenger/PKGBUILD

file modified

+6 -6

		`@@ -1,9 +1,9 @@`
		`- # Maintainer (AUR): Tom Richards <tom@tomrichards.net>`
		`- # Maintainer (Arch:nginx): Bartłomiej Piotrowski <bpiotrowski@archlinux.org>`
		`- # Maintainer (Arch:nginx): Sébastien Luttringer`
		`- # Contributor (Arch:nginx): Sergej Pupykin <pupykin.s+arch@gmail.com>`
		`- # Contributor (Arch:nginx): Miroslaw Szot <mss@czlug.icis.pcz.pl>`
		`- # Contributor (Arch:nginx): Daniel Micay <danielmicay@gmail.com>`
		`+ # Maintainer (aur): Tom Richards <tom@tomrichards.net>`
		`+ # Maintainer (arch:nginx): Bartłomiej Piotrowski <bpiotrowski@archlinux.org>`
		`+ # Maintainer (arch:nginx): Sébastien Luttringer`
		`+ # Contributor: Sergej Pupykin <pupykin.s+arch@gmail.com>`
		`+ # Contributor: Miroslaw Szot <mss@czlug.icis.pcz.pl>`
		`+ # Contributor: Daniel Micay <danielmicay@gmail.com>`
		`# Maintainer: Luke Shumaker <lukeshu@sbcglobal.net>`

		`_nginxver=1.12.1`

pcr/nicotine/PKGBUILD

file modified

+5 -5

		`@@ -1,8 +1,8 @@`
		`- # Maintainer (Arch): Antonio Rojas <nqn1976 @ gmail.com>`
		`- # Contributor (Arch): Alexander Rødseth <rodseth@gmail.com>`
		`- # Contributor (Arch): Angel Velasquez <angvp@archlinux.org>`
		`- # Contributor (Arch): Hugo Doria <hugo@archlinux.org>`
		`- # Contributor (Arch): Andrew Wright <andreww@photism.org>`
		`+ # Maintainer (arch): Antonio Rojas <nqn1976 @ gmail.com>`
		`+ # Contributor: Alexander Rødseth <rodseth@gmail.com>`
		`+ # Contributor: Angel Velasquez <angvp@archlinux.org>`
		`+ # Contributor: Hugo Doria <hugo@archlinux.org>`
		`+ # Contributor: Andrew Wright <andreww@photism.org>`
		`# Maintainer: Guest One <theguestone at gmail dot com>`

		`pkgname=nicotine`

pcr/ninja-open/PKGBUILD

file modified

+3 -3

		`@@ -1,6 +1,6 @@`
		`- # Contributor (Arch): Aurelien Desbrieres <aurelien@hackers.camp>`
		`- # Contributor (Arch): Alexander R�dseth <rodseth@gmail.com>`
		`- # Maintainer : Omar Vega Ramos <ovruni@gnu.org.pe>`
		`+ # Contributor: Aurélien Desbrières <aurelien@hackers.camp>`
		`+ # Contributor: Alexander R�dseth <rodseth@gmail.com>`
		`+ # Maintainer: Omar Vega Ramos <ovruni@gnu.org.pe>`

		`pkgname=ninja-open`
		`pkgver=0.7`

pcr/nitroshare/PKGBUILD

file modified

+3 -3

		`@@ -1,6 +1,6 @@`
		`- # Maintainer (AUR): Sid Karunaratne <sid at karunaratne dot net>`
		`- # Contributor (AUR): Nathan Osman <nathan at quickmediasolutions dot com>`
		`- # Contributor (AUR): BlackEagle <ike.devolder@gmail.com>`
		`+ # Maintainer (aur): Sid Karunaratne <sid at karunaratne dot net>`
		`+ # Contributor: Nathan Osman <nathan at quickmediasolutions dot com>`
		`+ # Contributor: BlackEagle <ike.devolder@gmail.com>`

		`# parabola changes and rationale:`
		`# no changes.`

pcr/nodejs-bower/PKGBUILD

file modified

+1 -1

		`@@ -1,4 +1,4 @@`
		`- # Maintainers: Parabola hackers <dev@lists.parabola.nu>`
		`+ # Maintainer: Parabola Hackers <dev@lists.parabola.nu>`

		`# parabola changes and rationale:`
		`# - using a common nodejs packaging scheme`

pcr/nodejs-semver-utils/PKGBUILD

file modified

+1 -1

		`@@ -1,4 +1,4 @@`
		`- # Maintainers: Parabola hackers <dev@lists.parabola.nu>`
		`+ # Maintainer: Parabola Hackers <dev@lists.parabola.nu>`

		`# parabola changes and rationale:`
		`# - using a common nodejs packaging scheme`

pcr/noip/PKGBUILD

file modified

+4 -4

		`@@ -1,7 +1,7 @@`
		`- # Maintainer (Arch): Runnytu < runnytu at gmail dot com >`
		`- # Contributor (Arch): Alexander Rødseth <rodseth@gmail.com>`
		`- # Contributor (Arch): Daenyth`
		`- # Contributor (Arch): Lyle Putnam <lcputnam@amerytel.net>`
		`+ # Maintainer (arch): Runnytu < runnytu at gmail dot com >`
		`+ # Contributor: Alexander Rødseth <rodseth@gmail.com>`
		`+ # Contributor: Daenyth`
		`+ # Contributor: Lyle Putnam <lcputnam@amerytel.net>`

		`pkgname=noip`
		`pkgver=2.1.9`

pcr/noisy-git/PKGBUILD

file added

+49

		`@@ -0,0 +1,49 @@`
		`+ # Maintainer (aur): Łaurent ʘ❢Ŧ Ŧough <laurent dot fough at gmail dot com>`
		`+`
		`+ # derived (very loosely) from 'noisy-py3-git'`
		`+`
		`+ # parabola changes and rationale:`
		`+ # * build for arch=any`
		`+ # * build from source-ball instead of VCS`
		`+ # upstream has no releases; but the script has not changed since 2018`
		`+ # * simplified sed commands`
		`+ # * do not install GPL and other useless files`
		`+ # * install README to docs/`
		`+`
		`+`
		`+ pkgname=noisy-git`
		`+ pkgver=20180908`
		`+ pkgrel=1`
		`+ pkgdesc="Simple random DNS, HTTP/S internet traffic noise generator"`
		`+ arch=(any)`
		`+ url=https://github.com/1tayH/noisy`
		`+ license=(GPL3)`
		`+`
		`+ _gitver=c21e7682d5626d96d0f6ee56a5ed749078d34aac`
		`+ depends=(python-requests)`
		`+ source=(noisy-${pkgver}.zip::https://github.com/1tayH/noisy/archive/${_gitver}.zip)`
		`+`
		`+ sha256sums=('1d23778579bb6c0d4ee2063bbc3bb8114426dc350a43b80a5cd086c7381031b9')`
		`+`
		`+`
		`+ prepare()`
		`+ {`
		`+ cd "${srcdir}"/noisy-${_gitver}`
		`+`
		`+ sed -i 's\|User=noisy\|DynamicUser=yes\|' examples/systemd/noisy.service`
		`+ sed -i 's\|/opt/noisy/noisy.py\|/usr/bin/noisy.py\|' examples/systemd/noisy.service`
		`+ sed -i 's\|/opt/noisy\|/usr/share/noisy\|g' examples/systemd/noisy.service`
		`+`
		`+ # add missing shebang`
		`+ sed -i '0,/./ s\|$.$\|#!/usr/bin/env python\n\n\1\|' noisy.py`
		`+ }`
		`+`
		`+ package()`
		`+ {`
		`+ cd "${srcdir}"/noisy-${_gitver}`
		`+`
		`+ install -Dm755 noisy.py "${pkgdir}"/usr/bin/noisy.py`
		`+ install -Dm644 examples/systemd/noisy.service "${pkgdir}"/usr/lib/systemd/system/noisy.service`
		`+ install -Dm644 README.md "${pkgdir}"/usr/share/doc/noisy/README.md`
		`+ install -Dm644 config.json "${pkgdir}"/usr/share/noisy/config.json`
		`+ }`

pcr/note/PKGBUILD

file modified

+2 -2

		`@@ -1,5 +1,5 @@`
		`- # Contributor (Arch) : David Pflug <Viaken@Gmail.com>`
		`- # Maintainer (Parabola) : Aurélien DESBRIÈRES <aurelien@hackers.camp>`
		`+ # Contributor: David Pflug <Viaken@Gmail.com>`
		`+ # Maintainer: Aurélien Desbrières <aurelien@hackers.camp>`

		`_author=TLINDEN`
		`_perlmod=note`

pcr/nouvegnomegray-icon-theme/PKGBUILD

file modified

+1 -1

		`@@ -1,4 +1,4 @@`
		`- # Maintainer (Arch): 3V0LU710N <db_eee at yahoo dot com>`
		`+ # Maintainer (arch): 3V0LU710N <db_eee at yahoo dot com>`

		`pkgname=nouvegnomegray-icon-theme`
		`pkgver=20140821`

pcr/obfs4proxy/PKGBUILD

file modified

+16 -9

		`@@ -1,29 +1,36 @@`
		`- # Maintainer (AUR): mutantmonkey <aur@mutantmonkey.in>`
		`- # Contributor (AUR): shyokou <shyokou at gmail dot com>`
		`- # Contributor (AUR): FzerorubigD <Fzerorubigd {AT} GMail {DOT} com>`
		`+ # Maintainer (aur): mutantmonkey <aur@mutantmonkey.in>`
		`+ # Contributor: shyokou <shyokou at gmail dot com>`
		`+ # Contributor: FzerorubigD <Fzerorubigd {AT} GMail {DOT} com>`

		`# parabola changes and rationale:`
		`# no changes.`

		`pkgname=obfs4proxy`
		`- pkgver=0.0.11`
		`+ pkgver=0.0.14`
		`pkgrel=1`
		`pkgdesc='The obfourscator - a pluggable transport proxy written in Go'`
		`arch=('i686' 'x86_64' 'armv6h' 'armv7h' 'aarch64')`
		`- url='https://gitweb.torproject.org/pluggable-transports/obfs4.git/'`
		`+ url='https://gitlab.com/yawning/obfs4'`
		`license=('BSD')`
		`makedepends=('git' 'go')`
		`optdepends=('tor: you need tor to use this package')`
		`- source=("https://people.torproject.org/~yawning/releases/obfs4proxy/obfs4proxy-${pkgver}.tar.xz")`
		`- sha512sums=('7d7fef951bcebd4433dfb638896d4be15dc090d38a3b54c9a9d34ea264b006cff75a42da1b97b6af998cfbc3b44919770cd8cb519ada351486a247faf47c656f')`
		`+ source=("https://gitlab.com/yawning/obfs4/-/archive/obfs4proxy-${pkgver}/obfs4-obfs4proxy-${pkgver}.tar.bz2")`
		`+ sha512sums=('a720d45250140e3ba02b176d84fd80cca55304c09d5cebbd0fda45a3f5cfd7c2e8ffb6a2588a7b98a2ce03854969b0b1f949dca0405b16de29e90842861657c1')`

		`build() {`
		`- cd "${srcdir}/"`
		`+ export GOPATH="$srcdir"`
		`+ export CGO_CPPFLAGS="${CPPFLAGS}"`
		`+ export CGO_CFLAGS="${CFLAGS}"`
		`+ export CGO_CXXFLAGS="${CXXFLAGS}"`
		`+ export CGO_LDFLAGS="${LDFLAGS}"`
		`+ export GOFLAGS="-buildmode=pie -trimpath -ldflags=-linkmode=external -mod=readonly -modcacherw"`
		`+`
		`+ cd "${srcdir}/obfs4-obfs4proxy-${pkgver}"`
		`GOPATH="${srcdir}/go" go build -o obfs4proxy/obfs4proxy ./obfs4proxy`
		`}`

		`package() {`
		`- cd "${srcdir}/"`
		`+ cd "${srcdir}/obfs4-obfs4proxy-${pkgver}"`
		`install -Dm0755 obfs4proxy/obfs4proxy "${pkgdir}/usr/bin/obfs4proxy"`
		`install -Dm0644 doc/obfs4proxy.1 "${pkgdir}/usr/share/man/man1/obfs4proxy.1"`
		`install -Dm0644 ChangeLog "${pkgdir}/usr/share/doc/${pkgname}/ChangeLog"`

pcr/obmenu-generator/PKGBUILD

file modified

+1 -1

		`@@ -1,5 +1,5 @@`
		`# Maintainer: Luke R. <g4jc@openmailbox.org> GPG: rsa4096/3EAE8697`
		`- # Maintainer (Arch): Trizen <echo dHJpemVueEBnbWFpbC5jb20K \| base64 -d>`
		`+ # Maintainer (arch): Trizen <echo dHJpemVueEBnbWFpbC5jb20K \| base64 -d>`

		`pkgname=obmenu-generator`
		`pkgver=0.85`

pcr/ocaml-base/PKGBUILD

file modified

+1 -1

		`@@ -1,4 +1,4 @@`
		`- # Maintainer (AUR): Jakob Gahde <j5lx@fmail.co.uk>`
		`+ # Maintainer (aur): Jakob Gahde <j5lx@fmail.co.uk>`

		`pkgname=ocaml-base`
		`pkgver=0.11.1`

pcr/ocaml-camomile/PKGBUILD

file modified

+3 -3

		`@@ -1,6 +1,6 @@`
		`- # Maintainer (AUR): robertfoster`
		`- # Contributor (AUR): Marek Kubica <marek@xivilization.net>`
		`- # Contributor (AUR): Serge Zirukin <ftrvxmtrx@gmail.com>`
		`+ # Maintainer (aur): robertfoster`
		`+ # Contributor: Marek Kubica <marek@xivilization.net>`
		`+ # Contributor: Serge Zirukin <ftrvxmtrx@gmail.com>`
		`# Maintainer: Aurélien Desbrières <aurelien@hackers.camp>`

		`pkgname=ocaml-camomile`

pcr/ocaml-curl/PKGBUILD

file modified

+1 -1

		`@@ -1,5 +1,5 @@`
		`# Maintainer (AUR) : Eric Bailey <nerflad@gmail.com>`
		`- # Maintainer (Parabola) : Aurélien DESBRIÈRES <aurelien@hackers.camp>`
		`+ # Maintainer: Aurélien Desbrières <aurelien@hackers.camp>`

		`pkgname=ocaml-curl`
		`pkgver=0.8.2`

pcr/ocaml-extlib/PKGBUILD

file modified

+3 -3

		`@@ -1,6 +1,6 @@`
		`- # Maintainer (AUR): Yen Chi Hsuan < yan12125 at gmail dot com >`
		`- # Contributor (AUR): lesebas < sebdeligny at gmail dot com>`
		`- # Maintainer (Parabola) : Aurélien DESBRIÈRES <aurelien@hackers.camp>`
		`+ # Maintainer (aur): Yen Chi Hsuan < yan12125 at gmail dot com >`
		`+ # Contributor: lesebas < sebdeligny at gmail dot com>`
		`+ # Maintainer: Aurélien Desbrières <aurelien@hackers.camp>`

		`pkgname=ocaml-extlib`
		`pkgver=1.7.5`

pcr/ocaml-lwt/PKGBUILD

file modified

+4 -4

		`@@ -1,7 +1,7 @@`
		`- # Maintainer (AUR): Jakob Gahde <j5lx@fmail.co.uk>`
		`- # Contributor (AUR): Serge Zirukin <ftrvxmtrx@gmail.com>`
		`- # Contributor (AUR): Sergei Lebedev <superbobry@gmail.com`
		`- # Contributor (AUR): serp <serp256 at gmail dot com>`
		`+ # Maintainer (aur): Jakob Gahde <j5lx@fmail.co.uk>`
		`+ # Contributor: Serge Zirukin <ftrvxmtrx@gmail.com>`
		`+ # Contributor: Sergei Lebedev <superbobry@gmail.com`
		`+ # Contributor: serp <serp256 at gmail dot com>`
		`# Maintainer: Omar Vega Ramos <ovruni@gnu.org.pe>`

		`# parabola changes and rationale:`

pcr/ocaml-migrate-parsetree/PKGBUILD

file modified

+1 -1

		`@@ -1,4 +1,4 @@`
		`- # Maintainer (AUR): Jakob Gahde <j5lx@fmail.co.uk>`
		`+ # Maintainer (aur): Jakob Gahde <j5lx@fmail.co.uk>`

		`pkgname=ocaml-migrate-parsetree`
		`pkgver=1.1.0`

pcr/ocaml-ounit/PKGBUILD

file modified

+9 -9

		`@@ -1,12 +1,12 @@`
		`- # Maintainer (AUR): Eric Bailey <nerflad@gmail.com>`
		`- # Contributor (AUR): Marek Kubica <marek@xivilization.net>`
		`- # Contributor (AUR): Serge Zirukin <ftrvxmtrx@gmail.com>`
		`- # Contributor (AUR): Sergei Lebedev <superbobry@gmail.com>`
		`- # Contributor (AUR): Thomas S Hatch <thatch45 at gmail dot com>`
		`- # Contributor (AUR): Sebastian Wiesner <lunaryorn googlemail com>`
		`- # Contributor (AUR): Benjamin Andresen <benny(at)klapmuetz(dot)org>`
		`- # Contributor (AUR): Sylvester Johansson <syljo361(at)gmail(dot)org>`
		`- # Maintainer (Parabola) : Aurélien DESBRIÈRES <aurelien@hackers.camp>`
		`+ # Maintainer (aur): Eric Bailey <nerflad@gmail.com>`
		`+ # Contributor: Marek Kubica <marek@xivilization.net>`
		`+ # Contributor: Serge Zirukin <ftrvxmtrx@gmail.com>`
		`+ # Contributor: Sergei Lebedev <superbobry@gmail.com>`
		`+ # Contributor: Thomas S Hatch <thatch45 at gmail dot com>`
		`+ # Contributor: Sebastian Wiesner <lunaryorn googlemail com>`
		`+ # Contributor: Benjamin Andresen <benny(at)klapmuetz(dot)org>`
		`+ # Contributor: Sylvester Johansson <syljo361(at)gmail(dot)org>`
		`+ # Maintainer: Aurélien Desbrières <aurelien@hackers.camp>`

		`pkgname=ocaml-ounit`
		`_pkgname=ounit`

pcr/ocaml-pcre/PKGBUILD

file modified

+6 -6

		`@@ -1,9 +1,9 @@`
		`- # Maintainer (AUR: Jakob Gahde <j5lx@fmail.co.uk>`
		`- # Contributor (AUR): Leonard de Ruijter <leonard@aur.archlinux.org>`
		`- # Contributor (Arch): Serge Zirukin <ftrvxmtrx@gmail.com>`
		`- # Contributor (Arch): Sergei Lebedev <superbobry@gmail.com>`
		`- # Contributor (Arch): Magnus Therning <magnus@therning.org>`
		`- # Maintainer : Parabola GNU / Linux-libre <aurelien@cwb.io>`
		`+ # Maintainer (aur): Jakob Gahde <j5lx@fmail.co.uk>`
		`+ # Contributor: Leonard de Ruijter <leonard@aur.archlinux.org>`
		`+ # Contributor: Serge Zirukin <ftrvxmtrx@gmail.com>`
		`+ # Contributor: Sergei Lebedev <superbobry@gmail.com>`
		`+ # Contributor: Magnus Therning <magnus@therning.org>`
		`+ # Maintainer: Aurélien Desbrières <aurelien@cwb.io>`

		`# parabola changes and rationale:`
		`# no changes.`

pcr/ocaml-react/PKGBUILD

file modified

+4 -4

		`@@ -1,7 +1,7 @@`
		`- # Maintainer (AUR): Jakob Gahde <j5lx@fmail.co.uk>`
		`- # Contributor (AUR): Serge Zirukin <ftrvxmtrx@gmail.com>`
		`- # Contributor (AUR): Sergei Lebedev <superbobry@gmail.com>`
		`- # Contributor (AUR): serp <serp 256 at gmail dot com>`
		`+ # Maintainer (aur): Jakob Gahde <j5lx@fmail.co.uk>`
		`+ # Contributor: Serge Zirukin <ftrvxmtrx@gmail.com>`
		`+ # Contributor: Sergei Lebedev <superbobry@gmail.com>`
		`+ # Contributor: serp <serp 256 at gmail dot com>`
		`# Maintainer: Omar Vega Ramos <ovruni@gnu.org.pe>`

		`# parabola changes and rationale:`

pcr/ocaml-sexplib0/PKGBUILD

file modified

+1 -1

		`@@ -1,4 +1,4 @@`
		`- # Maintainer (AUR): Jakob Gahde <j5lx@fmail.co.uk>`
		`+ # Maintainer (aur): Jakob Gahde <j5lx@fmail.co.uk>`

		`pkgname=ocaml-sexplib0`
		`pkgver=0.11.0`

pcr/ocaml-ssl/PKGBUILD

file modified

+4 -4

		`@@ -1,7 +1,7 @@`
		`- # Maintainer (AUR): robertfoster`
		`- # Contributor (AUR): Sigmund Vestergaard <sigmundv at gmail dot com>`
		`- # Contributor (AUR): Denis Wernert <denis@wernert.info>`
		`- # Contributor (AUR): Jakob Gahde <j5lx@fmail.co.uk>`
		`+ # Maintainer (aur): robertfoster`
		`+ # Contributor: Sigmund Vestergaard <sigmundv at gmail dot com>`
		`+ # Contributor: Denis Wernert <denis@wernert.info>`
		`+ # Contributor: Jakob Gahde <j5lx@fmail.co.uk>`
		`# Maintainer: Omar Vega Ramos <ovruni@gnu.org.pe>`

		`# parabola changes and rationale:`

pcr/ocaml-xmlm/PKGBUILD

file modified

+4 -4

		`@@ -1,8 +1,8 @@`
		`# Maintainer (AUR) : Jakob Gahde <j5lx@fmail.co.uk>`
		`- # Contributor (AUR) : Leonard de Ruijter <leonard@aur.archlinux.org>`
		`- # Contributor (AUR) : charlesthehawk -- yahoo -- com`
		`- # Contributor (AUR) : Gregory BELLIER <gregory.bellier -- gmail -- com>`
		`- # Maintainer (Parabola) : Aurélien DESBRIÈRES <aurelien@hackers.camp>`
		`+ # Contributor: Leonard de Ruijter <leonard@aur.archlinux.org>`
		`+ # Contributor: charlesthehawk -- yahoo -- com`
		`+ # Contributor: Gregory BELLIER <gregory.bellier -- gmail -- com>`
		`+ # Maintainer: Aurélien Desbrières <aurelien@hackers.camp>`

		`_pkgname=xmlm`
		`pkgname=ocaml-${_pkgname}`

pcr/ocp/PKGBUILD

file modified

+2 -2

		`@@ -1,6 +1,6 @@`
		`# Maintainer: Luke Shumaker <lukeshu@sbcglobal.net>`
		`- # Maintainer (AUR): Mikael Eriksson <mikael_eriksson@miffe.org>`
		`- # Contributor (AUR): berkus [berkus_at_madfire_dot_net]`
		`+ # Maintainer (aur): Mikael Eriksson <mikael_eriksson@miffe.org>`
		`+ # Contributor: berkus [berkus_at_madfire_dot_net]`

		`pkgname=ocp`
		`pkgver=0.1.21`

pcr/ocrodjvu/PKGBUILD

file modified

+3 -3

		`@@ -1,6 +1,6 @@`
		`- # Maintainer (AUR): Dmitry Kharitonov <darksab0r@gmail.com>`
		`- # Contributor (AUR): Francois Garillot <francois[@]garillot.net>`
		`- # Contributor (AUR): Malkov Fyodor aka krox: iksut@yandex.ru`
		`+ # Maintainer (aur): Dmitry Kharitonov <darksab0r@gmail.com>`
		`+ # Contributor: Francois Garillot <francois[@]garillot.net>`
		`+ # Contributor: Malkov Fyodor aka krox: iksut@yandex.ru`

		`# parabola changes and rationale:`
		`# no changes.`

pcr/octave-communications/PKGBUILD

file modified

+1 -1

		`@@ -1,5 +1,5 @@`
		`#`
		`- # Maintainer (Arch): Clemens Buchacher <drizzd@aon.at>`
		`+ # Maintainer (arch): Clemens Buchacher <drizzd@aon.at>`
		`# Maintainer: Omar Vega Ramos <ovruni@gnu.org.pe>`
		`#`
		`# You can use the newpkg script from`

pcr/octave-control/PKGBUILD

file modified

+1 -1

		`@@ -1,5 +1,5 @@`
		`#`
		`- # Maintainer (Arch): Clemens Buchacher <drizzd@aon.at>`
		`+ # Maintainer (arch): Clemens Buchacher <drizzd@aon.at>`
		`# Maintainer: Omar Vega Ramos <ovruni@gnu.org.pe>`
		`#`
		`# You can use the newpkg script from`

pcr/octave-general/PKGBUILD

file modified

+1 -1

		`@@ -1,5 +1,5 @@`
		`#`
		`- # Maintainer (Arch): Clemens Buchacher <drizzd@aon.at>`
		`+ # Maintainer (arch): Clemens Buchacher <drizzd@aon.at>`
		`# Maintainer: Omar Vega Ramos <ovruni@gnu.org.pe>`
		`#`
		`# You can use the newpkg script from`

pcr/octave-image/PKGBUILD

file modified

+3 -3

		`@@ -1,7 +1,7 @@`
		`#`
		`- # Contributor (Arch): Philipp Brüschweiler <blei42 gmail com>`
		`- # Contributor (Arch): Ng Oon-Ee <ngoonee.talk@gmail.com>`
		`- # Maintainer (Arch): Clemens Buchacher <drizzd@aon.at>`
		`+ # Contributor: Philipp Brüschweiler <blei42 gmail com>`
		`+ # Contributor: Ng Oon-Ee <ngoonee.talk@gmail.com>`
		`+ # Maintainer (arch): Clemens Buchacher <drizzd@aon.at>`
		`# Maintainer: Omar Vega Ramos <ovruni@gnu.org.pe>`
		`#`
		`# You can use the newpkg script from`

pcr/octave-signal/PKGBUILD

file modified

+1 -1

		`@@ -1,5 +1,5 @@`
		`#`
		`- # Maintainer (Arch): Clemens Buchacher <drizzd@aon.at>`
		`+ # Maintainer (arch): Clemens Buchacher <drizzd@aon.at>`
		`# Maintainer: Omar Vega Ramos <ovruni@gnu.org.pe>`
		`#`
		`# You can use the newpkg script from`

pcr/octopi/PKGBUILD

file modified

+2 -2

		`@@ -1,5 +1,5 @@`
		`- # Maintainer (Hyperbola): André Silva <emulatorman@hyperbola.info>`
		`- # Contributor (Hyperbola): Márcio Silva <coadde@hyperbola.info>`
		`+ # Maintainer (hyperbola): André Silva <emulatorman@hyperbola.info>`
		`+ # Contributor: Márcio Silva <coadde@hyperbola.info>`
		`# Maintainer: Omar Vega Ramos <ovruni@gnu.org.pe>`

		`pkgname=octopi`

pcr/odamex/PKGBUILD

file modified

+5 -5

		`@@ -1,8 +1,8 @@`
		`- # Maintainer (AUR): Mikael Eriksson <mikael_eriksson@miffe.org>`
		`- # Contributor (AUR): Pol Marcet Sardà <polmarcetsarda@gmail.com>`
		`- # Contributor (AUR): Thomas Dziedzic < gostrc at gmail >`
		`- # Contributor (AUR): Christoph Zeiler <archNOSPAM_at_moonblade.dot.org>`
		`- # Contributor (AUR): Curtis Smith <kman922002@gmail.com>`
		`+ # Maintainer (aur): Mikael Eriksson <mikael_eriksson@miffe.org>`
		`+ # Contributor: Pol Marcet Sardà <polmarcetsarda@gmail.com>`
		`+ # Contributor: Thomas Dziedzic < gostrc at gmail >`
		`+ # Contributor: Christoph Zeiler <archNOSPAM_at_moonblade.dot.org>`
		`+ # Contributor: Curtis Smith <kman922002@gmail.com>`

		`pkgname=odamex`
		`pkgver=0.8.3`

pcr/oggfwd/PKGBUILD

file modified

+3 -3

		`@@ -1,6 +1,6 @@`
		`- # Contributor (Arch): farid abdelnour < farid at atelier-labs.org>`
		`- # Contributor (Arch): Evan Purkhiser <evanpurkhiser@gmail.com>`
		`- # Maintainer : Omar Vega Ramos <ovruni@gnu.org.pe>`
		`+ # Contributor: farid abdelnour < farid at atelier-labs.org>`
		`+ # Contributor: Evan Purkhiser <evanpurkhiser@gmail.com>`
		`+ # Maintainer: Omar Vega Ramos <ovruni@gnu.org.pe>`

		`pkgname=oggfwd`
		`pkgver=0.2`

pcr/olsrd/PKGBUILD

file modified

+1 -1

		`@@ -1,4 +1,4 @@`
		`- # Maintainer (AUR): Nimrod Maclomair <nimrod4garoa at gmail dot com>`
		`+ # Maintainer (aur): Nimrod Maclomair <nimrod4garoa at gmail dot com>`

		`# parabola changes and rationale:`
		`# - renamed tarball to avoid collisions`

pcr/omap-u-boot-utils-git/PKGBUILD

file modified

+1 -1

		`@@ -1,7 +1,7 @@`
		`# Copyright (C) 2020 Denis 'GNUtoo' Carikli <GNUtoo@cyberdimension.org>`
		`# This program is free software: you can redistribute it and/or modify`
		`# it under the terms of the CC0 1.0 License.`
		`- # Maintainers: Parabola hackers <dev@lists.parabola.nu>`
		`+ # Maintainer: Parabola Hackers <dev@lists.parabola.nu>`

		`pkgname=omap-u-boot-utils-git`
		`_pkgname=omap-u-boot-utils`

pcr/omap-usb-boot/PKGBUILD

file modified

+1 -1

		`@@ -1,7 +1,7 @@`
		`# Copyright (C) 2020 Denis 'GNUtoo' Carikli <GNUtoo@cyberdimension.org>`
		`# This program is free software: you can redistribute it and/or modify`
		`# it under the terms of the CC0 1.0 License.`
		`- # Maintainers: Parabola hackers <dev@lists.parabola.nu>`
		`+ # Maintainer: Parabola Hackers <dev@lists.parabola.nu>`

		`# Parabola changes and rationale:`
		`# no changes.`

pcr/onioncat/PKGBUILD

file modified

+2 -2

		`@@ -1,5 +1,5 @@`
		`- # Maintainer (AUR): revel <revelΘmuub·net>`
		`- # Contributor (AUR): jwwolf <jwwolf+arch@gmail.com>`
		`+ # Maintainer (aur): revel <revelΘmuub·net>`
		`+ # Contributor: jwwolf <jwwolf+arch@gmail.com>`

		`# parabola changes and rationale:`
		`# no changes.`

pcr/openchange/PKGBUILD

file modified

+4 -4

		`@@ -1,7 +1,7 @@`
		`- # Maintainer (Arch): Michael Hansen <zrax0111 gmail com>`
		`- # Maintainer (Arch): DJ Lucas <dj_AT_linuxfromscratch_DOT_org>`
		`- # Contributor (Arch): ngoonee <ngoonee.talk@gmail.com>`
		`- # Contributor (Arch): Adam Russell <adamlr6+arch@gmail.com>`
		`+ # Maintainer (arch): Michael Hansen <zrax0111 gmail com>`
		`+ # Maintainer (arch): DJ Lucas <dj_AT_linuxfromscratch_DOT_org>`
		`+ # Contributor: ngoonee <ngoonee.talk@gmail.com>`
		`+ # Contributor: Adam Russell <adamlr6+arch@gmail.com>`
		`# Maintainer: Omar Vega Ramos <ovruni@gnu.org.pe>`
		`pkgname=openchange`
		`_codename=VULCAN`

pcr/opendnssec/PKGBUILD

file modified

+1 -1

		`@@ -1,4 +1,4 @@`
		`- # Maintainer (Arch): Javier Torres <javitonino [at] gmail [dot] com>`
		`+ # Maintainer (arch): Javier Torres <javitonino [at] gmail [dot] com>`
		`# Maintainer: Omar Vega Ramos <ovruni@gnu.org.pe>`

		`pkgname=opendnssec`

pcr/openfoam/PKGBUILD

file modified

+4 -4

		`@@ -1,7 +1,7 @@`
		`- # Maintainer (AUR): Jingbei Li <i@jingbei.li>`
		`- # Contributor (AUR): Xwang <xwaang1976@gmail.com>`
		`- # Contributor (AUR): George Eleftheriou <eleftg>`
		`- # Contributor (AUR): Andrew Fischer <andrew_at_apastron.co>`
		`+ # Maintainer (aur): Jingbei Li <i@jingbei.li>`
		`+ # Contributor: Xwang <xwaang1976@gmail.com>`
		`+ # Contributor: George Eleftheriou <eleftg>`
		`+ # Contributor: Andrew Fischer <andrew_at_apastron.co>`
		`# Contributor: bill-auger <bill-auger@programmer.net>`

		`# parabola changes and rationale:`

pcr/openrc-accessible/PKGBUILD

file modified

+1 -8

		`@@ -1,13 +1,8 @@`
		`- # Maintainer (Artix): artoo <artoo@cromnix.org>`
		`+ # Maintainer (artix): artoo <artoo@cromnix.org>`
		`# Maintainer: Omar Vega Ramos <ovruni@gnu.org.pe>`

		`_url="https://raw.githubusercontent.com/gentoo/gentoo/master"`

		`- _sed_args=(-e 's\|/var/run\|/run\|g')`
		`- prefix=true`
		`-`
		`- $_prefix && _sed_args+=(-e 's\|#!/sbin/openrc-run\|#!/usr/bin/openrc-run\|g')`
		`-`
		`pkgbase=openrc-accessible`
		`pkgname=('brltty-openrc'`
		`'espeakup-openrc')`
		`@@ -32,8 +27,6 @@`

		`_inst_initd(){`
		`install -Dm755 ${srcdir}/$1.initd ${pkgdir}/etc/init.d/$1`
		`-`
		`- sed ${_sed_args[@]} -i ${pkgdir}/etc/init.d/$1`
		`}`

		`_inst_confd(){`

pcr/openrc-base/PKGBUILD

file modified

+1 -8

		`@@ -1,15 +1,10 @@`
		`- # Maintainer (Artix): artoo <artoo@cromnix.org>`
		`+ # Maintainer (artix): artoo <artoo@cromnix.org>`
		`# Maintainer: Omar Vega Ramos <ovruni@gnu.org.pe>`

		`pkgver=20170927`
		`_commit=0783bd6eb14f40386abf1ca4c6b6ef30b68ae11b`
		`_url="https://raw.githubusercontent.com/gentoo/gentoo/${_commit}"`

		`- _sed_args=(-e 's\|/var/run\|/run\|g')`
		`- prefix=true`
		`-`
		`- $_prefix && _sed_args+=(-e 's\|#!/sbin/openrc-run\|#!/usr/bin/openrc-run\|g')`
		`-`
		`pkgbase=openrc-base`
		`pkgname=('cronie-openrc'`
		`'cryptsetup-openrc'`
		`@@ -105,8 +100,6 @@`

		`_inst_initd(){`
		`install -Dm755 ${srcdir}/$1.initd ${pkgdir}/etc/init.d/$1`
		`-`
		`- sed ${_sed_args[@]} -i ${pkgdir}/etc/init.d/$1`
		`}`

		`_inst_confd(){`

pcr/openrc-devel/PKGBUILD

file modified

+1 -26

		`@@ -1,18 +1,12 @@`
		`- # Maintainer (Artix): artoo <artoo@cromnix.org>`
		`+ # Maintainer (artix): artoo <artoo@cromnix.org>`
		`# Maintainer: Omar Vega Ramos <ovruni@gnu.org.pe>`

		`_url="https://raw.githubusercontent.com/gentoo/gentoo/master"`

		`- _sed_args=(-e 's\|/var/run\|/run\|g' -e 's\|/usr/sbin\|/usr/bin\|g')`
		`- prefix=true`
		`-`
		`- $_prefix && _sed_args+=(-e 's\|#!/sbin/openrc-run\|#!/usr/bin/openrc-run\|g')`
		`-`
		`pkgbase=openrc-devel`
		`pkgname=('distcc-openrc'`
		`'git-openrc'`
		`'jenkins-openrc'`
		`- 'mysql-openrc'`
		`#'php-fpm-openrc'`
		`'postgresql-openrc'`
		`'subversion-openrc')`
		`@@ -30,8 +24,6 @@`
		`"git-daemon.initd::${_url}/dev-vcs/git/files/git-daemon-r1.initd"`
		`'jenkins.initd'`
		`"jenkins.logrotate"`
		`- "mysql.confd::${_url}/dev-db/mysql-init-scripts/files/conf.d-2.0"`
		`- "mysql.initd::${_url}/dev-db/mysql-init-scripts/files/init.d-2.0"`
		`#"php-fpm.initd::${_url}/dev-lang/php/files/php-fpm-r4.init"`
		`"postgresql.confd::${_url}/dev-db/postgresql/files/postgresql.confd"`
		`"postgresql.initd::${_url}/dev-db/postgresql/files/postgresql.init-9.3"`
		`@@ -43,8 +35,6 @@`
		`'c39eff8e0d0156f035b987521444476875852519ddfe6b36ea5c205d93a7f323'`
		`'7ef50b386bef359224dffb964387f651aa02cd610c3f73d585fa3ae78e9becee'`
		`'03dcaccbb0d398c2b600be0752ffc68d20c877b58a10026b7c59b0bd40c0e5bf'`
		`- 'b94756f2a5fe43893dea90fadbe47308e50fb4dbe2cbaa2676f34fa88181d8e7'`
		`- 'b6eb4576e654b1f4a8138df04408935a07fab69775e9663f736133c71bbb414b'`
		`'57c1ad0b14e8458024c713dd8cc2390023b95c27ba4cbd637333b1020f11f398'`
		`'120e872848eb13c949179b22f00a31bd043823ac75c547374225c6c3620a827d'`
		`'45f2dc1a718aed885559e71d98112e670c92bd6b4f19c5cf593eced6cd2bbd97'`
		`@@ -56,8 +46,6 @@`

		`_inst_initd(){`
		`install -Dm755 ${srcdir}/$1.initd ${pkgdir}/etc/init.d/$1`
		`-`
		`- sed ${_sed_args[@]} -i ${pkgdir}/etc/init.d/$1`
		`}`

		`_inst_confd(){`
		`@@ -95,19 +83,6 @@`
		`install -Dm644 "${srcdir}/jenkins.logrotate" "${pkgdir}/etc/logrotate.d/jenkins"`
		`}`

		`- package_mysql-openrc() {`
		`- pkgdesc="OpenRC mysql init script"`
		`- depends=('mysql' 'openrc')`
		`- optdepends=('bind-openrc: bind initscript')`
		`- backup=('etc/conf.d/mysql')`
		`- install=mysql.install`
		`-`
		`- _inst_confd 'mysql'`
		`- _inst_initd 'mysql'`
		`-`
		`- sed -e 's\|/sbin/mysqld\|/bin/mysqld\|g' -i "${pkgdir}/etc/init.d/mysql"`
		`- }`
		`-`
		`# package_php-fpm-openrc() {`
		`# pkgdesc="OpenRC php-fpm init script"`
		`# depends=('php-fpm' 'openrc')`

pcr/openrc-misc/PKGBUILD

file modified

+1 -1

		`@@ -1,4 +1,4 @@`
		`- # Maintainer (Artix): artoo <artoo@cromnix.org>`
		`+ # Maintainer (artix): artoo <artoo@cromnix.org>`
		`# Maintainer: Omar Vega Ramos <ovruni@gnu.org.pe>`

		`_url="https://raw.githubusercontent.com/gentoo/gentoo/master"`

pcr/openrc-net/PKGBUILD

file modified

+1 -1

		`@@ -1,4 +1,4 @@`
		`- # Maintainer (Artix): artoo <artoo@cromnix.org>`
		`+ # Maintainer (artix): artoo <artoo@cromnix.org>`
		`# Maintainer: Omar Vega Ramos <ovruni@gnu.org.pe>`

		`_apver=2.4.18-r1`

pcr/openrc-video/PKGBUILD

file modified

+1 -1

		`@@ -1,4 +1,4 @@`
		`- # Maintainer (Artix): artoo <artoo@cromnix.org>`
		`+ # Maintainer (artix): artoo <artoo@cromnix.org>`
		`# Maintainer: Omar Vega Ramos <ovruni@gnu.org.pe>`

		`_url="https://raw.githubusercontent.com/gentoo/gentoo/master"`

pcr/openssh-knock/PKGBUILD

file modified

+3 -3

		`@@ -1,7 +1,7 @@`
		`# $Id: PKGBUILD 291134 2017-03-20 21:48:15Z bisson $`
		`- # Maintainer (Arch): Gaetan Bisson <bisson@archlinux.org>`
		`- # Contributor (Arch): Aaron Griffin <aaron@archlinux.org>`
		`- # Contributor (Arch): judd <jvinet@zeroflux.org>`
		`+ # Maintainer (arch): Gaetan Bisson <bisson@archlinux.org>`
		`+ # Contributor: Aaron Griffin <aaron@archlinux.org>`
		`+ # Contributor: judd <jvinet@zeroflux.org>`
		`# Maintainer: André Silva <emulatorman@hyperbola.info>`
		`# Contributor: Márcio Silva <coadde@hyperbola.info>`
		`# Contributor: Julian Kirsch <kirschju@sec.in.tum.de>`

pcr/openswan/PKGBUILD

file modified

+5 -5

		`@@ -1,8 +1,8 @@`
		`- # Maintainer (AUR): Carsten Feuls <archlinux@carstenfeuls.de>`
		`- # Contributor (AUR): AXVill`
		`- # Contributor (AUR): dacoit <dacoit at tuta.io>`
		`- # Contributor (AUR): xjpvictor Huang <ke [AT] xjpvictor [DOT] info>`
		`- # Contributor (AUR): uuwe`
		`+ # Maintainer (aur): Carsten Feuls <archlinux@carstenfeuls.de>`
		`+ # Contributor: AXVill`
		`+ # Contributor: dacoit <dacoit at tuta.io>`
		`+ # Contributor: xjpvictor Huang <ke [AT] xjpvictor [DOT] info>`
		`+ # Contributor: uuwe`

		`# parabola changes and rationale:`
		`# - removed "open source" term from pkgdesc`

pcr/opentracker-git/PKGBUILD

file modified

+1 -1

		`@@ -1,4 +1,4 @@`
		`- # Maintainer (Arch): TheCreeper <loxoko@gmail.com>`
		`+ # Maintainer (arch): TheCreeper <loxoko@gmail.com>`
		`# Maintainer: Omar Vega Ramos <ovruni@gnu.org.pe>`

		`pkgname=opentracker-git`

pcr/otf-stix/PKGBUILD

file modified

+1 -1

		`@@ -1,4 +1,4 @@`
		`- # Maintainers: Parabola hackers <dev@lists.parabola.nu>`
		`+ # Maintainer: Parabola Hackers <dev@lists.parabola.nu>`

		`# parabola changes and rationale:`
		`# - added .install file to update font cache`

pcr/pacman-static/PKGBUILD

file modified

+1 -1

		`@@ -1,4 +1,4 @@`
		`- # Maintainer (AUR): Eli Schwartz <eschwartz@archlinux.org>`
		`+ # Maintainer (aur): Eli Schwartz <eschwartz@archlinux.org>`

		`# parabola changes and rationale:`
		`# no changes.`

pcr/pacman2pacman/PKGBUILD

file modified

+7 -2

		`@@ -1,4 +1,7 @@`
		`- # Maintainer: Joseph Graham <joseph@xylon.me.uk>`
		`+ # SPDX-License-Identifier: CC0-1.0`
		`+ # Maintainer: Parabola Hackers <dev@lists.parabola.nu>`
		`+ # Contributor: Joseph Graham <joseph@xylon.me.uk>`
		`+`

		`pkgname=pacman2pacman`
		`pkgver=20170705.1`
		`@@ -20,7 +23,9 @@`
		`mksource=("$pkgname-$pkgver::git://git.parabola.nu/pacman2pacman.git/#$_gitver")`
		`mkmd5sums=('SKIP')`

		`- package() {`
		`+`
		`+ package()`
		`+ {`
		`cd $pkgname-$pkgver`

		`mkdir -p "${pkgdir}/srv/pacman2pacman/torrents"`

pcr/pacman4console/PKGBUILD

file modified

+1 -1

		`@@ -1,4 +1,4 @@`
		`- # Maintainer (AUR): Erus <erus.iluvatar@gmail.com>`
		`+ # Maintainer (aur): Erus <erus.iluvatar@gmail.com>`
		`# Maintainer: David P. <megver83@parabola.nu>`

		`pkgname=pacman4console`

pcr/pactools/PKGBUILD

file modified

+2 -2

		`@@ -1,5 +1,5 @@`
		`- # Contributor (Arch): Pierluigi <pierluigi88@gmail.com>`
		`- # Maintainer : Parabola GNU / Linux-libre Aurelien Desbrieres <aurelien@cwb.io>`
		`+ # Contributor: Pierluigi <pierluigi88@gmail.com>`
		`+ # Maintainer: Aurélien Desbrières <aurelien@cwb.io>`

		`pkgname=pactools`
		`pkgver=0.8.2`

pcr/par/PKGBUILD

file modified

+1 -1

		`@@ -1,4 +1,4 @@`
		`- # Maintainer (Arch): Ray Hogenson <rayhogenson@gmail.com>`
		`+ # Maintainer (arch): Ray Hogenson <rayhogenson@gmail.com>`
		`# Maintainer: Omar Vega Ramos <ovruni@gnu.org.pe>`
		`pkgname=par`
		`pkgver=1.52`

pcr/parabolaiso-git/PKGBUILD

file modified

+3 -3

		`@@ -1,6 +1,6 @@`
		`- # Maintainer (Arch): David Runge <dvzrv@archlinux.org>`
		`- # Contributor (Arch): Pierre Schmitz <pierre@archlinux.de>`
		`- # Contributor (Arch): Gerardo Exequiel Pozzi <djgera@archlinux.org>`
		`+ # Maintainer (arch): David Runge <dvzrv@archlinux.org>`
		`+ # Contributor: Pierre Schmitz <pierre@archlinux.de>`
		`+ # Contributor: Gerardo Exequiel Pozzi <djgera@archlinux.org>`
		`# Maintainer: David P. <megver83@parabola.nu>`
		`# Contributor: André Silva <emulatorman@hyperbola.info>`

pcr/parcimonie-sh-git/PKGBUILD

file modified

+2 -2

		`@@ -1,5 +1,5 @@`
		`- # Maintainer (AUR): Frederik Schwan <frederik dot schwan at linux dot com>`
		`- # Contributor (AUR): Etienne Perot <etienne at perot dot me>`
		`+ # Maintainer (aur): Frederik Schwan <frederik dot schwan at linux dot com>`
		`+ # Contributor: Etienne Perot <etienne at perot dot me>`

		`# parabola changes and rationale:`
		`# - renamed pgp-key to avoid collisions`

pcr/pdsh/PKGBUILD

file modified

+3 -3

		`@@ -1,6 +1,6 @@`
		`- # Contributor (Arch): drrossum <d.r.vanrossum at gmx.de>`
		`- # Contributor (Arch): sh0 <mee@sh0.org>`
		`- # Maintainer : Aurélien Desbrières <aurelien@xload.io>`
		`+ # Contributor: drrossum <d.r.vanrossum at gmx.de>`
		`+ # Contributor: sh0 <mee@sh0.org>`
		`+ # Maintainer: Aurélien Desbrières <aurelien@xload.io>`

		`pkgname=pdsh`
		`pkgver=2.33`

pcr/pencil2d/PKGBUILD

file modified

+1 -1

		`@@ -1,4 +1,4 @@`
		`- # Maintainer (AUR): Jakob Gahde <j5lx@fmail.co.uk>`
		`+ # Maintainer (aur): Jakob Gahde <j5lx@fmail.co.uk>`
		`# Contributor: Márcio Silva <coadde@hyperbola.info>`

		`# parabola changes and rationale:`

pcr/perl-bytes-random-secure/PKGBUILD

file modified

+2 -2

		`@@ -1,5 +1,5 @@`
		`- # Contributor (AUR): Daniel Müllner <daniel@danifold.net>`
		`- # Maintainers: Parabola hackers <dev@lists.parabola.nu>`
		`+ # Contributor: Daniel Müllner <daniel@danifold.net>`
		`+ # Maintainer: Parabola Hackers <dev@lists.parabola.nu>`

		`# repolint: reason=asdeps(pulledpork)`

pcr/perl-carp-always/PKGBUILD

file modified

+2 -2

		`@@ -1,6 +1,6 @@`
		`- # Contributor (AUR): John D Jones III <j[nospace]n[nospace]b[nospace]e[nospace]k[nospace]1972 -_AT_- the domain name google offers a mail service at ending in dot com>`
		`+ # Contributor: John D Jones III <j[nospace]n[nospace]b[nospace]e[nospace]k[nospace]1972 -_AT_- the domain name google offers a mail service at ending in dot com>`
		`# Generator (AUR): CPANPLUS::Dist::Arch 1.27`
		`- # Maintainers: Parabola hackers <dev@lists.parabola.nu>`
		`+ # Maintainer: Parabola Hackers <dev@lists.parabola.nu>`


		`# parabola changes and rationale:`

pcr/perl-crypt-dh/PKGBUILD

file modified

+4 -4

		`@@ -1,10 +1,10 @@`
		`- # Maintainer (Arch): Michael Witten`
		`+ # Maintainer (arch): Michael Witten`
		`#`
		`# Derived from perl-crypt-blowfish:`
		`- # Contributor (Arch): Sergej Pupykin <pupykin.s+arch@gmail.com>`
		`- # Contributor (Arch): Charles Mauch <cmauch@gmail.com>`
		`+ # Contributor: Sergej Pupykin <pupykin.s+arch@gmail.com>`
		`+ # Contributor: Charles Mauch <cmauch@gmail.com>`
		`#`
		`- # Contributor (Arch): Pedro Alejandro López-Valencia <palopezv@gmail.com>`
		`+ # Contributor: Pedro Alejandro López-Valencia <palopezv@gmail.com>`
		`# Contributor: Márcio Silva <coadde@hyperbola.info>`

		`pkgname=perl-crypt-dh`

pcr/perl-crypt-random-seed/PKGBUILD

file modified

+2 -2

		`@@ -1,5 +1,5 @@`
		`- # Contributor (AUR): Daniel Müllner <daniel@danifold.net>`
		`- # Maintainers: Parabola hackers <dev@lists.parabola.nu>`
		`+ # Contributor: Daniel Müllner <daniel@danifold.net>`
		`+ # Maintainer: Parabola Hackers <dev@lists.parabola.nu>`
		`# repolint: reason=asdeps(perl-bytes-random-secure)`

		`pkgname=perl-crypt-random-seed`

pcr/perl-crypt-random-tesha2/PKGBUILD

file modified

+2 -2

		`@@ -1,5 +1,5 @@`
		`- # Contributor (AUR): Daniel Müllner <daniel@danifold.net>`
		`- # Maintainers: Parabola hackers <dev@lists.parabola.nu>`
		`+ # Contributor: Daniel Müllner <daniel@danifold.net>`
		`+ # Maintainer: Parabola Hackers <dev@lists.parabola.nu>`
		`# repolint: reason=asdeps(perl-crypt-random-seed)`

		`pkgname=perl-crypt-random-tesha2`

pcr/perl-encode-eucjpascii/PKGBUILD

file modified

+2 -2

		`@@ -1,6 +1,6 @@`
		`- # Contributor (Arch): Andreas Wagner <Andreas dot Wagner at em dot uni-frankfurt dot de>`
		`+ # Contributor: Andreas Wagner <Andreas dot Wagner at em dot uni-frankfurt dot de>`
		`# Contributor: Márcio Silva <coadde@hyperbola.info>`
		`- # Maintainers: Parabola hackers <dev@lists.parabola.nu>`
		`+ # Maintainer: Parabola Hackers <dev@lists.parabola.nu>`

		`pkgname=perl-encode-eucjpascii`
		`pkgver=0.03`

pcr/perl-encode-hanextra/PKGBUILD

file modified

+2 -2

		`@@ -1,6 +1,6 @@`
		`- # Contributor (Arch): Andreas Wagner <Andreas dot Wagner at em dot uni-frankfurt dot de>`
		`+ # Contributor: Andreas Wagner <Andreas dot Wagner at em dot uni-frankfurt dot de>`
		`# Contributor: Márcio Silva <coadde@hyperbola.info>`
		`- # Maintainers: Parabola hackers <dev@lists.parabola.nu>`
		`+ # Maintainer: Parabola Hackers <dev@lists.parabola.nu>`

		`pkgname=perl-encode-hanextra`
		`pkgver=0.23`

pcr/perl-encode-jis2k/PKGBUILD

file modified

+2 -2

		`@@ -1,7 +1,7 @@`
		`- # Contributor (Arch): Andreas Wagner <Andreas dot Wagner at em dot uni-frankfurt dot de>`
		`+ # Contributor: Andreas Wagner <Andreas dot Wagner at em dot uni-frankfurt dot de>`
		`# Contributor: Márcio Silva <coadde@hyperbola.info>`
		`# Contributor: André Silva <emulatorman@hyperbola.info>`
		`- # Maintainers: Parabola hackers <dev@lists.parabola.nu>`
		`+ # Maintainer: Parabola Hackers <dev@lists.parabola.nu>`

		`pkgname=perl-encode-jis2k`
		`pkgver=0.03`

pcr/perl-geo-ipfree/PKGBUILD

file modified

+1 -1

		`@@ -1,5 +1,5 @@`
		`# Contributor: Márcio Silva <coadde@hyperbola.info>`
		`- # Maintainers: Parabola hackers <dev@lists.parabola.nu>`
		`+ # Maintainer: Parabola Hackers <dev@lists.parabola.nu>`

		`_author=bricas`
		`_perlmod=Geo-IPfree`

pcr/perl-iptables-chainmgr/PKGBUILD

file modified

+2 -2

		`@@ -1,5 +1,5 @@`
		`- # Contributor (Arch): Weirch Sodora <sodora@gmail.com>`
		`- # Maintainer: Parabola GNU / Linux-libre Aurelien Desbrieres <aurelien@cwb.IO>`
		`+ # Contributor: Weirch Sodora <sodora@gmail.com>`
		`+ # Maintainer: Aurélien Desbrières <aurelien@cwb.io>`
		`# Contributor: Márcio Silva <coadde@hyperbola.info>`

		`pkgname=perl-iptables-chainmgr`

pcr/perl-iptables-parse/PKGBUILD

file modified

+2 -2

		`@@ -1,5 +1,5 @@`
		`- # Contributor (Arch): Weirch Sodora <sodora@gmail.com>`
		`- # Maintainer: Parabola GNU / Linux-libre Aurelien Desbrieres <aurelien@cwb.io>`
		`+ # Contributor: Weirch Sodora <sodora@gmail.com>`
		`+ # Maintainer: Aurélien Desbrières <aurelien@cwb.io>`
		`# Contributor: Márcio Silva <coadde@hyperbola.info>`

		`pkgname=perl-iptables-parse`

pcr/perl-latex-encode/PKGBUILD

file modified

+1 -1

		`@@ -1,4 +1,4 @@`
		`- # Maintainer (AUR): Moritz Bunkus <moritz@bunkus.org>`
		`+ # Maintainer (aur): Moritz Bunkus <moritz@bunkus.org>`
		`# Contributor: Márcio Silva <coadde@hyperbola.info>`

		`# parabola changes and rationale:`

pcr/perl-linux-desktopfiles/PKGBUILD

file modified

+1 -1

		`@@ -1,4 +1,4 @@`
		`- # Maintainer (AUR): Trizen <echo dHJpemVueEBnbWFpbC5jb20K \| base64 -d>`
		`+ # Maintainer (aur): Trizen <echo dHJpemVueEBnbWFpbC5jb20K \| base64 -d>`
		`# Generator (AUR): CPANPLUS::Dist::Arch 1.32`

		`# parabola changes and rationale:`

pcr/perl-math-bigint-gmp/PKGBUILD

file modified

+2 -2

		`@@ -1,7 +1,7 @@`
		`- # Contributor (AUR): Trizen <echo dHJpemVueEBnbWFpbC5jb20K \| base64 -d>`
		`+ # Contributor: Trizen <echo dHJpemVueEBnbWFpbC5jb20K \| base64 -d>`
		`# Generator (AUR): CPANPLUS::Dist::Arch 1.32`
		`# Contributor: Márcio Silva <coadde@hyperbola.info>`
		`- # Maintainers: Parabola hackers <dev@lists.parabola.nu>`
		`+ # Maintainer: Parabola Hackers <dev@lists.parabola.nu>`

		`# parabola changes and rationale:`
		`# no changes.`

pcr/perl-math-bigint/PKGBUILD

file modified

+2 -2

		`@@ -1,5 +1,5 @@`
		`- # Contributor (AUR): Trizen <echo dHJpemVueEBnbWFpbC5jb20K \| base64 -d>`
		`- # Maintainers: Parabola hackers <dev@lists.parabola.nu>`
		`+ # Contributor: Trizen <echo dHJpemVueEBnbWFpbC5jb20K \| base64 -d>`
		`+ # Maintainer: Parabola Hackers <dev@lists.parabola.nu>`
		`# Generator (AUR): CPANPLUS::Dist::Arch 1.32`

		`# parabola changes and rationale:`

pcr/perl-mldbm/PKGBUILD

file modified

+1 -1

		`@@ -1,5 +1,5 @@`
		`# Maintainer: Luke Shumaker <lukeshu@parabola.nu>`
		`- # Maintainer (AUR): John D Jones III <jnbek1972@gmail.com>`
		`+ # Maintainer (aur): John D Jones III <jnbek1972@gmail.com>`

		`# NB: This package is affected by a makepkg bug (in a non-critical`
		`# way). I'm choosing to just wait for makepkg to get fixed, rather`

pcr/perl-pod-latex/PKGBUILD

file modified

+1 -1

		`@@ -1,4 +1,4 @@`
		`- # Maintainer (AUR): Moritz Bunkus <moritz@bunkus.org>`
		`+ # Maintainer (aur): Moritz Bunkus <moritz@bunkus.org>`

		`# parabola changes and rationale:`
		`# no changes`

pcr/perl-readonly-xs/PKGBUILD

file modified

+2 -2

		`@@ -1,7 +1,7 @@`
		`- # Contributor (Arch): John D Jones III <jnbek1972 -_AT_- g m a i l -_Dot_- com>`
		`+ # Contributor: John D Jones III <jnbek1972 -_AT_- g m a i l -_Dot_- com>`
		`# Generator (Arch): CPANPLUS::Dist::Arch 1.28`
		`# Contributor: Márcio Silva <coadde@hyperbola.info>`
		`- # Maintainers: Parabola hackers <dev@lists.parabola.nu>`
		`+ # Maintainer: Parabola Hackers <dev@lists.parabola.nu>`

		`pkgname='perl-readonly-xs'`
		`pkgver='1.05'`

pcr/perl-rpc-xml/PKGBUILD

file modified

+2 -2

		`@@ -1,5 +1,5 @@`
		`- # Contributor (Arch): John D Jones III <jnbek1972 -_AT_- the domain name google offers a mail service at ending in dot com>`
		`- # Maintainer: Aurélien DESBRIÈRES <aurelien@hackers.camp>`
		`+ # Contributor: John D Jones III <jnbek1972 -_AT_- the domain name google offers a mail service at ending in dot com>`
		`+ # Maintainer: Aurélien Desbrières <aurelien@hackers.camp>`
		`# Contributor: Márcio Silva <coadde@hyperbola.info>`

		`pkgname='perl-rpc-xml'`

pcr/perl-term-shellui/PKGBUILD

file modified

+2 -2

		`@@ -1,5 +1,5 @@`
		`- # Contributor (Arch): François Charette <firmicus ατ gmx δοτ net>`
		`- # Maintainer (Arch): mutantmonkey <aur@mutantmonkey.in>`
		`+ # Contributor: François Charette <firmicus ατ gmx δοτ net>`
		`+ # Maintainer (arch): mutantmonkey <aur@mutantmonkey.in>`

		`pkgname=perl-term-shellui`
		`pkgver=0.92`

pcr/perspectives-server/PKGBUILD

file modified

+3 -2

		`@@ -1,6 +1,7 @@`
		`- # Maintainer (upstream): Robert Štětka <robert dot stetka at gmail dot com>`
		`+ # Contributor: Robert Štětka <robert dot stetka at gmail dot com>`
		`# Contributor: fauno <fauno@parabola.nu>`
		`- # Contrbutor: bill-auger <bill-auger@programmer.net>`
		`+ # Contributor: bill-auger <bill-auger@programmer.net>`
		`+ # Maintainer: Parabola Hackers <dev@lists.parabola.nu>`


		`pkgname=perspectives-server`

pcr/petri-foo/PKGBUILD

file modified

+1 -1

		`@@ -1,4 +1,4 @@`
		`- # Maintainer (Arch): masutu <masutu dot arch at gmail dot com>`
		`+ # Maintainer (arch): masutu <masutu dot arch at gmail dot com>`
		`# Maintainer: Guest One <theguestone at gmail dot com>`
		`pkgname=petri-foo`
		`pkgver=0.1.87`

pcr/pgl/PKGBUILD

file modified

+1 -1

		`@@ -1,5 +1,5 @@`
		`# Maintainer: Luke R. <g4jc@openmailbox.org> GPG: rsa4096/3EAE8697`
		`- # Contributor (Arch): Gilrain <gilrain+libre.arch A_T castelmo DOT_ re>`
		`+ # Contributor: Gilrain <gilrain+libre.arch A_T castelmo DOT_ re>`

		`pkgname=pgl`
		`pkgver=2.3.1`

pcr/phantomjs/PKGBUILD

file modified

+7 -7

		`@@ -1,10 +1,10 @@`
		`- # Maintainer (AUR): Felix Golatofski <contact@xdfr.de>`
		`- # Contributor (AUR): Chih-Hsuan Yen <yan12125@gmail.com>`
		`- # Contributor (AUR): Felix Yan <felixonmars@archlinux.org>`
		`- # Contributor (AUR): grimsock <lord.grimsock at gmail dot com>`
		`- # Contributor (AUR): Dieter Plaetinck <dieter@plaetinck.be>`
		`- # Contributor (AUR): Vladimir Chizhov <jagoterr@gmail.com>`
		`- # Contributor (AUR): Henry Tang <henryykt@gmail.com>`
		`+ # Maintainer (aur): Felix Golatofski <contact@xdfr.de>`
		`+ # Contributor: Chih-Hsuan Yen <yan12125@gmail.com>`
		`+ # Contributor: Felix Yan <felixonmars@archlinux.org>`
		`+ # Contributor: grimsock <lord.grimsock at gmail dot com>`
		`+ # Contributor: Dieter Plaetinck <dieter@plaetinck.be>`
		`+ # Contributor: Vladimir Chizhov <jagoterr@gmail.com>`
		`+ # Contributor: Henry Tang <henryykt@gmail.com>`

		`pkgname=phantomjs`
		`pkgver=2.1.1`

pcr/pivaders-git/PKGBUILD

file modified

+2 -2

		`@@ -1,5 +1,5 @@`
		`- # Contributor (Arch) : Arthur Zamarin <arthurzam@gmail.com>`
		`- # Maintainer (Parabola) : Aurélien DESBRIÈRES <aurelien@hackers.camp>`
		`+ # Contributor: Arthur Zamarin <arthurzam@gmail.com>`
		`+ # Maintainer: Aurélien Desbrières <aurelien@hackers.camp>`

		`_pkgname=pivaders`
		`pkgname=pivaders-git`

pcr/pjproject/PKGBUILD

file modified

+4 -4

		`@@ -1,8 +1,8 @@`
		`# Maintainer (AUR): Caleb Maclennan <caleb@alerque.com>`
		`- # Contributor (AUR): Xavier Devlamynck <magicrhesus@ouranos.be>`
		`- # Contributor (AUR): Marti Raudsepp <marti@juffo.org>`
		`- # Contributor (AUR): Travis Hegner <travis.hegner@gmail.com>`
		`- # Contributor (Parabola): Denis 'GNUtoo' Carikli <GNUtoo@cyberdimension.org>`
		`+ # Contributor: Xavier Devlamynck <magicrhesus@ouranos.be>`
		`+ # Contributor: Marti Raudsepp <marti@juffo.org>`
		`+ # Contributor: Travis Hegner <travis.hegner@gmail.com>`
		`+ # Contributor: Denis 'GNUtoo' Carikli <GNUtoo@cyberdimension.org>`

		`# parabola changes and rationale:`
		`# - don't autodetect x86 extensions at compile time (-march=native)`

pcr/ploticus/PKGBUILD

file modified

+3 -3

		`@@ -1,6 +1,6 @@`
		`- # Maintainer (AUR): Chris Severance aur.severach aATt spamgourmet dott com`
		`- # Contributor (AUR): Kaiting Chen <kaitocracy@gmail.com>`
		`- # Contributor (AUR): Andreas Hauser <andy-aur@splashground.de>`
		`+ # Maintainer (aur): Chris Severance aur.severach aATt spamgourmet dott com`
		`+ # Contributor: Kaiting Chen <kaitocracy@gmail.com>`
		`+ # Contributor: Andreas Hauser <andy-aur@splashground.de>`

		`# Patches are found on the News page.`
		`# http://ploticus.sourceforge.net/doc/news.html`

pcr/plymouth/PKGBUILD

file modified

+4 -4

		`@@ -1,9 +1,9 @@`
		`# Maintainer: David P. <megver83@parabola.nu>`
		`# Contributor: Luke Shumaker <lukeshu@parabola.nu>`
		`- # Maintainer (AUR:plymouth-nosystemd): Chris Cromer <chris@cromer.cl>`
		`- # Maintainer (AUR:plymouth): Sebastian Lau <lauseb644@gmail.com>`
		`- # Contributor (AUR:plymouth): Damian01w <damian01w@gmail.com>`
		`- # Contributor (AUR:plymouth): Padfoot <padfoot@exemail.com.au>`
		`+ # Maintainer (aur:plymouth-nosystemd): Chris Cromer <chris@cromer.cl>`
		`+ # Maintainer (aur:plymouth): Sebastian Lau <lauseb644@gmail.com>`
		`+ # Contributor: Damian01w <damian01w@gmail.com>`
		`+ # Contributor: Padfoot <padfoot@exemail.com.au>`

		`pkgbase=plymouth`
		`pkgname=(plymouth plymouth-nosystemd)`

pcr/pmount/PKGBUILD

file modified

+1 -1

		`@@ -1,5 +1,5 @@`
		`# $Id: PKGBUILD 80202 2012-11-17 15:45:28Z eric $`
		`- # Maintainer (Arch): Tobias Powalowski <tpowa@archlinux.org>`
		`+ # Maintainer (arch): Tobias Powalowski <tpowa@archlinux.org>`

		`pkgname=pmount`
		`pkgver=0.9.23`

pcr/policycoreutils/PKGBUILD

file modified

+5 -5

		`@@ -1,8 +1,8 @@`
		`- # Maintainer (AUR): Nicolas Iooss (nicolas <dot> iooss <at> m4x <dot> org)`
		`- # Contributor (AUR): Timothée Ravier <tim@siosm.fr>`
		`- # Contributor (AUR): Nicky726 (Nicky726 <at> gmail <dot> com)`
		`- # Contributor (AUR): Sergej Pupykin (pupykin <dot> s+arch <at> gmail <dot> com)`
		`- # Contributor (AUR): angelux/xangelux (xangelux <at> gmail <dot> com)`
		`+ # Maintainer (aur): Nicolas Iooss (nicolas <dot> iooss <at> m4x <dot> org)`
		`+ # Contributor: Timothée Ravier <tim@siosm.fr>`
		`+ # Contributor: Nicky726 (Nicky726 <at> gmail <dot> com)`
		`+ # Contributor: Sergej Pupykin (pupykin <dot> s+arch <at> gmail <dot> com)`
		`+ # Contributor: angelux/xangelux (xangelux <at> gmail <dot> com)`

		`# parabola changes and rationale:`
		`# - Added armv7h`

pcr/portaudio-git/PKGBUILD

file modified

+5 -5

		`@@ -1,8 +1,8 @@`
		`- # Maintainer (Arch): David Runge <dvzrv@archlinux.org>`
		`- # Contributor (Arch): Lukas Fleischer <lfleischer@archlinux.org>`
		`- # Contributor (Arch): Eric Belanger <eric@archlinux.org>`
		`- # Contributor (Arch): Darwin Bautista <djclue917@gmail.com>`
		`- # Contributor (Arch): Bob Finch <w9ya@qrparci.net>`
		`+ # Maintainer (arch): David Runge <dvzrv@archlinux.org>`
		`+ # Contributor: Lukas Fleischer <lfleischer@archlinux.org>`
		`+ # Contributor: Eric Belanger <eric@archlinux.org>`
		`+ # Contributor: Darwin Bautista <djclue917@gmail.com>`
		`+ # Contributor: Bob Finch <w9ya@qrparci.net>`
		`# Maintainer: David P. <megver83@parabola.nu>`

		`_pkgname=portaudio`

pcr/postfix-policyd-spf-perl/PKGBUILD

file added

+22

		`@@ -0,0 +1,22 @@`
		`+ # Maintainer: David P. <megver83@parabola.nu>`
		`+ # Maintainer (AUR): Zach Callear <zach@callear.org>`
		`+ # Contributor (AUR): Sergej Pupykin <pupykin.s+arch@gmail.com>`
		`+`
		`+ pkgname=postfix-policyd-spf-perl`
		`+ pkgver=2.011`
		`+ pkgrel=1`
		`+ pkgdesc='Postfix SPF policy engine, written in Perl'`
		`+ arch=(any)`
		`+ url='https://launchpad.net/postfix-policyd-spf-perl/'`
		`+ license=('GPL')`
		`+ depends=('perl-mail-spf' 'perl-netaddr-ip' 'perl-sys-hostname-long')`
		`+ source=("https://launchpad.net/postfix-policyd-spf-perl/trunk/${pkgver}/+download/${pkgname}-${pkgver}.tar.gz"{,.asc})`
		`+ sha512sums=('22fc00bf74912056a67e937a460ac1fd878f1cb1a3bfa7b19bc5f1e6bc1c36d815dcf8c945e818d242ed5e72a6295bb0e1569446e06b09aefb2842993b8016ba'`
		`+ 'SKIP')`
		`+ validpgpkeys=('E7729BFFBE85400FEEEE23B178D7DEFB9AD59AF1') # Scott Kitterman`
		`+`
		`+ package() {`
		`+ cd ${pkgname}-${pkgver}`
		`+`
		`+ install -D ${pkgname} ${pkgdir}/usr/lib/postfix/${pkgname}`
		`+ }`

pcr/postsrsd/PKGBUILD

file modified

+3 -3

		`@@ -1,7 +1,7 @@`
		`# Maintainer: Luke Shumaker <lukeshu@parabola.nu>`
		`- # Maintainer (AUR:postsrsd-git): Radek Podgorny <radek@podgorny.cz>`
		`- # Maintainer (AUR:postsrsd-git): Thomas Haider <t.haider@deprecate.de>`
		`- # Maintainer (AUR:postsrsd): fordprefect <fordprefect@dukun.de>`
		`+ # Maintainer (aur:postsrsd-git): Radek Podgorny <radek@podgorny.cz>`
		`+ # Maintainer (aur:postsrsd-git): Thomas Haider <t.haider@deprecate.de>`
		`+ # Maintainer (aur:postsrsd): fordprefect <fordprefect@dukun.de>`

		`pkgname=postsrsd`
		`pkgver=1.4`

pcr/prboom-plus/PKGBUILD

file modified

+37 -25

		`@@ -1,38 +1,50 @@`
		`- # Maintainer (AUR): Kingan <kingan201 at gmail dot com>`
		`- # Contributor (AUR): Frederic Bezies <fredbezies at gmail dot com>`
		`- # Contributor (AUR): Valsu [arch(at)hylia.de]`
		`-`
		`- # parabola changes and rationale:`
		`- # - use --disable-cpu-opt, otherwise it use -mach=native and the resulting`
		`- # binary is only meant to run on the machine that compiled it: this option`
		`- # generates SMID (SSE3, AVX, etc) instructions in a way that is impossible to`
		`- # disable it at runtime. So running it on a machine without the same extended`
		`- # instruction set generally result in illegal instructions.`
		`+ # Maintainer (aur): Kingan <kingan201 at gmail dot com>`
		`+ # Contributor: Frederic Bezies <fredbezies at gmail dot com>`
		`+ # Contributor: Valsu [arch(at)hylia.de]`

		`pkgname=prboom-plus`
		`- pkgver=2.5.1.4`
		`- pkgrel=2`
		`+ pkgver=2.6.2`
		`+ pkgrel=1`
		`pkgdesc='An advanced, Vanilla-compatible Doom engine based on PrBoom'`
		`- url='http://prboom-plus.sourceforge.net/'`
		`- arch=('x86_64' 'i686')`
		`- arch+=('armv7h')`
		`+ url='https://github.com/coelckers/prboom-plus'`
		`+ arch=('x86_64')`
		`+ arch+=('armv7h' 'i686')`
		`license=('GPL2')`
		`- depends=('fluidsynth' 'glu' 'libmad' 'portmidi' 'sdl_image' 'sdl_mixer' 'sdl_net')`
		`- conflicts=('prboom')`
		`- replaces=('prboom')`
		`- provides=('prboom')`
		`- source=("http://download.sourceforge.net/prboom-plus/prboom-plus-$pkgver.tar.gz")`
		`- sha256sums=('e0e2241d174839b107f1a42b191aa9895dc6749e477cbc850ad520fba2353b94')`
		`+ depends=('sdl2')`
		`+ optdepends=('dumb'`
		`+ 'fluidsynth'`
		`+ 'glu'`
		`+ 'libmad'`
		`+ 'libvorbis'`
		`+ 'pcre'`
		`+ 'portmidi'`
		`+ 'sdl2_image'`
		`+ 'sdl2_mixer'`
		`+ 'sdl2_net')`
		`+ makedepends=('cmake')`
		`+ source=("${pkgname}-${pkgver}.tar.gz::https://github.com/coelckers/prboom-plus/archive/refs/tags/v$pkgver.tar.gz")`
		`+ sha1sums=('363471156b15e3927227ff4406670fdcd9725a74')`
		`+`
		`+ _rootdir="prboom-plus-${pkgver}/prboom2"`
		`+ _builddir="${_rootdir}/cbuild"`
		`+`
		`+ prepare() {`
		`+ cd "${srcdir}"`
		`+ sed -i -E 's/mktemp/mkstemp/g' $(find "${_rootdir}" -type f -name r_demo.c)`
		`+ }`

		`build() {`
		`- cd "prboom-plus-$pkgver"`
		`+ cd "${srcdir}"`
		`+`
		`+ mkdir -p "${_builddir}"`
		`+ cd "${_builddir}"`

		`- ./configure --prefix=/usr --without-dumb --disable-cpu-opt`
		`+ cmake -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_BUILD_TYPE=Release ../`
		`make`
		`}`

		`package() {`
		`- cd "prboom-plus-$pkgver"`
		`+ cd "${srcdir}/${_builddir}"`

		`- make DESTDIR="$pkgdir" gamesdir=/usr/bin install`
		`+ make DESTDIR="${pkgdir}" gamesdir=/usr/bin install`
		`}`

pcr/proot/PKGBUILD

file modified

+2 -2

		`@@ -1,5 +1,5 @@`
		`- # Maintainer (Arch): Nicolas Cornu <ncornu@aldebaran-robotics.com>`
		`- # Maintainer (Hyperbola): Márcio Silva <coadde@hyperbola.info>`
		`+ # Maintainer (aur): Nicolas Cornu <ncornu@aldebaran-robotics.com>`
		`+ # Contributor: Márcio Silva <coadde@hyperbola.info>`
		`# Maintainer: Omar Vega Ramos <ovruni@gnu.org.pe>`

		`pkgname=proot`

pcr/prosody-modules/PKGBUILD

file added

+126

		`@@ -0,0 +1,126 @@`
		`+ # Copyright (C) 2022 Wael Karram <wael@waelk.tech>`
		`+ # SPDX-License-Identifier: CC0-1.0`
		`+ # Maintainer: Parabola Hackers <dev@lists.parabola.nu>`
		`+`
		`+ # The prosody-modules repository doesn't have tags that correspond to`
		`+ # the prosody releases. In the prosody source code we have:`
		`+ # $ hg tags \| grep "^0.12.1"`
		`+ # 0.12.1 12526:252ed01896dd`
		`+ # $ hg log`
		`+ # [...]`
		`+ # changeset: 12543:cf29bdb74c15`
		`+ # branch: 0.12`
		`+ # parent: 12526:252ed01896dd`
		`+ # user: Matthew Wild <mwild1@gmail.com>`
		`+ # date: Thu Jun 09 12:42:57 2022 +0100`
		`+ # summary: Added tag 0.12.1 for changeset 252ed01896dd`
		`+ # [...]`
		`+ # changeset: 12526:252ed01896dd`
		`+ # branch: 0.12`
		`+ # tag: 0.12.1`
		`+ # user: Kim Alvefur <zash@zash.se>`
		`+ # date: Fri May 27 14:45:35 2022 +0200`
		`+ # summary: mod_smacks: Bounce unhandled stanzas from local origin (fix #1759)`
		`+ # So we used the revision 4959:0989dea9b356`
		`+ # and in prosody-modules we have:`
		`+ # $ hg log`
		`+ # changeset: 4960:59bedf167910`
		`+ # user: Kim Alvefur <zash@zash.se>`
		`+ # date: Mon Jun 13 14:25:39 2022 +0200`
		`+ # summary: mod_muc_ping: Remove since Prosody mod_muc 0.11+ covers this natively`
		`+ #`
		`+ # changeset: 4959:0989dea9b356`
		`+ # user: Kim Alvefur <zash@zash.se>`
		`+ # date: Sun Jun 05 21:59:17 2022 +0200`
		`+ # summary: mod_rest: Add various things to openapi spec`
		`+ # So we used the commit right before June 09 to correspond to the prosody release`
		`+`
		`+ pkgname=prosody-modules`
		`+ pkgver=0.12.1`
		`+ pkgrel=1`
		`+ pkgdesc="Prosody community modules, includes experimental ones."`
		`+ arch=('any')`
		`+ url="https://modules.prosody.im/"`
		`+ license=('MIT')`
		`+ depends=('prosody')`
		`+ makedepends=('mercurial')`
		`+ mksource=("${pkgname}-${pkgver}::hg+https://hg.prosody.im/prosody-modules/#revision=4959")`
		`+ source=("https://repo.parabola.nu/other/${pkgname}-libre/${pkgname}-libre-${pkgver}")`
		`+ mksha1sums=('SKIP')`
		`+ sha1sums=('SKIP')`
		`+`
		`+ mksource() {`
		`+ cd "${srcdir}/${pkgname}-${pkgver}/"`
		`+ # Clean up mercurial files.`
		`+ rm -rf \.hg \.hgtags`
		`+`
		`+ # Seems to download external dependencies, needs inspection.`
		`+ rm -rf mod_admin_web`
		`+`
		`+ # Unmaintained and shouldn't be used.`
		`+ rm -rf mod_auth_external_insecure`
		`+`
		`+ # Connects to AWS.`
		`+ rm -rf mod_aws_profile`
		`+`
		`+ # Depricated, might conflict with built-in module.`
		`+ rm -rf mod_bookmarks`
		`+`
		`+ # Requires modification to prosody core.`
		`+ rm -rf mod_captcha_registrations`
		`+`
		`+ # Unsafe and unmaintained.`
		`+ rm -rf mod_compression_unsafe`
		`+`
		`+ # Relies on conversejs' CDN, free software though.`
		`+ rm -rf mod_conversejs`
		`+`
		`+ # Seems abandoned.`
		`+ rm -rf mod_couchdb`
		`+`
		`+ # Deprecated.`
		`+ rm -rf mod_easy_invite`
		`+`
		`+ # Integrated into core prosody software.`
		`+ rm -rf mod_graceful_shutdown`
		`+`
		`+ # Seems to include unlicensed code.`
		`+ rm -rf mod_pubsub_feeds`
		`+`
		`+ # Relies on github network services.`
		`+ rm -rf mod_pubsub_github`
		`+`
		`+ # relies on twitter network services and API.`
		`+ rm -rf mod_pubsub_twitter`
		`+`
		`+ # Monkeysphere project seems to be defunct.`
		`+ rm -rf mod_s2s_auth_monkeysphere`
		`+`
		`+ # Relies on nonfree network services.`
		`+ rm -rf mod_s2s_auth_posh`
		`+`
		`+ # Relies on nonfree network services.`
		`+ rm -rf mod_sentry`
		`+`
		`+ # relies on nonfree network services.`
		`+ rm -rf mod_slack_webhooks`
		`+`
		`+ # Relies on nonfree network services.`
		`+ rm -rf mod_sms_clickatel`
		`+`
		`+ # Relies on nonfree network services.`
		`+ rm -rf mod_sms_free`
		`+`
		`+ # Relies on nonfree network services.`
		`+ rm -rf mod_tweet_data`
		`+`
		`+ # Relies on nonfree network services and unfinished/unmaintained.`
		`+ rm -rf mod_twitter`
		`+ }`
		`+`
		`+ package() {`
		`+ # Make sure that the modules path exists.`
		`+ mkdir -p "${pkgdir}/usr/lib/prosody/modules/"`
		`+ # Copy the modules.`
		`+ cp -r "${srcdir}/${pkgname}-${pkgver}/" "${pkgdir}/usr/lib/prosody/modules/"`
		`+ }`

pcr/psad/PKGBUILD

file modified

+1 -1

		`@@ -1,5 +1,5 @@`
		`# Maintainer: Artur Wojcik <xartii at gmail dot com>`
		`- # Maintainer : Parabola GNU / Linux-libre Aurelien Desbrieres <aurelien@cwb.IO>`
		`+ # Maintainer: Aurélien Desbrières <aurelien@cwb.io>`

		`pkgname=psad`
		`pkgver=2.2.3`

pcr/pspp/PKGBUILD

file modified

+2 -2

		`@@ -1,5 +1,5 @@`
		`- # Maintainer (Arch): Miguel Revilla <yo@miguelrevilla.com>`
		`- # Contributor (Arch): joyfulgirl <joyfulgirl (at) archlinux.us>`
		`+ # Maintainer (arch): Miguel Revilla <yo@miguelrevilla.com>`
		`+ # Contributor: joyfulgirl <joyfulgirl (at) archlinux.us>`
		`# Maintainer: Omar Vega Ramos <ovruni@gnu.org.pe>`
		`pkgname=pspp`
		`pkgver=0.10.2`

pcr/pulledpork/PKGBUILD

file modified

+3 -3

		`@@ -1,6 +1,6 @@`
		`- # Maintainer (AUR): Amish <contact at via dot aur>`
		`- # Contributor (AUR): Isaac C. Aronson <i@pingas.org>`
		`- # Maintainer : Parabola GNU / Linux-libre Aurelien Desbrieres <aurelien@cwb.io>`
		`+ # Maintainer (aur): Amish <contact at via dot aur>`
		`+ # Contributor: Isaac C. Aronson <i@pingas.org>`
		`+ # Maintainer: Aurélien Desbrières <aurelien@cwb.io>`

		`pkgname=pulledpork`
		`pkgver=0.7.3`

pcr/pumpa/PKGBUILD

file modified

+2 -2

		`@@ -1,5 +1,5 @@`
		`- # Contributor (Arch): Eugenio M. Vigo <emvigo@gmail.com>`
		`- # Contributor (Arch): speps <speps dot aur dot archlinux dot org>`
		`+ # Contributor: Eugenio M. Vigo <emvigo@gmail.com>`
		`+ # Contributor: speps <speps dot aur dot archlinux dot org>`
		`# Maintainer: Omar Vega Ramos <ovruni@gnu.org.pe>`

		`pkgname=pumpa`

pcr/puzzlemoppet-git/PKGBUILD

file modified

+1 -1

		`@@ -1,5 +1,5 @@`
		`# Maintainer: bill-auger <bill-auger@programmer.net>`
		`- # Maintainer (AUR): MCMic <come.bernigaud@laposte.net>`
		`+ # Maintainer (aur): MCMic <come.bernigaud@laposte.net>`


		`pkgname=puzzlemoppet-git`

pcr/pybristol/PKGBUILD

file modified

+1 -1

		`@@ -1,4 +1,4 @@`
		`- # Maintainer (Arch): adorableGNU <adorablegnu@hushmail.com>`
		`+ # Maintainer (arch): adorableGNU <adorablegnu@hushmail.com>`
		`pkgname=pybristol`
		`pkgver=1.0.33`
		`pkgrel=1`

pcr/pypolicyd-spf/PKGBUILD

file modified

+3 -3

		`@@ -1,7 +1,7 @@`
		`# Maintainer: Luke Shumaker <lukeshu@parabola.nu>`
		`- # Maintainer (AUR:python-postfix-policyd-spf): Hao Zhang theivorytower [at] gmail [dot] com>`
		`- # Maintainer (AUR:python2-postfix-policyd-spf): Filip S. Adamsen <fsa [at] fsadev [dot] com>`
		`- # Contributor (AUR): Samed Beyribey <ras0ir@eventualis.org>`
		`+ # Maintainer (aur:python-postfix-policyd-spf): Hao Zhang theivorytower [at] gmail [dot] com>`
		`+ # Maintainer (aur:python2-postfix-policyd-spf): Filip S. Adamsen <fsa [at] fsadev [dot] com>`
		`+ # Contributor: Samed Beyribey <ras0ir@eventualis.org>`

		`pkgname=pypolicyd-spf`
		`pkgver=2.0.2`

pcr/pyrenamer/PKGBUILD

file modified

+7 -7

		`@@ -1,10 +1,10 @@`
		`- # Contributor (Arch): boenki <boenki at gmx dot de>`
		`- # Contributor (Arch): Arkham <arkham at archlinux dot us>`
		`- # Contributor (Arch): Christoph Zeiler <rabyte*gmail>`
		`- # Contributor (Arch): Marcin Karpezo <sirmacik at gmail dot com>`
		`- # Contributor (Arch): Lucas Salies Brum <lucas at archlinux dot com dot br>`
		`- # Contributor (Arch): max.bra <max.bra at alice dot it>`
		`- # Maintainer : Omar Vega Ramos <ovruni@gnu.org.pe>`
		`+ # Contributor: boenki <boenki at gmx dot de>`
		`+ # Contributor: Arkham <arkham at archlinux dot us>`
		`+ # Contributor: Christoph Zeiler <rabyte*gmail>`
		`+ # Contributor: Marcin Karpezo <sirmacik at gmail dot com>`
		`+ # Contributor: Lucas Salies Brum <lucas at archlinux dot com dot br>`
		`+ # Contributor: max.bra <max.bra at alice dot it>`
		`+ # Maintainer: Omar Vega Ramos <ovruni@gnu.org.pe>`

		`pkgname=pyrenamer`
		`pkgver=0.6.0`

pcr/pysheng/PKGBUILD

file modified

+2 -2

		`@@ -1,5 +1,5 @@`
		`- # Contributor (Arch): mutlu_inek@yahoo.de`
		`- # Maintainer : Parabola GNU / Linux-libre Aurelien Desbrieres <aurelien@cwb.io>`
		`+ # Contributor: mutlu_inek@yahoo.de`
		`+ # Maintainer: Aurélien Desbrières <aurelien@cwb.io>`

		`pkgname=pysheng`
		`pkgver=0.1`

pcr/python-bundlewrap/PKGBUILD

file modified

+1 -1

		`@@ -1,7 +1,7 @@`
		`# Copyright (C) 2019 Denis 'GNUtoo' Carikli <GNUtoo@cyberdimension.org>`
		`# This program is free software: you can redistribute it and/or modify`
		`# it under the terms of the CC0 1.0 License.`
		`- # Maintainers: Parabola hackers <dev@lists.parabola.nu>`
		`+ # Maintainer: Parabola Hackers <dev@lists.parabola.nu>`

		`pkgname=python-bundlewrap`
		`_pkgname=bundlewrap`

pcr/python-django18/PKGBUILD

file modified

+1 -1

		`@@ -1,4 +1,4 @@`
		`- # Maintainer (AUR): Victor <v1c70rp@gmail.com>`
		`+ # Maintainer (aur): Victor <v1c70rp@gmail.com>`

		`# parabola changes and rationale:`
		`# no changes.`

pcr/python-efl/PKGBUILD

file modified

+2 -2

		`@@ -1,6 +1,6 @@`
		`- # Maintainer (AUR): Doug Newgard <scimmia at archlinux dot info>`
		`+ # Maintainer (aur): Doug Newgard <scimmia at archlinux dot info>`
		`# Mantainer (AUR): Lorenzo Ferrillo <lorenzofersteam at live dot it>`
		`- # Maintainer (AUR): Philippe Bourjac <philippe dot bourjac at gmail dot com>`
		`+ # Maintainer (aur): Philippe Bourjac <philippe dot bourjac at gmail dot com>`
		`# Maintainer: Luke Shumaker <lukeshu@sbcglobal.net>`

		`# parabola changes and rationale:`

pcr/python-gensim/PKGBUILD

file modified

+4 -4

		`@@ -1,7 +1,7 @@`
		`- # Maintainer (AUR): Gordian Edenhofer <gordian.edenhofer@gmail.com>`
		`- # Contributor (AUR): Maarten van Gompel <proycon at anaproy dot nl>`
		`- # Contributor (AUR): Lex Black <autumn-wind at web dot de>`
		`- # Contributor (AUR): Dieter_be`
		`+ # Maintainer (aur): Gordian Edenhofer <gordian.edenhofer@gmail.com>`
		`+ # Contributor: Maarten van Gompel <proycon at anaproy dot nl>`
		`+ # Contributor: Lex Black <autumn-wind at web dot de>`
		`+ # Contributor: Dieter_be`
		`# Maintainer: Omar Vega Ramos <ovruni@gnu.org.pe>`
		`# Contributor: Luke Shumaker <lukeshu@lukeshu.com>`

pcr/python-libusb1/PKGBUILD

file modified

+1 -1

		`@@ -1,4 +1,4 @@`
		`- # Maintainer (Aur): sehraf`
		`+ # Maintainer (aur): sehraf`
		`# submitter (Aur): vorpalblade77@gmail.com`
		`pkgname=python-libusb1`
		`_pkgname=libusb1`

pcr/python-lirc/PKGBUILD

file modified

+2 -2

		`@@ -1,5 +1,5 @@`
		`- # Contributor (AUR?): Eelco Cramer <eelco@servicelab.org>`
		`- # Maintainer: Parabola Aurélien Desbrières <aurelien@xload.io>`
		`+ # Contributor: Eelco Cramer <eelco@servicelab.org>`
		`+ # Maintainer: Aurélien Desbrières <aurelien@xload.io>`
		`# Contributor: Luke Shumaker <lukeshu@lukeshu.com>`

		`pkgname=python-lirc`

pcr/python-pefile/PKGBUILD

file modified

+2 -2

		`@@ -1,5 +1,5 @@`
		`- # Maintainer (AUR): Christian Rebischke <chris.rebischke[at]archlinux[dot]org>`
		`- # Contributor (AUR): Sonic-Y3k <sonic.y3k@googlemail.com>`
		`+ # Maintainer (aur): Christian Rebischke <chris.rebischke[at]archlinux[dot]org>`
		`+ # Contributor: Sonic-Y3k <sonic.y3k@googlemail.com>`

		`# parabola changes and rationale:`
		`# no changes.`

pcr/python-polib/PKGBUILD

file modified

+1 -1

		`@@ -1,5 +1,5 @@`
		`# Contributor: Esteban V. Carnevale <alfplayer@mailoo.com>`
		`- # Maintainers: Parabola hackers <dev@lists.parabola.nu>`
		`+ # Maintainer: Parabola Hackers <dev@lists.parabola.nu>`

		`pkgbase=python-polib`
		`pkgname=(python-polib python2-polib)`

pcr/python-poppler-qt5/PKGBUILD

file modified

+3 -3

		`@@ -1,6 +1,6 @@`
		`- # Maintainer (AUR): Caleb Maclennan <caleb@alerque.com>`
		`- # Contributor (AUR): Lucki <https://aur.archlinux.org/account/Lucki/>`
		`- # Contributor (AUR): Johan Reitan (venatux) <johan.reitan@gmail.com>`
		`+ # Maintainer (aur): Caleb Maclennan <caleb@alerque.com>`
		`+ # Contributor: Lucki <https://aur.archlinux.org/account/Lucki/>`
		`+ # Contributor: Johan Reitan (venatux) <johan.reitan@gmail.com>`
		`# Contributer (AUR): Kenneth Lyons (ixjlyons) <ixjlyons@gmail.com>`

		`pkgname=python-poppler-qt5`

pcr/python-py3dns/PKGBUILD

file modified

+2 -2

		`@@ -1,6 +1,6 @@`
		`# Maintainer: Luke Shumaker <lukeshu@parabola.nu>`
		`- # Maintainer (AUR:python-pydns): Sebastien Leduc <sebastien@sleduc.fr>`
		`- # Contributor (AUR:python-pydns): Samed Beyribey <ras0ir AT eventualis DOT org>`
		`+ # Maintainer (aur:python-pydns): Sebastien Leduc <sebastien@sleduc.fr>`
		`+ # Contributor: Samed Beyribey <ras0ir AT eventualis DOT org>`

		`pkgname=python-py3dns`
		`_pkgname=py3dns`

pcr/python-pyspf/PKGBUILD

file modified

+3 -3

		`@@ -1,7 +1,7 @@`
		`# Maintainer: Luke Shumaker <lukeshu@parabola.nu>`
		`- # Maintainer (AUR): Hao Zhang <hao at hao-zhang com>`
		`- # Contributor (AUR): Rich Li <rich at dranek com>`
		`- # Contributor (AUR): Samed Beyribey <ras0ir AT eventualis DOT org>`
		`+ # Maintainer (aur): Hao Zhang <hao at hao-zhang com>`
		`+ # Contributor: Rich Li <rich at dranek com>`
		`+ # Contributor: Samed Beyribey <ras0ir AT eventualis DOT org>`

		`pkgname=python-pyspf`
		`pkgver=2.0.14`

pcr/python-pyutil/PKGBUILD

file modified

+1 -1

		`@@ -1,4 +1,4 @@`
		`- # Maintainers: Parabola hackers <dev@lists.parabola.nu>`
		`+ # Maintainer: Parabola Hackers <dev@lists.parabola.nu>`
		`# repolint: reason=asdeps`

		`_pkgname=pyutil`

pcr/python-pywikibot/PKGBUILD

file modified

+1 -1

		`@@ -1,4 +1,4 @@`
		`- # Maintainer (AUR): Simon Legner <Simon.Legner@gmail.com>`
		`+ # Maintainer (aur): Simon Legner <Simon.Legner@gmail.com>`
		`# parabola changes and rationale:`
		`# no changes.`

pcr/python-redmine/PKGBUILD

file modified

+2 -2

		`@@ -1,6 +1,6 @@`
		`# Maintainer(Aur): Konstantin Shalygin <k0ste@k0ste.ru>`
		`- # Contributor(Aur): Konstantin Shalygin <k0ste@k0ste.ru>`
		`- # Contributor(Aur): Sebastien Leduc <sebastien@sleduc.fr>`
		`+ # Contributor: Konstantin Shalygin <k0ste@k0ste.ru>`
		`+ # Contributor: Sebastien Leduc <sebastien@sleduc.fr>`

		`# parabola changes and rationale:`
		`# - Switched from any to ('armv7h' 'i686' 'x86_64') because`

pcr/python-rosdistro/PKGBUILD

file modified

+1 -1

		`@@ -1,4 +1,4 @@`
		`- # Maintainer (Parabola) : Aurélien DESBRIÈRES <aurelien@hackers.camp>`
		`+ # Maintainer: Aurélien Desbrières <aurelien@hackers.camp>`

		`_pkgname=rosdistro`
		`pkgname=(python-$_pkgname)`

pcr/python-rosinstall/PKGBUILD

file modified

+1 -1

		`@@ -1,4 +1,4 @@`
		`- # Maintainer: Aurélien DESBRIÈRES <aurelien@hackers.camp>`
		`+ # Maintainer: Aurélien Desbrières <aurelien@hackers.camp>`

		`_pkgname=rosinstall`
		`pkgname=(python-$_pkgname)`

pcr/python-rospkg/PKGBUILD

file modified

+1 -1

		`@@ -1,4 +1,4 @@`
		`- # Maintainer : Parabola GNU / Linux-libre Aurelien Desbrieres <aurelien@cwb.io>`
		`+ # Maintainer: Aurélien Desbrières <aurelien@cwb.io>`

		`_pkgname=rospkg`
		`pkgname=(python{,2}-$_pkgname)`

pcr/python-vcstools/PKGBUILD

file modified

+2 -2

		`@@ -1,5 +1,5 @@`
		`- # Contributor (Arch) : Georg Bremer <pkgbuild@dschoordsch.de>`
		`- # Maintainer (Parabola) : Aurélien DESBRIÈRES <aurelien@hackers.camp>`
		`+ # Contributor: Georg Bremer <pkgbuild@dschoordsch.de>`
		`+ # Maintainer: Aurélien Desbrières <aurelien@hackers.camp>`

		`_pkgname=vcstools`
		`pkgname=(python{,2}-$_pkgname)`

pcr/python-wsgiref/PKGBUILD

file modified

+1 -1

		`@@ -1,4 +1,4 @@`
		`- # Maintainer : Parabola GNU / Linux-libre Aurélien DESBRIÈRES <aurelien@hackers.camp>`
		`+ # Maintainer: Aurélien Desbrières <aurelien@hackers.camp>`

		`_pkgname=wsgiref`
		`pkgname=(python{,2}-$_pkgname)`

pcr/python-wstool/PKGBUILD

file modified

+2 -2

		`@@ -1,5 +1,5 @@`
		`- # Maintainer (AUR): Kartik Mohta <kartikmohta@gmail.com>`
		`- # Maintainer (Parabola) : Aurélien DESBRIÈRES <aurelien@hackers.camp>`
		`+ # Maintainer (aur): Kartik Mohta <kartikmohta@gmail.com>`
		`+ # Maintainer: Aurélien Desbrières <aurelien@hackers.camp>`

		`_pkgname=wstool`
		`pkgname=python-$_pkgname`

pcr/python-xbee/PKGBUILD

file modified

+2 -2

		`@@ -1,5 +1,5 @@`
		`- # Maintainer (AUR): razer <razer[at]neuf[dot]fr>`
		`- # Maintainer: Aurélien DESBRIÈRES <aurelien@hackers.camp>`
		`+ # Maintainer (aur): razer <razer[at]neuf[dot]fr>`
		`+ # Maintainer: Aurélien Desbrières <aurelien@hackers.camp>`
		`# Contributor: Luke Shumaker <lukeshu@lukeshu.com>`

		`pkgname=python-xbee`

pcr/python-zbase32/PKGBUILD

file modified

+1 -1

		`@@ -1,4 +1,4 @@`
		`- # Maintainers: Parabola hackers <dev@lists.parabola.nu>`
		`+ # Maintainer: Parabola Hackers <dev@lists.parabola.nu>`
		`# repolint: reason=asdeps`

		`_pkgname=zbase32`

pcr/python2-amqplib/PKGBUILD

file modified

+2 -2

		`@@ -1,5 +1,5 @@`
		`- # Contributor (Arch): Tevin Zhang <mail2tevin {at} gmail {dot} com>`
		`- # Maintainer : Parabola GNU / Linux-libre Aurelien Desbrieres <aurelien@cwb.IO>`
		`+ # Contributor: Tevin Zhang <mail2tevin {at} gmail {dot} com>`
		`+ # Maintainer: Aurélien Desbrières <aurelien@cwb.io>`

		`pkgname=python2-amqplib`
		`pkgver=1.0.2`

pcr/python2-async/PKGBUILD

file modified

+2 -2

		`@@ -1,5 +1,5 @@`
		`- # Contributor (Arch) : Jon Bergli Heier <snakebite@jvnv.net>`
		`- # Maintainer (Parabola) : Aurélien DESBRIÈRES <aurelien@hackers.camp>`
		`+ # Contributor: Jon Bergli Heier <snakebite@jvnv.net>`
		`+ # Maintainer: Aurélien Desbrières <aurelien@hackers.camp>`

		`pkgname=python2-async`
		`pkgver=0.6.2`

pcr/python2-authres/PKGBUILD

file modified

+3 -3

		`@@ -1,6 +1,6 @@`
		`- # Maintainer (AUR): Thomas Haider <t.haider@deprecate.de>`
		`- # Contributor (AUR): Filip S. Adamsen <fsa [at] fsadev [dot] com>`
		`- # Contributor (AUR): Samed Beyribey <ras0ir@eventualis.org>`
		`+ # Maintainer (aur): Thomas Haider <t.haider@deprecate.de>`
		`+ # Contributor: Filip S. Adamsen <fsa [at] fsadev [dot] com>`
		`+ # Contributor: Samed Beyribey <ras0ir@eventualis.org>`

		`# parabola changes and rationale:`
		`# no changes.`

pcr/python2-caldav/PKGBUILD

file modified

+1 -1

		`@@ -1,4 +1,4 @@`
		- # Maintainer (Arch): Elena ``of Valhalla'' Grandi <elena.valhalla@gmail.com>
		+ # Maintainer (arch): Elena ``of Valhalla'' Grandi <elena.valhalla@gmail.com>
		`# Maintainer: Omar Vega Ramos <ovruni@gnu.org.pe>`
		`pkgname=python2-caldav`
		`pkgver=0.4.0`

pcr/python2-carrot/PKGBUILD

file modified

+4 -4

		`@@ -1,7 +1,7 @@`
		`- # Contributor (Arch): Lukas Linhart <bugs@almad.net>`
		`- # Contributor (Arch): Marco Elver <marco.elver AT gmail.com>`
		`- # Contributor (Arch): Jacob Melton <jmelton116@gmail.com>`
		`- # Maintainer : Parabola GNU / Linux-libre Aurelien Desbrieres <aurelien@cwb.IO>`
		`+ # Contributor: Lukas Linhart <bugs@almad.net>`
		`+ # Contributor: Marco Elver <marco.elver AT gmail.com>`
		`+ # Contributor: Jacob Melton <jmelton116@gmail.com>`
		`+ # Maintainer: Aurélien Desbrières <aurelien@cwb.io>`

		`pkgname=python2-carrot`
		`pkgver=0.10.7`

pcr/python2-django-tagging/PKGBUILD

file modified

+4 -4

		`@@ -1,7 +1,7 @@`
		`- # Contributor (AUR): Andrey Mivrenik <gim at fastmail dot fm>`
		`- # Contributor (AUR): Ryan Coyner <rcoyner@gmail.com>`
		`- # Contributor (AUR): James Pearson <james.m.pearson+arch@gmail.com>`
		`- # Maintainer : Aurélien Desbrières <aurelien@hackers.camp>`
		`+ # Contributor: Andrey Mivrenik <gim at fastmail dot fm>`
		`+ # Contributor: Ryan Coyner <rcoyner@gmail.com>`
		`+ # Contributor: James Pearson <james.m.pearson+arch@gmail.com>`
		`+ # Maintainer: Aurélien Desbrières <aurelien@hackers.camp>`

		`# parabola changes and rationale:`
		`# - added replaces for previous pkgname 'django-tagging' (2018-02-01)`

pcr/python2-djvulibre/PKGBUILD

file modified

+4 -4

		`@@ -1,7 +1,7 @@`
		`- # Maintainer (AUR): Dmitry Kharitonov <darksab0r@gmail.com>`
		`- # Contributor (AUR): Francois Garillot <francois[@]garillot.net>`
		`- # Contributor (AUR): Anton Bazhenov <anton.bazhenov at gmail>`
		`- # Contributor (AUR): Malkov Fyodor aka krox <iksut@yandex.ru>`
		`+ # Maintainer (aur): Dmitry Kharitonov <darksab0r@gmail.com>`
		`+ # Contributor: Francois Garillot <francois[@]garillot.net>`
		`+ # Contributor: Anton Bazhenov <anton.bazhenov at gmail>`
		`+ # Contributor: Malkov Fyodor aka krox <iksut@yandex.ru>`

		`# parabola changes and rationale:`
		`# no changes.`

pcr/python2-dukpy/PKGBUILD

file modified

+2 -2

		`@@ -1,5 +1,5 @@`
		`- # Contributor (arch): Jelle van der Waa <jelle@archlinux.org>`
		`- # Contributor (arch): Eli Schwartz <eschwartz93@gmail.com>`
		`+ # Contributor: Jelle van der Waa <jelle@archlinux.org>`
		`+ # Contributor: Eli Schwartz <eschwartz93@gmail.com>`
		`# Maintainer: bill-auger <bill-auger@programmer.net>`

pcr/python2-empy/PKGBUILD

file modified

+4 -4

		`@@ -1,7 +1,7 @@`
		`- # Contributor (Arch): Benjamin Chretien <chretien at lirmm dot fr>`
		`- # Contributor (Arch): Andrew Conkling <andrewski@fr.st>`
		`- # Contributor (Arch): hauptmech <hauptmech@gmail.com>`
		`- # Maintainer : Parabola GNU / LInux-libre Aurelien Desbrieres <aurelien@cwb.io>`
		`+ # Contributor: Benjamin Chretien <chretien at lirmm dot fr>`
		`+ # Contributor: Andrew Conkling <andrewski@fr.st>`
		`+ # Contributor: hauptmech <hauptmech@gmail.com>`
		`+ # Maintainer: Aurélien Desbrières <aurelien@cwb.io>`

		`pkgname=python2-empy`
		`realname=empy`

pcr/python2-flask-lesscss/PKGBUILD

file modified

+1 -1

		`@@ -1,4 +1,4 @@`
		`- # Maintainer : Parabola GNU / Linux-libre Aurelien Desbrieres <aurelien@cwb.io>`
		`+ # Maintainer: Aurélien Desbrières <aurelien@cwb.io>`

		`pkgname="python2-flask-lesscss"`
		`pkgver=0.9.1`

pcr/python2-interruptingcow/PKGBUILD

file modified

+4 -4

		`@@ -1,8 +1,8 @@`
		`# Mantainer (Arch): Ivan Pulido <ijpulidos[AT]riseup.net>`
		`- # Contributor (Arch): Thomas Dziedzic < gostrc at gmail >`
		`- # Contributor (Arch): Paulo Matias <matias@archlinux-br·org>`
		`- # Contributor (Arch): Rafael G. Martins <rafael@rafaelmartins.com>`
		`- # Maintainers: Parabola hackers <dev@lists.parabola.nu>`
		`+ # Contributor: Thomas Dziedzic < gostrc at gmail >`
		`+ # Contributor: Paulo Matias <matias@archlinux-br·org>`
		`+ # Contributor: Rafael G. Martins <rafael@rafaelmartins.com>`
		`+ # Maintainer: Parabola Hackers <dev@lists.parabola.nu>`

		`pkgname=python2-interruptingcow`
		`pkgver=0.6`

pcr/python2-liblarch/PKGBUILD

file modified

+1 -1

		`@@ -1,4 +1,4 @@`
		`- # Maintainer (Arch): Francois Boulogne <fboulogne at april dot org>`
		`+ # Maintainer (arch): Francois Boulogne <fboulogne at april dot org>`

		`pkgname=python2-liblarch`
		`pkgver=2.1.0`

pcr/python2-oauth2/PKGBUILD

file modified

+2 -2

		`@@ -1,5 +1,5 @@`
		`- # Contributor (Arch): Massimiliano Torromeo <massimiliano.torromeo@gmail.com>`
		`- # Maintainer : Parabola GNU / Linux-libre Aurelien Desbrieres <aurelien@cwb.io>`
		`+ # Contributor: Massimiliano Torromeo <massimiliano.torromeo@gmail.com>`
		`+ # Maintainer: Aurélien Desbrières <aurelien@cwb.io>`

		`pkgname=python2-oauth2`
		`pkgver=1.5.211`

pcr/python2-paste-deploy/PKGBUILD

file modified

+4 -4

		`@@ -1,7 +1,7 @@`
		`- # Contributor (Arch): Limao Luo <luolimao+AUR@gmail.com>`
		`- # Contributor (Arch): David Campbell <davekong@archlinux.us>`
		`- # Contributor (Arch): Cilyan Olowen <gaknar@gmail.com>`
		`- # Maintainer : Parabola GNU / Linux-libre Aurelien Desbrieres <aurelien@cwb.IO>`
		`+ # Contributor: Limao Luo <luolimao+AUR@gmail.com>`
		`+ # Contributor: David Campbell <davekong@archlinux.us>`
		`+ # Contributor: Cilyan Olowen <gaknar@gmail.com>`
		`+ # Maintainer: Aurélien Desbrières <aurelien@cwb.io>`

		`_pkgname=PasteDeploy`
		`pkgname=python2-paste-deploy`

pcr/python2-paste-script/PKGBUILD

file modified

+3 -3

		`@@ -1,6 +1,6 @@`
		`- # Maintainer (Arch): Brad Pitcher <bradpitcher@gmail.com>`
		`- # Contributor (Arch): David Campbell <davekong@archlinux.us>`
		`- # Contributor (Arch): Cilyan Olowen <gaknar@gmail.com>`
		`+ # Maintainer (arch): Brad Pitcher <bradpitcher@gmail.com>`
		`+ # Contributor: David Campbell <davekong@archlinux.us>`
		`+ # Contributor: Cilyan Olowen <gaknar@gmail.com>`
		`# Maintainer: Omar Vega Ramos <ovruni@gnu.org.pe>`

		`pkgname=python2-paste-script`

pcr/python2-pkgtools/PKGBUILD

file modified

+1 -1

		`@@ -1,5 +1,5 @@`
		`# $Id$`
		`- # Maintainer (Arch): Fabien Devaux <fdev31 at gmail dot com>`
		`+ # Maintainer (arch): Fabien Devaux <fdev31 at gmail dot com>`
		`# Maintainer: Omar Vega Ramos <ovruni@gnu.org.pe>`

		`pkgname=python2-pkgtools`

pcr/python2-potr/PKGBUILD

file modified

+1 -1

		`@@ -1,4 +1,4 @@`
		`- # Maintainer (AUR): Eliot Whalan <ewhal at pantsu dot cat>:`
		`+ # Maintainer (aur): Eliot Whalan <ewhal at pantsu dot cat>:`
		`# Contrbutor (AUR): Michael Düll <mail@akurei.me>`
		`# Contributor: fauno <fauno@parabola.nu>`
		`# Contrbutor: bill-auger <bill-auger@programmer.net>`

pcr/python2-relatorio/PKGBUILD

file modified

+3 -3

		`@@ -1,6 +1,6 @@`
		`- # Contributor (AUR): Richard PALO <richard.palo@free.fr>`
		`- # Contributor (AUR): Florian Walch <florian.walch@gmx.at>`
		`- # Maintainer (AUR): Robin Baumgartner <robin@baumgartners.ch>`
		`+ # Contributor: Richard PALO <richard.palo@free.fr>`
		`+ # Contributor: Florian Walch <florian.walch@gmx.at>`
		`+ # Maintainer (aur): Robin Baumgartner <robin@baumgartners.ch>`
		`# Contributor: André Silva <emulatorman@hyperbola.info>`

		`# parabola changes and rationale:`

pcr/python2-stdnum/PKGBUILD

file modified

+1 -1

		`@@ -1,4 +1,4 @@`
		`- # Maintainer (Arch): Alex Merry <dev@randomguy3.me.uk>`
		`+ # Maintainer (arch): Alex Merry <dev@randomguy3.me.uk>`
		`# Maintainer: Omar Vega Ramos <ovruni@gnu.org.pe>`

		`pkgname=python2-stdnum`

pcr/pythonqt/PKGBUILD

file modified

+4 -4

		`@@ -1,7 +1,7 @@`
		`- # Maintainer (AUR): Alfredo Ramos <alfredo dot ramos at yandex dot com>`
		`- # Contributor (AUR): Chris <christopher.r.mullins g-mail>`
		`- # Contributor (AUR): Ainola`
		`- # Contributor (AUR): speps`
		`+ # Maintainer (aur): Alfredo Ramos <alfredo dot ramos at yandex dot com>`
		`+ # Contributor: Chris <christopher.r.mullins g-mail>`
		`+ # Contributor: Ainola`
		`+ # Contributor: speps`
		`# Maintainer: David P. <megver83@parabola.nu>`

		`pkgname=pythonqt`

pcr/pyzenity/PKGBUILD

file modified

+3 -3

		`@@ -1,6 +1,6 @@`
		`- # Contributor (Arch): lang2 <wenzhi.liang@gmail.com>`
		`- # Contributor (Arch): sylvain alborini <sylvain dot alborini at gmail dot com>`
		`- # Maintainer : Parabola Aurélien DESBRIÈRES <aurelien@replicant.io>`
		`+ # Contributor: lang2 <wenzhi.liang@gmail.com>`
		`+ # Contributor: sylvain alborini <sylvain dot alborini at gmail dot com>`
		`+ # Maintainer: Aurélien Desbrières <aurelien@replicant.io>`

		`pkgname=pyzenity`
		`_pkg_name=PyZenity`

pcr/qdl/PKGBUILD

file modified

+1 -1

		`@@ -1,7 +1,7 @@`
		`# Copyright (C) 2019 Denis 'GNUtoo' Carikli <GNUtoo@cyberdimension.org>`
		`# This program is free software: you can redistribute it and/or modify`
		`# it under the terms of the CC0 1.0 License.`
		`- # Maintainers: Parabola hackers <dev@lists.parabola.nu>`
		`+ # Maintainer: Parabola Hackers <dev@lists.parabola.nu>`

		`pkgname=qdl`
		`pkgver=1.0`

pcr/qt5-quick1/PKGBUILD

file modified

+1 -1

		`@@ -1,4 +1,4 @@`
		`- # Maintainer (AUR): Zulu`
		`+ # Maintainer (aur): Zulu`

		`# parabola changes and rationale:`
		`# no changes.`

pcr/qt5-webkit-og/PKGBUILD

file modified

+3 -3

		`@@ -1,8 +1,8 @@`
		`# $Id: PKGBUILD 240297 2015-06-03 10:22:03Z fyan $`
		`- # Maintainer (Arch): Felix Yan <felixonmars@archlinux.org>`
		`- # Contributor (Arch): Andrea Scarpino <andrea@archlinux.org>`
		`+ # Maintainer (arch): Felix Yan <felixonmars@archlinux.org>`
		`+ # Contributor: Andrea Scarpino <andrea@archlinux.org>`

		`- # Maintainer (ALARM): Kevin Mihelich <kevin@archlinuxarm.org>`
		`+ # Maintainer (archarm): Kevin Mihelich <kevin@archlinuxarm.org>`
		`# - icu makedepend`
		`# - patch for soft-float armv5`
		`# - patch for AArch64 support in qtwebkit`

pcr/qtoctave/PKGBUILD

file modified

+3 -3

		`@@ -1,6 +1,6 @@`
		`- # Maintainer (AUR): Michael Schubert <mschu.dev at gmail>`
		`- # Contributor (AUR): Ronald van Haren <ronald.archlinux.org>`
		`- # Contributor (AUR): Stefan Husmann <stefan-husmann@t-online.de>`
		`+ # Maintainer (aur): Michael Schubert <mschu.dev at gmail>`
		`+ # Contributor: Ronald van Haren <ronald.archlinux.org>`
		`+ # Contributor: Stefan Husmann <stefan-husmann@t-online.de>`
		`# Maintainer: Omar Vega Ramos <ovruni@gnu.org.pe>`

		`pkgname=qtoctave`

pcr/qtqr/PKGBUILD

file removed

-50

		`@@ -1,50 +0,0 @@`
		`- # Maintainer: David P. <megver83@parabola.nu>`
		`-`
		`- _python="python2"`
		`- _name="qr-tools"`
		`- _ubuntur="0~23~ubuntu16.10.1"`
		`- pkgname="qtqr"`
		`- pkgver="1.4"`
		`- pkgrel="1"`
		`- pkgdesc="A Graphical interface QR Code generator and decoder."`
		`- url="https://launchpad.net/qr-tools"`
		`- arch=('i686' 'x86_64')`
		`- license=('GPL3')`
		`- depends=("${_python}" "${_python}-qrtools" "${_python}-pyqt4")`
		`- provides=("${pkgname}")`
		`- source=("https://launchpad.net/~${_name}-developers/+archive/ubuntu/daily/+files/${pkgname}_${pkgver}-${_ubuntur}.tar.gz")`
		`- sha256sums=('b1d3ba45594ddacd96c2da906b8ed90a0f0f50cc0348b9d2435ff11c93eebae1')`
		`-`
		`- _qtqr_desktop="[Desktop Entry]`
		`- Name=QtQR`
		`- Comment=QtQR is a Qt based software that let's you generate QR Codes easily, scan an image file for QR Codes and decode them or use your webcam to scan a printed one.`
		`- Exec=qtqr`
		`- Icon=qtqr`
		`- Terminal=false`
		`- Type=Application`
		`- Categories=Graphics"`
		`-`
		`- build() {`
		`- cd "${pkgname}-${pkgver}"`
		`- echo -e "$_qtqr_desktop" \| tee "${pkgname}.desktop"`
		`- sed -i 's/env python/env python2/' "${pkgname}.py"`
		`- }`
		`-`
		`- package() {`
		`- cd "${pkgname}-${pkgver}"`
		`- install -d ${pkgdir}/usr/bin`
		`- install -d ${pkgdir}/usr/share/${pkgname}/samples`
		`- install -d ${pkgdir}/usr/share/applications`
		`- install -d ${pkgdir}/usr/share/pixmaps`
		`- install -d ${pkgdir}/usr/share/qt4/translations`
		`-`
		`- install -m 755 qtqr.py ${pkgdir}/usr/bin/qtqr`
		`- install -m 644 samples/* ${pkgdir}/usr/share/${pkgname}/samples`
		`- install -m 644 qtqr.desktop ${pkgdir}/usr/share/applications`
		`- install -m 644 icon.png ${pkgdir}/usr/share/pixmaps/qtqr.png`
		`- install -m 644 *.qm ${pkgdir}/usr/share/qt4/translations`
		`-`
		`- install -D -m644 LICENCE "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"`
		`- }`
		`-`
		`- # vim:set ts=4 sw=2 ft=sh et:`

pcr/qtwebkit/PKGBUILD

file modified

+1 -1

		`@@ -1,5 +1,5 @@`
		`# $Id: PKGBUILD 252776 2015-12-06 12:09:40Z bpiotrowski $`
		`- # Maintainer (AUR): Andrea Scarpino <andrea@archlinux.org>`
		`+ # Maintainer (aur): Andrea Scarpino <andrea@archlinux.org>`

		`# parabola changes and rationale:`
		`# no changes.`

pcr/quack/PKGBUILD

file modified

+3 -3

		`@@ -1,6 +1,6 @@`
		`- # Contributor (AUR): Geoffrey Teale <tealeg@member.fsf.org>`
		`- # Maintainer (AUR): Stefan Husmann <stefan-husmann@t-online.de>`
		`- # Maintainer : Aurelien Desbrieres <aurelien@hackers.camp>`
		`+ # Contributor: Geoffrey Teale <tealeg@member.fsf.org>`
		`+ # Maintainer (aur): Stefan Husmann <stefan-husmann@t-online.de>`
		`+ # Maintainer: Aurélien Desbrières <aurelien@hackers.camp>`

		`pkgname=quack`
		`pkgver=0.48`

pcr/quackle/PKGBUILD

file modified

+1 -1

		`@@ -1,4 +1,4 @@`
		`- # Maintainer (AUR): Guillaume ALAUX <Guillaume at ALAUX dot net>`
		`+ # Maintainer (aur): Guillaume ALAUX <Guillaume at ALAUX dot net>`

		`# parabola changes and rationale:`
		`# no changes.`

pcr/quaternion/PKGBUILD

file added

+44

		`@@ -0,0 +1,44 @@`
		`+ # Maintainer (aur): Alexey Andreyev <aa13q@ya.ru>`
		`+ # Contributor: Aleksandar Trifunović <akstrfn at gmail dot com>`
		`+ # Contributor: Ivan Semkin <ivan at semkin dot ru>`
		`+ # Contributor: Martin Weinelt <hexa at darmstadt dot ccc dot de>`
		`+`
		`+`
		`+ pkgname=quaternion`
		`+ pkgver=0.0.95.1`
		`+ pkgrel=1`
		`+ pkgdesc="Qt5 Matrix client, with IRC/hexchat-like GUI"`
		`+ url=https://matrix.org/docs/projects/client/quaternion.html`
		`+ arch=(aarch64 armv7h i686 x86_64)`
		`+ license=(GPL3)`
		`+`
		`+ depends=(qt5-tools qt5-multimedia qt5-quickcontrols qt5-quickcontrols2 libquotient)`
		`+ optdepends=(qtkeychain)`
		`+ makedepends=(cmake)`
		`+`
		`+ source=(${pkgname}-${pkgver}.tar.gz::https://github.com/quotient-im/${pkgname^}/archive/refs/tags/${pkgver}.tar.gz)`
		`+ sha512sums=('465e49b90fef88b252f26b5791c2d491bfa451dd3b876b1fce8732bf96276437343fd368d1d48d20a2b5ec993a3e0a36709232f60fadd176548a7b942b22b678')`
		`+`
		`+`
		`+ build()`
		`+ {`
		`+ cd "${pkgname^}-${pkgver}"`
		`+`
		`+ cmake -H. -Bbuild \`
		`+ -DCMAKE_CXX_FLAGS:STRING="${CXXFLAGS}" \`
		`+ -DCMAKE_EXE_LINKER_FLAGS:STRING="${LDFLAGS}" \`
		`+ -DCMAKE_INSTALL_LIBDIR=lib \`
		`+ -DCMAKE_BUILD_TYPE=Release \`
		`+ -DCMAKE_INSTALL_PREFIX=/usr \`
		`+ -DBUILD_SHARED_LIBS=ON \`
		`+ -DUSE_INTREE_LIBQMC=OFF`
		`+`
		`+ cmake --build build`
		`+ }`
		`+`
		`+ package()`
		`+ {`
		`+ cd "${pkgname^}-${pkgver}"`
		`+`
		`+ cmake --build build -- DESTDIR="${pkgdir}/" install`
		`+ }`

pcr/qwt-qt4/PKGBUILD

file modified

+2 -2

		`@@ -1,5 +1,5 @@`
		`- # Maintainer (Arch): Doug Newgard <scimmia at archlinux dot info>`
		`- # Contributor (Arch): Ronald van Haren <ronald.archlinux.org>`
		`+ # Maintainer (arch): Doug Newgard <scimmia at archlinux dot info>`
		`+ # Contributor: Ronald van Haren <ronald.archlinux.org>`
		`# Maintainer: Omar Vega Ramos <ovruni@gnu.org.pe>`

		`pkgname=qwt-qt4`

pcr/qwtpolar-qt4/PKGBUILD

file modified

+4 -4

		`@@ -1,7 +1,7 @@`
		`- # Maintainer (Arch): Doug Newgard <scimmia at archlinux dot info>`
		`- # Contributor (Arch): SaultDon <sault.don gmail>`
		`- # Contributor (Arch): Gunther Schulz < mail at guntherschulz.de >`
		`- # Contributor (Arch): Kévin Guilloy <kevin at guilloy dot ath dot cx>`
		`+ # Maintainer (arch): Doug Newgard <scimmia at archlinux dot info>`
		`+ # Contributor: SaultDon <sault.don gmail>`
		`+ # Contributor: Gunther Schulz < mail at guntherschulz.de >`
		`+ # Contributor: Kévin Guilloy <kevin at guilloy dot ath dot cx>`
		`# Maintainer: Omar Vega Ramos <ovruni@gnu.org.pe>`

		`pkgname=qwtpolar-qt4`

pcr/rbenv/PKGBUILD

file modified

+5 -5

		`@@ -1,8 +1,8 @@`
		`- # Maintainer (AUR): Chris Down <chris@chrisdown.name>`
		`- # Contributor (AUR): Vladimir Chizhov <jagoterr@gmail.com>`
		`- # Contributor (AUR): Jochen Schalanda <jochen+aur (-AT-) schalanda.name>`
		`- # Contributor (AUR): Ichimonji10 <Ichimonji10@gmail.com>`
		`- # Maintainer : Aurélien Desbrières <aurelien@hackers.camp>`
		`+ # Maintainer (aur): Chris Down <chris@chrisdown.name>`
		`+ # Contributor: Vladimir Chizhov <jagoterr@gmail.com>`
		`+ # Contributor: Jochen Schalanda <jochen+aur (-AT-) schalanda.name>`
		`+ # Contributor: Ichimonji10 <Ichimonji10@gmail.com>`
		`+ # Maintainer: Aurélien Desbrières <aurelien@hackers.camp>`

		`# parabola changes and rationale:`
		`# no changes.`

pcr/realtimeconfigquickscan-git/PKGBUILD

file modified

+2 -2

		`@@ -1,5 +1,5 @@`
		`- # Maintainer (AUR): CrocoDuck <crocoduck dot oducks at gmail dot com>`
		`- # Contributor (AUR): Giancarlo Bianchi <giancarlobianchi76@gmail.com>`
		`+ # Maintainer (aur): CrocoDuck <crocoduck dot oducks at gmail dot com>`
		`+ # Contributor: Giancarlo Bianchi <giancarlobianchi76@gmail.com>`
		`# Contributor: André Silva <emulatorman@hyperbola.info>`

		`# parabola changes and rationale:`

pcr/recutils/PKGBUILD

file modified

+1 -1

		`@@ -1,4 +1,4 @@`
		`- # Maintainer (AUR): Stefan Haller <fgrsnau@gmail.com>`
		`+ # Maintainer (aur): Stefan Haller <fgrsnau@gmail.com>`
		`# Maintainer: Luke Shumaker <lukeshu@sbcglobal.net>`

		`pkgname=recutils`

pcr/rencode/PKGBUILD

file modified

+2 -2

		`@@ -1,5 +1,5 @@`
		`- # Contributor (AUR): Bug <bug2000@gmail.com>`
		`- # Maintainer (AUR): Bug <bug2000@gmail.com>`
		`+ # Contributor: Bug <bug2000@gmail.com>`
		`+ # Maintainer (aur): Bug <bug2000@gmail.com>`

		`# parabola changes and rationale:`
		`# no changes`

pcr/rmilter/PKGBUILD

file modified

+2 -2

		`@@ -1,7 +1,7 @@`
		`- # Contributor (AUR): Oleksandr Natalenko <oleksandr@natalenko.name>`
		`+ # Contributor: Oleksandr Natalenko <oleksandr@natalenko.name>`
		`# Contributor: fauno <fauno@parabola.nu>`
		`# Contrbutor: bill-auger <bill-auger@programmer.net>`
		`- # Maintainers: Parabola hackers <dev@lists.parabola.nu>`
		`+ # Maintainer: Parabola Hackers <dev@lists.parabola.nu>`

		`pkgname=rmilter`
		`pkgver=1.10.0`

pcr/rtorrent-color/PKGBUILD

file modified

+5 -5

		`@@ -1,8 +1,8 @@`
		`- # Maintainer (Arch): Gaetan Bisson <bisson@archlinux.org>`
		`- # Maintainer (Arch): Jaroslav Lichtblau <svetlemodry@archlinux.org>`
		`- # Contributor (Arch): Daenyth <Daenyth [at] gmail [dot] com>`
		`- # Contributor (Arch): Jeff Mickey <jeff@archlinux.org>`
		`- # Contributor (Arch): sh__`
		`+ # Maintainer (arch): Gaetan Bisson <bisson@archlinux.org>`
		`+ # Maintainer (arch): Jaroslav Lichtblau <svetlemodry@archlinux.org>`
		`+ # Contributor: Daenyth <Daenyth [at] gmail [dot] com>`
		`+ # Contributor: Jeff Mickey <jeff@archlinux.org>`
		`+ # Contributor: sh__`
		`# Based on rtorrent in [community]`
		`# Maintainer: Omar Vega Ramos <ovruni@gnu.org.pe>`

pcr/ruby-haml/PKGBUILD

file modified

+2 -2

		`@@ -1,6 +1,6 @@`
		`# Generated by gem2arch (https://github.com/anatol/gem2arch)`
		`- # Maintainer (Arch): Aoibhinn di Tori <email@aoibh.in>`
		`- # Contributor (Arch): Artem Vorotnikov <artem@vorotnikov.me>`
		`+ # Maintainer (arch): Aoibhinn di Tori <email@aoibh.in>`
		`+ # Contributor: Artem Vorotnikov <artem@vorotnikov.me>`
		`# Maintainer: Omar Vega Ramos <ovruni@gnu.org.pe>`

		`_gemname=haml`

pcr/ruby-syntax/PKGBUILD

file modified

+2 -2

		`@@ -1,6 +1,6 @@`
		`- # Maintainter: Aurelien Desbrieres <aurelien@cwb.io>`
		`+ # Maintainter: Aurélien Desbrières <aurelien@cwb.io>`
		`# Contributor: Luke Shumaker <lukeshu@parabola.nu>`
		`- # Maintainer (AUR): Adam Lloyd <lloyda2@rpi.edu>`
		`+ # Maintainer (aur): Adam Lloyd <lloyda2@rpi.edu>`

		`_gemname=syntax`
		`pkgname=ruby-$_gemname`

pcr/rush/PKGBUILD

file modified

+3 -3

		`@@ -1,6 +1,6 @@`
		`- # Maintainer (AUR): Chris Severance aur.severach aATt spamgourmet dott com`
		`- # Contributor (AUR): Brandon Invergo <brandon@invergo.net>`
		`- # Contributor (AUR): B3nny <benny@b3nny.net>`
		`+ # Maintainer (aur): Chris Severance aur.severach aATt spamgourmet dott com`
		`+ # Contributor: Brandon Invergo <brandon@invergo.net>`
		`+ # Contributor: B3nny <benny@b3nny.net>`

		`# parabola changes and rationale:`
		`# - added .install file to update icon database`

pcr/rxcpp/PKGBUILD

file modified

+1 -1

		`@@ -1,4 +1,4 @@`
		`- # Maintainer (AUR): Peter Majchrak <petoknm@gmail.com>`
		`+ # Maintainer (aur): Peter Majchrak <petoknm@gmail.com>`
		`# repolint: reason=asdeps`

		`pkgname=rxcpp`

pcr/rxvt-unicode-pixbuf/PKGBUILD

file modified

+5 -5

		`@@ -1,8 +1,8 @@`
		`- # Maintainer (AUR): Jacob Steffler <jacobsteffler@gmail.com>`
		`- # Contributor (AUR): Sébastien Luttringer <seblu@aur.archlinux.org>`
		`- # Contributor (AUR): Angel Velasquez <angvp@archlinux.org>`
		`- # Contributor (AUR): tobias <tobias@archlinux.org>`
		`- # Contributor (AUR): dibblethewrecker dibblethewrecker.at.jiwe.dot.org`
		`+ # Maintainer (aur): Jacob Steffler <jacobsteffler@gmail.com>`
		`+ # Contributor: Sébastien Luttringer <seblu@aur.archlinux.org>`
		`+ # Contributor: Angel Velasquez <angvp@archlinux.org>`
		`+ # Contributor: tobias <tobias@archlinux.org>`
		`+ # Contributor: dibblethewrecker dibblethewrecker.at.jiwe.dot.org`

		`# parabola changes and rationale:`
		`# no changes.`

pcr/sacd-extract/PKGBUILD

file modified

+1 -1

		`@@ -1,4 +1,4 @@`
		`- # Maintainer (Arch): spider-mario <spidermario@free.fr>`
		`+ # Maintainer (arch): spider-mario <spidermario@free.fr>`
		`# Maintainer: Omar Vega Ramos <ovruni@gnu.org.pe>`
		`pkgname=sacd-extract`
		`pkgver=0.3.8`

pcr/samhain/PKGBUILD

file modified

+2 -2

		`@@ -22,8 +22,8 @@`

		`# Hack to allow having samhain-$pkgver.tar.gz in source=(),`
		`# since it is inside samhain_signed-$pkgver.tar.gz`
		`- [ -e ${pkgbase}_signed-$pkgver.tar.gz ] \|\| curl -fLC - --retry 3 --retry-delay 3 -O ${source[0]}`
		`- [[ -e samhain-$pkgver.tar.gz{,.asc} ]] \|\| tar -zxf ${pkgbase}_signed-$pkgver.tar.gz &&`
		`+ [ -e ${pkgbase}_signed-$pkgver.tar.gz ] \|\| curl -fLC - --retry 3 --retry-delay 3 --silent -O ${source[0]}`
		`+ [[ -e samhain-$pkgver.tar.gz{,.asc} ]] \|\| tar -zxf ${pkgbase}_signed-$pkgver.tar.gz &> /dev/null &&`
		`source+=("samhain-$pkgver.tar.gz"{,.asc})`

		`build() {`

pcr/scotch/PKGBUILD

file modified

+1 -1

		`@@ -1,4 +1,4 @@`
		`- # Maintainer (AUR): Samuel Williams <ioquatix>`
		`+ # Maintainer (aur): Samuel Williams <ioquatix>`

		`pkgname=scotch`
		`pkgver=6.0.6`

pcr/screen-message/PKGBUILD

file modified

+1 -1

		`@@ -1,5 +1,5 @@`
		`# Maintainer (AUR): speps <speps at aur dot archlinux dot org>`
		`- # Contributor (AUR): Andrew LeCain dread@csh.rit.edu`
		`+ # Contributor: Andrew LeCain dread@csh.rit.edu`

		`# parabola changes and rationale:`
		`# - added .install file to update desktop database`

pcr/searx/PKGBUILD

file modified

+1 -1

		`@@ -1,4 +1,4 @@`
		`- # Maintainer (AUR): Jake <aur@ja-ke.tech>`
		`+ # Maintainer (aur): Jake <aur@ja-ke.tech>`
		`# parabola changes and rationale:`
		`# - Fixed license`
		`# - Moved random secret key generation in the .install: having that in`

pcr/selinux-python/PKGBUILD

file modified

+1 -1

		`@@ -1,4 +1,4 @@`
		`- # Maintainer (AUR): Nicolas Iooss (nicolas <dot> iooss <at> m4x <dot> org)`
		`+ # Maintainer (aur): Nicolas Iooss (nicolas <dot> iooss <at> m4x <dot> org)`

		`# parabola changes and rationale:`
		`# - Added armv7h`

pcr/setools/PKGBUILD

file modified

+4 -4

		`@@ -1,7 +1,7 @@`
		`- # Maintainer (AUR): Nicolas Iooss (nicolas <dot> iooss <at> m4x <dot> org)`
		`- # Contributor (AUR): Timothée Ravier <tim@siosm.fr>`
		`- # Contributor (AUR): Nicky726 <Nicky726 [at] gmail [dot] com>`
		`- # Contributor (AUR): Xiao-Long Chen <chenxiaolong@cxl.epac.to>`
		`+ # Maintainer (aur): Nicolas Iooss (nicolas <dot> iooss <at> m4x <dot> org)`
		`+ # Contributor: Timothée Ravier <tim@siosm.fr>`
		`+ # Contributor: Nicky726 <Nicky726 [at] gmail [dot] com>`
		`+ # Contributor: Xiao-Long Chen <chenxiaolong@cxl.epac.to>`

		`# parabola changes and rationale:`
		`# - Added armv7h`

pcr/shogun/PKGBUILD

file modified

+1 -1

		`@@ -1,4 +1,4 @@`
		`- # Maintainer (AUR): Christian Pfeiffer <xpipe at hotmail dot de>`
		`+ # Maintainer (aur): Christian Pfeiffer <xpipe at hotmail dot de>`
		`# Maintainer: Omar Vega Ramos <ovruni@gnu.org.pe>`
		`pkgname=shogun`
		`pkgver=6.1.3`

pcr/sic/PKGBUILD

file modified

+1 -1

		`@@ -1,4 +1,4 @@`
		`- # Maintainer (AUR): Will Alexander <archlinux dot org at willalexander dot me>`
		`+ # Maintainer (aur): Will Alexander <archlinux dot org at willalexander dot me>`
		`# Maintainer: Omar Vega Ramos <ovruni@gnu.org.pe>`

		`pkgname=sic`

pcr/simtrace/PKGBUILD

file modified

+1 -1

		`@@ -1,7 +1,7 @@`
		`# Copyright (C) 2020 Denis 'GNUtoo' Carikli <GNUtoo@cyberdimension.org>`
		`# This program is free software: you can redistribute it and/or modify`
		`# it under the terms of the CC0 1.0 License.`
		`- # Maintainers: Parabola hackers <dev@lists.parabola.nu>`
		`+ # Maintainer: Parabola Hackers <dev@lists.parabola.nu>`

		`pkgname=simtrace`
		`pkgver=1.5`

pcr/simtrace2/PKGBUILD

file modified

+1 -1

		`@@ -1,7 +1,7 @@`
		`# Copyright (C) 2020 Denis 'GNUtoo' Carikli <GNUtoo@cyberdimension.org>`
		`# This program is free software: you can redistribute it and/or modify`
		`# it under the terms of the CC0 1.0 License.`
		`- # Maintainers: Parabola hackers <dev@lists.parabola.nu>`
		`+ # Maintainer: Parabola Hackers <dev@lists.parabola.nu>`

		`pkgname=simtrace2`
		`pkgver=0.8.1`

pcr/smartypants/PKGBUILD

file modified

+1 -1

		`@@ -1,5 +1,5 @@`
		`# Contributor: Daniel Milewski <niitotantei@riseup.net>`
		`- # Maintainers: Parabola hackers <dev@lists.parabola.nu>`
		`+ # Maintainer: Parabola Hackers <dev@lists.parabola.nu>`

		`pkgname=smartypants`
		`pkgver=1.5.1`

pcr/snapraid/PKGBUILD

file modified

+1 -1

		`@@ -1,4 +1,4 @@`
		`- # Maintainer (Arch): John Williams <jwilliams4200 liamg reverse&remove moc>`
		`+ # Maintainer (arch): John Williams <jwilliams4200 liamg reverse&remove moc>`
		`# Maintainer: Omar Vega Ramos <ovruni@gnu.org.pe>`
		`pkgname=snapraid`
		`pkgver=10.0`

pcr/soapyosmo-xtrx/PKGBUILD

file modified

+1 -1

		`@@ -1,4 +1,4 @@`
		`- # Maintainer (ARCH): Filipe Laíns (FFY00) <lains@archlinux.org>`
		`+ # Maintainer (arch): Filipe Laíns (FFY00) <lains@archlinux.org>`
		`# Contributor: Denis 'GNUtoo' Carikli <GNUtoo@cyberdimension.org>`

		`pkgname=soapyosmo-xtrx`

pcr/softhsm/PKGBUILD

file modified

+1 -1

		`@@ -1,4 +1,4 @@`
		`- # Maintainer (Arch): Javier Torres <javitonino [at] gmail [dot] com>`
		`+ # Maintainer (arch): Javier Torres <javitonino [at] gmail [dot] com>`
		`# Maintainer: Omar Vega Ramos <ovruni@gnu.org.pe>`

		`pkgname=softhsm`

pcr/sphinx/PKGBUILD

file modified

+8 -8

		`@@ -1,11 +1,11 @@`
		`- # Maintainer (AUR): Isaac Aronson <i at linux dotcom>`
		`- # Contributor (AUR): Dan Serban`
		`- # Contributor (AUR): Jim Casteel`
		`- # Contributor (AUR): dryes <joswiseman@gmail>`
		`- # Contributor (AUR): Vishnevsky Roman <aka dot x0x01 at gmail dot com>`
		`- # Contributor (AUR): Massimiliano Torromeo <massimiliano.torromeo@gmail.com>`
		`- # Contributor (AUR): Aldo Culquicondor <alculquicondor@gmail.com>`
		`- # Contributor (AUR): Florijan Hamzic <florijanh@gmail.com>`
		`+ # Maintainer (aur): Isaac Aronson <i at linux dotcom>`
		`+ # Contributor: Dan Serban`
		`+ # Contributor: Jim Casteel`
		`+ # Contributor: dryes <joswiseman@gmail>`
		`+ # Contributor: Vishnevsky Roman <aka dot x0x01 at gmail dot com>`
		`+ # Contributor: Massimiliano Torromeo <massimiliano.torromeo@gmail.com>`
		`+ # Contributor: Aldo Culquicondor <alculquicondor@gmail.com>`
		`+ # Contributor: Florijan Hamzic <florijanh@gmail.com>`
		`# Maintainer: Omar Vega Ramos <ovruni@gnu.org.pe>`

		`# parabola changes and rationale:`

pcr/steinberg-vst36/PKGBUILD

file modified

+3 -3

		`@@ -1,6 +1,6 @@`
		`- # Maintainer (AUR): Albert Graef <aggraef@gmail.com>`
		`- # Contributor (AUR): Ray Rashif <schiv@archlinux.org>`
		`- # Contributor (AUR): rtfreedman (rob<d0t>til<d0t>freedman<aT>googlemail<d0t>com`
		`+ # Maintainer (aur): Albert Graef <aggraef@gmail.com>`
		`+ # Contributor: Ray Rashif <schiv@archlinux.org>`
		`+ # Contributor: rtfreedman (rob<d0t>til<d0t>freedman<aT>googlemail<d0t>com`

		`# parabola changes and rationale:`
		`# no changes.`

pcr/stormlib/PKGBUILD

file modified

+1 -1

		`@@ -1,5 +1,5 @@`
		`# Maintainer: Andreas Grapentin <andreas@grapentin.org>`
		`- # Maintainer (AUR): Jerome Leclanche <jerome@leclan.ch>`
		`+ # Maintainer (aur): Jerome Leclanche <jerome@leclan.ch>`

		`_pkgname=StormLib`
		`pkgname=${_pkgname,,}`

pcr/straw-viewer/PKGBUILD

file modified

+1 -1

		`@@ -1,4 +1,4 @@`
		`- # Maintainer (AUR): Trizen <trizen@protonmail.com>`
		`+ # Maintainer (aur): Trizen <trizen@protonmail.com>`
		`# Maintainer: David P. <megver83@parabola.nu>`

		`pkgname=straw-viewer`

pcr/supermodel/PKGBUILD

file modified

+1 -1

		`@@ -1,4 +1,4 @@`
		`- # Maintainer (Arch): Anton Shestakov <engored*ya.ru>`
		`+ # Maintainer (arch): Anton Shestakov <engored*ya.ru>`

		`pkgname=supermodel`
		`pkgver=0.2a`

pcr/suricata/PKGBUILD

file modified

+1 -1

		`@@ -1,4 +1,4 @@`
		`- # Maintainer (AUR): Jaroslav Lichtblau <dragonlord@aur.archlinux.org>`
		`+ # Maintainer (aur): Jaroslav Lichtblau <dragonlord@aur.archlinux.org>`
		`# Contributor: André Silva <emulatorman@hyperbola.info>`

		`# parabola changes and rationale:`

pcr/tahoe-lafs/PKGBUILD

file modified

+3 -3

		`@@ -1,7 +1,7 @@`
		`# Maintainer (AUR): Skydrome <skydrome@i2pmail.org>`
		`- # Contributor (AUR): DaNiMoTh <jjdanimoth@gmail.com>`
		`- # Contributor (Arch): Peter Simons <simons@cryp.to>`
		`- # Contributor (Arch): Nicolas Pouillard <nicolas.pouillard@gmail.com>`
		`+ # Contributor: DaNiMoTh <jjdanimoth@gmail.com>`
		`+ # Contributor: Peter Simons <simons@cryp.to>`
		`+ # Contributor: Nicolas Pouillard <nicolas.pouillard@gmail.com>`
		`# Maintainer: Luke R. <g4jc@openmailbox.org> GPG: rsa4096/3EAE8697`

		`pkgname=tahoe-lafs`

pcr/tanglet/PKGBUILD

file modified

+1 -1

		`@@ -1,4 +1,4 @@`
		`- # Maintainer (AUR): Graeme Gott <graeme@gottcode.org>`
		`+ # Maintainer (aur): Graeme Gott <graeme@gottcode.org>`
		`# Contributor: Alon Ivtsan <alonivtsan@lavabit.com>`

		`# parabola changes and rationale:`

pcr/tango-icon-theme/PKGBUILD

file modified

+3 -3

		`@@ -1,6 +1,6 @@`
		`- # Maintainer (Arch): Steffen Weber <-boenki-gmx-de->`
		`- # Contributor (Arch): Thayer Williams <thayer@archlinux.org>`
		`- # Contributor (Arch): James Rayner <james@archlinux.org>`
		`+ # Maintainer (arch): Steffen Weber <-boenki-gmx-de->`
		`+ # Contributor: Thayer Williams <thayer@archlinux.org>`
		`+ # Contributor: James Rayner <james@archlinux.org>`
		`# Maintainer: André Silva <emulatorman@hyperbola.info>`

		`pkgname=tango-icon-theme`

pcr/task-spooler/PKGBUILD

file modified

+2 -2

		`@@ -1,6 +1,6 @@`
		`# Maintainer: Andreas Grapentin <andreas@grapentin.org>`
		`- # Contributor (AUR): willemw <willemw12@gmail.com>`
		`- # Contributor (AUR): gnomeye <gnomeye at gmail dot com>`
		`+ # Contributor: willemw <willemw12@gmail.com>`
		`+ # Contributor: gnomeye <gnomeye at gmail dot com>`

		`_name=ts`

pcr/ted/PKGBUILD

file modified

+4 -4

		`@@ -1,7 +1,7 @@`
		`- # Maintainer (AUR): willemw <willemw12@gmail.com>`
		`- # Contributor (AUR): shirokuro <tod dot jackson at gmail dot com>`
		`- # Contributor (AUR): sergej`
		`- # Maintainer: Parabola Aurélien DESBRIÈRES <aurelien@xload.IO>`
		`+ # Maintainer (aur): willemw <willemw12@gmail.com>`
		`+ # Contributor: shirokuro <tod dot jackson at gmail dot com>`
		`+ # Contributor: sergej`
		`+ # Maintainer: Aurélien Desbrières <aurelien@xload.io>`

		`pkgname=ted`
		`pkgver=2.23`

pcr/terminal-screensaver/PKGBUILD

file modified

+1 -1

		`@@ -1,4 +1,4 @@`
		`- # Maintainer : Aurelien Desbrieres <aurelien@hackers.camp>`
		`+ # Maintainer: Aurélien Desbrières <aurelien@hackers.camp>`
		`# Contributor: totoloco <totoloco at gmail dot com>`

		`pkgname=terminal-screensaver`

pcr/texlive-localmanager/PKGBUILD

file modified

+4 -4

		`@@ -1,7 +1,7 @@`
		`- # Maintainer (AUR): XZS <d dot f dot fischer at web dot de>`
		`- # Contributor (AUR): Stefan Husmann <stefan-husmann@t-online.de>`
		`- # Contributor (AUR): Rémy Oudompheng <remy@archlinux.org>`
		`- # Contributor (AUR): Firmicus <francois . archlinux . org>`
		`+ # Maintainer (aur): XZS <d dot f dot fischer at web dot de>`
		`+ # Contributor: Stefan Husmann <stefan-husmann@t-online.de>`
		`+ # Contributor: Rémy Oudompheng <remy@archlinux.org>`
		`+ # Contributor: Firmicus <francois . archlinux . org>`
		`# Contrbutor: bill-auger <bill-auger@programmer.net>`

pcr/textext/PKGBUILD

file modified

+2 -2

		`@@ -1,5 +1,5 @@`
		`- # Contributor (AUR): Joel Schaerer <joel.schaerer@laposte.net>`
		`- # Maintainer (AUR): Stefan Husmann <stefan-husmann@t-online.de>`
		`+ # Contributor: Joel Schaerer <joel.schaerer@laposte.net>`
		`+ # Maintainer (aur): Stefan Husmann <stefan-husmann@t-online.de>`

		`pkgname=textext`
		`_pkgname=TexText`

pcr/thinkfan/PKGBUILD

file modified

+2 -2

		`@@ -1,5 +1,5 @@`
		`- # Maintainer (Arch): nblock <nblock [/at\] archlinux DOT us>`
		`- # Contributor (Arch): Frederik AlkÃ¦rsig (FALKER) <havnelisten AT gmail.com>`
		`+ # Maintainer (arch): nblock <nblock [/at\] archlinux DOT us>`
		`+ # Contributor: Frederik AlkÃ¦rsig (FALKER) <havnelisten AT gmail.com>`
		`# Maintainer: Omar Vega Ramos <ovruni@gnu.org.pe>`

		`pkgname=thinkfan`

pcr/timekpr/PKGBUILD

file modified

+2 -2

		`@@ -1,5 +1,5 @@`
		`- # Contributor (AUR): SanskritFritz (gmail)`
		`- # Maintainers: Parabola hackers <dev@lists.parabola.nu>`
		`+ # Contributor: SanskritFritz (gmail)`
		`+ # Maintainer: Parabola Hackers <dev@lists.parabola.nu>`

		`pkgname=timekpr`
		`pkgver=0.3.2`

pcr/timelineproject-hg/PKGBUILD

file modified

+1 -1

		`@@ -1,4 +1,4 @@`
		`- # Maintainer (AUR): Thibaud Kehler <thibaud.kehler at gmx dot net>`
		`+ # Maintainer (aur): Thibaud Kehler <thibaud.kehler at gmx dot net>`
		`pkgname=timelineproject-hg`
		`pkgver=2.2.0.r6954`
		`pkgrel=1`

pcr/tintin/PKGBUILD

file modified

+4 -4

		`@@ -1,7 +1,7 @@`
		`- # Maintainer (AUR): Mike Sampson <mike at sambodata dot com>`
		`- # Contributor (AUR): Thomas Zervogiannis <tzervo@gmail.com>`
		`- # Contributor (AUR): Loui Chang <louipc dot ist at gmail company>`
		`- # Contributor (AUR): rabyte <rabyte__gmail>`
		`+ # Maintainer (aur): Mike Sampson <mike at sambodata dot com>`
		`+ # Contributor: Thomas Zervogiannis <tzervo@gmail.com>`
		`+ # Contributor: Loui Chang <louipc dot ist at gmail company>`
		`+ # Contributor: rabyte <rabyte__gmail>`
		`# Maintainer: Freemor <freemor@freemor.ca>`

		`pkgname=tintin`

pcr/tkpng/PKGBUILD

file modified

+1 -1

		`@@ -1,4 +1,4 @@`
		`- # Maintainer (AUR): SpepS <dreamspepser at yahoo dot it>`
		`+ # Maintainer (aur): SpepS <dreamspepser at yahoo dot it>`
		`# Maintainer: Omar Vega Ramos <ovruni@gnu.org.pe>`

		`pkgname=tkpng`

pcr/tomoyo-tools/PKGBUILD

file modified

+3 -3

		`@@ -1,6 +1,6 @@`
		`- # Maintainer (AUR): Steven Allen <steven@stebalien.com>`
		`- # Contributor (AUR): Sergej Pupykin <pupykin.s+arch@gmail.com>`
		`- # Contributor (AUR): Jamie Nguyen <jamie AT tomoyolinux.co.uk>`
		`+ # Maintainer (aur): Steven Allen <steven@stebalien.com>`
		`+ # Contributor: Sergej Pupykin <pupykin.s+arch@gmail.com>`
		`+ # Contributor: Jamie Nguyen <jamie AT tomoyolinux.co.uk>`

		`# parabola changes and rationale:`
		`# - removed from depends: linux-tomoyo`

pcr/tox-prpl/PKGBUILD

file modified

+1 -1

		`@@ -1,4 +1,4 @@`
		`- # Maintainer (AUR): Christian Hesse <mail@eworm.de>`
		`+ # Maintainer (aur): Christian Hesse <mail@eworm.de>`
		`# Maintainer: Isaac David <isacdaavid@at@isacdaavid@dot@info>`

		`pkgname=tox-prpl`

pcr/triceratops-lv2/PKGBUILD

file modified

+2 -2

		`@@ -1,5 +1,5 @@`
		`- # Maintainer (AUR): Christopher Arndt <aur -at- chrisarndt -dot- de>`
		`- # Contributor (AUR): speps <speps at aur dot archlinux dot org>`
		`+ # Maintainer (aur): Christopher Arndt <aur -at- chrisarndt -dot- de>`
		`+ # Contributor: speps <speps at aur dot archlinux dot org>`

		`# parabola changes and rationale:`
		`# no changes.`

pcr/trousers/PKGBUILD

file modified

+7 -7

		`@@ -1,10 +1,10 @@`
		`- # Maintainer (AUR): mutantmonkey <aur@mutantmonkey.in>`
		`- # Contributor (AUR): Gerardo Exequiel Pozzi <djgera@archlinux.org>`
		`- # Contributor (AUR): Robert Buhren <robert@robertbuhren.de>`
		`- # Contributor (AUR): Gavin Lloyd <gavinhungry@gmail.com>`
		`- # Contributor (AUR): xav <xav at ethertricks dot net>`
		`- # Contributor (AUR): julian <pidanc_j at epita dot fr>`
		`- # Contributor (AUR): Silvio Knizek <killermoehre@gmx.net>`
		`+ # Maintainer (aur): mutantmonkey <aur@mutantmonkey.in>`
		`+ # Contributor: Gerardo Exequiel Pozzi <djgera@archlinux.org>`
		`+ # Contributor: Robert Buhren <robert@robertbuhren.de>`
		`+ # Contributor: Gavin Lloyd <gavinhungry@gmail.com>`
		`+ # Contributor: xav <xav at ethertricks dot net>`
		`+ # Contributor: julian <pidanc_j at epita dot fr>`
		`+ # Contributor: Silvio Knizek <killermoehre@gmx.net>`

		`# parabola changes and rationale:`
		`# - removed "open source" term from pkgdesc`

pcr/tryton/PKGBUILD

file modified

+2 -2

		`@@ -1,5 +1,5 @@`
		`- # Maintainer (Arch): Robin Baumgartner <robin@baumgartners.ch>`
		`- # Contributor (Arch): Florian Walch <florian.walch@gmx.at>`
		`+ # Maintainer (arch): Robin Baumgartner <robin@baumgartners.ch>`
		`+ # Contributor: Florian Walch <florian.walch@gmx.at>`
		`# Maintainer: Omar Vega Ramos <ovruni@gnu.org.pe>`
		`pkgname=tryton`
		`pkgver=4.2.1`

pcr/trytond/PKGBUILD

file modified

+2 -2

		`@@ -1,5 +1,5 @@`
		`- # Contributor (Arch): Florian Walch <florian.walch@gmx.at>`
		`- # Maintainer (Arch): Robin Baumgartner <robin@baumgartners.ch>`
		`+ # Contributor: Florian Walch <florian.walch@gmx.at>`
		`+ # Maintainer (arch): Robin Baumgartner <robin@baumgartners.ch>`
		`# Maintainer: Omar Vega Ramos <ovruni@gnu.org.pe>`
		`pkgname=trytond`
		`pkgver=4.2.1`

pcr/ttf-beteckna/PKGBUILD

file modified

+2 -2

		`@@ -1,5 +1,5 @@`
		`- # Maintainer (AUR): Aerion <emile@aerion.co.uk>`
		`- # Contributor (AUR): TDY <tdy@archlinux.info>`
		`+ # Maintainer (aur): Aerion <emile@aerion.co.uk>`
		`+ # Contributor: TDY <tdy@archlinux.info>`
		`# Maintainer: Omar Vega Ramos <ovruni@gnu.org.pe>`
		`# Contributor: bill-auger <bill-auger@programmer.net>`

pcr/ttf-comic-neue/PKGBUILD

file modified

+1 -1

		`@@ -1,4 +1,4 @@`
		`- # Maintainer (AUR): Gatlin Johnson <gatlin@niltag.net>`
		`+ # Maintainer (aur): Gatlin Johnson <gatlin@niltag.net>`

		`# parabola changes and rationale:`
		`# no changes.`

pcr/ttf-montserrat/PKGBUILD

file modified

+3 -3

		`@@ -1,6 +1,6 @@`
		`- # Maintainer (AUR): Caleb Maclennan <caleb@alerque.com>`
		`- # Contributor (AUR): scolobb <scolobb@colimite.fr>`
		`- # Contributor (AUR): EEva <eeva+aur@marvid.fr>`
		`+ # Maintainer (aur): Caleb Maclennan <caleb@alerque.com>`
		`+ # Contributor: scolobb <scolobb@colimite.fr>`
		`+ # Contributor: EEva <eeva+aur@marvid.fr>`
		`# Maintainer: Luke R. <g4jc@openmailbox.org> GPG: rsa4096/3EAE8697`
		`# Contributor: Freemor <freemor@freemor.ca>`

pcr/ttf-open-comic-font/PKGBUILD

file modified

+1 -1

		`@@ -1,6 +1,6 @@`
		`# Contributor: Márcio Silva <coadde@hyperbola.info>`
		`# Contributor: bill-auger <bill-auger@programmer.net>`
		`- # Maintainers: Parabola hackers <dev@lists.parabola.nu>`
		`+ # Maintainer: Parabola Hackers <dev@lists.parabola.nu>`

		`pkgname=ttf-open-comic-font`
		`pkgver=0.03.2`

pcr/tupi/PKGBUILD

file modified

+4 -4

		`@@ -1,7 +1,7 @@`
		`- # Contributor (Arch): Ninez <triplesquarednine AT gmail DOT com>`
		`- # Contributor (Arch): N30N <archlinux@alunamation.com>`
		`- # Contributor (Arch): sekret (AUR)`
		`- # Maintainer (Arch): SanskritFritz (gmail)`
		`+ # Contributor: Ninez <triplesquarednine AT gmail DOT com>`
		`+ # Contributor: N30N <archlinux@alunamation.com>`
		`+ # Contributor: sekret (AUR)`
		`+ # Maintainer (arch): SanskritFritz (gmail)`
		`# Maintainer: Omar Vega Ramos <ovruni@gnu.org.pe>`

		`pkgname="tupi"`

pcr/uboot-tools/PKGBUILD

file modified

+3 -3

		`@@ -1,7 +1,7 @@`
		`# $Id$`
		`- # Maintainer (Arch): Anatol Pomozov`
		`- # Contributor (Arch): Michael Lass <bevan@bi-co.net>`
		`- # Contributor (Arch): Philipp Schrader <philipp.schrader+arch@gmail.com>`
		`+ # Maintainer (arch): Anatol Pomozov`
		`+ # Contributor: Michael Lass <bevan@bi-co.net>`
		`+ # Contributor: Philipp Schrader <philipp.schrader+arch@gmail.com>`
		`# Maintainer: Omar Vega Ramos <ovruni@gnu.org.pe>`

		`# Parabola changes and rationale:`

pcr/ucommon/PKGBUILD

file modified

+2 -2

		`@@ -1,5 +1,5 @@`
		`- # Maintainer (AUR): Timothy Redaelli <timothy.redaelli@gmail.com>`
		`- # Contributor (AUR): Sergej Pupykin <pupykin.s+arch@gmail.com>`
		`+ # Maintainer (aur): Timothy Redaelli <timothy.redaelli@gmail.com>`
		`+ # Contributor: Sergej Pupykin <pupykin.s+arch@gmail.com>`

		`# parabola changes and rationale:`
		`# no changes.`

pcr/ucsniff-ace/PKGBUILD

file modified

+1 -1

		`@@ -1,5 +1,5 @@`
		`# Contributor: Márcio Silva <coadde@hyperbola.info>`
		`- # Maintainers: Parabola hackers <dev@lists.parabola.nu>`
		`+ # Maintainer: Parabola Hackers <dev@lists.parabola.nu>`

		`pkgname='ucsniff-ace'`
		`pkgver='1.10'`

pcr/uefitool/PKGBUILD

file modified

+1 -1

		`@@ -1,7 +1,7 @@`
		`# Based on uefitool-git`
		`# Contributor: xsmile <sascha_r at gmx dot de>`
		`# Contributor: Denis 'GNUtoo' Carikli <GNUtoo@cyberdimension.org>`
		`- # Maintainers: Parabola hackers <dev@lists.parabola.nu>`
		`+ # Maintainer: Parabola Hackers <dev@lists.parabola.nu>`

		`pkgname=uefitool`
		`_pkgname=UEFITool`

pcr/ums/PKGBUILD

file modified

+3 -3

		`@@ -1,6 +1,6 @@`
		`- # Maintainer (AUR): Mitch <mitch at znation dot nl>`
		`- # Contributor (AUR): Red Squirrel <iam at redsquirrel87 dot com>`
		`- # Maintainer: Aurélien DESBRIÈRES <aurelien@hackers.camp>`
		`+ # Maintainer (aur): Mitch <mitch at znation dot nl>`
		`+ # Contributor: Red Squirrel <iam at redsquirrel87 dot com>`
		`+ # Maintainer: Aurélien Desbrières <aurelien@hackers.camp>`
		`# Based on PMS PKGBUILD`

		`pkgname=ums`

pcr/unifont/PKGBUILD

file added

+163

		`@@ -0,0 +1,163 @@`
		`+ # Maintainer: Wael Karram <wael@waelk.tech>`
		`+ # Maintainer (aur): neeshy <neeshy@tfwno.gf>`
		`+ # Contributor: Carlos Aznarán <caznaranl@uni.pe>`
		`+ # Contributor: Martin C. Doege <mdoege at compuserve dot com>`
		`+ # Contributor: Gregory G Danielson III <gregdan3@protonmail.com>`
		`+ # Contributor: nl6720 <nl6720@archlinux.org>`
		`+ # Contributor: David McInnis <dave@dave3.xyz>`
		`+ # Contributor: megadriver <megadriver at gmx dot com>`
		`+ # Contributor: Antonio Rojas <arojas@archlinux.org>`
		`+ # Contributor: Ronald van Haren <ronald.archlinux.org>`
		+ # Contributor: felix <`base64 -d <<< ZmVsaXgudm9uLnNAcG9zdGVvLmRlCg`>
		`+`
		`+`
		`+ # parabola changes and rationale:`
		`+ # - install documentation`
		`+ # - combination of several AUR packages`
		`+`
		`+ # NOTE: This package should be built per-arch.`
		`+ # The fonts are for 'any' arch; but 'unifont-utils' has binary executables.`
		+ # NOTE: In order to publish all of these packages, `librestage` must be run twice.
		`+ # The first run will stage the 'any' packages.`
		`+ # In order to librestage the per-arch 'unifont-utils' packages,`
		`+ # uncomment the commented arch=() array temporarily.`
		`+`
		`+`
		`+ pkgname=('pcf-unifont'`
		`+ 'psf-unifont'`
		`+ 'hex-unifont'`
		`+ 'bdf-unifont'`
		`+ 'ttf-unifont'`
		`+ 'otf-unifont'`
		`+ 'unifont-utils')`
		`+ pkgbase=unifont`
		`+ pkgver=15.0.01`
		`+ pkgrel=1`
		`+ pkgdesc="A free bitmap font with wide Unicode support (PCF, PSF and hex versions)"`
		`+ arch=('any')`
		`+ # arch=('armv7h' 'i686' 'x86_64') # for librestage (see NOTE above)`
		`+ url="http://unifoundry.com/"`
		`+ license=('GPL' 'custom:OFL')`
		`+ source=("http://unifoundry.com/pub/unifont/unifont-$pkgver/unifont-$pkgver.tar.gz"{,.sig})`
		`+ sha256sums=('7d11a924bf3c63ea7fdf2da2b96d6d4986435bedfd1e6816c8ac2e6db47634d5'`
		`+ 'SKIP')`
		`+ validpgpkeys=('95D2E9AB8740D8046387FD151A09227B1F435A33') # Paul Hardy <unifoundry@unifoundry.com>`
		`+`
		`+ build() {`
		`+ cd "${srcdir}"/${pkgbase}-${pkgver}`
		`+`
		`+ local variation`
		`+ for variation in bold italic bolditalic; do`
		`+ "mk$variation" "unifont-$pkgver.bdf" \| gzip -c >"unifont-$variation-$pkgver.bdf.gz"`
		`+ done`
		`+`
		`+ make`
		`+ }`
		`+`
		`+ package_pcf-unifont() {`
		`+ pkgdesc="A free bitmap font with wide Unicode support (PCF version)"`
		`+`
		`+ # Install the font.`
		`+ cd "$srcdir/unifont-$pkgver/font/precompiled"`
		`+ install -Dm644 "unifont-$pkgver.pcf.gz" "$pkgdir/usr/share/fonts/misc/unifont.pcf.gz"`
		`+ # Install the license.`
		`+ cd "$srcdir/unifont-$pkgver"`
		`+ install -Dm644 OFL-1.1.txt "$pkgdir/usr/share/licenses/$pkgname/LICENSE"`
		`+ # Install the documentation.`
		`+ install -Dm644 doc/unifont.pdf "$pkgdir/usr/share/licenses/$pkgname/LICENSE"`
		`+ install -Dm644 doc/unifont.txt "$pkgdir/usr/share/licenses/$pkgname/LICENSE"`
		`+ }`
		`+`
		`+ package_psf-unifont() {`
		`+ pkgdesc="A free bitmap font with wide Unicode support (PSF version)"`
		`+`
		`+ # Install the font.`
		`+ cd "$srcdir/unifont-$pkgver/font/precompiled"`
		`+ install -Dm644 "Unifont-APL8x16-$pkgver.psf.gz" "$pkgdir/usr/share/kbd/consolefonts/Unifont-APL8x16.psf.gz"`
		`+ # Install the license.`
		`+ cd "$srcdir/unifont-$pkgver"`
		`+ install -Dm644 OFL-1.1.txt "$pkgdir/usr/share/licenses/$pkgname/LICENSE"`
		`+ # Install the documentation.`
		`+ install -Dm644 doc/unifont.pdf "$pkgdir/usr/share/licenses/$pkgname/LICENSE"`
		`+ install -Dm644 doc/unifont.txt "$pkgdir/usr/share/licenses/$pkgname/LICENSE"`
		`+ }`
		`+`
		`+ package_hex-unifont() {`
		`+ pkgdesc="A free bitmap font with wide Unicode support (hex version)"`
		`+`
		`+ # Install the font.`
		`+ cd "$srcdir/unifont-$pkgver/font/precompiled"`
		`+ install -Dm644 "unifont-$pkgver.hex" "$pkgdir/usr/share/unifont/unifont.hex"`
		`+ # Install the license.`
		`+ cd "$srcdir/unifont-$pkgver"`
		`+ install -Dm644 OFL-1.1.txt "$pkgdir/usr/share/licenses/$pkgname/LICENSE"`
		`+ # Install the documentation.`
		`+ install -Dm644 doc/unifont.pdf "$pkgdir/usr/share/licenses/$pkgname/LICENSE"`
		`+ install -Dm644 doc/unifont.txt "$pkgdir/usr/share/licenses/$pkgname/LICENSE"`
		`+ }`
		`+`
		`+ package_bdf-unifont () {`
		`+ pkgdesc="A free bitmap font with wide Unicode support (BDF version)"`
		`+`
		`+ # Install the font.`
		`+ cd "$srcdir/unifont-$pkgver/font/precompiled"`
		`+ gzip -d --force "unifont-$pkgver.bdf.gz"`
		`+ install -Dm644 "unifont-$pkgver.bdf" "$pkgdir/usr/share/fonts/misc/unifont.bdf"`
		`+ # Install the license.`
		`+ cd "$srcdir/unifont-$pkgver"`
		`+ install -Dm644 OFL-1.1.txt "$pkgdir/usr/share/licenses/$pkgname/LICENSE"`
		`+ # Install the documentation.`
		`+ install -Dm644 doc/unifont.pdf "$pkgdir/usr/share/licenses/$pkgname/LICENSE"`
		`+ install -Dm644 doc/unifont.txt "$pkgdir/usr/share/licenses/$pkgname/LICENSE"`
		`+ }`
		`+`
		`+ package_ttf-unifont() {`
		`+ pkgdesc="A free bitmap font with wide Unicode support (TTF version)"`
		`+`
		`+ # Install the font.`
		`+ cd "$srcdir/unifont-$pkgver/font/precompiled"`
		`+ install -d "$pkgdir/usr/share/fonts/Unifont/"`
		`+ install -m644 "unifont-$pkgver.ttf" "$pkgdir/usr/share/fonts/Unifont/Unifont.ttf"`
		`+ install -m644 "unifont_jp-$pkgver.ttf" "$pkgdir/usr/share/fonts/Unifont/Unifont_jp.ttf"`
		`+ install -m644 "unifont_upper-$pkgver.ttf" "$pkgdir/usr/share/fonts/Unifont/Unifont_Upper.ttf"`
		`+ install -m644 "unifont_csur-$pkgver.ttf" "$pkgdir/usr/share/fonts/Unifont/Unifont_CSUR.ttf"`
		`+ # Install the license.`
		`+ cd "$srcdir/unifont-$pkgver"`
		`+ install -Dm644 OFL-1.1.txt "$pkgdir/usr/share/licenses/$pkgname/LICENSE"`
		`+ # Install the documentation.`
		`+ install -Dm644 doc/unifont.pdf "$pkgdir/usr/share/licenses/$pkgname/LICENSE"`
		`+ install -Dm644 doc/unifont.txt "$pkgdir/usr/share/licenses/$pkgname/LICENSE"`
		`+ }`
		`+`
		`+ package_otf-unifont() {`
		`+ pkgdesc="A free bitmap font with wide Unicode support (OTF version)"`
		`+`
		`+ # Install the font.`
		`+ cd "$srcdir/unifont-$pkgver/font/precompiled"`
		`+ install -d "$pkgdir/usr/share/fonts/Unifont/"`
		`+ install -m644 "unifont-$pkgver.otf" "$pkgdir/usr/share/fonts/Unifont/Unifont.otf"`
		`+ install -m644 "unifont_jp-$pkgver.otf" "$pkgdir/usr/share/fonts/Unifont/Unifont_jp.otf"`
		`+ install -m644 "unifont_upper-$pkgver.otf" "$pkgdir/usr/share/fonts/Unifont/Unifont_Upper.otf"`
		`+ install -m644 "unifont_csur-$pkgver.otf" "$pkgdir/usr/share/fonts/Unifont/Unifont_CSUR.otf"`
		`+ # Install the license.`
		`+ cd "$srcdir/unifont-$pkgver"`
		`+ install -Dm644 OFL-1.1.txt "$pkgdir/usr/share/licenses/$pkgname/LICENSE"`
		`+ # Install the documentation.`
		`+ install -Dm644 doc/unifont.pdf "$pkgdir/usr/share/licenses/$pkgname/LICENSE"`
		`+ install -Dm644 doc/unifont.txt "$pkgdir/usr/share/licenses/$pkgname/LICENSE"`
		`+ }`
		`+`
		`+ package_unifont-utils() {`
		`+ pkgdesc="A free bitmap font with wide Unicode support - utilities"`
		`+ arch=('armv7h' 'i686' 'x86_64')`
		`+ license=('GPL')`
		`+ depends=('perl')`
		`+ optdepends=(`
		`+ 'perl-wx: for the unifont-viewer utility'`
		`+ 'perl-gd: for the unihex2png and unipng2hex utilities'`
		`+ )`
		`+`
		`+ cd "$srcdir/unifont-$pkgver"`
		`+ make -C src install PREFIX="$pkgdir/usr" LOCALBINDIR=../bin`
		`+ make -C man install PREFIX="$pkgdir/usr" COMPRESS=1`
		`+ }`

pcr/upp/PKGBUILD

file modified

+1 -1

		`@@ -1,4 +1,4 @@`
		`- # Maintainer (AUR): Jan Dolinar <dolik.rce@gmail.com>`
		`+ # Maintainer (aur): Jan Dolinar <dolik.rce@gmail.com>`

		`pkgbase=upp`
		`pkgname=(upp theide umk)`

pcr/urxvtcd/PKGBUILD

file modified

+2 -2

		`@@ -1,5 +1,5 @@`
		`- # Maintainer (Arch): Jaroslav Lichtblau <dragonlord@aur.archlinux.org>`
		`- # Contributor (Arch): G_Syme <demichan(at)mail(dot)upb(dot)de>`
		`+ # Maintainer (arch): Jaroslav Lichtblau <dragonlord@aur.archlinux.org>`
		`+ # Contributor: G_Syme <demichan(at)mail(dot)upb(dot)de>`

		`pkgname=urxvtcd`
		`pkgver=2`

pcr/vassal/PKGBUILD

file modified

+1 -1

		`@@ -1,4 +1,4 @@`
		`- # Maintainer (AUR): David Vilar <davvil@gmail.com>`
		`+ # Maintainer (aur): David Vilar <davvil@gmail.com>`
		`# Maintainer: Luke R. <g4jc@openmailbox.org> GPG: rsa4096/3EAE8697`

		`# parabola changes and rationale:`

pcr/video_entropyd/PKGBUILD

file modified

+1 -1

		`@@ -1,4 +1,4 @@`
		`- # Maintainer (AUR): Florian Schweikert <kelvan@logic.at>`
		`+ # Maintainer (aur): Florian Schweikert <kelvan@logic.at>`
		`# Maintainer: fauno <fauno@parabola.nu>`
		`pkgname=video_entropyd`
		`pkgver=2.0`

pcr/vim-autotag/PKGBUILD

file modified

+1 -1

		`@@ -1,5 +1,5 @@`
		`# Contributor: Daniel Milewski <niitotantei@riseup.net>`
		`- # Maintainers: Parabola hackers <dev@lists.parabola.nu>`
		`+ # Maintainer: Parabola Hackers <dev@lists.parabola.nu>`

		`pkgname=vim-autotag`
		`pkgver=r23.b2847e1`

pcr/vim-colors-solarized-git/PKGBUILD

file modified

+2 -2

		`@@ -1,5 +1,5 @@`
		`- # Maintainer (AUR): Mario Finelli <mario dot finelli at yahoo dot com>`
		`- # Maintainer : Aurelien Desbrieres <aurelien@hackers.camp>`
		`+ # Maintainer (aur): Mario Finelli <mario dot finelli at yahoo dot com>`
		`+ # Maintainer: Aurélien Desbrières <aurelien@hackers.camp>`

		`pkgname=vim-colors-solarized-git`
		`pkgver=20110509`

pcr/vim-colorschemes/PKGBUILD

file modified

+6 -6

		`@@ -1,9 +1,9 @@`
		`- # Maintainer (AUR): jsteel <mail at jsteel dot org>`
		`- # Contributor (AUR): nblock <nblock [/at\] archlinux DOT us>`
		`- # Contributor (AUR): William Díaz <wdiaz [at] archlinux [dot] us>`
		`- # Contributor (AUR): Wolfgang Frisch <xororand@frexx.de>`
		`- # Contributor (AUR): Leandro Inacio <carvalho.inacio@gmail.com>`
		`- # Maintainer : Aurelien Desbrieres <aurelien@hackers.camp>`
		`+ # Maintainer (aur): jsteel <mail at jsteel dot org>`
		`+ # Contributor: nblock <nblock [/at\] archlinux DOT us>`
		`+ # Contributor: William Díaz <wdiaz [at] archlinux [dot] us>`
		`+ # Contributor: Wolfgang Frisch <xororand@frexx.de>`
		`+ # Contributor: Leandro Inacio <carvalho.inacio@gmail.com>`
		`+ # Maintainer: Aurélien Desbrières <aurelien@hackers.camp>`

		`pkgname=vim-colorschemes`
		`pkgver=20140623`

pcr/vim-pathogen/PKGBUILD

file modified

+2 -2

		`@@ -1,5 +1,5 @@`
		`- # Maintainer (AUR): drrossum <d.r.vanrossum at gmx.de>`
		`- # Maintainer : Omar Vega Ramos <ovruni@gnu.org.pe>`
		`+ # Maintainer (aur): drrossum <d.r.vanrossum at gmx.de>`
		`+ # Maintainer: Omar Vega Ramos <ovruni@gnu.org.pe>`

		`pkgname=vim-pathogen`
		`pkgver=2.4`

pcr/vislcg3/PKGBUILD

file modified

+1 -1

		`@@ -1,4 +1,4 @@`
		`- # Maintainer (AUR): Kevin Brubeck Unhammer <unhammer@fsfe.org>`
		`+ # Maintainer (aur): Kevin Brubeck Unhammer <unhammer@fsfe.org>`
		`# Contributor: bill-auger <bill-auger@programmer.net>`

pcr/vundle-git/PKGBUILD

file modified

+3 -3

		`@@ -1,6 +1,6 @@`
		`- # Maintainer (AUR): Levente Polyak <anthraxx[at]archlinux[dot]org>`
		`- # Contributor (AUR): Fat Cat <carlos dot manuel250 at gmail dot com>`
		`- # Maintainer: Aurélien DESBRIÈRES <aurelien@hackers.camp>`
		`+ # Maintainer (aur): Levente Polyak <anthraxx[at]archlinux[dot]org>`
		`+ # Contributor: Fat Cat <carlos dot manuel250 at gmail dot com>`
		`+ # Maintainer: Aurélien Desbrières <aurelien@hackers.camp>`

		`pkgname=vundle-git`
		`pkgver=0.10.2.605.fef1c2f`

pcr/vuurmuur/PKGBUILD

file modified

+6 -6

		`@@ -1,9 +1,9 @@`
		`- # Maintainer (AUR): Piotr Rogoża <rogoza dot piotr at gmail dot com>`
		`- # Contributor (AUR): skydrome <skydrome@i2pmail.org>`
		`- # Contributor (AUR): Valere Monseur <valere_monseur@hotmail.com>`
		`- # Contributor (AUR): Phillip Smith <fukawi2@NO-SPAM.gmail.com>`
		`- # Contributor (AUR): (asper, noob`
		`- # Maintainer : Parabola GNU / Linux-libre Aurelien Desbrieres <aurelien@cwb.IO>`
		`+ # Maintainer (aur): Piotr Rogoża <rogoza dot piotr at gmail dot com>`
		`+ # Contributor: skydrome <skydrome@i2pmail.org>`
		`+ # Contributor: Valere Monseur <valere_monseur@hotmail.com>`
		`+ # Contributor: Phillip Smith <fukawi2@NO-SPAM.gmail.com>`
		`+ # Contributor: (asper, noob`
		`+ # Maintainer: Aurélien Desbrières <aurelien@cwb.io>`

		`pkgname=vuurmuur`
		`_pkgname=Vuurmuur`

pcr/wallchange/PKGBUILD

file modified

+3 -3

		`@@ -1,6 +1,6 @@`
		`- # Maintainer (AUR): Stefan Husmann <stefan-husmann@t-online.de>`
		`- # Contributor (AUR): ying <Jinoto Systems>`
		`- # Maintainer : Parabola GNU / Linux-libre Aurelien Desbrieres <aurelien@cwb.io>`
		`+ # Maintainer (aur): Stefan Husmann <stefan-husmann@t-online.de>`
		`+ # Contributor: ying <Jinoto Systems>`
		`+ # Maintainer: Aurélien Desbrières <aurelien@cwb.io>`

		`pkgname=wallchange`
		`pkgver=1.2`

pcr/whysynth/PKGBUILD

file modified

+2 -2

		`@@ -1,5 +1,5 @@`
		`- # Maintainer (AUR): Martin C. Doege <mdoege at compuserve dot com>`
		`- # Contributor (AUR): Sean Bolton <sean at smbolton dot com>`
		`+ # Maintainer (aur): Martin C. Doege <mdoege at compuserve dot com>`
		`+ # Contributor: Sean Bolton <sean at smbolton dot com>`
		`# Maintainer: Omar Vega Ramos <ovruni@gnu.org.pe>`

		`pkgname=whysynth`

pcr/wikipediafs/PKGBUILD

file modified

+1 -1

		`@@ -1,4 +1,4 @@`
		`- # Maintainer (Arch): Antoine Lubineau <antoine@lubignon.info>`
		`+ # Maintainer (arch): Antoine Lubineau <antoine@lubignon.info>`

		`pkgname=wikipediafs`
		`pkgver=0.4`

pcr/wordwarvi/PKGBUILD

file modified

+4 -4

		`@@ -1,7 +1,7 @@`
		`- # Maintainer (AUR): Steffen Weber <-boenki-gmx-de->`
		`- # Contributor (AUR): Anton Bazhenov <anton.bazhenov at gmail>`
		`- # Contributor (AUR): Christopher Rogers <slaxemulator@gmail.com>`
		`- # Contributor (AUR): J. W. Birdsong <jwbirdsong AT gmail DOT com>`
		`+ # Maintainer (aur): Steffen Weber <-boenki-gmx-de->`
		`+ # Contributor: Anton Bazhenov <anton.bazhenov at gmail>`
		`+ # Contributor: Christopher Rogers <slaxemulator@gmail.com>`
		`+ # Contributor: J. W. Birdsong <jwbirdsong AT gmail DOT com>`
		`# Maintainer: Luke R. <g4jc@openmailbox.org> GPG: rsa4096/3EAE8697`

		`pkgname=wordwarvi`

pcr/xboxdrv/PKGBUILD

file modified

+3 -3

		`@@ -1,6 +1,6 @@`
		`- # Maintainer (AUR): Levente Polyak <anthraxx[at]archlinux[dot]org>`
		`- # Contributor (AUR): Jack Mitchell <jack@embed.me.uk>`
		`- # Contributor (AUR): Kevin MacMartin <prurigro at gmail dot com>`
		`+ # Maintainer (aur): Levente Polyak <anthraxx[at]archlinux[dot]org>`
		`+ # Contributor: Jack Mitchell <jack@embed.me.uk>`
		`+ # Contributor: Kevin MacMartin <prurigro at gmail dot com>`

		`# parabola changes and rationale:`
		`# no change.`

pcr/xf86-video-armsoc-git/PKGBUILD

file modified

+2 -2

		`@@ -1,6 +1,6 @@`
		`# ArmSoc (OMAP + Mali) FrameBuffer driver for Xorg from Linaro.`
		`- # Maintainer (Arch ARM): Kevin Mihelich <kevin@archlinuxarm.org>`
		`- # Contributor (Arch ARM): Erik Andersson <erik.h.andersson@gmail.com>`
		`+ # Maintainer (archarm): Kevin Mihelich <kevin@archlinuxarm.org>`
		`+ # Contributor: Erik Andersson <erik.h.andersson@gmail.com>`
		`# Maintainer: Isaac David <isacdaavid@at@isacdaavid@dot@info>`

		`buildarch=4`

pcr/xf86-video-fbturbo-git/PKGBUILD

file modified

+1 -1

		`@@ -1,4 +1,4 @@`
		`- # Maintainer (Arch ARM): smotocel69`
		`+ # Maintainer (archarm): smotocel69`
		`# Contribuitor (Arch ARM): Georges Discry`
		`# Maintainer: Isaac David <isacdaavid@at@isacdaavid@dot@info>`

pcr/xf86-video-omap/PKGBUILD

file modified

+2 -2

		`@@ -1,5 +1,5 @@`
		`- # Maintainer (Arch ARM): Kevin Mihelich <kevin@archlinuxarm.org>`
		`- # Maintainer (Arch ARM): Mike Brown <mbrown@archlinuxarm.org>`
		`+ # Maintainer (archarm): Kevin Mihelich <kevin@archlinuxarm.org>`
		`+ # Maintainer (archarm): Mike Brown <mbrown@archlinuxarm.org>`
		`# Maintainer: Isaac David <isacdaavid@at@isacdaavid@dot@info>`
		`# OMAP FrameBuffer driver for Xorg`

pcr/xf86-video-omapfb/PKGBUILD

file modified

+1 -1

		`@@ -1,4 +1,4 @@`
		`- # Maintainer (Arch ARM): Kevin Mihelich <kevin@archlinuxarm.org>`
		`+ # Maintainer (archarm): Kevin Mihelich <kevin@archlinuxarm.org>`
		`# Maintainer: Isaac David <isacdaavid@at@isacdaavid@dot@info>`
		`# OMAP FrameBuffer driver for Xorg`

pcr/xfce-theme-greybird/PKGBUILD

file modified

+3 -3

		`@@ -1,6 +1,6 @@`
		`- # Maintainer (Arch): M.Reynolds <blackboxnetworkproject@gmail.com>`
		`- # Contributor (Arch): Bjoern Franke <bjo at nord-west.org>`
		`- # Contributor (Arch): flan_suse`
		`+ # Maintainer (arch): M.Reynolds <blackboxnetworkproject@gmail.com>`
		`+ # Contributor: Bjoern Franke <bjo at nord-west.org>`
		`+ # Contributor: flan_suse`
		`# Maintainer: Omar Vega Ramos <ovruni@gnu.org.pe>`

		`pkgname=xfce-theme-greybird`

pcr/xfce-theme-manager/PKGBUILD

file modified

+2 -2

		`@@ -1,5 +1,5 @@`
		`- # Maintainer (AUR): Mario Finelli <mario dot finelli at yahoo dot com>`
		`- # Contributor (AUR): Martin F. Schumann <mfs at mfs dot name>`
		`+ # Maintainer (aur): Mario Finelli <mario dot finelli at yahoo dot com>`
		`+ # Contributor: Martin F. Schumann <mfs at mfs dot name>`

		`# parabola changes and rationale:`
		`# no changes.`

pcr/xfce4-kbdleds-plugin/PKGBUILD

file modified

+3 -3

		`@@ -1,6 +1,6 @@`
		`- # Maintainer (AUR): Raphael Scholer <rscholer@gmx.de>`
		`- # Contributor (AUR): tomberry88 <tomberry@live.it>`
		`- # Contributor (AUR): Gour-Gadadhara Dasa <gour@atmarama.net>`
		`+ # Maintainer (aur): Raphael Scholer <rscholer@gmx.de>`
		`+ # Contributor: tomberry88 <tomberry@live.it>`
		`+ # Contributor: Gour-Gadadhara Dasa <gour@atmarama.net>`
		`pkgname=xfce4-kbdleds-plugin`
		`pkgver=0.0.6`
		`pkgrel=11`

pcr/xml2rfc/PKGBUILD

file modified

+1 -1

		`@@ -1,4 +1,4 @@`
		`- # Maintainer (Arch): milki <milki at rescomp dot berkeley dot edu>`
		`+ # Maintainer (arch): milki <milki at rescomp dot berkeley dot edu>`
		`# Maintainer: André Silva <emulatorman@hyperbola.info>`
		`# Contributor: Luke Shumaker <lukeshu@lukeshu.com>`

pcr/xonotic-data/PKGBUILD

file modified

+2 -2

		`@@ -1,5 +1,5 @@`
		`- # Maintainer (Arch): Sven-Hendrik Haase <svenstaro@gmail.com>`
		`- # Contributor (Arch): Alexander Suhoverhov <cy at ngs dot ru>`
		`+ # Maintainer (arch): Sven-Hendrik Haase <svenstaro@gmail.com>`
		`+ # Contributor: Alexander Suhoverhov <cy at ngs dot ru>`
		`# This package is in Parabola only for architectures that don't have xonotic in`
		`# their feed. Here is the status of xonotic in the various upstream`
		`# GNU/Linux distributions Parabola is based on:`

pcr/xonotic/PKGBUILD

file modified

+3 -3

		`@@ -1,6 +1,6 @@`
		`- # Maintainer (Arch): Sven-Hendrik Haase <svenstaro@gmail.com>`
		`- # Contributor (Arch): Alexander Suhoverhov <cy at ngs dot ru>`
		`- # Contributor (Arch): Jookia <166291@gmail.com>`
		`+ # Maintainer (arch): Sven-Hendrik Haase <svenstaro@gmail.com>`
		`+ # Contributor: Alexander Suhoverhov <cy at ngs dot ru>`
		`+ # Contributor: Jookia <166291@gmail.com>`
		`# This package is in Parabola only for architectures that don't have xonotic in`
		`# their feed. Here is the status of xonotic in the various upstream`
		`# GNU/Linux distributions Parabola is based on:`

pcr/xsp/PKGBUILD

file modified

+2 -2

		`@@ -1,6 +1,6 @@`
		`# $Id: PKGBUILD 308160 2017-10-17 17:36:56Z jelle $`
		`- # Maintainer (AUR): Daniel Isenmann <daniel@archlinux.org>`
		`- # Contributor (AUR): Tobias Kieslich <tobias@justdreams.de>`
		`+ # Maintainer (aur): Daniel Isenmann <daniel@archlinux.org>`
		`+ # Contributor: Tobias Kieslich <tobias@justdreams.de>`
		`# Maintainer: Omar Vega Ramos <ovruni@gnu.org.pe>`

		`# parabola changes and rationale:`

pcr/xsynth-dssi/PKGBUILD

file modified

+2 -2

		`@@ -1,6 +1,6 @@`
		`# $Id$`
		`- # Maintainer (AUR): Sean Bolton musound at jps dot net`
		`- # Contributor (AUR): Thomas Karmann <thomas@karmann-paf.de>`
		`+ # Maintainer (aur): Sean Bolton musound at jps dot net`
		`+ # Contributor: Thomas Karmann <thomas@karmann-paf.de>`
		`# Maintainer: Guest One <theguestone at gmail dot com>`
		`pkgname=xsynth-dssi`
		`pkgver=0.9.4`

pcr/xtables-addons/PKGBUILD

file modified

+3 -3

		`@@ -1,6 +1,6 @@`
		`- # Maintainer (AUR): Shalygin Konstantin <k0ste@k0ste.ru>`
		`- # Contributor (AUR): Shalygin Konstantin <k0ste@k0ste.ru>`
		`- # Maintainer : Aurélien DESBRIÈRES <aurelien@hackers.camp>`
		`+ # Maintainer (aur): Shalygin Konstantin <k0ste@k0ste.ru>`
		`+ # Contributor: Shalygin Konstantin <k0ste@k0ste.ru>`
		`+ # Maintainer: Aurélien Desbrières <aurelien@hackers.camp>`

		`pkgname='xtables-addons'`
		`pkgver='3.2'`

pcr/xteddy/PKGBUILD

file modified

+1 -1

		`@@ -1,4 +1,4 @@`
		`- # Maintainer (AUR): Gaetan Bisson <bisson@archlinux.org>`
		`+ # Maintainer (aur): Gaetan Bisson <bisson@archlinux.org>`
		`# Maintainer: Luke R. <g4jc@openmailbox.org> GPG: rsa4096/3EAE8697`

		`pkgname=xteddy`

pcr/xwinwrap/PKGBUILD

file modified

+3 -3

		`@@ -1,6 +1,6 @@`
		`- # Maintainer (AUR): chrisl echo archlinux@c2h0r1i2s4t5o6p7h8e9r-l3u4n1a.com\|sed 's/[0-9]//g'`
		`- # Maintainer (AUR): Dany Martineau <dany.luc.martineau gmail.com>`
		`- # Contributor (AUR): Stefan Clarke <fm0nk3y@yahoo.co.uk>`
		`+ # Maintainer (aur): chrisl echo archlinux@c2h0r1i2s4t5o6p7h8e9r-l3u4n1a.com\|sed 's/[0-9]//g'`
		`+ # Maintainer (aur): Dany Martineau <dany.luc.martineau gmail.com>`
		`+ # Contributor: Stefan Clarke <fm0nk3y@yahoo.co.uk>`
		`# Maintainer: Luke R. <g4jc@openmailbox.org> GPG: rsa4096/3EAE8697`

		`pkgname=xwinwrap`

pcr/yacy/PKGBUILD

file modified

+3 -3

		`@@ -1,8 +1,8 @@`
		`- # Maintainer (Arch): Nissar Chababy <funilrys at outlook dot com>`
		`+ # Maintainer (arch): Nissar Chababy <funilrys at outlook dot com>`
		`# Ex-Maintainer (Arch): Andreas B. Wagner <AndreasBWagner@pointfree.net>`
		`# Ex-Maintainer (Arch): Timothy Redaelli <timothy.redaelli@gmail.com>`
		`- # Contributor (Arch): Dan Serban`
		`- # Contributor (Arch): Florian Richter <Florian_Richter@gmx.de>`
		`+ # Contributor: Dan Serban`
		`+ # Contributor: Florian Richter <Florian_Richter@gmx.de>`

		`pkgname=yacy`
		`pkgver=1.922`

pcr/yafaray-blender-exporter/PKGBUILD

file modified

+1 -1

		`@@ -1,4 +1,4 @@`
		`- # Maintainer (AUR): Jeremy Johnathan Rodent <narf@x201t>`
		`+ # Maintainer (aur): Jeremy Johnathan Rodent <narf@x201t>`
		`# Contributor: Márcio Silva <coadde@hyperbola.info>`

		`# parabola changes and rationale:`

pcr/yafaray/PKGBUILD

file modified

+2 -2

		`@@ -1,5 +1,5 @@`
		`- # Maintainer (AUR): Jakob Gahde <j5lx@fmail.co.uk>`
		`- # Contributor (AUR): Thomas Ascher <thomas.ascher@gmx.at>`
		`+ # Maintainer (aur): Jakob Gahde <j5lx@fmail.co.uk>`
		`+ # Contributor: Thomas Ascher <thomas.ascher@gmx.at>`
		`# Contributor: Márcio Silva <coadde@hyperbola.info>`

		`# parabola changes and rationale:`

pcr/zeroinstall-injector/PKGBUILD

file modified

+5 -5

		`@@ -1,8 +1,8 @@`
		`- # Maintainer (AUR): Tatsuyuki Ishi <ishitatsuyuki at gmail>`
		`- # Contributor (AUR): Ben Darwin <bcdarwin at gmail>`
		`- # Contributor (AUR): speps <speps at aur dot archlinux dot org>`
		`- # Contributor (AUR): Anton Bazhenov <anton.bazhenov at gmail>`
		`- # Contributor (AUR): Lone_Wolf <lonewolf@xs4all.nl>`
		`+ # Maintainer (aur): Tatsuyuki Ishi <ishitatsuyuki at gmail>`
		`+ # Contributor: Ben Darwin <bcdarwin at gmail>`
		`+ # Contributor: speps <speps at aur dot archlinux dot org>`
		`+ # Contributor: Anton Bazhenov <anton.bazhenov at gmail>`
		`+ # Contributor: Lone_Wolf <lonewolf@xs4all.nl>`

		`# parabola changes and rationale:`
		`# - added missing makedepends: ocamlbuild ocaml-findlib`

pcr/zeronet-git/PKGBUILD

file modified

+2 -2

		`@@ -1,6 +1,6 @@`
		`# Maintainer: Luke R. <g4jc@openmailbox.org> GPG: rsa4096/3EAE8697`
		`- # Maintainer (AUR): redfish <redfish at galactica dot pw>`
		`- # Contributori (AUR): Lothar_m <lothar_m at riseup dot net>`
		`+ # Maintainer (aur): redfish <redfish at galactica dot pw>`
		`+ # Contributor: Lothar_m <lothar_m at riseup dot net>`
		`# Contributor: Freemor <freemor@freemor.ca>`

		`pkgname='zeronet-git'`

pcr/zfec/PKGBUILD

file modified

+2 -2

		`@@ -1,5 +1,5 @@`
		`- # Maintainer (AUR): Nicolas Pouillard <nicolas.pouillard@gmail.com>`
		`- # Contributor (AUR): Peter Simons <simons@cryp.to>`
		`+ # Maintainer (aur): Nicolas Pouillard <nicolas.pouillard@gmail.com>`
		`+ # Contributor: Peter Simons <simons@cryp.to>`
		`pkgname=zfec`
		`pkgver=1.5.3`
		`pkgrel=1`

pcr/zimlib/PKGBUILD

file modified

+2 -2

		`@@ -1,6 +1,6 @@`
		`- # Contributor (Arch): Yaron de Leeuw < me@jarondl.net >`
		`+ # Contributor: Yaron de Leeuw < me@jarondl.net >`
		`# Contributor: André Silva <emulatorman@hyperbola.info>`
		`- # Maintainers: Parabola hackers <dev@lists.parabola.nu>`
		`+ # Maintainer: Parabola Hackers <dev@lists.parabola.nu>`

		`pkgname=zimlib`
		`pkgver=1.4`

pcr/zramswap/PKGBUILD

file modified

+7 -7

		`@@ -1,10 +1,10 @@`
		`- # Contributor (Arch): ifaigios <ifaigios_at_gmail_dot_com>`
		`- # Contributor (Arch): Alyssa Hung <deciare@isisiew.org>`
		`- # Contributor (Arch): Matt Brennan`
		`- # Contributor (Arch): falconindy`
		`- # Contributor (Arch): adee`
		`- # Contributor (Arch): mystilleef`
		`- # Maintainers: Parabola hackers <dev@lists.parabola.nu>`
		`+ # Contributor: ifaigios <ifaigios_at_gmail_dot_com>`
		`+ # Contributor: Alyssa Hung <deciare@isisiew.org>`
		`+ # Contributor: Matt Brennan`
		`+ # Contributor: falconindy`
		`+ # Contributor: adee`
		`+ # Contributor: mystilleef`
		`+ # Maintainer: Parabola Hackers <dev@lists.parabola.nu>`

		`pkgname=zramswap`
		`pkgver=1.1`

pcr/zulucrypt/PKGBUILD

file modified

+2 -2

		`@@ -1,6 +1,6 @@`
		`- # Maintainer (AUR): Salan54 <salan at fremenil dot com>`
		`+ # Maintainer (aur): Salan54 <salan at fremenil dot com>`
		`# Created: 2013-03-17`
		`- # Maintainer (Parabola) : Aurélien DESBRIÈRES <aurelien@hackers.camp>`
		`+ # Maintainer: Aurélien Desbrières <aurelien@hackers.camp>`

		`# parabola changes and rationale:`
		`# - added .install file to update desktop database`

retired/min/PKGBUILD

file modified

+1 -1

		`@@ -1,4 +1,4 @@`
		`- # Maintainer (Arch): Nicola Squartini <tensor5@gmail.com>`
		`+ # Maintainer (arch): Nicola Squartini <tensor5@gmail.com>`
		`# Maintainer: André Silva <emulatorman@hyperbola.info>`

		`pkgname=min`

scripts/package-all-acpi_call-tp_smapi

file added

+29

		`@@ -0,0 +1,29 @@`
		`+ #!/bin/bash`
		`+`
		`+ # TODO: inject the appropriate values of '_basekernel' into the PKGBUILDs,`
		`+ # and commit to VCS`
		`+ # $ _commit_msg='[acpi_call][acpi_call-dkms][acpi_call-lts][tp_smapi][tp_smapi-lts]: rebuild against latest kernels'`
		`+ # $ git commit -m "${_commit_msg}" "${PKGBUILDS[@]}"`
		`+`
		`+`
		`+ readonly CHROOT_NAME_x86_64=x86_64`
		`+ readonly CHROOT_NAME_i686=i686`
		`+ readonly CHROOT_NAME_armv7h=armv7h`
		`+ readonly ABS_ROOT=/var/lib/archbuild/packages/abslibre`
		`+`
		`+`
		`+ for ar in $CHROOT_NAME_x86_64 $CHROOT_NAME_i686 $CHROOT_NAME_armv7h`
		`+ do sudo librechroot $ar update`
		`+ done`
		`+`
		`+ for pkg_dir in $ABS_ROOT/libre/acpi_call{-dkms,,-lts}/ \`
		`+ $ABS_ROOT/libre/tp_smapi{,-lts}/`
		`+ do cd $pkg_dir`
		`+ for ar in $CHROOT_NAME_x86_64 $CHROOT_NAME_i686 $CHROOT_NAME_armv7h`
		`+ do sudo libremakepkg $ar \|\| break`
		`+ done`
		`+ done`
		`+`
		`+ echo DONE`
		`+ ls $ABS_ROOT/libre/acpi_call{-dkms,,-lts}/.pkg.tar. \`
		`+ $ABS_ROOT/libre/tp_smapi{,-lts}/.pkg.tar.`

unmaintained/uboot-am335x_bone/0001-parabola-arm-modifications.patch ~~libre/uboot-am335x_bone/0001-parabola-arm-modifications.patch~~

file renamed

file was moved with no change to the file

unmaintained/uboot-am335x_bone/PKGBUILD ~~libre/uboot-am335x_bone/PKGBUILD~~

file renamed

+1 -1

		`@@ -1,5 +1,5 @@`
		`# U-Boot: Beaglebone and Beaglebone Black`
		`- # Maintainer (ArchArm): Kevin Mihelich <kevin@archlinuxarm.org>`
		`+ # Maintainer (archarm): Kevin Mihelich <kevin@archlinuxarm.org>`
		`# Maintainer: Andreas Grapentin <oaken-source@parabola.nu>`
		`# Contributor: André Silva <emulatorman@hyperbola.info>`

unmaintained/uboot-am335x_bone/boot.txt ~~libre/uboot-am335x_bone/boot.txt~~

file renamed

file was moved with no change to the file

unmaintained/uboot-am335x_bone/mkscr ~~libre/uboot-am335x_bone/mkscr~~

file renamed

file was moved with no change to the file

unmaintained/uboot-am335x_bone/uboot-am335x_bone.install ~~libre/uboot-am335x_bone/uboot-am335x_bone.install~~

file renamed

file was moved with no change to the file

unmaintained/uboot-chiliboard/0001-Add-linux-compiler-gcc5.h-to-fix-builds-with-gcc5.patch ~~libre/uboot-chiliboard/0001-Add-linux-compiler-gcc5.h-to-fix-builds-with-gcc5.patch~~

file renamed

file was moved with no change to the file

unmaintained/uboot-chiliboard/0002-ARM-asm-io.h-use-static-inline.patch ~~libre/uboot-chiliboard/0002-ARM-asm-io.h-use-static-inline.patch~~

file renamed

file was moved with no change to the file

unmaintained/uboot-chiliboard/0003-common-main.c-make-show_boot_progress-__weak.patch ~~libre/uboot-chiliboard/0003-common-main.c-make-show_boot_progress-__weak.patch~~

file renamed

file was moved with no change to the file

unmaintained/uboot-chiliboard/0004-common-board_f-cosmetic-use-__weak-for-leds.patch ~~libre/uboot-chiliboard/0004-common-board_f-cosmetic-use-__weak-for-leds.patch~~

file renamed

file was moved with no change to the file

unmaintained/uboot-chiliboard/0005-chiliboard-support.patch ~~libre/uboot-chiliboard/0005-chiliboard-support.patch~~

file renamed

file was moved with no change to the file

unmaintained/uboot-chiliboard/0006-parabola-arm-modifications.patch ~~libre/uboot-chiliboard/0006-parabola-arm-modifications.patch~~

file renamed

file was moved with no change to the file

unmaintained/uboot-chiliboard/0006-parabola-arm-modifications.patch.new ~~libre/uboot-chiliboard/0006-parabola-arm-modifications.patch.new~~

file renamed

file was moved with no change to the file

unmaintained/uboot-chiliboard/PKGBUILD ~~libre/uboot-chiliboard/PKGBUILD~~

file renamed

file was moved with no change to the file

unmaintained/uboot-chiliboard/uEnv.txt ~~libre/uboot-chiliboard/uEnv.txt~~

file renamed

file was moved with no change to the file

unmaintained/uboot-chiliboard/uboot-chiliboard.install ~~libre/uboot-chiliboard/uboot-chiliboard.install~~

file renamed

file was moved with no change to the file

unmaintained/uboot-cubox/PKGBUILD ~~libre/uboot-cubox/PKGBUILD~~

file renamed

file was moved with no change to the file

unmaintained/uboot-cubox/boot.txt ~~libre/uboot-cubox/boot.txt~~

file renamed

file was moved with no change to the file

unmaintained/uboot-mx6_cubox-i/PKGBUILD ~~libre/uboot-mx6_cubox-i/PKGBUILD~~

file renamed

file was moved with no change to the file

unmaintained/uboot-mx6_cubox-i/arm_board_use_weak.patch ~~libre/uboot-mx6_cubox-i/arm_board_use_weak.patch~~

file renamed

file was moved with no change to the file

unmaintained/uboot-mx6_cubox-i/cmd_test_implement_-e_for_file_existance.patch ~~libre/uboot-mx6_cubox-i/cmd_test_implement_-e_for_file_existance.patch~~

file renamed

file was moved with no change to the file

unmaintained/uboot-mx6_cubox-i/common-main.c-make-show_boot_progress-__weak.patch ~~libre/uboot-mx6_cubox-i/common-main.c-make-show_boot_progress-__weak.patch~~

file renamed

file was moved with no change to the file

unmaintained/uboot-mx6_cubox-i/kernel-add-support-for-gcc-5.patch ~~libre/uboot-mx6_cubox-i/kernel-add-support-for-gcc-5.patch~~

file renamed

file was moved with no change to the file

unmaintained/uboot-mx6_cubox-i/leds_missing_include.patch ~~libre/uboot-mx6_cubox-i/leds_missing_include.patch~~

file renamed

file was moved with no change to the file

unmaintained/uboot-mx6_cubox-i/no-unalligned-access.patch ~~libre/uboot-mx6_cubox-i/no-unalligned-access.patch~~

file renamed

file was moved with no change to the file

unmaintained/uboot-mx6_cubox-i/parabola-modifications.patch ~~libre/uboot-mx6_cubox-i/parabola-modifications.patch~~

file renamed

file was moved with no change to the file

unmaintained/uboot-mx6_cubox-i/remove_unnecessary_inits.patch ~~libre/uboot-mx6_cubox-i/remove_unnecessary_inits.patch~~

file renamed

file was moved with no change to the file

unmaintained/uboot-mx6_cubox-i/u-boot-002-gcc5-use_gcc_inline_version_instead_c99.patch ~~libre/uboot-mx6_cubox-i/u-boot-002-gcc5-use_gcc_inline_version_instead_c99.patch~~

file renamed

file was moved with no change to the file

unmaintained/uboot-mx6_cubox-i/uboot-mx6_cubox-i.install ~~libre/uboot-mx6_cubox-i/uboot-mx6_cubox-i.install~~

file renamed

file was moved with no change to the file

unmaintained/uboot-nitrogen6q/0001-parabola-arm-modifications.patch ~~libre/uboot-nitrogen6q/0001-parabola-arm-modifications.patch~~

file renamed

file was moved with no change to the file

unmaintained/uboot-nitrogen6q/0002-kernel-add-support-for-gcc-5.patch ~~libre/uboot-nitrogen6q/0002-kernel-add-support-for-gcc-5.patch~~

file renamed

file was moved with no change to the file

unmaintained/uboot-nitrogen6q/0003-ARM-asm-io.h-use-static-inline.patch ~~libre/uboot-nitrogen6q/0003-ARM-asm-io.h-use-static-inline.patch~~

file renamed

file was moved with no change to the file

unmaintained/uboot-nitrogen6q/0004-common-main.c-make-show_boot_progress-__weak.patch ~~libre/uboot-nitrogen6q/0004-common-main.c-make-show_boot_progress-__weak.patch~~

file renamed

file was moved with no change to the file

unmaintained/uboot-nitrogen6q/0005-common-board-use-__weak.patch ~~libre/uboot-nitrogen6q/0005-common-board-use-__weak.patch~~

file renamed

file was moved with no change to the file

unmaintained/uboot-nitrogen6q/0006-common-board_f-cosmetic-use-__weak-for-leds.patch ~~libre/uboot-nitrogen6q/0006-common-board_f-cosmetic-use-__weak-for-leds.patch~~

file renamed

file was moved with no change to the file

unmaintained/uboot-nitrogen6q/6x_bootscript ~~libre/uboot-nitrogen6q/6x_bootscript~~

file renamed

file was moved with no change to the file

unmaintained/uboot-nitrogen6q/PKGBUILD ~~libre/uboot-nitrogen6q/PKGBUILD~~

file renamed

file was moved with no change to the file

unmaintained/uboot-omap3_beagle/0001-parabola-arm-modifications.patch ~~libre/uboot-omap3_beagle/0001-parabola-arm-modifications.patch~~

file renamed

file was moved with no change to the file

unmaintained/uboot-omap3_beagle/PKGBUILD ~~libre/uboot-omap3_beagle/PKGBUILD~~

file renamed

file was moved with no change to the file

unmaintained/uboot-omap3_beagle/uEnv.txt

file added

empty or binary file added

unmaintained/uboot-omap4_panda/0001-parabola-arm-modifications.patch ~~libre/uboot-omap4_panda/0001-parabola-arm-modifications.patch~~

file renamed

file was moved with no change to the file

unmaintained/uboot-omap4_panda/PKGBUILD ~~libre/uboot-omap4_panda/PKGBUILD~~

file renamed

file was moved with no change to the file

unmaintained/uboot-omap4_panda/uEnv.txt ~~libre/uboot-omap4_panda/uEnv.txt~~

file renamed

file was moved with no change to the file

unmaintained/uboot-omap4_panda/uboot-omap4_panda.install ~~libre/uboot-omap4_panda/uboot-omap4_panda.install~~

file renamed

file was moved with no change to the file

unmaintained/uboot-trimslice/0001-kernel-add-support-for-gcc-5.patch ~~libre/uboot-trimslice/0001-kernel-add-support-for-gcc-5.patch~~

file renamed

file was moved with no change to the file

unmaintained/uboot-trimslice/PKGBUILD ~~libre/uboot-trimslice/PKGBUILD~~

file renamed

file was moved with no change to the file

unmaintained/uboot-trimslice/boot.txt ~~libre/uboot-trimslice/boot.txt~~

file renamed

file was moved with no change to the file

unmaintained/uboot-udoo/0001-parabola-arm-modifications.patch ~~libre/uboot-udoo/0001-parabola-arm-modifications.patch~~

file renamed

file was moved with no change to the file

unmaintained/uboot-udoo/0002-kernel-add-support-for-gcc-5.patch ~~libre/uboot-udoo/0002-kernel-add-support-for-gcc-5.patch~~

file renamed

file was moved with no change to the file

unmaintained/uboot-udoo/PKGBUILD ~~libre/uboot-udoo/PKGBUILD~~

file renamed

file was moved with no change to the file

unmaintained/uboot-udoo/uboot-udoo.install ~~libre/uboot-udoo/uboot-udoo.install~~

file renamed

file was moved with no change to the file

unmaintained/uboot-usbarmory/0001-parabola-arm-modifications.patch ~~libre/uboot-usbarmory/0001-parabola-arm-modifications.patch~~

file renamed

file was moved with no change to the file

unmaintained/uboot-usbarmory/PKGBUILD ~~libre/uboot-usbarmory/PKGBUILD~~

file renamed

file was moved with no change to the file

unmaintained/uboot-usbarmory/boot.txt ~~libre/uboot-usbarmory/boot.txt~~

file renamed

file was moved with no change to the file

unmaintained/uboot-usbarmory/mkscr ~~libre/uboot-usbarmory/mkscr~~

file renamed

file was moved with no change to the file

unmaintained/uboot-usbarmory/uboot-usbarmory.install ~~libre/uboot-usbarmory/uboot-usbarmory.install~~

file renamed

file was moved with no change to the file

unmaintained/uboot-wandboard/0001-parabola-arm-modifications.patch ~~libre/uboot-wandboard/0001-parabola-arm-modifications.patch~~

file renamed

file was moved with no change to the file

unmaintained/uboot-wandboard/PKGBUILD ~~libre/uboot-wandboard/PKGBUILD~~

file renamed

file was moved with no change to the file

unmaintained/uboot-wandboard/uboot-wandboard.install ~~libre/uboot-wandboard/uboot-wandboard.install~~

file renamed

file was moved with no change to the file

~lukeshu/bash/PKGBUILD

file modified

+1 -1

		`@@ -1,5 +1,5 @@`
		`# $Id$`
		`- # Maintainer: Bartłomiej Piotrowski <bpiotrowski@archlinux.org>`
		`+ # Maintainer: Bartłomiej Piotrowski <bpiotrowski@archlinux.org>`
		`# Contributor: Allan McRae <allan@archlinux.org>`
		`# Contributor: Aaron Griffin <aaron@archlinux.org>`

~lukeshu/holo/PKGBUILD

file modified

+1 -1

		`@@ -1,4 +1,4 @@`
		`- # Maintainer (AUR): Stefan Majewsky <majewsky@gmx.net>`
		`+ # Maintainer (aur): Stefan Majewsky <majewsky@gmx.net>`
		`# Maintainer: Luke Shumaker <lukeshu@parabola.nu>`

		`pkgname='holo'`

~lukeshu/lxpanel-gtk3-hidpi/PKGBUILD

file modified

+4 -4

		`@@ -1,8 +1,8 @@`
		`# Maintainer: Luke Shumaker <lukeshu@parabola.nu>`
		`- # Maintainer (Arch:lxpanel-gtk3): Balló György <ballogyor+arch at gmail dot com>`
		`- # Contributor (Arch:lxpanel-gtk3): Bartłomiej Piotrowski <bpiotrowski@archlinux.org>`
		`- # Contributor (Arch:lxpanel-gtk3): Angel Velasquez <angvp@archlinux.org>`
		`- # Contributor (Arch:lxpanel-gtk3): Juergen Hoetzel <juergen@archlinux.org>`
		`+ # Maintainer (arch:lxpanel-gtk3): Balló György <ballogyor+arch at gmail dot com>`
		`+ # Contributor: Bartłomiej Piotrowski <bpiotrowski@archlinux.org>`
		`+ # Contributor: Angel Velasquez <angvp@archlinux.org>`
		`+ # Contributor: Juergen Hoetzel <juergen@archlinux.org>`

		`pkgname=lxpanel-gtk3`
		`pkgname+='-hidpi'`

~megver83/gcc/PKGBUILD

file modified

+1 -1

		`@@ -1,5 +1,5 @@`
		`# $Id$`
		`- # Maintainer: Bartłomiej Piotrowski <bpiotrowski@archlinux.org>`
		`+ # Maintainer: Bartłomiej Piotrowski <bpiotrowski@archlinux.org>`
		`# Contributor: Allan McRae <allan@archlinux.org>`

		`# toolchain build order: linux-api-headers->glibc->binutils->gcc->binutils->glibc`

~smv/sword-svn/PKGBUILD

file modified

+1 -1

		`@@ -1,4 +1,4 @@`
		`- # Maintainer (Arch): Stefan Husmann <stefan-husmann@t-online.de>`
		`+ # Maintainer (arch): Stefan Husmann <stefan-husmann@t-online.de>`
		`# Maintainer: Sorin-Mihai Vârgolici <smv@ceata.org>`
		`pkgname=sword-svn`
		`pkgver=2904`

~smv/xiphos-svn/PKGBUILD

file modified

+1 -1

		`@@ -1,4 +1,4 @@`
		`- # Contributor (Arch): Stefan Husmann <stefan-husmann@t-online.de>`
		`+ # Contributor: Stefan Husmann <stefan-husmann@t-online.de>`
		`# Maintainer: Sorin-Mihai Vârgolici <smv@ceata.org>`
		`pkgname=xiphos-svn`
		`pkgver=4482`

grizzlyuser commented a year ago

As usual, only the most recent commit is relevant.

Built for x86_64 in fresh clean librechroot. Had to modify /usr/lib/libretools/chroot/mkarchroot to remove deprecated option 'd' dropped by pacstrap, so that it's now pacstrap -GMc

Didn't try to build on i686 and armv7h, also didn't check if there were any updates from their upstreams, sorry.

191 new commits added

[iceweasel]: wip i686
libre/iceweasel: update to 107.0.1, sync with upstream, cleanup
[iceweasel]: armv7h
[gmid]: upgrade to v1.8.5
[unifont]: Update Unifont to 15.0.01
[iceweasel]: upgrade to v107.0
[iceweasel]: WIP
[iceweasel]: upgrade to v106.0.3
[qutebrowser]: housekeeping
[icecat][iceweasel]: housekeeping
[iceweasel]: WIP - armv7h
[iceweasel]: WIP - i686
[iceweasel]: WIP
systemd-252.1-1.parabola1: updating version
pcr: Update obfs4proxy to 0.0.14 by syncing with Aur
libre: systemd: rebuild to link against OpenSSL 3.x
libre: opentest4j: Add missing javac depedency
libre: Add opentest4j
libre: Move uboot-* to unmaintained
libre: linux-libre-vanilla: update to 6.0.7
pacman-6.0.2-5.parabola3: updating version
[pacman]: rebuild against latest openssl
[parabola-keyring]: manual rebuild
addpkg: pcr/postfix-policyd-spf-perl 2.011-1
[qutebrowser]: pin to asciidoc version
[your-freedom]: upgrade to v20220719
[asciidoc]: add pip deprecation warning
[asciidoc]: upgrade to v10.2.0
[qt5-styleplugins]: rebuild against latest qt5-base
[qutebroser]: upgrade to v2.5.2
[blender]: upgrade to v3.3.1
[gajim-plugin-omemo]: upgrade to v2.8.17
[iceweasel]: upgrade to v106.0.1
[icecat][iceweasel]: housekeeping
[iceweasel]: merge arch32 changes for v106
[icu-compat]: housekeeping
[icu-compat]: rotate to v71
[parabola-keyring]: upgrade to v20221019
[kio]: upgrade to v5.99.0
[prboom-plus]: upgrade to v2.6.2
[blender]: rebuild against latest 'openshadinglanguage'
[compiz]: tweak for arm
[ruby]: tweak for arm
[evolution-data-server]: derp, make it compile
updpkg: libre/xtensa-elf-gcc 12.2.0-1
updpkg: libre/arm-linux-gnueabi-gcc 12.2.0-1
[iceweasel]: tweak for armv7h
[iceweasel]: tweak for armv7h
[evolution-data-server]: upgrade to v3.44.4
updpkg: libre/xtensa-elf-binutils 2.39-1
updpkg: libre/arm-linux-gnueabi-binutils 2.39-1
updpkg: libre/sh-elf-binutils 2.39-1
[ruby]: upgrade to v3.0.4
[blender]: upgrade to v3.3.0
housekeeping - minimize diff between icecat and iceweasel
[icecat][iceweasel]: fix `libremakepkg -R` (re-package)
[icu-compat][icu-compat-68][icu-compat-69]: upgrade v70 - add v{68,69}
updpkg: libre/linux-libre-lts 5.15.72-1
[iceweasel]: upgrade to v105.0.2
[bombadillo]: add package
housekeeping - minimize diff between icecat and iceweasel
[icecat]: tweak for armv7h
[icecat]: tweak for i686
[iceweasel]: tweak for armv7h
[gentoo-functions]: upgrade to v0.17
[i2pd-openrc]: add package
[compiz]: upgrade to v0.9.14.2
[kio]: upgrade to v5.98.0
normalize 'Contributor:' entries
normalize upstream 'Maintainer:' identifiers
normalize 'Contributor:' entries
normalize upstream 'Maintainer:' identifiers
delete unused recipes
normalize upstream 'Maintainer:' identifiers
normalize Aurélien's attributions
normalize upstream 'Maintainer:' identifiers
normalize 'Maintainers:->Maintainer: Parabola Hackers' across all PKGBUILDs
[your-privacy]: disable NetworkManager connectivity check
[your-privacy]: add APLM hook to disable archlinux-keyring auto-refresh
[your-initfreedom]: rename to 'your-init-freedom'
normalize 'your-*' PKGBUILDs and install hook messages
housekeeping
housekeeping - silence noisy PKGBUILDs when sourced
libre: linux-libre-vanilla: update to 5.19.12
[mariadb-openrc]: add package
[cups-filters]: upgrade to v1.28.16
updpkg: libre/hplip 1:3.22.6-1.par1
remove uneeded [libre] replacements and unused PKGBUILDs
[icecat]: upgrade to v102.2.0
[iceweasel]: tweak for i686 (still FTBS)
[iceweasel]: upgrade to v105.0
[rz-cutter]: upgrade to v2.1.2
[kinfocenter]: add blacklist replacement
[freecad]: add blacklist replacement
[fonts-meta]: add bdf-unifont hex-unifont otf-unifont pcf-unifont psf-unifont ttf-unifont
[unifont]: add package
[COPYRIGHTS]: re-word, specify upstream designations and hackers IDs
[COPYRIGHTS]: add recent confirmations
[qt5-styleplugins]: tweak for arm
[qt5-styleplugins]: rebuild against latest qt5-base
[qutebrowser]: rebuild against latest qt5-base
housekeeping - silence noisy PKGBUILDs when sourced
[quaternion]: add package
[quassel]: upgrade to v0.14.0-2
[quassel]: upgrade to v0.14.0 (FTBS)
[acpi_call][acpi_call-dkms][acpi_call-lts][tp_smapi][tp_smapi-lts]: rebuild against latest kernels
add 'package-all-acpi_call-tp_smapi' helper script
[COPYRIGHTS]: add recent confirmations
[pacman2pacman]: add CC0 license SPDX
[iceweasel]: housekeeping
[iceweasel]: upgrade to v104.0.1
[iceweasel]: fix 'sync' bug
[iceweasel]: tweak for i686
libre/iceweasel: 104.0-1.parabola1
drop qtqr, now in [community]
libre: libretools: add in forgetten pkgrel bump
pcr: prosody-modules: fix unknown revision '4959:0989dea9b356'
libretools: librefetch: fix "does not contain a valid package suffix"
pcr: prosody-modules: Explain what is removed
pcr: Add prosody-modules
pcr: fcode-utils: add armv7h support
Add fcode-utils
libreboot-utils: Add ich9utils
[xscreensaver]: upgrade to v6.04
[retroarch]: upgrade to v1.10.3
[icecat]: tweak for armv7h
[icecat]: tweak for 1686
[icecat]: housekeeping
[rtl8812au]: remove package
[parabola-base]: add icu-compat
[iceweasel][networkmanager][systemd]: housekeeping
[noisy]: add missing shebang
[noisy-git]: add package
[pacman]: tweak for armv7h
[pacman]: neutralize tests requiring network access
[pacman]: add keyring updatedb patch
[pacman]: bugfix checksums
[parabola-keyring]: rebuild
[parabola-keyring][your-freedom]: housekeeping
[parabola-hackers]: upgrade to v20220802
linux-libre-pck: disable broken CONFIG_TCP_CONG_BBR on armv7h
restore mksource()
[gmid]: upgrade to v1.8.4
[libreboot-utils]: upgrade to v4.15.libreboot20220710
libre/iceweasel: 103.0-1.parabola1
[iceweasel]: upgrade to v102.0.1
updpkg: libre/linux-libre-pck 5.18.14.pck1-1
[pacman]: remove keyring update service files
[gophernicus]: move to [pcr]
[rtl8812au]: add package v5.6.4.2.20220606
pcr: remove lcov
updpkg: libre/linux-libre-hardened 5.18.12.hardened1-1
updpkg: libre/linux-libre-pae 5.18.14-1
libre: epiphany: armv7h: build with libportal-gtk3
libre: epiphany: unbreak armv7h and i686 builds
pcr: libreboot-utils: Add intelmetool
libre: epiphany: update to 42.3
pcr: gajim-plugin-omemo: update to 2.8.15
updpkg: libre/linux-libre 5.18.14-1
updpkg: nonsystemd/your-initfreedom 20220719-1
updpkg: nonsystemd/elogind 246.10-7
deprecate notsystemd
addpkg: nonsystemd/elogind-openrc 20210704-1
drop openrc-security
Update openrc init scripts urls and add their depends as runtime dependencies
addpkg: nonsystemd/nftables-openrc 20210505-2
addpkg: nonsystemd/iptables-openrc 20210505-2
addpkg: nonsystemd/firewalld-openrc 20210505-1
addpkg: nonsystemd/apparmor-openrc 20210506-1
updpkg: nonsystemd/networkmanager 1.38.2-2.nonsystemd1
updpkg: nonsystemd/dbus 1.14.0-1.nonsystemd1
addpkg: nonsystemd/networkmanager-openrc 20210505-6
addpkg: nonsystemd/dbus-openrc 20210418-2
libre: linux-libre-64: Add rationale for the package
updpkg: nonsystemd/polkit 121-1.nonsystemd1
updpkg: libre/parabolaiso 65-1, delete openrc-desktop
addpkg: nonsystemd/xdm-openrc 20220104-1
addpkg: nonsystemd/wpa_supplicant-openrc 20210505-1
addpkg: nonsystemd/tlp-openrc 20210505-1
addpkg: nonsystemd/sddm-openrc 20220104-1
addpkg: nonsystemd/lxdm-openrc 20220104-1
addpkg: nonsystemd/lightdm-openrc 20220104-1
addpkg: nonsystemd/gpm-openrc 20210505-2
addpkg: nonsystemd/gdm-openrc 20220104-1
addpkg: nonsystemd/docker-openrc 20210505-1
addpkg: nonsystemd/chrony-openrc 20210506-2
addpkg: nonsystemd/bluez-openrc 20210506-1
addpkg: nonsystemd/avahi-openrc 20210505-2
addpkg: nonsystemd/alsa-utils-openrc 20210505-2
addpkg: nonsystemd/acpid-openrc 20210506-1
[parabola-keyring]: upgrade to v20220714

a year ago

191 new commits added

[iceweasel]: i686
libre/iceweasel: update to 107.0.1, sync with upstream, cleanup
[iceweasel]: armv7h
[gmid]: upgrade to v1.8.5
[unifont]: Update Unifont to 15.0.01
[iceweasel]: upgrade to v107.0
[iceweasel]: WIP
[iceweasel]: upgrade to v106.0.3
[qutebrowser]: housekeeping
[icecat][iceweasel]: housekeeping
[iceweasel]: WIP - armv7h
[iceweasel]: WIP - i686
[iceweasel]: WIP
systemd-252.1-1.parabola1: updating version
pcr: Update obfs4proxy to 0.0.14 by syncing with Aur
libre: systemd: rebuild to link against OpenSSL 3.x
libre: opentest4j: Add missing javac depedency
libre: Add opentest4j
libre: Move uboot-* to unmaintained
libre: linux-libre-vanilla: update to 6.0.7
pacman-6.0.2-5.parabola3: updating version
[pacman]: rebuild against latest openssl
[parabola-keyring]: manual rebuild
addpkg: pcr/postfix-policyd-spf-perl 2.011-1
[qutebrowser]: pin to asciidoc version
[your-freedom]: upgrade to v20220719
[asciidoc]: add pip deprecation warning
[asciidoc]: upgrade to v10.2.0
[qt5-styleplugins]: rebuild against latest qt5-base
[qutebroser]: upgrade to v2.5.2
[blender]: upgrade to v3.3.1
[gajim-plugin-omemo]: upgrade to v2.8.17
[iceweasel]: upgrade to v106.0.1
[icecat][iceweasel]: housekeeping
[iceweasel]: merge arch32 changes for v106
[icu-compat]: housekeeping
[icu-compat]: rotate to v71
[parabola-keyring]: upgrade to v20221019
[kio]: upgrade to v5.99.0
[prboom-plus]: upgrade to v2.6.2
[blender]: rebuild against latest 'openshadinglanguage'
[compiz]: tweak for arm
[ruby]: tweak for arm
[evolution-data-server]: derp, make it compile
updpkg: libre/xtensa-elf-gcc 12.2.0-1
updpkg: libre/arm-linux-gnueabi-gcc 12.2.0-1
[iceweasel]: tweak for armv7h
[iceweasel]: tweak for armv7h
[evolution-data-server]: upgrade to v3.44.4
updpkg: libre/xtensa-elf-binutils 2.39-1
updpkg: libre/arm-linux-gnueabi-binutils 2.39-1
updpkg: libre/sh-elf-binutils 2.39-1
[ruby]: upgrade to v3.0.4
[blender]: upgrade to v3.3.0
housekeeping - minimize diff between icecat and iceweasel
[icecat][iceweasel]: fix `libremakepkg -R` (re-package)
[icu-compat][icu-compat-68][icu-compat-69]: upgrade v70 - add v{68,69}
updpkg: libre/linux-libre-lts 5.15.72-1
[iceweasel]: upgrade to v105.0.2
[bombadillo]: add package
housekeeping - minimize diff between icecat and iceweasel
[icecat]: tweak for armv7h
[icecat]: tweak for i686
[iceweasel]: tweak for armv7h
[gentoo-functions]: upgrade to v0.17
[i2pd-openrc]: add package
[compiz]: upgrade to v0.9.14.2
[kio]: upgrade to v5.98.0
normalize 'Contributor:' entries
normalize upstream 'Maintainer:' identifiers
normalize 'Contributor:' entries
normalize upstream 'Maintainer:' identifiers
delete unused recipes
normalize upstream 'Maintainer:' identifiers
normalize Aurélien's attributions
normalize upstream 'Maintainer:' identifiers
normalize 'Maintainers:->Maintainer: Parabola Hackers' across all PKGBUILDs
[your-privacy]: disable NetworkManager connectivity check
[your-privacy]: add APLM hook to disable archlinux-keyring auto-refresh
[your-initfreedom]: rename to 'your-init-freedom'
normalize 'your-*' PKGBUILDs and install hook messages
housekeeping
housekeeping - silence noisy PKGBUILDs when sourced
libre: linux-libre-vanilla: update to 5.19.12
[mariadb-openrc]: add package
[cups-filters]: upgrade to v1.28.16
updpkg: libre/hplip 1:3.22.6-1.par1
remove uneeded [libre] replacements and unused PKGBUILDs
[icecat]: upgrade to v102.2.0
[iceweasel]: tweak for i686 (still FTBS)
[iceweasel]: upgrade to v105.0
[rz-cutter]: upgrade to v2.1.2
[kinfocenter]: add blacklist replacement
[freecad]: add blacklist replacement
[fonts-meta]: add bdf-unifont hex-unifont otf-unifont pcf-unifont psf-unifont ttf-unifont
[unifont]: add package
[COPYRIGHTS]: re-word, specify upstream designations and hackers IDs
[COPYRIGHTS]: add recent confirmations
[qt5-styleplugins]: tweak for arm
[qt5-styleplugins]: rebuild against latest qt5-base
[qutebrowser]: rebuild against latest qt5-base
housekeeping - silence noisy PKGBUILDs when sourced
[quaternion]: add package
[quassel]: upgrade to v0.14.0-2
[quassel]: upgrade to v0.14.0 (FTBS)
[acpi_call][acpi_call-dkms][acpi_call-lts][tp_smapi][tp_smapi-lts]: rebuild against latest kernels
add 'package-all-acpi_call-tp_smapi' helper script
[COPYRIGHTS]: add recent confirmations
[pacman2pacman]: add CC0 license SPDX
[iceweasel]: housekeeping
[iceweasel]: upgrade to v104.0.1
[iceweasel]: fix 'sync' bug
[iceweasel]: tweak for i686
libre/iceweasel: 104.0-1.parabola1
drop qtqr, now in [community]
libre: libretools: add in forgetten pkgrel bump
pcr: prosody-modules: fix unknown revision '4959:0989dea9b356'
libretools: librefetch: fix "does not contain a valid package suffix"
pcr: prosody-modules: Explain what is removed
pcr: Add prosody-modules
pcr: fcode-utils: add armv7h support
Add fcode-utils
libreboot-utils: Add ich9utils
[xscreensaver]: upgrade to v6.04
[retroarch]: upgrade to v1.10.3
[icecat]: tweak for armv7h
[icecat]: tweak for 1686
[icecat]: housekeeping
[rtl8812au]: remove package
[parabola-base]: add icu-compat
[iceweasel][networkmanager][systemd]: housekeeping
[noisy]: add missing shebang
[noisy-git]: add package
[pacman]: tweak for armv7h
[pacman]: neutralize tests requiring network access
[pacman]: add keyring updatedb patch
[pacman]: bugfix checksums
[parabola-keyring]: rebuild
[parabola-keyring][your-freedom]: housekeeping
[parabola-hackers]: upgrade to v20220802
linux-libre-pck: disable broken CONFIG_TCP_CONG_BBR on armv7h
restore mksource()
[gmid]: upgrade to v1.8.4
[libreboot-utils]: upgrade to v4.15.libreboot20220710
libre/iceweasel: 103.0-1.parabola1
[iceweasel]: upgrade to v102.0.1
updpkg: libre/linux-libre-pck 5.18.14.pck1-1
[pacman]: remove keyring update service files
[gophernicus]: move to [pcr]
[rtl8812au]: add package v5.6.4.2.20220606
pcr: remove lcov
updpkg: libre/linux-libre-hardened 5.18.12.hardened1-1
updpkg: libre/linux-libre-pae 5.18.14-1
libre: epiphany: armv7h: build with libportal-gtk3
libre: epiphany: unbreak armv7h and i686 builds
pcr: libreboot-utils: Add intelmetool
libre: epiphany: update to 42.3
pcr: gajim-plugin-omemo: update to 2.8.15
updpkg: libre/linux-libre 5.18.14-1
updpkg: nonsystemd/your-initfreedom 20220719-1
updpkg: nonsystemd/elogind 246.10-7
deprecate notsystemd
addpkg: nonsystemd/elogind-openrc 20210704-1
drop openrc-security
Update openrc init scripts urls and add their depends as runtime dependencies
addpkg: nonsystemd/nftables-openrc 20210505-2
addpkg: nonsystemd/iptables-openrc 20210505-2
addpkg: nonsystemd/firewalld-openrc 20210505-1
addpkg: nonsystemd/apparmor-openrc 20210506-1
updpkg: nonsystemd/networkmanager 1.38.2-2.nonsystemd1
updpkg: nonsystemd/dbus 1.14.0-1.nonsystemd1
addpkg: nonsystemd/networkmanager-openrc 20210505-6
addpkg: nonsystemd/dbus-openrc 20210418-2
libre: linux-libre-64: Add rationale for the package
updpkg: nonsystemd/polkit 121-1.nonsystemd1
updpkg: libre/parabolaiso 65-1, delete openrc-desktop
addpkg: nonsystemd/xdm-openrc 20220104-1
addpkg: nonsystemd/wpa_supplicant-openrc 20210505-1
addpkg: nonsystemd/tlp-openrc 20210505-1
addpkg: nonsystemd/sddm-openrc 20220104-1
addpkg: nonsystemd/lxdm-openrc 20220104-1
addpkg: nonsystemd/lightdm-openrc 20220104-1
addpkg: nonsystemd/gpm-openrc 20210505-2
addpkg: nonsystemd/gdm-openrc 20220104-1
addpkg: nonsystemd/docker-openrc 20210505-1
addpkg: nonsystemd/chrony-openrc 20210506-2
addpkg: nonsystemd/bluez-openrc 20210506-1
addpkg: nonsystemd/avahi-openrc 20210505-2
addpkg: nonsystemd/alsa-utils-openrc 20210505-2
addpkg: nonsystemd/acpid-openrc 20210506-1
[parabola-keyring]: upgrade to v20220714

a year ago

191 new commits added

[iceweasel]: i686
libre/iceweasel: update to 107.0.1, sync with upstream, cleanup
[iceweasel]: armv7h
[gmid]: upgrade to v1.8.5
[unifont]: Update Unifont to 15.0.01
[iceweasel]: upgrade to v107.0
[iceweasel]: WIP
[iceweasel]: upgrade to v106.0.3
[qutebrowser]: housekeeping
[icecat][iceweasel]: housekeeping
[iceweasel]: WIP - armv7h
[iceweasel]: WIP - i686
[iceweasel]: WIP
systemd-252.1-1.parabola1: updating version
pcr: Update obfs4proxy to 0.0.14 by syncing with Aur
libre: systemd: rebuild to link against OpenSSL 3.x
libre: opentest4j: Add missing javac depedency
libre: Add opentest4j
libre: Move uboot-* to unmaintained
libre: linux-libre-vanilla: update to 6.0.7
pacman-6.0.2-5.parabola3: updating version
[pacman]: rebuild against latest openssl
[parabola-keyring]: manual rebuild
addpkg: pcr/postfix-policyd-spf-perl 2.011-1
[qutebrowser]: pin to asciidoc version
[your-freedom]: upgrade to v20220719
[asciidoc]: add pip deprecation warning
[asciidoc]: upgrade to v10.2.0
[qt5-styleplugins]: rebuild against latest qt5-base
[qutebroser]: upgrade to v2.5.2
[blender]: upgrade to v3.3.1
[gajim-plugin-omemo]: upgrade to v2.8.17
[iceweasel]: upgrade to v106.0.1
[icecat][iceweasel]: housekeeping
[iceweasel]: merge arch32 changes for v106
[icu-compat]: housekeeping
[icu-compat]: rotate to v71
[parabola-keyring]: upgrade to v20221019
[kio]: upgrade to v5.99.0
[prboom-plus]: upgrade to v2.6.2
[blender]: rebuild against latest 'openshadinglanguage'
[compiz]: tweak for arm
[ruby]: tweak for arm
[evolution-data-server]: derp, make it compile
updpkg: libre/xtensa-elf-gcc 12.2.0-1
updpkg: libre/arm-linux-gnueabi-gcc 12.2.0-1
[iceweasel]: tweak for armv7h
[iceweasel]: tweak for armv7h
[evolution-data-server]: upgrade to v3.44.4
updpkg: libre/xtensa-elf-binutils 2.39-1
updpkg: libre/arm-linux-gnueabi-binutils 2.39-1
updpkg: libre/sh-elf-binutils 2.39-1
[ruby]: upgrade to v3.0.4
[blender]: upgrade to v3.3.0
housekeeping - minimize diff between icecat and iceweasel
[icecat][iceweasel]: fix `libremakepkg -R` (re-package)
[icu-compat][icu-compat-68][icu-compat-69]: upgrade v70 - add v{68,69}
updpkg: libre/linux-libre-lts 5.15.72-1
[iceweasel]: upgrade to v105.0.2
[bombadillo]: add package
housekeeping - minimize diff between icecat and iceweasel
[icecat]: tweak for armv7h
[icecat]: tweak for i686
[iceweasel]: tweak for armv7h
[gentoo-functions]: upgrade to v0.17
[i2pd-openrc]: add package
[compiz]: upgrade to v0.9.14.2
[kio]: upgrade to v5.98.0
normalize 'Contributor:' entries
normalize upstream 'Maintainer:' identifiers
normalize 'Contributor:' entries
normalize upstream 'Maintainer:' identifiers
delete unused recipes
normalize upstream 'Maintainer:' identifiers
normalize Aurélien's attributions
normalize upstream 'Maintainer:' identifiers
normalize 'Maintainers:->Maintainer: Parabola Hackers' across all PKGBUILDs
[your-privacy]: disable NetworkManager connectivity check
[your-privacy]: add APLM hook to disable archlinux-keyring auto-refresh
[your-initfreedom]: rename to 'your-init-freedom'
normalize 'your-*' PKGBUILDs and install hook messages
housekeeping
housekeeping - silence noisy PKGBUILDs when sourced
libre: linux-libre-vanilla: update to 5.19.12
[mariadb-openrc]: add package
[cups-filters]: upgrade to v1.28.16
updpkg: libre/hplip 1:3.22.6-1.par1
remove uneeded [libre] replacements and unused PKGBUILDs
[icecat]: upgrade to v102.2.0
[iceweasel]: tweak for i686 (still FTBS)
[iceweasel]: upgrade to v105.0
[rz-cutter]: upgrade to v2.1.2
[kinfocenter]: add blacklist replacement
[freecad]: add blacklist replacement
[fonts-meta]: add bdf-unifont hex-unifont otf-unifont pcf-unifont psf-unifont ttf-unifont
[unifont]: add package
[COPYRIGHTS]: re-word, specify upstream designations and hackers IDs
[COPYRIGHTS]: add recent confirmations
[qt5-styleplugins]: tweak for arm
[qt5-styleplugins]: rebuild against latest qt5-base
[qutebrowser]: rebuild against latest qt5-base
housekeeping - silence noisy PKGBUILDs when sourced
[quaternion]: add package
[quassel]: upgrade to v0.14.0-2
[quassel]: upgrade to v0.14.0 (FTBS)
[acpi_call][acpi_call-dkms][acpi_call-lts][tp_smapi][tp_smapi-lts]: rebuild against latest kernels
add 'package-all-acpi_call-tp_smapi' helper script
[COPYRIGHTS]: add recent confirmations
[pacman2pacman]: add CC0 license SPDX
[iceweasel]: housekeeping
[iceweasel]: upgrade to v104.0.1
[iceweasel]: fix 'sync' bug
[iceweasel]: tweak for i686
libre/iceweasel: 104.0-1.parabola1
drop qtqr, now in [community]
libre: libretools: add in forgetten pkgrel bump
pcr: prosody-modules: fix unknown revision '4959:0989dea9b356'
libretools: librefetch: fix "does not contain a valid package suffix"
pcr: prosody-modules: Explain what is removed
pcr: Add prosody-modules
pcr: fcode-utils: add armv7h support
Add fcode-utils
libreboot-utils: Add ich9utils
[xscreensaver]: upgrade to v6.04
[retroarch]: upgrade to v1.10.3
[icecat]: tweak for armv7h
[icecat]: tweak for 1686
[icecat]: housekeeping
[rtl8812au]: remove package
[parabola-base]: add icu-compat
[iceweasel][networkmanager][systemd]: housekeeping
[noisy]: add missing shebang
[noisy-git]: add package
[pacman]: tweak for armv7h
[pacman]: neutralize tests requiring network access
[pacman]: add keyring updatedb patch
[pacman]: bugfix checksums
[parabola-keyring]: rebuild
[parabola-keyring][your-freedom]: housekeeping
[parabola-hackers]: upgrade to v20220802
linux-libre-pck: disable broken CONFIG_TCP_CONG_BBR on armv7h
restore mksource()
[gmid]: upgrade to v1.8.4
[libreboot-utils]: upgrade to v4.15.libreboot20220710
libre/iceweasel: 103.0-1.parabola1
[iceweasel]: upgrade to v102.0.1
updpkg: libre/linux-libre-pck 5.18.14.pck1-1
[pacman]: remove keyring update service files
[gophernicus]: move to [pcr]
[rtl8812au]: add package v5.6.4.2.20220606
pcr: remove lcov
updpkg: libre/linux-libre-hardened 5.18.12.hardened1-1
updpkg: libre/linux-libre-pae 5.18.14-1
libre: epiphany: armv7h: build with libportal-gtk3
libre: epiphany: unbreak armv7h and i686 builds
pcr: libreboot-utils: Add intelmetool
libre: epiphany: update to 42.3
pcr: gajim-plugin-omemo: update to 2.8.15
updpkg: libre/linux-libre 5.18.14-1
updpkg: nonsystemd/your-initfreedom 20220719-1
updpkg: nonsystemd/elogind 246.10-7
deprecate notsystemd
addpkg: nonsystemd/elogind-openrc 20210704-1
drop openrc-security
Update openrc init scripts urls and add their depends as runtime dependencies
addpkg: nonsystemd/nftables-openrc 20210505-2
addpkg: nonsystemd/iptables-openrc 20210505-2
addpkg: nonsystemd/firewalld-openrc 20210505-1
addpkg: nonsystemd/apparmor-openrc 20210506-1
updpkg: nonsystemd/networkmanager 1.38.2-2.nonsystemd1
updpkg: nonsystemd/dbus 1.14.0-1.nonsystemd1
addpkg: nonsystemd/networkmanager-openrc 20210505-6
addpkg: nonsystemd/dbus-openrc 20210418-2
libre: linux-libre-64: Add rationale for the package
updpkg: nonsystemd/polkit 121-1.nonsystemd1
updpkg: libre/parabolaiso 65-1, delete openrc-desktop
addpkg: nonsystemd/xdm-openrc 20220104-1
addpkg: nonsystemd/wpa_supplicant-openrc 20210505-1
addpkg: nonsystemd/tlp-openrc 20210505-1
addpkg: nonsystemd/sddm-openrc 20220104-1
addpkg: nonsystemd/lxdm-openrc 20220104-1
addpkg: nonsystemd/lightdm-openrc 20220104-1
addpkg: nonsystemd/gpm-openrc 20210505-2
addpkg: nonsystemd/gdm-openrc 20220104-1
addpkg: nonsystemd/docker-openrc 20210505-1
addpkg: nonsystemd/chrony-openrc 20210506-2
addpkg: nonsystemd/bluez-openrc 20210506-1
addpkg: nonsystemd/avahi-openrc 20210505-2
addpkg: nonsystemd/alsa-utils-openrc 20210505-2
addpkg: nonsystemd/acpid-openrc 20210506-1
[parabola-keyring]: upgrade to v20220714