Skip to content

Commit a81a46f

Browse files
authored
Merge pull request #432 from buffer/weasyprint
Fix macOS build and disable speakeasy-emulator
2 parents 8bf2e91 + 32e18d9 commit a81a46f

2 files changed

Lines changed: 8 additions & 8 deletions

File tree

.github/workflows/osx.yml

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ jobs:
99
strategy:
1010
fail-fast: false
1111
matrix:
12-
python-version: ['3.9', '3.10', '3.11', '3.12', '3.13', '3.14']
12+
python-version: ['3.10', '3.11', '3.12', '3.13', '3.14']
1313
os: [macos-14]
1414

1515
steps:
@@ -24,13 +24,8 @@ jobs:
2424
- name: Install dependencies
2525
run: |
2626
brew reinstall git autoconf libtool
27-
brew install automake graphviz tesseract libmagic pango
27+
brew install automake graphviz tesseract libmagic
2828
ln -s $(which glibtoolize) /usr/local/bin/libtoolize
29-
ln -s /opt/homebrew/opt/glib/lib/libgobject-2.0.0.dylib /usr/local/lib/gobject-2.0
30-
ln -s /opt/homebrew/opt/pango/lib/libpango-1.0.dylib /usr/local/lib/pango-1.0
31-
ln -s /opt/homebrew/opt/harfbuzz/lib/libharfbuzz.dylib /usr/local/lib/harfbuzz
32-
ln -s /opt/homebrew/opt/fontconfig/lib/libfontconfig.1.dylib /usr/local/lib/fontconfig-1
33-
ln -s /opt/homebrew/opt/pango/lib/libpangoft2-1.0.dylib /usr/local/lib/pangoft2-1.0
3429
pip install --upgrade pip setuptools wheel tox tox-gh-actions appdirs
3530
BUILD_LIB=1 pip install --use-pep517 ssdeep
3631
pip install --config-settings="--global-option=build_ext" --config-settings="--global-option=-I$(brew --prefix graphviz)/include/" --config-settings="--global-option=-L$(brew --prefix graphviz)/lib/" pygraphviz
@@ -51,4 +46,9 @@ jobs:
5146
5247
- name: Test Thug
5348
run: |
49+
sudo ln -s $(brew --prefix glib)/lib/libgobject-2.0.0.dylib /usr/local/lib/libgobject-2.0-0
50+
sudo ln -s $(brew --prefix pango)/lib/libpango-1.0.dylib /usr/local/lib/pango-1.0-0
51+
sudo ln -s $(brew --prefix harfbuzz)/lib/libharfbuzz.dylib /usr/local/lib/libharfbuzz-0
52+
sudo ln -s $(brew --prefix fontconfig)/lib/libfontconfig.1.dylib /usr/local/lib/fontconfig-1
53+
sudo ln -s $(brew --prefix pango)/lib/libpangoft2-1.0.0.dylib /usr/local/lib/pangoft2-1.0
5454
tox

thug/Analysis/shellcode/Shellcode.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@
4040
class Shellcode:
4141
modules = (
4242
"pylibemu",
43-
"speakeasy",
43+
# "speakeasy",
4444
)
4545

4646
def __init__(self):

0 commit comments

Comments
 (0)