mirror/vcpkg
1
0
Fork 0
mirror of https://github.com/microsoft/vcpkg.git synced 2024-11-28 04:09:00 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

[fontconfig] update to 2.13.94 (#19285)

Browse Source
This commit is contained in:
autoantwort 2021-09-10 22:36:20 +02:00 committed by GitHub
parent dfcd4e4b30
commit 6676fce90e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
10 changed files with 21 additions and 445 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

295
ports/fontconfig/build.patch
View File

@ -1,295 +0,0 @@
diff --git a/conf.d/Makefile.am b/conf.d/Makefile.am
index ff03fb2eb..769fc6005 100644
--- a/conf.d/Makefile.am
+++ b/conf.d/Makefile.am
@@ -95,9 +95,9 @@ install-data-hook:
@(echo cd $(DESTDIR)$(configdir); \
cd $(DESTDIR)$(configdir); \
for i in $(CONF_LINKS); do \
- echo $(RM) $$i";" ln -s $(templatedir)/$$i .; \
+ echo $(RM) $$i";" $(LN_S) $(DESTDIR)$(templatedir)/$$i .; \
$(RM) $$i; \
- ln -s $(templatedir)/$$i .; \
+ $(LN_S) $(DESTDIR)$(templatedir)/$$i .; \
done)
uninstall-local:
@(echo cd $(DESTDIR)$(configdir); \
diff --git a/src/Makefile.am b/src/Makefile.am
index 35e820d60..42bd7c5a2 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -33,7 +33,7 @@ fontconfig_def_dependency = fontconfig.def
install-libtool-import-lib: libfontconfig.la
$(MKDIR_P) $(DESTDIR)$(libdir)
- $(INSTALL) .libs/libfontconfig.dll.a $(DESTDIR)$(libdir)/libfontconfig.dll.a
+# $(INSTALL) .libs/libfontconfig.dll.a $(DESTDIR)$(libdir)/libfontconfig.dll.a
$(INSTALL) fontconfig.def $(DESTDIR)$(libdir)/fontconfig.def
uninstall-libtool-import-lib:
@@ -58,7 +58,8 @@ fontconfig.lib : libfontconfig.la
lib -name:libfontconfig-@LIBT_CURRENT_MINUS_AGE@.dll -def:fontconfig.def -out:$@
install-ms-import-lib:
- $(INSTALL) fontconfig.lib $(DESTDIR)$(libdir)
+ $(MKDIR_P) $(DESTDIR)$(libdir)
+ $(INSTALL) .libs/fontconfig.lib $(DESTDIR)$(libdir)
uninstall-ms-import-lib:
$(RM) $(DESTDIR)$(libdir)/fontconfig.lib
diff --git a/fc-cache/fc-cache.c b/fc-cache/fc-cache.c
index 87e302083..8b5012110 100644
--- a/fc-cache/fc-cache.c
+++ b/fc-cache/fc-cache.c
@@ -34,11 +34,20 @@
#include <fontconfig/fontconfig.h>
#include <stdio.h>
#include <stdlib.h>
+#ifdef HAVE_UNISTD_H
#include <unistd.h>
+#endif
+#ifdef _MSC_VER
+#include <io.h>
+#endif
#include <sys/types.h>
+#if HAVE_SYS_STAT_H
#include <sys/stat.h>
+#endif
#include <errno.h>
+#if HAVE_FCNTL_H
#include <fcntl.h>
+#endif
#include <dirent.h>
#include <string.h>
#include <locale.h>
diff --git a/fc-cat/fc-cat.c b/fc-cat/fc-cat.c
index 69611bcc3..e7b0efbaa 100644
--- a/fc-cat/fc-cat.c
+++ b/fc-cat/fc-cat.c
@@ -36,9 +36,16 @@
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
+#ifdef HAVE_UNISTD_H
#include <unistd.h>
+#endif
+#ifdef _MSC_VER
+#include <io.h>
+#endif
#include <sys/types.h>
+#if HAVE_SYS_STAT_H
#include <sys/stat.h>
+#endif
#include <errno.h>
#include <locale.h>
diff --git a/fc-conflist/fc-conflist.c b/fc-conflist/fc-conflist.c
index 5c40a0f09..affaca09e 100644
--- a/fc-conflist/fc-conflist.c
+++ b/fc-conflist/fc-conflist.c
@@ -35,7 +35,12 @@
#include <fontconfig/fontconfig.h>
#include <stdio.h>
+#ifdef HAVE_UNISTD_H
#include <unistd.h>
+#endif
+#ifdef _MSC_VER
+#include <io.h>
+#endif
#include <stdlib.h>
#include <string.h>
#include <locale.h>
diff --git a/fc-list/fc-list.c b/fc-list/fc-list.c
index 2039acd36..0e56b1c32 100644
--- a/fc-list/fc-list.c
+++ b/fc-list/fc-list.c
@@ -24,7 +24,12 @@
#include <fontconfig/fontconfig.h>
#include <stdio.h>
+#ifdef HAVE_UNISTD_H
#include <unistd.h>
+#endif
+#ifdef _MSC_VER
+#include <io.h>
+#endif
#include <stdlib.h>
#include <string.h>
#include <locale.h>
diff --git a/fc-match/fc-match.c b/fc-match/fc-match.c
index dee61479d..da8d820aa 100644
--- a/fc-match/fc-match.c
+++ b/fc-match/fc-match.c
@@ -33,7 +33,12 @@
#include <fontconfig/fontconfig.h>
#include <stdio.h>
+#ifdef HAVE_UNISTD_H
#include <unistd.h>
+#endif
+#ifdef _MSC_VER
+#include <io.h>
+#endif
#include <stdlib.h>
#include <string.h>
#include <locale.h>
diff --git a/fc-pattern/fc-pattern.c b/fc-pattern/fc-pattern.c
index 7989b816f..15b43e098 100644
--- a/fc-pattern/fc-pattern.c
+++ b/fc-pattern/fc-pattern.c
@@ -33,7 +33,12 @@
#include <fontconfig/fontconfig.h>
#include <stdio.h>
+#ifdef HAVE_UNISTD_H
#include <unistd.h>
+#endif
+#ifdef _MSC_VER
+#include <io.h>
+#endif
#include <stdlib.h>
#include <string.h>
#include <locale.h>
diff --git a/fc-query/fc-query.c b/fc-query/fc-query.c
index fbffb8415..58c251fe3 100644
--- a/fc-query/fc-query.c
+++ b/fc-query/fc-query.c
@@ -36,7 +36,12 @@
#include <fontconfig/fontconfig.h>
#include <fontconfig/fcfreetype.h>
#include <stdio.h>
+#ifdef HAVE_UNISTD_H
#include <unistd.h>
+#endif
+#ifdef _MSC_VER
+#include <io.h>
+#endif
#include <stdlib.h>
#include <string.h>
#include <locale.h>
diff --git a/fc-scan/fc-scan.c b/fc-scan/fc-scan.c
index 9302ac559..3a0ccf188 100644
--- a/fc-scan/fc-scan.c
+++ b/fc-scan/fc-scan.c
@@ -36,7 +36,12 @@
#include <fontconfig/fontconfig.h>
#include <fontconfig/fcfreetype.h>
#include <stdio.h>
+#ifdef HAVE_UNISTD_H
#include <unistd.h>
+#endif
+#ifdef _MSC_VER
+#include <io.h>
+#endif
#include <stdlib.h>
#include <string.h>
#include <locale.h>
diff --git a/fc-validate/fc-validate.c b/fc-validate/fc-validate.c
index 2ceee2024..8f702f190 100644
--- a/fc-validate/fc-validate.c
+++ b/fc-validate/fc-validate.c
@@ -36,7 +36,12 @@
#include <fontconfig/fontconfig.h>
#include <fontconfig/fcfreetype.h>
#include <stdio.h>
+#ifdef HAVE_UNISTD_H
#include <unistd.h>
+#endif
+#ifdef _MSC_VER
+#include <io.h>
+#endif
#include <stdlib.h>
#include <string.h>
#include <locale.h>
diff --git a/src/fcatomic.c b/src/fcatomic.c
index d12d32408..da7234934 100644
--- a/src/fcatomic.c
+++ b/src/fcatomic.c
@@ -50,7 +50,9 @@
#include "fcint.h"
#include <sys/types.h>
#include <sys/stat.h>
+#ifdef HAVE_UNISTD_H
#include <unistd.h>
+#endif
#include <stdlib.h>
#include <time.h>
diff --git a/src/fccache.c b/src/fccache.c
index 2b604014e..50fb742c6 100644
--- a/src/fccache.c
+++ b/src/fccache.c
@@ -30,7 +30,9 @@
#include <limits.h>
#include <sys/types.h>
#include <sys/stat.h>
+#ifndef _MSC_VER
#include <sys/time.h>
+#endif
#include <assert.h>
#if defined(HAVE_MMAP) || defined(__CYGWIN__)
# include <unistd.h>
diff --git a/src/fcint.h b/src/fcint.h
index de78cd8c9..4fb269ffa 100644
--- a/src/fcint.h
+++ b/src/fcint.h
@@ -40,7 +40,18 @@
#include <limits.h>
#include <float.h>
#include <math.h>
+#ifdef HAVE_UNISTD_H
#include <unistd.h>
+#endif
+#ifdef _MSC_VER
+#include <direct.h>
+#include <io.h>
+#include <BaseTsd.h>
+#define ssize_t SSIZE_T
+#define F_OK 0
+#define W_OK 2
+typedef int mode_t;
+#endif
#include <stddef.h>
#include <sys/types.h>
#include <sys/stat.h>
diff --git a/test/test-migration.c b/test/test-migration.c
index b7d96dcce..7eac59dcc 100644
--- a/test/test-migration.c
+++ b/test/test-migration.c
@@ -28,13 +28,16 @@
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
+#ifdef HAVE_UNISTD_H
#include <unistd.h>
+#endif
+#ifdef _MSC_VER
+#include <io.h>
+#endif
#include <sys/types.h>
#include <dirent.h>
#ifndef HAVE_STRUCT_DIRENT_D_TYPE
-#include <sys/types.h>
#include <sys/stat.h>
-#include <unistd.h>
#endif
#include <fontconfig/fontconfig.h>
diff --git a/test/test-pthread.c b/test/test-pthread.c
index fbf397d4c..38d7dea35 100644
--- a/test/test-pthread.c
+++ b/test/test-pthread.c
@@ -24,7 +24,12 @@
*/
#include <stdio.h>
#include <stdlib.h>
+#ifdef HAVE_UNISTD_H
#include <unistd.h>
+#endif
+#ifdef _MSC_VER
+#include <io.h>
+#endif
#include <pthread.h>
#include <fontconfig/fontconfig.h>

35
ports/fontconfig/build2.patch
View File

@ -1,35 +0,0 @@
diff --git a/Tools.mk b/Tools.mk
index f0fa0ec50..24e5afd16 100644
--- a/Tools.mk
+++ b/Tools.mk
@@ -43,7 +43,7 @@ AM_CPPFLAGS = \
$(WARN_CFLAGS)
$(TOOL): $(TSRC) $(ALIAS_FILES)
- $(AM_V_GEN) $(CC_FOR_BUILD) -o $(TOOL) $< $(AM_CPPFLAGS)
+ $(AM_V_GEN) $(CC_FOR_BUILD) -o $(TOOL) $< $(AM_CPPFLAGS) $(LIBINTL) $(CFLAGS)
$(TARG): $(TMPL) $(TSRC) $(DEPS)
$(AM_V_GEN) $(MAKE) $(TOOL) && \
diff --git a/fc-case/fc-case.c b/fc-case/fc-case.c
index 236bff5f0..6fb21c855 100644
--- a/fc-case/fc-case.c
+++ b/fc-case/fc-case.c
@@ -345,7 +345,7 @@ main (int argc, char **argv)
break;
fputs (line, stdout);
}
-
+ fflush (stdout);
/*
* Dump these tables
*/
@@ -354,7 +354,7 @@ main (int argc, char **argv)
/*
* And flush out the rest of the input file
*/
-
+ fflush (stdout);
while (fgets (line, sizeof (line), stdin))
fputs (line, stdout);

14
ports/fontconfig/disable-install-data.patch
View File

@ -1,14 +0,0 @@
diff --git a/po-conf/LINGUAS b/po-conf/LINGUAS
index 0d5d97c..e7604c1 100644
--- a/po-conf/LINGUAS
+++ b/po-conf/LINGUAS
@@ -1,2 +1 @@
# Please keep this list sorted alphabetically.
-zh_CN
diff --git a/po/LINGUAS b/po/LINGUAS
index 0d5d97c..e7604c1 100644
--- a/po/LINGUAS
+++ b/po/LINGUAS
@@ -1,2 +1 @@
# Please keep this list sorted alphabetically.
-zh_CN

13
ports/fontconfig/fix_def_dll_name.patch
View File

@ -1,13 +0,0 @@
diff --git a/src/Makefile.am b/src/Makefile.am
index 3cf93a7f8..c80f4dd83 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -218,7 +218,7 @@ fontconfig.def: $(PUBLIC_FILES) $(PUBLIC_FT_FILES)
(cat $(PUBLIC_FILES) $(PUBLIC_FT_FILES) || echo 'FcERROR ()' ) | \
$(GREP) '^Fc[^ ]* *(' | $(SED) -e 's/ *(.*$$//' -e 's/^/ /' | \
sort; \
- echo LIBRARY libfontconfig-@LIBT_CURRENT_MINUS_AGE@.dll; \
+ echo LIBRARY fontconfig-@LIBT_CURRENT_MINUS_AGE@.dll; \
echo VERSION @LIBT_CURRENT@.@LIBT_REVISION@) >$@
@ ! $(GREP) -q FcERROR $@ || ($(RM) $@; false)

