Update upstream source from tag 'upstream/3.36.7'

Update to upstream version '3.36.7'
with Debian dir 237d1830a3a2341ac49391371334d12b77c04780

62 files changed, 376 insertions, 1484 deletions

diff --git a/NEWS b/NEWS
index 8013d4f7..f51f7f76 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,36 @@
+Overview of changes in 3.36.7
+=============================
+
+Bugs fixed:
+ Wrong checkbox style in AlbumWidget (#414)
+
+Thanks to our contributors this release:
+ Jean Felder
+
+Overview of changes in 3.36.6
+=============================
+
+Bugs fixed:
+ Crash because it can't find some files (#401)
+
+Thanks to our contributors this release:
+ Marinus Schraal
+
+Overview of changes in 3.36.5
+=============================
+
+Bugs fixed:
+ scrobbler: Don't crash if gnome-online-accounts is unavailable (#410)
+ Selection mode search doesn't work (#405)
+ Selecting an album in albums view in selection mode randomly deselects other albums (#406)
+ Selection mode only works for artists during search (#407)
+ mpris misc fixes (!743)
+
+Thanks to our contributors this release:
+ Jean Felder
+ Marinus Schraal
+ Simon McVittie
+
 Overview of changes in 3.36.4.1
 ===============================
 
diff --git a/data/org.gnome.Music.appdata.xml.in.in b/data/org.gnome.Music.appdata.xml.in.in
index c5816da2..5c2e0186 100644
--- a/data/org.gnome.Music.appdata.xml.in.in
+++ b/data/org.gnome.Music.appdata.xml.in.in
@@ -28,6 +28,27 @@
     </screenshot>
   </screenshots>
   <releases>
+    <release version="3.36.7" date="2020-11-21">
+      <description>
+        <p>
+          This release fixes an issue with checkbox style in the album view.
+        </p>
+      </description>
+    </release>
+    <release version="3.36.6" date="2020-10-05">
+      <description>
+        <p>
+          This updates fixes one crasher.
+        </p>
+      </description>
+    </release>
+    <release version="3.36.5" date="2020-07-04">
+      <description>
+        <p>
+          This release fixes bugs related to MPRIS and selection-mode.
+        </p>
+      </description>
+    </release>
     <release version="3.36.4.1" date="2020-07-08">
       <description>
         <p>
diff --git a/data/ui/AboutDialog.ui.in b/data/ui/AboutDialog.ui.in
index 7e878871..3ccab36a 100644
--- a/data/ui/AboutDialog.ui.in
+++ b/data/ui/AboutDialog.ui.in
@@ -92,6 +92,7 @@ Sambhav Kothari
 Seif Lotfy
 Shivani Poddar
 Shivansh Handa
+Simon McVittie
 Subhadip Jana
 Sumaid Syed
 Suyash Garg
diff --git a/data/ui/AlbumWidget.ui b/data/ui/AlbumWidget.ui
index 75d649ac..dc7f5e7c 100644
--- a/data/ui/AlbumWidget.ui
+++ b/data/ui/AlbumWidget.ui
@@ -6,7 +6,6 @@
     <property name="visible">True</property>
     <style>
       <class name="view"/>
-      <class name="content-view"/>
     </style>
     <child>
       <object class="GtkBox">
diff --git a/gnomemusic/mpris.py b/gnomemusic/mpris.py
index 2bb2b30e..275074e9 100644
--- a/gnomemusic/mpris.py
+++ b/gnomemusic/mpris.py
@@ -418,6 +418,9 @@ class MPRIS(DBusInterface):
         return path
 
     def _update_tracklist(self):
+        # FIXME: On a repeat-mode change, the current song needs to be queried
+        # to update the player position property.
+        self._player.props.current_song
         previous_path_list = self._path_list
         self._path_list = []
         self._metadata_list = []
@@ -728,10 +731,11 @@ class MPRIS(DBusInterface):
         :param str path: Identifier of the track to skip to
         """
         current_index = self._path_list.index(self._get_song_dbus_path())
-        current_coresong = self._player_model[current_index]
+        current_coresong = self._player.props.current_song
 
         goto_index = self._path_list.index(path)
-        new_coresong = self._player_model[goto_index]
+        new_position = self._player.props.position + goto_index - current_index
+        new_coresong = self._player_model[new_position]
 
         self._player.play(new_coresong)
         current_coresong.props.state = SongWidget.State.PLAYED
diff --git a/gnomemusic/scrobbler.py b/gnomemusic/scrobbler.py
index 98bf0ba1..896e1a12 100644
--- a/gnomemusic/scrobbler.py
+++ b/gnomemusic/scrobbler.py
@@ -77,6 +77,11 @@ class GoaLastFM(GObject.GObject):
             return
 
         manager = self._client.get_manager()
+
+        if manager is None:
+            self._log.info("GNOME Online Accounts is unavailable")
+            return
+
         try:
             manager.call_is_supported_provider(
                 "lastfm", None, self._lastfm_is_supported_cb)
diff --git a/gnomemusic/utils.py b/gnomemusic/utils.py
index b00f5ec1..7302936a 100644
--- a/gnomemusic/utils.py
+++ b/gnomemusic/utils.py
@@ -27,9 +27,11 @@ import re
 import unicodedata
 
 from gettext import gettext as _
-from gi.repository import Gio
+from gi.repository import Gio, GLib
 from gi._gi import pygobject_new_full
 
+from gnomemusic.musiclogger import MusicLogger
+
 
 class SongStateIcon(Enum):
     """Enum for icons used in song playing and validation"""
@@ -98,12 +100,21 @@ def get_media_title(item):
 
     if not title:
         url = item.get_url()
-        # FIXME
+        # FIXME: This and the later occurance are user facing strings,
+        # but they ideally should never be seen. A media should always
+        # contain a URL or we can not play it, in that case it should
+        # be removed.
         if url is None:
             return "NO URL"
         file_ = Gio.File.new_for_uri(url)
-        fileinfo = file_.query_info(
-            "standard::display-name", Gio.FileQueryInfoFlags.NONE, None)
+        try:
+            # FIXME: query_info is not async.
+            fileinfo = file_.query_info(
+                "standard::display-name", Gio.FileQueryInfoFlags.NONE, None)
+        except GLib.Error as error:
+            MusicLogger().warning(
+                "Error: {}, {}".format(error.domain, error.message))
+            return "NO URL"
         title = fileinfo.get_display_name()
         title = title.replace("_", " ")
 
diff --git a/gnomemusic/views/albumsview.py b/gnomemusic/views/albumsview.py
index 81eb14f3..6d7cef34 100644
--- a/gnomemusic/views/albumsview.py
+++ b/gnomemusic/views/albumsview.py
@@ -227,11 +227,14 @@ class AlbumsView(Gtk.Stack):
         if self.props.selection_mode is False:
             self.props.selection_mode = True
 
+        rubberband_selection = len(self._flowbox.get_selected_children()) > 1
         with self._application.props.coreselection.freeze_notify():
-            if self._ctrl_hold is False:
+            if (rubberband_selection
+                    and not self._ctrl_hold):
                 self.deselect_all()
             for child in self._flowbox.get_selected_children():
-                if self._ctrl_hold is True:
+                if (self._ctrl_hold is True
+                        or not rubberband_selection):
                     child.props.selected = not child.props.selected
                 else:
                     child.props.selected = True
diff --git a/gnomemusic/views/searchview.py b/gnomemusic/views/searchview.py
index 1eb83657..8473c78f 100644
--- a/gnomemusic/views/searchview.py
+++ b/gnomemusic/views/searchview.py
@@ -238,12 +238,22 @@ class SearchView(Gtk.Stack):
             self.props.search_state = Search.State.NO_RESULT
 
     def _song_activated(self, widget, event):
+        if widget.props.select_click:
+            widget.props.select_click = False
+            return
+
         mod_mask = Gtk.accelerator_get_default_mod_mask()
         if ((event.get_state() & mod_mask) == Gdk.ModifierType.CONTROL_MASK
                 and not self.props.selection_mode):
             self.props.selection_mode = True
             return
 
+        if self.props.selection_mode:
+            widget.props.select_click = True
+            widget.props.selected = not widget.props.selected
+            widget.props.coresong.props.selected = widget.props.selected
+            return
+
         (_, button) = event.get_button()
         if (button == Gdk.BUTTON_PRIMARY
                 and not self.props.selection_mode):
@@ -253,10 +263,6 @@ class SearchView(Gtk.Stack):
                 PlayerPlaylist.Type.SEARCH_RESULT, self._model)
             self._player.play(widget.props.coresong)
 
-        # FIXME: Need to ignore the event from the checkbox.
-        # if self.props.selection_mode:
-        #     widget.props.selected = not widget.props.selected
-
         return True
 
     def _on_album_flowbox_size_allocate(self, widget, allocation, data=None):
@@ -334,6 +340,7 @@ class SearchView(Gtk.Stack):
     def _on_album_activated(self, widget, child, user_data=None):
         corealbum = child.props.corealbum
         if self.props.selection_mode:
+            corealbum.props.selected = not corealbum.props.selected
             return
 
         # Update and display the album widget if not in selection mode
diff --git a/gnomemusic/widgets/headerbar.py b/gnomemusic/widgets/headerbar.py
index 909974a2..3d928d9c 100644
--- a/gnomemusic/widgets/headerbar.py
+++ b/gnomemusic/widgets/headerbar.py
@@ -139,6 +139,10 @@ class HeaderBar(Gtk.HeaderBar):
             "search-mode-active", self._search_button, "active",
             GObject.BindingFlags.BIDIRECTIONAL
             | GObject.BindingFlags.SYNC_CREATE)
+        self.bind_property(
+            "selection-mode", self._search_button, "visible",
+            GObject.BindingFlags.INVERT_BOOLEAN
+            | GObject.BindingFlags.SYNC_CREATE)
 
         self.connect(
             "notify::selection-mode-allowed",
diff --git a/gnomemusic/widgets/searchheaderbar.py b/gnomemusic/widgets/searchheaderbar.py
index 2b6de962..f8a0955a 100644
--- a/gnomemusic/widgets/searchheaderbar.py
+++ b/gnomemusic/widgets/searchheaderbar.py
@@ -88,6 +88,10 @@ class SearchHeaderBar(Gtk.HeaderBar):
             "search-mode-active", self._search_button, "active",
             GObject.BindingFlags.BIDIRECTIONAL
             | GObject.BindingFlags.SYNC_CREATE)
+        self.bind_property(
+            "selection-mode", self._search_button, "visible",
+            GObject.BindingFlags.INVERT_BOOLEAN
+            | GObject.BindingFlags.SYNC_CREATE)
 
         self.connect(
             "notify::selection-mode-allowed",
diff --git a/gnomemusic/window.py b/gnomemusic/window.py
index 939855cb..b0afa62f 100644
--- a/gnomemusic/window.py
+++ b/gnomemusic/window.py
@@ -317,6 +317,7 @@ class Window(Gtk.ApplicationWindow):
             # Open search bar on Ctrl + F
             if (keyval == Gdk.KEY_f
                     and not self.views[View.PLAYLIST].rename_active
+                    and not self.props.selection_mode
                     and self._headerbar.props.state != HeaderBar.State.SEARCH):
                 search_mode = self._search.props.search_mode_active
                 self._search.props.search_mode_active = not search_mode
@@ -399,6 +400,7 @@ class Window(Gtk.ApplicationWindow):
                 and (modifiers == shift_mask
                      or modifiers == 0)
                 and not self.views[View.PLAYLIST].rename_active
+                and not self.props.selection_mode
                 and self._headerbar.props.state != HeaderBar.State.SEARCH):
             self._search.props.search_mode_active = True
 
diff --git a/meson.build b/meson.build
index a64fdd74..4895e8f2 100644
--- a/meson.build
+++ b/meson.build
@@ -1,5 +1,5 @@
 project('gnome-music',
-    version: '3.36.4.1',
+    version: '3.36.7',
     meson_version: '>= 0.46.0'
 )
 
diff --git a/org.gnome.Music.json b/org.gnome.Music.json
index bde05d39..1de5befb 100644
--- a/org.gnome.Music.json
+++ b/org.gnome.Music.json
@@ -126,6 +126,8 @@
                              "-Denable-podcasts=no",
                              "-Denable-thetvdb=no",
                              "-Denable-tmdb=no",
+                             "-Denable-tracker=yes",
+                             "-Denable-tracker3=no",
                              "-Denable-vimeo=no",
                              "-Denable-youtube=no" ],
             "sources": [
diff --git a/subprojects/shared-modules/CODEOWNERS b/subprojects/shared-modules/CODEOWNERS
index 1be232ae..d8841d17 100644
--- a/subprojects/shared-modules/CODEOWNERS
+++ b/subprojects/shared-modules/CODEOWNERS
@@ -7,8 +7,5 @@
 /intltool/         @TingPing
 /libappindicator/  @TingPing
 /libsecret/        @Lctrs
-/libusb/           @A6GibKm
 /openjpeg/         @bochecha
 /python2.7/        @bilelmoussaoui
-/linux-audio/      @hfiguiere
-/lua5.1/           @Unrud
diff --git a/subprojects/shared-modules/README.md b/subprojects/shared-modules/README.md
index cde47075..5a0ec035 100644
--- a/subprojects/shared-modules/README.md
+++ b/subprojects/shared-modules/README.md
@@ -23,15 +23,6 @@ To update the submodule:
 git submodule update --remote --merge
 ```
 
-To remove the submodule:
-
-```
-git submodule deinit -f -- shared-modules
-rm -rf .git/modules/shared-modules
-git rm -f shared-modules
-rm .gitmodules
-```
-
 
 [See the description in the Flathub wiki](https://github.com/flathub/flathub/wiki/App-Requirements#shared-modules) for more information.
 
diff --git a/subprojects/shared-modules/glew/glew.json b/subprojects/shared-modules/glew/glew.json
index 92c62c9a..6ec15bf7 100644
--- a/subprojects/shared-modules/glew/glew.json
+++ b/subprojects/shared-modules/glew/glew.json
@@ -14,8 +14,8 @@
         "sources": [
                 {
                         "type": "archive",
-                        "url": "https://downloads.sourceforge.net/project/glew/glew/2.2.0/glew-2.2.0.tgz",
-                        "sha256": "d4fc82893cfb00109578d0a1a2337fb8ca335b3ceccf97b97e5cc7f08e4353e1"
+                        "url": "https://downloads.sourceforge.net/project/glew/glew/2.1.0/glew-2.1.0.tgz",
+                        "sha256": "04de91e7e6763039bc11940095cd9c7f880baba82196a7765f727ac05a993c95"
                 }
         ],
         "cleanup": [
diff --git a/subprojects/shared-modules/gtk2/arc-gtk2-theme-Replace-Inkscape-dependency-with-rsvg-convert.patch b/subprojects/shared-modules/gtk2/arc-gtk2-theme-Replace-Inkscape-dependency-with-rsvg-convert.patch
deleted file mode 100644
index 90e09509..00000000
--- a/subprojects/shared-modules/gtk2/arc-gtk2-theme-Replace-Inkscape-dependency-with-rsvg-convert.patch
+++ /dev/null
@@ -1,180 +0,0 @@
-From d5e0034183564df5fec8e4dde1705116c7b38021 Mon Sep 17 00:00:00 2001
-From: Patrick Griffis <tingping@tingping.se>
-Date: Sat, 16 May 2020 18:00:36 -0700
-Subject: [PATCH] Replace Inkscape dependency with rsvg-convert
-
-rsvg-convert is a *much* smaller dependency that all systems with
-a functioning GTK installation should have easy access to.
----
- common/gtk-2.0/Makefile.am     |  6 +-----
- common/gtk-2.0/render-asset.sh | 16 ++++++++--------
- common/gtk-3.0/common.am       | 12 ++----------
- common/xfwm4/Makefile.am       |  6 +-----
- common/xfwm4/render-asset.sh   | 16 ++++++++--------
- configure.ac                   |  8 ++------
- 6 files changed, 22 insertions(+), 42 deletions(-)
-
-diff --git a/common/gtk-2.0/Makefile.am b/common/gtk-2.0/Makefile.am
-index 010823a..873013a 100644
---- a/common/gtk-2.0/Makefile.am
-+++ b/common/gtk-2.0/Makefile.am
-@@ -35,11 +35,7 @@ $(light): $(srcdir)/light/assets.svg | light/assets
- $(dark): $(srcdir)/dark/assets.svg | dark/assets
- 
- $(light) $(dark):
--if INKSCAPE_1_0_OR_NEWER
--	$(INKSCAPE) --export-id-only --export-filename="$@" --export-id="$(basename $(notdir $@))" --export-dpi=$(if $(filter $(OPTION_GTK2_HIDPI),true),192,96) "$<" >/dev/null
--else !INKSCAPE_1_0_OR_NEWER
--	$(INKSCAPE) --export-id-only --export-png="$@" --export-id="$(basename $(notdir $@))" --export-dpi=$(if $(filter $(OPTION_GTK2_HIDPI),true),192,96) "$<" >/dev/null
--endif
-+	$(RSVG_CONVERT) --format=png --output="$@" --export-id="$(basename $(notdir $@))" --dpi-x=$(if $(filter $(OPTION_GTK2_HIDPI),true),192,96) --dpi-y=$(if $(filter $(OPTION_GTK2_HIDPI),true),192,96) "$<" >/dev/null
- 	$(OPTIPNG) -o7 --quiet "$@"
- 
- menubar-toolbar/%-dark.png: dark/assets/%.png | menubar-toolbar
-diff --git a/common/gtk-2.0/render-asset.sh b/common/gtk-2.0/render-asset.sh
-index 6685414..f6198af 100755
---- a/common/gtk-2.0/render-asset.sh
-+++ b/common/gtk-2.0/render-asset.sh
-@@ -1,7 +1,7 @@
- #!/bin/bash
- set -ueo pipefail
- 
--INKSCAPE="$(which inkscape)"
-+RSVG_CONVERT="$(which rsvg-convert)"
- OPTIPNG="$(which optipng)"
- 
- ASSETS_DIR="$1"
-@@ -14,9 +14,9 @@ if [[ -f "${result_file}" ]] ; then
- 	echo "${result_file} already exists."
- else
- 	echo "Rendering '${result_file}'"
--	"$INKSCAPE" --export-id="$i" \
--				--export-id-only \
--				--export-png="${result_file}" "$SRC_FILE" >/dev/null \
-+	"$RSVG_CONVERT" --export-id="$i" \
-+                        --format=png
-+                        --output="${result_file}" "$SRC_FILE" >/dev/null \
- 	&& "$OPTIPNG" -o7 --quiet "${result_file}"
- fi
- 
-@@ -26,10 +26,10 @@ if [[ "$OPTION_GTK2_HIDPI" == "true" ]]; then
- 		echo "${result_file_hidpi} already exists."
- 	else
- 		echo "Rendering '${result_file_hidpi}'"
--		"$INKSCAPE" --export-id="$i" \
--					--export-id-only \
--					--export-dpi=192 \
--					--export-png="${result_file_hidpi}" "$SRC_FILE" >/dev/null \
-+		"$RSVG_CONVERT" --export-id="$i" \
-+				--dpi-x=192 --dpi-y=192 \
-+				--format=png
-+			        --output="${result_file_hidpi}" "$SRC_FILE" >/dev/null \
- 		&& "$OPTIPNG" -o7 --quiet "${result_file_hidpi}"
- 	fi
- fi
-diff --git a/common/gtk-3.0/common.am b/common/gtk-3.0/common.am
-index a93d01d..9e4b102 100644
---- a/common/gtk-3.0/common.am
-+++ b/common/gtk-3.0/common.am
-@@ -14,19 +14,11 @@ clean:
- 	rm -rf assets/ light/ dark/ darker/ lighter/
- 
- $(normal): $(srcdir)/assets.svg | assets
--if INKSCAPE_1_0_OR_NEWER
--	$(INKSCAPE) --export-id-only --export-filename="$@" --export-id="$(basename $(notdir $@))" --export-dpi=96 "$<" >/dev/null
--else !INKSCAPE_1_0_OR_NEWER
--	$(INKSCAPE) --export-id-only --export-png="$@" --export-id="$(basename $(notdir $@))" --export-dpi=96 "$<" >/dev/null
--endif
-+	$(RSVG_CONVERT) --format=png --output="$@" --export-id="$(basename $(notdir $@))" --dpi-y=96 --dpi-x=96 "$<" >/dev/null
- 	$(OPTIPNG) -o7 --quiet "$@"
- 
- $(hidpi): $(srcdir)/assets.svg | assets
--if INKSCAPE_1_0_OR_NEWER
--	$(INKSCAPE) --export-id-only --export-filename="$@" --export-id="$(patsubst %@2,%,$(basename $(notdir $@)))" --export-dpi=192 "$<" >/dev/null
--else !INKSCAPE_1_0_OR_NEWER
--	$(INKSCAPE) --export-id-only --export-png="$@" --export-id="$(patsubst %@2,%,$(basename $(notdir $@)))" --export-dpi=192 "$<" >/dev/null
--endif
-+	$(RSVG_CONVERT) --format=png --output="$@" --export-id="$(patsubst %@2,%,$(basename $(notdir $@)))" --dpi-y=192 --dpi-x=192 "$<" >/dev/null
- 	$(OPTIPNG) -o7 --quiet "$@"
- 
- .PHONY: normal hidpi clean
-diff --git a/common/xfwm4/Makefile.am b/common/xfwm4/Makefile.am
-index e5fbdc5..1f21183 100644
---- a/common/xfwm4/Makefile.am
-+++ b/common/xfwm4/Makefile.am
-@@ -17,11 +17,7 @@ $(light): $(srcdir)/light/assets.svg | light/assets
- $(dark): $(srcdir)/dark/assets.svg | dark/assets
- 
- $(light) $(dark):
--if INKSCAPE_1_0_OR_NEWER
--	$(INKSCAPE) --export-id-only --export-filename="$@" --export-id="$(basename $(notdir $@))" --export-dpi=$(if $(filter $(OPTION_GTK2_HIDPI),true),192,96) "$<" >/dev/null
--else !INKSCAPE_1_0_OR_NEWER
--	$(INKSCAPE) --export-id-only --export-png="$@" --export-id="$(basename $(notdir $@))" --export-dpi=$(if $(filter $(OPTION_GTK2_HIDPI),true),192,96) "$<" >/dev/null
--endif
-+	$(RSVG_CONVERT) --format=png --output="$@" --export-id="$(basename $(notdir $@))" --dpi-y=$(if $(filter $(OPTION_GTK2_HIDPI),true),192,96) --dpi-x=$(if $(filter $(OPTION_GTK2_HIDPI),true),192,96) "$<" >/dev/null
- 	$(OPTIPNG) -o7 --quiet "$@"
- 
- .PHONY: light dark clean
-diff --git a/common/xfwm4/render-asset.sh b/common/xfwm4/render-asset.sh
-index 6685414..f6198af 100755
---- a/common/xfwm4/render-asset.sh
-+++ b/common/xfwm4/render-asset.sh
-@@ -1,7 +1,7 @@
- #!/bin/bash
- set -ueo pipefail
- 
--INKSCAPE="$(which inkscape)"
-+RSVG_CONVERT="$(which rsvg-convert)"
- OPTIPNG="$(which optipng)"
- 
- ASSETS_DIR="$1"
-@@ -14,9 +14,9 @@ if [[ -f "${result_file}" ]] ; then
- 	echo "${result_file} already exists."
- else
- 	echo "Rendering '${result_file}'"
--	"$INKSCAPE" --export-id="$i" \
--				--export-id-only \
--				--export-png="${result_file}" "$SRC_FILE" >/dev/null \
-+	"$RSVG_CONVERT" --export-id="$i" \
-+                        --format=png
-+                        --output="${result_file}" "$SRC_FILE" >/dev/null \
- 	&& "$OPTIPNG" -o7 --quiet "${result_file}"
- fi
- 
-@@ -26,10 +26,10 @@ if [[ "$OPTION_GTK2_HIDPI" == "true" ]]; then
- 		echo "${result_file_hidpi} already exists."
- 	else
- 		echo "Rendering '${result_file_hidpi}'"
--		"$INKSCAPE" --export-id="$i" \
--					--export-id-only \
--					--export-dpi=192 \
--					--export-png="${result_file_hidpi}" "$SRC_FILE" >/dev/null \
-+		"$RSVG_CONVERT" --export-id="$i" \
-+				--dpi-x=192 --dpi-y=192 \
-+				--format=png
-+			        --output="${result_file_hidpi}" "$SRC_FILE" >/dev/null \
- 		&& "$OPTIPNG" -o7 --quiet "${result_file_hidpi}"
- 	fi
- fi
-diff --git a/configure.ac b/configure.ac
-index f0725f1..1a52cc7 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -48,12 +48,8 @@ AM_CONDITIONAL([GNOME_SHELL_3_32_OR_NEWER], [test "0$GNOME_SHELL_VERSMNR" -ge 31
- AS_IF([test "x$ENABLE_CINNAMON" != xno], [ARC_CINNAMON])
- 
- AS_IF([test "x$ENABLE_GTK2" != xno -o "x$ENABLE_GTK3" != xno -o "x$ENABLE_XFWM" != xno], [
--    AC_PATH_PROG([INKSCAPE], [inkscape])
--    AS_IF([test "x$ac_cv_path_INKSCAPE" = x], [AC_MSG_ERROR([inkscape not found])])
--    AS_IF([test "x$ac_cv_path_INKSCAPE" != x],
--        [INKSCAPE_VERSMJR=`inkscape --version 2> /dev/null | cut -d' ' -f2 | cut -d'.' -f1`]
--        AM_CONDITIONAL([INKSCAPE_1_0_OR_NEWER], [test "x$INKSCAPE_VERSMJR" = x1])
--    )
-+    AC_PATH_PROG([RSVG_CONVERT], [rsvg-convert])
-+    AS_IF([test "x$ac_cv_path_RSVG_CONVERT" = x], [AC_MSG_ERROR([rsvg-convert not found])])
-     AC_PATH_PROG([OPTIPNG], [optipng])
-     AS_IF([test "x$ac_cv_path_OPTIPNG" = x], [AC_MSG_ERROR([optipng not found])])
- ])
--- 
-2.26.0
-
diff --git a/subprojects/shared-modules/gtk2/gtk2-common-themes.json b/subprojects/shared-modules/gtk2/gtk2-common-themes.json
deleted file mode 100644
index ecbf080d..00000000
--- a/subprojects/shared-modules/gtk2/gtk2-common-themes.json
+++ /dev/null
@@ -1,226 +0,0 @@
-{
-  "name": "gtk2-common-themes",
-  "buildsystem": "simple",
-  "build-commands": [],
-  "modules": [
-    {
-      "name": "sassc",
-      "// NOTE": "This is used by Yaru, Greybird, and Materia",
-      "cleanup": ["*"],
-      "sources": [
-        {
-          "type": "archive",
-          "url": "https://github.com/sass/sassc/archive/3.5.0.tar.gz",
-          "sha256": "26f54e31924b83dd706bc77df5f8f5553a84d51365f0e3c566df8de027918042"
-        },
-        {
-          "type": "script",
-          "commands": ["autoreconf -si"]
-        }
-      ],
-      "modules": [
-        {
-          "name": "libsass",
-          "cleanup": ["*"],
-          "sources": [
-            {
-              "type": "archive",
-              "url": "https://github.com/sass/libsass/archive/3.5.4.tar.gz",
-              "sha256": "5f61cbcddaf8e6ef7a725fcfa5d05297becd7843960f245197ebb655ff868770"
-            },
-            {
-              "type": "script",
-              "commands": ["autoreconf -si"]
-            }
-          ]
-        }
-      ]
-    },
-    {
-      "name": "gtk2-murrine-engine",
-      "// NOTE": "Used by Arc",
-      "cleanup": [
-        "*.la"
-      ],
-      "sources": [
-        {
-          "type": "archive",
-          "url": "https://download.gnome.org/sources/murrine/0.98/murrine-0.98.2.tar.xz",
-          "sha256": "e9c68ae001b9130d0f9d1b311e8121a94e5c134b82553ba03971088e57d12c89"
-        },
-        {
-          "type": "patch",
-          "path": "murrine-engine-fix-crash.patch"
-        }
-      ]
-    },
-    {
-      "name": "arc-gtk2-theme",
-      "// NOTE": "This is used by Solus and is popular",
-      "// FIXME": "This has a dependency on inkscape and my patch isn't quite good enough sadly",
-      "disabled": true,
-      "config-opts": [
-        "--disable-gnome-shell",
-        "--disable-cinnamon",
-        "--disable-gtk3",
-        "--disable-metacity",
-        "--disable-xfwm",
-        "--disable-plank",
-        "--disable-openbox",
-        "--disable-unity"
-      ],
-      "sources": [
-        {
-          "type": "archive",
-          "url": "https://github.com/jnsh/arc-theme/releases/download/20200513/arc-theme-20200513.tar.xz",
-          "sha256": "cd268b878d6ad7c81b7acc0f89b66e26ee9a9a92eafb03b792318d51707f1962"
-        },
-        {
-          "type": "patch",
-          "path": "arc-gtk2-theme-Replace-Inkscape-dependency-with-rsvg-convert.patch"
-        },
-        {
-          "type": "shell",
-          "commands": ["sed -i 's|\"$srcdir/configure\" $@||' autogen.sh"]
-        }
-      ],
-      "modules": [
-        {
-          "name": "optipng",
-          "cleanup": ["*"],
-          "sources": [
-            {
-              "type": "archive",
-              "url": "https://prdownloads.sourceforge.net/optipng/optipng-0.7.7.tar.gz",
-              "sha256": "4f32f233cef870b3f95d3ad6428bfe4224ef34908f1b42b0badf858216654452"
-            }
-          ]
-        }
-      ]
-    },
-    {
-      "name": "breeze-gtk2-theme",
-      "// NOTE": "This is used by some KDE distros",
-      "// FIXME": "This is disabled because breeze depends on KDecoration/Qt5...",
-      "disabled": true,
-      "buildsystem": "cmake-ninja",
-      "sources": [
-        {
-          "type": "archive",
-          "url": "https://github.com/KDE/breeze-gtk/archive/v5.18.90.tar.gz",
-          "sha256": "73ff1fee8afb2fc498075d1693a664f6a749b763606d4548f74e225983107730"
-        }
-      ],
-      "modules": [
-        {
-          "name": "extra-cmake-modules",
-          "buildsystem": "cmake-ninja",
-          "cleanup": ["*"],
-          "sources": [
-            {
-              "type": "archive",
-              "url": "https://github.com/KDE/extra-cmake-modules/archive/v5.70.0.tar.gz",
-              "sha256": "0e6d0694b2372cbdbc9e64abcaaac21196a15355b360e02e2e833885ae0c62f2"
-            }
-          ]
-        },
-        {
-          "name": "breeze",
-          "buildsystem": "cmake-ninja",
-          "cleanup": ["*"],
-          "sources": [
-            {
-              "type": "archive",
-              "url": "https://github.com/KDE/breeze/archive/v5.18.90.tar.gz",
-              "sha256": "55e42656601dd79db1bc40589764606ec203c7f99c84340deed6e3847a4fdaf6"
-            }
-          ]
-        }
-      ]
-    },
-    {
-      "name": "elementary-gtk2-theme",
-      "// NOTE": "This is used by Elementary OS",
-      "buildsystem": "meson",
-      "cleanup": [
-        "/share/themes/elementary/gtk-3.0",
-        "/share/themes/elementary/plank",
-        "/share/plank"
-      ],
-      "sources": [
-        {
-          "type": "archive",
-          "url": "https://github.com/elementary/stylesheet/archive/5.4.2.tar.gz",
-          "sha256": "3bc37723daf4ce0b7c9ce4c125ef0055affe8d6654981388ec87d4a23a1ae0ec"
-        }
-      ]
-    },
-    {
-      "name": "yaru-gtk2-theme",
-      "// NOTE": "This is used by Ubuntu",
-      "buildsystem": "meson",
-      "config-opts": [
-        "-Dicons=false",
-        "-Dsounds=false",
-        "-Dgnome-shell=false",
-        "-Dsessions=false"
-      ],
-      "cleanup": [
-        "/share/themes/Yaru*/gtk-3.0",
-        "/share/themes/Yaru*/gtk-3.20",
-        "/share/themes/Yaru*/unity"
-      ],
-      "sources": [
-        {
-          "type": "archive",
-          "url": "https://github.com/ubuntu/yaru/archive/20.10.1.tar.gz",
-          "sha256": "9da2605088674edf2694a8215b7344fb5209b308dd8220ea21667a914dc8c55d"
-        }
-      ]
-    },
-    {
-      "name": "greybird-gtk2-theme",
-      "// NOTE": "This is used by many XFCE distros",
-      "buildsystem": "meson",
-      "cleanup": [
-        "/share/themes/Greybird*/xfwm4",
-        "/share/themes/Greybird*/gnome-shell",
-        "/share/themes/Greybird*/gtk-3.0",
-        "/share/themes/Greybird*/metacity-1",
-        "/share/themes/Greybird*/xfce-notify-4.0",
-        "/share/themes/Greybird*/plank",
-        "/share/themes/Greybird*/unity",
-        "/share/themes/Greybird*/*.emerald"
-      ],
-      "sources": [
-        {
-          "type": "archive",
-          "url": "https://github.com/shimmerproject/Greybird/archive/v3.22.12.tar.gz",
-          "sha256": "410804cd5daca33cbc5c7c4a179f3a334ced87f408e515fc5d9c083a04bec4bc"
-        }
-      ]
-    },
-    {
-      "name": "materia-gtk2-theme",
-      "// NOTE": "This is used by Ubuntu Studio",
-      "buildsystem": "meson",
-      "cleanup": [
-        "/share/themes/Materia*/xfwm4",
-        "/share/themes/Materia*/gnome-shell",
-        "/share/themes/Materia*/gtk-3.0",
-        "/share/themes/Materia*/metacity-1",
-        "/share/themes/Materia*/cinnamon",
-        "/share/themes/Materia*/chrome",
-        "/share/themes/Materia*/plank",
-        "/share/themes/Materia*/unity"
-      ],
-      "sources": [
-        {
-          "type": "git",
-          "url": "https://github.com/nana-4/materia-theme.git",
-          "commit": "b36b379c9256b67e5f63a60c6faf6912f1845b66"
-        }
-      ]
-    }
-  ]
-}
\ No newline at end of file
diff --git a/subprojects/shared-modules/gtk2/gtk2-use-adwaita-theme.patch b/subprojects/shared-modules/gtk2/gtk2-use-adwaita-theme.patch
index e0350545..916b3491 100644
--- a/subprojects/shared-modules/gtk2/gtk2-use-adwaita-theme.patch
+++ b/subprojects/shared-modules/gtk2/gtk2-use-adwaita-theme.patch
@@ -17,7 +17,7 @@ index 186a8f5cb2..f5c39b5afe 100644
 +  if (var)
 +    path = g_build_filename (var, "share", "themes", NULL);
 +  else
-+    path = g_build_filename ("/app", "share", "themes", NULL);
++    path = g_build_filename ("/usr", "share", "themes", NULL);
 +
 +  return path;
 +}
diff --git a/subprojects/shared-modules/gtk2/gtk2.json b/subprojects/shared-modules/gtk2/gtk2.json
index e2d92729..cb39de7d 100644
--- a/subprojects/shared-modules/gtk2/gtk2.json
+++ b/subprojects/shared-modules/gtk2/gtk2.json
@@ -68,6 +68,7 @@
     },
     {
       "name": "ibus-gtk2",
+      "no-make-install": true,
       "config-opts": [
         "--disable-xim",
         "--disable-dconf",
@@ -89,12 +90,12 @@
         "--disable-introspection",
         "--disable-python2"
       ],
-      "make-install-args": [
-        "-C", "client/gtk2"
+      "ensure-writable": [
+        "/lib/gtk-2.0/2.10.0/immodules.cache"
       ],
       "post-install": [
-        "gtk-query-immodules-2.0 > immodules.cache",
-        "install immodules.cache -t $(pkg-config --variable=libdir gtk+-2.0)/gtk-2.0/2.10.0/"
+        "install -m644 --target-directory=${FLATPAK_DEST}/lib/gtk-2.0/2.10.0/immodules client/gtk2/.libs/im-ibus.so",
+        "gtk-query-immodules-2.0 > ${FLATPAK_DEST}/lib/gtk-2.0/2.10.0/immodules.cache"
       ],
       "sources": [
         {
diff --git a/subprojects/shared-modules/gtk2/murrine-engine-fix-crash.patch b/subprojects/shared-modules/gtk2/murrine-engine-fix-crash.patch
deleted file mode 100644
index 6200e771..00000000
--- a/subprojects/shared-modules/gtk2/murrine-engine-fix-crash.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-Index: gtk2-engines-murrine-0.98.2/src/murrine_style.c
-===================================================================
---- gtk2-engines-murrine-0.98.2.orig/src/murrine_style.c
-+++ gtk2-engines-murrine-0.98.2/src/murrine_style.c
-@@ -2171,6 +2171,7 @@ murrine_style_draw_layout (GtkStyle
- 			cairo_t *cr; 
- 			cr = murrine_begin_paint (window, area); 
- 			cairo_translate (cr, x+xos, y+yos); 
-+			pango_cairo_update_layout (cr, layout);
- 			pango_cairo_layout_path (cr, layout);
- 			murrine_set_color_rgba (cr, &temp, 0.5);
- 			cairo_stroke (cr);
diff --git a/subprojects/shared-modules/libappindicator/libappindicator-fix-crash-from-incorrect-signal-emission.patch b/subprojects/shared-modules/libappindicator/libappindicator-fix-crash-from-incorrect-signal-emission.patch
deleted file mode 100644
index 28927a37..00000000
--- a/subprojects/shared-modules/libappindicator/libappindicator-fix-crash-from-incorrect-signal-emission.patch
+++ /dev/null
@@ -1,74 +0,0 @@
---- libappindicator-12.10.0/src/app-indicator.c	2012-07-11 13:28:34.415113869 -0400
-+++ wrk/src/app-indicator.c	2020-03-19 12:14:47.813191652 -0400
-@@ -443,7 +443,7 @@
- 	                                  G_STRUCT_OFFSET (AppIndicatorClass, new_icon),
- 	                                  NULL, NULL,
- 	                                  g_cclosure_marshal_VOID__VOID,
--	                                  G_TYPE_NONE, 0, G_TYPE_NONE);
-+	                                  G_TYPE_NONE, 0);
- 
- 	/**
- 	 * AppIndicator::new-attention-icon:
-@@ -457,7 +457,7 @@
- 	                                            G_STRUCT_OFFSET (AppIndicatorClass, new_attention_icon),
- 	                                            NULL, NULL,
- 	                                            g_cclosure_marshal_VOID__VOID,
--	                                            G_TYPE_NONE, 0, G_TYPE_NONE);
-+	                                            G_TYPE_NONE, 0);
- 
- 	/**
- 	 * AppIndicator::new-status:
-@@ -505,7 +505,7 @@
- 	                                            G_STRUCT_OFFSET (AppIndicatorClass, connection_changed),
- 	                                            NULL, NULL,
- 	                                            g_cclosure_marshal_VOID__BOOLEAN,
--	                                            G_TYPE_NONE, 1, G_TYPE_BOOLEAN, G_TYPE_NONE);
-+	                                            G_TYPE_NONE, 1, G_TYPE_BOOLEAN);
- 
- 	/**
- 	 * AppIndicator::new-icon-theme-path:
-@@ -1175,7 +1175,7 @@
- 	gchar * guide = priv->label_guide != NULL ? priv->label_guide : "";
- 
- 	g_signal_emit(G_OBJECT(self), signals[NEW_LABEL], 0,
--	              label, guide, TRUE);
-+	              label, guide);
- 	if (priv->dbus_registration != 0 && priv->connection != NULL) {
- 		GError * error = NULL;
- 
-@@ -1490,7 +1490,7 @@
- static void
- theme_changed_cb (GtkIconTheme * theme, gpointer user_data)
- {
--	g_signal_emit (user_data, signals[NEW_ICON], 0, TRUE);
-+	g_signal_emit (user_data, signals[NEW_ICON], 0);
- 
- 	AppIndicator * self = (AppIndicator *)user_data;
- 	AppIndicatorPrivate *priv = self->priv;
-@@ -1904,7 +1904,7 @@
- 	}
- 
- 	if (changed) {
--		g_signal_emit (self, signals[NEW_ATTENTION_ICON], 0, TRUE);
-+		g_signal_emit (self, signals[NEW_ATTENTION_ICON], 0);
- 
- 		if (self->priv->dbus_registration != 0 && self->priv->connection != NULL) {
- 			GError * error = NULL;
-@@ -1982,7 +1982,7 @@
- 	}
- 
- 	if (changed) {
--		g_signal_emit (self, signals[NEW_ICON], 0, TRUE);
-+		g_signal_emit (self, signals[NEW_ICON], 0);
- 
- 		if (self->priv->dbus_registration != 0 && self->priv->connection != NULL) {
- 			GError * error = NULL;
-@@ -2048,7 +2048,7 @@
- 
- 		self->priv->icon_theme_path = g_strdup(icon_theme_path);
- 
--		g_signal_emit (self, signals[NEW_ICON_THEME_PATH], 0, self->priv->icon_theme_path, TRUE);
-+		g_signal_emit (self, signals[NEW_ICON_THEME_PATH], 0, self->priv->icon_theme_path);
- 
- 		if (self->priv->dbus_registration != 0 && self->priv->connection != NULL) {
- 			GError * error = NULL;
diff --git a/subprojects/shared-modules/libappindicator/libappindicator-fix-crash-iterating-icon-themes.patch b/subprojects/shared-modules/libappindicator/libappindicator-fix-crash-iterating-icon-themes.patch
deleted file mode 100644
index 44f6fe48..00000000
--- a/subprojects/shared-modules/libappindicator/libappindicator-fix-crash-iterating-icon-themes.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- libappindicator-12.10.0/src/app-indicator.c
-+++ libappindicator-12.10.0/src/app-indicator.c
-@@ -1606,7 +1606,7 @@ status_icon_changes (AppIndicator * self, gpointer data)
- 		gint n_elements, i;
- 		gboolean found=FALSE;
- 		gtk_icon_theme_get_search_path(icon_theme, &path, &n_elements);
--		for (i=0; i< n_elements || path[i] == NULL; i++) {
-+		for (i=0; i< n_elements; i++) {
- 			if(g_strcmp0(path[i], self->priv->icon_theme_path) == 0) {
- 				found=TRUE;
- 				break;
diff --git a/subprojects/shared-modules/libappindicator/libappindicator-gtk2-12.10.json b/subprojects/shared-modules/libappindicator/libappindicator-gtk2-12.10.json
index 13ff359d..b65cfa3f 100644
--- a/subprojects/shared-modules/libappindicator/libappindicator-gtk2-12.10.json
+++ b/subprojects/shared-modules/libappindicator/libappindicator-gtk2-12.10.json
@@ -34,14 +34,6 @@
       "path": "libappindicator-no-python.patch"
     },
     {
-      "type": "patch",
-      "path": "libappindicator-fix-crash-from-incorrect-signal-emission.patch"
-    },
-    {
-      "type": "patch",
-      "path": "libappindicator-fix-crash-iterating-icon-themes.patch"
-    },
-    {
       "type": "script",
       "commands": ["autoreconf -sfi"],
       "dest-filename": "autogen.sh"
diff --git a/subprojects/shared-modules/libappindicator/libappindicator-gtk3-12.10.json b/subprojects/shared-modules/libappindicator/libappindicator-gtk3-12.10.json
index 133d4bee..46e6f438 100644
--- a/subprojects/shared-modules/libappindicator/libappindicator-gtk3-12.10.json
+++ b/subprojects/shared-modules/libappindicator/libappindicator-gtk3-12.10.json
@@ -34,14 +34,6 @@
       "path": "libappindicator-no-python.patch"
     },
     {
-      "type": "patch",
-      "path": "libappindicator-fix-crash-from-incorrect-signal-emission.patch"
-    },
-    {
-      "type": "patch",
-      "path": "libappindicator-fix-crash-iterating-icon-themes.patch"
-    },
-    {
       "type": "script",
       "commands": ["autoreconf -sfi"],
       "dest-filename": "autogen.sh"
diff --git a/subprojects/shared-modules/libappindicator/libappindicator-gtk3-introspection-12.10.json b/subprojects/shared-modules/libappindicator/libappindicator-gtk3-introspection-12.10.json
index cbe10be5..5df82527 100644
--- a/subprojects/shared-modules/libappindicator/libappindicator-gtk3-introspection-12.10.json
+++ b/subprojects/shared-modules/libappindicator/libappindicator-gtk3-introspection-12.10.json
@@ -34,14 +34,6 @@
       "path": "libappindicator-no-python.patch"
     },
     {
-      "type": "patch",
-      "path": "libappindicator-fix-crash-from-incorrect-signal-emission.patch"
-    },
-    {
-      "type": "patch",
-      "path": "libappindicator-fix-crash-iterating-icon-themes.patch"
-    },
-    {
       "type": "script",
       "commands": ["autoreconf -sfi"],
       "dest-filename": "autogen.sh"
diff --git a/subprojects/shared-modules/libappindicator/libappindicator.json.in b/subprojects/shared-modules/libappindicator/libappindicator.json.in
index 3731595f..2b383af7 100644
--- a/subprojects/shared-modules/libappindicator/libappindicator.json.in
+++ b/subprojects/shared-modules/libappindicator/libappindicator.json.in
@@ -34,14 +34,6 @@
       "path": "libappindicator-no-python.patch"
     },
     {
-      "type": "patch",
-      "path": "libappindicator-fix-crash-from-incorrect-signal-emission.patch"
-    },
-    {
-      "type": "patch",
-      "path": "libappindicator-fix-crash-iterating-icon-themes.patch"
-    },
-    {
       "type": "script",
       "commands": ["autoreconf -sfi"],
       "dest-filename": "autogen.sh"
diff --git a/subprojects/shared-modules/libsecret/libsecret-init-gcrypt-for-file-collection.patch b/subprojects/shared-modules/libsecret/libsecret-init-gcrypt-for-file-collection.patch
deleted file mode 100644
index cf47922c..00000000
--- a/subprojects/shared-modules/libsecret/libsecret-init-gcrypt-for-file-collection.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-diff --git a/libsecret/secret-file-collection.c b/libsecret/secret-file-collection.c
-index 2e90e3c..a27cf04 100644
---- a/libsecret/secret-file-collection.c
-+++ b/libsecret/secret-file-collection.c
-@@ -16,6 +16,7 @@
- 
- #include "secret-file-collection.h"
- 
-+#include "egg/egg-libgcrypt.h"
- #include "egg/egg-secure-memory.h"
- 
- EGG_SECURE_DECLARE (secret_file_collection);
-@@ -271,6 +272,8 @@ secret_file_collection_class_init (SecretFileCollectionClass *klass)
- 		   g_param_spec_boxed ("password", "password", "Password",
- 				       SECRET_TYPE_VALUE,
- 				       G_PARAM_WRITABLE | G_PARAM_CONSTRUCT_ONLY));
-+
-+	egg_libgcrypt_initialize ();
- }
- 
- static void
diff --git a/subprojects/shared-modules/libsecret/libsecret.json b/subprojects/shared-modules/libsecret/libsecret.json
index 8e5fc33f..a2d34f58 100644
--- a/subprojects/shared-modules/libsecret/libsecret.json
+++ b/subprojects/shared-modules/libsecret/libsecret.json
@@ -16,12 +16,8 @@
   "sources": [
     {
       "type": "archive",
-      "url": "https://ftp.gnome.org/pub/GNOME/sources/libsecret/0.20/libsecret-0.20.3.tar.xz",
-      "sha256": "4fcb3c56f8ac4ab9c75b66901fb0104ec7f22aa9a012315a14c0d6dffa5290e4"
-    },
-    {
-      "type": "patch",
-      "path": "libsecret-init-gcrypt-for-file-collection.patch"
+      "url": "https://ftp.gnome.org/pub/GNOME/sources/libsecret/0.20/libsecret-0.20.1.tar.xz",
+      "sha256": "57f73e94ec6263a17a077fb809cf8cf424637a897a7f15b4eec42ce4aef52447"
     }
   ]
 }
diff --git a/subprojects/shared-modules/libusb/libusb.json b/subprojects/shared-modules/libusb/libusb.json
deleted file mode 100644
index 03cff446..00000000
--- a/subprojects/shared-modules/libusb/libusb.json
+++ /dev/null
@@ -1,19 +0,0 @@
-{
-    "name": "libusb",
-    "config-opts": [ "--disable-static" ],
-    "cleanup": [
-        "/lib/*.la",
-        "/lib/pkgconfig",
-        "/include"
-    ],
-    "sources": [
-        {
-            "type":"archive",
-            "url":"https://github.com/libusb/libusb/archive/v1.0.23.tar.gz",
-            "sha256": "02620708c4eea7e736240a623b0b156650c39bfa93a14bcfa5f3e05270313eba"
-        }
-    ],
-    "post-install": [
-        "install -Dm644 COPYING /app/share/licenses/libusb/COPYING"
-    ]
-}
diff --git a/subprojects/shared-modules/linux-audio/dssi.json b/subprojects/shared-modules/linux-audio/dssi.json
deleted file mode 100644
index ec33fd37..00000000
--- a/subprojects/shared-modules/linux-audio/dssi.json
+++ /dev/null
@@ -1,29 +0,0 @@
-{
-    "name": "dssi",
-    "rm-configure": true,
-    "config-opts": [
-        "--disable-static"
-    ],
-    "cleanup": [
-      "/bin",
-      "/include",
-      "/lib/dssi",
-      "/lib/pkgconfig",
-      "/share/man",
-      "*.la"
-    ],
-    "sources": [
-        {
-            "type": "archive",
-            "url": "http://download.sf.net/sourceforge/dssi/dssi-1.1.1.tar.gz",
-            "sha256": "f2c82b073a947c8255284249097667f9b14e660bf86186f3fcd3b3b3e087814e"
-        },
-        {
-            "type": "script",
-            "commands": [
-                "autoreconf -fiv"
-            ],
-            "dest-filename": "autogen.sh"
-        }
-    ]
-}
diff --git a/subprojects/shared-modules/linux-audio/fftw3f-static.json b/subprojects/shared-modules/linux-audio/fftw3f-static.json
deleted file mode 100644
index d6e095d0..00000000
--- a/subprojects/shared-modules/linux-audio/fftw3f-static.json
+++ /dev/null
@@ -1,41 +0,0 @@
-{
-  "name": "fftw3f",
-  "config-opts": [
-    "--enable-threads",
-    "--enable-static",
-    "--disable-shared",
-    "--enable-float"
-  ],
-  "build-options": {
-    "env": {
-      "CFLAGS": "-fPIC"
-    },
-    "arch": {
-      "x86_64": {
-        "config-opts": [
-          "--enable-sse2",
-          "--enable-avx",
-          "--enable-avx-128-fma"
-        ]
-      }
-    }
-  },
-  "sources": [
-    {
-      "type": "archive",
-      "url": "http://www.fftw.org/fftw-3.3.8.tar.gz",
-      "sha256": "6113262f6e92c5bd474f2875fa1b01054c4ad5040f6b0da7c03c98821d9ae303"
-    }
-  ],
-  "cleanup": [
-    "/bin",
-    "/include",
-    "/lib/cmake",
-    "/lib/pkgconfig",
-    "/share/info",
-    "/share/man",
-    "*.a",
-    "*.la",
-    "*.so"
-  ]
-}
diff --git a/subprojects/shared-modules/linux-audio/fftw3f.json b/subprojects/shared-modules/linux-audio/fftw3f.json
deleted file mode 100644
index 870b6897..00000000
--- a/subprojects/shared-modules/linux-audio/fftw3f.json
+++ /dev/null
@@ -1,36 +0,0 @@
-{
-    "name": "fftw3f",
-    "config-opts": [
-        "--enable-threads",
-        "--enable-shared",
-        "--disable-static",
-        "--enable-float"
-    ],
-    "build-options": {
-        "arch": {
-            "x86_64": {
-                "config-opts": [
-                    "--enable-sse2",
-                    "--enable-avx",
-                    "--enable-avx-128-fma"
-                ]
-            }
-        }
-    },
-    "sources": [
-        {
-            "type": "archive",
-            "url": "http://www.fftw.org/fftw-3.3.8.tar.gz",
-            "sha256": "6113262f6e92c5bd474f2875fa1b01054c4ad5040f6b0da7c03c98821d9ae303"
-        }
-    ],
-    "cleanup": [
-        "/bin",
-        "/include",
-        "/lib/cmake",
-        "/lib/pkgconfig",
-        "/share/man",
-        "*.la",
-        "*.so"
-    ]
-}
diff --git a/subprojects/shared-modules/linux-audio/fluidsynth2-static.json b/subprojects/shared-modules/linux-audio/fluidsynth2-static.json
deleted file mode 100644
index 6b62db8d..00000000
--- a/subprojects/shared-modules/linux-audio/fluidsynth2-static.json
+++ /dev/null
@@ -1,29 +0,0 @@
-{
-  "name": "fluidsynth",
-  "buildsystem": "cmake-ninja",
-  "build-options": {
-    "env": {
-      "CFLAGS": "-fPIC",
-      "CXXFLAGS": "-fPIC"
-    }
-  },
-  "config-opts": [
-    "-DLIB_SUFFIX=",
-    "-DBUILD_SHARED_LIBS=OFF"
-  ],
-  "cleanup": [
-    "/bin",
-    "/include",
-    "/lib/pkgconfig",
-    "/share/man",
-    "*.so",
-    "*.a"
-  ],
-  "sources": [
-    {
-      "type": "archive",
-      "url": "https://github.com/FluidSynth/fluidsynth/archive/v2.1.3.tar.gz",
-      "sha256": "645fbfd7c04543c6d3bf415eab8250527813b8dc8e6d6972dbcc8cb525e1d409"
-    }
-  ]
-}
diff --git a/subprojects/shared-modules/linux-audio/fluidsynth2.json b/subprojects/shared-modules/linux-audio/fluidsynth2.json
deleted file mode 100644
index 68a47759..00000000
--- a/subprojects/shared-modules/linux-audio/fluidsynth2.json
+++ /dev/null
@@ -1,21 +0,0 @@
-{
-    "name": "fluidsynth",
-    "buildsystem": "cmake-ninja",
-    "config-opts": [
-        "-DLIB_SUFFIX="
-    ],
-    "cleanup": [
-        "/bin",
-        "/include",
-        "/lib/pkgconfig",
-        "/share/man",
-        "*.so"
-    ],
-    "sources": [
-        {
-            "type": "archive",
-            "url": "https://github.com/FluidSynth/fluidsynth/archive/v2.1.3.tar.gz",
-            "sha256": "645fbfd7c04543c6d3bf415eab8250527813b8dc8e6d6972dbcc8cb525e1d409"
-        }
-    ]
-}
diff --git a/subprojects/shared-modules/linux-audio/jack2.json b/subprojects/shared-modules/linux-audio/jack2.json
deleted file mode 100644
index 683e7153..00000000
--- a/subprojects/shared-modules/linux-audio/jack2.json
+++ /dev/null
@@ -1,21 +0,0 @@
-{
-    "name": "jack2",
-    "buildsystem": "simple",
-    "build-commands": [
-        "./waf configure --prefix=$FLATPAK_DEST --htmldir=$FLATPAK_DEST/share/doc/jack/ --classic",
-        "./waf build -j $FLATPAK_BUILDER_N_JOBS",
-        "./waf install"
-    ],
-    "cleanup": [
-        "/include",
-        "/lib/pkgconfig",
-        "/share/man"
-    ],
-    "sources": [
-        {
-            "type": "archive",
-            "url": "https://github.com/jackaudio/jack2/releases/download/v1.9.14/v1.9.14.tar.gz",
-            "sha256": "a20a32366780c0061fd58fbb5f09e514ea9b7ce6e53b080a44b11a558a83217c"
-        }
-    ]
-}
diff --git a/subprojects/shared-modules/linux-audio/ladspa.json b/subprojects/shared-modules/linux-audio/ladspa.json
deleted file mode 100644
index 110f0b45..00000000
--- a/subprojects/shared-modules/linux-audio/ladspa.json
+++ /dev/null
@@ -1,17 +0,0 @@
-{
-    "name": "ladspa",
-    "no-autogen": true,
-    "subdir": "src",
-    "make-install-args": [
-        "INSTALL_PLUGINS_DIR=/app/lib/ladspa",
-        "INSTALL_INCLUDE_DIR=/app/include",
-        "INSTALL_BINARY_DIR=/app/bin"
-    ],
-    "sources": [
-        {
-            "type": "archive",
-            "url": "http://www.ladspa.org/download/ladspa_sdk_1.15.tgz",
-            "sha256": "4229959b09d20c88c8c86f4aa76427843011705df22d9c28b38359fd1829fded"
-        }
-    ]
-}
diff --git a/subprojects/shared-modules/linux-audio/lash.json b/subprojects/shared-modules/linux-audio/lash.json
deleted file mode 100644
index 4d0ccb28..00000000
--- a/subprojects/shared-modules/linux-audio/lash.json
+++ /dev/null
@@ -1,41 +0,0 @@
-{
-    "name": "lash",
-    "rm-configure": true,
-    "config-opts": [
-        "--disable-static",
-        "--disable-serv-inst",
-        "CFLAGS=-D_GNU_SOURCE"
-    ],
-    "sources": [
-        {
-            "type": "archive",
-            "url": "https://download.savannah.gnu.org/releases/lash/lash-0.5.4.tar.gz",
-            "sha256": "105a7da84415c4725c6bcad28e70f23aeb4534f94fc80ca262b6a2cef2226c16"
-        },
-        {
-            "type": "patch",
-            "strip-components": 0,
-            "path": "patches/lash-0.5.3-no-static-lib.patch"
-        },
-        {
-            "type": "patch",
-            "path": "patches/lash-gcc47.patch"
-        },
-        {
-            "type": "patch",
-            "path": "patches/lash-linking.patch"
-        },
-        {
-            "type": "patch",
-            "strip-components": 0,
-            "path": "patches/lash-configure.patch"
-        },
-        {
-            "type": "script",
-            "commands": [
-                "autoreconf -fiv"
-            ],
-            "dest-filename": "autogen.sh"
-        }
-    ]
-}
diff --git a/subprojects/shared-modules/linux-audio/libinstpatch.json b/subprojects/shared-modules/linux-audio/libinstpatch.json
deleted file mode 100644
index 994e9a22..00000000
--- a/subprojects/shared-modules/linux-audio/libinstpatch.json
+++ /dev/null
@@ -1,17 +0,0 @@
-{
-    "name": "libinstpatch",
-    "buildsystem": "cmake-ninja",
-    "config-opts": [
-        "-DLIB_SUFFIX="
-    ],
-    "cleanup": [
-	"/share/doc"
-    ],
-    "sources": [
-        {
-            "type": "archive",
-            "url": "https://github.com/swami/libinstpatch/archive/v1.1.5.tar.gz",
-            "sha256": "5fd01cd2ba7377e7a72caaf3b565d8fe088b5c8a14e0ea91516f0c87524bcf8a"
-        }
-    ]
-}
diff --git a/subprojects/shared-modules/linux-audio/liblo-static.json b/subprojects/shared-modules/linux-audio/liblo-static.json
deleted file mode 100644
index 7d229d36..00000000
--- a/subprojects/shared-modules/linux-audio/liblo-static.json
+++ /dev/null
@@ -1,27 +0,0 @@
-{
-  "name": "liblo",
-  "cleanup": [
-    "/bin",
-    "/include",
-    "/lib/pkgconfig",
-    "*.la",
-    "*.a",
-    "*.so"
-  ],
-  "build-options": {
-    "env": {
-      "CFLAGS": "-fPIC"
-    }
-  },
-  "config-opts": [
-    "--enable-static",
-    "--disable-shared"
-  ],
-  "sources": [
-    {
-      "type": "archive",
-      "url": "http://download.sf.net/sourceforge/liblo/liblo-0.31.tar.gz",
-      "sha256": "2b4f446e1220dcd624ecd8405248b08b7601e9a0d87a0b94730c2907dbccc750"
-    }
-  ]
-}
diff --git a/subprojects/shared-modules/linux-audio/liblo.json b/subprojects/shared-modules/linux-audio/liblo.json
deleted file mode 100644
index 17de750e..00000000
--- a/subprojects/shared-modules/linux-audio/liblo.json
+++ /dev/null
@@ -1,17 +0,0 @@
-{
-  "name": "liblo",
-  "cleanup": [
-    "/bin",
-    "/include",
-    "/lib/pkgconfig",
-    "*.la",
-    "*.so"
-  ],
-  "sources": [
-    {
-      "type": "archive",
-      "url": "http://download.sf.net/sourceforge/liblo/liblo-0.31.tar.gz",
-      "sha256": "2b4f446e1220dcd624ecd8405248b08b7601e9a0d87a0b94730c2907dbccc750"
-    }
-  ]
-}
diff --git a/subprojects/shared-modules/linux-audio/lilv.json b/subprojects/shared-modules/linux-audio/lilv.json
deleted file mode 100644
index e33bf0e3..00000000
--- a/subprojects/shared-modules/linux-audio/lilv.json
+++ /dev/null
@@ -1,100 +0,0 @@
-{
-  "name": "lilv",
-  "buildsystem": "simple",
-  "build-commands": [
-    "python3 ./waf configure --prefix=$FLATPAK_DEST",
-    "python3 ./waf build -j $FLATPAK_BUILDER_N_JOBS",
-    "python3 ./waf install"
-  ],
-  "modules": [
-    {
-      "name": "serd",
-      "buildsystem": "simple",
-      "build-commands": [
-        "python3 ./waf configure --prefix=$FLATPAK_DEST",
-        "python3 ./waf build -j $FLATPAK_BUILDER_N_JOBS",
-        "python3 ./waf install"
-      ],
-      "sources": [
-        {
-          "type": "archive",
-          "url": "https://download.drobilla.net/serd-0.30.2.tar.bz2",
-          "sha256": "9d3102701172804f823f2215ca3147c50eba992641f9fbe014272355f4937202"
-        }
-      ],
-      "post-install": [
-        "install -Dm644 -t /app/share/licenses/serd COPYING"
-      ],
-      "cleanup": [
-        "/bin",
-        "/include",
-        "/lib/pkgconfig",
-        "/share/man"
-      ]
-    },
-    {
-      "name": "sord",
-      "buildsystem": "simple",
-      "build-commands": [
-        "python3 ./waf configure --prefix=$FLATPAK_DEST",
-        "python3 ./waf build -j $FLATPAK_BUILDER_N_JOBS",
-        "python3 ./waf install"
-      ],
-      "sources": [
-        {
-          "type": "archive",
-          "url": "https://download.drobilla.net/sord-0.16.4.tar.bz2",
-          "sha256": "b15998f4e7ad958201346009477d6696e90ee5d3e9aff25e7e9be074372690d7"
-        }
-      ],
-      "post-install": [
-        "install -Dm644 -t /app/share/licenses/sord COPYING"
-      ],
-      "cleanup": [
-        "/bin",
-        "/include",
-        "/lib/pkgconfig",
-        "/share/man"
-      ]
-    },
-    {
-      "name": "sratom",
-      "buildsystem": "simple",
-      "build-commands": [
-        "python3 ./waf configure --prefix=$FLATPAK_DEST",
-        "python3 ./waf build -j $FLATPAK_BUILDER_N_JOBS",
-        "python3 ./waf install"
-      ],
-      "cleanup": [
-        "/include",
-        "/lib/pkgconfig"
-      ],
-      "sources": [
-        {
-          "type": "archive",
-          "url": "https://download.drobilla.net/sratom-0.6.4.tar.bz2",
-          "sha256": "146c8f14b8902ac3c8fa8c2e0a014eb8a38fab60090c5adbfbff3e3b7c5c006e"
-        }
-      ],
-      "post-install": [
-        "install -Dm644 -t /app/share/licenses/sratom COPYING"
-      ]
-    }
-  ],
-  "sources": [
-    {
-      "type": "archive",
-      "url": "https://download.drobilla.net/lilv-0.24.6.tar.bz2",
-      "sha256": "5f544cf79656e0782a03a2cc7ab1d31a93f36d71d4187bd427ade8d7b55370dc"
-    }
-  ],
-  "post-install": [
-    "install -Dm644 -t /app/share/licenses/lilv COPYING"
-  ],
-  "cleanup": [
-    "/bin",
-    "/etc",
-    "/lib/pkgconfig",
-    "/share/man"
-  ]
-}
diff --git a/subprojects/shared-modules/linux-audio/lrdf.json b/subprojects/shared-modules/linux-audio/lrdf.json
deleted file mode 100644
index 465dd663..00000000
--- a/subprojects/shared-modules/linux-audio/lrdf.json
+++ /dev/null
@@ -1,44 +0,0 @@
-{
-    "name": "lrdf",
-    "rm-configure": true,
-    "cleanup": [
-        "/include",
-        "/lib/pkgconfig"
-    ],
-    "modules": [
-        "ladspa.json",
-        {
-            "name": "raptor2",
-            "cleanup": [
-                "/include",
-                "/lib/pkgconfig"
-            ],
-            "config-opts": [
-                "--disable-documentation",
-                "--disable-static"
-            ],
-            "sources": [
-                {
-                    "type": "archive",
-                    "url": "http://download.librdf.org/source/raptor2-2.0.15.tar.gz",
-                    "sha256": "ada7f0ba54787b33485d090d3d2680533520cd4426d2f7fb4782dd4a6a1480ed"
-                }
-            ]
-        }
-    ],
-    "sources": [
-        {
-            "type": "archive",
-            "url": "https://github.com/swh/LRDF/tarball/0.5.0",
-            "dest-filename": "swh-LRDF-0.5.0-0-g7ebc032.tar.gz",
-            "sha256": "013002b91ef209827fe99552b8c7f0b569cddb3d6f1439bedbd8bafe1956a93c"
-        },
-        {
-            "type": "script",
-            "commands": [
-                "autoreconf -fiv"
-            ],
-            "dest-filename": "autogen.sh"
-        }
-    ]
-}
diff --git a/subprojects/shared-modules/linux-audio/lv2.json b/subprojects/shared-modules/linux-audio/lv2.json
deleted file mode 100644
index 180f3272..00000000
--- a/subprojects/shared-modules/linux-audio/lv2.json
+++ /dev/null
@@ -1,26 +0,0 @@
-{
-    "name": "lv2",
-    "buildsystem": "simple",
-    "build-commands": [
-        "python3 ./waf configure --prefix=$FLATPAK_DEST --lv2dir=$FLATPAK_DEST/lib/lv2 --copy-headers",
-        "python3 ./waf build -j $FLATPAK_BUILDER_N_JOBS",
-        "python3 ./waf install"
-    ],
-    "cleanup": [
-        "/bin",
-        "/include",
-        "/lib/pkgconfig",
-        "/share"
-    ],
-    "sources": [
-        {
-            "type": "archive",
-            "url": "https://lv2plug.in/spec/lv2-1.18.0.tar.bz2",
-            "sha256": "90a3e5cf8bdca81b49def917e89fd6bba1d5845261642cd54e7888df0320473f"
-        }
-    ],
-    "post-install": [
-        "install -Dm644 -t $FLATPAK_DEST/share/licenses/lv2 COPYING",
-        "ln -sf lv2.pc $FLATPAK_DEST/lib/pkgconfig/lv2core.pc"
-    ]
-}
diff --git a/subprojects/shared-modules/linux-audio/patches/lash-0.5.3-no-static-lib.patch b/subprojects/shared-modules/linux-audio/patches/lash-0.5.3-no-static-lib.patch
deleted file mode 100644
index 54d1cd7b..00000000
--- a/subprojects/shared-modules/linux-audio/patches/lash-0.5.3-no-static-lib.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- lash-1.0.pc.in~	2007-10-07 06:33:27.000000000 -0700
-+++ lash-1.0.pc.in	2007-10-07 06:35:00.000000000 -0700
-@@ -7,6 +7,5 @@
- Description: Audio session management
- Requires: @PC_REQUIRES@
- Version: @PACKAGE_VERSION@
--Libs: -llash
--Libs.static: -lpthread -luuid
-+Libs: -llash -lpthread -luuid
- Cflags: -I${includedir}/lash-1.0
diff --git a/subprojects/shared-modules/linux-audio/patches/lash-configure.patch b/subprojects/shared-modules/linux-audio/patches/lash-configure.patch
deleted file mode 100644
index ba9bb8ba..00000000
--- a/subprojects/shared-modules/linux-audio/patches/lash-configure.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- configure.ac	2007-11-14 16:58:51.000000000 -0500
-+++ configure.ac.new	2019-01-24 13:48:46.284377086 -0500
-@@ -2,7 +2,7 @@
- AC_CONFIG_SRCDIR([lash/types.h])
- AC_CONFIG_HEADER([config.h])
- AM_INIT_AUTOMAKE
--AM_ACLOCAL_INCLUDE([m4])
-+dnl AM_ACLOCAL_INCLUDE([m4])
- 
- ### Check for programs ###
- AC_LANG([C])
diff --git a/subprojects/shared-modules/linux-audio/patches/lash-gcc47.patch b/subprojects/shared-modules/linux-audio/patches/lash-gcc47.patch
deleted file mode 100644
index 41710ca5..00000000
--- a/subprojects/shared-modules/linux-audio/patches/lash-gcc47.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-diff -rupN lash-0.5.4.old/liblash/lash.c lash-0.5.4/liblash/lash.c
---- lash-0.5.4.old/liblash/lash.c	2007-03-09 10:34:40.000000000 -0500
-+++ lash-0.5.4/liblash/lash.c	2012-07-22 18:17:46.003963521 -0400
-@@ -22,6 +22,7 @@
- #include <string.h>
- #include <strings.h>
- #include <pthread.h>
-+#include <sys/resource.h>
- #include <sys/types.h>
- #include <sys/wait.h>
- #include <sys/socket.h>
diff --git a/subprojects/shared-modules/linux-audio/patches/lash-linking.patch b/subprojects/shared-modules/linux-audio/patches/lash-linking.patch
deleted file mode 100644
index e46d1647..00000000
--- a/subprojects/shared-modules/linux-audio/patches/lash-linking.patch
+++ /dev/null
@@ -1,90 +0,0 @@
-diff -rupN lash-0.5.4.old/clients/control/Makefile.am lash-0.5.4/clients/control/Makefile.am
---- lash-0.5.4.old/clients/control/Makefile.am	2007-01-13 13:20:03.000000000 -0500
-+++ lash-0.5.4/clients/control/Makefile.am	2010-02-10 03:08:04.000000000 -0500
-@@ -18,6 +18,6 @@ lash_control_CFLAGS = $(LASH_CFLAGS)
- 
- lash_control_LDADD = \
- 	$(top_builddir)/liblash/liblash.la \
--	$(LASH_LIBS) @READLINE_LIBS@
-+	$(LASH_LIBS) @READLINE_LIBS@ -luuid
- 
- endif
-diff -rupN lash-0.5.4.old/clients/control/Makefile.in lash-0.5.4/clients/control/Makefile.in
---- lash-0.5.4.old/clients/control/Makefile.in	2007-11-14 17:00:09.000000000 -0500
-+++ lash-0.5.4/clients/control/Makefile.in	2010-02-10 03:09:26.000000000 -0500
-@@ -236,7 +236,7 @@ AM_CPPFLAGS = -I$(top_srcdir)
- @HAVE_READLINE_TRUE@lash_control_CFLAGS = $(LASH_CFLAGS)
- @HAVE_READLINE_TRUE@lash_control_LDADD = \
- @HAVE_READLINE_TRUE@	$(top_builddir)/liblash/liblash.la \
--@HAVE_READLINE_TRUE@	$(LASH_LIBS) @READLINE_LIBS@
-+@HAVE_READLINE_TRUE@	$(LASH_LIBS) @READLINE_LIBS@ -luuid
- 
- all: all-am
- 
-diff -rupN lash-0.5.4.old/clients/panel/Makefile.am lash-0.5.4/clients/panel/Makefile.am
---- lash-0.5.4.old/clients/panel/Makefile.am	2005-09-13 01:22:59.000000000 -0400
-+++ lash-0.5.4/clients/panel/Makefile.am	2010-02-10 03:17:10.000000000 -0500
-@@ -13,7 +13,7 @@ lash_panel_CFLAGS = \
- 
- lash_panel_LDADD = \
- 	$(top_builddir)/liblash/liblash.la \
--	$(GTK2_LIBS)
-+	$(GTK2_LIBS) -luuid
- 
- if HAVE_GTK2
-   bin_PROGRAMS = lash_panel
-diff -rupN lash-0.5.4.old/clients/panel/Makefile.in lash-0.5.4/clients/panel/Makefile.in
---- lash-0.5.4.old/clients/panel/Makefile.in	2007-11-14 17:00:09.000000000 -0500
-+++ lash-0.5.4/clients/panel/Makefile.in	2010-02-10 03:17:23.000000000 -0500
-@@ -230,7 +230,7 @@ lash_panel_CFLAGS = \
- 
- lash_panel_LDADD = \
- 	$(top_builddir)/liblash/liblash.la \
--	$(GTK2_LIBS)
-+	$(GTK2_LIBS) -luuid
- 
- all: all-am
- 
-diff -rupN lash-0.5.4.old/clients/synth/Makefile.am lash-0.5.4/clients/synth/Makefile.am
---- lash-0.5.4.old/clients/synth/Makefile.am	2005-09-13 01:22:59.000000000 -0400
-+++ lash-0.5.4/clients/synth/Makefile.am	2010-02-10 03:22:39.000000000 -0500
-@@ -20,4 +20,4 @@ lash_synth_LDADD = \
- 	$(JACK_LIBS) \
- 	$(ALSA_LIBS) \
- 	$(GTK2_LIBS) \
--	-lpthread
-+	-lpthread -lm
-diff -rupN lash-0.5.4.old/clients/synth/Makefile.in lash-0.5.4/clients/synth/Makefile.in
---- lash-0.5.4.old/clients/synth/Makefile.in	2007-11-14 17:00:10.000000000 -0500
-+++ lash-0.5.4/clients/synth/Makefile.in	2010-02-10 03:22:51.000000000 -0500
-@@ -238,7 +238,7 @@ lash_synth_LDADD = \
- 	$(JACK_LIBS) \
- 	$(ALSA_LIBS) \
- 	$(GTK2_LIBS) \
--	-lpthread
-+	-lpthread -lm
- 
- all: all-am
- 
-diff -rupN lash-0.5.4.old/lashd/Makefile.am lash-0.5.4/lashd/Makefile.am
---- lash-0.5.4.old/lashd/Makefile.am	2006-09-16 16:27:46.000000000 -0400
-+++ lash-0.5.4/lashd/Makefile.am	2010-07-23 15:13:59.000000000 -0400
-@@ -32,6 +32,7 @@ lashd_LDADD = \
- 	$(ALSA_LIBS) \
- 	$(XML2_LIBS) \
- 	$(UUID_LIBS) \
-+	-lpthread \
- 	$(top_builddir)/liblash/liblash.la
- 
- lashd_CFLAGS = \
-diff -rupN lash-0.5.4.old/lashd/Makefile.in lash-0.5.4/lashd/Makefile.in
---- lash-0.5.4.old/lashd/Makefile.in	2007-11-14 17:00:10.000000000 -0500
-+++ lash-0.5.4/lashd/Makefile.in	2010-07-23 15:14:29.000000000 -0400
-@@ -262,6 +262,7 @@ lashd_LDADD = \
- 	$(ALSA_LIBS) \
- 	$(XML2_LIBS) \
- 	$(UUID_LIBS) \
-+	-lpthread \
- 	$(top_builddir)/liblash/liblash.la
- 
- lashd_CFLAGS = \
diff --git a/subprojects/shared-modules/linux-audio/patches/stk-install.sh b/subprojects/shared-modules/linux-audio/patches/stk-install.sh
deleted file mode 100644
index e2d9c9b7..00000000
--- a/subprojects/shared-modules/linux-audio/patches/stk-install.sh
+++ /dev/null
@@ -1,54 +0,0 @@
-
-INCLUDE_DIR=/app/include
-DATA_DIR=/app/share
-LIB_DIR=/app/lib
-BIN_DIR=/app/bin
-
-
-
-
-install -Dm644 -t $INCLUDE_DIR/stk include/*
-install -Dm644 -t $LIB_DIR src/libstk.*
-install -Dm644 -t $DATA_DIR/stk/rawwaves rawwaves/*.raw
-
-#cp -pr projects/demo/tcl $DATA_DIR/stk/demo
-#cp -pr projects/demo/scores $DATA_DIR/stk/demo
-#cp -p projects/demo/demo $BIN_DIR/stk-demo
-#cp -p projects/demo/Md2Skini $BIN_DIR/Md2Skini
-#for f in Banded Drums Modal Physical Shakers StkDemo Voice ; do
-#  chmod +x projects/demo/$f
-#  sed -e 's,\./demo,$BIN_DIR/stk-demo,' -e '1i#! /bin/sh' \
-#    -i projects/demo/$f
-#  cp -p projects/demo/$f $DATA_DIR/stk/demo
-#done
-
-#cp -pr projects/examples/midifiles $DATA_DIR/stk/examples
-#cp -pr projects/examples/rawwaves $DATA_DIR/stk/examples
-#cp -pr projects/examples/scores $DATA_DIR/stk/examples
-#for f in sine sineosc foursine audioprobe midiprobe duplex play \
-#    record inetIn inetOut rtsine crtsine bethree controlbee \
-#    threebees playsmf grains ; do
-#  cp -p projects/examples/$f $BIN_DIR/stk-$f
-#  # absolute links, will be shortened later
-#  ln -s $BIN_DIR/stk-$f $DATA_DIR/stk/examples/$f
-#done
-
-install -Dm644 -t $DATA_DIR/stk/effects projects/effects/tcl
-install -Dm644 -t $BIN_DIR/stk-effects projects/effects/effects
-sed -e 's,\./effects,$BIN_DIR/stk-effects,' -e '1i#! /bin/sh' \
-    -i projects/effects/StkEffects
-install -Dm644 -t $DATA_DIR/stk/effects projects/effects/StkEffects
-
-install -Dm644 -t $DATA_DIR/stk/ragamatic projects/ragamatic/tcl
-install -Dm644 -t $DATA_DIR/stk/ragamatic projects/ragamatic/rawwaves
-install -Dm644 -t $BIN_DIR/stk-ragamat projects/ragamatic/ragamat
-sed -e 's,\./ragamat,$BIN_DIR/stk-ragamat,' -e '1i#! /bin/sh' \
-  -i projects/ragamatic/Raga
-install -Dm644 -t $DATA_DIR/stk/ragamatic projects/ragamatic/Raga
-
-install -Dm644 -t $DATA_DIR/stk/eguitar projects/eguitar/tcl
-install -Dm644 -t $DATA_DIR/stk/eguitar projects/eguitar/scores
-install -Dm644 -t $BIN_DIR/stk-eguitar projects/eguitar/eguitar
-sed -e 's,\./eguitar,$BIN_DIR/stk-eguitar,' -e '1i#! /bin/sh' \
-  -i projects/eguitar/ElectricGuitar
-install -Dm644 -t $DATA_DIR/stk/eguitar projects/eguitar/ElectricGuitar
diff --git a/subprojects/shared-modules/linux-audio/stk.json b/subprojects/shared-modules/linux-audio/stk.json
deleted file mode 100644
index cf4d8f93..00000000
--- a/subprojects/shared-modules/linux-audio/stk.json
+++ /dev/null
@@ -1,28 +0,0 @@
-{
-    "name": "stk",
-    "build-commands": [
-        "make -j $FLATPAK_BUILDER_N_JOBS -C src",
-        "make -j $FLATPAK_BUILDER_N_JOBS -C projects/effects libeffects",
-        "make -j $FLATPAK_BUILDER_N_JOBS -C projects/ragamatic libragamat",
-        "make -j $FLATPAK_BUILDER_N_JOBS -C projects/eguitar libeguitar"
-    ],
-    "post-install": [
-        "sh ./stk-install.sh"
-    ],
-    "cleanup": [
-        "/bin/*",
-        "/include",
-        "*.a"
-    ],
-    "sources": [
-        {
-            "type": "archive",
-            "url": "http://ccrma.stanford.edu/software/stk/release/stk-4.6.1.tar.gz",
-            "sha256": "e77ba3c80cdd93ca02c34098b9b7f918df3d648c87f1ed5d94fe854debd6d101"
-        },
-        {
-            "type": "file",
-            "path": "patches/stk-install.sh"
-        }
-    ]
-}
diff --git a/subprojects/shared-modules/lua5.1/lua-5.1.5-so.patch b/subprojects/shared-modules/lua5.1/lua-5.1.5-so.patch
deleted file mode 100644
index 5fc61a08..00000000
--- a/subprojects/shared-modules/lua5.1/lua-5.1.5-so.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-diff -ur lua-5.1.4/src/Makefile lua-5.1.4-new/src/Makefile
---- lua-5.1.4/src/Makefile	2008-01-19 20:37:58.000000000 +0100
-+++ lua-5.1.4-new/src/Makefile	2012-02-23 18:26:43.000000000 +0100
-@@ -23,6 +23,7 @@
- PLATS= aix ansi bsd freebsd generic linux macosx mingw posix solaris
- 
- LUA_A=	liblua.a
-+LUA_SO=	liblua.so
- CORE_O=	lapi.o lcode.o ldebug.o ldo.o ldump.o lfunc.o lgc.o llex.o lmem.o \
- 	lobject.o lopcodes.o lparser.o lstate.o lstring.o ltable.o ltm.o  \
- 	lundump.o lvm.o lzio.o
-@@ -36,7 +37,7 @@
- LUAC_O=	luac.o print.o
- 
- ALL_O= $(CORE_O) $(LIB_O) $(LUA_O) $(LUAC_O)
--ALL_T= $(LUA_A) $(LUA_T) $(LUAC_T)
-+ALL_T= $(LUA_A) $(LUA_SO) $(LUA_T) $(LUAC_T)
- ALL_A= $(LUA_A)
- 
- default: $(PLAT)
-@@ -51,6 +52,11 @@
- 	$(AR) $@ $?
- 	$(RANLIB) $@
- 
-+$(LUA_SO): $(CORE_O) $(LIB_O)
-+	$(CC) -shared -ldl -Wl,-soname,$(LUA_SO).$(V) -o $@.$(R) $? -lm $(MYLDFLAGS)
-+	ln -sf $(LUA_SO).$(R) $(LUA_SO).$(V)
-+	ln -sf $(LUA_SO).$(R) $(LUA_SO)
-+
- $(LUA_T): $(LUA_O) $(LUA_A)
- 	$(CC) -o $@ $(MYLDFLAGS) $(LUA_O) $(LUA_A) $(LIBS)
- 
---- lua-5.1.4/Makefile	2008-08-12 02:40:48.000000000 +0200
-+++ lua-5.1.4-new/Makefile	2012-02-23 19:06:32.000000000 +0100
-@@ -53,7 +53,7 @@
- all:	$(PLAT)
- 
- $(PLATS) clean:
--	cd src && $(MAKE) $@
-+	cd src && $(MAKE) $@ V=$(V) R=$(R)
- 
- test:	dummy
- 	src/lua test/hello.lua
diff --git a/subprojects/shared-modules/lua5.1/lua-5.1.5.json b/subprojects/shared-modules/lua5.1/lua-5.1.5.json
deleted file mode 100644
index 896cadb9..00000000
--- a/subprojects/shared-modules/lua5.1/lua-5.1.5.json
+++ /dev/null
@@ -1,38 +0,0 @@
-{
-    "name": "lua-5.1",
-    "buildsystem": "simple",
-    "build-commands": [
-        "make -j $FLATPAK_BUILDER_N_JOBS CFLAGS=\"$CFLAGS -fPIC -DLUA_USE_LINUX\" linux",
-        "make INSTALL_TOP=$FLATPAK_DEST TO_LIB='liblua.a liblua.so.5.1.5' install",
-        "ln -sf liblua.so.5.1.5 $FLATPAK_DEST/lib/liblua.so",
-        "ln -sf liblua.so.5.1.5 $FLATPAK_DEST/lib/liblua.so.5.1",
-        "install -Dm0644 etc/lua.pc $FLATPAK_DEST/lib/pkgconfig/lua.pc",
-        "ln -sf lua.pc $FLATPAK_DEST/lib/pkgconfig/lua51.pc",
-        "ln -sf lua.pc $FLATPAK_DEST/lib/pkgconfig/lua5.1.pc",
-        "ln -sf lua.pc $FLATPAK_DEST/lib/pkgconfig/lua-5.1.pc"
-    ],
-    "sources": [
-        {
-            "type": "archive",
-            "url": "https://www.lua.org/ftp/lua-5.1.5.tar.gz",
-            "sha256": "2640fc56a795f29d28ef15e13c34a47e223960b0240e8cb0a82d9b0738695333"
-        },
-        {
-            "type": "patch",
-            "path": "lua-5.1.5-so.patch"
-        },
-        {
-            "type": "shell",
-            "commands": [
-                "sed -i \"s|/usr/local|$FLATPAK_DEST|\" etc/lua.pc src/luaconf.h"
-            ]
-        }
-    ],
-    "cleanup": [
-        "*.a",
-        "/bin",
-        "/include",
-        "/lib/pkgconfig",
-        "/man"
-    ]
-}
diff --git a/subprojects/shared-modules/lua5.3/lua-5.3.0-autotoolize.patch b/subprojects/shared-modules/lua5.3/lua-5.3.0-autotoolize.patch
new file mode 100644
index 00000000..3e4723a5
--- /dev/null
+++ b/subprojects/shared-modules/lua5.3/lua-5.3.0-autotoolize.patch
@@ -0,0 +1,192 @@
+diff -up lua-5.3.0/configure.ac.autoxxx lua-5.3.0/configure.ac
+--- lua-5.3.0/configure.ac.autoxxx	2015-01-15 10:20:03.826889574 -0500
++++ lua-5.3.0/configure.ac	2015-01-15 10:20:03.826889574 -0500
+@@ -0,0 +1,69 @@
++AC_PREREQ(2.59)
++AC_INIT([lua], [5.3.0], [https://bugzilla.redhat.com/], [lua-at], [http://www.lua.org])
++AC_SUBST([MAJOR_VERSION], [5.3])
++
++AC_CONFIG_HEADERS([config.h])
++AC_CONFIG_SRCDIR([src/lapi.c])
++
++AM_INIT_AUTOMAKE([1.9 foreign])
++
++AC_PROG_CC
++AC_PROG_LIBTOOL
++
++AC_ARG_WITH(
++  [readline],
++  [AC_HELP_STRING([--with-readline], [Use readline for interpreter input [default=yes]])],
++  [use_readline=$withval],
++  [use_readline=yes]
++)
++
++LUA_LIBS="-lm"
++
++# Check for readline
++READLINE_DEFS="#undef LUA_USE_READLINE"
++if test "x$use_readline" == "xyes"; then
++  AC_CHECK_LIB([readline], [readline], [:], [use_readline=no], [-lncurses])
++  AC_CHECK_HEADERS([readline/readline.h readline/history.h], [], [use_readline=no])
++  if test "x$use_readline" == "xno"; then
++    AC_MSG_WARN([readline headers could not be found, disabling readline support])
++  else
++    READLINE_DEFS="#define LUA_USE_READLINE"
++    READLINE_LIBS="-lreadline -lncurses"
++  fi
++fi
++AC_SUBST(READLINE_DEFS)
++AC_SUBST(READLINE_LIBS)
++
++case "$host" in
++  *-mingw*)  use_os=win32  ;;
++  *-darwin*) use_os=macosx ;;
++  *)         use_os=posix  ;;
++esac
++
++POSIX_DEFS="#undef LUA_USE_POSIX"
++LUA_DL_DEFS="#undef LUA_USE_DLOPEN"
++LUA_BUILD_AS_DLL_DEFS="#undef LUA_BUILD_AS_DLL"
++
++if test "x$use_os" == "xwin32"; then
++  LUA_BUILD_AS_DLL_DEFS="#define LUA_BUILD_AS_DLL"
++elif test "x$use_os" == "xmacosx"; then
++  POSIX_DEFS="#define LUA_USE_POSIX"
++  LUA_DL_DEFS="#define LUA_DL_DYLD"
++elif test "x$use_os" == "xposix"; then
++  POSIX_DEFS="#define LUA_USE_POSIX"
++  LUA_DL_DEFS="#define LUA_DL_DLOPEN"
++  LUA_LIBS="$LUA_LIBS -ldl"
++fi
++AC_SUBST(POSIX_DEFS)
++AC_SUBST(LUA_DL_DEFS)
++AC_SUBST(LUA_BUILD_AS_DLL_DEFS)
++
++AC_SUBST(LUA_LIBS)
++
++AC_CONFIG_FILES([Makefile
++                 src/Makefile
++                 src/lua.pc
++                 src/luaconf.h.template
++                 doc/Makefile
++])
++AC_OUTPUT
+diff -up lua-5.3.0/doc/Makefile.am.autoxxx lua-5.3.0/doc/Makefile.am
+--- lua-5.3.0/doc/Makefile.am.autoxxx	2015-01-15 10:20:03.826889574 -0500
++++ lua-5.3.0/doc/Makefile.am	2015-01-15 10:20:03.826889574 -0500
+@@ -0,0 +1,4 @@
++man1_MANS = lua.1 luac.1
++
++EXTRA_DIST = \
++	contents.html logo.gif lua.1 luac.1 lua.css manual.css manual.html osi-certified-72x60.png readme.html
+diff -up lua-5.3.0/Makefile.am.autoxxx lua-5.3.0/Makefile.am
+--- lua-5.3.0/Makefile.am.autoxxx	2015-01-15 10:20:03.826889574 -0500
++++ lua-5.3.0/Makefile.am	2015-01-15 10:20:03.826889574 -0500
+@@ -0,0 +1,3 @@
++SUBDIRS = src doc
++
++EXTRA_DIST = README
+diff -up lua-5.3.0/src/.gitignore.autoxxx lua-5.3.0/src/.gitignore
+--- lua-5.3.0/src/.gitignore.autoxxx	2015-01-15 10:20:03.826889574 -0500
++++ lua-5.3.0/src/.gitignore	2015-01-15 10:20:03.826889574 -0500
+@@ -0,0 +1,5 @@
++lua
++lua.pc
++luac
++luaconf.h
++luaconf.h.template
+diff -up lua-5.3.0/src/luaconf.h.template.in.autoxxx lua-5.3.0/src/luaconf.h.template.in
+--- lua-5.3.0/src/luaconf.h.template.in.autoxxx	2015-01-15 10:20:03.828889562 -0500
++++ lua-5.3.0/src/luaconf.h.template.in	2015-01-15 10:22:37.420027778 -0500
+@@ -11,6 +11,11 @@
+ #include <limits.h>
+ #include <stddef.h>
+ 
++@POSIX_DEFS@
++@LUA_DL_DEFS@
++@LUA_BUILD_AS_DLL_DEFS@
++@READLINE_DEFS@
++
+ 
+ /*
+ ** ===================================================================
+@@ -175,9 +180,9 @@
+ 
+ #else			/* }{ */
+ 
+-#define LUA_ROOT	"/usr/local/"
+-#define LUA_LDIR	LUA_ROOT "share/lua/" LUA_VDIR "/"
+-#define LUA_CDIR	LUA_ROOT "lib/lua/" LUA_VDIR "/"
++#define LUA_ROOT	"@prefix@/"
++#define LUA_LDIR	"@pkgdatadir@/lua/" LUA_VDIR "/"
++#define LUA_CDIR	"@libdir@/lua/" LUA_VDIR "/"
+ #define LUA_PATH_DEFAULT  \
+ 		LUA_LDIR"?.lua;"  LUA_LDIR"?/init.lua;" \
+ 		LUA_CDIR"?.lua;"  LUA_CDIR"?/init.lua;" \
+diff -up lua-5.3.0/src/lua.pc.in.autoxxx lua-5.3.0/src/lua.pc.in
+--- lua-5.3.0/src/lua.pc.in.autoxxx	2015-01-15 10:20:03.827889568 -0500
++++ lua-5.3.0/src/lua.pc.in	2015-01-15 10:20:03.827889568 -0500
+@@ -0,0 +1,13 @@
++V= @MAJOR_VERSION@
++R= @VERSION@
++prefix= @prefix@
++exec_prefix=${prefix}
++libdir= @libdir@
++includedir=${prefix}/include
++
++Name: Lua
++Description: An Extensible Extension Language
++Version: ${R}
++Requires:
++Libs: -llua @LUA_LIBS@
++Cflags: -I${includedir}
+diff -up lua-5.3.0/src/Makefile.am.autoxxx lua-5.3.0/src/Makefile.am
+--- lua-5.3.0/src/Makefile.am.autoxxx	2015-01-15 10:20:03.826889574 -0500
++++ lua-5.3.0/src/Makefile.am	2015-01-15 10:20:03.826889574 -0500
+@@ -0,0 +1,46 @@
++AM_CFLAGS = -Wall
++
++include_HEADERS = lua.h lualib.h lauxlib.h lua.hpp
++
++nodist_include_HEADERS = luaconf.h
++
++lib_LTLIBRARIES = liblua.la
++liblua_la_LDFLAGS = -release @MAJOR_VERSION@
++liblua_la_SOURCES = \
++	lapi.c lauxlib.c lbaselib.c lbitlib.c lcode.c lcorolib.c lctype.c ldblib.c \
++	ldebug.c ldo.c ldump.c lfunc.c lgc.c linit.c liolib.c llex.c lmathlib.c lmem.c \
++	loadlib.c lobject.c lopcodes.c loslib.c lparser.c lstate.c lstring.c lstrlib.c \
++	ltable.c ltablib.c ltm.c lundump.c lutf8lib.c lvm.c lzio.c \
++	lapi.h lcode.h lctype.h ldebug.h ldo.h lfunc.h lgc.h llex.h llimits.h \
++	lmem.h lobject.h lopcodes.h lparser.h lstate.h lstring.h ltable.h ltm.h \
++	lundump.h lvm.h lzio.h
++
++pkgconfigdir = $(libdir)/pkgconfig
++pkgconfig_DATA = lua.pc
++
++bin_PROGRAMS = lua luac
++
++lua_SOURCES = lua.c
++lua_LDADD = liblua.la @LUA_LIBS@ @READLINE_LIBS@
++lua_DEPENDENCIES = liblua.la
++
++luac_SOURCES = luac.c
++# Statically link liblua against luac since luac uses symbols not exported in liblua
++luac_LDADD = .libs/liblua.a @LUA_LIBS@
++luac_DEPENDENCIES = liblua.la
++
++EXTRA_DIST = luaconf.h.template
++BUILT_SOURCES = luaconf.h
++CLEANFILES = luaconf.h luaconf.h.template
++
++readline_defs = @READLINE_DEFS@
++
++edit = 	sed \
++	  -e 's,%prefix%,$(prefix),g' \
++	  -e 's,%lua_datadir%,$(datadir),g' \
++	  -e 's,%lua_libdir%,$(libdir),g'
++
++luaconf.h : luaconf.h.template
++	rm -f $@ $@.tmp
++	$(edit) $< >$@.tmp
++	mv $@.tmp $@
diff --git a/subprojects/shared-modules/lua5.3/lua-5.3.0-configure-compat-module.patch b/subprojects/shared-modules/lua5.3/lua-5.3.0-configure-compat-module.patch
new file mode 100644
index 00000000..bd5d41d4
--- /dev/null
+++ b/subprojects/shared-modules/lua5.3/lua-5.3.0-configure-compat-module.patch
@@ -0,0 +1,35 @@
+diff -up lua-5.2.2/configure.ac.compat-module lua-5.2.2/configure.ac
+--- lua-5.2.2/configure.ac.compat-module	2013-05-10 10:16:05.344137597 -0400
++++ lua-5.2.2/configure.ac	2013-05-10 10:16:05.357137596 -0400
+@@ -11,6 +11,20 @@ AC_PROG_CC
+ AC_PROG_LIBTOOL
+ 
+ AC_ARG_WITH(
++  [compat-module],
++  [AC_HELP_STRING([--with-compat-module], [Enable LUA_COMPAT_MODULE functions [default=no]])],
++  [use_compat_module=$withval],
++  [use_compat_module=no]
++)
++
++COMPAT_DEFS="#undef LUA_COMPAT_ALL"
++if test "x$use_compat_module" == "xyes"; then
++  COMPAT_DEFS="#define LUA_COMPAT_5_1
++#define LUA_COMPAT_5_2"
++fi
++AC_SUBST(COMPAT_DEFS)
++
++AC_ARG_WITH(
+   [readline],
+   [AC_HELP_STRING([--with-readline], [Use readline for interpreter input [default=yes]])],
+   [use_readline=$withval],
+diff -up lua-5.2.2/src/luaconf.h.template.in.compat-module lua-5.2.2/src/luaconf.h.template.in
+--- lua-5.2.2/src/luaconf.h.template.in.compat-module	2013-05-10 10:25:42.586116963 -0400
++++ lua-5.2.2/src/luaconf.h.template.in	2013-05-10 10:26:29.957115269 -0400
+@@ -15,6 +15,7 @@
+ @LUA_DL_DEFS@
+ @LUA_BUILD_AS_DLL_DEFS@
+ @READLINE_DEFS@
++@COMPAT_DEFS@
+ 
+ 
+ /*
diff --git a/subprojects/shared-modules/lua5.3/lua-5.3.0-idsize.patch b/subprojects/shared-modules/lua5.3/lua-5.3.0-idsize.patch
new file mode 100644
index 00000000..16107fe2
--- /dev/null
+++ b/subprojects/shared-modules/lua5.3/lua-5.3.0-idsize.patch
@@ -0,0 +1,12 @@
+diff -up lua-5.3.0/src/luaconf.h.template.in.idsize lua-5.3.0/src/luaconf.h.template.in
+--- lua-5.3.0/src/luaconf.h.template.in.idsize	2015-01-15 10:23:20.515801344 -0500
++++ lua-5.3.0/src/luaconf.h.template.in	2015-01-15 10:23:48.955651916 -0500
+@@ -693,7 +693,7 @@
+ @@ of a function in debug information.
+ ** CHANGE it if you want a different size.
+ */
+-#define LUA_IDSIZE	60
++#define LUA_IDSIZE	512
+ 
+ 
+ /*
diff --git a/subprojects/shared-modules/lua5.3/lua-5.3.5.json b/subprojects/shared-modules/lua5.3/lua-5.3.5.json
index c789fd65..fd5f2682 100644
--- a/subprojects/shared-modules/lua5.3/lua-5.3.5.json
+++ b/subprojects/shared-modules/lua5.3/lua-5.3.5.json
@@ -1,17 +1,7 @@
 {
     "name": "lua-5.3",
-    "buildsystem": "simple",
-    "build-commands": [
-        "make -j $FLATPAK_BUILDER_N_JOBS CFLAGS=\"$CFLAGS -fPIC -DLUA_USE_LINUX\" linux",
-        "make TO_LIB=liblua.so.5.3.5 INSTALL_TOP=$FLATPAK_DEST install",
-        "ln -sf liblua.so.5.3.5 $FLATPAK_DEST/lib/liblua.so",
-        "ln -sf liblua.so.5.3.5 $FLATPAK_DEST/lib/liblua.so.5.3",
-        "make INSTALL_TOP=${FLATPAK_DEST} pc > lua.pc",
-        "cat lua.pc.in >> lua.pc",
-        "install -Dm644 lua.pc $FLATPAK_DEST/lib/pkgconfig/lua.pc",
-        "ln -sf lua.pc $FLATPAK_DEST/lib/pkgconfig/lua53.pc",
-        "ln -sf lua.pc $FLATPAK_DEST/lib/pkgconfig/lua5.3.pc",
-        "ln -sf lua.pc $FLATPAK_DEST/lib/pkgconfig/lua-5.3.pc"
+    "config-opts": [
+        "--with-compat-module"
     ],
     "sources": [
         {
@@ -20,27 +10,25 @@
             "sha256": "0c2eed3f960446e1a3e4b9a1ca2f3ff893b6ce41942cf54d5dd59ab4b3b058ac"
         },
         {
+            "type": "shell",
+            "commands": [ "mv src/luaconf.h src/luaconf.h.template.in" ]
+        },
+        {
             "type": "patch",
-            "path": "makefile-add-liblua.so-rule.patch"
+            "path": "lua-5.3.0-autotoolize.patch"
         },
         {
-            "type": "file",
-            "path": "lua.pc.in"
+            "type": "patch",
+            "path": "lua-5.3.0-idsize.patch"
+        },
+        {
+            "type": "patch",
+            "path": "lua-5.3.0-configure-compat-module.patch"
         },
         {
             "type": "shell",
-            "commands": [
-                "sed -i \"s|/usr/local/|$FLATPAK_DEST/|;s|LUA_IDSIZE	60|LUA_IDSIZE	512|\" src/luaconf.h",
-                "# Lua 5.3.5 has wrong release version in its Makefile. Fix it.",
-                "sed 's/^R= \$V.4/R= \$V.5/' -i Makefile",
-                "sed -i '12 a\\\\n#define LUA_COMPAT_5_1\\n#define LUA_COMPAT_5_2' src/luaconf.h"
-            ]
+            "commands": [ "autoreconf -i" ]
         }
     ],
-    "cleanup": [
-        "/bin",
-        "/include",
-        "/lib/pkgconfig",
-        "/share/man"
-    ]
+    "cleanup": [ "/bin", "/include", "/lib/pkgconfig", "/lib/*.a", "/lib/*.la", "/share/man" ]
 }
diff --git a/subprojects/shared-modules/lua5.3/lua.pc.in b/subprojects/shared-modules/lua5.3/lua.pc.in
deleted file mode 100644
index 6698f8bc..00000000
--- a/subprojects/shared-modules/lua5.3/lua.pc.in
+++ /dev/null
@@ -1,8 +0,0 @@
-exec_prefix=${prefix}
-
-Name: Lua
-Description: An Extensible Extension Language
-Version: ${version}
-Requires: 
-Libs: -L${libdir} -llua -lm
-Cflags: -I${includedir}
\ No newline at end of file
diff --git a/subprojects/shared-modules/lua5.3/makefile-add-liblua.so-rule.patch b/subprojects/shared-modules/lua5.3/makefile-add-liblua.so-rule.patch
deleted file mode 100644
index f675d4d4..00000000
--- a/subprojects/shared-modules/lua5.3/makefile-add-liblua.so-rule.patch
+++ /dev/null
@@ -1,47 +0,0 @@
-diff --git a/Makefile b/Makefile
-index 7fa91c8..dccf485 100644
---- a/Makefile
-+++ b/Makefile
-@@ -52,7 +52,7 @@ R= $V.0
- all:	$(PLAT)
- 
- $(PLATS) clean:
--	cd src && $(MAKE) $@
-+	cd src && $(MAKE) $@ V=$(V) R=$(R)
- 
- test:	dummy
- 	src/lua -v
-diff --git a/src/Makefile b/src/Makefile
-index 2e7a412..fa5769f 100644
---- a/src/Makefile
-+++ b/src/Makefile
-@@ -29,6 +29,7 @@ MYOBJS=
- PLATS= aix bsd c89 freebsd generic linux macosx mingw posix solaris
- 
- LUA_A=	liblua.a
-+LUA_SO= liblua.so
- CORE_O=	lapi.o lcode.o lctype.o ldebug.o ldo.o ldump.o lfunc.o lgc.o llex.o \
- 	lmem.o lobject.o lopcodes.o lparser.o lstate.o lstring.o ltable.o \
- 	ltm.o lundump.o lvm.o lzio.o
-@@ -43,7 +44,7 @@ LUAC_T=	luac
- LUAC_O=	luac.o
- 
- ALL_O= $(BASE_O) $(LUA_O) $(LUAC_O)
--ALL_T= $(LUA_A) $(LUA_T) $(LUAC_T)
-+ALL_T= $(LUA_A) $(LUA_T) $(LUAC_T) $(LUA_SO)
- ALL_A= $(LUA_A)
- 
- # Targets start here.
-@@ -59,6 +60,12 @@ $(LUA_A): $(BASE_O)
- 	$(AR) $@ $(BASE_O)
- 	$(RANLIB) $@
- 
-+$(LUA_SO): $(CORE_O) $(LIB_O)
-+	$(CC) -shared -ldl -Wl,-soname,$(LUA_SO).$(V) -o $@.$(R) $? -lm $(MYLDFLAGS)
-+	ln -sf $(LUA_SO).$(R) $(LUA_SO).$(V)
-+	ln -sf $(LUA_SO).$(R) $(LUA_SO)
-+
-+
- $(LUA_T): $(LUA_O) $(LUA_A)
- 	$(CC) -o $@ $(LDFLAGS) $(LUA_O) $(LUA_A) $(LIBS)
- 
\ No newline at end of file
diff --git a/subprojects/shared-modules/python2.7/python-2.7.json b/subprojects/shared-modules/python2.7/python-2.7.json
index afdef902..14253764 100644
--- a/subprojects/shared-modules/python2.7/python-2.7.json
+++ b/subprojects/shared-modules/python2.7/python-2.7.json
@@ -3,8 +3,8 @@
     "sources": [
         {
             "type": "archive",
-            "url": "https://www.python.org/ftp/python/2.7.18/Python-2.7.18.tar.xz",
-            "sha256": "b62c0e7937551d0cc02b8fd5cb0f544f9405bafc9a54d3808ed4594812edef43"
+            "url": "https://www.python.org/ftp/python/2.7.17/Python-2.7.17.tar.xz",
+            "sha256": "4d43f033cdbd0aa7b7023c81b0e986fd11e653b5248dac9144d508f11812ba41"
         }
     ],
     "config-opts": [
diff --git a/subprojects/shared-modules/qt4/fixgcc9.patch b/subprojects/shared-modules/qt4/fixgcc9.patch
deleted file mode 100644
index 6501a83c..00000000
--- a/subprojects/shared-modules/qt4/fixgcc9.patch
+++ /dev/null
@@ -1,31 +0,0 @@
---- qt-everywhere-opensource-src-4.8.7/src/corelib/global/qglobal.h	2015-05-07 16:14:48.000000000 +0200
-+++ qt-everywhere-opensource-src-4.8.7-gcc9/src/corelib/global/qglobal.h	2020-05-28 16:24:45.160340385 +0200
-@@ -2482,22 +2482,22 @@
- 
- #endif /* Q_NO_TYPESAFE_FLAGS */
- 
--#if defined(Q_CC_GNU) && !defined(Q_CC_INTEL) && !defined(Q_CC_RVCT)
-+#if (defined(Q_CC_GNU) && !defined(Q_CC_RVCT))
- /* make use of typeof-extension */
- template <typename T>
- class QForeachContainer {
- public:
--    inline QForeachContainer(const T& t) : c(t), brk(0), i(c.begin()), e(c.end()) { }
-+    inline QForeachContainer(const T& t) : c(t), i(c.begin()), e(c.end()), control(1) { }
-     const T c;
--    int brk;
-     typename T::const_iterator i, e;
-+    int control;
- };
- 
- #define Q_FOREACH(variable, container)                                \
- for (QForeachContainer<__typeof__(container)> _container_(container); \
--     !_container_.brk && _container_.i != _container_.e;              \
--     __extension__  ({ ++_container_.brk; ++_container_.i; }))                       \
--    for (variable = *_container_.i;; __extension__ ({--_container_.brk; break;}))
-+     _container_.control && _container_.i != _container_.e;         \
-+     ++_container_.i, _container_.control ^= 1)                     \
-+    for (variable = *_container_.i; _container_.control; _container_.control = 0)
- 
- #else
- 
diff --git a/subprojects/shared-modules/qt4/qt4-4.8.7-minimal.json b/subprojects/shared-modules/qt4/qt4-4.8.7-minimal.json
index f0a192cf..fe7b74a4 100644
--- a/subprojects/shared-modules/qt4/qt4-4.8.7-minimal.json
+++ b/subprojects/shared-modules/qt4/qt4-4.8.7-minimal.json
@@ -77,10 +77,6 @@
             "path": "disable-sslv3.patch"
         },
         {
-            "type": "patch",
-            "path": "fixgcc9.patch"
-        },
-        {
             "type": "shell",
             "commands": [
                 "sed -i \"s|-O2|${CXXFLAGS}|\" mkspecs/common/{g++,gcc}-base.conf",