This is an automated email from the git hooks/post-receive script. jreyer-guest pushed a commit to branch stretch in repository wine.
commit ad34832bdd9ffafbc26591dd473c8baae7bc24b1 Author: Jens Reyer <[email protected]> Date: Mon Jun 6 03:36:31 2016 +0200 Fix local search for addon (gecko/mono) installers. Closes: #812750 Only disable the download of external addon installers, but look for them locally again. Adjust these search paths: - directory stored in registry (unchanged) - /usr/share/wine-<addon> - $INSTALL_DATADIR/<addon>/ - /usr/share/wine/<addon>/ - $XDG_CACHE_HOME/wine/ (unchanged) - $HOME/.cache/wine (unchanged) Update documentation. You may verify the search paths with WINEDEBUG="trace+appwizcpl". Cherry-picked from master: 16fe62676bdd08879e953f4ffaa2328d8d9621fc Fix local search for addon (gecko/mono) installers. eba69c1c11debcfe3781aba7dd6c6c88e8f097ea Split addons.patch. 1edebf08264c0bc91ed8a090a863a345619738da Add information about verification of the addon installers. --- debian/README.debian | 24 +++++++++++++++++++--- debian/changelog | 8 ++++++++ debian/patches/addons.patch | 25 ++++++++++++++--------- debian/patches/disable/addons-download.patch | 17 ++++++++++++++++ debian/patches/disable/external-installers.patch | 26 ------------------------ debian/patches/series | 2 +- 6 files changed, 62 insertions(+), 40 deletions(-) diff --git a/debian/README.debian b/debian/README.debian index cb920d4..a32409d 100644 --- a/debian/README.debian +++ b/debian/README.debian @@ -103,9 +103,27 @@ Wine version is available at: https://wiki.winehq.org/Gecko If the right libwine-gecko-*.deb package is not currently available, you can -manually extract an associated upstream WineGecko tarball to -/usr/share/wine-development/gecko. Or preferably, please provide help building -the new Debian libwine-gecko-* package that is needed. +download the Wine Gecko installers (on 64-bit systems you need both the 32-bit +and the 64-bit version) and copy them to one of the following locations (in +home their checksums get verified, in /usr/share not): +- /usr/share/wine-gecko/ +- /usr/share/wine-development/gecko/ (only if you are using wine-development) +- /usr/share/wine/gecko/ +- $XDG_CACHE_HOME/wine/ +- $HOME/.cache/wine/ (if XDG_CACHE_HOME is not set) +Or preferably, please provide help building the new Debian libwine-gecko-* +package that is needed. + +Wine Mono +========= +The downloader for Wine Mono is intentionally disabled in the Debian packages. +Unfortunately Wine Mono is not available in the official Debian archives. + +You can find more information at: +https://wiki.winehq.org/Mono + +You can download the Wine Mono installer and copy it to similar locations as +shown for Wine Gecko above, just replace gecko with mono. Automatically Launching Windows Executables =========================================== diff --git a/debian/changelog b/debian/changelog index 19d96d4..f1b40a5 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,11 @@ +wine (1.8.2-2) UNRELEASED; urgency=medium + + * Cherrypick changes from master: + - Fix local search for addon (gecko/mono) installers and update + documentation for their manual installation (closes: #812750). + + -- Jens Reyer <[email protected]> Mon, 06 Jun 2016 03:35:43 +0200 + wine (1.8.2-1) unstable; urgency=medium * New upstream release 1.8.2, released Apr 12, 2016. diff --git a/debian/patches/addons.patch b/debian/patches/addons.patch index a22ed78..953a598 100644 --- a/debian/patches/addons.patch +++ b/debian/patches/addons.patch @@ -1,5 +1,6 @@ -description: search /usr/share/wine-<addon> instead of /usr/share/wine/<addon> +description: adjust search paths for addon installers author: Michael Gilbert <[email protected]> +author: Jens Reyer <[email protected]> --- a/dlls/appwiz.cpl/addons.c +++ b/dlls/appwiz.cpl/addons.c @@ -12,13 +13,17 @@ author: Michael Gilbert <[email protected]> if(*subdir) { strcpy(file_path+len, subdir); len += strlen(subdir); -@@ -308,6 +306,9 @@ static enum install_res install_from_def - int len; - enum install_res ret; +@@ -320,11 +318,11 @@ static enum install_res install_from_def + return INSTALL_NEXT; + } -+ /* fetch addons only from /usr/share */ -+ return install_from_unix_file("/usr/share/wine/", addon->subdir_name, addon->file_name); -+ - if((data_dir = wine_get_data_dir())) { - package_dir = data_dir; - }else if((data_dir = wine_get_build_dir())) { +- ret = install_from_unix_file(package_dir, addon->subdir_name, addon->file_name); ++ ret = install_from_unix_file("/usr/share/wine-", addon->subdir_name, addon->file_name); + heap_free(dir_buf); + + if (ret == INSTALL_NEXT) +- ret = install_from_unix_file(INSTALL_DATADIR "/wine/", addon->subdir_name, addon->file_name); ++ ret = install_from_unix_file(INSTALL_DATADIR "/", addon->subdir_name, addon->file_name); + if (ret == INSTALL_NEXT && strcmp(INSTALL_DATADIR, "/usr/share")) + ret = install_from_unix_file("/usr/share/wine/", addon->subdir_name, addon->file_name); + return ret; diff --git a/debian/patches/disable/addons-download.patch b/debian/patches/disable/addons-download.patch new file mode 100644 index 0000000..c69fd74 --- /dev/null +++ b/debian/patches/disable/addons-download.patch @@ -0,0 +1,17 @@ +description: disable gecko/mono installer download +author: Jens Reyer <[email protected]> + +--- a/dlls/appwiz.cpl/addons.c ++++ b/dlls/appwiz.cpl/addons.c +@@ -795,9 +795,8 @@ BOOL install_addon(addon_t addon_type) + */ + if (install_from_registered_dir() == INSTALL_NEXT + && install_from_default_dir() == INSTALL_NEXT +- && install_from_cache() == INSTALL_NEXT +- && (url = get_url())) +- DialogBoxW(hInst, addon->dialog_template, 0, installer_proc); ++ && install_from_cache() == INSTALL_NEXT) ++ {}; + + heap_free(url); + url = NULL; diff --git a/debian/patches/disable/external-installers.patch b/debian/patches/disable/external-installers.patch deleted file mode 100644 index 6f9531e..0000000 --- a/debian/patches/disable/external-installers.patch +++ /dev/null @@ -1,26 +0,0 @@ -description: disable gecko/mono external installers -author: Michael Gilbert <[email protected]> - ---- a/dlls/mscoree/mscoree_main.c -+++ b/dlls/mscoree/mscoree_main.c -@@ -760,8 +760,6 @@ static BOOL install_wine_mono(void) - - HRESULT WINAPI DllRegisterServer(void) - { -- install_wine_mono(); -- - return __wine_register_resources( MSCOREE_hInstance ); - } - ---- a/dlls/mshtml/nsembed.c -+++ b/dlls/mshtml/nsembed.c -@@ -772,8 +772,7 @@ BOOL load_gecko(void) - if(!loading_thread) { - loading_thread = GetCurrentThreadId(); - -- if(load_wine_gecko(gre_path) -- || (install_wine_gecko() && load_wine_gecko(gre_path))) -+ if(load_wine_gecko(gre_path)) - ret = init_xpcom(gre_path); - else - MESSAGE("Could not load wine-gecko. HTML rendering will be disabled.\n"); diff --git a/debian/patches/series b/debian/patches/series index a319492..29392bf 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -5,8 +5,8 @@ sfnt2fon.patch manpages.patch version-string.patch +disable/addons-download.patch disable/shlib-exit-calls.patch -disable/external-installers.patch generate/opengl.patch generate/unicode.patch -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-wine/wine.git _______________________________________________ pkg-wine-party mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-wine-party