34
ports/fontconfig/macos_arm_fccache.patch
View File

@ -1,34 +0,0 @@
src/fcatomic.h | 12 ++----------
1 file changed, 2 insertions(+), 10 deletions(-)
diff --git a/src/fcatomic.h b/src/fcatomic.h
index cc28a883c13fadf2ad9900586a9cae3097354671..657a5f551adfc37415231b7002746ad6cd031c78 100644
--- a/src/fcatomic.h
+++ b/src/fcatomic.h
@@ -70,24 +70,16 @@ typedef LONG fc_atomic_int_t;
#elif !defined(FC_NO_MT) && defined(__APPLE__)
#include <libkern/OSAtomic.h>
-#ifdef __MAC_OS_X_MIN_REQUIRED
#include <AvailabilityMacros.h>
-#elif defined(__IPHONE_OS_MIN_REQUIRED)
-#include <Availability.h>
-#endif
typedef int fc_atomic_int_t;
#define fc_atomic_int_add(AI, V) (OSAtomicAdd32Barrier ((V), &(AI)) - (V))
#define fc_atomic_ptr_get(P) (OSMemoryBarrier (), (void *) *(P))
-#if (MAC_OS_X_VERSION_MIN_REQUIRED > MAC_OS_X_VERSION_10_4 || __IPHONE_VERSION_MIN_REQUIRED >= 20100)
+#if (MAC_OS_X_VERSION_MIN_REQUIRED > MAC_OS_X_VERSION_10_4 || __IPHONE_OS_VERSION_MIN_REQUIRED >= 20100)
#define fc_atomic_ptr_cmpexch(P,O,N) OSAtomicCompareAndSwapPtrBarrier ((void *) (O), (void *) (N), (void **) (P))
#else
-#if __ppc64__ || __x86_64__
-#define fc_atomic_ptr_cmpexch(P,O,N) OSAtomicCompareAndSwap64Barrier ((int64_t) (O), (int64_t) (N), (int64_t*) (P))
-#else
-#define fc_atomic_ptr_cmpexch(P,O,N) OSAtomicCompareAndSwap32Barrier ((int32_t) (O), (int32_t) (N), (int32_t*) (P))
-#endif
+#error "Your macOS / iOS targets are too old"
#endif
#elif !defined(FC_NO_MT) && defined(HAVE_INTEL_ATOMIC_PRIMITIVES)

