CONTRIBUTING.md

-# Contributing 
+# Contributing
 
 Whether you've got a bugfix, documentation update, or new feature for us, these are the steps to follow to contribute code back into the main trisquel repo.
 
@@ -6,34 +6,27 @@ Whether you've got a bugfix, documentation update, or new feature for us, these
 
 
 
- 1. Install needed packages for both, sources and binary builds
+ 1. Install needed packages for running the helpers
 ```
-sudo apt-get install  dpkg-dev devscripts git pbuilder quilt patch sed rpl parsewiki
+sudo apt-get install cdbs devscripts dpkg-dev git gnupg patch quilt rpl sed
 ```
 
- 1. Configure build environment for binary packages
+ 1. Get the Trisquel build environment and follow the [README](https://gitlab.trisquel.org/trisquel/trisquel-builder/-/blob/master/README.md) to setup your system for building
 ```
-git clone https://devel.trisquel.info/trisquel/trisquel-builder.git
-ln -s $(readlink -f trisquel-builder/pbuilderrc) ~/.pbuilderrc
-sudo ln -s $(readlink -f trisquel-builder/hooks) /var/cache/pbuilder/hooks.d
-```
-
- 1. Create the build environment for each distribution/architecture you want to work with
-```
-sudo BUILDDIST=belenos BUILDARCH=amd64 pbuilder create 
+git clone https://gitlab.trisquel.org/trisquel/trisquel-builder.git
 ```
 
 
 ## 2. Get the latest code from gitlab
 
-You'll need to understand a little bit about how git and gitlab work before this step (GitHub works the same way, but we like free software). In simple terms, log in [here](https://devel.trisquel.info/users/sign_in?redirect_to_referer=yes), visit the [trisquel/package-helpers project page](https://devel.trisquel.info/trisquel/package-helpers), and click the "fork" button to create your own copy of the repo.  You will push your changes to this new repo under your own git account, and we will pull changes into the main repo from there.
+You'll need to understand a little bit about how git and gitlab work before this step (GitHub works the same way, but we like free software). In simple terms, log in [here](https://gitlab.trisquel.org/users/sign_in?redirect_to_referer=yes), visit the [trisquel/package-helpers project page](https://gitlab.trisquel.org/trisquel/package-helpers), and click the "fork" button to create your own copy of the repo.  You will push your changes to this new repo under your own git account, and we will pull changes into the main repo from there.
 
 For the sake of the rest of the examples in this guide, we're going to assume your gitlab username is "**richardtorvalds**" and you will be working with the  "**hello**" package, and use those in our examples.
 
 Now, we want to grab the latest from this newly created repository and pull it down to your local machine. Getting the latest code from your repo is simple, just clone it:
 
 ```bash
-git clone https://devel.trisquel.info/richardtorvalds/package-helpers.git
+git clone https://gitlab.trisquel.org/richardtorvalds/package-helpers.git
 cd package-helpers
 ```
 
@@ -44,7 +37,7 @@ This will give you a directory called "package-helpers" on your local machine wi
 One thing you'll need to do to make things easier to integrate and keep up to date in your fork is to add the main repo as a remote reference. This way you can fetch the latest code from the production version and integrate it. So, here's how to set that up:
 
 ```bash
-git remote add upstream https://devel.trisquel.info/trisquel/package-helpers.git
+git remote add upstream https://gitlab.trisquel.org/trisquel/package-helpers.git
 git remote   (this will list out your remotes, showing the new one we added)
 ```
 
@@ -52,14 +45,14 @@ Then, when you need to pull the latest from the main trisquel repo, you just fet
 
 ```bash
 git fetch upstream
-git merge upstream/belenos
+git merge upstream/nabia
 ```
 
-You can also use *git pull upstream belenos* if you want it all in one step.
+You can also use *git pull upstream nabia* if you want it all in one step.
 
 ## 4. Making a branch for your changes
 
-When adding features or bug fixes, please create a separate branch for each changeset you want us to pull in, either with the issue number in the branch name or with an indication of what the feature is (feature, bugfix...). 
+When adding features or bug fixes, please create a separate branch for each changeset you want us to pull in, either with the issue number in the branch name or with an indication of what the feature is (feature, bugfix...).
 
 ```bash
 git branch   (lists your current branches)
@@ -75,7 +68,7 @@ cd helpers
 cp make-apache2 make-hello
 ```
 
-For importing free packages from ppa's or other sources, check [make-toxcore](https://devel.trisquel.info/trisquel/package-helpers/blob/belenos/helpers/make-toxcore) and update the _EXTERNAL_ , _SIGNKEY_ and _changelog_ lines  with your own values.
+For importing free packages from ppa's or other sources, check [make-tor](https://gitlab.trisquel.org/trisquel/package-helpers/blob/nabia/helpers/make-tor) and update the _EXTERNAL_ , _SIGNKEY_ and _changelog_ lines  with your own values.
 
 Then, run the helper with
 ```
@@ -86,12 +79,12 @@ If everything goes fine, you will have your new source package ready at _PACKAGE
 
 ## 6. Build and test the binary package
 
-The last step generated a source package file, so we need to build the binary one:
+The last step generated a source package file, so we need to build the binary one. Please make sure that you set or replace `CODENAME` and `ARCH` variables:
 ```
-sudo BUILDDIST=belenos BUILDARCH=amd64 pbuilder build PACKAGES/hello/*.dsc
+sbuild -v -A --dist $CODENAME --arch $ARCH PACKAGES/hello/*.dsc
 ```
 
-The binary packages will be avaliable at _/var/cache/pbuilder/jenkins-repos/$BUILDDIST/_
+The binary packages will be avaliable in the directory from which you ran the previous command.
 
 
 ## 7. Push your code and make a pull request
@@ -107,6 +100,4 @@ This pushes everything in that branch up. Then you can go back to your forked pa
 That lets us know that there's something new from you that needs to be pulled in. We'll review it and get back to you about it if we have any questions. Otherwise, we'll integrate it and let you know when it's in!
 
 
-Hope this guide helps you get started in contributing to the trisquel project! If you still have questions, don't hesitate to join us on IRC - we're in #trisquel-dev on freenode -, or send a mail to the development mailing list trisquel-devel at listas.trisquel.info.
-
-   
+Hope this guide helps you get started in contributing to the trisquel project! If you still have questions, don't hesitate to join us on IRC - we're in #trisquel-dev on libera.chat -, or send a mail to the development mailing list trisquel-devel at listas.trisquel.info.

README.md

@@ -11,9 +11,9 @@ derivative of your own, we suggest you to use Builder instead of this helpers.
 
 Once a new package is added, it takes priority over the original one from Ubuntu,
 so they never enter into the repo from upstream and need to be
-compiled with this helpers and pushed into reprepro. 
+compiled with this helpers and pushed into reprepro.
 
-To add a package to the list, follow the [CONTRIBUTING](https://devel.trisquel.info/trisquel/package-helpers/blob/belenos/CONTRIBUTING.md) guidelines.
+To add a package to the list, follow the [CONTRIBUTING](https://gitlab.trisquel.org/trisquel/package-helpers/blob/nabia/CONTRIBUTING.md) guidelines.
 
 ## Steps
 
@@ -26,11 +26,20 @@ Those are the steps done by the helpers:
 5. Apply the changes described in the helper
 6. Re-package it, adding "triquel$VERSION" version string
 
+## Variables in helper scripts
+
+* `VERSION` (required): The trisquel version for the helper.
+* `EXTERNAL`: When building packages not coming from the upstream Ubuntu, the external `deb-src` in the same format as in `apt.sources.list`.
+* `REPOKEY`: An additional GPG key to import for the helper. Mostly only used in conjunction with `EXTERNAL`.
+* `BACKPORT(S)`: Must be set to `true` if the package is a backport.
+* `QUILT`: If `skip`, avoids patches to be automatically applied. Only set this variables if you know what you are doing.
+* `BUILD_UNTIL`: build this helper if the Trisquel REVISION number (e.g. Trisquel 10.0) is <= this number. To be used when we know that the helper will not be needed at a certain future release.
+
 ## Recommendations
 
 * You don't need to use sudo in order to run those scripts, but some extra packages are needed:
 
-     `sudo apt-get install dpkg-dev sed git rpl devscripts quilt patch`
+     `sudo apt-get install cdbs devscripts dpkg-dev git gnupg gnupg2 patch python2 quilt rename rpl sed python3-jsonschema`
 
 * Take care to use the right sourcePackageName, many source packages produce
 several binary packages. `apt-cache showsrc binary-package` can help you.
@@ -41,8 +50,26 @@ it at the `DATA/sourcePackageName` directory
 would actually be shown to the user. Avoid replacing copyright statements!
 * Try to write your replacements in a way they might work in future versions
 of the upstream package. Well written regexps and sed will help with that.
-* You can test your changes by doing them inside the _PACKAGES/sourcePackageName/source/_ directory, 
+* You can test your changes by doing them inside the _PACKAGES/sourcePackageName/source/_ directory,
 and running `dpkg-source -b .`, before being added to the helper script
+* You can check the status of failed build at https://jenkins.trisquel.org/job/build-watchdog/lastBuild/consoleText
+
+## Debootstrap
+On every new release we need to get compiled the very basic packages in order
+to create a trisquel base builder.
+Before that we currently relay on a upstream debootstrap image, so creating a
+trisquel debootstrap is the starting point.
+
+Every new release need the following packages taken care of first,
+
+* `make-apt`
+* `make-base-files`
+* `make-bash`
+* `make-debootstrap`
+* `make-dpkg`
+* `make-cdebconf`
+* `trisquel-keyring` (not as helper)
+* `trisquel-meta` (not as helper)
 
 ## Netinstall
 
@@ -62,4 +89,3 @@ To generate the images, we run the following scripts:
 
 Then we push the results into the Trisquel repository and run the script
 `make-debian-installer` to build the final images.
-

helpers/DATA/akregator/trisquel_feeds.patch

+--- src/akregator_part.cpp	2020-06-05 11:41:23.000000000 -0500
++++ src/akregator_part_trisquel.cpp	2020-06-05 12:46:05.914051386 -0500
+@@ -189,6 +189,61 @@
+     wire.setAttribute(QStringLiteral("xmlUrl"), QStringLiteral("http://wire.kubuntu.org/?feed=rss2"));
+     kubuntuFolder.appendChild(wire);
+ 
++// Trisquel feeds
++    QDomElement trisquelFolder = doc.createElement(QStringLiteral("outline"));
++    trisquelFolder.setAttribute(QStringLiteral("text"), QStringLiteral("Trisquel GNU/Linux"));
++    body.appendChild(trisquelFolder);
++
++    QDomElement tnews = doc.createElement(QStringLiteral("outline"));
++    tnews.setAttribute(QStringLiteral("text"), i18n("News"));
++    tnews.setAttribute(QStringLiteral("xmlUrl"), QStringLiteral("https://trisquel.info/en/node/feed"));
++    trisquelFolder.appendChild(tnews);
++
++    QDomElement relAnnounce = doc.createElement(QStringLiteral("outline"));
++    relAnnounce.setAttribute(QStringLiteral("text"), i18n("Release announcements"));
++    relAnnounce.setAttribute(QStringLiteral("xmlUrl"), QStringLiteral("https://trisquel.info/en/taxonomy/term/700/0/feed"));
++    trisquelFolder.appendChild(relAnnounce);
++
++    QDomElement enForum = doc.createElement(QStringLiteral("outline"));
++    enForum.setAttribute(QStringLiteral("text"), i18n("Forum"));
++    enForum.setAttribute(QStringLiteral("xmlUrl"), QStringLiteral("https://trisquel.info/en/taxonomy/term/50/0/feed"));
++    trisquelFolder.appendChild(enForum);
++
++    QDomElement tReddit = doc.createElement(QStringLiteral("outline"));
++    tReddit.setAttribute(QStringLiteral("text"), i18n("Trisquel at Reddit"));
++    tReddit.setAttribute(QStringLiteral("xmlUrl"), QStringLiteral("https://www.reddit.com/r/trisquel/.rss"));
++    trisquelFolder.appendChild(tReddit);
++
++// Free Software feeds
++    QDomElement fsFolder = doc.createElement(QStringLiteral("outline"));
++    fsFolder.setAttribute(QStringLiteral("text"), QStringLiteral("Free Software"));
++    body.appendChild(fsFolder);
++
++    QDomElement newGNU = doc.createElement(QStringLiteral("outline"));
++    newGNU.setAttribute(QStringLiteral("text"), i18n("What's New at GNU"));
++    newGNU.setAttribute(QStringLiteral("xmlUrl"), QStringLiteral("https://www.reddit.com/r/trisquel/.rss"));
++    fsFolder.appendChild(newGNU);
++
++    QDomElement fsfNews = doc.createElement(QStringLiteral("outline"));
++    fsfNews.setAttribute(QStringLiteral("text"), i18n("FSF News"));
++    fsfNews.setAttribute(QStringLiteral("xmlUrl"), QStringLiteral("https://static.fsf.org/fsforg/rss/news.xml"));
++    fsFolder.appendChild(fsfNews);
++
++    QDomElement fsfEvents = doc.createElement(QStringLiteral("outline"));
++    fsfEvents.setAttribute(QStringLiteral("text"), i18n("FSF Events"));
++    fsfEvents.setAttribute(QStringLiteral("xmlUrl"), QStringLiteral("https://static.fsf.org/fsforg/rss/events.xml"));
++    fsFolder.appendChild(fsfEvents);
++
++    QDomElement fsfBlog = doc.createElement(QStringLiteral("outline"));
++    fsfBlog.setAttribute(QStringLiteral("text"), i18n("FSF Blogs"));
++    fsfBlog.setAttribute(QStringLiteral("xmlUrl"), QStringLiteral("https://static.fsf.org/fsforg/rss/blogs.xml"));
++    fsFolder.appendChild(fsfBlog);
++
++    QDomElement gnuReddit = doc.createElement(QStringLiteral("outline"));
++    gnuReddit.setAttribute(QStringLiteral("text"), i18n("GNU at Reddit"));
++    gnuReddit.setAttribute(QStringLiteral("xmlUrl"), QStringLiteral("https://www.reddit.com/r/gnu/.rss"));
++    fsFolder.appendChild(gnuReddit);
++
+     return doc;
+ }
+ }

helpers/DATA/apache2/001_branding

-#!/bin/sh -e
-## 02_branding.dpatch by Adam Conrad <adconrad@0c3.net>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Changes apache's PLATFORM based on lsb_release output
-
-BUILD_DIST="($(lsb_release -i -s) GNU/Linux)"
-
-if [ $# -ne 1 ]; then
-    echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
-    exit 1
-fi
-
-case "$1" in
-  -patch)
-    if grep -q "${BUILD_DIST}" server/core.c 2>/dev/null; then
-      echo >&2 "`basename $0`: patch already applied"
-      exit 1
-    else
-      # This is where we get our distribution-specific server signature from:
-      sed -i -e "s:(\" PLATFORM \"):${BUILD_DIST}:" server/core.c
-    fi
-  ;;
-  -unpatch)
-    if grep -q "${BUILD_DIST}" server/core.c 2>/dev/null; then
-      sed -i -e "s:${BUILD_DIST}:(\" PLATFORM \"):" server/core.c
-    else
-      echo >&2 "`basename $0`: patch not yet applied, cannot unpatch"
-      exit 1
-    fi
-  ;;
-  *)
-    echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
-    exit 1
-  ;;
-esac
-

helpers/DATA/app-install-data-ubuntu/09_app_install_entry.patch

-Index: gnome-menus-2.28.0/layout/applications.menu
-===================================================================
---- gnome-menus-2.28.0.orig/layout/applications.menu	2009-09-24 11:34:44.000000000 +0200
-+++ gnome-menus-2.28.0/layout/applications.menu	2009-09-24 11:34:44.000000000 +0200
-@@ -157,4 +157,29 @@
-     <Directory>Debian.directory</Directory>
-   </Menu>
- 
-+<Include>
-+  <Filename>gnome-app-install.desktop</Filename>
-+</Include>
-+
-+<!-- Separator between menus and gnome-app-install -->
-+<Layout>
-+  <Merge type="menus"/>
-+  <Menuname>Internet</Menuname>
-+  <Menuname>Office</Menuname>
-+  <Menuname>Education</Menuname>
-+  <Menuname>Development</Menuname>
-+  <Menuname>Graphics</Menuname>
-+  <Menuname>Multimedia</Menuname>
-+  <Menuname>Games</Menuname>
-+  <Menuname>Accessories</Menuname>
-+  <Menuname>System</Menuname>
-+  <Menuname>Universal Access</Menuname>
-+  <Menuname>Debian</Menuname>
-+  <Menuname>Other</Menuname>
-+  <Menuname>wine-wine</Menuname>
-+  <Merge type="files"/>
-+  <Separator/>
-+  <Filename>gnome-app-install.desktop</Filename>
-+</Layout>
-+
- </Menu> <!-- End Applications -->
-Index: gnome-menus-2.28.0/layout/settings.menu
-===================================================================
---- gnome-menus-2.28.0.orig/layout/settings.menu	2009-09-24 11:34:47.000000000 +0200
-+++ gnome-menus-2.28.0/layout/settings.menu	2009-09-24 11:35:22.000000000 +0200
-@@ -43,6 +43,7 @@
-       <And>
-         <Category>Settings</Category>
-         <Category>System</Category>
-+        <Not><Filename>gnome-app-install.desktop</Filename></Not>
-       </And>
-     </Include>
-   </Menu>     <!-- End System Settings -->

helpers/DATA/apparmor-profiles-extra/70aed868a4ed76d74eecf3b210ce7bf3098ffab4.patch

+From 70aed868a4ed76d74eecf3b210ce7bf3098ffab4 Mon Sep 17 00:00:00 2001
+From: Jacob K <jacobk@disroot.org>
+Date: Wed, 12 Feb 2025 12:19:24 -0600
+Subject: [PATCH] Add some lines from Atril's profile to fix the screen reader
+
+---
+ profiles/usr.bin.pidgin | 8 ++++++++
+ 1 file changed, 8 insertions(+)
+
+diff --git a/profiles/usr.bin.pidgin b/profiles/usr.bin.pidgin
+index 5e18702..085301c 100644
+--- a/profiles/usr.bin.pidgin
++++ b/profiles/usr.bin.pidgin
+@@ -8,6 +8,7 @@
+   #include <abstractions/bash>
+   #include <abstractions/dbus-session>
+   #include <abstractions/dbus-strict>
++  #include <abstractions/dbus-accessibility>
+   #include <abstractions/dconf>
+   #include <abstractions/enchant>
+   #include <abstractions/gnome>
+@@ -82,6 +83,13 @@
+   owner @{PROC}/@{pid}/auxv r,
+   owner @{PROC}/@{pid}/fd/ r,
+ 
++  # These lines were copied from Atril's profile to make the screen reader functional
++  owner /{,var/}run/user/*/at-spi2-*/   rw,
++  owner /{,var/}run/user/*/at-spi2-*/** rw,
++  # Allow access to the non-abstract D-Bus socket used by at-spi > 2.42.0
++  #   https://gitlab.gnome.org/GNOME/at-spi2-core/-/issues/43
++  owner /{,var/}run/user/*/at-spi/bus* rw,
++
+   # Site-specific additions and overrides. See local/README for details.
+   #include <local/usr.bin.pidgin>
+ }
+-- 
+2.25.1
+

helpers/DATA/apparmor/b5a7641dd3502fcfb897d3b96e197628b674ce3c.patch

+From b5a7641dd3502fcfb897d3b96e197628b674ce3c Mon Sep 17 00:00:00 2001
+From: Adrian Heine <mail@adrianheine.de>
+Date: Mon, 23 Jan 2023 20:35:29 +0100
+Subject: [PATCH] Add pipewire client.conf to audio abstractions
+
+Fixes: https://bugs.launchpad.net/bugs/2003702
+---
+ profiles/apparmor.d/abstractions/audio | 3 +++
+ 1 file changed, 3 insertions(+)
+
+diff --git a/profiles/apparmor.d/abstractions/audio b/profiles/apparmor.d/abstractions/audio
+index 01493260d..dd783992d 100644
+--- a/profiles/apparmor.d/abstractions/audio
++++ b/profiles/apparmor.d/abstractions/audio
+@@ -85,5 +85,8 @@ owner @{HOME}/.local/share/openal/hrtf/{,**} r,
+ # wildmidi
+ /etc/wildmidi/wildmidi.cfg r,
+ 
++# pipewire
++/usr/share/pipewire/client.conf r,
++
+   # Include additions to the abstraction
+   include if exists <abstractions/audio.d>
+-- 
+GitLab
+

helpers/DATA/apt-mirror/Trisquel-mirror.list

@@ -14,14 +14,14 @@ set _tilde 0
 #
 ############# end config ##############
 
-deb http://archive.trisquel.info/trisquel @CODENAME@ main
-deb http://archive.trisquel.info/trisquel @CODENAME@-security main 
-deb http://archive.trisquel.info/trisquel @CODENAME@-updates main 
-deb http://archive.trisquel.info/trisquel @CODENAME@-backports main 
+deb http://archive.trisquel.org/trisquel @CODENAME@ main
+deb http://archive.trisquel.org/trisquel @CODENAME@-security main 
+deb http://archive.trisquel.org/trisquel @CODENAME@-updates main 
+deb http://archive.trisquel.org/trisquel @CODENAME@-backports main 
 
-deb-src http://archive.trisquel.info/trisquel @CODENAME@ main 
-deb-src http://archive.trisquel.info/trisquel @CODENAME@-security main 
-deb-src http://archive.trisquel.info/trisquel @CODENAME@-updates main 
-deb-src http://archive.trisquel.info/trisquel @CODENAME@-backports main 
+deb-src http://archive.trisquel.org/trisquel @CODENAME@ main 
+deb-src http://archive.trisquel.org/trisquel @CODENAME@-security main 
+deb-src http://archive.trisquel.org/trisquel @CODENAME@-updates main 
+deb-src http://archive.trisquel.org/trisquel @CODENAME@-backports main 
 
-clean http://archive.trisquel.info/trisquel
+clean http://archive.trisquel.org/trisquel

helpers/DATA/apt/trisquel/apt-vendor.ent

@@ -4,17 +4,17 @@
 <!ENTITY keyring-filename "<filename>/usr/share/keyrings/trisquel-archive-keyring.gpg</filename>">
 <!ENTITY keyring-removed-filename "<filename>/usr/share/keyrings/trisquel-archive-removed-keys.gpg</filename>">
 <!ENTITY keyring-master-filename "/usr/share/keyrings/trisquel-master-keyring.gpg">
-<!ENTITY keyring-uri "http://archive.trisquel.info/trisquel/trisquel-archive-signkey.gpg">
+<!ENTITY keyring-uri "http://archive.trisquel.org/trisquel/trisquel-archive-signkey.gpg">
 
-<!ENTITY sourceslist-list-format "deb http://es.archive.trisquel.info/trisquel &trisquel-codename; main
-deb http://es.archive.trisquel.info/trisquel &trisquel-codename;-security main
-deb http://es.archive.trisquel.info/trisquel &trisquel-codename;-updates main">
+<!ENTITY sourceslist-list-format "deb http://archive.trisquel.org/trisquel &trisquel-codename; main
+deb http://archive.trisquel.org/trisquel &trisquel-codename;-security main
+deb http://archive.trisquel.org/trisquel &trisquel-codename;-updates main">
 <!ENTITY sourceslist-sources-format "Types: deb
-URIs: http://es.archive.trisquel.info/trisquel
+URIs: http://archive.trisquel.org/trisquel
 Suites: &trisquel-codename; &trisquel-codename;-updates
 Components: main
 
 Types: deb
-URIs: http://es.archive.trisquel.info/trisquel
+URIs: http://archive.trisquel.org/trisquel
 Suites: &trisquel-codename;-security
 Components: main">

helpers/DATA/apt/trisquel/apt.conf-01-vendor-trisquel

+// The phased updates system from Ubuntu does not apply
+// correctly to our repositories and should be disabled.
+Update-Manager::Always-Include-Phased-Updates "True";

helpers/DATA/apt/trisquel/sources.list.in

 # See sources.list(5) manpage for more information
 # Remember that CD-ROMs, DVDs and such are managed through the apt-cdrom tool.
-deb http://es.archive.trisquel.info/trisquel &trisquel-codename; main
-deb-src http://es.archive.trisquel.info/trisquel &trisquel-codename; main
+deb http://archive.trisquel.org/trisquel &trisquel-codename; main
+deb-src http://archive.trisquel.org/trisquel &trisquel-codename; main
 
-deb http://es.archive.trisquel.info/trisquel &trisquel-codename;-security main
-deb-src http://es.archive.trisquel.info/trisquel &trisquel-codename;-security main
+deb http://archive.trisquel.org/trisquel &trisquel-codename;-security main
+deb-src http://archive.trisquel.org/trisquel &trisquel-codename;-security main
 
-deb http://es.archive.trisquel.info/trisquel &trisquel-codename;-updates main
-deb-src http://es.archive.trisquel.info/trisquel &trisquel-codename;-updates main
+deb http://archive.trisquel.org/trisquel &trisquel-codename;-updates main
+deb-src http://archive.trisquel.org/trisquel &trisquel-codename;-updates main

helpers/DATA/arctica-greeter/org.ArcticaProject.arctica-greeter.gschema.xml

+<?xml version="1.0" encoding="UTF-8"?>
+<schemalist gettext-domain="arctica-greeter">
+  <schema id="org.ArcticaProject.arctica-greeter" path="/org/ArcticaProject/arctica-greeter/">
+    <key name="background" type="s">
+      <default>'/usr/share/backgrounds/aramo.jpg'</default>
+      <summary>Background file to use, either an image path or a color (e.g. #772953)</summary>
+    </key>
+    <key name="background-color" type="s">
+      <default>'#000000'</default>
+      <summary>Background color (e.g. #772953), set before wallpaper is seen</summary>
+    </key>
+    <key name="togglebox-font-fgcolor" type="s">
+      <default>'#A0A0A0'</default>
+      <summary>Font foreground color (e.g. #A0A0A0) for selected session names in session list</summary>
+    </key>
+    <key name="togglebox-button-bgcolor" type="s">
+      <default>'#2F70C6'</default>
+      <summary>Font foreground color (e.g. #202020) for selected session names in session list</summary>
+    </key>
+    <key name="draw-user-backgrounds" type="b">
+      <default>true</default>
+      <summary>Whether to draw user backgrounds</summary>
+    </key>
+    <key name="draw-grid" type="b">
+      <default>false</default>
+      <summary>Whether to draw an overlay grid</summary>
+    </key>
+    <key name="show-hostname" type="b">
+      <default>true</default>
+      <summary>Whether to show the hostname in the menubar</summary>
+    </key>
+    <key name="logo" type="s">
+      <default>'/usr/share/arctica-greeter/logo.png'</default>
+      <summary>Logo file to use</summary>
+    </key>
+    <key name="theme-name" type="s">
+      <default>'Trisquel-dark'</default>
+      <summary>GTK+ theme to use</summary>
+    </key>
+    <key name="icon-theme-name" type="s">
+      <default>'trisquel'</default>
+      <summary>Icon theme to use</summary>
+    </key>
+    <key name="font-name" type="s">
+      <default>'Sans 11'</default>
+      <summary>Font to use</summary>
+    </key>
+    <key name="xft-antialias" type="b">
+      <default>true</default>
+      <summary>Whether to antialias Xft fonts</summary>
+    </key>
+    <key name="xft-dpi" type="d">
+      <default>96</default>
+      <summary>Resolution for Xft in dots per inch</summary>
+    </key>
+    <key name="xft-hintstyle" type="s">
+      <choices>
+        <choice value='hintnone'/>
+        <choice value='hintslight'/>
+        <choice value='hintmedium'/>
+        <choice value='hintfull'/>
+      </choices>
+      <default>'hintslight'</default>
+      <summary>What degree of hinting to use</summary>
+    </key>
+    <key name="xft-rgba" type="s">
+      <choices>
+        <choice value='none'/>
+        <choice value='rgb'/>
+        <choice value='bgr'/>
+        <choice value='vrgb'/>
+        <choice value='vbgr'/>
+      </choices>
+      <default>'rgb'</default>
+      <summary>Type of subpixel antialiasing</summary>
+    </key>
+    <key name="onscreen-keyboard" type="b">
+      <default>false</default>
+      <summary>Whether to enable the onscreen keyboard</summary>
+    </key>
+    <key name="high-contrast" type="b">
+      <default>false</default>
+      <summary>Whether to use a high contrast theme</summary>
+    </key>
+    <key name="screen-reader" type="b">
+      <default>false</default>
+      <summary>Whether to enable the screen reader</summary>
+    </key>
+    <key name="play-ready-sound" type="b">
+      <default>true</default>
+      <summary>Whether to play sound when greeter is ready</summary>
+    </key>
+    <key name="indicators" type="as">
+      <default>['ug-accessibility', 'org.ayatana.indicator.keyboard', 'org.ayatana.indicator.session', 'org.ayatana.indicator.datetime', 'org.ayatana.indicator.power', 'org.ayatana.indicator.sound', 'ayatana-application']</default>
+      <summary>Which indicators to load</summary>
+    </key>
+    <key name="hidden-users" type="as">
+      <default>[]</default>
+      <summary>List of usernames that are hidden until a special key combination is hit</summary>
+    </key>
+    <key name="group-filter" type="as">
+      <default>[]</default>
+      <summary>List of groups that users must be part of to be shown (empty list shows all users)</summary>
+    </key>
+    <key name="idle-timeout" type="i">
+      <default>300</default>
+      <summary>Number of seconds of inactivity before blanking the screen. Set to 0 to never timeout.</summary>
+    </key>
+    <key name="enable-hidpi" type="s">
+      <choices>
+        <choice value='on'/>
+        <choice value='off'/>
+        <choice value='auto'/>
+      </choices>
+      <default>'auto'</default>
+      <summary>Whether to enable HiDPI support</summary>
+    </key>
+    <key name="remote-service-configure-uri" type="s">
+      <default>''</default>
+      <summary>Default FQDN for host offering Remote Logon Service</summary>
+    </key>
+    <key name="activate-numlock" type="b">
+      <default>false</default>
+      <summary>Whether to activate numlock. This features requires the installation of numlockx.</summary>
+    </key>
+    <key name="only-on-monitor" type="s">
+      <default>'auto'</default>
+      <summary>Monitor on which to show the Login GUI</summary>
+    </key>
+  </schema>
+</schemalist>

helpers/DATA/asunder/asunder.4061-aac.patch → helpers/DATA/asunder/asunder_2.9.5-acc.patch

-diff -ruN ../asunder-2.0-orig/src/callbacks.c src/callbacks.c
---- ../asunder-2.0-orig/src/callbacks.c	2010-01-23 16:21:15.000000000 +0000
-+++ src/callbacks.c	2011-11-08 18:10:15.000000000 +0000
-@@ -510,31 +510,6 @@
+diff -ruN a/src/callbacks.c b/src/callbacks.c
+--- a/src/callbacks.c	2019-08-29 00:18:58.000000000 -0500
++++ b/src/callbacks.c	2021-06-27 15:52:48.030388633 -0500
+@@ -734,32 +734,6 @@
  }
  
  void
--on_rip_aac_toggled                  (GtkToggleButton *togglebutton,
--                                     gpointer         user_data)
+-on_rip_fdkaac_toggled                     (GtkToggleButton *togglebutton,
+-                                        gpointer         user_data)
 -{
--    if (gtk_toggle_button_get_active(togglebutton) && !program_exists("neroAacEnc"))
+-    if (gtk_toggle_button_get_active(togglebutton) && !program_exists("fdkaac"))
 -    {
 -        GtkWidget * dialog;
+-        
 -        dialog = gtk_message_dialog_new(GTK_WINDOW(win_main), 
 -                                        GTK_DIALOG_DESTROY_WITH_PARENT, GTK_MESSAGE_ERROR, GTK_BUTTONS_OK, 
 -                                        _("%s was not found in your path. Asunder requires it to create %s files. "
 -                                        "All %s functionality is disabled."),
--                                        "'neroAacEnc'", "MP4", "AAC");
+-                                        "'fdkaac'", "AAC", "AAC");
 -        gtk_dialog_run(GTK_DIALOG(dialog));
 -        gtk_widget_destroy(dialog);
 -
--        global_prefs->rip_aac = 0;
--        gtk_toggle_button_set_active(togglebutton, global_prefs->rip_aac);
+-        global_prefs->rip_fdkaac = 0;
+-        gtk_toggle_button_set_active(togglebutton, global_prefs->rip_fdkaac);
 -    }
 -    
 -    if (!gtk_toggle_button_get_active(togglebutton))
--        disable_aac_widgets();
+-        disable_fdkaac_widgets();
 -    else
--        enable_aac_widgets();
+-        enable_fdkaac_widgets();
 -}
 -
 -void
- on_rip_musepack_toggled                  (GtkToggleButton *togglebutton,
-                                           gpointer         user_data)
+ on_rip_flac_toggled                    (GtkToggleButton *togglebutton,
+                                         gpointer         user_data)
  {
-diff -ruN ../asunder-2.0-orig/src/callbacks.h src/callbacks.h
---- ../asunder-2.0-orig/src/callbacks.h	2010-01-23 16:21:15.000000000 +0000
-+++ src/callbacks.h	2011-11-08 18:20:03.000000000 +0000
-@@ -164,9 +164,6 @@
- on_rip_monkey_toggled                  (GtkToggleButton *togglebutton,
+diff -ruN a/src/callbacks.h b/src/callbacks.h
+--- a/src/callbacks.h	2019-08-29 00:18:58.000000000 -0500
++++ b/src/callbacks.h	2021-06-27 15:54:41.446511848 -0500
+@@ -169,10 +169,6 @@
                                          gpointer         user_data);
+ 
  void
--on_rip_aac_toggled                  (GtkToggleButton *togglebutton,
--                                     gpointer         user_data);
+-on_rip_fdkaac_toggled                     (GtkToggleButton *togglebutton,
+-                                        gpointer         user_data);
+-                                        
 -void
- on_rip_musepack_toggled                  (GtkToggleButton *togglebutton,
-                                           gpointer         user_data);
+ on_rip_wavpack_toggled                 (GtkToggleButton *togglebutton,
+                                         gpointer         user_data);
  void
-diff -ruN ../asunder-2.0-orig/src/interface.c src/interface.c
---- ../asunder-2.0-orig/src/interface.c	2010-07-17 11:44:06.000000000 +0000
-+++ src/interface.c	2011-11-08 18:09:31.000000000 +0000
-@@ -863,61 +863,6 @@
-     GLADE_HOOKUP_OBJECT (prefs, rip_monkey, "rip_monkey");
-     /* END MONKEY */
-     
--    expander = gtk_expander_new(_("Proprietary encoders"));
--    gtk_widget_show (expander);
--    gtk_box_pack_start (GTK_BOX (vbox), expander, FALSE, FALSE, 0);
--    GLADE_HOOKUP_OBJECT (prefs, expander, "proprietary_formats_expander");
--    
--    hiddenbox = gtk_vbox_new (FALSE, 0);
--    gtk_widget_show (hiddenbox);
--    gtk_container_add (GTK_CONTAINER (expander), hiddenbox);
--    
--    /* AAC */
--    GtkWidget* rip_aac;
--    GtkWidget* aacQuality;
--    GtkWidget* aacVbox;
--    
--    frame8 = gtk_frame_new (NULL);
--    gtk_widget_show (frame8);
--    gtk_box_pack_start (GTK_BOX (hiddenbox), frame8, FALSE, FALSE, 0);
+diff -ruN a/src/interface.c b/src/interface.c
+--- a/src/interface.c	2019-10-21 07:09:34.000000000 -0500
++++ b/src/interface.c	2021-06-27 16:00:02.926827702 -0500
+@@ -714,57 +714,6 @@
+                                         NULL);
+     /* END OGG */
+ 
+-    /* FDK-AAC  */
+-    frame3X = gtk_frame_new (NULL);
+-    gtk_frame_set_shadow_type(GTK_FRAME(frame3X), GTK_SHADOW_IN);
+-    gtk_widget_show (frame3X);
+-    gtk_box_pack_start (GTK_BOX (vbox), frame3X, FALSE, FALSE, 0);
+-
+-    alignment8X = gtk_alignment_new (0.5, 0.5, 1, 1);
+-    gtk_widget_show (alignment8X);
+-    gtk_container_add (GTK_CONTAINER (frame3X), alignment8X);
+-    gtk_alignment_set_padding (GTK_ALIGNMENT (alignment8X), 2, 2, 12, 2);
 -    
