Attachment 203037 Details for Bug 236708 – git diff from 1.6.2 to 1.6.3

[patch] git diff from 1.6.2 to 1.6.3

syncplay-1.6.3.diff (text/plain), 4.49 KB, created by Christian Heckendorf on 2019-03-21 19:44:35 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Christian Heckendorf

Created: 2019-03-21 19:44:35 UTC

Size: 4.49 KB

patch

obsolete

>diff --git a/multimedia/syncplay/Makefile b/multimedia/syncplay/Makefile
>index cf6500303b80..ca0211000877 100644
>--- a/multimedia/syncplay/Makefile
>+++ b/multimedia/syncplay/Makefile
>@@ -2,7 +2,7 @@
> 
> PORTNAME=	syncplay
> DISTVERSIONPREFIX=	v
>-DISTVERSION=	1.6.2
>+DISTVERSION=	1.6.3
> CATEGORIES=	multimedia
> 
> MAINTAINER=	heckendorfc@gmail.com
>diff --git a/multimedia/syncplay/distinfo b/multimedia/syncplay/distinfo
>index df288027cec7..12c3cb33135c 100644
>--- a/multimedia/syncplay/distinfo
>+++ b/multimedia/syncplay/distinfo
>@@ -1,3 +1,3 @@
>-TIMESTAMP = 1549885925
>-SHA256 (Syncplay-syncplay-v1.6.2_GH0.tar.gz) = 42f2e18063dbc4e540d6be423d459f6b359977dd5c2188df41846017378ba0a0
>-SIZE (Syncplay-syncplay-v1.6.2_GH0.tar.gz) = 1640481
>+TIMESTAMP = 1553018479
>+SHA256 (Syncplay-syncplay-v1.6.3_GH0.tar.gz) = fa65ac115c2cda978d2ce41228bddc3f0954543475d091dd1db78d4ba50d3794
>+SIZE (Syncplay-syncplay-v1.6.3_GH0.tar.gz) = 1755890
>diff --git a/multimedia/syncplay/files/patch-GNUmakefile b/multimedia/syncplay/files/patch-GNUmakefile
>index d33e366cad16..9761d25a81a2 100644
>--- a/multimedia/syncplay/files/patch-GNUmakefile
>+++ b/multimedia/syncplay/files/patch-GNUmakefile
>@@ -1,6 +1,6 @@
>---- GNUmakefile.orig	2018-04-07 21:02:55 UTC
>+--- GNUmakefile.orig	2019-03-15 11:21:49 UTC
> +++ GNUmakefile
>-@@ -38,17 +38,22 @@ endif
>+@@ -34,17 +34,22 @@ endif
>  	APP_SHORTCUT_PATH = ${DESTDIR}${PREFIX}/share/applications
>  	SHARE_PATH        = ${DESTDIR}${PREFIX}/share
>  
>@@ -27,7 +27,7 @@
>  	cp resources/hicolor/48x48/apps/syncplay.png $(SHARE_PATH)/app-install/icons/
>  	cp resources/hicolor/48x48/apps/syncplay.png $(SHARE_PATH)/pixmaps/
>  
>-@@ -60,8 +65,8 @@ u-common:
>+@@ -56,8 +61,8 @@ u-common:
>  
>  client:
>  	-mkdir -p $(BIN_PATH)
>@@ -37,16 +37,7 @@
>  	chmod 755 $(BIN_PATH)/syncplay
>  	cp syncplayClient.py $(LIB_PATH)/syncplay/
>  	cp resources/syncplay.desktop $(APP_SHORTCUT_PATH)/
>-@@ -73,8 +78,6 @@ endif
>- ifeq ($(VLC_SUPPORT),true)
>- 	-mkdir -p ${DESTDIR}$(VLC_LIB_PATH)/vlc/lua/intf/
>- 	cp resources/lua/intf/syncplay.lua ${DESTDIR}$(VLC_LIB_PATH)/vlc/lua/intf/
>--	-mkdir -p ${DESTDIR}$(VLC_LIB_PATH64)/vlc/lua/intf/
>--	cp resources/lua/intf/syncplay.lua ${DESTDIR}$(VLC_LIB_PATH64)/vlc/lua/intf/
>- endif
>- 
>- u-client:
>-@@ -86,8 +89,8 @@ u-client:
>+@@ -75,8 +80,8 @@ u-client:
>  
>  server:
>  	-mkdir -p $(BIN_PATH)
>diff --git a/multimedia/syncplay/files/patch-syncplay_ui_GuiConfiguration.py b/multimedia/syncplay/files/patch-syncplay_ui_GuiConfiguration.py
>deleted file mode 100644
>index e11b5f78dc8e..000000000000
>--- a/multimedia/syncplay/files/patch-syncplay_ui_GuiConfiguration.py
>+++ /dev/null
>@@ -1,13 +0,0 @@
>---- 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")
>diff --git a/multimedia/syncplay/pkg-plist b/multimedia/syncplay/pkg-plist
>index 6a04aba0a396..394451c5d2d0 100644
>--- a/multimedia/syncplay/pkg-plist
>+++ b/multimedia/syncplay/pkg-plist
>@@ -32,6 +32,8 @@
> %%DATADIR%%/resources/house.png
> %%DATADIR%%/resources/key_go.png
> %%DATADIR%%/resources/lock.png
>+%%DATADIR%%/resources/lock_green.png
>+%%DATADIR%%/resources/lock_green_dialog.png
> %%DATADIR%%/resources/lock_open.png
> %%DATADIR%%/resources/lua/intf/syncplay.lua
> %%DATADIR%%/resources/mpc-be.png
>@@ -59,6 +61,7 @@ lib/syncplay/syncplay/client.py
> lib/syncplay/syncplay/clientManager.py
> lib/syncplay/syncplay/constants.py
> lib/syncplay/syncplay/messages.py
>+lib/syncplay/syncplay/messages_es.py
> lib/syncplay/syncplay/messages_de.py
> lib/syncplay/syncplay/messages_en.py
> lib/syncplay/syncplay/messages_it.py
>@@ -84,7 +87,6 @@ lib/syncplay/syncplay/utils.py
> lib/syncplay/syncplay/vendor/Qt.py
> lib/syncplay/syncplay/vendor/__init__.py
> lib/syncplay/syncplay/vendor/qt5reactor.py
>-%%CLIENT%%%%VLC%%lib/vlc/lua/intf/syncplay.lua
> share/app-install/icons/syncplay.png
> %%CLIENT%%share/applications/syncplay.desktop
> %%SERVER%%share/applications/syncplay-server.desktop

Flags:

meta: maintainer-approval+

Actions: View | Diff

Attachments on bug 236708: 203037