diff --git a/patches/Staging/0004-loader-Add-commandline-option-check-libs.patch b/patches/Staging/0004-loader-Add-commandline-option-check-libs.patch index 8be84128..457d2a7c 100644 --- a/patches/Staging/0004-loader-Add-commandline-option-check-libs.patch +++ b/patches/Staging/0004-loader-Add-commandline-option-check-libs.patch @@ -1,16 +1,16 @@ -From e71a6c24c41e3d390a81aac1986938a1db71f9e6 Mon Sep 17 00:00:00 2001 +From 41863fd8fdf3a885efa93359a538e4e74258fb30 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michael=20M=C3=BCller?= Date: Wed, 28 May 2014 19:50:51 +0200 Subject: loader: Add commandline option --check-libs. --- include/wine/library.h | 2 + - libs/wine/config.c | 112 +++++++++++++++++++++++++++++++++++++++++++++++++ - libs/wine/loader.c | 36 ++++++++++++++++ + libs/wine/config.c | 124 +++++++++++++++++++++++++++++++++++++++++++++++++ + libs/wine/loader.c | 36 ++++++++++++++ libs/wine/wine.def | 2 + libs/wine/wine.map | 2 + - loader/main.c | 50 +++++++++++++++++++++- - 6 files changed, 203 insertions(+), 1 deletion(-) + loader/main.c | 50 +++++++++++++++++++- + 6 files changed, 215 insertions(+), 1 deletion(-) diff --git a/include/wine/library.h b/include/wine/library.h index fae73fe..7395a11 100644 @@ -33,14 +33,17 @@ index fae73fe..7395a11 100644 extern void *wine_dlsym( void *handle, const char *symbol, char *error, size_t errorsize ); extern int wine_dlclose( void *handle, char *error, size_t errorsize ); diff --git a/libs/wine/config.c b/libs/wine/config.c -index 5262c76..7acf51b 100644 +index 12f4a67..be9f401 100644 --- a/libs/wine/config.c +++ b/libs/wine/config.c -@@ -444,6 +444,118 @@ const char *wine_get_build_dir(void) +@@ -443,6 +443,130 @@ const char *wine_get_build_dir(void) return build_dir; } +const char *wine_libs[] = { ++#ifdef SONAME_LIBCAIRO ++ SONAME_LIBCAIRO, ++#endif +#ifdef SONAME_LIBCAPI20 + SONAME_LIBCAPI20, +#endif @@ -65,9 +68,15 @@ index 5262c76..7acf51b 100644 +#ifdef SONAME_LIBGNUTLS + SONAME_LIBGNUTLS, +#endif ++#ifdef SONAME_LIBGOBJECT_2_0 ++ SONAME_LIBGOBJECT_2_0, ++#endif +#ifdef SONAME_LIBGSM + SONAME_LIBGSM, +#endif ++#ifdef SONAME_LIBGTK_3 ++ SONAME_LIBGTK_3, ++#endif +#ifdef SONAME_LIBHAL + SONAME_LIBHAL, +#endif @@ -116,6 +125,9 @@ index 5262c76..7acf51b 100644 +#ifdef SONAME_LIBX11 + SONAME_LIBX11, +#endif ++#ifdef SONAME_LIBX11_XCB ++ SONAME_LIBX11_XCB, ++#endif +#ifdef SONAME_LIBXCOMPOSITE + SONAME_LIBXCOMPOSITE, +#endif @@ -156,10 +168,10 @@ index 5262c76..7acf51b 100644 const char *wine_get_server_dir(void) { diff --git a/libs/wine/loader.c b/libs/wine/loader.c -index 3591ede..2718857 100644 +index b5b32cc..1453a82 100644 --- a/libs/wine/loader.c +++ b/libs/wine/loader.c -@@ -1043,6 +1043,42 @@ void *wine_dlopen( const char *filename, int flag, char *error, size_t errorsize +@@ -1041,6 +1041,42 @@ void *wine_dlopen( const char *filename, int flag, char *error, size_t errorsize } /*********************************************************************** @@ -243,7 +255,7 @@ index 7cb2918..72ffed8 100644 wine_get_sortkey; wine_get_ss; diff --git a/loader/main.c b/loader/main.c -index fa0efa2..e96363d 100644 +index 343ea26..44804e1 100644 --- a/loader/main.c +++ b/loader/main.c @@ -36,6 +36,12 @@ @@ -318,5 +330,5 @@ index fa0efa2..e96363d 100644 -- -2.3.1 +2.7.1