--    alignment11 = gtk_alignment_new (0.5, 0.5, 1, 1);
--    gtk_widget_show (alignment11);
--    gtk_container_add (GTK_CONTAINER (frame8), alignment11);
--    gtk_alignment_set_padding (GTK_ALIGNMENT (alignment11), 2, 2, 12, 2);
+-    vbox2X = gtk_vbox_new (FALSE, 0);
+-    gtk_widget_show (vbox2X);
+-    gtk_container_add (GTK_CONTAINER (alignment8X), vbox2X);
+-
+-    hbox9X = gtk_hbox_new (FALSE, 0);
+-    gtk_widget_show (hbox9X);
+-    gtk_box_pack_start (GTK_BOX (vbox2X), hbox9X, TRUE, TRUE, 0);    
+-
+-    label = gtk_label_new (_("Bitrate"));
+-    gtk_widget_show (label);
+-    gtk_box_pack_start (GTK_BOX (hbox9X), label, FALSE, FALSE, 0);
+-    GLADE_HOOKUP_OBJECT (prefs, label, "fdkaac_bitrate_lbl");
 -    
--    aacVbox = gtk_vbox_new (FALSE, 0);
--    gtk_widget_show (aacVbox);
--    gtk_container_add (GTK_CONTAINER (alignment11), aacVbox);
+-    fdkaac_bitrate = gtk_hscale_new (GTK_ADJUSTMENT (gtk_adjustment_new (0, 0, 14, 1, 1, 1)));
+-    gtk_widget_show (fdkaac_bitrate);
+-    gtk_box_pack_start (GTK_BOX (hbox9X), fdkaac_bitrate, TRUE, TRUE, 5);
+-    gtk_scale_set_draw_value (GTK_SCALE (fdkaac_bitrate), FALSE);
+-    gtk_scale_set_digits (GTK_SCALE (fdkaac_bitrate), 0);
+-    g_signal_connect ((gpointer) fdkaac_bitrate, "value_changed",
+-                                        G_CALLBACK (on_fdkaac_bitrate_value_changed),
+-                                        NULL);
 -    
--    hbox13 = gtk_hbox_new (FALSE, 0);
--    gtk_widget_show (hbox13);
--    gtk_box_pack_start (GTK_BOX (aacVbox), hbox13, FALSE, FALSE, 0);
+-    tooltips = gtk_tooltips_new ();
+-    gtk_tooltips_set_tip (tooltips, fdkaac_bitrate, _("Higher bitrate is better quality but also bigger file. Most people use 192Kbps."), NULL);
 -    
--    label = gtk_label_new (_("Quality"));
+-    char kbps_textX[10];
+-    snprintf(kbps_textX, 10, _("%dKbps"), 32);
+-    label = gtk_label_new (kbps_textX);
 -    gtk_widget_show (label);
--    gtk_box_pack_start (GTK_BOX (hbox13), label, FALSE, FALSE, 0);
--    GLADE_HOOKUP_OBJECT (prefs, label, "aac_quality_lbl");
+-    gtk_box_pack_start (GTK_BOX (hbox9X), label, FALSE, FALSE, 0);
+-    GLADE_HOOKUP_OBJECT (prefs, label, "fdkaac_bitrate_lbl_2");
 -    
--    aacQuality = gtk_hscale_new (GTK_ADJUSTMENT (gtk_adjustment_new (0, 1, 100, 1, 1, 1)));
--    gtk_widget_show (aacQuality);
--    gtk_box_pack_start (GTK_BOX (hbox13), aacQuality, TRUE, TRUE, 5);
--    gtk_scale_set_value_pos (GTK_SCALE (aacQuality), GTK_POS_RIGHT);
--    gtk_scale_set_digits (GTK_SCALE (aacQuality), 0);
--    GLADE_HOOKUP_OBJECT (prefs, aacQuality, "aac_quality_slider");
+-    rip_fdkaac = gtk_check_button_new_with_mnemonic (_("AAC (lossy compression)"));
+-    gtk_widget_show (rip_fdkaac);
+-    gtk_frame_set_label_widget (GTK_FRAME (frame3X), rip_fdkaac);
+-    g_signal_connect ((gpointer) rip_fdkaac, "toggled",
+-                                        G_CALLBACK (on_rip_fdkaac_toggled),
+-                                        NULL);
+-    /* END FDK-AAC */
 -    
--    tooltips = gtk_tooltips_new ();
--    gtk_tooltips_set_tip (tooltips, aacQuality, _("Higher quality means bigger file. Default is 60."), NULL);
+     /* FLAC */
+     frame5 = gtk_frame_new (NULL);
+     gtk_frame_set_shadow_type(GTK_FRAME(frame5), GTK_SHADOW_IN);
+@@ -1059,15 +1008,6 @@
+     GLADE_HOOKUP_OBJECT (prefs, rip_monkey, "rip_monkey");
+     /* END MONKEY */
+     
+-    //~ expander = gtk_expander_new(_("Proprietary encoders"));
+-    //~ gtk_widget_show (expander);
+-    //~ gtk_box_pack_start (GTK_BOX (vbox), expander, FALSE, FALSE, 0);
+-    //~ GLADE_HOOKUP_OBJECT (prefs, expander, "proprietary_formats_expander");
 -    
--    rip_aac = gtk_check_button_new_with_mnemonic (_("AAC (lossy compression, Nero encoder)"));
--    gtk_widget_show (rip_aac);
--    gtk_frame_set_label_widget (GTK_FRAME (frame8), rip_aac);
--    g_signal_connect ((gpointer) rip_aac, "toggled",
--                                        G_CALLBACK (on_rip_aac_toggled),
--                                        NULL);
--    GLADE_HOOKUP_OBJECT (prefs, rip_aac, "rip_aac");
--    /* END AAC */
+-    //~ hiddenbox = gtk_vbox_new (FALSE, 0);
+-    //~ gtk_widget_show (hiddenbox);
+-    //~ gtk_container_add (GTK_CONTAINER (expander), hiddenbox);
 -    
      label = gtk_label_new (_("Encode"));
      gtk_widget_show (label);
      gtk_notebook_set_tab_label (GTK_NOTEBOOK (notebook1), gtk_notebook_get_nth_page (GTK_NOTEBOOK (notebook1), 2), label);
-@@ -1297,18 +1242,6 @@
-     gtk_widget_set_sensitive(lookup_widget(win_prefs, "monkey_compression_slider"), TRUE);
+@@ -1420,20 +1360,6 @@
+     gtk_widget_set_sensitive(lookup_widget(win_prefs, "bitrate_lbl_2"), TRUE);
  }
  
--void disable_aac_widgets(void)
+-void disable_fdkaac_widgets(void)
 -{
--    gtk_widget_set_sensitive(lookup_widget(win_prefs, "aac_quality_lbl"), FALSE);
--    gtk_widget_set_sensitive(lookup_widget(win_prefs, "aac_quality_slider"), FALSE);
+-    gtk_widget_set_sensitive(lookup_widget(win_prefs, "fdkaac_bitrate_lbl"), FALSE);
+-    gtk_widget_set_sensitive(lookup_widget(win_prefs, "fdkaac_bitrate"), FALSE);
+-    gtk_widget_set_sensitive(lookup_widget(win_prefs, "fdkaac_bitrate_lbl_2"), FALSE);
 -}
 -
--void enable_aac_widgets(void)
+-void enable_fdkaac_widgets(void)
 -{
--    gtk_widget_set_sensitive(lookup_widget(win_prefs, "aac_quality_lbl"), TRUE);
--    gtk_widget_set_sensitive(lookup_widget(win_prefs, "aac_quality_slider"), TRUE);
+-    gtk_widget_set_sensitive(lookup_widget(win_prefs, "fdkaac_bitrate_lbl"), TRUE);
+-    gtk_widget_set_sensitive(lookup_widget(win_prefs, "fdkaac_bitrate"), TRUE);
+-    gtk_widget_set_sensitive(lookup_widget(win_prefs, "fdkaac_bitrate_lbl_2"), TRUE);
 -}
 -
- void disable_musepack_widgets(void)
+ void disable_ogg_widgets(void)
  {
-     gtk_widget_set_sensitive(lookup_widget(win_prefs, "musepack_bitrate_lbl"), FALSE);
-@@ -1545,8 +1478,7 @@
+     gtk_widget_set_sensitive(lookup_widget(win_prefs, "ogg_lbl"), FALSE);
+@@ -1921,8 +1847,7 @@
  static const char* 
  GBLcomments = 
  N_("An application to save tracks from an Audio CD \n"
--"as WAV, MP3, OGG, FLAC, Wavpack, Musepack, Monkey's Audio, and/or "
+-"as WAV, MP3, OGG, FLAC, Wavpack, Opus, Musepack, Monkey's Audio, and/or "
 -"AAC files.");
-+"as WAV, MP3, OGG, FLAC, Wavpack, Musepack, Monkey's Audio files ");
++"as WAV, MP3, OGG, FLAC, Wavpack, Opus, Musepack, Monkey's Audio files.");
  
  static const char* 
  GBLcopyright = 
-diff -ruN ../asunder-2.0-orig/src/interface.h src/interface.h
---- ../asunder-2.0-orig/src/interface.h	2009-08-25 01:32:28.000000000 +0000
-+++ src/interface.h	2011-11-08 18:08:28.000000000 +0000
-@@ -15,8 +15,6 @@
- void enable_wavpack_widgets(void);
- void disable_monkey_widgets(void);
+diff -ruN a/src/interface.h b/src/interface.h
+--- a/src/interface.h	2019-08-29 00:18:58.000000000 -0500
++++ b/src/interface.h	2021-06-27 16:00:37.894859872 -0500
+@@ -19,8 +19,6 @@
  void enable_monkey_widgets(void);
--void disable_aac_widgets(void);
--void enable_aac_widgets(void);
  void disable_musepack_widgets(void);
  void enable_musepack_widgets(void);
- #if GTK_MINOR_VERSION >= 6
-diff -ruN ../asunder-2.0-orig/src/prefs.c src/prefs.c
---- ../asunder-2.0-orig/src/prefs.c	2009-08-25 01:32:28.000000000 +0000
-+++ src/prefs.c	2011-11-08 18:14:40.000000000 +0000
-@@ -122,8 +122,6 @@
+-void disable_fdkaac_widgets(void);
+-void enable_fdkaac_widgets(void);
+ void show_aboutbox (void);
+ void show_completed_dialog(int numOk, int numFailed);
+ void toggle_allow_tracknum(void);
+diff -ruN a/src/prefs.c b/src/prefs.c
+--- a/src/prefs.c	2019-08-29 00:18:58.000000000 -0500
++++ b/src/prefs.c	2021-06-27 16:07:27.299217038 -0500
+@@ -127,8 +127,6 @@
      p->wavpack_bitrate = 3;
      p->rip_monkey = 0;
      p->monkey_compression = 2;
@@ -163,72 +179,74 @@ diff -ruN ../asunder-2.0-orig/src/prefs.c src/prefs.c
 -    p->aac_quality = 60;
      p->rip_musepack = 0;
      p->musepack_bitrate = 2;
-     
-@@ -184,8 +182,6 @@
+     p->rip_opus = 0;
+@@ -203,8 +201,6 @@
      gtk_range_set_value(GTK_RANGE(lookup_widget(win_prefs, "wavpack_bitrate_slider")), p->wavpack_bitrate);
      gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(lookup_widget(win_prefs, "rip_monkey")), p->rip_monkey);
      gtk_range_set_value(GTK_RANGE(lookup_widget(win_prefs, "monkey_compression_slider")), p->monkey_compression);
--    gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(lookup_widget(win_prefs, "rip_aac")), p->rip_aac);
--    gtk_range_set_value(GTK_RANGE(lookup_widget(win_prefs, "aac_quality_slider")), p->aac_quality);
+-    gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(lookup_widget(win_prefs, "rip_fdkaac")), p->rip_fdkaac);
+-    gtk_range_set_value(GTK_RANGE(lookup_widget(win_prefs, "fdkaac_bitrate")), p->fdkaac_bitrate);
      gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(lookup_widget(win_prefs, "rip_musepack")), p->rip_musepack);
      gtk_range_set_value(GTK_RANGE(lookup_widget(win_prefs, "musepack_bitrate_slider")), p->musepack_bitrate);
-     gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(lookup_widget(win_prefs, "eject_on_done")), p->eject_on_done);
-@@ -216,8 +212,6 @@
+     gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(lookup_widget(win_prefs, "rip_opus")), p->rip_opus);
+@@ -242,8 +238,6 @@
          enable_wavpack_widgets(); /* need this to potentially disable hybrid widgets */
      if( !(p->rip_monkey) )
          disable_monkey_widgets();
--    if( !(p->rip_aac) )
--        disable_aac_widgets();
+-    if( !(p->rip_fdkaac) )
+-        disable_fdkaac_widgets();
      if( !(p->rip_musepack) )
          disable_musepack_widgets();
- }
-@@ -275,8 +269,6 @@
+     if (!(p->rip_opus))
+@@ -304,8 +298,6 @@
      p->wavpack_bitrate = (int)gtk_range_get_value(GTK_RANGE(lookup_widget(win_prefs, "wavpack_bitrate_slider")));
      p->rip_monkey = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(lookup_widget(win_prefs, "rip_monkey")));
      p->monkey_compression = (int)gtk_range_get_value(GTK_RANGE(lookup_widget(win_prefs, "monkey_compression_slider")));
--    p->rip_aac = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(lookup_widget(win_prefs, "rip_aac")));
--    p->aac_quality = (int)gtk_range_get_value(GTK_RANGE(lookup_widget(win_prefs, "aac_quality_slider")));
+-    p->rip_fdkaac = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(lookup_widget(win_prefs, "rip_fdkaac")));
+-    p->fdkaac_bitrate = (int)gtk_range_get_value(GTK_RANGE(lookup_widget(win_prefs, "fdkaac_bitrate")));
      p->rip_musepack = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(lookup_widget(win_prefs, "rip_musepack")));
      p->musepack_bitrate = (int)gtk_range_get_value(GTK_RANGE(lookup_widget(win_prefs, "musepack_bitrate_slider")));
-     
-@@ -358,8 +350,6 @@
+     p->rip_opus = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(lookup_widget(win_prefs, "rip_opus")));
+@@ -462,8 +454,6 @@
          fprintf(config, "%d\n", p->cddb_port_number);
          fprintf(config, "%d\n", p->rip_monkey);
          fprintf(config, "%d\n", p->monkey_compression);
--        fprintf(config, "%d\n", p->rip_aac);
--        fprintf(config, "%d\n", p->aac_quality);
+-        fprintf(config, "%s\n", "unused"); /* used to be p->rip_aac */
+-        fprintf(config, "%s\n", "unused"); /* used to be p->aac_quality */
          fprintf(config, "%d\n", p->rip_musepack);
          fprintf(config, "%d\n", p->musepack_bitrate);
          fprintf(config, "%d\n", p->more_formats_expanded);
-@@ -537,12 +527,6 @@
-         p->monkey_compression = read_line_num(fd);
-         
-         // this one can be 0
--        p->rip_aac = read_line_num(fd);
+@@ -683,13 +673,7 @@
+         p->track_num_width = read_line_num(fd);
+         if (p->track_num_width < 1 || p->track_num_width > 4)
+             p->track_num_width = 2;
 -        
 -        // this one can be 0
--        p->aac_quality = read_line_num(fd);
+-        p->rip_fdkaac = read_line_num(fd);
 -        
 -        // this one can be 0
-         p->rip_musepack = read_line_num(fd);
-         
-         // this one can be 0
-diff -ruN ../asunder-2.0-orig/src/prefs.h src/prefs.h
---- ../asunder-2.0-orig/src/prefs.h	2009-09-01 03:22:41.000000000 +0000
-+++ src/prefs.h	2011-11-08 18:20:15.000000000 +0000
+-        p->fdkaac_bitrate = read_line_num(fd);
+-        
++
+         aCharPtr = read_line(fd);
+         if (aCharPtr != NULL)
+         {
+diff -ruN a/src/prefs.h b/src/prefs.h
+--- a/src/prefs.h	2019-08-29 00:18:58.000000000 -0500
++++ b/src/prefs.h	2021-06-27 16:20:10.544156626 -0500
 @@ -34,8 +34,6 @@
      int cddb_port_number;
      int rip_monkey;
      int monkey_compression;
--    int rip_aac;
--    int aac_quality;
+-    int rip_aac; /* no longer used */
+-    int aac_quality; /* no longer used */
      int rip_musepack;
      int musepack_bitrate;
      int more_formats_expanded;
-diff -ruN ../asunder-2.0-orig/src/threads.c src/threads.c
---- ../asunder-2.0-orig/src/threads.c	2010-05-01 22:27:47.000000000 +0000
-+++ src/threads.c	2011-11-08 18:21:22.000000000 +0000
-@@ -39,7 +39,6 @@
+diff -ruN a/src/threads.c b/src/threads.c
+--- a/src/threads.c	2019-08-29 00:18:58.000000000 -0500
++++ b/src/threads.c	2021-06-27 16:30:39.049983041 -0500
+@@ -41,7 +41,6 @@
  static FILE * playlist_wavpack = NULL;
  static FILE * playlist_monkey = NULL;
  static FILE * playlist_musepack = NULL;
@@ -236,7 +254,7 @@ diff -ruN ../asunder-2.0-orig/src/threads.c src/threads.c
  
  /* ripping or encoding, so that can know not to clear the tracklist on eject */
  bool working;
-@@ -60,7 +59,6 @@
+@@ -63,7 +62,6 @@
  static double wavpack_percent;
  static double monkey_percent;
  static double musepack_percent;
@@ -244,65 +262,65 @@ diff -ruN ../asunder-2.0-orig/src/threads.c src/threads.c
  static int rip_tracks_completed;
  static int encode_tracks_completed;
  
-@@ -86,13 +84,11 @@
-         kill(monkey_pid, SIGKILL);
-     if (musepack_pid != 0) 
-         kill(musepack_pid, SIGKILL);
--    if (aac_pid != 0) 
--        kill(aac_pid, SIGKILL);
+@@ -92,13 +90,11 @@
+         kill(pid, SIGKILL);
+     if ((pid = musepack_pid)   != 0)
+         kill(pid, SIGKILL);
+-    if ((pid = fdkaac_pid)     != 0)
+-        kill(pid, SIGKILL);
      
      /* wait until all the worker threads are done */
      while (cdparanoia_pid != 0 || lame_pid != 0 || oggenc_pid != 0 || 
-            flac_pid != 0 || wavpack_pid != 0 || monkey_pid != 0 || 
--           musepack_pid != 0 || aac_pid != 0)
+            opusenc_pid != 0 || flac_pid != 0 || wavpack_pid != 0 || monkey_pid != 0 ||
+-           musepack_pid != 0 || fdkaac_pid != 0)
 +           musepack_pid != 0)
      {
          debugLog("w1");
          usleep(100000);
-@@ -114,8 +110,8 @@
+@@ -120,8 +116,8 @@
      gdk_flush();
      working = false;
      
--    show_completed_dialog(numCdparanoiaOk + numLameOk + numOggOk + numFlacOk + numWavpackOk + numMonkeyOk + numMusepackOk + numAacOk,
--                          numCdparanoiaFailed + numLameFailed + numOggFailed + numFlacFailed + numWavpackFailed + numMonkeyFailed + numMusepackFailed + numAacFailed);
-+    show_completed_dialog(numCdparanoiaOk + numLameOk + numOggOk + numFlacOk + numWavpackOk + numMonkeyOk + numMusepackOk ,
-+                          numCdparanoiaFailed + numLameFailed + numOggFailed + numFlacFailed + numWavpackFailed + numMonkeyFailed + numMusepackFailed );
+-    show_completed_dialog(numCdparanoiaOk + numLameOk + numOggOk + numOpusOk + numFlacOk + numWavpackOk + numMonkeyOk + numMusepackOk + numAacOk,
+-                          numCdparanoiaFailed + numLameFailed + numOggFailed + numOpusFailed + numFlacFailed + numWavpackFailed + numMonkeyFailed + numMusepackFailed + numAacFailed);
++    show_completed_dialog(numCdparanoiaOk + numLameOk + numOggOk + numOpusOk + numFlacOk + numWavpackOk + numMonkeyOk + numMusepackOk,
++                          numCdparanoiaFailed + numLameFailed + numOggFailed + numOpusFailed + numFlacFailed + numWavpackFailed + numMonkeyFailed + numMusepackFailed);
  }
  
  // spawn needed threads and begin ripping
-@@ -134,7 +130,6 @@
+@@ -146,7 +142,6 @@
      wavpack_percent = 0.0;
      monkey_percent = 0.0;
      musepack_percent = 0.0;
 -    aac_percent = 0.0;
      rip_tracks_completed = 0;
      encode_tracks_completed = 0;
- 
-@@ -161,7 +156,7 @@
+     
+@@ -178,7 +173,7 @@
      // make sure there's at least one format to rip to
-     if (!global_prefs->rip_wav && !global_prefs->rip_mp3 && !global_prefs->rip_ogg && 
+     if (!global_prefs->rip_wav && !global_prefs->rip_mp3 && !global_prefs->rip_ogg && !global_prefs->rip_opus &&
          !global_prefs->rip_flac && !global_prefs->rip_wavpack && !global_prefs->rip_monkey &&
--        !global_prefs->rip_musepack && !global_prefs->rip_aac)
-+        !global_prefs->rip_musepack )
+-        !global_prefs->rip_musepack && !global_prefs->rip_fdkaac)
++        !global_prefs->rip_musepack)
      {
          GtkWidget * dialog;
          dialog = gtk_message_dialog_new(GTK_WINDOW(win_main), 
-@@ -291,14 +286,6 @@
+@@ -327,14 +322,6 @@
              
              free(filename);
          }
--        if (global_prefs->rip_aac)
+-        if (global_prefs->rip_fdkaac)
 -        {
 -            char * filename = make_filename(prefs_get_music_dir(global_prefs), albumdir, playlist, "m4a.m3u");
 -            
--            make_playlist(filename, &playlist_monkey);
+-            make_playlist(filename, &playlist_aac);
 -            
 -            free(filename);
 -        }
      }
      
      free(albumdir);
-@@ -313,7 +300,6 @@
+@@ -353,7 +340,6 @@
      numWavpackFailed = 0;
      numMonkeyFailed = 0;
      numMusepackFailed = 0;
@@ -310,7 +328,7 @@ diff -ruN ../asunder-2.0-orig/src/threads.c src/threads.c
      
      numCdparanoiaOk = 0;
      numLameOk = 0;
-@@ -322,7 +308,6 @@
+@@ -363,7 +349,6 @@
      numWavpackOk = 0;
      numMonkeyOk = 0;
      numMusepackOk = 0;
@@ -318,31 +336,49 @@ diff -ruN ../asunder-2.0-orig/src/threads.c src/threads.c
      
      ripper = g_thread_create(rip, NULL, TRUE, NULL);
      encoder = g_thread_create(encode, NULL, TRUE, NULL);
-@@ -461,7 +446,6 @@
-     char* wavpackfilename2 = NULL;
-     char* monkeyfilename = NULL;
-     char* musepackfilename = NULL;
--    char* aacfilename = NULL;
-     struct stat statStruct;
-     bool doEncode;
-     
-@@ -541,7 +525,6 @@
-             wavpackfilename2 = make_filename(prefs_get_music_dir(global_prefs), albumdir, musicfilename, "wvc");
-             monkeyfilename = make_filename(prefs_get_music_dir(global_prefs), albumdir, musicfilename, "ape");
-             musepackfilename = make_filename(prefs_get_music_dir(global_prefs), albumdir, musicfilename, "mpc");
--            aacfilename = make_filename(prefs_get_music_dir(global_prefs), albumdir, musicfilename, "m4a");
-             
-             if (global_prefs->rip_mp3)
-             {
-@@ -745,41 +728,6 @@
-                     fflush(playlist_musepack);
+@@ -554,9 +539,6 @@
+     if (playlist_musepack) 
+         fclose(playlist_musepack);
+     playlist_musepack = NULL;
+-    if (playlist_aac) 
+-        fclose(playlist_aac);
+-    playlist_aac = NULL;
+ }
+ 
+ // the thread that handles encoding WAV files to all other formats
+@@ -1105,65 +1087,6 @@
                  }
+                 free(musepackfilename);
              }
--            if (global_prefs->rip_aac)
+-            if (global_prefs->rip_fdkaac)
 -            {
--                debugLog("Encoding track %d to \"%s\"\n", tracknum, aacfilename);
--                
--                if (aborted) g_thread_exit(NULL);
+-                if (aborted)
+-                {
+-                    free(albumdir);
+-                    free(musicfilename);
+-                    free(wavfilename);
+-                    free(trackartist_trimmed);
+-                    free(tracktitle_trimmed);
+-
+-                    free(trackartist);
+-                    free(tracktitle);
+-                    free(tracktime);
+-
+-                    free(album_artist);
+-                    free(album_title);
+-                    free(album_genre);
+-                    free(album_year);
+-                    free(album_artist_trimmed);
+-                    free(album_title_trimmed);
+-                    free(album_genre_trimmed);
+-
+-                    close_playlists();
+-                    return NULL;
+-                }
+-				
+-                char * aacfilename = make_filename(prefs_get_music_dir(global_prefs), albumdir, musicfilename, "m4a");
+-                snprintf(logStr, 1024, "Encoding track %d to \"%s\"\n", tracknum, aacfilename);
+-                debugLog(logStr);
 -                
 -                rc = stat(aacfilename, &statStruct);
 -                if(rc == 0)
@@ -359,111 +395,90 @@ diff -ruN ../asunder-2.0-orig/src/threads.c src/threads.c
 -                
 -                if(doEncode)
 -                {
--                    aac(wavfilename, aacfilename,
--                        global_prefs->aac_quality, 
--                        &aac_percent);
+-                    fdkaac(tracknum, trackartist, album_title, tracktitle, album_genre, album_year,
+-                           wavfilename, aacfilename,
+-                           global_prefs->fdkaac_bitrate,
+-                           &aac_percent);
 -                }
 -                
--                if (aborted) g_thread_exit(NULL);
--                
 -                if (playlist_aac)
 -                {
 -                    fprintf(playlist_aac, "#EXTINF:%d,%s - %s\n", (min*60)+sec, trackartist, tracktitle);
 -                    fprintf(playlist_aac, "%s\n", basename(aacfilename));
 -                    fflush(playlist_aac);
 -                }
+-                free(aacfilename);
 -            }
              if (!global_prefs->rip_wav)
              {
-                 debugLog("Removing track %d WAV file\n", tracknum);
-@@ -806,7 +754,6 @@
-             free(wavpackfilename);
-             free(monkeyfilename);
-             free(musepackfilename);
--            free(aacfilename);
-             
-             mp3_percent = 0.0;
-             ogg_percent = 0.0;
-@@ -814,7 +761,6 @@
+                 snprintf(logStr, 1024, "Removing track %d WAV file\n", tracknum);
+@@ -1196,7 +1119,6 @@
              wavpack_percent = 0.0;
              monkey_percent = 0.0;
              musepack_percent = 0.0;
 -            aac_percent = 0.0;
              encode_tracks_completed++;
          }
