This is an automated email from the git hooks/post-receive script. jreyer-guest pushed a commit to branch master in repository wine.
commit eba69c1c11debcfe3781aba7dd6c6c88e8f097ea Author: Jens Reyer <[email protected]> Date: Sun May 15 01:56:17 2016 +0200 Split addons.patch. --- debian/patches/addons.patch | 14 +------------- debian/patches/disable/addons-download.patch | 17 +++++++++++++++++ debian/patches/series | 1 + 3 files changed, 19 insertions(+), 13 deletions(-) diff --git a/debian/patches/addons.patch b/debian/patches/addons.patch index 7229c7b..953a598 100644 --- a/debian/patches/addons.patch +++ b/debian/patches/addons.patch @@ -1,4 +1,4 @@ -description: adjust search paths for addon installers, but don't download installers +description: adjust search paths for addon installers author: Michael Gilbert <[email protected]> author: Jens Reyer <[email protected]> @@ -27,15 +27,3 @@ author: Jens Reyer <[email protected]> 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; -@@ -795,9 +793,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/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/series b/debian/patches/series index 604637b..8bc2816 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -5,6 +5,7 @@ manpages.patch version-string.patch disable/tests.patch +disable/addons-download.patch disable/shlib-exit-calls.patch generate/opengl.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
