Attachment 202080 Details for Bug 235790 – git diff from 1.5.5 to 1.6.2

[patch] git diff from 1.5.5 to 1.6.2

syncplay-1.6.2.diff (text/plain), 4.08 KB, created by Christian Heckendorf on 2019-02-17 00:20:22 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Christian Heckendorf

Created: 2019-02-17 00:20:22 UTC

Size: 4.08 KB

patch

obsolete

>diff --git a/multimedia/syncplay/Makefile b/multimedia/syncplay/Makefile
>index 60f7218ea63b..5329f50e0fc1 100644
>--- a/multimedia/syncplay/Makefile
>+++ b/multimedia/syncplay/Makefile
>@@ -2,7 +2,7 @@
> 
> PORTNAME=	syncplay
> DISTVERSIONPREFIX=	v
>-DISTVERSION=	1.5.5
>+DISTVERSION=	1.6.2
> CATEGORIES=	multimedia
> 
> MAINTAINER=	heckendorfc@gmail.com
>@@ -13,7 +13,7 @@ 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 \
>@@ -32,7 +32,7 @@ VLC_DESC=	Support for VLC media player
> 
> MAKEFILE=	GNUmakefile
> 
>-GUI_RUN_DEPENDS=	pyside-py2?>=1.1.2:devel/pyside
>+GUI_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pyside2>=0:devel/pyside2@${PY_FLAVOR}
> 
> VLC_MAKE_ARGS=	VLC_SUPPORT=true
> VLC_MAKE_ARGS_OFF=	VLC_SUPPORT=false
>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")

Actions: View | Diff

Attachments on bug 235790: 202080