-         
-@@ -843,8 +789,6 @@
-     playlist_monkey = NULL;
-     if (playlist_musepack) fclose(playlist_musepack);
-     playlist_musepack = NULL;
--    if (playlist_aac) fclose(playlist_aac);
--    playlist_aac = NULL;
-     
-     g_mutex_free(barrier);
-     barrier = NULL;
-@@ -854,7 +798,7 @@
+ 
+@@ -1241,7 +1163,7 @@
      /* wait until all the worker threads are done */
      while (cdparanoia_pid != 0 || lame_pid != 0 || oggenc_pid != 0 || 
-            flac_pid != 0 || wavpack_pid != 0 || monkey_pid != 0 ||
--           musepack_pid != 0 || aac_pid != 0)
-+           musepack_pid != 0 )
+            opusenc_pid != 0 || flac_pid != 0 || wavpack_pid != 0 || monkey_pid != 0 ||
+-           musepack_pid != 0 || fdkaac_pid != 0)
++           musepack_pid != 0)
      {
          debugLog("w2");
          usleep(100000);
-@@ -867,8 +811,8 @@
-         gtk_widget_hide(win_ripping);
-         gdk_flush();
-         
--        show_completed_dialog(numCdparanoiaOk + numLameOk + numOggOk + numFlacOk + numWavpackOk + numMonkeyOk + numMusepackOk + numAacOk,
--                              numCdparanoiaFailed + numLameFailed + numOggFailed + numFlacFailed + numWavpackFailed + numMonkeyFailed + numMusepackFailed + numAacFailed);
-+        show_completed_dialog(numCdparanoiaOk + numLameOk + numOggOk + numFlacOk + numWavpackOk + numMonkeyOk + numMusepackOk , 
-+                              numCdparanoiaFailed + numLameFailed + numOggFailed + numFlacFailed + numWavpackFailed + numMonkeyFailed + numMusepackFailed );
+@@ -1260,8 +1182,8 @@
+         eject_disc(global_prefs->cdrom);
+     }
+ 
+-        show_completed_dialog(numCdparanoiaOk + numLameOk + numOggOk + numOpusOk + numFlacOk + numWavpackOk + numMonkeyOk + numMusepackOk + numAacOk,
+-                              numCdparanoiaFailed + numLameFailed + numOggFailed + numOpusFailed + numFlacFailed + numWavpackFailed + numMonkeyFailed + numMusepackFailed + numAacFailed);
++        show_completed_dialog(numCdparanoiaOk + numLameOk + numOggOk + numOpusOk + numFlacOk + numWavpackOk + numMonkeyOk + numMusepackOk,
++                              numCdparanoiaFailed + numLameFailed + numOggFailed + numOpusFailed + numFlacFailed + numWavpackFailed + numMonkeyFailed + numMusepackFailed);
      gdk_threads_leave();
      
      return NULL;
-@@ -890,8 +834,6 @@
+@@ -1286,8 +1208,6 @@
          parts++;
      if(global_prefs->rip_musepack) 
          parts++;
--    if(global_prefs->rip_aac) 
+-    if(global_prefs->rip_fdkaac)
 -        parts++;
      
      gdk_threads_enter();
          GtkProgressBar * progress_total = GTK_PROGRESS_BAR(lookup_widget(win_ripping, "progress_total"));
-@@ -926,10 +868,10 @@
-         
-         debugLog("completed tracks %d, rip %.2lf%%; encoded tracks %d, "
-                  "mp3 %.2lf%% ogg %.2lf%% flac %.2lf%% wavpack %.2lf%% "
--                 "monkey %.2lf%% musepack %.2lf%% aac %.2lf%%\n\n", 
-+                 "monkey %.2lf%% musepack %.2lf%% \n\n", 
-                  rip_tracks_completed, rip_percent*100, encode_tracks_completed, 
-                  mp3_percent*100, ogg_percent*100, flac_percent*100, wavpack_percent*100, 
--                 monkey_percent*100,musepack_percent*100,aac_percent*100);
-+                 monkey_percent*100,musepack_percent*100);
-         
-         prip = (rip_tracks_completed+rip_percent) / tracks_to_rip;
-         snprintf(srip, 13, "%d%% (%d/%d)", (int)(prip*100),
-@@ -941,7 +883,7 @@
+@@ -1331,7 +1251,7 @@
          {
              pencode = ((double)encode_tracks_completed/(double)tracks_to_rip) + 
                         ((mp3_percent+ogg_percent+flac_percent+wavpack_percent+monkey_percent
--                         +musepack_percent+aac_percent) /
-+                         +musepack_percent) /
+-                         +opus_percent+musepack_percent+aac_percent) /
++                         +opus_percent+musepack_percent) /
                          (parts-1) / tracks_to_rip);
              snprintf(sencode, 13, "%d%% (%d/%d)", (int)(pencode*100),
                       (encode_tracks_completed < tracks_to_rip)
-diff -ruN ../asunder-2.0-orig/src/wrappers.c src/wrappers.c
---- ../asunder-2.0-orig/src/wrappers.c	2010-07-17 12:13:29.000000000 +0000
-+++ src/wrappers.c	2011-11-08 18:19:07.000000000 +0000
-@@ -34,7 +34,6 @@
- pid_t wavpack_pid;
- pid_t monkey_pid;
- pid_t musepack_pid;
--pid_t aac_pid;
+@@ -1370,7 +1290,7 @@
+                      "monkey %.2lf%% musepack %.2lf%% aac %.2lf%%; prip %.2lf%% pencode %.2lf%%\n",
+                      rip_tracks_completed, rip_percent*100, encode_tracks_completed,
+                      mp3_percent*100, ogg_percent*100, opus_percent*100, flac_percent*100, wavpack_percent*100,
+-                     monkey_percent*100,musepack_percent*100,aac_percent*100,
++                     monkey_percent*100,musepack_percent*100,
+                      prip*100, pencode*100);
+             debugLog(logStr);
+         }
+diff -ruN a/src/wrappers.c b/src/wrappers.c
+--- a/src/wrappers.c	2019-10-21 07:05:37.000000000 -0500
++++ b/src/wrappers.c	2021-06-27 16:35:20.690511295 -0500
+@@ -37,7 +37,6 @@
+ pid_t wavpack_pid = 0;
+ pid_t monkey_pid = 0;
+ pid_t musepack_pid = 0;
+-pid_t fdkaac_pid = 0;
  
  int numCdparanoiaFailed;
  int numLameFailed;
-@@ -43,7 +42,6 @@
+@@ -47,7 +46,6 @@
  int numWavpackFailed;
  int numMonkeyFailed;
  int numMusepackFailed;
@@ -471,7 +486,7 @@ diff -ruN ../asunder-2.0-orig/src/wrappers.c src/wrappers.c
  
  int numCdparanoiaOk;
  int numLameOk;
-@@ -52,7 +50,6 @@
+@@ -57,7 +55,6 @@
  int numWavpackOk;
  int numMonkeyOk;
  int numMusepackOk;
@@ -479,122 +494,169 @@ diff -ruN ../asunder-2.0-orig/src/wrappers.c src/wrappers.c
  
  int numchildren = 0;
  static bool waitBeforeSigchld;
-@@ -89,7 +86,6 @@
- extern pid_t wavpack_pid;
- extern pid_t monkey_pid;
- extern pid_t musepack_pid;
--extern pid_t aac_pid;
- 
- // signal handler to find out when our child has exited
- void sigchld(int signum)
-@@ -100,9 +96,9 @@
-     pid = wait(&status);
-     
-     debugLog("sigchld for %d (know about wav %d, mp3 %d, ogg %d, flac %d, "
--             "wv %d, ape %d, mpc %d, m4a %d\n",
-+             "wv %d, ape %d, mpc %d\n",
-              pid, cdparanoia_pid, lame_pid, oggenc_pid, flac_pid, 
--             wavpack_pid, monkey_pid, musepack_pid, aac_pid);
-+             wavpack_pid, monkey_pid, musepack_pid);
-     
-     /* this is because i can't seem to be able to block sigchld: */
-     while(waitBeforeSigchld)
-@@ -113,7 +109,7 @@
-     
-     if (pid != cdparanoia_pid && pid != lame_pid && pid != oggenc_pid && 
-         pid != flac_pid && pid != wavpack_pid && pid != monkey_pid &&
--        pid != musepack_pid && pid != aac_pid)
-+        pid != musepack_pid )
-     {
-         printf("SIGCHLD for unknown pid, report bug please");
-     }
-@@ -166,11 +162,6 @@
+@@ -144,11 +141,6 @@
              musepack_pid = 0;
              numMusepackFailed++;
          }
--        else if (pid == aac_pid)
+-        else if (pid == fdkaac_pid)
 -        {
--            aac_pid = 0;
+-            fdkaac_pid = 0;
 -            numAacFailed++;
 -        }
      }
      else
      {
-@@ -210,11 +201,6 @@
+@@ -193,11 +185,6 @@
              musepack_pid = 0;
              numMusepackOk++;
          }
--        else if (pid == aac_pid)
+-        else if (pid == fdkaac_pid)
 -        {
--            aac_pid = 0;
+-            fdkaac_pid = 0;
 -            numAacOk++;
 -        }
      }
-     
-     debugLog("sigchld completed\n");
-@@ -981,50 +967,3 @@
-     }
  }
  
--void aac(char* wavfilename,
--         char* aacfilename,
--         int quality,
+@@ -1345,126 +1332,3 @@
+     *progress = 1;
+ }
+ 
+-void fdkaac(int tracknum,
+-         const char * artist,
+-         const char * album,
+-         const char * title,
+-         const char * genre,
+-         const char * year,
+-         const char* wavfilename,
+-         const char* aacfilename,
+-         int bitrate,
 -         double* progress)
 -{
--    const char* args[8];
+-    const char* args[21];
+-    char bitrate_text[4];
 -    int fd;
 -    int pos;
--    
+-
 -    pos = 0;
--    args[pos++] = "neroAacEnc";
--    
--    args[pos++] = "-q";
--    char qualityParam[5];
--    snprintf(qualityParam, 5, "0.%d", quality);
--    args[pos++] = qualityParam;
--    
--    args[pos++] = "-if";
--    args[pos++] = wavfilename;
--    args[pos++] = "-of";
+-    args[pos++] = "fdkaac";
+-
+-    /* fdkaac has a VBR option but it's unsupported */
+-    args[pos++] = "-m";
+-    args[pos++] = "0";
+-    args[pos++] = "-b";
+-    snprintf(bitrate_text, 4, "%d", int_to_bitrate(bitrate, 0));
+-    args[pos++] = bitrate_text;
+-
+-
+-    char * track = NULL;
+-    if (tracknum > 0 && asprintf(&track, "%d", tracknum) > 0)
+-    {
+-        args[pos++] = "--track";
+-        args[pos++] = track;
+-    }
+-
+-    if ((title != NULL) && (strlen(title) > 0))
+-    {
+-        args[pos++] = "--title";
+-        args[pos++] = title;
+-    }
+-
+-    if ((artist != NULL) && (strlen(artist) > 0))
+-    {
+-        args[pos++] = "--artist";
+-        args[pos++] = artist;
+-    }
+-
+-    if ((album != NULL) && (strlen(album) > 0))
+-    {
+-        args[pos++] = "--album";
+-        args[pos++] = album;
+-    }
+-
+-    if ((genre != NULL) && (strlen(genre) > 0))
+-    {
+-        args[pos++] = "--genre";
+-        args[pos++] = genre;
+-    }
+-
+-    if ((year != NULL) && (strlen(year) > 0))
+-    {
+-        args[pos++] = "--date";
+-        args[pos++] = year;
+-    }
+-
+-    args[pos++] = "-o";
 -    args[pos++] = aacfilename;
+-
+-    args[pos++] = wavfilename;
+-
 -    args[pos++] = NULL;
--    
--    fd = exec_with_output(args, STDERR_FILENO, &aac_pid);
--    
+-
+-    fd = exec_with_output(args, STDERR_FILENO, &fdkaac_pid, NULL);
+-    free(track);
+-
 -    int size;
 -    char buf[256];
+-
 -    do
 -    {
--        /* The Nero encoder doesn't give me an estimate for completion
--        * or any way to estimate it myself, just the number of seconds
--        * done. So just sit in here until the program exits */
--        size = read(fd, &buf[0], 256);
--        
--        if (size == -1 && errno == EINTR)
--        /* signal interrupted read(), try again */
--            size = 1;
+-        pos = -1;
+-        bool interrupted;
+-        do
+-        {
+-            interrupted = FALSE;
+-
+-            pos++;
+-            size = read(fd, &buf[pos], 1);
+-
+-            if (size == -1 && errno == EINTR)
+-            /* signal interrupted read(), try again */
+-            {
+-                pos--;
+-                debugLog("fdkaac() interrupted");
+-                interrupted = TRUE;
+-            }
+-
+-        } while ((size > 0 && pos < 255 && buf[pos] != '\r' && buf[pos] != '\n') || interrupted);
+-
+-        buf[pos] = '\0';
+-
+-        /* We get lines like this:
+-            [28%] 00:14.037/00:49.771 (22x), ETA 00:01.599
+-        */
+-        if ((pos >= 4) && (buf[0] == '[')) {
+-            int percent = 0;
+-            if (sscanf(buf, "[%d%%]", &percent) == 1)
+-            {
+-                *progress = (double) percent / 100.0;
+-            }
+-        }
 -    } while (size > 0);
--    
+-
 -    close(fd);
+-
 -    /* don't go on until the signal for the previous call is handled */
--    while (aac_pid != 0)
+-    while (fdkaac_pid != 0)
 -    {
--        debugLog("w11 (%d)\n", aac_pid);
+-        debugLog("w12\n");
 -        usleep(100000);
 -    }
+-
+-    *progress = 1;
 -}
-diff -ruN ../asunder-2.0-orig/src/wrappers.h src/wrappers.h
---- ../asunder-2.0-orig/src/wrappers.h	2010-04-16 01:15:02.000000000 +0000
-+++ src/wrappers.h	2011-11-08 18:19:37.000000000 +0000
-@@ -8,7 +8,6 @@
+diff -ruN a/src/wrappers.h b/src/wrappers.h
+--- a/src/wrappers.h	2019-08-29 00:18:58.000000000 -0500
++++ b/src/wrappers.h	2021-06-27 16:36:17.366606719 -0500
+@@ -9,7 +9,6 @@
  extern pid_t wavpack_pid;
  extern pid_t monkey_pid;
  extern pid_t musepack_pid;
--extern pid_t aac_pid;
+-extern pid_t fdkaac_pid;
  
  extern int numCdparanoiaFailed;
  extern int numLameFailed;
-@@ -17,7 +16,6 @@
+@@ -19,7 +18,6 @@
  extern int numWavpackFailed;
  extern int numMonkeyFailed;
  extern int numMusepackFailed;
@@ -602,7 +664,7 @@ diff -ruN ../asunder-2.0-orig/src/wrappers.h src/wrappers.h
  
  extern int numCdparanoiaOk;
  extern int numLameOk;
-@@ -26,7 +24,6 @@
+@@ -29,7 +27,6 @@
  extern int numWavpackOk;
  extern int numMonkeyOk;
  extern int numMusepackOk;
@@ -610,11 +672,29 @@ diff -ruN ../asunder-2.0-orig/src/wrappers.h src/wrappers.h
  
  // signal handler to find out when out child has exited
  void sigchld(int signum);
-@@ -130,7 +127,3 @@
+@@ -195,25 +192,3 @@
+               const char * musepackfilename,
                int quality,
                double* progress);
- 
--void aac(char* wavfilename,
--         char* aacfilename,
+-
+-void aac(int tracknum,
+-         const char * artist,
+-         const char * album,
+-         const char * title,
+-         const char * genre,
+-         const char * year,
+-         const char* wavfilename,
+-         const char* aacfilename,
 -         int quality,
 -         double* progress);
+-
+-void fdkaac(int tracknum,
+-         const char * artist,
+-         const char * album,
+-         const char * title,
+-         const char * genre,
+-         const char * year,
+-         const char* wavfilename,
+-         const char* aacfilename,
+-         int bitrate,
+-         double* progress);

helpers/DATA/asunder/asunder.4061-monkey.patch → helpers/DATA/asunder/asunder_2.9.5-monkey.patch

-diff -ruN src-monkey/callbacks.c src/callbacks.c
---- src-monkey/callbacks.c	2011-11-08 19:18:12.000000000 +0000
-+++ src/callbacks.c	2011-11-08 19:29:08.000000000 +0000
-@@ -485,31 +485,6 @@
+diff -ruN b/src/callbacks.c c/src/callbacks.c
+--- b/src/callbacks.c	2021-06-27 15:52:48.030388633 -0500
++++ c/src/callbacks.c	2021-06-27 16:37:37.266736576 -0500
+@@ -835,31 +835,6 @@
  }
  
  void
