commit: 0eec8ffb2d8468e4147c3e6f436f7cab589ed53c
parent 6b04ef717345370ad02805a78e7bf2c53d4b0fe7
Author: Haelwenn (lanodan) Monnier <contact@hacktivis.me>
Date: Sun, 3 Jan 2021 05:34:39 +0100
Remove patches that are now upstream
Diffstat:
3 files changed, 0 insertions(+), 187 deletions(-)
diff --git a/patches/net-libs/webkit-gtk/webkit-gtk-2.28.1-bubblewrap_launcher-allow-sndio.patch b/patches/net-libs/webkit-gtk/webkit-gtk-2.28.1-bubblewrap_launcher-allow-sndio.patch
@@ -1,37 +0,0 @@
-commit bb27bdec2efb886c309144d3f755d1490c26dcfe
-Author: Haelwenn (lanodan) Monnier <contact@hacktivis.me>
-Date: 2020-05-25T22:27:59 GMT
-
- BubblewrapLauncher.cpp: Allows to use sndio
-
-diff --git a/Source/WebKit/UIProcess/Launcher/glib/BubblewrapLauncher.cpp b/Source/WebKit/UIProcess/Launcher/glib/BubblewrapLauncher.cpp
-index ad301ab2..06dcd41b 100644
---- a/Source/WebKit/UIProcess/Launcher/glib/BubblewrapLauncher.cpp
-+++ b/Source/WebKit/UIProcess/Launcher/glib/BubblewrapLauncher.cpp
-@@ -381,6 +381,18 @@ static void bindPulse(Vector<CString>& args)
- bindIfExists(args, "/dev/snd", BindFlags::Device);
- }
-
-+static void bindSndio(Vector<CString>& args)
-+{
-+ bindIfExists(args, "/tmp/sndio", BindFlags::ReadWrite);
-+
-+ GUniquePtr<char> sndioUidDir(g_strdup_printf("/tmp/sndio-%d", getuid()));
-+ bindIfExists(args, sndioUidDir.get(), BindFlags::ReadWrite);
-+
-+ const char* homeDir = g_get_home_dir();
-+ GUniquePtr<char> sndioHomeDir(g_build_filename(homeDir, ".sndio", nullptr));
-+ bindIfExists(args, sndioHomeDir.get(), BindFlags::ReadWrite);
-+}
-+
- static void bindFonts(Vector<CString>& args)
- {
- const char* configDir = g_get_user_config_dir();
-@@ -807,6 +819,7 @@ GRefPtr<GSubprocess> bubblewrapSpawn(GSubprocessLauncher* launcher, const Proces
- bindDBusSession(sandboxArgs, proxy);
- // FIXME: We should move to Pipewire as soon as viable, Pulse doesn't restrict clients atm.
- bindPulse(sandboxArgs);
-+ bindSndio(sandboxArgs);
- bindFonts(sandboxArgs);
- bindGStreamerData(sandboxArgs);
- bindOpenGL(sandboxArgs);
diff --git a/patches/net-misc/youtube-dl/youtube-dl-2020.09.20-bandcamp_url_quoted_data.patch b/patches/net-misc/youtube-dl/youtube-dl-2020.09.20-bandcamp_url_quoted_data.patch
@@ -1,129 +0,0 @@
-From f2ecf2b7e6e79d2003c8ef3ddf018430f62eb19f Mon Sep 17 00:00:00 2001
-From: Leonardo Taccari <iamleot@gmail.com>
-Date: Sun, 11 Oct 2020 14:47:25 +0200
-Subject: [PATCH] [bandcamp] Update to handle HTML quoted data
-
-Adjust the extractor to handle JSON data-* attributes by introducing a
-_json_data_extract() method to handle them (and existing existing
-patterns in the code).
-
-Based on Gilles Pietri #26684.
----
- youtube_dl/extractor/bandcamp.py | 48 ++++++++++++++------------------
- 1 file changed, 21 insertions(+), 27 deletions(-)
-
-diff --git a/youtube_dl/extractor/bandcamp.py b/youtube_dl/extractor/bandcamp.py
-index f14b407dc82c..7357b794b275 100644
---- a/youtube_dl/extractor/bandcamp.py
-+++ b/youtube_dl/extractor/bandcamp.py
-@@ -79,6 +79,14 @@ class BandcampIE(InfoExtractor):
- },
- }]
-
-+ def _json_data_extract(self, data_key, video_id, webpage):
-+ return self._parse_json(
-+ self._search_regex(
-+ r'data-' + data_key + r'=(["\'])(?P<data>{.+?})\1',
-+ webpage, 'JSON data {data_key}'.format(data_key=data_key),
-+ group='data', default=None),
-+ video_id, transform_source=unescapeHTML)
-+
- def _real_extract(self, url):
- mobj = re.match(self._VALID_URL, url)
- title = mobj.group('title')
-@@ -91,10 +99,9 @@ def _real_extract(self, url):
- duration = None
-
- formats = []
-- track_info = self._parse_json(
-- self._search_regex(
-- r'trackinfo\s*:\s*\[\s*({.+?})\s*\]\s*,\s*?\n',
-- webpage, 'track info', default='{}'), title)
-+ tralbum_data = self._json_data_extract('tralbum', title, webpage)
-+ embed_data = self._json_data_extract('embed', title, webpage)
-+ track_info = tralbum_data['trackinfo'][0]
- if track_info:
- file_ = track_info.get('file')
- if isinstance(file_, dict):
-@@ -116,9 +123,9 @@ def _real_extract(self, url):
- duration = float_or_none(track_info.get('duration'))
-
- def extract(key):
-- return self._search_regex(
-- r'\b%s\s*["\']?\s*:\s*(["\'])(?P<value>(?:(?!\1).)+)\1' % key,
-- webpage, key, default=None, group='value')
-+ for data in tralbum_data['current'], embed_data, tralbum_data:
-+ if key in data and data[key]:
-+ return data[key]
-
- artist = extract('artist')
- album = extract('album_title')
-@@ -126,9 +133,7 @@ def extract(key):
- extract('publish_date') or extract('album_publish_date'))
- release_date = unified_strdate(extract('album_release_date'))
-
-- download_link = self._search_regex(
-- r'freeDownloadPage\s*:\s*(["\'])(?P<url>(?:(?!\1).)+)\1', webpage,
-- 'download link', default=None, group='url')
-+ download_link = tralbum_data['freeDownloadPage']
- if download_link:
- track_id = self._search_regex(
- r'(?ms)var TralbumData = .*?[{,]\s*id: (?P<id>\d+),?$',
-@@ -137,11 +142,7 @@ def extract(key):
- download_webpage = self._download_webpage(
- download_link, track_id, 'Downloading free downloads page')
-
-- blob = self._parse_json(
-- self._search_regex(
-- r'data-blob=(["\'])(?P<blob>{.+?})\1', download_webpage,
-- 'blob', group='blob'),
-- track_id, transform_source=unescapeHTML)
-+ blob = self._json_data_extract('blob', track_id, download_webpage)
-
- info = try_get(
- blob, (lambda x: x['digital_items'][0],
-@@ -218,7 +219,7 @@ def extract(key):
- }
-
-
--class BandcampAlbumIE(InfoExtractor):
-+class BandcampAlbumIE(BandcampIE):
- IE_NAME = 'Bandcamp:album'
- _VALID_URL = r'https?://(?:(?P<subdomain>[^.]+)\.)?bandcamp\.com(?:/album/(?P<album_id>[^/?#&]+))?'
-
-@@ -314,11 +315,8 @@ def _real_extract(self, url):
- for elem_content, t_path in track_elements
- if self._html_search_meta('duration', elem_content, default=None)]
-
-- title = self._html_search_regex(
-- r'album_title\s*:\s*"((?:\\.|[^"\\])+?)"',
-- webpage, 'title', fatal=False)
-- if title:
-- title = title.replace(r'\"', '"')
-+ embed_data = self._json_data_extract('embed', album_id, webpage)
-+ title = embed_data.get('album_title')
- return {
- '_type': 'playlist',
- 'uploader_id': uploader_id,
-@@ -328,7 +326,7 @@ def _real_extract(self, url):
- }
-
-
--class BandcampWeeklyIE(InfoExtractor):
-+class BandcampWeeklyIE(BandcampIE):
- IE_NAME = 'Bandcamp:weekly'
- _VALID_URL = r'https?://(?:www\.)?bandcamp\.com/?\?(?:.*?&)?show=(?P<id>\d+)'
- _TESTS = [{
-@@ -355,11 +353,7 @@ def _real_extract(self, url):
- video_id = self._match_id(url)
- webpage = self._download_webpage(url, video_id)
-
-- blob = self._parse_json(
-- self._search_regex(
-- r'data-blob=(["\'])(?P<blob>{.+?})\1', webpage,
-- 'blob', group='blob'),
-- video_id, transform_source=unescapeHTML)
-+ blob = self._json_data_extract('blob', video_id, webpage)
-
- show = blob['bcw_show']
-
diff --git a/patches/sys-libs/glibc/stfu-rms-on-abort.patch b/patches/sys-libs/glibc/stfu-rms-on-abort.patch
@@ -1,21 +0,0 @@
-X-Git-Url: https://sourceware.org/git/?p=glibc.git;a=blobdiff_plain;f=manual%2Fstartup.texi;h=21c48cd0374dcc906c33165267412081fc7de2dc;hp=7395d32dd0c877487938857fd432650e87fe7bb2;hb=340d9652b9d0e1d4136588f18b726662d195777c;hpb=c57bf7c15ba179168d01f7c6acde7ecbf5dd9cd8
-
-diff --git a/manual/startup.texi b/manual/startup.texi
-index 7395d32..21c48cd 100644
---- a/manual/startup.texi
-+++ b/manual/startup.texi
-@@ -1005,14 +1005,6 @@ This function actually terminates the process by raising a
- intercept this signal; see @ref{Signal Handling}.
- @end deftypefun
-
--@c Put in by rms. Don't remove.
--@cartouche
--@strong{Future Change Warning:} Proposed Federal censorship regulations
--may prohibit us from giving you information about the possibility of
--calling this function. We would be required to say that this is not an
--acceptable way of terminating a program.
--@end cartouche
--
- @node Termination Internals
- @subsection Termination Internals
-
