diff --git a/patches/Compholio/0004-loader-Add-commandline-option-check-libs.patch b/patches/Compholio/0004-loader-Add-commandline-option-check-libs.patch index 0b039a3f..27f05bae 100644 --- a/patches/Compholio/0004-loader-Add-commandline-option-check-libs.patch +++ b/patches/Compholio/0004-loader-Add-commandline-option-check-libs.patch @@ -1,19 +1,19 @@ -From eb9657a39d222aa59140f6b0aff657ae86d1824d Mon Sep 17 00:00:00 2001 +From 5f0f1d8dc69cd473f35c874b46e98a34930d0b46 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 | 91 ++++++++++++++++++++++++++++++++++++++++++++++++ - libs/wine/loader.c | 36 +++++++++++++++++++ - libs/wine/wine.def | 2 ++ - libs/wine/wine.map | 2 ++ - loader/main.c | 50 +++++++++++++++++++++++++- - 6 files changed, 182 insertions(+), 1 deletion(-) + include/wine/library.h | 2 + + libs/wine/config.c | 103 +++++++++++++++++++++++++++++++++++++++++++++++++ + libs/wine/loader.c | 36 +++++++++++++++++ + libs/wine/wine.def | 2 + + libs/wine/wine.map | 2 + + loader/main.c | 50 +++++++++++++++++++++++- + 6 files changed, 194 insertions(+), 1 deletion(-) diff --git a/include/wine/library.h b/include/wine/library.h -index fae73fe..7395a11 100644 +index 242bb69..fa1e339 100644 --- a/include/wine/library.h +++ b/include/wine/library.h @@ -40,6 +40,7 @@ extern "C" { @@ -24,7 +24,7 @@ index fae73fe..7395a11 100644 extern const char *wine_get_server_dir(void); extern const char *wine_get_user_name(void); extern const char *wine_get_version(void); -@@ -52,6 +53,7 @@ extern void wine_exec_wine_binary( const char *name, char **argv, const char *en +@@ -51,6 +52,7 @@ extern void wine_exec_wine_binary( const char *name, char **argv, const char *en typedef void (*load_dll_callback_t)( void *, const char * ); @@ -33,10 +33,10 @@ 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 954035d..3fb7327 100644 +index a273502..58e4977 100644 --- a/libs/wine/config.c +++ b/libs/wine/config.c -@@ -444,6 +444,97 @@ const char *wine_get_build_dir(void) +@@ -444,6 +444,109 @@ const char *wine_get_build_dir(void) return build_dir; } @@ -56,6 +56,9 @@ index 954035d..3fb7327 100644 +#ifdef SONAME_LIBFONTCONFIG + SONAME_LIBFONTCONFIG, +#endif ++#ifdef SONAME_LIBFREETYPE ++ SONAME_LIBFREETYPE, ++#endif +#ifdef SONAME_LIBGL + SONAME_LIBGL, +#endif @@ -83,6 +86,9 @@ index 954035d..3fb7327 100644 +#ifdef SONAME_LIBOSMESA + SONAME_LIBOSMESA, +#endif ++#ifdef SONAME_LIBPCAP ++ SONAME_LIBPCAP, ++#endif +#ifdef SONAME_LIBPNG + SONAME_LIBPNG, +#endif @@ -92,9 +98,15 @@ index 954035d..3fb7327 100644 +#ifdef SONAME_LIBTIFF + SONAME_LIBTIFF, +#endif ++#ifdef SONAME_LIBTXC_DXTN ++ SONAME_LIBTXC_DXTN, ++#endif +#ifdef SONAME_LIBV4L1 + SONAME_LIBV4L1, +#endif ++#ifdef SONAME_LIBX11 ++ SONAME_LIBX11, ++#endif +#ifdef SONAME_LIBXCOMPOSITE + SONAME_LIBXCOMPOSITE, +#endif @@ -135,10 +147,10 @@ index 954035d..3fb7327 100644 const char *wine_get_server_dir(void) { diff --git a/libs/wine/loader.c b/libs/wine/loader.c -index 5c0192d..91a4428 100644 +index 3591ede..2718857 100644 --- a/libs/wine/loader.c +++ b/libs/wine/loader.c -@@ -1054,6 +1054,42 @@ void *wine_dlopen( const char *filename, int flag, char *error, size_t errorsize +@@ -1043,6 +1043,42 @@ void *wine_dlopen( const char *filename, int flag, char *error, size_t errorsize } /*********************************************************************** @@ -182,7 +194,7 @@ index 5c0192d..91a4428 100644 */ void *wine_dlsym( void *handle, const char *symbol, char *error, size_t errorsize ) diff --git a/libs/wine/wine.def b/libs/wine/wine.def -index 5b42029..6acf329 100644 +index ed315bd..b6acbce 100644 --- a/libs/wine/wine.def +++ b/libs/wine/wine.def @@ -64,6 +64,7 @@ EXPORTS @@ -202,7 +214,7 @@ index 5b42029..6acf329 100644 wine_get_sortkey wine_get_user_name diff --git a/libs/wine/wine.map b/libs/wine/wine.map -index 7cb2918..72ffed8 100644 +index 2159fac..91ace06 100644 --- a/libs/wine/wine.map +++ b/libs/wine/wine.map @@ -65,6 +65,7 @@ WINE_1.0 @@ -222,7 +234,7 @@ index 7cb2918..72ffed8 100644 wine_get_sortkey; wine_get_ss; diff --git a/loader/main.c b/loader/main.c -index 71e5055..131ac2f 100644 +index 76bf324..36738f2 100644 --- a/loader/main.c +++ b/loader/main.c @@ -36,6 +36,12 @@ @@ -297,5 +309,5 @@ index 71e5055..131ac2f 100644 -- -1.7.9.5 +2.1.2