mirrors/guru
1
0
Fork 0
mirror of https://github.com/gentoo-mirror/guru.git synced 2026-07-10 15:45:15 -04:00
Code Issues Packages Projects Releases Wiki Activity

dev-util/afdko: clean up patches

Browse Source 
Signed-off-by: Anna (cybertailor) Vyalkova <cyber+gentoo@sysrq.in>
This commit is contained in:
Anna (cybertailor) Vyalkova
2023-03-01 04:39:42 +05:00
parent 06e56faf3f
commit d5bc6cde14
5 changed files with 4 additions and 91 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
dev-util/afdko/files/afdko-3.6.2-AR-fix.patch
View File

@@ -1,22 +0,0 @@
--- a/c/public/lib/config/linux/gcc/gcc.mak
+++ b/c/public/lib/config/linux/gcc/gcc.mak
@@ -27,7 +27,7 @@
$(LIB_TARGET): $(LIB_OBJS)
mkdir -p $(LIB_DIR)
- $(AR) -rvs $@ $?
+ $(AR) rvs $@ $?
clean:
if [ "$(LIB_OBJS)" ]; then \
--- a/c/public/lib/config/linux/gcc/gcc_tx.mak
+++ b/c/public/lib/config/linux/gcc/gcc_tx.mak
@@ -30,7 +30,7 @@
$(LIB_TARGET): $(LIB_OBJS)
mkdir -p $(LIB_DIR)
- $(AR) -rvs $@ $?
+ $(AR) rvs $@ $?
clean:
if [ "$(LIB_OBJS)" ]; then \

11
dev-util/afdko/files/afdko-3.6.2-_get_scripts-to-data_files.patch
View File

@@ -1,11 +0,0 @@
--- a/setup.py
+++ b/setup.py
@@ -234,7 +234,7 @@
'pytest',
],
install_requires=_get_requirements(),
- scripts=_get_scripts(),
+ data_files=[("bin",_get_scripts())],
entry_points={
'console_scripts': _get_console_scripts(),
},

26
dev-util/afdko/files/afdko-3.6.2-relax-hard-pinning.patch
View File

@@ -1,26 +0,0 @@
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,13 +1,13 @@
# 'lxml' is not a primary requirement of afdko but it's listed here because
# we want to have control over the version and guarantee that the XML output
# of our tools is stable
-# NOTE: hard-pinning (==) here gets relaxed to >= in setup.py
-lxml==4.6.2
-booleanOperations==0.9.0
-defcon[pens,lxml]==0.7.2
-fontMath==0.6.0
-fontTools[woff,ufo,lxml,unicode]==4.21.1
-psautohint==2.3.0
-tqdm==4.58.0
-ufonormalizer==0.5.3
-ufoProcessor==1.9.0
+# NOTE: hard-pinning (>=) here gets relaxed to >= in setup.py
+lxml>=4.6.2
+booleanOperations>=0.9.0
+defcon[pens,lxml]>=0.7.2
+fontMath>=0.6.0
+fontTools[woff,ufo,lxml,unicode]>=4.21.1
+psautohint>=2.3.0
+tqdm>=4.58.0
+ufonormalizer>=0.5.3
+ufoProcessor>=1.9.0

10
dev-util/afdko/files/afdko-3.8.1-antlr.patch
View File

@@ -1,6 +1,5 @@
diff '--color=auto' -ru afdko-3.8.1-orig/c/makeotf/lib/hotconv/CMakeLists.txt afdko-3.8.1/c/makeotf/lib/hotconv/CMakeLists.txt
--- a/c/makeotf/lib/hotconv/CMakeLists.txt 2022-04-16 18:04:34.060438876 +0200
+++ b/c/makeotf/lib/hotconv/CMakeLists.txt 2022-04-16 18:11:51.280732567 +0200
--- a/c/makeotf/lib/hotconv/CMakeLists.txt
+++ b/c/makeotf/lib/hotconv/CMakeLists.txt
@@ -68,8 +68,8 @@
)
@@ -12,9 +11,8 @@ diff '--color=auto' -ru afdko-3.8.1-orig/c/makeotf/lib/hotconv/CMakeLists.txt af
if ( CMAKE_COMPILER_IS_GNUCC )
target_compile_options(hotconv PRIVATE -Wall -Wno-attributes)
diff '--color=auto' -ru afdko-3.8.1-orig/CMakeLists.txt afdko-3.8.1/CMakeLists.txt
--- a/CMakeLists.txt 2022-04-16 18:04:34.055438815 +0200
+++ b/CMakeLists.txt 2022-04-16 18:05:14.656930402 +0200
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -27,23 +27,6 @@
list(APPEND CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/cmake)

26
dev-util/afdko/files/afdko-nowheel.diff
View File

@@ -1,26 +0,0 @@
--- a/setup.py
+++ b/setup.py
@@ -29,7 +29,6 @@ try:
except ImportError:
print("afdko: setup.py requires that the Python package 'wheel' be "
"installed. Try the command 'pip install wheel'.")
- sys.exit(1)
class InstallPlatlib(setuptools.command.install.install):
@@ -246,7 +245,6 @@ def main():
zip_safe=False,
python_requires='>=2.7',
setup_requires=[
- 'wheel',
'setuptools_scm',
],
tests_require=[
@@ -260,7 +258,6 @@ def main():
cmdclass={
'build_py': CustomBuild,
'build_scripts': CustomBuildScripts,
- 'bdist_wheel': CustomBDistWheel,
'install': InstallPlatlib,
},
)