@@ -33,23 +33,23 @@ diff -ruN src-monkey/callbacks.c src/callbacks.c
  on_rip_musepack_toggled                  (GtkToggleButton *togglebutton,
                                            gpointer         user_data)
  {
-diff -ruN src-monkey/callbacks.h src/callbacks.h
---- src-monkey/callbacks.h	2011-11-08 19:18:12.000000000 +0000
-+++ src/callbacks.h	2011-11-08 19:29:26.000000000 +0000
-@@ -161,9 +161,6 @@
+diff -ruN b/src/callbacks.h c/src/callbacks.h
+--- b/src/callbacks.h	2021-06-27 15:54:41.446511848 -0500
++++ c/src/callbacks.h	2021-06-27 16:38:30.334820157 -0500
+@@ -172,9 +172,6 @@
  on_rip_wavpack_toggled                 (GtkToggleButton *togglebutton,
                                          gpointer         user_data);
  void
 -on_rip_monkey_toggled                  (GtkToggleButton *togglebutton,
--                                        gpointer         user_data);
+-                                     gpointer         user_data);
 -void
  on_rip_musepack_toggled                  (GtkToggleButton *togglebutton,
                                            gpointer         user_data);
  void
-diff -ruN src-monkey/interface.c src/interface.c
---- src-monkey/interface.c	2011-11-08 19:18:12.000000000 +0000
-+++ src/interface.c	2011-11-08 19:30:02.000000000 +0000
-@@ -816,53 +816,6 @@
+diff -ruN b/src/interface.c c/src/interface.c
+--- b/src/interface.c	2021-06-27 16:00:02.926827702 -0500
++++ c/src/interface.c	2021-06-27 16:42:14.287154174 -0500
+@@ -960,53 +960,6 @@
      GLADE_HOOKUP_OBJECT (prefs, rip_musepack, "rip_musepack");
      /* END MUSEPACK */
      
@@ -60,6 +60,7 @@ diff -ruN src-monkey/interface.c src/interface.c
 -    GtkWidget* monkeyVbox;
 -    
 -    frame8 = gtk_frame_new (NULL);
+-    gtk_frame_set_shadow_type(GTK_FRAME(frame8), GTK_SHADOW_IN);
 -    gtk_widget_show (frame8);
 -    gtk_box_pack_start (GTK_BOX (hiddenbox), frame8, FALSE, FALSE, 0);
 -    
@@ -99,11 +100,10 @@ diff -ruN src-monkey/interface.c src/interface.c
 -                                        NULL);
 -    GLADE_HOOKUP_OBJECT (prefs, rip_monkey, "rip_monkey");
 -    /* END MONKEY */
--    
+     
      label = gtk_label_new (_("Encode"));
      gtk_widget_show (label);
-     gtk_notebook_set_tab_label (GTK_NOTEBOOK (notebook1), gtk_notebook_get_nth_page (GTK_NOTEBOOK (notebook1), 2), label);
-@@ -1230,18 +1183,6 @@
+@@ -1424,18 +1377,6 @@
      }
  }
  
@@ -122,31 +122,31 @@ diff -ruN src-monkey/interface.c src/interface.c
  void disable_musepack_widgets(void)
  {
      gtk_widget_set_sensitive(lookup_widget(win_prefs, "musepack_bitrate_lbl"), FALSE);
-@@ -1478,7 +1419,7 @@
+@@ -1847,7 +1788,7 @@
  static const char* 
  GBLcomments = 
  N_("An application to save tracks from an Audio CD \n"
--"as WAV, MP3, OGG, FLAC, Wavpack, Musepack, Monkey's Audio files ");
-+"as WAV, MP3, OGG, FLAC, Wavpack, and Musepack audio files ");
+-"as WAV, MP3, OGG, FLAC, Wavpack, Opus, Musepack, Monkey's Audio files.");
++"as WAV, MP3, OGG, FLAC, Wavpack, Opus and Musepack audio files.");
  
  static const char* 
  GBLcopyright = 
-diff -ruN src-monkey/interface.h src/interface.h
---- src-monkey/interface.h	2011-11-08 19:18:12.000000000 +0000
-+++ src/interface.h	2011-11-08 19:30:17.000000000 +0000
-@@ -13,8 +13,6 @@
- void enable_ogg_widgets(void);
+diff -ruN b/src/interface.h c/src/interface.h
+--- b/src/interface.h	2021-06-27 16:00:37.894859872 -0500
++++ c/src/interface.h	2021-06-27 16:42:38.247188440 -0500
+@@ -15,8 +15,6 @@
+ void enable_opus_widgets(void);
  void disable_wavpack_widgets(void);
  void enable_wavpack_widgets(void);
 -void disable_monkey_widgets(void);
 -void enable_monkey_widgets(void);
  void disable_musepack_widgets(void);
  void enable_musepack_widgets(void);
- #if GTK_MINOR_VERSION >= 6
-diff -ruN src-monkey/prefs.c src/prefs.c
---- src-monkey/prefs.c	2011-11-08 19:18:12.000000000 +0000
-+++ src/prefs.c	2011-11-08 19:31:23.000000000 +0000
-@@ -120,8 +120,6 @@
+ void show_aboutbox (void);
+diff -ruN b/src/prefs.c c/src/prefs.c
+--- b/src/prefs.c	2021-06-27 16:07:27.299217038 -0500
++++ c/src/prefs.c	2021-06-27 16:49:01.759711018 -0500
+@@ -125,8 +125,6 @@
      p->wavpack_compression = 1;
      p->wavpack_hybrid = 1;
      p->wavpack_bitrate = 3;
@@ -154,8 +154,8 @@ diff -ruN src-monkey/prefs.c src/prefs.c
 -    p->monkey_compression = 2;
      p->rip_musepack = 0;
      p->musepack_bitrate = 2;
-     
-@@ -180,8 +178,6 @@
+     p->rip_opus = 0;
+@@ -199,8 +197,6 @@
      gtk_range_set_value(GTK_RANGE(lookup_widget(win_prefs, "wavpack_compression")), p->wavpack_compression);
      gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(lookup_widget(win_prefs, "wavpack_hybrid")), p->wavpack_hybrid);
      gtk_range_set_value(GTK_RANGE(lookup_widget(win_prefs, "wavpack_bitrate_slider")), p->wavpack_bitrate);
@@ -163,8 +163,8 @@ diff -ruN src-monkey/prefs.c src/prefs.c
 -    gtk_range_set_value(GTK_RANGE(lookup_widget(win_prefs, "monkey_compression_slider")), p->monkey_compression);
      gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(lookup_widget(win_prefs, "rip_musepack")), p->rip_musepack);
      gtk_range_set_value(GTK_RANGE(lookup_widget(win_prefs, "musepack_bitrate_slider")), p->musepack_bitrate);
-     gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(lookup_widget(win_prefs, "eject_on_done")), p->eject_on_done);
-@@ -210,8 +206,6 @@
+     gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(lookup_widget(win_prefs, "rip_opus")), p->rip_opus);
+@@ -236,8 +232,6 @@
          disable_wavpack_widgets();
      else
          enable_wavpack_widgets(); /* need this to potentially disable hybrid widgets */
@@ -172,8 +172,8 @@ diff -ruN src-monkey/prefs.c src/prefs.c
 -        disable_monkey_widgets();
      if( !(p->rip_musepack) )
          disable_musepack_widgets();
- }
-@@ -267,8 +261,6 @@
+     if (!(p->rip_opus))
+@@ -296,8 +290,6 @@
      p->wavpack_compression = (int)gtk_range_get_value(GTK_RANGE(lookup_widget(win_prefs, "wavpack_compression")));
      p->wavpack_hybrid = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(lookup_widget(win_prefs, "wavpack_hybrid")));
      p->wavpack_bitrate = (int)gtk_range_get_value(GTK_RANGE(lookup_widget(win_prefs, "wavpack_bitrate_slider")));
@@ -181,8 +181,8 @@ diff -ruN src-monkey/prefs.c src/prefs.c
 -    p->monkey_compression = (int)gtk_range_get_value(GTK_RANGE(lookup_widget(win_prefs, "monkey_compression_slider")));
      p->rip_musepack = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(lookup_widget(win_prefs, "rip_musepack")));
      p->musepack_bitrate = (int)gtk_range_get_value(GTK_RANGE(lookup_widget(win_prefs, "musepack_bitrate_slider")));
-     
-@@ -348,8 +340,6 @@
+     p->rip_opus = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(lookup_widget(win_prefs, "rip_opus")));
+@@ -452,8 +444,6 @@
          fprintf(config, "%d\n", p->do_log);
          fprintf(config, "%s\n", p->cddb_server_name);
          fprintf(config, "%d\n", p->cddb_port_number);
@@ -191,22 +191,22 @@ diff -ruN src-monkey/prefs.c src/prefs.c
          fprintf(config, "%d\n", p->rip_musepack);
          fprintf(config, "%d\n", p->musepack_bitrate);
          fprintf(config, "%d\n", p->more_formats_expanded);
-@@ -521,12 +511,6 @@
+@@ -626,12 +616,6 @@
+             p->cddb_port_number = DEFAULT_CDDB_SERVER_PORT;
          }
          
-         // this one can be 0
+-        // this one can be 0
 -        p->rip_monkey = read_line_num(fd);
 -        
 -        // this one can be 0
 -        p->monkey_compression = read_line_num(fd);
 -        
--        // this one can be 0
-         p->rip_musepack = read_line_num(fd);
-         
-         // this one can be 0
-diff -ruN src-monkey/prefs.h src/prefs.h
---- src-monkey/prefs.h	2011-11-08 19:18:12.000000000 +0000
-+++ src/prefs.h	2011-11-08 19:31:47.000000000 +0000
+         /* used to be p->rip_aac, but no longer used */
+         aCharPtr = read_line(fd);
+         if (aCharPtr != NULL)
+diff -ruN b/src/prefs.h c/src/prefs.h
+--- b/src/prefs.h	2021-06-27 16:20:10.544156626 -0500
++++ c/src/prefs.h	2021-06-27 16:50:15.719807686 -0500
 @@ -32,8 +32,6 @@
      int do_log;
      char* cddb_server_name;
@@ -216,70 +216,71 @@ diff -ruN src-monkey/prefs.h src/prefs.h
      int rip_musepack;
      int musepack_bitrate;
      int more_formats_expanded;
-diff -ruN src-monkey/threads.c src/threads.c
---- src-monkey/threads.c	2011-11-08 19:18:12.000000000 +0000
-+++ src/threads.c	2011-11-08 19:28:27.000000000 +0000
-@@ -37,7 +37,6 @@
- static FILE * playlist_ogg = NULL;
+diff -ruN b/src/threads.c c/src/threads.c
+--- b/src/threads.c	2021-06-27 16:30:39.049983041 -0500
++++ c/src/threads.c	2021-06-27 16:59:37.104253676 -0500
+@@ -39,7 +39,6 @@
+ static FILE * playlist_opus = NULL;
  static FILE * playlist_flac = NULL;
  static FILE * playlist_wavpack = NULL;
 -static FILE * playlist_monkey = NULL;
  static FILE * playlist_musepack = NULL;
  
  /* ripping or encoding, so that can know not to clear the tracklist on eject */
-@@ -57,7 +56,6 @@
- static double ogg_percent;
+@@ -60,7 +59,6 @@
+ static double opus_percent;
  static double flac_percent;
  static double wavpack_percent;
 -static double monkey_percent;
  static double musepack_percent;
  static int rip_tracks_completed;
  static int encode_tracks_completed;
-@@ -80,14 +78,12 @@
-         kill(flac_pid, SIGKILL);
-     if (wavpack_pid != 0) 
-         kill(wavpack_pid, SIGKILL);
--    if (monkey_pid != 0) 
--        kill(monkey_pid, SIGKILL);
-     if (musepack_pid != 0) 
-         kill(musepack_pid, SIGKILL);
+@@ -86,14 +84,12 @@
+         kill(pid, SIGKILL);
+     if ((pid = wavpack_pid)    != 0)
+         kill(pid, SIGKILL);
+-    if ((pid = monkey_pid)     != 0)
+-        kill(pid, SIGKILL);
+-    if ((pid = musepack_pid)   != 0)
++   if ((pid = musepack_pid)   != 0)
+         kill(pid, SIGKILL);
      
      /* wait until all the worker threads are done */
      while (cdparanoia_pid != 0 || lame_pid != 0 || oggenc_pid != 0 || 
--           flac_pid != 0 || wavpack_pid != 0 || monkey_pid != 0 || 
-+           flac_pid != 0 || wavpack_pid != 0 || 
+-           opusenc_pid != 0 || flac_pid != 0 || wavpack_pid != 0 || monkey_pid != 0 ||
++           opusenc_pid != 0 || flac_pid != 0 || wavpack_pid != 0 ||
             musepack_pid != 0)
      {
          debugLog("w1");
-@@ -110,8 +106,8 @@
+@@ -116,8 +112,8 @@
      gdk_flush();
      working = false;
      
--    show_completed_dialog(numCdparanoiaOk + numLameOk + numOggOk + numFlacOk + numWavpackOk + numMonkeyOk + numMusepackOk ,
--                          numCdparanoiaFailed + numLameFailed + numOggFailed + numFlacFailed + numWavpackFailed + numMonkeyFailed + numMusepackFailed );
-+    show_completed_dialog(numCdparanoiaOk + numLameOk + numOggOk + numFlacOk + numWavpackOk + numMusepackOk ,
-+                          numCdparanoiaFailed + numLameFailed + numOggFailed + numFlacFailed + numWavpackFailed + numMusepackFailed );
+-    show_completed_dialog(numCdparanoiaOk + numLameOk + numOggOk + numOpusOk + numFlacOk + numWavpackOk + numMonkeyOk + numMusepackOk,
+-                          numCdparanoiaFailed + numLameFailed + numOggFailed + numOpusFailed + numFlacFailed + numWavpackFailed + numMonkeyFailed + numMusepackFailed);
++    show_completed_dialog(numCdparanoiaOk + numLameOk + numOggOk + numOpusOk + numFlacOk + numWavpackOk + numMusepackOk,
++                          numCdparanoiaFailed + numLameFailed + numOggFailed + numOpusFailed + numFlacFailed + numWavpackFailed + numMusepackFailed);
  }
  
  // spawn needed threads and begin ripping
-@@ -128,7 +124,6 @@
-     ogg_percent = 0.0;
+@@ -140,7 +136,6 @@
+     opus_percent = 0.0;
      flac_percent = 0.0;
      wavpack_percent = 0.0;
 -    monkey_percent = 0.0;
      musepack_percent = 0.0;
      rip_tracks_completed = 0;
      encode_tracks_completed = 0;
-@@ -155,7 +150,7 @@
+@@ -172,7 +167,7 @@
      
      // make sure there's at least one format to rip to
-     if (!global_prefs->rip_wav && !global_prefs->rip_mp3 && !global_prefs->rip_ogg && 
+     if (!global_prefs->rip_wav && !global_prefs->rip_mp3 && !global_prefs->rip_ogg && !global_prefs->rip_opus &&
 -        !global_prefs->rip_flac && !global_prefs->rip_wavpack && !global_prefs->rip_monkey &&
 +        !global_prefs->rip_flac && !global_prefs->rip_wavpack &&
-         !global_prefs->rip_musepack )
+         !global_prefs->rip_musepack)
      {
          GtkWidget * dialog;
-@@ -270,19 +265,11 @@
+@@ -306,14 +301,6 @@
              
              free(filename);
          }