50
ports/fontconfig/portfile.cmake
View File

@ -1,50 +1,21 @@
set(FONTCONFIG_VERSION 2.13.1)
if(NOT VCPKG_TARGET_IS_MINGW AND VCPKG_TARGET_IS_WINDOWS)
set(PATCHES fix_def_dll_name.patch)
endif()
set(FONTCONFIG_VERSION 2.13.94)
vcpkg_from_gitlab(
GITLAB_URL https://gitlab.freedesktop.org
OUT_SOURCE_PATH SOURCE_PATH
REPO fontconfig/fontconfig
REF 844d8709a1f3ecab45015b24b72dd775c13b2421 #v2.13.1
SHA512 fed0cf46f5dca9cb1e03475d7a8d7efdab06c7180fe0c922fb30cadfa91e1efe1f6a6e36d2fdb742a479cb09c05b0aefb5da5658bf2e01a32b7ac88ee8ff0b58
HEAD_REF master # branch name
PATCHES remove_tests.patch
build.patch
build2.patch
disable-install-data.patch
macos_arm_fccache.patch
${PATCHES}
REF ${FONTCONFIG_VERSION}
SHA512 815f999146970c7f0e6c15a21f218d4b3f75b26d4ef14d36711bc0a1de19e59cc62d6a2c53993dd38b963ae30820c4db29f103380d5001886d55b6a7df361154
HEAD_REF master
)
vcpkg_find_acquire_program(GPERF)
get_filename_component(GPERF_PATH ${GPERF} DIRECTORY)
vcpkg_add_to_path(${GPERF_PATH})
vcpkg_configure_make(
AUTOCONFIG
COPY_SOURCE
SOURCE_PATH ${SOURCE_PATH}
OPTIONS
--disable-docs
${OPTIONS}
ac_cv_type_pid_t=yes
--enable-iconv
"--with-libiconv=${CURRENT_INSTALLED_DIR}"
"--with-libiconv-includes=${CURRENT_INSTALLED_DIR}/include"
OPTIONS_DEBUG
"--with-libiconv-lib=${CURRENT_INSTALLED_DIR}/debug/lib"
${OPT_DBG}
OPTIONS_RELEASE
"--with-libiconv-lib=${CURRENT_INSTALLED_DIR}/lib"
${OPT_REL}
ADD_BIN_TO_PATH
ADDITIONAL_MSYS_PACKAGES xz findutils gettext gettext-devel # for autopoint
)
vcpkg_configure_meson(SOURCE_PATH ${SOURCE_PATH})
vcpkg_install_meson(ADD_BIN_TO_PATH)
vcpkg_install_make(ADD_BIN_TO_PATH)
vcpkg_copy_pdbs()
#Fix missing libintl static dependency
if(NOT VCPKG_TARGET_IS_MINGW AND VCPKG_TARGET_IS_WINDOWS)
@ -98,8 +69,8 @@ file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share
if(NOT VCPKG_TARGET_IS_WINDOWS)
set(ENV{FONTCONFIG_PATH} "${CURRENT_PACKAGES_DIR}/etc/fonts")
set(ENV{FONTCONFIG_FILE} "${CURRENT_PACKAGES_DIR}/etc/fonts/fonts.conf")
vcpkg_execute_required_process(COMMAND "${CURRENT_PACKAGES_DIR}/tools/${PORT}/bin/fc-cache${VCPKG_TARGET_EXECUTABLE_SUFFIX}" --verbose
WORKING_DIRECTORY "${CURRENT_PACKAGES_DIR}/tools/${PORT}/bin"
vcpkg_execute_required_process(COMMAND "${CURRENT_PACKAGES_DIR}/bin/fc-cache${VCPKG_TARGET_EXECUTABLE_SUFFIX}" --verbose
WORKING_DIRECTORY "${CURRENT_PACKAGES_DIR}/bin"
LOGNAME fc-cache-${TARGET_TRIPLET})
endif()
@ -112,3 +83,8 @@ if(NOT VCPKG_TARGET_IS_LINUX)
set(VCPKG_TARGET_IS_LINUX 0) # To not leave empty AND statements in the wrapper
endif()
configure_file("${CMAKE_CURRENT_LIST_DIR}/vcpkg-cmake-wrapper.cmake.in" "${CURRENT_PACKAGES_DIR}/share/${PORT}/vcpkg-cmake-wrapper.cmake" @ONLY)
vcpkg_copy_tools(
TOOL_NAMES fc-match fc-cat fc-list fc-pattern fc-query fc-scan fc-cache fc-validate fc-conflist
AUTO_CLEAN
)

13
ports/fontconfig/remove_tests.patch
View File

@ -1,13 +0,0 @@
diff --git a/Makefile.am b/Makefile.am
index cc3024e68..e58f8688c 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -24,7 +24,7 @@
SUBDIRS=fontconfig fc-case fc-lang src \
fc-cache fc-cat fc-conflist fc-list fc-match \
fc-pattern fc-query fc-scan fc-validate conf.d \
- its po po-conf test
+ its po po-conf
if ENABLE_DOCS
SUBDIRS += doc
endif

3
ports/fontconfig/vcpkg.json
View File

@ -1,7 +1,6 @@
{
"name": "fontconfig",
"version-string": "2.13.1",
"port-version": 8,
"version": "2.13.94",
"description": "Library for configuring and customizing font access.",
"homepage": "https://www.freedesktop.org/software/fontconfig/front.html",
"dependencies": [

4
versions/baseline.json
View File

@ -2121,8 +2121,8 @@
"port-version": 1
},
"fontconfig": {
"baseline": "2.13.1",
"port-version": 8
"baseline": "2.13.94",
"port-version": 0
},
"foonathan-memory": {
"baseline": "2019-07-21",

5
versions/f-/fontconfig.json
View File

@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "73929965b1d7992064fec1f69c6225a3d73a262b",
"version": "2.13.94",
"port-version": 0
},
{
"git-tree": "51b95a8e2dda5a9ffe083a8fc910ad9528597580",
"version-string": "2.13.1",