Merge pull request #5064 from nulano/gha

Update FriBiDi to 1.0.10
python-pillow · Nov 26, 2020 · 6a9c5fc · 6a9c5fc
2 parents 030e1b7 + dd1a514
commit 6a9c5fc
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git a/winbuild/build_prepare.py b/winbuild/build_prepare.py
@@ -287,9 +287,9 @@ def cmd_msbuild(
         "libs": [r"*.lib"],
     },
     "fribidi": {
-        "url": "https://github.com/fribidi/fribidi/archive/v1.0.9.zip",
-        "filename": "fribidi-1.0.9.zip",
-        "dir": "fribidi-1.0.9",
+        "url": "https://github.com/fribidi/fribidi/archive/v1.0.10.zip",
+        "filename": "fribidi-1.0.10.zip",
+        "dir": "fribidi-1.0.10",
         "build": [
             cmd_copy(r"{winbuild_dir}\fribidi.cmake", r"CMakeLists.txt"),
             cmd_cmake(),

diff --git a/winbuild/fribidi.cmake b/winbuild/fribidi.cmake
@@ -99,4 +99,4 @@ add_library(fribidi STATIC
 	${FRIBIDI_SOURCES_GENERATED})
 fribidi_definitions(fribidi)
 target_compile_definitions(fribidi
-	PUBLIC -DFRIBIDI_ENTRY=extern)
+	PUBLIC -DFRIBIDI_LIB_STATIC)
diff --git a/winbuild/raqm.cmake b/winbuild/raqm.cmake
@@ -7,7 +7,7 @@ find_library(fribidi NAMES fribidi)
 find_library(harfbuzz NAMES harfbuzz)
 find_library(freetype NAMES freetype)
 
-add_definitions(-DFRIBIDI_ENTRY=extern)
+add_definitions(-DFRIBIDI_LIB_STATIC)
 
 
 function(raqm_conf)