Hello community, here is the log from the commit of package wine for openSUSE:Factory checked in at 2016-11-01 09:58:53 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/wine (Old) and /work/SRC/openSUSE:Factory/.wine.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "wine" Changes: -------- --- /work/SRC/openSUSE:Factory/wine/wine.changes 2016-10-26 13:29:45.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.wine.new/wine.changes 2016-11-01 09:58:55.000000000 +0100 @@ -1,0 +2,11 @@ +Sun Oct 30 18:31:45 UTC 2016 - [email protected] + +- Updated to 1.9.22 development snapshot + - macOS clipboard support adapted to the new design. + - Initial implementation of bitmap rendering in Direct2D. + - More WebServices implementation. + - A few more steps towards HID support. + - Various bug fixes. +- updated winetricks + +------------------------------------------------------------------- Old: ---- wine-1.9.21.tar.bz2 wine-1.9.21.tar.bz2.sign New: ---- wine-1.9.22.tar.bz2 wine-1.9.22.tar.bz2.sign ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ wine.spec ++++++ --- /var/tmp/diff_new_pack.tfPGYD/_old 2016-11-01 09:58:58.000000000 +0100 +++ /var/tmp/diff_new_pack.tfPGYD/_new 2016-11-01 09:58:58.000000000 +0100 @@ -53,8 +53,8 @@ BuildRequires: update-desktop-files BuildRequires: valgrind-devel BuildRequires: xorg-x11-devel -%define realver 1.9.21 -Version: 1.9.21 +%define realver 1.9.22 +Version: 1.9.22 Release: 0 Summary: An MS Windows Emulator License: LGPL-2.1+ ++++++ wine-1.9.21.tar.bz2 -> wine-1.9.22.tar.bz2 ++++++ /work/SRC/openSUSE:Factory/wine/wine-1.9.21.tar.bz2 /work/SRC/openSUSE:Factory/.wine.new/wine-1.9.22.tar.bz2 differ: char 11, line 1 ++++++ winetricks ++++++ --- /var/tmp/diff_new_pack.tfPGYD/_old 2016-11-01 09:58:58.000000000 +0100 +++ /var/tmp/diff_new_pack.tfPGYD/_new 2016-11-01 09:58:58.000000000 +0100 @@ -139,6 +139,7 @@ # #-------------------------------------------------------------------- +# FIXME: XDG_CACHE_HOME is defined twice, clean this up XDG_DATA_HOME="${XDG_DATA_HOME:-$HOME/.local/share}" XDG_CACHE_HOME="${XDG_CACHE_HOME:-$HOME/.cache}" @@ -148,7 +149,6 @@ if [ -x "$(which mktemp 2>/dev/null)" ] then W_TMP_EARLY="$(mktemp -d "${TMPDIR:-/tmp}/winetricks.XXXXXXXX")" - W_TMP_EARLY_CLEAN=1 elif [ -w "$TMPDIR" ] then W_TMP_EARLY="$TMPDIR" @@ -693,8 +693,24 @@ _W_tmpdir="$(mktemp -d "$_W_tmpdir/$_W_filename.XXXXXXXX")" w_download_to "$_W_tmpdir" https://raw.githubusercontent.com/Winetricks/winetricks/master/src/winetricks - w_try mv "$_W_tmpdir/$_W_filename" "${_W_update_file}.gz" - w_try gunzip "${_W_update_file}.gz" + + # 2016/10/26: now file is uncompressed? Handle both cases: + update_file_type="$(file "$_W_tmpdir/$_W_filename")" + case "$update_file_type" in + *"POSIX shell script"*) + #echo "already decompressed!" + w_try mv "$_W_tmpdir/$_W_filename" "${_W_update_file}" + ;; + *"gzip compressed data"*) + w_try mv "$_W_tmpdir/$_W_filename" "${_W_update_file}.gz" + w_try gunzip "${_W_update_file}.gz" + ;; + *) + echo "Unknown file type: $update_file_type" + exit 1 + ;; + esac + w_try rmdir "$_W_tmpdir" w_try cp "$0" "$_W_rollback_file" @@ -748,7 +764,12 @@ then _W_file=$(basename "$_W_url") fi - _W_cache="$W_CACHE/$_W_packagename" + + if [ -z "${_W_packagename%%/*}" ] && pathchk -P "$_W_packagename" ; then + _W_cache="$_W_packagename" + else + _W_cache="$W_CACHE/$_W_packagename" + fi if test ! -d "$_W_cache" then @@ -2547,7 +2568,39 @@ fi } -winetricks_print_version() { +winetricks_latest_version_check() +{ + if [ "$WINETRICKS_LATEST_VERSION_CHECK" = 'disabled' ] || [ -f "${WINETRICKS_CONFIG}/disable-latest-version-check" ] ; then + w_info "winetricks latest version check update disabled" + return + fi + + latest_file="${W_TMP_EARLY}/LATEST" + + # Obviously, always redownload: + if [ -e "$latest_file" ] ; then + w_try rm "${latest_file}" + fi + + w_download_to ${W_TMP_EARLY} https://raw.githubusercontent.com/Winetricks/winetricks/master/files/LATEST + + latest_version="$(cat "${latest_file}")" + + if [ ! "$WINETRICKS_VERSION" = "${latest_version}" ] ; then + if [ -f "${WINETRICKS_CONFIG}/enable-auto-update" ] ; then + w_info "You are running winetricks-${WINETRICKS_VERSION}." + w_info "New upstream release winetricks-${latest_version} is available." + w_info "auto-update enabled: running winetricks_selfupdate" + winetricks_selfupdate + else + w_warn "You are running winetricks-${WINETRICKS_VERSION}, latest upstream is winetricks-${latest_version}!" + w_warn "You should update using your distribution's package manager, --self-update, or manually." + fi + fi +} + +winetricks_print_version() +{ # Normally done by winetricks_init, but we don't want to set up the WINEPREFIX # just to get the winetricks version: winetricks_get_sha1sum_prog @@ -4062,8 +4115,8 @@ fi test "$WINETRICKS_CACHE_SYMLINK" && rm -f "$WINETRICKS_CACHE_SYMLINK" test "$W_OPT_NOCLEAN" = 1 || rm -rf "$WINETRICKS_WORKDIR" - # if $W_TMP_EARLY was created by mktemp, remove it: - test "$W_OPT_NOCLEAN" = 1 || test "$W_TMP_EARLY_CLEAN" = 1 && rm -rf "$W_TMP_EARLY" + # if $W_TMP_EARLY was created by mktemp, remove it (but not if W_OPT_NOCLEAN is set to 1): + test "$W_OPT_NOCLEAN" = 1 || rm -rf "$W_TMP_EARLY" } winetricks_set_unattended() @@ -4311,13 +4364,18 @@ # Where application installers are cached # See http://standards.freedesktop.org/basedir-spec/latest/ar01s03.html - if test -d "$HOME/Library/Caches" + # OSX: https://developer.apple.com/library/content/documentation/FileManagement/Conceptual/FileSystemProgrammingGuide/MacOSXDirectories/MacOSXDirectories.html + + if test -d "$HOME/Library" then # OS X XDG_CACHE_HOME="${XDG_CACHE_HOME:-$HOME/Library/Caches}" + XDG_CONFIG_HOME="${XDG_CONFIG_HOME:-$HOME/Library/Preferences}" else XDG_CACHE_HOME="${XDG_CACHE_HOME:-$HOME/.cache}" + XDG_CONFIG_HOME="${XDG_CONFIG_HOME:-$HOME/.config}" fi + # shellcheck disable=SC2153 if test "$WINETRICKS_DIR" then @@ -4328,9 +4386,14 @@ W_CACHE="${W_CACHE:-$XDG_CACHE_HOME/winetricks}" WINETRICKS_POST="${WINETRICKS_POST:-$XDG_DATA_HOME/winetricks/postinstall}" fi - test -d "$W_CACHE" || mkdir -p "$W_CACHE" + WINETRICKS_AUTH="${WINETRICKS_AUTH:-$XDG_DATA_HOME/winetricks/auth}" + # Config options are currently opt-in and not required, so not creating the config + # directory unless there's demand: + WINETRICKS_CONFIG="${XDG_CONFIG_HOME}/winetricks" + #test -d "$WINETRICKS_CONFIG" || mkdir -p "$WINETRICKS_CONFIG" + # System-specific variables case "$W_PLATFORM" in windows_cmd) @@ -4419,6 +4482,8 @@ WINETRICKS_WINE_MICRO=$(echo $WINETRICKS_WINE_VERSION | sed 's/wine-1.[0-9][0-9]*\.\([0-9]*\).*/\1/') echo "Using winetricks $(winetricks_print_version) with $WINETRICKS_WINE_VERSION" + + winetricks_latest_version_check } winetricks_usage() @@ -6138,10 +6203,13 @@ load_dotnet35() { case "$W_PLATFORM" in - windows_cmd) ;; - *) w_warn "dotnet35 does not yet fully work or install on wine. Caveat emptor." ;; + windows_cmd) ;; + *) w_warn "dotnet35 does not yet fully work or install on wine. Caveat emptor." ;; esac + # This will fail later if cabextract isn't installed, so check/fail now: + w_try_cabextract -v >/dev/null + # http://www.microsoft.com/downloads/details.aspx?FamilyId=333325FD-AE52-4E35-B531-508D977D32A6 w_download http://download.microsoft.com/download/6/0/f/60fc5854-3cb8-4892-b6db-bd4f42510f28/dotnetfx35.exe 0a271bb44531aadef902829f98dfad66e4a57586 @@ -6190,6 +6258,9 @@ *) w_warn "dotnet35sp1 does not yet fully work or install on wine. Caveat emptor." ;; esac + # The installer will fail later in dotnet35 if cabextract isn't installed, so check/fail now: + w_try_cabextract -v >/dev/null + # http://www.microsoft.com/download/en/details.aspx?id=25150 w_download http://download.microsoft.com/download/2/0/e/20e90413-712f-438c-988e-fdaa79a8ac3d/dotnetfx35.exe 3dce66bae0dd71284ac7a971baed07030a186918 @@ -6303,6 +6374,9 @@ w_warn "This package may not work on a 64-bit installation" fi + # The installer will fail later in dotnet35 if cabextract isn't installed, so check/fail now: + w_try_cabextract -v >/dev/null + # http://www.microsoft.com/download/en/details.aspx?id=17718 w_download http://download.microsoft.com/download/b/a/4/ba4a7e71-2906-4b2d-a0e1-80cf16844f5f/dotnetfx45_full_x86_x64.exe b2ff712ca0947040ca0b8e9bd7436a3c3524bb5d @@ -6359,6 +6433,9 @@ w_warn "This package may not work on a 64-bit installation" fi + # The installer will fail later in dotnet35 if cabextract isn't installed, so check/fail now: + w_try_cabextract -v >/dev/null + # http://www.microsoft.com/download/en/details.aspx?id=17718 w_download http://download.microsoft.com/download/E/2/1/E21644B5-2DF2-47C2-91BD-63C560427900/NDP452-KB2901907-x86-x64-AllOS-ENU.exe 89f86f9522dc7a8a965facce839abb790a285a63 @@ -10171,16 +10248,16 @@ #---------------------------------------------------------------- w_metadata foobar2000 apps \ - title="foobar2000 v1.3.10" \ + title="foobar2000 v1.3.12" \ publisher="Peter Pawlowski" \ year="2014" \ media="manual_download" \ - file1="foobar2000_v1.3.10.exe" \ + file1="foobar2000_v1.3.12.exe" \ installed_exe1="$W_PROGRAMS_X86_WIN/foobar2000/foobar2000.exe" load_foobar2000() { - w_download_manual http://www.foobar2000.org/download foobar2000_v1.3.10.exe d4d60effc26d3ead48ba6f9c5ad32b9066231807 + w_download_manual http://www.foobar2000.org/download foobar2000_v1.3.12.exe 9ea5c70f662c8bf3db6f02dbb20109fd05580f6c w_try_cd "$W_CACHE/$W_PACKAGE" w_try "$WINE" "$file1" $W_UNATTENDED_SLASH_S } @@ -11513,6 +11590,9 @@ load_vc2008express() { + # The installer will fail later in dotnet35 if cabextract isn't installed, so check/fail now: + w_try_cabextract -v >/dev/null + w_call dotnet35 # This is the version without SP1 baked in. (SP1 requires dotnet35sp1, which doesn't work yet.)
