forked from void-linux/void-packages
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Closes: void-linux#46683 Closes: void-linux#46693
- Loading branch information
Showing
3 changed files
with
83 additions
and
4 deletions.
There are no files selected for viewing
47 changes: 47 additions & 0 deletions
47
srcpkgs/gpodder/patches/0001-Replace-the-removed-imp-module-with-importlib.patch
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,47 @@ | ||
From 16f52b8b96e05b8acb20354429269c4c9acc563a Mon Sep 17 00:00:00 2001 | ||
From: auouymous <au@qzx.com> | ||
Date: Fri, 20 Oct 2023 03:03:01 -0600 | ||
Subject: [PATCH 1/2] Replace the removed imp module with importlib. | ||
|
||
--- | ||
src/gpodder/extensions.py | 13 +++++++------ | ||
1 file changed, 7 insertions(+), 6 deletions(-) | ||
|
||
diff --git a/src/gpodder/extensions.py b/src/gpodder/extensions.py | ||
index 8f50ff31..44fc35d5 100644 | ||
--- a/src/gpodder/extensions.py | ||
+++ b/src/gpodder/extensions.py | ||
@@ -31,7 +31,7 @@ For an example extension see share/gpodder/examples/extensions.py | ||
|
||
import functools | ||
import glob | ||
-import imp | ||
+import importlib | ||
import logging | ||
import os | ||
import re | ||
@@ -291,15 +291,16 @@ class ExtensionContainer(object): | ||
self.name, self.metadata.only_for) | ||
return | ||
|
||
- basename, extension = os.path.splitext(os.path.basename(self.filename)) | ||
- fp = open(self.filename, 'r') | ||
+ basename, _ = os.path.splitext(os.path.basename(self.filename)) | ||
try: | ||
- module_file = imp.load_module(basename, fp, self.filename, | ||
- (extension, 'r', imp.PY_SOURCE)) | ||
+ # from load_source() on https://docs.python.org/dev/whatsnew/3.12.html | ||
+ loader = importlib.machinery.SourceFileLoader(basename, self.filename) | ||
+ spec = importlib.util.spec_from_file_location(basename, self.filename, loader=loader) | ||
+ module_file = importlib.util.module_from_spec(spec) | ||
+ loader.exec_module(module_file) | ||
finally: | ||
# Remove the .pyc file if it was created during import | ||
util.delete_file(self.filename + 'c') | ||
- fp.close() | ||
|
||
self.default_config = getattr(module_file, 'DefaultConfig', {}) | ||
if self.default_config: | ||
-- | ||
2.42.0 | ||
|
32 changes: 32 additions & 0 deletions
32
srcpkgs/gpodder/patches/0002-Switch-from-distutils-to-setuptools.patch
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,32 @@ | ||
From 4b75a049f5bc49273bb4a395ab16be3ba48491bd Mon Sep 17 00:00:00 2001 | ||
From: auouymous <au@qzx.com> | ||
Date: Tue, 24 Oct 2023 03:39:53 -0600 | ||
Subject: [PATCH 2/2] Switch from distutils to setuptools. | ||
|
||
Closes: #1571 [via git-merge-pr] | ||
--- | ||
setup.py | 5 +++-- | ||
1 file changed, 3 insertions(+), 2 deletions(-) | ||
|
||
diff --git a/setup.py b/setup.py | ||
index 86963fc5..9eb8ca39 100644 | ||
--- a/setup.py | ||
+++ b/setup.py | ||
@@ -21,11 +21,12 @@ | ||
import os | ||
import re | ||
import sys | ||
-from distutils.core import setup | ||
+ | ||
+from setuptools import setup | ||
|
||
installing = ('install' in sys.argv and '--help' not in sys.argv) | ||
|
||
-# distutils depends on setup.py being executed from the same dir. | ||
+# setuptools depends on setup.py being executed from the same dir. | ||
# Most of our custom commands work either way, but this makes | ||
# it work in all cases. | ||
os.chdir(os.path.dirname(os.path.realpath(__file__))) | ||
-- | ||
2.42.0 | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters