From: "Andrew Ammerlaan" <andrewammerlaan@riseup.net> To: gentoo-commits@lists.gentoo.org Subject: [gentoo-commits] repo/proj/guru:master commit in: app-misc/brightness-control/, app-misc/brightness-control/files/ Date: Wed, 7 Apr 2021 08:51:37 +0000 (UTC) [thread overview] Message-ID: <1617785428.c3c0a2b8ffe83f279945e645ad12b5f6d17492f7.andrewammerlaan@gentoo> (raw) commit: c3c0a2b8ffe83f279945e645ad12b5f6d17492f7 Author: Andrew Ammerlaan <andrewammerlaan <AT> riseup <DOT> net> AuthorDate: Wed Apr 7 08:50:28 2021 +0000 Commit: Andrew Ammerlaan <andrewammerlaan <AT> riseup <DOT> net> CommitDate: Wed Apr 7 08:50:28 2021 +0000 URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=c3c0a2b8 app-misc/brightness-control: update snapshot Package-Manager: Portage-3.0.18, Repoman-3.0.3 Signed-off-by: Andrew Ammerlaan <andrewammerlaan <AT> riseup.net> app-misc/brightness-control/Manifest | 2 +- ...ild => brightness-control-2.0_p20210331.ebuild} | 10 +- .../files/brightness-control-use-qtpy.patch | 118 --------------------- 3 files changed, 4 insertions(+), 126 deletions(-) diff --git a/app-misc/brightness-control/Manifest b/app-misc/brightness-control/Manifest index c5c17093c..322081ec9 100644 --- a/app-misc/brightness-control/Manifest +++ b/app-misc/brightness-control/Manifest @@ -1 +1 @@ -DIST brightness-control-2.0_p20200629.tar.gz 285708 BLAKE2B 2b886e14c42b40d2e6bb66e2cb5ab08fe18403430b69dc0b42be9c4126ed6caa4edf85451a30d5b1160c1da0c0205b2d2cf232ec3d805062b2d332a880bcf17b SHA512 064423512a1492fce20ad5efe4751fd68b2c3dc06a71f0afd5c2d598843daea3e4d1eaebeb9142a93c37f998c3b1ff5d20a5b5b087bd16bc85de5169f219de49 +DIST brightness-control-2.0_p20210331.tar.gz 285852 BLAKE2B a5fb5a91498e53fe0e08a67a4dafe7b10bd5d84c73154e84f1c3c473b85765dcf21afef02a55ea1965a574cfcab99cee5fa90d923cda301be3f15350734a9985 SHA512 e8a6b9080c8929a1f3b6f0284e25f705062e11a18f1bff264b2d4a6ce8a7068c65254ce8f53801db09dc32e0f2dd436cdf01e57697eb26d0742821b8c4b46ad9 diff --git a/app-misc/brightness-control/brightness-control-2.0_p20200629.ebuild b/app-misc/brightness-control/brightness-control-2.0_p20210331.ebuild similarity index 76% rename from app-misc/brightness-control/brightness-control-2.0_p20200629.ebuild rename to app-misc/brightness-control/brightness-control-2.0_p20210331.ebuild index 94dd2e4d7..e05e928e5 100644 --- a/app-misc/brightness-control/brightness-control-2.0_p20200629.ebuild +++ b/app-misc/brightness-control/brightness-control-2.0_p20210331.ebuild @@ -3,12 +3,12 @@ EAPI=7 -PYTHON_COMPAT=( python3_{7,8} ) +PYTHON_COMPAT=( python3_{7,8,9} ) DISTUTILS_SINGLE_IMPL=1 inherit distutils-r1 desktop -COMMIT="39c297e98621e4604e8fbeb4a155a224418460ed" +COMMIT="ea7434ae53681c591daa2ced0d107f4b4bb6f997" DESCRIPTION="Qt Brightness Controller in Python" HOMEPAGE="https://github.com/lordamit/Brightness" @@ -28,13 +28,9 @@ RDEPEND="$(python_gen_cond_dep \ S="${WORKDIR}/Brightness-${COMMIT}/src" -PATCHES=( - "${FILESDIR}/${PN}-use-qtpy.patch" -) - python_install_all () { distutils-r1_python_install_all doicon -s scalable icons/brightness-controller.svg - make_desktop_entry brightness "Brightness Controller" brightness-controller Settings + make_desktop_entry brightness "Brightness Controller" brightness-controller Settings } diff --git a/app-misc/brightness-control/files/brightness-control-use-qtpy.patch b/app-misc/brightness-control/files/brightness-control-use-qtpy.patch deleted file mode 100644 index 17b130f77..000000000 --- a/app-misc/brightness-control/files/brightness-control-use-qtpy.patch +++ /dev/null @@ -1,118 +0,0 @@ -diff --git a//init.py b//init.py -index 495c15d..1670972 100755 ---- a//init.py -+++ b//init.py -@@ -19,9 +19,9 @@ - import sys - import getpass - from os import path, remove, makedirs --from PySide2 import QtGui, QtCore, QtWidgets --from PySide2.QtCore import QSize --from PySide2.QtGui import QIcon -+from qtpy import QtGui, QtCore, QtWidgets -+from qtpy.QtCore import QSize -+from qtpy.QtGui import QIcon - from util.QtSingleApplication import QtSingleApplication - from ui.mainwindow import Ui_MainWindow - from ui.license import Ui_Form as License_Ui_Form -diff --git a//ui/about.py b//ui/about.py -index 248eae8..30d6f72 100644 ---- a//ui/about.py -+++ b//ui/about.py -@@ -8,12 +8,12 @@ - ## WARNING! All changes made in this file will be lost when recompiling UI file! - ################################################################################ - --from PySide2.QtCore import (QCoreApplication, QDate, QDateTime, QMetaObject, -+from qtpy.QtCore import (QCoreApplication, QDate, QDateTime, QMetaObject, - QObject, QPoint, QRect, QSize, QTime, QUrl, Qt) --from PySide2.QtGui import (QBrush, QColor, QConicalGradient, QCursor, QFont, -+from qtpy.QtGui import (QBrush, QColor, QConicalGradient, QCursor, QFont, - QFontDatabase, QIcon, QKeySequence, QLinearGradient, QPalette, QPainter, - QPixmap, QRadialGradient) --from PySide2.QtWidgets import * -+from qtpy.QtWidgets import * - - - class Ui_Form(object): -diff --git a//ui/help.py b//ui/help.py -index 1eba729..a458f0e 100644 ---- a//ui/help.py -+++ b//ui/help.py -@@ -8,12 +8,12 @@ - ## WARNING! All changes made in this file will be lost when recompiling UI file! - ################################################################################ - --from PySide2.QtCore import (QCoreApplication, QMetaObject, QObject, QPoint, -+from qtpy.QtCore import (QCoreApplication, QMetaObject, QObject, QPoint, - QRect, QSize, QUrl, Qt) --from PySide2.QtGui import (QBrush, QColor, QConicalGradient, QCursor, QFont, -+from qtpy.QtGui import (QBrush, QColor, QConicalGradient, QCursor, QFont, - QFontDatabase, QIcon, QLinearGradient, QPalette, QPainter, QPixmap, - QRadialGradient) --from PySide2.QtWidgets import * -+from qtpy.QtWidgets import * - - - class Ui_Form(object): -diff --git a//ui/license.py b//ui/license.py -index 7cfa021..370992b 100644 ---- a//ui/license.py -+++ b//ui/license.py -@@ -8,12 +8,12 @@ - ## WARNING! All changes made in this file will be lost when recompiling UI file! - ################################################################################ - --from PySide2.QtCore import (QCoreApplication, QMetaObject, QObject, QPoint, -+from qtpy.QtCore import (QCoreApplication, QMetaObject, QObject, QPoint, - QRect, QSize, QUrl, Qt) --from PySide2.QtGui import (QBrush, QColor, QConicalGradient, QCursor, QFont, -+from qtpy.QtGui import (QBrush, QColor, QConicalGradient, QCursor, QFont, - QFontDatabase, QIcon, QLinearGradient, QPalette, QPainter, QPixmap, - QRadialGradient) --from PySide2.QtWidgets import * -+from qtpy.QtWidgets import * - - - class Ui_Form(object): -diff --git a//ui/mainwindow.py b//ui/mainwindow.py -index f8ccf11..4d50ff6 100644 ---- a//ui/mainwindow.py -+++ b//ui/mainwindow.py -@@ -8,12 +8,12 @@ - ## WARNING! All changes made in this file will be lost when recompiling UI file! - ################################################################################ - --from PySide2.QtCore import (QCoreApplication, QMetaObject, QObject, QPoint, -+from qtpy.QtCore import (QCoreApplication, QMetaObject, QObject, QPoint, - QRect, QSize, QUrl, Qt) --from PySide2.QtGui import (QBrush, QColor, QConicalGradient, QCursor, QFont, -+from qtpy.QtGui import (QBrush, QColor, QConicalGradient, QCursor, QFont, - QFontDatabase, QIcon, QLinearGradient, QPalette, QPainter, QPixmap, - QRadialGradient) --from PySide2.QtWidgets import * -+from qtpy.QtWidgets import * - - - class Ui_MainWindow(object): -diff --git a//util/QtSingleApplication.py b//util/QtSingleApplication.py -index 4dec38f..13a01a6 100644 ---- a//util/QtSingleApplication.py -+++ b//util/QtSingleApplication.py -@@ -1,11 +1,11 @@ - # -*- coding: utf-8 -*- --from PySide2.QtCore import Signal, QTextStream, Qt --# from PySide2.QtGui import * --from PySide2.QtNetwork import QLocalSocket, QLocalServer --from PySide2.QtWidgets import QApplication -+from qtpy.QtCore import Signal, QTextStream, Qt -+# from qtpy.QtGui import * -+from qtpy.QtNetwork import QLocalSocket, QLocalServer -+from qtpy.QtWidgets import QApplication - - """ Python 2.7 implementation of the C++ QtSingleApplication interface -- Note: This is Python 3 implementation of the above, using Pyside2 - Archisman Panigrahi <apandada1@gmail.com> -+ Note: This is Python 3 implementation of the above, using qtpy - Archisman Panigrahi <apandada1@gmail.com> - Copyright 2013, Johan Råde - All rights reserved. -
WARNING: multiple messages have this Message-ID (diff)
From: "Andrew Ammerlaan" <andrewammerlaan@riseup.net> To: gentoo-commits@lists.gentoo.org Subject: [gentoo-commits] repo/proj/guru:dev commit in: app-misc/brightness-control/files/, app-misc/brightness-control/ Date: Wed, 7 Apr 2021 08:50:37 +0000 (UTC) [thread overview] Message-ID: <1617785428.c3c0a2b8ffe83f279945e645ad12b5f6d17492f7.andrewammerlaan@gentoo> (raw) Message-ID: <20210407085037.YFaqwYFYVtgIy9BcPQpL3Asz8VrA0AU8Ud08v_MHbf4@z> (raw) commit: c3c0a2b8ffe83f279945e645ad12b5f6d17492f7 Author: Andrew Ammerlaan <andrewammerlaan <AT> riseup <DOT> net> AuthorDate: Wed Apr 7 08:50:28 2021 +0000 Commit: Andrew Ammerlaan <andrewammerlaan <AT> riseup <DOT> net> CommitDate: Wed Apr 7 08:50:28 2021 +0000 URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=c3c0a2b8 app-misc/brightness-control: update snapshot Package-Manager: Portage-3.0.18, Repoman-3.0.3 Signed-off-by: Andrew Ammerlaan <andrewammerlaan <AT> riseup.net> app-misc/brightness-control/Manifest | 2 +- ...ild => brightness-control-2.0_p20210331.ebuild} | 10 +- .../files/brightness-control-use-qtpy.patch | 118 --------------------- 3 files changed, 4 insertions(+), 126 deletions(-) diff --git a/app-misc/brightness-control/Manifest b/app-misc/brightness-control/Manifest index c5c17093c..322081ec9 100644 --- a/app-misc/brightness-control/Manifest +++ b/app-misc/brightness-control/Manifest @@ -1 +1 @@ -DIST brightness-control-2.0_p20200629.tar.gz 285708 BLAKE2B 2b886e14c42b40d2e6bb66e2cb5ab08fe18403430b69dc0b42be9c4126ed6caa4edf85451a30d5b1160c1da0c0205b2d2cf232ec3d805062b2d332a880bcf17b SHA512 064423512a1492fce20ad5efe4751fd68b2c3dc06a71f0afd5c2d598843daea3e4d1eaebeb9142a93c37f998c3b1ff5d20a5b5b087bd16bc85de5169f219de49 +DIST brightness-control-2.0_p20210331.tar.gz 285852 BLAKE2B a5fb5a91498e53fe0e08a67a4dafe7b10bd5d84c73154e84f1c3c473b85765dcf21afef02a55ea1965a574cfcab99cee5fa90d923cda301be3f15350734a9985 SHA512 e8a6b9080c8929a1f3b6f0284e25f705062e11a18f1bff264b2d4a6ce8a7068c65254ce8f53801db09dc32e0f2dd436cdf01e57697eb26d0742821b8c4b46ad9 diff --git a/app-misc/brightness-control/brightness-control-2.0_p20200629.ebuild b/app-misc/brightness-control/brightness-control-2.0_p20210331.ebuild similarity index 76% rename from app-misc/brightness-control/brightness-control-2.0_p20200629.ebuild rename to app-misc/brightness-control/brightness-control-2.0_p20210331.ebuild index 94dd2e4d7..e05e928e5 100644 --- a/app-misc/brightness-control/brightness-control-2.0_p20200629.ebuild +++ b/app-misc/brightness-control/brightness-control-2.0_p20210331.ebuild @@ -3,12 +3,12 @@ EAPI=7 -PYTHON_COMPAT=( python3_{7,8} ) +PYTHON_COMPAT=( python3_{7,8,9} ) DISTUTILS_SINGLE_IMPL=1 inherit distutils-r1 desktop -COMMIT="39c297e98621e4604e8fbeb4a155a224418460ed" +COMMIT="ea7434ae53681c591daa2ced0d107f4b4bb6f997" DESCRIPTION="Qt Brightness Controller in Python" HOMEPAGE="https://github.com/lordamit/Brightness" @@ -28,13 +28,9 @@ RDEPEND="$(python_gen_cond_dep \ S="${WORKDIR}/Brightness-${COMMIT}/src" -PATCHES=( - "${FILESDIR}/${PN}-use-qtpy.patch" -) - python_install_all () { distutils-r1_python_install_all doicon -s scalable icons/brightness-controller.svg - make_desktop_entry brightness "Brightness Controller" brightness-controller Settings + make_desktop_entry brightness "Brightness Controller" brightness-controller Settings } diff --git a/app-misc/brightness-control/files/brightness-control-use-qtpy.patch b/app-misc/brightness-control/files/brightness-control-use-qtpy.patch deleted file mode 100644 index 17b130f77..000000000 --- a/app-misc/brightness-control/files/brightness-control-use-qtpy.patch +++ /dev/null @@ -1,118 +0,0 @@ -diff --git a//init.py b//init.py -index 495c15d..1670972 100755 ---- a//init.py -+++ b//init.py -@@ -19,9 +19,9 @@ - import sys - import getpass - from os import path, remove, makedirs --from PySide2 import QtGui, QtCore, QtWidgets --from PySide2.QtCore import QSize --from PySide2.QtGui import QIcon -+from qtpy import QtGui, QtCore, QtWidgets -+from qtpy.QtCore import QSize -+from qtpy.QtGui import QIcon - from util.QtSingleApplication import QtSingleApplication - from ui.mainwindow import Ui_MainWindow - from ui.license import Ui_Form as License_Ui_Form -diff --git a//ui/about.py b//ui/about.py -index 248eae8..30d6f72 100644 ---- a//ui/about.py -+++ b//ui/about.py -@@ -8,12 +8,12 @@ - ## WARNING! All changes made in this file will be lost when recompiling UI file! - ################################################################################ - --from PySide2.QtCore import (QCoreApplication, QDate, QDateTime, QMetaObject, -+from qtpy.QtCore import (QCoreApplication, QDate, QDateTime, QMetaObject, - QObject, QPoint, QRect, QSize, QTime, QUrl, Qt) --from PySide2.QtGui import (QBrush, QColor, QConicalGradient, QCursor, QFont, -+from qtpy.QtGui import (QBrush, QColor, QConicalGradient, QCursor, QFont, - QFontDatabase, QIcon, QKeySequence, QLinearGradient, QPalette, QPainter, - QPixmap, QRadialGradient) --from PySide2.QtWidgets import * -+from qtpy.QtWidgets import * - - - class Ui_Form(object): -diff --git a//ui/help.py b//ui/help.py -index 1eba729..a458f0e 100644 ---- a//ui/help.py -+++ b//ui/help.py -@@ -8,12 +8,12 @@ - ## WARNING! All changes made in this file will be lost when recompiling UI file! - ################################################################################ - --from PySide2.QtCore import (QCoreApplication, QMetaObject, QObject, QPoint, -+from qtpy.QtCore import (QCoreApplication, QMetaObject, QObject, QPoint, - QRect, QSize, QUrl, Qt) --from PySide2.QtGui import (QBrush, QColor, QConicalGradient, QCursor, QFont, -+from qtpy.QtGui import (QBrush, QColor, QConicalGradient, QCursor, QFont, - QFontDatabase, QIcon, QLinearGradient, QPalette, QPainter, QPixmap, - QRadialGradient) --from PySide2.QtWidgets import * -+from qtpy.QtWidgets import * - - - class Ui_Form(object): -diff --git a//ui/license.py b//ui/license.py -index 7cfa021..370992b 100644 ---- a//ui/license.py -+++ b//ui/license.py -@@ -8,12 +8,12 @@ - ## WARNING! All changes made in this file will be lost when recompiling UI file! - ################################################################################ - --from PySide2.QtCore import (QCoreApplication, QMetaObject, QObject, QPoint, -+from qtpy.QtCore import (QCoreApplication, QMetaObject, QObject, QPoint, - QRect, QSize, QUrl, Qt) --from PySide2.QtGui import (QBrush, QColor, QConicalGradient, QCursor, QFont, -+from qtpy.QtGui import (QBrush, QColor, QConicalGradient, QCursor, QFont, - QFontDatabase, QIcon, QLinearGradient, QPalette, QPainter, QPixmap, - QRadialGradient) --from PySide2.QtWidgets import * -+from qtpy.QtWidgets import * - - - class Ui_Form(object): -diff --git a//ui/mainwindow.py b//ui/mainwindow.py -index f8ccf11..4d50ff6 100644 ---- a//ui/mainwindow.py -+++ b//ui/mainwindow.py -@@ -8,12 +8,12 @@ - ## WARNING! All changes made in this file will be lost when recompiling UI file! - ################################################################################ - --from PySide2.QtCore import (QCoreApplication, QMetaObject, QObject, QPoint, -+from qtpy.QtCore import (QCoreApplication, QMetaObject, QObject, QPoint, - QRect, QSize, QUrl, Qt) --from PySide2.QtGui import (QBrush, QColor, QConicalGradient, QCursor, QFont, -+from qtpy.QtGui import (QBrush, QColor, QConicalGradient, QCursor, QFont, - QFontDatabase, QIcon, QLinearGradient, QPalette, QPainter, QPixmap, - QRadialGradient) --from PySide2.QtWidgets import * -+from qtpy.QtWidgets import * - - - class Ui_MainWindow(object): -diff --git a//util/QtSingleApplication.py b//util/QtSingleApplication.py -index 4dec38f..13a01a6 100644 ---- a//util/QtSingleApplication.py -+++ b//util/QtSingleApplication.py -@@ -1,11 +1,11 @@ - # -*- coding: utf-8 -*- --from PySide2.QtCore import Signal, QTextStream, Qt --# from PySide2.QtGui import * --from PySide2.QtNetwork import QLocalSocket, QLocalServer --from PySide2.QtWidgets import QApplication -+from qtpy.QtCore import Signal, QTextStream, Qt -+# from qtpy.QtGui import * -+from qtpy.QtNetwork import QLocalSocket, QLocalServer -+from qtpy.QtWidgets import QApplication - - """ Python 2.7 implementation of the C++ QtSingleApplication interface -- Note: This is Python 3 implementation of the above, using Pyside2 - Archisman Panigrahi <apandada1@gmail.com> -+ Note: This is Python 3 implementation of the above, using qtpy - Archisman Panigrahi <apandada1@gmail.com> - Copyright 2013, Johan Råde - All rights reserved. -
next reply other threads:[~2021-04-07 8:51 UTC|newest] Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top 2021-04-07 8:51 Andrew Ammerlaan [this message] 2021-04-07 8:50 ` [gentoo-commits] repo/proj/guru:dev commit in: app-misc/brightness-control/files/, app-misc/brightness-control/ Andrew Ammerlaan
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=1617785428.c3c0a2b8ffe83f279945e645ad12b5f6d17492f7.andrewammerlaan@gentoo \ --to=andrewammerlaan@riseup.net \ --cc=gentoo-commits@lists.gentoo.org \ --cc=gentoo-dev@lists.gentoo.org \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox