svn commit: r494151 - in head/multimedia/syncplay: . files

[Kai Knoblich]

Author: kai
Date: Thu Feb 28 13:51:55 2019
New Revision: 494151
URL: https://svnweb.freebsd.org/changeset/ports/494151

Log:
  multimedia/syncplay: Update to 1.6.2
  
  While I'm here:
  
  * Sort variables a bit
  
  Changelog:
  
  * Switched from Python 2 to Python 3
  * For all changes since 1.5.5, see:
  
  https://syncplay.pl/changelog/
  
  PR:		235790
  Submitted by:	Christian Heckendorf <heckendorfc at gmail.com> (maintainer)
  Approved by:	miwi (mentor)
  Differential Revision:	https://reviews.freebsd.org/D19278

Added:
  head/multimedia/syncplay/files/patch-syncplay_ui_GuiConfiguration.py   (contents, props changed)
Modified:
  head/multimedia/syncplay/Makefile
  head/multimedia/syncplay/distinfo
  head/multimedia/syncplay/files/patch-GNUmakefile

Modified: head/multimedia/syncplay/Makefile
==============================================================================
--- head/multimedia/syncplay/Makefile	Thu Feb 28 13:47:39 2019	(r494150)
+++ head/multimedia/syncplay/Makefile	Thu Feb 28 13:51:55 2019	(r494151)
@@ -2,8 +2,7 @@
 
 PORTNAME=	syncplay
 DISTVERSIONPREFIX=	v
-DISTVERSION=	1.5.5
-PORTREVISION=	1
+DISTVERSION=	1.6.2
 CATEGORIES=	multimedia
 
 MAINTAINER=	heckendorfc at 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

Modified: head/multimedia/syncplay/distinfo
==============================================================================
--- head/multimedia/syncplay/distinfo	Thu Feb 28 13:47:39 2019	(r494150)
+++ head/multimedia/syncplay/distinfo	Thu Feb 28 13:51:55 2019	(r494151)
@@ -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

Modified: head/multimedia/syncplay/files/patch-GNUmakefile
==============================================================================
--- head/multimedia/syncplay/files/patch-GNUmakefile	Thu Feb 28 13:47:39 2019	(r494150)
+++ head/multimedia/syncplay/files/patch-GNUmakefile	Thu Feb 28 13:51:55 2019	(r494151)
@@ -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)/

Added: head/multimedia/syncplay/files/patch-syncplay_ui_GuiConfiguration.py
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/multimedia/syncplay/files/patch-syncplay_ui_GuiConfiguration.py	Thu Feb 28 13:51:55 2019	(r494151)
@@ -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")