svn commit: r414947 - in head/emulators/playonbsd: . files
Stefan Esser
se at FreeBSD.org
Tue May 10 17:05:35 UTC 2016
Author: se
Date: Tue May 10 17:05:33 2016
New Revision: 414947
URL: https://svnweb.freebsd.org/changeset/ports/414947
Log:
Fix problem with desktop shortcuts reported by iluxa (at) ex.ua.
Upgrade to latest stable version 4.2.10 on that occasion.
PR: 209418
Reported by: iluxa (at) ex.ua
Approved by: antoine (mentor, implicit)
Added:
head/emulators/playonbsd/files/patch-playonfreebsd (contents, props changed)
Modified:
head/emulators/playonbsd/Makefile
head/emulators/playonbsd/distinfo
head/emulators/playonbsd/files/patch-lib_scripts.lib
head/emulators/playonbsd/files/patch-lib_setupwindow.lib
head/emulators/playonbsd/files/patch-lib_variables
head/emulators/playonbsd/files/patch-lib_wine.lib
head/emulators/playonbsd/files/patch-python_mainwindow.py
Directory Properties:
head/emulators/playonbsd/files/playonbsd.sh.in (props changed)
Modified: head/emulators/playonbsd/Makefile
==============================================================================
--- head/emulators/playonbsd/Makefile Tue May 10 16:46:36 2016 (r414946)
+++ head/emulators/playonbsd/Makefile Tue May 10 17:05:33 2016 (r414947)
@@ -2,7 +2,7 @@
# $FreeBSD$
PORTNAME= playonbsd
-PORTVERSION= 4.2.8
+PORTVERSION= 4.2.10
CATEGORIES= emulators games
MAINTAINER= se at FreeBSD.org
Modified: head/emulators/playonbsd/distinfo
==============================================================================
--- head/emulators/playonbsd/distinfo Tue May 10 16:46:36 2016 (r414946)
+++ head/emulators/playonbsd/distinfo Tue May 10 17:05:33 2016 (r414947)
@@ -1,2 +1,2 @@
-SHA256 (PlayOnLinux-POL-POM-4-4.2.8_GH0.tar.gz) = 746cd72267c42b9c910c2977c5de92ec3e591b72dec382c5a706e353238cd6a3
-SIZE (PlayOnLinux-POL-POM-4-4.2.8_GH0.tar.gz) = 3168626
+SHA256 (PlayOnLinux-POL-POM-4-4.2.10_GH0.tar.gz) = e4fca669624ad1926884bc42910b752979172bce3b89a4196c691791e8bff6f9
+SIZE (PlayOnLinux-POL-POM-4-4.2.10_GH0.tar.gz) = 3203954
Modified: head/emulators/playonbsd/files/patch-lib_scripts.lib
==============================================================================
--- head/emulators/playonbsd/files/patch-lib_scripts.lib Tue May 10 16:46:36 2016 (r414946)
+++ head/emulators/playonbsd/files/patch-lib_scripts.lib Tue May 10 17:05:33 2016 (r414947)
@@ -1,15 +1,22 @@
---- lib/scripts.lib.orig 2015-05-12 22:33:57 UTC
+--- lib/scripts.lib.orig 2016-01-03 22:16:17 UTC
+++ lib/scripts.lib
-@@ -382,7 +382,7 @@ POL_Shortcut()
+@@ -382,10 +382,14 @@ POL_Shortcut()
# Menus
if [ ! "$(POL_Config_Read NO_MENU_ICON)" = "TRUE" ]; then
# Do nothing on Mac OS
- if [ -n "$Categories" -a "$POL_OS" = "Linux" ] || [ -n "$Categories" -a "$POL_OS" = "BSD" ]; then
-+ if [ -n "$Categories" -a "$POL_OS" = "Linux" ] || [ -n "$Categories" -a "$POL_OS" = "FreeBSD" ]; then
++ if [ -n "$Categories" -a "$POL_OS" = "Linux" ]
LOCALAPPS="$HOME/.local/share/applications"
make_desktop_shortcut "$iconPath" "$ICON_FILENAME" "$LOCALAPPS" "$PLAYONLINUX/playonlinux --run \"$ICON_FILENAME\"" "$binary_name" "$Categories" "playonlinux-"
fi
-@@ -992,9 +992,8 @@ POL_Shortcut_AddProfileLink()
++ if [ -n "$Categories" -a "$POL_OS" = "FreeBSD" ]; then
++ LOCALAPPS="$HOME/.local/share/applications"
++ make_desktop_shortcut "$iconPath" "$ICON_FILENAME" "$LOCALAPPS" "$PLAYONLINUX/playonbsd --run \"$ICON_FILENAME\"" "$binary_name" "$Categories" "playonlinux-"
++ fi
+ fi
+
+ # Desktop
+@@ -1002,9 +1006,8 @@ POL_Shortcut_AddProfileLink()
}
POL_LoadVar_Distro ()
{
@@ -21,7 +28,7 @@
main_kernel="$(uname -r | cut -d '.' -f 1)"
second_kernel="$(uname -r | cut -d '.' -f 2)"
-@@ -1005,7 +1004,14 @@ POL_LoadVar_Distro ()
+@@ -1015,7 +1018,14 @@ POL_LoadVar_Distro ()
[ "$main_kernel" = "12" ] && MacOS="Mountain Lion"
export DISTRO="$MacOS 10.$(( main_kernel - 4)).$second_kernel ($(uname -r))"
Modified: head/emulators/playonbsd/files/patch-lib_setupwindow.lib
==============================================================================
--- head/emulators/playonbsd/files/patch-lib_setupwindow.lib Tue May 10 16:46:36 2016 (r414946)
+++ head/emulators/playonbsd/files/patch-lib_setupwindow.lib Tue May 10 17:05:33 2016 (r414947)
@@ -1,4 +1,4 @@
---- lib/setupwindow.lib.orig 2015-05-12 22:33:57 UTC
+--- lib/setupwindow.lib.orig 2016-01-03 22:16:17 UTC
+++ lib/setupwindow.lib
@@ -36,7 +36,7 @@ ncs()
}
Modified: head/emulators/playonbsd/files/patch-lib_variables
==============================================================================
--- head/emulators/playonbsd/files/patch-lib_variables Tue May 10 16:46:36 2016 (r414946)
+++ head/emulators/playonbsd/files/patch-lib_variables Tue May 10 17:05:33 2016 (r414947)
@@ -1,6 +1,6 @@
---- lib/variables.orig 2015-05-12 22:33:57 UTC
+--- lib/variables.orig 2016-01-03 22:16:17 UTC
+++ lib/variables
-@@ -65,8 +65,11 @@ else
+@@ -69,8 +69,11 @@ else
eval_gettext() { printf "$@"; }
fi
Modified: head/emulators/playonbsd/files/patch-lib_wine.lib
==============================================================================
--- head/emulators/playonbsd/files/patch-lib_wine.lib Tue May 10 16:46:36 2016 (r414946)
+++ head/emulators/playonbsd/files/patch-lib_wine.lib Tue May 10 17:05:33 2016 (r414947)
@@ -1,11 +1,11 @@
---- lib/wine.lib.orig 2015-05-12 22:33:57 UTC
+--- lib/wine.lib.orig 2016-01-03 22:16:17 UTC
+++ lib/wine.lib
-@@ -31,7 +31,7 @@ POL_Wine_GetRegValue()
-
+@@ -32,7 +32,7 @@ POL_Wine_GetRegValue()
[ -z "$WINEPREFIX" ] && POL_Debug_Fatal "WINEPREFIX not set"
local value
-- [ -e "$WINEPREFIX/user.reg" ] && value="$(grep "$1" "$WINEPREFIX/user.reg" | head -n 1 | tr -d '"' | cut -d= -f2)"
-+ [ -e "$WINEPREFIX/user.reg" ] && value="$(grep "$1" "$WINEPREFIX/user.reg" | head -n 1 | tr -d \" | cut -d= -f2)"
+ # tr -d '\0' is a workaround for Wine bug #37575
+- [ -e "$WINEPREFIX/user.reg" ] && value="$(grep "^\"$1\"=" "$WINEPREFIX/user.reg" | head -n 1 | tr -d '"' | cut -d= -f2- | tr -d '\0')"
++ [ -e "$WINEPREFIX/user.reg" ] && value="$(grep "^\"$1\"=" "$WINEPREFIX/user.reg" | head -n 1 | tr -d \" | cut -d= -f2- | tr -d '\0')"
POL_Debug_Message "Getting registry value $1. Return: $value"
echo -n "${value:-default}"
}
Added: head/emulators/playonbsd/files/patch-playonfreebsd
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/emulators/playonbsd/files/patch-playonfreebsd Tue May 10 17:05:33 2016 (r414947)
@@ -0,0 +1,11 @@
+--- playonfreebsd.orig 2016-01-03 22:16:17 UTC
++++ playonfreebsd
+@@ -111,7 +111,7 @@ if [ "$1" = "--run" ]; then
+ # cp "$HOME/.PlayOnLinux/shortcuts/$NAME" "$POL_USER_ROOT/tmp/debug_$NAME" && \
+ # sed -e 's/^export WINEDEBUG="\(.*\)"/export WINEDEBUG="-all"/' "$POL_USER_ROOT/tmp/debug_$NAME" > "$HOME/.PlayOnLinux/shortcuts/$NAME"
+ #fi
+- exec bash playonlinux-bash "$HOME/.PlayOnLinux/shortcuts/$NAME" "$@"
++ exec bash playonlinux-bash "$HOME/.PlayOnBSD/shortcuts/$NAME" "$@"
+ fi
+ else
+ cd "$POLDIR/python"
Modified: head/emulators/playonbsd/files/patch-python_mainwindow.py
==============================================================================
--- head/emulators/playonbsd/files/patch-python_mainwindow.py Tue May 10 16:46:36 2016 (r414946)
+++ head/emulators/playonbsd/files/patch-python_mainwindow.py Tue May 10 17:05:33 2016 (r414947)
@@ -1,4 +1,4 @@
---- python/mainwindow.py.orig 2015-05-12 22:33:57 UTC
+--- python/mainwindow.py.orig 2016-01-03 22:16:17 UTC
+++ python/mainwindow.py
@@ -63,8 +63,8 @@ class POLWeb(threading.Thread):
def LastVersion(self):
More information about the svn-ports-all
mailing list