Skip to content

[TheOneric] Patch cleanup #40

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
dmitrylyzo merged 4 commits into from
Dec 23, 2022
Merged

[TheOneric] Patch cleanup #40

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
6993469
Remove libass patchdir
TheOneric Apr 1, 2022
71a8070
Drop useless patch
TheOneric Apr 1, 2022
91718c7
Replace patched harfbuzz.pc
TheOneric Apr 2, 2022
7d303f5
Bump Fontconfig
TheOneric Feb 13, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -164,7 +164,7 @@ $(DIST_DIR)/lib/libharfbuzz.a: build/lib/freetype/build_hb/dist_hb/lib/libfreety
# Freetype with Harfbuzz
$(DIST_DIR)/lib/libfreetype.a: $(DIST_DIR)/lib/libharfbuzz.a $(DIST_DIR)/lib/libbrotlidec.a
cd build/lib/freetype && \
EM_PKG_CONFIG_PATH=$(DIST_DIR)/lib/pkgconfig \
EM_PKG_CONFIG_PATH=$(DIST_DIR)/lib/pkgconfig:$(BASE_DIR)build/lib/freetype/build_hb/dist_hb/lib/pkgconfig \
emconfigure ./configure \
CFLAGS=" \
-s USE_PTHREADS=0 \
Expand Down
4 changes: 2 additions & 2 deletions ...es/fontconfig/0002-disable-pthreads.patch → ...es/fontconfig/0001-disable-pthreads.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
diff --git a/configure.ac b/configure.ac
index 394c281..1cb2f74 100644
index 26b974a..b73d132 100644
--- a/configure.ac
+++ b/configure.ac
@@ -681,22 +681,8 @@ if $fc_cv_have_solaris_atomic_ops; then
@@ -712,22 +712,8 @@ if $fc_cv_have_solaris_atomic_ops; then
AC_DEFINE(HAVE_SOLARIS_ATOMIC_OPS, 1, [Have Solaris __machine_*_barrier and atomic_* operations])
fi

Expand Down
46 changes: 0 additions & 46 deletions build/patches/fontconfig/0003-fix-fcstats-emscripten.patch
View file
Open in desktop

This file was deleted.

26 changes: 0 additions & 26 deletions build/patches/freetype/0001-disable-exports.patch
View file
Open in desktop

This file was deleted.

10 changes: 0 additions & 10 deletions build/patches/harfbuzz/0002-disable-dependency-build.patch
View file
Open in desktop

This file was deleted.

Empty file removed build/patches/libass/.gitkeep
View file
Open in desktop
Empty file.
2 changes: 1 addition & 1 deletion lib/fontconfig
Open in desktop
Submodule fontconfig updated from e291fd to d37f97