@@ -294,53 +295,65 @@ diff -ruN src-monkey/threads.c src/threads.c
          if (global_prefs->rip_musepack)
          {
              char * filename = make_filename(prefs_get_music_dir(global_prefs), albumdir, playlist, "mpc.m3u");
-             
--            make_playlist(filename, &playlist_monkey);
-+            make_playlist(filename, &playlist_musepack);
-             
-             free(filename);
-         }
-@@ -298,7 +285,6 @@
-     numOggFailed = 0;
+@@ -338,7 +325,6 @@
+     numOpusFailed = 0;
      numFlacFailed = 0;
      numWavpackFailed = 0;
 -    numMonkeyFailed = 0;
      numMusepackFailed = 0;
      
      numCdparanoiaOk = 0;
-@@ -306,7 +292,6 @@
-     numOggOk = 0;
+@@ -347,7 +333,6 @@
+     numOpusOk = 0;
      numFlacOk = 0;
      numWavpackOk = 0;
 -    numMonkeyOk = 0;
      numMusepackOk = 0;
      
      ripper = g_thread_create(rip, NULL, TRUE, NULL);
-@@ -444,7 +429,6 @@
-     char* flacfilename = NULL;
-     char* wavpackfilename = NULL;
-     char* wavpackfilename2 = NULL;
--    char* monkeyfilename = NULL;
-     char* musepackfilename = NULL;
-     struct stat statStruct;
-     bool doEncode;
-@@ -523,7 +507,6 @@
-             flacfilename = make_filename(prefs_get_music_dir(global_prefs), albumdir, musicfilename, "flac");
-             wavpackfilename = make_filename(prefs_get_music_dir(global_prefs), albumdir, musicfilename, "wv");
-             wavpackfilename2 = make_filename(prefs_get_music_dir(global_prefs), albumdir, musicfilename, "wvc");
--            monkeyfilename = make_filename(prefs_get_music_dir(global_prefs), albumdir, musicfilename, "ape");
-             musepackfilename = make_filename(prefs_get_music_dir(global_prefs), albumdir, musicfilename, "mpc");
-             
-             if (global_prefs->rip_mp3)
-@@ -658,41 +641,6 @@
-                     fflush(playlist_wavpack);
-                 }
+@@ -533,9 +518,6 @@
+     if (playlist_wavpack) 
+         fclose(playlist_wavpack);
+     playlist_wavpack = NULL;
+-    if (playlist_monkey) 
+-        fclose(playlist_monkey);
+-    playlist_monkey = NULL;
+     if (playlist_musepack) 
+         fclose(playlist_musepack);
+     playlist_musepack = NULL;
+@@ -970,64 +952,6 @@
+                 free(wavpackfilename);
+                 free(wavpackfilename2);
              }
 -            if (global_prefs->rip_monkey)
 -            {
--                debugLog("Encoding track %d to \"%s\"\n", tracknum, monkeyfilename);
--                
--                if (aborted) g_thread_exit(NULL);
+-                if (aborted)
+-                {
+-                    free(albumdir);
+-                    free(musicfilename);
+-                    free(wavfilename);
+-                    free(trackartist_trimmed);
+-                    free(tracktitle_trimmed);
+-
+-                    free(trackartist);
+-                    free(tracktitle);
+-                    free(tracktime);
+-
+-                    free(album_artist);
+-                    free(album_title);
+-                    free(album_genre);
+-                    free(album_year);
+-                    free(album_artist_trimmed);
+-                    free(album_title_trimmed);
+-                    free(album_genre_trimmed);
+-
+-                    close_playlists();
+-                    return NULL;
+-                }
+-
+-                char * monkeyfilename = make_filename(prefs_get_music_dir(global_prefs), albumdir, musicfilename, "ape");
+-                snprintf(logStr, 1024, "Encoding track %d to \"%s\"\n", tracknum, monkeyfilename);
+-                debugLog(logStr);
 -                
 -                rc = stat(monkeyfilename, &statStruct);
 -                if(rc == 0)
@@ -362,63 +375,46 @@ diff -ruN src-monkey/threads.c src/threads.c
 -                        &monkey_percent);
 -                }
 -                
--                if (aborted) g_thread_exit(NULL);
--                
 -                if (playlist_monkey)
 -                {
 -                    fprintf(playlist_monkey, "#EXTINF:%d,%s - %s\n", (min*60)+sec, trackartist, tracktitle);
 -                    fprintf(playlist_monkey, "%s\n", basename(monkeyfilename));
 -                    fflush(playlist_monkey);
 -                }
+-                free(monkeyfilename);
 -            }
              if (global_prefs->rip_musepack)
              {
-                 debugLog("Encoding track %d to \"%s\"\n", tracknum, musepackfilename);
-@@ -752,14 +700,12 @@
-             free(oggfilename);
-             free(flacfilename);
-             free(wavpackfilename);
--            free(monkeyfilename);
-             free(musepackfilename);
-             
-             mp3_percent = 0.0;
-             ogg_percent = 0.0;
+                 if (aborted)
+@@ -1117,7 +1041,6 @@
+             opus_percent = 0.0;
              flac_percent = 0.0;
              wavpack_percent = 0.0;
 -            monkey_percent = 0.0;
              musepack_percent = 0.0;
              encode_tracks_completed++;
          }
-@@ -785,8 +731,6 @@
-     playlist_flac = NULL;
-     if (playlist_wavpack) fclose(playlist_wavpack);
-     playlist_wavpack = NULL;
--    if (playlist_monkey) fclose(playlist_monkey);
--    playlist_monkey = NULL;
-     if (playlist_musepack) fclose(playlist_musepack);
-     playlist_musepack = NULL;
-     
-@@ -797,7 +741,7 @@
+@@ -1162,7 +1085,7 @@
      
      /* wait until all the worker threads are done */
      while (cdparanoia_pid != 0 || lame_pid != 0 || oggenc_pid != 0 || 
--           flac_pid != 0 || wavpack_pid != 0 || monkey_pid != 0 ||
-+           flac_pid != 0 || wavpack_pid != 0 ||
-            musepack_pid != 0 )
+-           opusenc_pid != 0 || flac_pid != 0 || wavpack_pid != 0 || monkey_pid != 0 ||
++           opusenc_pid != 0 || flac_pid != 0 || wavpack_pid != 0 ||
+            musepack_pid != 0)
      {
          debugLog("w2");
-@@ -811,8 +755,8 @@
-         gtk_widget_hide(win_ripping);
-         gdk_flush();
-         
--        show_completed_dialog(numCdparanoiaOk + numLameOk + numOggOk + numFlacOk + numWavpackOk + numMonkeyOk + numMusepackOk , 
--                              numCdparanoiaFailed + numLameFailed + numOggFailed + numFlacFailed + numWavpackFailed + numMonkeyFailed + numMusepackFailed );
-+        show_completed_dialog(numCdparanoiaOk + numLameOk + numOggOk + numFlacOk + numWavpackOk + numMusepackOk , 
-+                              numCdparanoiaFailed + numLameFailed + numOggFailed + numFlacFailed + numWavpackFailed + numMusepackFailed );
+@@ -1182,8 +1105,8 @@
+         eject_disc(global_prefs->cdrom);
+     }
+ 
+-        show_completed_dialog(numCdparanoiaOk + numLameOk + numOggOk + numOpusOk + numFlacOk + numWavpackOk + numMonkeyOk + numMusepackOk,
+-                              numCdparanoiaFailed + numLameFailed + numOggFailed + numOpusFailed + numFlacFailed + numWavpackFailed + numMonkeyFailed + numMusepackFailed);
++        show_completed_dialog(numCdparanoiaOk + numLameOk + numOggOk + numOpusOk + numFlacOk + numWavpackOk + numMusepackOk,
++                              numCdparanoiaFailed + numLameFailed + numOggFailed + numOpusFailed + numFlacFailed + numWavpackFailed + numMusepackFailed);
      gdk_threads_leave();
      
      return NULL;
-@@ -830,8 +774,6 @@
+@@ -1204,8 +1127,6 @@
          parts++;
      if(global_prefs->rip_wavpack) 
          parts++;
@@ -427,82 +423,56 @@ diff -ruN src-monkey/threads.c src/threads.c
      if(global_prefs->rip_musepack) 
          parts++;
      
-@@ -868,10 +810,10 @@
-         
-         debugLog("completed tracks %d, rip %.2lf%%; encoded tracks %d, "
-                  "mp3 %.2lf%% ogg %.2lf%% flac %.2lf%% wavpack %.2lf%% "
--                 "monkey %.2lf%% musepack %.2lf%% \n\n", 
-+                 "musepack %.2lf%% \n\n", 
-                  rip_tracks_completed, rip_percent*100, encode_tracks_completed, 
-                  mp3_percent*100, ogg_percent*100, flac_percent*100, wavpack_percent*100, 
--                 monkey_percent*100,musepack_percent*100);
-+                 musepack_percent*100);
-         
-         prip = (rip_tracks_completed+rip_percent) / tracks_to_rip;
-         snprintf(srip, 13, "%d%% (%d/%d)", (int)(prip*100),
-@@ -882,7 +824,7 @@
+@@ -1250,7 +1171,7 @@
          if (parts > 1)
          {
              pencode = ((double)encode_tracks_completed/(double)tracks_to_rip) + 
 -                       ((mp3_percent+ogg_percent+flac_percent+wavpack_percent+monkey_percent
 +                       ((mp3_percent+ogg_percent+flac_percent+wavpack_percent
-                          +musepack_percent) /
+                          +opus_percent+musepack_percent) /
                          (parts-1) / tracks_to_rip);
              snprintf(sencode, 13, "%d%% (%d/%d)", (int)(pencode*100),
-diff -ruN src-monkey/wrappers.c src/wrappers.c
---- src-monkey/wrappers.c	2011-11-08 19:18:12.000000000 +0000
-+++ src/wrappers.c	2011-11-08 19:21:50.000000000 +0000
-@@ -32,7 +32,6 @@
- pid_t oggenc_pid;
- pid_t flac_pid;
- pid_t wavpack_pid;
--pid_t monkey_pid;
- pid_t musepack_pid;
+@@ -1287,10 +1208,10 @@
+         if ((looper % 20) == 0) {
+             snprintf(logStr, 1024, "completed tracks %d, rip %.2lf%%; encoded tracks %d, "
+                      "mp3 %.2lf%% ogg %.2lf%% opus %.2lf%% flac %.2lf%% wavpack %.2lf%% "
+-                     "monkey %.2lf%% musepack %.2lf%% aac %.2lf%%; prip %.2lf%% pencode %.2lf%%\n",
++                     "musepack %.2lf%% aac %.2lf%%; prip %.2lf%% pencode %.2lf%%\n",
+                      rip_tracks_completed, rip_percent*100, encode_tracks_completed,
+                      mp3_percent*100, ogg_percent*100, opus_percent*100, flac_percent*100, wavpack_percent*100,
+-                     monkey_percent*100,musepack_percent*100,
++                     musepack_percent*100,
+                      prip*100, pencode*100);
+             debugLog(logStr);
+         }
+diff -ruN b/src/wrappers.c c/src/wrappers.c
+--- b/src/wrappers.c	2021-06-27 16:35:20.690511295 -0500
++++ c/src/wrappers.c	2021-06-27 17:02:42.840406254 -0500
+@@ -35,7 +35,6 @@
+ pid_t opusenc_pid = 0;
+ pid_t flac_pid = 0;
+ pid_t wavpack_pid = 0;
+-pid_t monkey_pid = 0;
+ pid_t musepack_pid = 0;
  
  int numCdparanoiaFailed;
-@@ -40,7 +39,6 @@
- int numOggFailed;
+@@ -44,7 +43,6 @@
+ int numOpusFailed;
  int numFlacFailed;
  int numWavpackFailed;
 -int numMonkeyFailed;
  int numMusepackFailed;
  
  int numCdparanoiaOk;
-@@ -48,7 +46,6 @@
- int numOggOk;
+@@ -53,7 +51,6 @@
+ int numOpusOk;
  int numFlacOk;
  int numWavpackOk;
 -int numMonkeyOk;
  int numMusepackOk;
  
  int numchildren = 0;
-@@ -84,7 +81,6 @@
- extern pid_t oggenc_pid;
- extern pid_t flac_pid;
- extern pid_t wavpack_pid;
--extern pid_t monkey_pid;
- extern pid_t musepack_pid;
- 
- // signal handler to find out when our child has exited
-@@ -98,7 +94,7 @@
-     debugLog("sigchld for %d (know about wav %d, mp3 %d, ogg %d, flac %d, "
-              "wv %d, ape %d, mpc %d\n",
-              pid, cdparanoia_pid, lame_pid, oggenc_pid, flac_pid, 
--             wavpack_pid, monkey_pid, musepack_pid);
-+             wavpack_pid, musepack_pid);
-     
-     /* this is because i can't seem to be able to block sigchld: */
-     while(waitBeforeSigchld)
-@@ -108,7 +104,7 @@
-     }
-     
-     if (pid != cdparanoia_pid && pid != lame_pid && pid != oggenc_pid && 
--        pid != flac_pid && pid != wavpack_pid && pid != monkey_pid &&
-+        pid != flac_pid && pid != wavpack_pid && 
-         pid != musepack_pid )
-     {
-         printf("SIGCHLD for unknown pid, report bug please");
-@@ -152,11 +148,6 @@
+@@ -131,11 +128,6 @@
              wavpack_pid = 0;
              numWavpackFailed++;
          }
@@ -514,7 +484,7 @@ diff -ruN src-monkey/wrappers.c src/wrappers.c
          else if (pid == musepack_pid)
          {
              musepack_pid = 0;
-@@ -191,11 +182,6 @@
+@@ -175,11 +167,6 @@
              wavpack_pid = 0;
              numWavpackOk++;
          }
@@ -526,13 +496,12 @@ diff -ruN src-monkey/wrappers.c src/wrappers.c
          else if (pid == musepack_pid)
          {
              musepack_pid = 0;
-@@ -848,64 +834,6 @@
-         usleep(100000);
-     }
+@@ -1158,65 +1145,6 @@
+     *progress = 1;
  }
--
--void mac(char* wavfilename,
--         char* monkeyfilename,
+ 
+-void mac(const char* wavfilename,
+-         const char* monkeyfilename,
 -         int compression,
 -         double* progress)
 -{
@@ -551,7 +520,7 @@ diff -ruN src-monkey/wrappers.c src/wrappers.c
 -    
 -    args[pos++] = NULL;
 -    
--    fd = exec_with_output(args, STDERR_FILENO, &monkey_pid);
+-    fd = exec_with_output(args, STDERR_FILENO, &monkey_pid, NULL);
 -    
 -    int size;
 -    char buf[256];
@@ -570,7 +539,7 @@ diff -ruN src-monkey/wrappers.c src/wrappers.c
 -                size = 1;
 -            }
 -            
--        } while ((buf[pos] != '\r') && (buf[pos] != '\n') && (size > 0) && (pos < 256));
+-        } while ((buf[pos] != '\r') && (buf[pos] != '\n') && (size > 0) && (pos < 255));
 -        buf[pos] = '\0';
 -        
 -        double percent;
@@ -584,49 +553,51 @@ diff -ruN src-monkey/wrappers.c src/wrappers.c
 -    /* don't go on until the signal for the previous call is handled */
 -    while (monkey_pid != 0)
 -    {
--        debugLog("w9 (%d)\n", monkey_pid);
+-        debugLog("w9\n");
 -        usleep(100000);
 -    }
+-    *progress = 1;
 -}
