4 files changed, 26 insertions, 15 deletions

diff --git a/multimedia/syncplay/Makefile b/multimedia/syncplay/Makefile
index e303a105387d..cf6500303b80 100644
--- a/multimedia/syncplay/Makefile
+++ b/multimedia/syncplay/Makefile
@@ -2,8 +2,7 @@
 
 PORTNAME=	syncplay
 DISTVERSIONPREFIX=	v
-DISTVERSION=	1.5.5
-PORTREVISION=	1
+DISTVERSION=	1.6.2
 CATEGORIES=	multimedia
 
 MAINTAINER=	heckendorfc@gmail.com
@@ -14,11 +13,13 @@ LICENSE_FILE=	${WRKSRC}/LICENSE
 
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}twisted>=0:devel/py-twisted@${PY_FLAVOR}
 
-USES=		desktop-file-utils gmake python:2.7 shebangfix
+USES=		desktop-file-utils gmake python:3.4+ shebangfix
 USE_GITHUB=	yes
 GH_ACCOUNT=	Syncplay
+
 SHEBANG_FILES=	syncplayClient.py \
 		syncplayServer.py
+MAKEFILE=	GNUmakefile
 NO_ARCH=	yes
 
 OPTIONS_DEFINE=	GUI VLC
@@ -31,11 +32,8 @@ CLIENT_DESC=	Client mode
 SERVER_DESC=	Server mode
 VLC_DESC=	Support for VLC media player
 
-MAKEFILE=	GNUmakefile
-
-GUI_RUN_DEPENDS=	pyside-py2?>=1.1.2:devel/pyside
-
-VLC_MAKE_ARGS=	VLC_SUPPORT=true
+GUI_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pyside2>=0:devel/pyside2@${PY_FLAVOR}
+VLC_MAKE_ARGS=		VLC_SUPPORT=true
 VLC_MAKE_ARGS_OFF=	VLC_SUPPORT=false
 CLIENT_INSTALL_TARGET=	install-client
 SERVER_INSTALL_TARGET=	install-server
diff --git a/multimedia/syncplay/distinfo b/multimedia/syncplay/distinfo
index 5e5b17a114b1..df288027cec7 100644
--- a/multimedia/syncplay/distinfo
+++ b/multimedia/syncplay/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1531100680
-SHA256 (Syncplay-syncplay-v1.5.5_GH0.tar.gz) = 19f266665daa297794dd6857319da9bb14274c8c804aca6b960e11465085223c
-SIZE (Syncplay-syncplay-v1.5.5_GH0.tar.gz) = 1638588
+TIMESTAMP = 1549885925
+SHA256 (Syncplay-syncplay-v1.6.2_GH0.tar.gz) = 42f2e18063dbc4e540d6be423d459f6b359977dd5c2188df41846017378ba0a0
+SIZE (Syncplay-syncplay-v1.6.2_GH0.tar.gz) = 1640481
diff --git a/multimedia/syncplay/files/patch-GNUmakefile b/multimedia/syncplay/files/patch-GNUmakefile
index b45e724b8198..d33e366cad16 100644
--- a/multimedia/syncplay/files/patch-GNUmakefile
+++ b/multimedia/syncplay/files/patch-GNUmakefile
@@ -31,9 +31,9 @@
  
  client:
  	-mkdir -p $(BIN_PATH)
-+	sed -i '' -e 's%# libpath%site.addsitedir\("${PREFIX}/lib/syncplay"\)%' syncplayClient.py
++	sed -i '' -e 's%# libpath%import site; site.addsitedir\("${PREFIX}/lib/syncplay"\)%' syncplayClient.py
  	cp syncplayClient.py $(BIN_PATH)/syncplay
--	sed -i -e 's%# libpath%site.addsitedir\("${PREFIX}/lib/syncplay"\)%' $(BIN_PATH)/syncplay
+-	sed -i -e '/# libpath/ a\import site\nsite.addsitedir\("${PREFIX}/lib/syncplay"\)' $(BIN_PATH)/syncplay
  	chmod 755 $(BIN_PATH)/syncplay
  	cp syncplayClient.py $(LIB_PATH)/syncplay/
  	cp resources/syncplay.desktop $(APP_SHORTCUT_PATH)/
@@ -50,9 +50,9 @@
  
  server:
  	-mkdir -p $(BIN_PATH)
-+	sed -i '' -e 's%# libpath%site.addsitedir\("${PREFIX}/lib/syncplay"\)%' syncplayServer.py
++	sed -i '' -e 's%# libpath%import site; site.addsitedir\("${PREFIX}/lib/syncplay"\)%' syncplayServer.py
  	cp syncplayServer.py $(BIN_PATH)/syncplay-server
--	sed -i -e 's%# libpath%site.addsitedir\("${PREFIX}/lib/syncplay"\)%' $(BIN_PATH)/syncplay-server
+-	sed -i -e '/# libpath/ a\import site\nsite.addsitedir\("${PREFIX}/lib/syncplay"\)' $(BIN_PATH)/syncplay-server
  	chmod 755 $(BIN_PATH)/syncplay-server
  	cp syncplayServer.py $(LIB_PATH)/syncplay/
  	cp resources/syncplay-server.desktop $(APP_SHORTCUT_PATH)/
diff --git a/multimedia/syncplay/files/patch-syncplay_ui_GuiConfiguration.py b/multimedia/syncplay/files/patch-syncplay_ui_GuiConfiguration.py
new file mode 100644
index 000000000000..e11b5f78dc8e
--- /dev/null
+++ b/multimedia/syncplay/files/patch-syncplay_ui_GuiConfiguration.py
@@ -0,0 +1,13 @@
+--- syncplay/ui/GuiConfiguration.py.orig	2019-01-15 11:08:33 UTC
++++ syncplay/ui/GuiConfiguration.py
+@@ -1109,8 +1109,8 @@ class ConfigDialog(QtWidgets.QDialog):
+             if lang == self.config['language']:
+                 self.languageCombobox.setCurrentIndex(self.languageCombobox.count()-1)
+         self.languageCombobox.currentIndexChanged.connect(self.languageChanged)
+-        self.languageLayout.addWidget(self.languageLabel, 1, 0)
+-        self.languageLayout.addWidget(self.languageCombobox, 1, 1)
++        self.languageLayout.addWidget(self.languageLabel, 1, Qt.AlignLeft)
++        self.languageLayout.addWidget(self.languageCombobox, 1, Qt.AlignLeft)
+         self.displaySettingsLayout.addWidget(self.languageFrame)
+ 
+         self.languageLabel.setObjectName("language")