Merge pull request #40 from dmitrylyzo/TheOneric/patch_cleanup

[TheOneric] Patch cleanup

Author: dmitrylyzo

Makefile

@@ -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 \

…s/fontconfig/0002-disable-pthreads.patch …s/fontconfig/0001-disable-pthreads.patchbuild/patches/fontconfig/0002-disable-pthreads.patch renamed to build/patches/fontconfig/0001-disable-pthreads.patch build/patches/fontconfig/0002-disable-pthreads.patch renamed to build/patches/fontconfig/0001-disable-pthreads.patch

@@ -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