- 
- void musepack(char* wavfilename,
-               char* musepackfilename,
-diff -ruN src-monkey/wrappers.h src/wrappers.h
---- src-monkey/wrappers.h	2011-11-08 19:18:12.000000000 +0000
-+++ src/wrappers.h	2011-11-08 19:32:52.000000000 +0000
-@@ -6,7 +6,6 @@
- extern pid_t oggenc_pid;
+-
+ // uses mpcenc to encode a WAV file into a .mpc and tag it
+ //
+ // tracknum - the track number
+diff -ruN b/src/wrappers.h c/src/wrappers.h
+--- b/src/wrappers.h	2021-06-27 16:36:17.366606719 -0500
++++ c/src/wrappers.h	2021-06-27 17:03:50.812466083 -0500
+@@ -7,7 +7,6 @@
+ extern pid_t opusenc_pid;
  extern pid_t flac_pid;
  extern pid_t wavpack_pid;
 -extern pid_t monkey_pid;
  extern pid_t musepack_pid;
  
  extern int numCdparanoiaFailed;
-@@ -14,7 +13,6 @@
- extern int numOggFailed;
+@@ -16,7 +15,6 @@
+ extern int numOpusFailed;
  extern int numFlacFailed;
  extern int numWavpackFailed;
 -extern int numMonkeyFailed;
  extern int numMusepackFailed;
  
  extern int numCdparanoiaOk;
-@@ -22,7 +20,6 @@
- extern int numOggOk;
+@@ -25,7 +23,6 @@
+ extern int numOpusOk;
  extern int numFlacOk;
  extern int numWavpackOk;
 -extern int numMonkeyOk;
  extern int numMusepackOk;
  
  // signal handler to find out when out child has exited
-@@ -117,11 +114,6 @@
+@@ -167,11 +164,6 @@
               int bitrate,
               double * progress);
  
--void mac(char* wavfilename,
--         char* monkeyfilename,
+-void mac(const char* wavfilename,
+-         const char* monkeyfilename,
 -         int compression,
 -         double* progress);
 -
- void musepack(char* wavfilename,
-               char* musepackfilename,
-               int quality,
+ // uses mpcenc to encode a WAV file into a .mpc and tag it
+ //
+ // tracknum - the track number

helpers/DATA/atril/apparmor-profile

+# vim:syntax=apparmor
+
+# evince is not written with application confinement in mind and is designed to
+# operate within a trusted desktop session where anything running within the
+# user's session is trusted. That said, evince will often process untrusted
+# input (PDFs, images, etc). Ideally evince would be written in such a way that
+# image processing is separate from the main process and that processing
+# happens in a restrictive sandbox, but unfortunately that is not currently the
+# case. Because evince will process untrusted input, this profile aims to
+# provide some hardening, but considering evince's design and other factors such
+# as X, gsettings, accessibility, translations, DBus session and system
+# services, etc, complete confinement is not possible.
+
+#include <tunables/global>
+
+/usr/bin/atril {
+  #include <abstractions/audio>
+  #include <abstractions/bash>
+  #include <abstractions/cups-client>
+  #include <abstractions/dbus-accessibility>
+  #include <abstractions/atril>
+  #include <abstractions/ibus>
+  #include <abstractions/nameservice>
+
+  #include <abstractions/ubuntu-browsers>
+  #include <abstractions/ubuntu-console-browsers>
+  #include <abstractions/ubuntu-email>
+  #include <abstractions/ubuntu-console-email>
+  #include <abstractions/ubuntu-media-players>
+
+  # allow atril to spawn browsers distributed as snaps (LP: #1794064)
+  #include <abstractions/snap_browsers>
+
+  # For now, let atril talk to any session services over dbus. We can
+  # blacklist any problematic ones (but note, evince uses libsecret :\)
+  #include <abstractions/dbus-session>
+
+  #include <abstractions/dbus-strict>
+  dbus (receive) bus=system,
+  # Allow getting information from various system services
+  dbus (send)
+      bus=system
+      member="Get*"
+      peer=(label=unconfined),
+  # Allow talking to avahi with whatever polkit allows
+  dbus (send)
+      bus=system
+      interface="org.freedesktop.Avahi{,.*}",
+  # Allow talking to colord with whatever polkit allows
+  dbus (send)
+      bus=system
+      interface="org.freedesktop.ColorManager{,.*}",
+
+  # Terminals for using console applications. These abstractions should ideally
+  # have 'ix' to restrict access to what only atril is allowed to do
+  #include <abstractions/ubuntu-gnome-terminal>
+
+  # By default, we won't support launching a terminal program in Xterm or
+  # KDE's konsole. It opens up too many unnecessary files for most users.
+  # People who need this functionality can uncomment the following:
+  ##include <abstractions/ubuntu-xterm>
+  ##include <abstractions/ubuntu-konsole>
+
+  /usr/bin/atril rmPx,
+  /usr/bin/atril-previewer Px,
+  /usr/bin/yelp Cx -> sanitized_helper,
+  /usr/bin/bug-buddy px,
+  # 'Show Containing Folder' (LP: #1022962)
+  /usr/bin/nautilus Cx -> sanitized_helper, # Gnome
+  /usr/bin/pcmanfm Cx -> sanitized_helper,  # LXDE
+  /usr/bin/krusader Cx -> sanitized_helper, # KDE
+  /usr/bin/thunar Cx -> sanitized_helper,   # XFCE
+
+  # Print Dialog
+  /usr/lib/@{multiarch}/libproxy/*/pxgsettings Cx -> sanitized_helper,
+
+  # For Xubuntu to launch the browser
+  #include <abstractions/exo-open>
+
+  # For text attachments
+  /usr/bin/gedit ixr,
+
+  # For Send to
+  /usr/bin/nautilus-sendto Cx -> sanitized_helper,
+
+  # GLib desktop launch helper (used under the hood by g_app_info_launch)
+  /usr/lib/@{multiarch}/glib-[0-9]*/gio-launch-desktop rmix,
+  /usr/bin/env ixr,
+
+  # allow directory listings (ie 'r' on directories) so browsing via the file
+  # dialog works
+  / r,
+  /**/ r,
+
+  # This is need for saving files in your home directory without an extension.
+  # Changing this to '@{HOME}/** r' makes it require an extension and more
+  # secure (but with 'rw', we still have abstractions/private-files-strict in
+  # effect).
+  owner @{HOME}/** rw,
+  owner /media/**  rw,
+  owner @{HOME}/.local/share/gvfs-metadata/** l,
+  owner /{,var/}run/user/*/gvfs-metadata/** l,
+
+  # Maybe add to an abstraction?
+  /etc/dconf/**                                       r,
+  owner @{HOME}/.cache/dconf/user                     rw,
+  owner @{HOME}/.config/dconf/user                    r,
+  owner @{HOME}/.config/enchant/*                     rk,
+  owner /{,var/}run/user/*/dconf/                     w,
+  owner /{,var/}run/user/*/dconf/user                 rw,
+  owner /{,var/}run/user/*/dconf-service/keyfile/     w,
+  owner /{,var/}run/user/*/dconf-service/keyfile/user rw,
+
+  owner /{,var/}run/user/*/at-spi2-*/   rw,
+  owner /{,var/}run/user/*/at-spi2-*/** rw,
+
+  # Allow access to the non-abstract D-Bus socket used by at-spi > 2.42.0
+  #   https://gitlab.gnome.org/GNOME/at-spi2-core/-/issues/43
+  owner /{,var/}run/user/*/at-spi/bus* rw,
+
+  # from http://live.gnome.org/Evince/SupportedDocumentFormats. Allow
+  # read and write for all supported file formats
+  /**.[aA][iI]         rw,
+  /**.[bB][mM][pP]     rw,
+  /**.[dD][jJ][vV][uU] rw,
+  /**.[dD][vV][iI]     rw,
+  /**.[gG][iI][fF]     rw,
+  /**.[jJ][pP][gG]     rw,
+  /**.[jJ][pP][eE][gG] rw,
+  /**.[oO][dD][pP]     rw,
+  /**.[fFpP][dD][fF]   rw,
+  /**.[pP][nN][mM]     rw,
+  /**.[pP][nN][gG]     rw,
+  /**.[pP][sS]         rw,
+  /**.[eE][pP][sS]     rw,
+  /**.[tT][iI][fF]     rw,
+  /**.[tT][iI][fF][fF] rw,
+  /**.[xX][pP][mM]     rw,
+  /**.[gG][zZ]         rw,
+  /**.[bB][zZ]2        rw,
+  /**.[cC][bB][rRzZ7]  rw,
+  /**.[xX][zZ]         rw,
+
+  # atril creates a temporary stream file like '.goutputstream-XXXXXX' in the
+  # directory a file is saved. This allows that behavior.
+  owner /**/.goutputstream-* w,
+
+  # allow atril to spawn browsers distributed as snaps (LP: #1794064)
+  /{,snap/core/[0-9]*/,snap/snapd/[0-9]*/}usr/bin/snap mrCx -> snap_browsers,
+}
+
+/usr/bin/atril-previewer {
+  #include <abstractions/audio>
+  #include <abstractions/bash>
+  #include <abstractions/cups-client>
+  #include <abstractions/dbus-accessibility>
+  #include <abstractions/atril>
+  #include <abstractions/ibus>
+  #include <abstractions/nameservice>
+
+  #include <abstractions/ubuntu-browsers>
+  #include <abstractions/ubuntu-console-browsers>
+  #include <abstractions/ubuntu-email>
+  #include <abstractions/ubuntu-console-email>
+  #include <abstractions/ubuntu-media-players>
+
+  # For now, let atril talk to any session services over dbus. We can
+  # blacklist any problematic ones (but note, evince uses libsecret :\)
+  #include <abstractions/dbus-session>
+
+  #include <abstractions/dbus-strict>
+  dbus (receive) bus=system,
+  # Allow getting information from various system services
+  dbus (send)
+      bus=system
+      member="Get*"
+      peer=(label=unconfined),
+  # Allow talking to avahi with whatever polkit allows
+  dbus (send)
+      bus=system
+      interface="org.freedesktop.Avahi{,.*}",
+  # Allow talking to colord with whatever polkit allows
+  dbus (send)
+      bus=system
+      interface="org.freedesktop.ColorManager{,.*}",
+
+
+  # Terminals for using console applications. These abstractions should ideally
+  # have 'ix' to restrict access to what only atril is allowed to do
+  #include <abstractions/ubuntu-gnome-terminal>
+
+  # By default, we won't support launching a terminal program in Xterm or
+  # KDE's konsole. It opens up too many unnecessary files for most users.
+  # People who need this functionality can uncomment the following:
+  ##include <abstractions/ubuntu-xterm>
+
+  /usr/bin/atril-previewer mr,
+  /usr/bin/yelp Cx -> sanitized_helper,
+  /usr/bin/bug-buddy px,
+
+  # Lenient, but remember we still have abstractions/private-files-strict in
+  # effect). Write is needed for 'print to file' from the previewer.
+  @{HOME}/ r,
+  @{HOME}/** rw,
+
+  # Maybe add to an abstraction?
+  owner /{,var/}run/user/*/dconf/          w,
+  owner /{,var/}run/user/*/dconf/user      rw,
+}
+
+/usr/bin/atril-thumbnailer {
+  #include <abstractions/base>
+  #include <abstractions/private-files-strict>
+
+  #include <abstractions/fonts>
+  deny @{HOME}/.{,cache/}fontconfig/** wl,
+  deny @{HOME}/missfont.log wl,
+
+  #include <abstractions/dbus-session-strict>
+  dbus (receive) bus=session,
+  dbus (send)
+    bus=session
+    path="/org/gtk/vfs/mounttracker"
+    interface="org.gtk.vfs.MountTracker"
+    member="ListMountableInfo"
+    peer=(label=unconfined),
+
+  # updating gvfs-metadata for thumbnails is unneeded, so explicitly deny it
+  deny dbus (send)
+    bus=session
+    path="/org/gtk/vfs/metadata"
+    interface="org.gtk.vfs.Metadata"
+    member="GetTreeFromDevice"
+    peer=(label=unconfined),
+  deny @{HOME}/.local/share/gvfs-metadata/* r,
+
+  dbus (send)
+    bus=session
+    path="/org/gtk/vfs/Daemon"
+    interface="org.gtk.vfs.Daemon"
+    member="List*"
+    peer=(label=unconfined),
+
+  # The thumbnailer doesn't need access to everything in the nameservice
+  # abstraction. Allow reading of /etc/passwd and /etc/group, but suppress
+  # logging denial of nsswitch.conf.
+  /etc/passwd r,
+  /etc/group r,
+  deny /etc/nsswitch.conf r,
+
+  # TCP/UDP network access for NFS
+  network inet  stream,
+  network inet6 stream,
+  network inet  dgram,
+  network inet6 dgram,
+
+  /etc/papersize r,
+
+  /usr/bin/atril-thumbnailer mr,
+
+  /etc/texmf/ r,
+  /etc/texmf/** r,
+  /etc/xpdf/* r,
+
+  /usr/bin/gs-esp ixr,
+  # Silence these denials since 'no new privs' drops transitions to
+  # sanitized_helper, we don't want all those perms in the thumbnailer
+  # and the thumbnailer generates thumbnails without these just fine.
+  deny /usr/bin/mktexpk x,
+  deny /usr/bin/mktextfm x,
+  deny /usr/bin/dvipdfm x,
+  deny /usr/bin/dvipdfmx x,
+  deny /usr/bin/mkofm x,
+
+  # supported archivers
+  /{usr/,}bin/gzip ixr,
+  /{usr/,}bin/bzip2 ixr,
+  /usr/bin/unrar* ixr,
+  /usr/bin/unzip ixr,
+  /usr/bin/7zr ixr,
+  /usr/lib/p7zip/7zr ixr,
+  /usr/bin/7za ixr,
+  /usr/lib/p7zip/7za ixr,
+  /usr/bin/zipnote ixr,
+  /{usr/,}bin/tar ixr,
+  /usr/bin/xz ixr,
+
+  # miscellaneous access for the above
+  owner @{PROC}/@{pid}/fd/ r,
+  owner @{PROC}/@{pid}/mountinfo r,
+  /sys/devices/system/cpu/ r,
+
+  # allow read access to anything in /usr/share, for plugins and input methods
+  /usr/local/share/** r,
+  /usr/share/** r,
+  /usr/lib/ghostscript/** mr,
+  /var/lib/ghostscript/** r,
+  /var/lib/texmf/** r,
+
+  # from http://live.gnome.org/Evince/SupportedDocumentFormats. Allow
+  # read for all supported file formats
+  /**.[bB][mM][pP]     r,
+  /**.[dD][jJ][vV][uU] r,
+  /**.[dD][vV][iI]     r,
+  /**.[gG][iI][fF]     r,
+  /**.[jJ][pP][gG]     r,
+  /**.[jJ][pP][eE][gG] r,
+  /**.[oO][dD][pP]     r,
+  /**.[fFpP][dD][fF]   r,
+  /**.[pP][nN][mM]     r,
+  /**.[pP][nN][gG]     r,
+  /**.[pP][sS]         r,
+  /**.[eE][pP][sS]     r,
+  /**.[eE][pP][sS][fFiI23] r,
+  /**.[tT][iI][fF]     r,
+  /**.[tT][iI][fF][fF] r,
+  /**.[xX][pP][mM]     r,
+  /**.[gG][zZ]         r,
+  /**.[bB][zZ]2        r,
+  /**.[cC][bB][rRzZ7]  r,
+  /**.[xX][zZ]         r,
+
+  owner @{HOME}/.texlive*/** r,
+  owner @{HOME}/.texmf*/** r,
+  owner @{HOME}/.local/share/{,flatpak/exports/share/}mime/** r,
+  owner @{HOME}/.local/share/{,flatpak/exports/share/}mime/** r,
+
+  # With the network rules above, this allows data exfiltration for files
+  # not covered by private-files-strict.
+  @{HOME}/ r,
+  owner @{HOME}/[^.]** r,
+  owner /media/**  r,
+
+  owner /tmp/.gnome_desktop_thumbnail* w,
+  owner /tmp/gnome-desktop-* rw,
+  owner /tmp/atril-thumbnailer*/{,**} rw,
+  
+  # these happen post pivot_root
+  / r,
+  deny /missfont.log w,
+
+  # Add apparmor rule for mate's caja - LP#1798091
+  owner /tmp/.mate_desktop_thumbnail* w,
+  owner /tmp/mate-desktop-thumbnailer* w,
+
+  # Fix thumbnail issue #915024
+  owner @{HOME}/.cache/thumbnails/** rw,
+  owner /tmp/atril-thumbnailer* rw,
+
+}