Sisyphus repository
Last update: 1 october 2023 | SRPMs: 18631 | Visits: 37041540
en ru br
ALT Linux repos
S:8.15.1-alt1
5.0: 1.0.9-alt37
4.1: 1.0.9-alt0.M41.35
4.0: 1.0.9-alt0.M40.35
+backports:1.0.9-alt0.M40.16
3.0: 20050715-alt0.1
+backports:20061212-alt0.M30.1

Group :: Emulators
RPM: wine

 Main   Changelog   Spec   Patches   Sources   Download   Gear   Bugs and FR  Repocop 

Patch: 0001-enable-linking-with-freetype-and-fontconfig-see-altb.patch
Download


From 795e36ecbd07ee8dfaaa4ab0914a45f6ff29b0a7 Mon Sep 17 00:00:00 2001
From: Vitaly Lipatov <lav@etersoft.ru>
Date: Sat, 8 Apr 2017 22:27:46 +0300
Subject: [PATCH 1/3] enable linking with freetype and fontconfig (see altbug
 #16230)
To: wine-patches <wine-patches@winehq.org>
---
 wine/dlls/gdi32/Makefile.in | 2 +-
 wine/dlls/gdi32/freetype.c  | 6 +++++-
 2 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/wine/dlls/gdi32/Makefile.in b/wine/dlls/gdi32/Makefile.in
index a0f76d2..375be52 100644
--- a/wine/dlls/gdi32/Makefile.in
+++ b/wine/dlls/gdi32/Makefile.in
@@ -3,7 +3,7 @@ MODULE    = gdi32.dll
 IMPORTLIB = gdi32
 IMPORTS   = advapi32
 EXTRAINCL = $(FREETYPE_CFLAGS) $(FONTCONFIG_CFLAGS)
-EXTRALIBS = $(CARBON_LIBS) $(APPKIT_LIBS)
+EXTRALIBS = $(CARBON_LIBS) $(APPKIT_LIBS) $(FREETYPE_LIBS) $(FONTCONFIG_LIBS)
 DELAYIMPORTS = usp10
 
 C_SRCS = \
diff --git a/wine/dlls/gdi32/freetype.c b/wine/dlls/gdi32/freetype.c
index 49e8c2f..2613241 100644
--- a/wine/dlls/gdi32/freetype.c
+++ b/wine/dlls/gdi32/freetype.c
@@ -2832,6 +2832,9 @@ static void load_fontconfig_fonts(void)
 
     if (!fontconfig_enabled) return;
 
+    /* Etersoft: for libfontconfig linking */
+    if(!FcInit()) return;
+
     pat = pFcPatternCreate();
     os = pFcObjectSetCreate();
     pFcObjectSetAdd(os, FC_FILE);
@@ -4148,7 +4151,8 @@ static BOOL init_freetype(void)
     pFT_Library_SetLcdFilter = wine_dlsym(ft_handle, "FT_Library_SetLcdFilter", NULL, 0);
 #endif
 
-    if(pFT_Init_FreeType(&library) != 0) {
+    /* Etersoft: enable linking if(pFT_Init_FreeType(&library) != 0) { */
+    if(FT_Init_FreeType(&library) != 0) {
         ERR("Can't init FreeType library\n");
 	wine_dlclose(ft_handle, NULL, 0);
         ft_handle = NULL;
-- 
2.10.2
 
design & coding: Vladimir Lettiev aka crux © 2004-2005, Andrew Avramenko aka liks © 2007-2008
current maintainer: Michael Shigorin