From 8a66fec4ac1b3ead2b25ec4488a6988280280cbb Mon Sep 17 00:00:00 2001 From: Andrew Ammerlaan Date: Thu, 22 Oct 2020 15:39:07 +0200 Subject: [PATCH 1/4] net-misc/rpki-client: fix HOMEPAGE repology complains, this will fix it hopefully Package-Manager: Portage-3.0.8, Repoman-3.0.2 Signed-off-by: Andrew Ammerlaan --- net-misc/rpki-client/rpki-client-6.6_p2.ebuild | 2 +- net-misc/rpki-client/rpki-client-6.7_p0.ebuild | 2 +- net-misc/rpki-client/rpki-client-6.7_p1.ebuild | 2 +- net-misc/rpki-client/rpki-client-6.8_p0.ebuild | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/net-misc/rpki-client/rpki-client-6.6_p2.ebuild b/net-misc/rpki-client/rpki-client-6.6_p2.ebuild index 30ee0313f9..6ef777662c 100644 --- a/net-misc/rpki-client/rpki-client-6.6_p2.ebuild +++ b/net-misc/rpki-client/rpki-client-6.6_p2.ebuild @@ -10,7 +10,7 @@ MY_PV="${PV/_p/p}" MY_P="${MY_PN}-${MY_PV}" DESCRIPTION="Portability shim for OpenBSD's rpki-client" -HOMEPAGE="https://rpki-client.org/" +HOMEPAGE="https://www.rpki-client.org/" SRC_URI="https://github.com/${PN}/${MY_PN}/archive/${MY_PV}.tar.gz -> ${P}.tar.gz" EGIT_REPO_URI="https://github.com/${PN}/${PN}-openbsd.git" diff --git a/net-misc/rpki-client/rpki-client-6.7_p0.ebuild b/net-misc/rpki-client/rpki-client-6.7_p0.ebuild index b9a0673ba5..931fac3b44 100644 --- a/net-misc/rpki-client/rpki-client-6.7_p0.ebuild +++ b/net-misc/rpki-client/rpki-client-6.7_p0.ebuild @@ -10,7 +10,7 @@ MY_PV="${PV/_p/p}" MY_P="${MY_PN}-${MY_PV}" DESCRIPTION="Portability shim for OpenBSD's rpki-client" -HOMEPAGE="https://rpki-client.org/" +HOMEPAGE="https://www.rpki-client.org/" SRC_URI="https://github.com/${PN}/${MY_PN}/archive/${MY_PV}.tar.gz -> ${P}.tar.gz" EGIT_REPO_URI="https://github.com/${PN}/${PN}-openbsd.git" diff --git a/net-misc/rpki-client/rpki-client-6.7_p1.ebuild b/net-misc/rpki-client/rpki-client-6.7_p1.ebuild index b9a0673ba5..931fac3b44 100644 --- a/net-misc/rpki-client/rpki-client-6.7_p1.ebuild +++ b/net-misc/rpki-client/rpki-client-6.7_p1.ebuild @@ -10,7 +10,7 @@ MY_PV="${PV/_p/p}" MY_P="${MY_PN}-${MY_PV}" DESCRIPTION="Portability shim for OpenBSD's rpki-client" -HOMEPAGE="https://rpki-client.org/" +HOMEPAGE="https://www.rpki-client.org/" SRC_URI="https://github.com/${PN}/${MY_PN}/archive/${MY_PV}.tar.gz -> ${P}.tar.gz" EGIT_REPO_URI="https://github.com/${PN}/${PN}-openbsd.git" diff --git a/net-misc/rpki-client/rpki-client-6.8_p0.ebuild b/net-misc/rpki-client/rpki-client-6.8_p0.ebuild index 7ea95a3b8f..9e990f3102 100644 --- a/net-misc/rpki-client/rpki-client-6.8_p0.ebuild +++ b/net-misc/rpki-client/rpki-client-6.8_p0.ebuild @@ -7,7 +7,7 @@ MY_PV="${PV/_p/p}" MY_P="${PN}-${MY_PV}" DESCRIPTION="Portability shim for OpenBSD's rpki-client" -HOMEPAGE="https://rpki-client.org/" +HOMEPAGE="https://www.rpki-client.org/" SRC_URI="mirror://openbsd/${PN}/${PN}-${MY_PV}.tar.gz" LICENSE="ISC" From c1ad98ca9e5440d76cd0da3caeeaa66b68614268 Mon Sep 17 00:00:00 2001 From: Andrew Ammerlaan Date: Thu, 22 Oct 2020 15:39:54 +0200 Subject: [PATCH 2/4] dev-libs/wren: use https in homepage Package-Manager: Portage-3.0.8, Repoman-3.0.2 Signed-off-by: Andrew Ammerlaan --- dev-libs/wren/wren-0.2.0-r1.ebuild | 2 +- dev-libs/wren/wren-9999.ebuild | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dev-libs/wren/wren-0.2.0-r1.ebuild b/dev-libs/wren/wren-0.2.0-r1.ebuild index 11b147b980..689c8a5dcd 100644 --- a/dev-libs/wren/wren-0.2.0-r1.ebuild +++ b/dev-libs/wren/wren-0.2.0-r1.ebuild @@ -6,7 +6,7 @@ EAPI=7 inherit toolchain-funcs DESCRIPTION="The Wren Programming Language" -HOMEPAGE="http://wren.io/" +HOMEPAGE="https://wren.io/" if [[ ${PV} == 9999 ]]; then EGIT_REPO_URI="https://github.com/wren-lang/${PN}.git" inherit git-r3 diff --git a/dev-libs/wren/wren-9999.ebuild b/dev-libs/wren/wren-9999.ebuild index 11b147b980..689c8a5dcd 100644 --- a/dev-libs/wren/wren-9999.ebuild +++ b/dev-libs/wren/wren-9999.ebuild @@ -6,7 +6,7 @@ EAPI=7 inherit toolchain-funcs DESCRIPTION="The Wren Programming Language" -HOMEPAGE="http://wren.io/" +HOMEPAGE="https://wren.io/" if [[ ${PV} == 9999 ]]; then EGIT_REPO_URI="https://github.com/wren-lang/${PN}.git" inherit git-r3 From c34e0d0f9f9d1816079c62f4aa4920e10648b6f8 Mon Sep 17 00:00:00 2001 From: Andrew Ammerlaan Date: Thu, 22 Oct 2020 15:42:26 +0200 Subject: [PATCH 3/4] games-action/minecraft-launcher: beta to stable Package-Manager: Portage-3.0.8, Repoman-3.0.2 Signed-off-by: Andrew Ammerlaan --- games-action/minecraft-launcher/Manifest | 3 +- ...ld => minecraft-launcher-2.1.17785.ebuild} | 0 .../minecraft-launcher-2.1.17785_beta.ebuild | 58 ------------------- 3 files changed, 1 insertion(+), 60 deletions(-) rename games-action/minecraft-launcher/{minecraft-launcher-2.1.17627.ebuild => minecraft-launcher-2.1.17785.ebuild} (100%) delete mode 100644 games-action/minecraft-launcher/minecraft-launcher-2.1.17785_beta.ebuild diff --git a/games-action/minecraft-launcher/Manifest b/games-action/minecraft-launcher/Manifest index d4c184490b..8903e3344c 100644 --- a/games-action/minecraft-launcher/Manifest +++ b/games-action/minecraft-launcher/Manifest @@ -1,5 +1,4 @@ DIST minecraft-launcher-1.6.93.jar 4481683 BLAKE2B 29597977cc70f831bff7f77cb2493d8c8f8138518c79f5e92f91ed6440ae2224b4140546c37645370173c668d9db894ca6b548b6cfd41da40c4e1ff51f0d820b SHA512 85739c0c0828af5b901b9933173f08229175aef1e8dec40c83981fb6fc330285b4c3a206cdf4405408106eff56ce1e516368d18bf44f631446ebac45e9aba125 -DIST minecraft-launcher-2.1.17627.tar.gz 89727167 BLAKE2B 22d385b56c99713e7fb6e9c901c872fd6ec7fc507d3d2c0a645b5f4332837c0cf41f9eb6956a5ddcf0711bae263ecc820be6e085f5f11a035b6dccb50ca0d060 SHA512 3035dec9344520a9f5649db063875da83886da29b1db4479348a91ffcfb8abf089da92c3faa75d717cd978a31f73f36a1e752c072dbf03267b45c13e0b98b057 -DIST minecraft-launcher-2.1.17785_beta.tar.gz 90369245 BLAKE2B bbfb104ec8a223416145745f579a6fafaf979619058bbcdede3070dfe805f51d22fbf4091d96fd6b8ffcc50541844408dda76c1d7d08ba779262d7471a20a675 SHA512 d3c34efce03f12e1d7e1566b7777a7c99b9e4aea36d95417aa18c91f8ee621012ef7216e6d69008bacab23ddc0a12d06ba9ca7461c29c4855ff95477a3a15941 +DIST minecraft-launcher-2.1.17785.tar.gz 90369245 BLAKE2B bbfb104ec8a223416145745f579a6fafaf979619058bbcdede3070dfe805f51d22fbf4091d96fd6b8ffcc50541844408dda76c1d7d08ba779262d7471a20a675 SHA512 d3c34efce03f12e1d7e1566b7777a7c99b9e4aea36d95417aa18c91f8ee621012ef7216e6d69008bacab23ddc0a12d06ba9ca7461c29c4855ff95477a3a15941 DIST minecraft-launcher-legacy.svg 61803 BLAKE2B 6527c869aec955f5e457e57f6c60b6391c29f2bc6f83d72b9a432cc9b77df6fb842549158f38e32a0bec6973d6fac4af3a1a5562cb84b5a4fd1d95de645da842 SHA512 aa08e8fa2a5c1c3e2d714644cb9648adb779c09fff5a9e5b79cea42c53be3f53631d199f72c1eec56e4b4f8e46be8f4ae88fbe456865621b589a7c4f9438549a DIST minecraft-launcher.svg 61803 BLAKE2B 6527c869aec955f5e457e57f6c60b6391c29f2bc6f83d72b9a432cc9b77df6fb842549158f38e32a0bec6973d6fac4af3a1a5562cb84b5a4fd1d95de645da842 SHA512 aa08e8fa2a5c1c3e2d714644cb9648adb779c09fff5a9e5b79cea42c53be3f53631d199f72c1eec56e4b4f8e46be8f4ae88fbe456865621b589a7c4f9438549a diff --git a/games-action/minecraft-launcher/minecraft-launcher-2.1.17627.ebuild b/games-action/minecraft-launcher/minecraft-launcher-2.1.17785.ebuild similarity index 100% rename from games-action/minecraft-launcher/minecraft-launcher-2.1.17627.ebuild rename to games-action/minecraft-launcher/minecraft-launcher-2.1.17785.ebuild diff --git a/games-action/minecraft-launcher/minecraft-launcher-2.1.17785_beta.ebuild b/games-action/minecraft-launcher/minecraft-launcher-2.1.17785_beta.ebuild deleted file mode 100644 index ac6e6e0d22..0000000000 --- a/games-action/minecraft-launcher/minecraft-launcher-2.1.17785_beta.ebuild +++ /dev/null @@ -1,58 +0,0 @@ -# Copyright 2019-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit desktop xdg - -DESCRIPTION="An open-world game whose gameplay revolves around breaking and placing blocks" -HOMEPAGE="https://www.minecraft.net/" -SRC_URI="https://launcher.mojang.com/download/linux/x86_64/minecraft-launcher_${PV/_beta/}.tar.gz -> ${P}.tar.gz - https://launcher.mojang.com/download/minecraft-launcher.svg" - -KEYWORDS="~amd64 ~x86" -LICENSE="Mojang" -SLOT="2" - -RESTRICT="bindist mirror" - -RDEPEND=" - >=x11-libs/gtk+-2.24.32-r1[X] - dev-libs/nss - dev-libs/libbsd - dev-libs/libffi - dev-libs/libpcre - gnome-base/gconf - media-libs/alsa-lib - media-libs/openal - net-libs/gnutls[idn] - sys-apps/dbus - virtual/jre:1.8 - virtual/opengl - x11-apps/xrandr - x11-libs/libXScrnSaver - x11-libs/libXcomposite - x11-libs/libXcursor - x11-libs/libXdamage - x11-libs/libXext - x11-libs/libXfixes - x11-libs/libXi - x11-libs/libXrender - x11-libs/libXtst - x11-libs/xcb-util -" - -S="${WORKDIR}/${PN}" - -src_install() { - dodir /opt/${PN} - insinto /opt/${PN}/ - doins -r . - - fperms +x /opt/${PN}/${PN} - - dosym ../${PN}/${PN} /opt/bin/${PN} - - doicon -s scalable "${DISTDIR}/${PN}.svg" - make_desktop_entry ${PN} "Minecraft" ${PN} Game -} From 692c9c79a58ebf689314a5174f46615597c9d121 Mon Sep 17 00:00:00 2001 From: Andrew Ammerlaan Date: Thu, 22 Oct 2020 15:50:28 +0200 Subject: [PATCH 4/4] media-video/syncplay: beta to stable split up patch file cause that makes repoman happy Package-Manager: Portage-3.0.8, Repoman-3.0.2 Signed-off-by: Andrew Ammerlaan --- media-video/syncplay/Manifest | 2 +- ...qpixmap-to-qicon-conversion-explicit.patch | 163 ---------------- ...pixmap-to-qicon-conversion-explicit2.patch | 176 ++++++++++++++++++ ...6.6_beta2.ebuild => syncplay-1.6.6.ebuild} | 7 +- 4 files changed, 179 insertions(+), 169 deletions(-) create mode 100644 media-video/syncplay/files/syncplay-make-qpixmap-to-qicon-conversion-explicit2.patch rename media-video/syncplay/{syncplay-1.6.6_beta2.ebuild => syncplay-1.6.6.ebuild} (91%) diff --git a/media-video/syncplay/Manifest b/media-video/syncplay/Manifest index bfc202ab0d..673b479ff5 100644 --- a/media-video/syncplay/Manifest +++ b/media-video/syncplay/Manifest @@ -1 +1 @@ -DIST syncplay-1.6.6_beta2.tar.gz 1843024 BLAKE2B d5c1e9e4c7b220722fef263f96749af22965bd26b82d41b913660d8b5c70bb6fe82727d7b16492408db661cf77eed4602c201cf90b05b3ee01a51dbfb7f3ee10 SHA512 c9ec87632418dd18b62fe392458a56a23c6eb2bae33c5a6be6daa94bfc30153fb371b9fa524452bdf2329442eb073f8f77418da823eac49273e8611d404d2f8e +DIST syncplay-1.6.6.tar.gz 1842916 BLAKE2B 99db5862879046d6bc516590b2b7afb5092db887a86ab6f4d253b5eb34ae909020e2678e950719af8bb5665201b36cae9643ab796b942959fcd2b04bf995ad6d SHA512 bb91829434002b87834c373908f43629ef74e4db31b3ed06c5cb30bf7ca43326bc40fbe627dca89d7b7d45db72ca80f57de114c5613b9e3f63db4bcd4827430f diff --git a/media-video/syncplay/files/syncplay-make-qpixmap-to-qicon-conversion-explicit.patch b/media-video/syncplay/files/syncplay-make-qpixmap-to-qicon-conversion-explicit.patch index 2ff08f7e28..8caef49555 100644 --- a/media-video/syncplay/files/syncplay-make-qpixmap-to-qicon-conversion-explicit.patch +++ b/media-video/syncplay/files/syncplay-make-qpixmap-to-qicon-conversion-explicit.patch @@ -157,166 +157,3 @@ index c59c5697..2a4bd1a5 100755 getMessage("joinroom-label")) window.roomButton.pressed.connect(self.joinRoom) window.roomButton.setFixedWidth(window.roomButton.sizeHint().width()+3) -@@ -1620,24 +1620,24 @@ def addPlaybackLayout(self, window): - window.playbackFrame.setLayout(window.playbackLayout) - window.seekInput = QtWidgets.QLineEdit() - window.seekInput.returnPressed.connect(self.seekFromButton) -- window.seekButton = QtWidgets.QPushButton(QtGui.QPixmap(resourcespath + 'clock_go.png'), "") -+ window.seekButton = QtWidgets.QPushButton(QtGui.QIcon(QtGui.QPixmap(resourcespath + 'clock_go.png')), "") - window.seekButton.setToolTip(getMessage("seektime-menu-label")) - window.seekButton.pressed.connect(self.seekFromButton) - window.seekInput.setText("0:00") - window.seekInput.setFixedWidth(60) - window.playbackLayout.addWidget(window.seekInput) - window.playbackLayout.addWidget(window.seekButton) -- window.unseekButton = QtWidgets.QPushButton(QtGui.QPixmap(resourcespath + 'arrow_undo.png'), "") -+ window.unseekButton = QtWidgets.QPushButton(QtGui.QIcon(QtGui.QPixmap(resourcespath + 'arrow_undo.png')), "") - window.unseekButton.setToolTip(getMessage("undoseek-menu-label")) - window.unseekButton.pressed.connect(self.undoSeek) - - window.miscLayout = QtWidgets.QHBoxLayout() - window.playbackLayout.addWidget(window.unseekButton) -- window.playButton = QtWidgets.QPushButton(QtGui.QPixmap(resourcespath + 'control_play_blue.png'), "") -+ window.playButton = QtWidgets.QPushButton(QtGui.QIcon(QtGui.QPixmap(resourcespath + 'control_play_blue.png')), "") - window.playButton.setToolTip(getMessage("play-menu-label")) - window.playButton.pressed.connect(self.play) - window.playbackLayout.addWidget(window.playButton) -- window.pauseButton = QtWidgets.QPushButton(QtGui.QPixmap(resourcespath + 'control_pause_blue.png'), "") -+ window.pauseButton = QtWidgets.QPushButton(QtGui.QIcon(QtGui.QPixmap(resourcespath + 'control_pause_blue.png')), "") - window.pauseButton.setToolTip(getMessage("pause-menu-label")) - window.pauseButton.pressed.connect(self.pause) - window.playbackLayout.addWidget(window.pauseButton) -@@ -1657,13 +1657,13 @@ def populateMenubar(self, window): - # File menu - - window.fileMenu = QtWidgets.QMenu(getMessage("file-menu-label"), self) -- window.openAction = window.fileMenu.addAction(QtGui.QPixmap(resourcespath + 'folder_explore.png'), -+ window.openAction = window.fileMenu.addAction(QtGui.QIcon(QtGui.QPixmap(resourcespath + 'folder_explore.png')), - getMessage("openmedia-menu-label")) - window.openAction.triggered.connect(self.browseMediapath) -- window.openAction = window.fileMenu.addAction(QtGui.QPixmap(resourcespath + 'world_explore.png'), -+ window.openAction = window.fileMenu.addAction(QtGui.QIcon(QtGui.QPixmap(resourcespath + 'world_explore.png')), - getMessage("openstreamurl-menu-label")) - window.openAction.triggered.connect(self.promptForStreamURL) -- window.openAction = window.fileMenu.addAction(QtGui.QPixmap(resourcespath + 'film_folder_edit.png'), -+ window.openAction = window.fileMenu.addAction(QtGui.QIcon(QtGui.QPixmap(resourcespath + 'film_folder_edit.png')), - getMessage("setmediadirectories-menu-label")) - window.openAction.triggered.connect(self.openSetMediaDirectoriesDialog) - -@@ -1671,7 +1671,7 @@ def populateMenubar(self, window): - if isMacOS(): - window.exitAction.setMenuRole(QtWidgets.QAction.QuitRole) - else: -- window.exitAction.setIcon(QtGui.QPixmap(resourcespath + 'cross.png')) -+ window.exitAction.setIcon(QtGui.QIcon(QtGui.QPixmap(resourcespath + 'cross.png'))) - window.exitAction.triggered.connect(self.exitSyncplay) - - if(window.editMenu is not None): -@@ -1683,19 +1683,19 @@ def populateMenubar(self, window): - - window.playbackMenu = QtWidgets.QMenu(getMessage("playback-menu-label"), self) - window.playAction = window.playbackMenu.addAction( -- QtGui.QPixmap(resourcespath + 'control_play_blue.png'), -+ QtGui.QIcon(QtGui.QPixmap(resourcespath + 'control_play_blue.png')), - getMessage("play-menu-label")) - window.playAction.triggered.connect(self.play) - window.pauseAction = window.playbackMenu.addAction( -- QtGui.QPixmap(resourcespath + 'control_pause_blue.png'), -+ QtGui.QIcon(QtGui.QPixmap(resourcespath + 'control_pause_blue.png')), - getMessage("pause-menu-label")) - window.pauseAction.triggered.connect(self.pause) - window.seekAction = window.playbackMenu.addAction( -- QtGui.QPixmap(resourcespath + 'clock_go.png'), -+ QtGui.QIcon(QtGui.QPixmap(resourcespath + 'clock_go.png')), - getMessage("seektime-menu-label")) - window.seekAction.triggered.connect(self.seekPositionDialog) - window.unseekAction = window.playbackMenu.addAction( -- QtGui.QPixmap(resourcespath + 'arrow_undo.png'), -+ QtGui.QIcon(QtGui.QPixmap(resourcespath + 'arrow_undo.png')), - getMessage("undoseek-menu-label")) - window.unseekAction.triggered.connect(self.undoSeek) - -@@ -1705,17 +1705,17 @@ def populateMenubar(self, window): - - window.advancedMenu = QtWidgets.QMenu(getMessage("advanced-menu-label"), self) - window.setoffsetAction = window.advancedMenu.addAction( -- QtGui.QPixmap(resourcespath + 'timeline_marker.png'), -+ QtGui.QIcon(QtGui.QPixmap(resourcespath + 'timeline_marker.png')), - getMessage("setoffset-menu-label")) - window.setoffsetAction.triggered.connect(self.setOffset) - window.setTrustedDomainsAction = window.advancedMenu.addAction( -- QtGui.QPixmap(resourcespath + 'shield_edit.png'), -+ QtGui.QIcon(QtGui.QPixmap(resourcespath + 'shield_edit.png')), - getMessage("settrusteddomains-menu-label")) - window.setTrustedDomainsAction.triggered.connect(self.openSetTrustedDomainsDialog) - window.createcontrolledroomAction = window.advancedMenu.addAction( -- QtGui.QPixmap(resourcespath + 'page_white_key.png'), getMessage("createcontrolledroom-menu-label")) -+ QtGui.QIcon(QtGui.QPixmap(resourcespath + 'page_white_key.png')), getMessage("createcontrolledroom-menu-label")) - window.createcontrolledroomAction.triggered.connect(self.createControlledRoom) -- window.identifyascontroller = window.advancedMenu.addAction(QtGui.QPixmap(resourcespath + 'key_go.png'), -+ window.identifyascontroller = window.advancedMenu.addAction(QtGui.QIcon(QtGui.QPixmap(resourcespath + 'key_go.png')), - getMessage("identifyascontroller-menu-label")) - window.identifyascontroller.triggered.connect(self.identifyAsController) - -@@ -1725,7 +1725,7 @@ def populateMenubar(self, window): - - window.windowMenu = QtWidgets.QMenu(getMessage("window-menu-label"), self) - -- window.editroomsAction = window.windowMenu.addAction(QtGui.QPixmap(resourcespath + 'door_open_edit.png'), getMessage("roomlist-msgbox-label")) -+ window.editroomsAction = window.windowMenu.addAction(QtGui.QIcon(QtGui.QPixmap(resourcespath + 'door_open_edit.png')), getMessage("roomlist-msgbox-label")) - window.editroomsAction.triggered.connect(self.openEditRoomsDialog) - window.menuBar.addMenu(window.windowMenu) - -@@ -1743,18 +1743,18 @@ def populateMenubar(self, window): - window.helpMenu = QtWidgets.QMenu(getMessage("help-menu-label"), self) - - window.userguideAction = window.helpMenu.addAction( -- QtGui.QPixmap(resourcespath + 'help.png'), -+ QtGui.QIcon(QtGui.QPixmap(resourcespath + 'help.png')), - getMessage("userguide-menu-label")) - window.userguideAction.triggered.connect(self.openUserGuide) - window.updateAction = window.helpMenu.addAction( -- QtGui.QPixmap(resourcespath + 'application_get.png'), -+ QtGui.QIcon(QtGui.QPixmap(resourcespath + 'application_get.png')), - getMessage("update-menu-label")) - window.updateAction.triggered.connect(self.userCheckForUpdates) - - if not isMacOS(): - window.helpMenu.addSeparator() - window.about = window.helpMenu.addAction( -- QtGui.QPixmap(resourcespath + 'syncplay.png'), -+ QtGui.QIcon(QtGui.QPixmap(resourcespath + 'syncplay.png')), - getMessage("about-menu-label")) - else: - window.about = window.helpMenu.addAction("&About") -@@ -1835,16 +1835,16 @@ def changeAutoplayState(self, source=None): - def updateReadyIcon(self): - ready = self.readyPushButton.isChecked() - if ready: -- self.readyPushButton.setIcon(QtGui.QPixmap(resourcespath + 'tick_checkbox.png')) -+ self.readyPushButton.setIcon(QtGui.QIcon(QtGui.QPixmap(resourcespath + 'tick_checkbox.png'))) - else: -- self.readyPushButton.setIcon(QtGui.QPixmap(resourcespath + 'empty_checkbox.png')) -+ self.readyPushButton.setIcon(QtGui.QIcon(QtGui.QPixmap(resourcespath + 'empty_checkbox.png'))) - - def updateAutoPlayIcon(self): - ready = self.autoplayPushButton.isChecked() - if ready: -- self.autoplayPushButton.setIcon(QtGui.QPixmap(resourcespath + 'tick_checkbox.png')) -+ self.autoplayPushButton.setIcon(QtGui.QIcon(QtGui.QPixmap(resourcespath + 'tick_checkbox.png'))) - else: -- self.autoplayPushButton.setIcon(QtGui.QPixmap(resourcespath + 'empty_checkbox.png')) -+ self.autoplayPushButton.setIcon(QtGui.QIcon(QtGui.QPixmap(resourcespath + 'empty_checkbox.png'))) - - def automaticUpdateCheck(self): - currentDateTimeValue = QDateTime.currentDateTime() -@@ -2060,7 +2060,7 @@ def __init__(self, passedBar=None): - self.populateMenubar(self) - self.addMainFrame(self) - self.loadSettings() -- self.setWindowIcon(QtGui.QPixmap(resourcespath + "syncplay.png")) -+ self.setWindowIcon(QtGui.QIcon(QtGui.QPixmap(resourcespath + "syncplay.png"))) - self.setWindowFlags(self.windowFlags() & Qt.WindowCloseButtonHint & Qt.WindowMinimizeButtonHint & ~Qt.WindowContextHelpButtonHint) - self.show() - self.setAcceptDrops(True) - diff --git a/media-video/syncplay/files/syncplay-make-qpixmap-to-qicon-conversion-explicit2.patch b/media-video/syncplay/files/syncplay-make-qpixmap-to-qicon-conversion-explicit2.patch new file mode 100644 index 0000000000..85b61ea4d5 --- /dev/null +++ b/media-video/syncplay/files/syncplay-make-qpixmap-to-qicon-conversion-explicit2.patch @@ -0,0 +1,176 @@ +From b0e018d0cda148ef8dba07857fcbe8d751800992 Mon Sep 17 00:00:00 2001 +From: Andrew Ammerlaan +Date: Thu, 8 Oct 2020 08:47:44 +0200 +Subject: [PATCH] make conversion from QPixmap to QIcon explicit + +--- + syncplay/ui/gui.py | 106 ++++++++++++++++++++++----------------------- + 1 file changed, 53 insertions(+), 53 deletions(-) + +diff --git a/syncplay/ui/gui.py b/syncplay/ui/gui.py +index c59c5697..2a4bd1a5 100755 +--- a/syncplay/ui/gui.py ++++ b/syncplay/ui/gui.py +@@ -1620,24 +1620,24 @@ def addPlaybackLayout(self, window): + window.playbackFrame.setLayout(window.playbackLayout) + window.seekInput = QtWidgets.QLineEdit() + window.seekInput.returnPressed.connect(self.seekFromButton) +- window.seekButton = QtWidgets.QPushButton(QtGui.QPixmap(resourcespath + 'clock_go.png'), "") ++ window.seekButton = QtWidgets.QPushButton(QtGui.QIcon(QtGui.QPixmap(resourcespath + 'clock_go.png')), "") + window.seekButton.setToolTip(getMessage("seektime-menu-label")) + window.seekButton.pressed.connect(self.seekFromButton) + window.seekInput.setText("0:00") + window.seekInput.setFixedWidth(60) + window.playbackLayout.addWidget(window.seekInput) + window.playbackLayout.addWidget(window.seekButton) +- window.unseekButton = QtWidgets.QPushButton(QtGui.QPixmap(resourcespath + 'arrow_undo.png'), "") ++ window.unseekButton = QtWidgets.QPushButton(QtGui.QIcon(QtGui.QPixmap(resourcespath + 'arrow_undo.png')), "") + window.unseekButton.setToolTip(getMessage("undoseek-menu-label")) + window.unseekButton.pressed.connect(self.undoSeek) + + window.miscLayout = QtWidgets.QHBoxLayout() + window.playbackLayout.addWidget(window.unseekButton) +- window.playButton = QtWidgets.QPushButton(QtGui.QPixmap(resourcespath + 'control_play_blue.png'), "") ++ window.playButton = QtWidgets.QPushButton(QtGui.QIcon(QtGui.QPixmap(resourcespath + 'control_play_blue.png')), "") + window.playButton.setToolTip(getMessage("play-menu-label")) + window.playButton.pressed.connect(self.play) + window.playbackLayout.addWidget(window.playButton) +- window.pauseButton = QtWidgets.QPushButton(QtGui.QPixmap(resourcespath + 'control_pause_blue.png'), "") ++ window.pauseButton = QtWidgets.QPushButton(QtGui.QIcon(QtGui.QPixmap(resourcespath + 'control_pause_blue.png')), "") + window.pauseButton.setToolTip(getMessage("pause-menu-label")) + window.pauseButton.pressed.connect(self.pause) + window.playbackLayout.addWidget(window.pauseButton) +@@ -1657,13 +1657,13 @@ def populateMenubar(self, window): + # File menu + + window.fileMenu = QtWidgets.QMenu(getMessage("file-menu-label"), self) +- window.openAction = window.fileMenu.addAction(QtGui.QPixmap(resourcespath + 'folder_explore.png'), ++ window.openAction = window.fileMenu.addAction(QtGui.QIcon(QtGui.QPixmap(resourcespath + 'folder_explore.png')), + getMessage("openmedia-menu-label")) + window.openAction.triggered.connect(self.browseMediapath) +- window.openAction = window.fileMenu.addAction(QtGui.QPixmap(resourcespath + 'world_explore.png'), ++ window.openAction = window.fileMenu.addAction(QtGui.QIcon(QtGui.QPixmap(resourcespath + 'world_explore.png')), + getMessage("openstreamurl-menu-label")) + window.openAction.triggered.connect(self.promptForStreamURL) +- window.openAction = window.fileMenu.addAction(QtGui.QPixmap(resourcespath + 'film_folder_edit.png'), ++ window.openAction = window.fileMenu.addAction(QtGui.QIcon(QtGui.QPixmap(resourcespath + 'film_folder_edit.png')), + getMessage("setmediadirectories-menu-label")) + window.openAction.triggered.connect(self.openSetMediaDirectoriesDialog) + +@@ -1671,7 +1671,7 @@ def populateMenubar(self, window): + if isMacOS(): + window.exitAction.setMenuRole(QtWidgets.QAction.QuitRole) + else: +- window.exitAction.setIcon(QtGui.QPixmap(resourcespath + 'cross.png')) ++ window.exitAction.setIcon(QtGui.QIcon(QtGui.QPixmap(resourcespath + 'cross.png'))) + window.exitAction.triggered.connect(self.exitSyncplay) + + if(window.editMenu is not None): +@@ -1683,19 +1683,19 @@ def populateMenubar(self, window): + + window.playbackMenu = QtWidgets.QMenu(getMessage("playback-menu-label"), self) + window.playAction = window.playbackMenu.addAction( +- QtGui.QPixmap(resourcespath + 'control_play_blue.png'), ++ QtGui.QIcon(QtGui.QPixmap(resourcespath + 'control_play_blue.png')), + getMessage("play-menu-label")) + window.playAction.triggered.connect(self.play) + window.pauseAction = window.playbackMenu.addAction( +- QtGui.QPixmap(resourcespath + 'control_pause_blue.png'), ++ QtGui.QIcon(QtGui.QPixmap(resourcespath + 'control_pause_blue.png')), + getMessage("pause-menu-label")) + window.pauseAction.triggered.connect(self.pause) + window.seekAction = window.playbackMenu.addAction( +- QtGui.QPixmap(resourcespath + 'clock_go.png'), ++ QtGui.QIcon(QtGui.QPixmap(resourcespath + 'clock_go.png')), + getMessage("seektime-menu-label")) + window.seekAction.triggered.connect(self.seekPositionDialog) + window.unseekAction = window.playbackMenu.addAction( +- QtGui.QPixmap(resourcespath + 'arrow_undo.png'), ++ QtGui.QIcon(QtGui.QPixmap(resourcespath + 'arrow_undo.png')), + getMessage("undoseek-menu-label")) + window.unseekAction.triggered.connect(self.undoSeek) + +@@ -1705,17 +1705,17 @@ def populateMenubar(self, window): + + window.advancedMenu = QtWidgets.QMenu(getMessage("advanced-menu-label"), self) + window.setoffsetAction = window.advancedMenu.addAction( +- QtGui.QPixmap(resourcespath + 'timeline_marker.png'), ++ QtGui.QIcon(QtGui.QPixmap(resourcespath + 'timeline_marker.png')), + getMessage("setoffset-menu-label")) + window.setoffsetAction.triggered.connect(self.setOffset) + window.setTrustedDomainsAction = window.advancedMenu.addAction( +- QtGui.QPixmap(resourcespath + 'shield_edit.png'), ++ QtGui.QIcon(QtGui.QPixmap(resourcespath + 'shield_edit.png')), + getMessage("settrusteddomains-menu-label")) + window.setTrustedDomainsAction.triggered.connect(self.openSetTrustedDomainsDialog) + window.createcontrolledroomAction = window.advancedMenu.addAction( +- QtGui.QPixmap(resourcespath + 'page_white_key.png'), getMessage("createcontrolledroom-menu-label")) ++ QtGui.QIcon(QtGui.QPixmap(resourcespath + 'page_white_key.png')), getMessage("createcontrolledroom-menu-label")) + window.createcontrolledroomAction.triggered.connect(self.createControlledRoom) +- window.identifyascontroller = window.advancedMenu.addAction(QtGui.QPixmap(resourcespath + 'key_go.png'), ++ window.identifyascontroller = window.advancedMenu.addAction(QtGui.QIcon(QtGui.QPixmap(resourcespath + 'key_go.png')), + getMessage("identifyascontroller-menu-label")) + window.identifyascontroller.triggered.connect(self.identifyAsController) + +@@ -1725,7 +1725,7 @@ def populateMenubar(self, window): + + window.windowMenu = QtWidgets.QMenu(getMessage("window-menu-label"), self) + +- window.editroomsAction = window.windowMenu.addAction(QtGui.QPixmap(resourcespath + 'door_open_edit.png'), getMessage("roomlist-msgbox-label")) ++ window.editroomsAction = window.windowMenu.addAction(QtGui.QIcon(QtGui.QPixmap(resourcespath + 'door_open_edit.png')), getMessage("roomlist-msgbox-label")) + window.editroomsAction.triggered.connect(self.openEditRoomsDialog) + window.menuBar.addMenu(window.windowMenu) + +@@ -1743,18 +1743,18 @@ def populateMenubar(self, window): + window.helpMenu = QtWidgets.QMenu(getMessage("help-menu-label"), self) + + window.userguideAction = window.helpMenu.addAction( +- QtGui.QPixmap(resourcespath + 'help.png'), ++ QtGui.QIcon(QtGui.QPixmap(resourcespath + 'help.png')), + getMessage("userguide-menu-label")) + window.userguideAction.triggered.connect(self.openUserGuide) + window.updateAction = window.helpMenu.addAction( +- QtGui.QPixmap(resourcespath + 'application_get.png'), ++ QtGui.QIcon(QtGui.QPixmap(resourcespath + 'application_get.png')), + getMessage("update-menu-label")) + window.updateAction.triggered.connect(self.userCheckForUpdates) + + if not isMacOS(): + window.helpMenu.addSeparator() + window.about = window.helpMenu.addAction( +- QtGui.QPixmap(resourcespath + 'syncplay.png'), ++ QtGui.QIcon(QtGui.QPixmap(resourcespath + 'syncplay.png')), + getMessage("about-menu-label")) + else: + window.about = window.helpMenu.addAction("&About") +@@ -1835,16 +1835,16 @@ def changeAutoplayState(self, source=None): + def updateReadyIcon(self): + ready = self.readyPushButton.isChecked() + if ready: +- self.readyPushButton.setIcon(QtGui.QPixmap(resourcespath + 'tick_checkbox.png')) ++ self.readyPushButton.setIcon(QtGui.QIcon(QtGui.QPixmap(resourcespath + 'tick_checkbox.png'))) + else: +- self.readyPushButton.setIcon(QtGui.QPixmap(resourcespath + 'empty_checkbox.png')) ++ self.readyPushButton.setIcon(QtGui.QIcon(QtGui.QPixmap(resourcespath + 'empty_checkbox.png'))) + + def updateAutoPlayIcon(self): + ready = self.autoplayPushButton.isChecked() + if ready: +- self.autoplayPushButton.setIcon(QtGui.QPixmap(resourcespath + 'tick_checkbox.png')) ++ self.autoplayPushButton.setIcon(QtGui.QIcon(QtGui.QPixmap(resourcespath + 'tick_checkbox.png'))) + else: +- self.autoplayPushButton.setIcon(QtGui.QPixmap(resourcespath + 'empty_checkbox.png')) ++ self.autoplayPushButton.setIcon(QtGui.QIcon(QtGui.QPixmap(resourcespath + 'empty_checkbox.png'))) + + def automaticUpdateCheck(self): + currentDateTimeValue = QDateTime.currentDateTime() +@@ -2060,7 +2060,7 @@ def __init__(self, passedBar=None): + self.populateMenubar(self) + self.addMainFrame(self) + self.loadSettings() +- self.setWindowIcon(QtGui.QPixmap(resourcespath + "syncplay.png")) ++ self.setWindowIcon(QtGui.QIcon(QtGui.QPixmap(resourcespath + "syncplay.png"))) + self.setWindowFlags(self.windowFlags() & Qt.WindowCloseButtonHint & Qt.WindowMinimizeButtonHint & ~Qt.WindowContextHelpButtonHint) + self.show() + self.setAcceptDrops(True) + diff --git a/media-video/syncplay/syncplay-1.6.6_beta2.ebuild b/media-video/syncplay/syncplay-1.6.6.ebuild similarity index 91% rename from media-video/syncplay/syncplay-1.6.6_beta2.ebuild rename to media-video/syncplay/syncplay-1.6.6.ebuild index 30712b3661..6c85c3d381 100644 --- a/media-video/syncplay/syncplay-1.6.6_beta2.ebuild +++ b/media-video/syncplay/syncplay-1.6.6.ebuild @@ -8,11 +8,9 @@ DISTUTILS_USE_SETUPTOOLS=rdepend inherit distutils-r1 optfeature xdg -MYPV="${PV/_beta/-Beta}" - DESCRIPTION="Client/server to synchronize media playback" HOMEPAGE="https://github.com/Syncplay/syncplay https://syncplay.pl" -SRC_URI="https://github.com/${PN^}/${PN}/archive/${MYPV}.tar.gz -> ${P}.tar.gz" +SRC_URI="https://github.com/${PN^}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" LICENSE="Apache-2.0" SLOT="0" @@ -36,12 +34,11 @@ RDEPEND=" PATCHES=( "${FILESDIR}/${PN}-change-alignment-operator.patch" "${FILESDIR}/${PN}-make-qpixmap-to-qicon-conversion-explicit.patch" + "${FILESDIR}/${PN}-make-qpixmap-to-qicon-conversion-explicit2.patch" "${FILESDIR}/${PN}-use-lambda-to-connect-behind-wrapper.patch" "${FILESDIR}/${PN}-allow-PyQt5.patch" ) -S="${WORKDIR}/${PN}-${MYPV}" - python_install() { local MY_MAKEOPTS=( DESTDIR="${D}" PREFIX=/usr ) if use client; then