[gentoo-commits] repo/proj/guru:master commit in: gui-apps/wdisplays/
commit: dc7e00dc41618ac42f505d03a276e5cd83d264cf Author: Joe Kappus wt gd> AuthorDate: Sat May 25 12:14:38 2024 + Commit: Julien Roy jroy ca> CommitDate: Sat May 25 12:14:38 2024 + URL:https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=dc7e00dc gui-apps/wdisplays: drop 1.0-r3, add 1.1.1 EAPI 8, fix RDEPEND Closes: https://bugs.gentoo.org/932624 Signed-off-by: Joe Kappus wt.gd> gui-apps/wdisplays/Manifest| 2 +- .../wdisplays/{wdisplays-1.0-r3.ebuild => wdisplays-1.1.1.ebuild} | 7 +++ gui-apps/wdisplays/wdisplays-1.1.ebuild| 3 ++- gui-apps/wdisplays/wdisplays-.ebuild | 5 +++-- 4 files changed, 9 insertions(+), 8 deletions(-) diff --git a/gui-apps/wdisplays/Manifest b/gui-apps/wdisplays/Manifest index d262b7fd5..dec0873ca 100644 --- a/gui-apps/wdisplays/Manifest +++ b/gui-apps/wdisplays/Manifest @@ -1,2 +1,2 @@ -DIST wdisplays-1.0.tar.gz 106819 BLAKE2B d8a34ea82b88f99e27b5c42dc2e8bfed2bf69db719617d81d5f2c994e9020d206937e940f57452c99b534ceda241cea570899c7bdc74377009f7aa013e78b638 SHA512 876e883747331cf67d351b7afec963d6d52b6fa3870a57ed147acf898a662fb41407b3e835acc167d32de969d4001dbe8429340849ad09a7f7b8bfdabee61e3e +DIST wdisplays-1.1.1.tar.gz 108810 BLAKE2B a294719c3b8e91642d53e22aaac40c3ddd9a24e2eaef8e8b412905e9a4ef4be7984c0d0c087661d975ec518304020d1f84fc7a6ac4f62f1a5708c73878646818 SHA512 46923592e9fbb5c06c3549c198aedbafd8e0b5a6a82bc11d9d0b4cb086007cce18e0aa109932a4e4bee34d9f235660d2ea9d485a8fce146a2755ef62f81d DIST wdisplays-1.1.tar.gz 108410 BLAKE2B 438030d835a0b01dc65c9e69ef0019ce53741aa3be63624ffd73d7cd44e37ccb102cbc4aedaa303d7f47267353640072b3de76437f45637abfd2192b612b23ad SHA512 1aabcb4fef1bde1b8f6bb9254804bba39fe5ebdd57ecc62894aca432527be54ead39ece4008f48ddf96a28111fc409fa5a093905c8017b79bb3f6495a0dc264d diff --git a/gui-apps/wdisplays/wdisplays-1.0-r3.ebuild b/gui-apps/wdisplays/wdisplays-1.1.1.ebuild similarity index 87% rename from gui-apps/wdisplays/wdisplays-1.0-r3.ebuild rename to gui-apps/wdisplays/wdisplays-1.1.1.ebuild index 1e6afa740..2a1faecf7 100644 --- a/gui-apps/wdisplays/wdisplays-1.0-r3.ebuild +++ b/gui-apps/wdisplays/wdisplays-1.1.1.ebuild @@ -1,7 +1,7 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 inherit meson xdg @@ -23,6 +23,7 @@ RESTRICT="mirror test" RDEPEND=" dev-libs/glib + dev-libs/wayland media-libs/libepoxy x11-libs/gtk+:3[wayland] x11-libs/cairo @@ -32,5 +33,3 @@ DEPEND="${RDEPEND}" BDEPEND=" dev-libs/wayland-protocols " - -PATCHES=( "${FILESDIR}/${PN}-1.0-pull20.patch" ) diff --git a/gui-apps/wdisplays/wdisplays-1.1.ebuild b/gui-apps/wdisplays/wdisplays-1.1.ebuild index 1afe894e7..757718fc4 100644 --- a/gui-apps/wdisplays/wdisplays-1.1.ebuild +++ b/gui-apps/wdisplays/wdisplays-1.1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -23,6 +23,7 @@ RESTRICT="mirror test" RDEPEND=" dev-libs/glib + dev-libs/wayland media-libs/libepoxy x11-libs/gtk+:3[wayland] x11-libs/cairo diff --git a/gui-apps/wdisplays/wdisplays-.ebuild b/gui-apps/wdisplays/wdisplays-.ebuild index 1afe894e7..2a1faecf7 100644 --- a/gui-apps/wdisplays/wdisplays-.ebuild +++ b/gui-apps/wdisplays/wdisplays-.ebuild @@ -1,7 +1,7 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 inherit meson xdg @@ -23,6 +23,7 @@ RESTRICT="mirror test" RDEPEND=" dev-libs/glib + dev-libs/wayland media-libs/libepoxy x11-libs/gtk+:3[wayland] x11-libs/cairo
[gentoo-commits] repo/proj/guru:master commit in: gui-apps/wdisplays/
commit: 250235e7439c42c4fab47b57174e7d7646a6372b Author: Joe Kappus wt gd> AuthorDate: Sat May 25 12:05:27 2024 + Commit: Julien Roy jroy ca> CommitDate: Sat May 25 12:05:27 2024 + URL:https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=250235e7 gui-apps/wdisplays: add myself as a maintainer Signed-off-by: Joe Kappus wt.gd> gui-apps/wdisplays/metadata.xml | 5 - 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/gui-apps/wdisplays/metadata.xml b/gui-apps/wdisplays/metadata.xml index 1e1ae32f9..6bdc58964 100644 --- a/gui-apps/wdisplays/metadata.xml +++ b/gui-apps/wdisplays/metadata.xml @@ -1,7 +1,10 @@ https://www.gentoo.org/dtd/metadata.dtd";> - + +j...@wt.gd +Joe Kappus + https://github.com/artizirk/wdisplays/issues artizirk/wdisplays
[gentoo-commits] repo/proj/guru:master commit in: gui-apps/wdisplays/
commit: daa38a51f459b6f219cea859541fd90533d03eec Author: Matthias Coppens gmail com> AuthorDate: Sat May 15 14:16:31 2021 + Commit: Andrew Ammerlaan riseup net> CommitDate: Sat May 15 14:18:23 2021 + URL:https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=daa38a51 gui-apps/wdisplays: Change upstream developer and version bump to 1.1 The GitHub user account cyclopsian does no longer exist. As pointed out in the referenced bug, there seem to be 2 main forks: one by luispabon and one by artizirk. luispabon stated that they might not want to maintain wdisplays, the artizirk fork has seen some commits and a bug fix release. Closes: https://bugs.gentoo.org/788163 Package-Manager: Portage-3.0.18, Repoman-3.0.3 Signed-off-by: Matthias Coppens gmail.com> gui-apps/wdisplays/Manifest| 1 + gui-apps/wdisplays/metadata.xml| 4 ++-- gui-apps/wdisplays/wdisplays-1.0-r3.ebuild | 8 +--- .../{wdisplays-1.0-r3.ebuild => wdisplays-1.1.ebuild} | 10 +- gui-apps/wdisplays/wdisplays-.ebuild | 10 +- 5 files changed, 18 insertions(+), 15 deletions(-) diff --git a/gui-apps/wdisplays/Manifest b/gui-apps/wdisplays/Manifest index 0cb2a7b59..d262b7fd5 100644 --- a/gui-apps/wdisplays/Manifest +++ b/gui-apps/wdisplays/Manifest @@ -1 +1,2 @@ DIST wdisplays-1.0.tar.gz 106819 BLAKE2B d8a34ea82b88f99e27b5c42dc2e8bfed2bf69db719617d81d5f2c994e9020d206937e940f57452c99b534ceda241cea570899c7bdc74377009f7aa013e78b638 SHA512 876e883747331cf67d351b7afec963d6d52b6fa3870a57ed147acf898a662fb41407b3e835acc167d32de969d4001dbe8429340849ad09a7f7b8bfdabee61e3e +DIST wdisplays-1.1.tar.gz 108410 BLAKE2B 438030d835a0b01dc65c9e69ef0019ce53741aa3be63624ffd73d7cd44e37ccb102cbc4aedaa303d7f47267353640072b3de76437f45637abfd2192b612b23ad SHA512 1aabcb4fef1bde1b8f6bb9254804bba39fe5ebdd57ecc62894aca432527be54ead39ece4008f48ddf96a28111fc409fa5a093905c8017b79bb3f6495a0dc264d diff --git a/gui-apps/wdisplays/metadata.xml b/gui-apps/wdisplays/metadata.xml index 87001ec02..fe5b065b1 100644 --- a/gui-apps/wdisplays/metadata.xml +++ b/gui-apps/wdisplays/metadata.xml @@ -6,7 +6,7 @@ coppens.matthias@gmail.com -https://github.com/cyclopsian/wdisplays/issues -cyclopian/wdisplays +https://github.com/artizirk/wdisplays/issues +artizirk/wdisplays diff --git a/gui-apps/wdisplays/wdisplays-1.0-r3.ebuild b/gui-apps/wdisplays/wdisplays-1.0-r3.ebuild index e9c017e2e..a5ac286ac 100644 --- a/gui-apps/wdisplays/wdisplays-1.0-r3.ebuild +++ b/gui-apps/wdisplays/wdisplays-1.0-r3.ebuild @@ -6,17 +6,19 @@ EAPI=7 inherit meson xdg DESCRIPTION="GUI display configurator for wlroots compositors" -HOMEPAGE="https://cyclopsian.github.io/wdisplays https://github.com/cyclopsian/wdisplays"; +HOMEPAGE="https://github.com/artizirk/wdisplays"; if [[ "${PV}" == ]] then inherit git-r3 - EGIT_REPO_URI="https://github.com/cyclopsian/wdisplays.git"; + EGIT_REPO_URI="https://github.com/artizirk/wdisplays.git"; else - SRC_URI="https://github.com/cyclopsian/wdisplays/archive/${PV}.tar.gz -> ${P}.tar.gz" + SRC_URI="https://github.com/artizirk/wdisplays/archive/${PV}.tar.gz -> ${P}.tar.gz" KEYWORDS="~amd64 ~arm64 ~x86" fi +RESTRICT="mirror test" + RDEPEND=" dev-libs/glib media-libs/libepoxy diff --git a/gui-apps/wdisplays/wdisplays-1.0-r3.ebuild b/gui-apps/wdisplays/wdisplays-1.1.ebuild similarity index 62% copy from gui-apps/wdisplays/wdisplays-1.0-r3.ebuild copy to gui-apps/wdisplays/wdisplays-1.1.ebuild index e9c017e2e..030499155 100644 --- a/gui-apps/wdisplays/wdisplays-1.0-r3.ebuild +++ b/gui-apps/wdisplays/wdisplays-1.1.ebuild @@ -6,17 +6,19 @@ EAPI=7 inherit meson xdg DESCRIPTION="GUI display configurator for wlroots compositors" -HOMEPAGE="https://cyclopsian.github.io/wdisplays https://github.com/cyclopsian/wdisplays"; +HOMEPAGE="https://github.com/artizirk/wdisplays"; if [[ "${PV}" == ]] then inherit git-r3 - EGIT_REPO_URI="https://github.com/cyclopsian/wdisplays.git"; + EGIT_REPO_URI="https://github.com/artizirk/wdisplays.git"; else - SRC_URI="https://github.com/cyclopsian/wdisplays/archive/${PV}.tar.gz -> ${P}.tar.gz" + SRC_URI="https://github.com/artizirk/wdisplays/archive/${PV}.tar.gz -> ${P}.tar.gz" KEYWORDS="~amd64 ~arm64 ~x86" fi +RESTRICT="mirror test" + RDEPEND=" dev-libs/glib media-libs/libepoxy @@ -31,5 +33,3 @@ BDEPEND=" LICENSE="GPL-3+" SLOT="0" - -PATCHES=( "${FILESDIR}/${PN}-1.0-pull20.patch" ) diff --git a/gui-apps/wdisplays/wdisplays-.ebuild b/gui-apps/wdisplays/wdisplays-.ebuild index e9c017e2e..030499155 100644 --- a/gui-apps/wdisplays/wdisplays-.ebuild +++ b/gui-apps/wdisplays/wdisplays-.ebuild @@ -6,17 +6,19 @@ EAPI=7 inherit meson xdg DESCRIPTION=
[gentoo-commits] repo/proj/guru:master commit in: gui-apps/wdisplays/
commit: 5eb32c0beaa6a48c8942325aacf5287f51798a09 Author: Haelwenn (lanodan) Monnier hacktivis me> AuthorDate: Tue May 4 16:12:05 2021 + Commit: Andrew Ammerlaan riseup net> CommitDate: Tue May 4 16:12:05 2021 + URL:https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=5eb32c0b gui-apps/wdisplays: Undelete (the upstream is dead but might not need to be removed yet) Signed-off-by: Haelwenn (lanodan) Monnier hacktivis.me> gui-apps/wdisplays/wdisplays-.ebuild | 35 1 file changed, 35 insertions(+) diff --git a/gui-apps/wdisplays/wdisplays-.ebuild b/gui-apps/wdisplays/wdisplays-.ebuild new file mode 100644 index 0..e9c017e2e --- /dev/null +++ b/gui-apps/wdisplays/wdisplays-.ebuild @@ -0,0 +1,35 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit meson xdg + +DESCRIPTION="GUI display configurator for wlroots compositors" +HOMEPAGE="https://cyclopsian.github.io/wdisplays https://github.com/cyclopsian/wdisplays"; + +if [[ "${PV}" == ]] +then + inherit git-r3 + EGIT_REPO_URI="https://github.com/cyclopsian/wdisplays.git"; +else + SRC_URI="https://github.com/cyclopsian/wdisplays/archive/${PV}.tar.gz -> ${P}.tar.gz" + KEYWORDS="~amd64 ~arm64 ~x86" +fi + +RDEPEND=" + dev-libs/glib + media-libs/libepoxy + x11-libs/gtk+:3[wayland] + x11-libs/cairo + x11-libs/pango +" +DEPEND="${RDEPEND}" +BDEPEND=" + dev-libs/wayland-protocols +" + +LICENSE="GPL-3+" +SLOT="0" + +PATCHES=( "${FILESDIR}/${PN}-1.0-pull20.patch" )
[gentoo-commits] repo/proj/guru:master commit in: gui-apps/wdisplays/
commit: 6aac220a1ac48e9bb3144af6707ec95ffaf914f8 Author: Aisha Tammy aisha cc> AuthorDate: Wed Mar 10 12:38:21 2021 + Commit: Andrew Ammerlaan riseup net> CommitDate: Wed Mar 10 12:38:21 2021 + URL:https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=6aac220a gui-apps/wdisplays: drop old revision Package-Manager: Portage-3.0.16, Repoman-3.0.2 Signed-off-by: Aisha Tammy aisha.cc> gui-apps/wdisplays/wdisplays-1.0-r2.ebuild | 27 --- 1 file changed, 27 deletions(-) diff --git a/gui-apps/wdisplays/wdisplays-1.0-r2.ebuild b/gui-apps/wdisplays/wdisplays-1.0-r2.ebuild deleted file mode 100644 index 3959f430.. --- a/gui-apps/wdisplays/wdisplays-1.0-r2.ebuild +++ /dev/null @@ -1,27 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -if [[ "${PV}" == ]] -then - inherit git-r3 - EGIT_REPO_URI="https://github.com/cyclopsian/wdisplays.git"; -else - SRC_URI="https://github.com/cyclopsian/wdisplays/archive/${PV}.tar.gz -> ${P}.tar.gz" - KEYWORDS="~amd64" -fi -inherit meson xdg - -DESCRIPTION="GUI display configurator for wlroots compositors" -HOMEPAGE="https://cyclopsian.github.io/wdisplays https://github.com/cyclopsian/wdisplays"; - -BDEPEND=" - x11-libs/gtk+:3[wayland] - gui-libs/wlroots" -DEPEND="${BDEPEND}" - -LICENSE="GPL-3+" -SLOT="0" - -PATCHES=("${FILESDIR}/${PN}-1.0-pull20.patch")
[gentoo-commits] repo/proj/guru:master commit in: gui-apps/wdisplays/
commit: b63c82cd36a8cde5b0929fb5ad28275d9a4365ce Author: Aisha Tammy aisha cc> AuthorDate: Wed Mar 10 12:37:57 2021 + Commit: Andrew Ammerlaan riseup net> CommitDate: Wed Mar 10 12:37:57 2021 + URL:https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=b63c82cd gui-apps/wdisplays: fix dependencies Package-Manager: Portage-3.0.16, Repoman-3.0.2 Signed-off-by: Aisha Tammy aisha.cc> ...isplays-.ebuild => wdisplays-1.0-r3.ebuild} | 28 ++ gui-apps/wdisplays/wdisplays-.ebuild | 28 ++ 2 files changed, 36 insertions(+), 20 deletions(-) diff --git a/gui-apps/wdisplays/wdisplays-.ebuild b/gui-apps/wdisplays/wdisplays-1.0-r3.ebuild similarity index 67% copy from gui-apps/wdisplays/wdisplays-.ebuild copy to gui-apps/wdisplays/wdisplays-1.0-r3.ebuild index 3959f430..e9c017e2 100644 --- a/gui-apps/wdisplays/wdisplays-.ebuild +++ b/gui-apps/wdisplays/wdisplays-1.0-r3.ebuild @@ -1,27 +1,35 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 +inherit meson xdg + +DESCRIPTION="GUI display configurator for wlroots compositors" +HOMEPAGE="https://cyclopsian.github.io/wdisplays https://github.com/cyclopsian/wdisplays"; + if [[ "${PV}" == ]] then inherit git-r3 EGIT_REPO_URI="https://github.com/cyclopsian/wdisplays.git"; else SRC_URI="https://github.com/cyclopsian/wdisplays/archive/${PV}.tar.gz -> ${P}.tar.gz" - KEYWORDS="~amd64" + KEYWORDS="~amd64 ~arm64 ~x86" fi -inherit meson xdg -DESCRIPTION="GUI display configurator for wlroots compositors" -HOMEPAGE="https://cyclopsian.github.io/wdisplays https://github.com/cyclopsian/wdisplays"; - -BDEPEND=" +RDEPEND=" + dev-libs/glib + media-libs/libepoxy x11-libs/gtk+:3[wayland] - gui-libs/wlroots" -DEPEND="${BDEPEND}" + x11-libs/cairo + x11-libs/pango +" +DEPEND="${RDEPEND}" +BDEPEND=" + dev-libs/wayland-protocols +" LICENSE="GPL-3+" SLOT="0" -PATCHES=("${FILESDIR}/${PN}-1.0-pull20.patch") +PATCHES=( "${FILESDIR}/${PN}-1.0-pull20.patch" ) diff --git a/gui-apps/wdisplays/wdisplays-.ebuild b/gui-apps/wdisplays/wdisplays-.ebuild index 3959f430..e9c017e2 100644 --- a/gui-apps/wdisplays/wdisplays-.ebuild +++ b/gui-apps/wdisplays/wdisplays-.ebuild @@ -1,27 +1,35 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 +inherit meson xdg + +DESCRIPTION="GUI display configurator for wlroots compositors" +HOMEPAGE="https://cyclopsian.github.io/wdisplays https://github.com/cyclopsian/wdisplays"; + if [[ "${PV}" == ]] then inherit git-r3 EGIT_REPO_URI="https://github.com/cyclopsian/wdisplays.git"; else SRC_URI="https://github.com/cyclopsian/wdisplays/archive/${PV}.tar.gz -> ${P}.tar.gz" - KEYWORDS="~amd64" + KEYWORDS="~amd64 ~arm64 ~x86" fi -inherit meson xdg -DESCRIPTION="GUI display configurator for wlroots compositors" -HOMEPAGE="https://cyclopsian.github.io/wdisplays https://github.com/cyclopsian/wdisplays"; - -BDEPEND=" +RDEPEND=" + dev-libs/glib + media-libs/libepoxy x11-libs/gtk+:3[wayland] - gui-libs/wlroots" -DEPEND="${BDEPEND}" + x11-libs/cairo + x11-libs/pango +" +DEPEND="${RDEPEND}" +BDEPEND=" + dev-libs/wayland-protocols +" LICENSE="GPL-3+" SLOT="0" -PATCHES=("${FILESDIR}/${PN}-1.0-pull20.patch") +PATCHES=( "${FILESDIR}/${PN}-1.0-pull20.patch" )
[gentoo-commits] repo/proj/guru:master commit in: gui-apps/wdisplays/
commit: fb574fa21e6a0c2ff3cdca7313c6b7ca431507c2 Author: Matthias Coppens gmail com> AuthorDate: Thu Sep 10 11:43:14 2020 + Commit: Andrew Ammerlaan riseup net> CommitDate: Thu Sep 10 12:15:25 2020 + URL:https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=fb574fa2 gui-apps/wdisplays: Port patch to Port patch for version 1.0 to the live ebuild, I thought upstream would've pulled the PR already. Add GitHub link to HOMEPAGE. Fixed style to recommendations for proxy-maint ebuilds. Package-Manager: Portage-3.0.6, Repoman-3.0.1 Signed-off-by: Matthias Coppens gmail.com> gui-apps/wdisplays/wdisplays-1.0-r2.ebuild | 21 ++--- gui-apps/wdisplays/wdisplays-.ebuild | 21 +++-- 2 files changed, 21 insertions(+), 21 deletions(-) diff --git a/gui-apps/wdisplays/wdisplays-1.0-r2.ebuild b/gui-apps/wdisplays/wdisplays-1.0-r2.ebuild index f77ab59f..3959f430 100644 --- a/gui-apps/wdisplays/wdisplays-1.0-r2.ebuild +++ b/gui-apps/wdisplays/wdisplays-1.0-r2.ebuild @@ -3,19 +3,18 @@ EAPI=7 -EGIT_REPO_URI="https://github.com/cyclopsian/${PN}"; -case "${PV}" in - "") - inherit git-r3 - ;; - *) - SRC_URI="${EGIT_REPO_URI}/archive/${PV}.tar.gz -> ${P}.tar.gz" - KEYWORDS="~amd64" -esac +if [[ "${PV}" == ]] +then + inherit git-r3 + EGIT_REPO_URI="https://github.com/cyclopsian/wdisplays.git"; +else + SRC_URI="https://github.com/cyclopsian/wdisplays/archive/${PV}.tar.gz -> ${P}.tar.gz" + KEYWORDS="~amd64" +fi inherit meson xdg DESCRIPTION="GUI display configurator for wlroots compositors" -HOMEPAGE="https://cyclopsian.github.io/${PN}"; +HOMEPAGE="https://cyclopsian.github.io/wdisplays https://github.com/cyclopsian/wdisplays"; BDEPEND=" x11-libs/gtk+:3[wayland] @@ -25,4 +24,4 @@ DEPEND="${BDEPEND}" LICENSE="GPL-3+" SLOT="0" -PATCHES=("${FILESDIR}/${P}-pull20.patch") +PATCHES=("${FILESDIR}/${PN}-1.0-pull20.patch") diff --git a/gui-apps/wdisplays/wdisplays-.ebuild b/gui-apps/wdisplays/wdisplays-.ebuild index e277e11a..3959f430 100644 --- a/gui-apps/wdisplays/wdisplays-.ebuild +++ b/gui-apps/wdisplays/wdisplays-.ebuild @@ -3,19 +3,18 @@ EAPI=7 -EGIT_REPO_URI="https://github.com/cyclopsian/${PN}"; -case "${PV}" in - "") - inherit git-r3 - ;; - *) - SRC_URI="${EGIT_REPO_URI}/archive/${PV}.tar.gz -> ${P}.tar.gz" - KEYWORDS="~amd64" -esac +if [[ "${PV}" == ]] +then + inherit git-r3 + EGIT_REPO_URI="https://github.com/cyclopsian/wdisplays.git"; +else + SRC_URI="https://github.com/cyclopsian/wdisplays/archive/${PV}.tar.gz -> ${P}.tar.gz" + KEYWORDS="~amd64" +fi inherit meson xdg DESCRIPTION="GUI display configurator for wlroots compositors" -HOMEPAGE="https://cyclopsian.github.io/${PN}"; +HOMEPAGE="https://cyclopsian.github.io/wdisplays https://github.com/cyclopsian/wdisplays"; BDEPEND=" x11-libs/gtk+:3[wayland] @@ -24,3 +23,5 @@ DEPEND="${BDEPEND}" LICENSE="GPL-3+" SLOT="0" + +PATCHES=("${FILESDIR}/${PN}-1.0-pull20.patch")
[gentoo-commits] repo/proj/guru:master commit in: gui-apps/wdisplays/, gui-apps/wdisplays/files/
commit: f56995185d43d02dcc33f4cdb8e728c0e61c398b Author: Matthias Coppens gmail com> AuthorDate: Mon Jul 27 09:20:26 2020 + Commit: Andrew Ammerlaan riseup net> CommitDate: Mon Jul 27 09:22:09 2020 + URL:https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=f5699518 gui-apps/wdisplays: Updated patch This commit updates the patch for wdisplays-1.0 and updates the revision number, since the patch solves a runtime issue. This commit also cleans the ebuilds a bit. Package-Manager: Portage-2.3.103, Repoman-2.3.23 Signed-off-by: Matthias Coppens gmail.com> gui-apps/wdisplays/files/wdisplays-1.0-pull20.patch| 7 +++ .../wdisplays/{wdisplays-1.0-r1.ebuild => wdisplays-1.0-r2.ebuild} | 3 +-- gui-apps/wdisplays/wdisplays-.ebuild | 3 +-- 3 files changed, 5 insertions(+), 8 deletions(-) diff --git a/gui-apps/wdisplays/files/wdisplays-1.0-pull20.patch b/gui-apps/wdisplays/files/wdisplays-1.0-pull20.patch index 607c69b..200acd8 100644 --- a/gui-apps/wdisplays/files/wdisplays-1.0-pull20.patch +++ b/gui-apps/wdisplays/files/wdisplays-1.0-pull20.patch @@ -1,4 +1,4 @@ -From 657e2966e556c78f121075c69fe1ba8d2b4dcb73 Mon Sep 17 00:00:00 2001 +From 5198a9c94b40ff157c284df413be5402f1b75118 Mon Sep 17 00:00:00 2001 From: Simon Ser Date: Wed, 8 Jul 2020 11:57:35 +0200 Subject: [PATCH] Use correct versions when binding globals @@ -17,7 +17,7 @@ Closes: https://github.com/cyclopsian/wdisplays/issues/18 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/outputs.c b/src/outputs.c -index 9ebf7e5..40410ec 100644 +index 9ebf7e5..a5007e8 100644 --- a/src/outputs.c +++ b/src/outputs.c @@ -534,20 +534,20 @@ static void registry_handle_global(void *data, struct wl_registry *registry, @@ -31,7 +31,7 @@ index 9ebf7e5..40410ec 100644 } else if (strcmp(interface, zxdg_output_manager_v1_interface.name) == 0) { state->xdg_output_manager = wl_registry_bind(registry, name, -&zxdg_output_manager_v1_interface, version); -+&zxdg_output_manager_v1_interface, 3); ++&zxdg_output_manager_v1_interface, 2); } else if(strcmp(interface, zwlr_screencopy_manager_v1_interface.name) == 0) { state->copy_manager = wl_registry_bind(registry, name, -&zwlr_screencopy_manager_v1_interface, version); @@ -46,4 +46,3 @@ index 9ebf7e5..40410ec 100644 } } - diff --git a/gui-apps/wdisplays/wdisplays-1.0-r1.ebuild b/gui-apps/wdisplays/wdisplays-1.0-r2.ebuild similarity index 96% rename from gui-apps/wdisplays/wdisplays-1.0-r1.ebuild rename to gui-apps/wdisplays/wdisplays-1.0-r2.ebuild index 88076f1..f77ab59 100644 --- a/gui-apps/wdisplays/wdisplays-1.0-r1.ebuild +++ b/gui-apps/wdisplays/wdisplays-1.0-r2.ebuild @@ -10,6 +10,7 @@ case "${PV}" in ;; *) SRC_URI="${EGIT_REPO_URI}/archive/${PV}.tar.gz -> ${P}.tar.gz" + KEYWORDS="~amd64" esac inherit meson xdg @@ -24,6 +25,4 @@ DEPEND="${BDEPEND}" LICENSE="GPL-3+" SLOT="0" -KEYWORDS="~amd64" - PATCHES=("${FILESDIR}/${P}-pull20.patch") diff --git a/gui-apps/wdisplays/wdisplays-.ebuild b/gui-apps/wdisplays/wdisplays-.ebuild index 88964cf..e277e11 100644 --- a/gui-apps/wdisplays/wdisplays-.ebuild +++ b/gui-apps/wdisplays/wdisplays-.ebuild @@ -10,6 +10,7 @@ case "${PV}" in ;; *) SRC_URI="${EGIT_REPO_URI}/archive/${PV}.tar.gz -> ${P}.tar.gz" + KEYWORDS="~amd64" esac inherit meson xdg @@ -23,5 +24,3 @@ DEPEND="${BDEPEND}" LICENSE="GPL-3+" SLOT="0" - -KEYWORDS=""
[gentoo-commits] repo/proj/guru:master commit in: gui-apps/wdisplays/, gui-apps/wdisplays/files/
commit: 153064863b4cee79391fef5bf4c192b449a33cc6 Author: Matthias Coppens gmail com> AuthorDate: Wed Jul 8 19:54:09 2020 + Commit: Andrew Ammerlaan riseup net> CommitDate: Wed Jul 8 19:55:06 2020 + URL:https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=15306486 gui-apps/wdisplays: Fix wdisplays not starting This fixes upstream bug https://github.com/cyclopsian/wdisplays/issues/18 Package-Manager: Portage-2.3.99, Repoman-2.3.23 Signed-off-by: Matthias Coppens gmail.com> .../wdisplays/files/wdisplays-1.0-pull20.patch | 49 ++ ...displays-1.0.ebuild => wdisplays-1.0-r1.ebuild} | 2 + 2 files changed, 51 insertions(+) diff --git a/gui-apps/wdisplays/files/wdisplays-1.0-pull20.patch b/gui-apps/wdisplays/files/wdisplays-1.0-pull20.patch new file mode 100644 index 000..607c69b --- /dev/null +++ b/gui-apps/wdisplays/files/wdisplays-1.0-pull20.patch @@ -0,0 +1,49 @@ +From 657e2966e556c78f121075c69fe1ba8d2b4dcb73 Mon Sep 17 00:00:00 2001 +From: Simon Ser +Date: Wed, 8 Jul 2020 11:57:35 +0200 +Subject: [PATCH] Use correct versions when binding globals + +Changes to protocols aren't forward-compatible. It's not possible to use +version n+1 when a client has been designed to work with version n. For +instance in wlr-screencopy v5 a new event has been added. Binding to +version 5 without upgrading the client leads to libwayland errors +because libwayland doesn't know how to handle the event. + +The client needs to maintain its own version requirements. + +Closes: https://github.com/cyclopsian/wdisplays/issues/18 +--- + src/outputs.c | 10 +- + 1 file changed, 5 insertions(+), 5 deletions(-) + +diff --git a/src/outputs.c b/src/outputs.c +index 9ebf7e5..40410ec 100644 +--- a/src/outputs.c b/src/outputs.c +@@ -534,20 +534,20 @@ static void registry_handle_global(void *data, struct wl_registry *registry, + + if (strcmp(interface, zwlr_output_manager_v1_interface.name) == 0) { + state->output_manager = wl_registry_bind(registry, name, +-&zwlr_output_manager_v1_interface, version); ++&zwlr_output_manager_v1_interface, 1); + zwlr_output_manager_v1_add_listener(state->output_manager, + &output_manager_listener, state); + } else if (strcmp(interface, zxdg_output_manager_v1_interface.name) == 0) { + state->xdg_output_manager = wl_registry_bind(registry, name, +-&zxdg_output_manager_v1_interface, version); ++&zxdg_output_manager_v1_interface, 3); + } else if(strcmp(interface, zwlr_screencopy_manager_v1_interface.name) == 0) { + state->copy_manager = wl_registry_bind(registry, name, +-&zwlr_screencopy_manager_v1_interface, version); ++&zwlr_screencopy_manager_v1_interface, 1); + } else if(strcmp(interface, zwlr_layer_shell_v1_interface.name) == 0) { + state->layer_shell = wl_registry_bind(registry, name, +-&zwlr_layer_shell_v1_interface, version); ++&zwlr_layer_shell_v1_interface, 1); + } else if(strcmp(interface, wl_shm_interface.name) == 0) { +-state->shm = wl_registry_bind(registry, name, &wl_shm_interface, version); ++state->shm = wl_registry_bind(registry, name, &wl_shm_interface, 1); + } + } + + diff --git a/gui-apps/wdisplays/wdisplays-1.0.ebuild b/gui-apps/wdisplays/wdisplays-1.0-r1.ebuild similarity index 92% rename from gui-apps/wdisplays/wdisplays-1.0.ebuild rename to gui-apps/wdisplays/wdisplays-1.0-r1.ebuild index 39f2b9d..88076f1 100644 --- a/gui-apps/wdisplays/wdisplays-1.0.ebuild +++ b/gui-apps/wdisplays/wdisplays-1.0-r1.ebuild @@ -25,3 +25,5 @@ LICENSE="GPL-3+" SLOT="0" KEYWORDS="~amd64" + +PATCHES=("${FILESDIR}/${P}-pull20.patch")
[gentoo-commits] repo/proj/guru:master commit in: gui-apps/wdisplays/
commit: 32f1cf6c513992aee448aa331b0da3ea190c82ec Author: Matthias Coppens gmail com> AuthorDate: Tue Jun 30 20:23:10 2020 + Commit: Andrew Ammerlaan riseup net> CommitDate: Tue Jun 30 20:23:10 2020 + URL:https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=32f1cf6c gui-apps/wdisplays: Fixed dependencies Package-Manager: Portage-2.3.99, Repoman-2.3.23 Signed-off-by: Matthias Coppens gmail.com> gui-apps/wdisplays/wdisplays-1.0.ebuild | 2 +- gui-apps/wdisplays/wdisplays-.ebuild | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/gui-apps/wdisplays/wdisplays-1.0.ebuild b/gui-apps/wdisplays/wdisplays-1.0.ebuild index 02f3aa3..39f2b9d 100644 --- a/gui-apps/wdisplays/wdisplays-1.0.ebuild +++ b/gui-apps/wdisplays/wdisplays-1.0.ebuild @@ -17,7 +17,7 @@ DESCRIPTION="GUI display configurator for wlroots compositors" HOMEPAGE="https://cyclopsian.github.io/${PN}"; BDEPEND=" - x11-libs/gtk+:3 + x11-libs/gtk+:3[wayland] gui-libs/wlroots" DEPEND="${BDEPEND}" diff --git a/gui-apps/wdisplays/wdisplays-.ebuild b/gui-apps/wdisplays/wdisplays-.ebuild index 88406d3..88964cf 100644 --- a/gui-apps/wdisplays/wdisplays-.ebuild +++ b/gui-apps/wdisplays/wdisplays-.ebuild @@ -17,7 +17,7 @@ DESCRIPTION="GUI display configurator for wlroots compositors" HOMEPAGE="https://cyclopsian.github.io/${PN}"; BDEPEND=" - x11-libs/gtk+:3 + x11-libs/gtk+:3[wayland] gui-libs/wlroots" DEPEND="${BDEPEND}"
[gentoo-commits] repo/proj/guru:master commit in: gui-apps/wdisplays/
commit: 4211ab464b6ad019680b05e9042b98bc7b23af92 Author: Matthias Coppens gmail com> AuthorDate: Mon Jun 29 20:52:03 2020 + Commit: Andrew Ammerlaan riseup net> CommitDate: Mon Jun 29 20:53:00 2020 + URL:https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=4211ab46 gui-apps/wdisplays: New package Package-Manager: Portage-2.3.99, Repoman-2.3.23 Signed-off-by: Matthias Coppens gmail.com> gui-apps/wdisplays/Manifest | 1 + gui-apps/wdisplays/metadata.xml | 8 gui-apps/wdisplays/wdisplays-1.0.ebuild | 27 +++ gui-apps/wdisplays/wdisplays-.ebuild | 27 +++ 4 files changed, 63 insertions(+) diff --git a/gui-apps/wdisplays/Manifest b/gui-apps/wdisplays/Manifest new file mode 100644 index 000..0cb2a7b --- /dev/null +++ b/gui-apps/wdisplays/Manifest @@ -0,0 +1 @@ +DIST wdisplays-1.0.tar.gz 106819 BLAKE2B d8a34ea82b88f99e27b5c42dc2e8bfed2bf69db719617d81d5f2c994e9020d206937e940f57452c99b534ceda241cea570899c7bdc74377009f7aa013e78b638 SHA512 876e883747331cf67d351b7afec963d6d52b6fa3870a57ed147acf898a662fb41407b3e835acc167d32de969d4001dbe8429340849ad09a7f7b8bfdabee61e3e diff --git a/gui-apps/wdisplays/metadata.xml b/gui-apps/wdisplays/metadata.xml new file mode 100644 index 000..7066f7e --- /dev/null +++ b/gui-apps/wdisplays/metadata.xml @@ -0,0 +1,8 @@ + +http://www.gentoo.org/dtd/metadata.dtd";> + + +Matthias Coppens +coppens.matthias@gmail.com + + diff --git a/gui-apps/wdisplays/wdisplays-1.0.ebuild b/gui-apps/wdisplays/wdisplays-1.0.ebuild new file mode 100644 index 000..02f3aa3 --- /dev/null +++ b/gui-apps/wdisplays/wdisplays-1.0.ebuild @@ -0,0 +1,27 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +EGIT_REPO_URI="https://github.com/cyclopsian/${PN}"; +case "${PV}" in + "") + inherit git-r3 + ;; + *) + SRC_URI="${EGIT_REPO_URI}/archive/${PV}.tar.gz -> ${P}.tar.gz" +esac +inherit meson xdg + +DESCRIPTION="GUI display configurator for wlroots compositors" +HOMEPAGE="https://cyclopsian.github.io/${PN}"; + +BDEPEND=" + x11-libs/gtk+:3 + gui-libs/wlroots" +DEPEND="${BDEPEND}" + +LICENSE="GPL-3+" +SLOT="0" + +KEYWORDS="~amd64" diff --git a/gui-apps/wdisplays/wdisplays-.ebuild b/gui-apps/wdisplays/wdisplays-.ebuild new file mode 100644 index 000..88406d3 --- /dev/null +++ b/gui-apps/wdisplays/wdisplays-.ebuild @@ -0,0 +1,27 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +EGIT_REPO_URI="https://github.com/cyclopsian/${PN}"; +case "${PV}" in + "") + inherit git-r3 + ;; + *) + SRC_URI="${EGIT_REPO_URI}/archive/${PV}.tar.gz -> ${P}.tar.gz" +esac +inherit meson xdg + +DESCRIPTION="GUI display configurator for wlroots compositors" +HOMEPAGE="https://cyclopsian.github.io/${PN}"; + +BDEPEND=" + x11-libs/gtk+:3 + gui-libs/wlroots" +DEPEND="${BDEPEND}" + +LICENSE="GPL-3+" +SLOT="0" + +KEYWORDS=""