Browse Source

Update 'patchinstall' script references

master
Pekka Helenius 1 year ago
parent
commit
b674133393
2 changed files with 8 additions and 6 deletions
  1. +4
    -3
      arch/0-wine-staging-git/PKGBUILD
  2. +4
    -3
      debian/wineroot/winebuild.sh

+ 4
- 3
arch/0-wine-staging-git/PKGBUILD View File

@ -7,7 +7,7 @@ PKGDEST="${PWD}"
# Enable Wine Staging? 1 = yes # Enable Wine Staging? 1 = yes
enable_staging=1 enable_staging=1
# Staging patchsets. Default: all patchsets. Please see Wine Staging patchinstall.sh file for individual patchset names.
# Staging patchsets. Default: all patchsets. Please see Wine Staging 'patchset' directory contents for individual patchset names.
staging_patchsets=(--all) # In order to disable all patchsets, use #(--all) and add desired patchsets individually here staging_patchsets=(--all) # In order to disable all patchsets, use #(--all) and add desired patchsets individually here
# Enable 32-bit compilation? 1 = yes # Enable 32-bit compilation? 1 = yes
@ -208,7 +208,8 @@ prepare() {
if [[ ${_wine_commit} == HEAD ]] && [[ enable_staging -eq 1 ]]; then if [[ ${_wine_commit} == HEAD ]] && [[ enable_staging -eq 1 ]]; then
# Change back to the wine upstream commit that this version of wine-staging is based on # Change back to the wine upstream commit that this version of wine-staging is based on
git checkout $(../"$pkgname"/patches/patchinstall.sh --upstream-commit)
chmod u+x ../"$pkgname"/staging/patchinstall.py
git checkout $(../"$pkgname"/staging/patchinstall.py --upstream-commit)
fi fi
# Restore the wine tree to its git origin state, without wine-staging patches # Restore the wine tree to its git origin state, without wine-staging patches
@ -228,7 +229,7 @@ build() {
if [[ enable_staging -eq 1 ]]; then if [[ enable_staging -eq 1 ]]; then
# Apply all wine-staging patches # Apply all wine-staging patches
msg2 "Applying wine-staging patches..." msg2 "Applying wine-staging patches..."
./wine-staging-git/patches/patchinstall.sh DESTDIR="${srcdir}/wine-git" \
./wine-staging-git/staging/patchinstall.py DESTDIR="${srcdir}/wine-git" \
${staging_patchsets[*]} ${staging_patchsets[*]}
fi fi


+ 4
- 3
debian/wineroot/winebuild.sh View File

@ -35,7 +35,7 @@ BUILDROOT="${PWD}"
# Staging patchsets. Default: all patchsets. # Staging patchsets. Default: all patchsets.
# Applies only if Wine Staging is set to be compiled # Applies only if Wine Staging is set to be compiled
# Please see Wine Staging patchinstall.sh file for individual patchset names.
# Please see Wine Staging 'patchset' directory contents for individual patchset names.
staging_patchsets=(--all) staging_patchsets=(--all)
######################################################## ########################################################
@ -762,7 +762,8 @@ function refreshWineGIT() {
if [[ ${git_commithash_wine} == HEAD ]]; then if [[ ${git_commithash_wine} == HEAD ]]; then
# Change back to the wine upstream commit that this version of wine-staging is based on # Change back to the wine upstream commit that this version of wine-staging is based on
git checkout $(bash "${WINEDIR_STAGING}"/patches/patchinstall.sh --upstream-commit)
chmod u+x "${WINEDIR_STAGING}"/staging/patchinstall.py
git checkout $("${WINEDIR_STAGING}"/staging/patchinstall.py --upstream-commit)
else else
cd "${WINEDIR_STAGING}" cd "${WINEDIR_STAGING}"
@ -791,7 +792,7 @@ function wine_version() {
function patchWineSource() { function patchWineSource() {
if [[ ! -v NO_STAGING ]]; then if [[ ! -v NO_STAGING ]]; then
bash "${WINEDIR_STAGING}/patches/patchinstall.sh" DESTDIR="${WINEDIR}" ${staging_patchsets[*]}
"${WINEDIR_STAGING}/staging/patchinstall.py" DESTDIR="${WINEDIR}" ${staging_patchsets[*]}
fi fi
cp -r ${WINEROOT}/../../../wine_custom_patches/* "${WINEDIR_PATCHES}/" cp -r ${WINEROOT}/../../../wine_custom_patches/* "${WINEDIR_PATCHES}/"


Loading…
Cancel
Save