* [gentoo-commits] repo/gentoo:master commit in: xfce-base/xfce4-session/files/, xfce-base/xfce4-session/
@ 2019-12-06 14:20 Michał Górny
0 siblings, 0 replies; 2+ messages in thread
From: Michał Górny @ 2019-12-06 14:20 UTC (permalink / raw
To: gentoo-commits
commit: d83168fcab3aaf6ef9041135a1d24ae50b707e8e
Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Fri Dec 6 12:34:10 2019 +0000
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Fri Dec 6 14:19:48 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d83168fc
xfce-base/xfce4-session: Remove redundant version
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>
xfce-base/xfce4-session/Manifest | 1 -
...on-4.12.1-light-locker_support_to_xflock4.patch | 17 -----
.../xfce4-session/xfce4-session-4.12.1-r2.ebuild | 78 ----------------------
3 files changed, 96 deletions(-)
diff --git a/xfce-base/xfce4-session/Manifest b/xfce-base/xfce4-session/Manifest
index 95f0da8a358..3fd800cd30a 100644
--- a/xfce-base/xfce4-session/Manifest
+++ b/xfce-base/xfce4-session/Manifest
@@ -1,2 +1 @@
-DIST xfce4-session-4.12.1.tar.bz2 1289284 BLAKE2B 00af274ac1160a413c9e2c8b308dfc84248f0078e8c294528614bb642988468f9dadaae906b4a8e2179d2beef0a48ebf5e2eedcb2ed3ad7ea73a8f7a9b90e224 SHA512 d7f37dbff59acb316965ab2224674ac3b5b7cfd7262acd4426b582001cee313945acb8883be21553dd6d7a046934bbbe116f451e6d5fd35b6fa5444da94605df
DIST xfce4-session-4.14.0.tar.bz2 826950 BLAKE2B 164fd9f61f03a61e705abf1f7ab82e81eccbd5269d28d66f6da7234ba073d38a1b38d1be0ddb5f3c055e829adf12673611a2b0ea0585f9fd1d2806b17cf0e761 SHA512 fba79ef9727d47514c5e4223376c49057b714f9be9bda6031a1220f4840abb257d31517252180c0af2e7cd6969bbc4e6f525b00cac594e1a3b80f09f3f2335cb
diff --git a/xfce-base/xfce4-session/files/xfce4-session-4.12.1-light-locker_support_to_xflock4.patch b/xfce-base/xfce4-session/files/xfce4-session-4.12.1-light-locker_support_to_xflock4.patch
deleted file mode 100644
index aac01cfbe9b..00000000000
--- a/xfce-base/xfce4-session/files/xfce4-session-4.12.1-light-locker_support_to_xflock4.patch
+++ /dev/null
@@ -1,17 +0,0 @@
---- a/scripts/xflock4 2016-02-02 10:40:15.726495183 -0700
-+++ b/scripts/xflock4 2016-02-02 10:43:17.548061336 -0700
-@@ -24,10 +24,12 @@
- PATH=/bin:/usr/bin
- export PATH
-
--# Lock by xscreensaver or gnome-screensaver, if a respective daemon is running
-+# Lock by xscreensaver, gnome-screensaver or light-locker, if a respective
-+# daemon is running
- for lock_cmd in \
- "xscreensaver-command -lock" \
-- "gnome-screensaver-command --lock"
-+ "gnome-screensaver-command --lock" \
-+ "light-locker-command --lock"
- do
- $lock_cmd >/dev/null 2>&1 && exit
- done
diff --git a/xfce-base/xfce4-session/xfce4-session-4.12.1-r2.ebuild b/xfce-base/xfce4-session/xfce4-session-4.12.1-r2.ebuild
deleted file mode 100644
index 5c7c886d64e..00000000000
--- a/xfce-base/xfce4-session/xfce4-session-4.12.1-r2.ebuild
+++ /dev/null
@@ -1,78 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit gnome2-utils
-
-DESCRIPTION="A session manager for the Xfce desktop environment"
-HOMEPAGE="https://docs.xfce.org/xfce/xfce4-session/start"
-SRC_URI="https://archive.xfce.org/src/xfce/${PN}/${PV%.*}/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~x86-solaris"
-IUSE="elogind nls policykit systemd upower +xscreensaver"
-
-COMMON_DEPEND=">=dev-libs/dbus-glib-0.100:=
- x11-apps/iceauth
- x11-libs/libSM:=
- >=x11-libs/libwnck-2.30:1=
- x11-libs/libX11:=
- >=xfce-base/libxfce4util-4.11:=
- >=xfce-base/libxfce4ui-4.12.1:=
- >=xfce-base/xfconf-4.10:=
- policykit? ( >=sys-auth/polkit-0.102:= )
- upower? ( >=sys-power/upower-0.9.23 )"
-RDEPEND="${COMMON_DEPEND}
- x11-apps/xrdb
- nls? ( x11-misc/xdg-user-dirs )
- !systemd? ( upower? ( sys-power/pm-utils ) )
- xscreensaver? ( || (
- >=x11-misc/xscreensaver-5.26
- x11-misc/light-locker
- >=x11-misc/xlockmore-5.43
- x11-misc/slock
- x11-misc/alock[pam]
- ) )"
-DEPEND="${COMMON_DEPEND}
- dev-util/intltool
- sys-devel/gettext
- virtual/pkgconfig"
-
-REQUIRED_USE="elogind? ( policykit )
- systemd? ( policykit )"
-
-PATCHES=(
- "${FILESDIR}"/${PN}-4.10.1-alock_support_to_xflock4.patch
- "${FILESDIR}"/${PN}-4.12.1-light-locker_support_to_xflock4.patch
-)
-
-src_configure() {
- local myconf=(
- $(use_enable policykit polkit)
- --with-xsession-prefix="${EPREFIX}"/usr
- )
- use upower && myconf+=( --enable-upower )
-
- econf "${myconf[@]}"
-}
-
-src_install() {
- default
- find "${ED}" -name '*.la' -delete || die
-
- local sessiondir=/etc/X11/Sessions
- echo startxfce4 > "${T}"/Xfce4 || die
- exeinto ${sessiondir}
- doexe "${T}"/Xfce4
- dosym Xfce4 ${sessiondir}/Xfce
-}
-
-pkg_postinst() {
- gnome2_icon_cache_update
-}
-
-pkg_postrm() {
- gnome2_icon_cache_update
-}
^ permalink raw reply related [flat|nested] 2+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: xfce-base/xfce4-session/files/, xfce-base/xfce4-session/
@ 2023-03-17 10:50 Michał Górny
0 siblings, 0 replies; 2+ messages in thread
From: Michał Górny @ 2023-03-17 10:50 UTC (permalink / raw
To: gentoo-commits
commit: 737abb404f372b9ad7c28e3e8b6ec261f7df4f56
Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Fri Mar 17 10:47:32 2023 +0000
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Fri Mar 17 10:50:16 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=737abb40
xfce-base/xfce4-session: Remove old
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>
xfce-base/xfce4-session/Manifest | 2 -
...4-session-4.10.1-alock_support_to_xflock4.patch | 15 -----
.../xfce4-session/xfce4-session-4.16.0.ebuild | 76 ---------------------
.../xfce4-session/xfce4-session-4.17.2.ebuild | 77 ----------------------
4 files changed, 170 deletions(-)
diff --git a/xfce-base/xfce4-session/Manifest b/xfce-base/xfce4-session/Manifest
index 778a263eb7dc..ff7fea36668d 100644
--- a/xfce-base/xfce4-session/Manifest
+++ b/xfce-base/xfce4-session/Manifest
@@ -1,4 +1,2 @@
-DIST xfce4-session-4.16.0.tar.bz2 875504 BLAKE2B 8e06e1ff378593b90c3c600bd5aabb3ea9ba9e58854ed615d39009595be4b71c5f77359e4249a93f44aa67795e2d4bf658b83d9c1d445304764eee655ed1f9e9 SHA512 fd74b24d0c2762b5a99883b62ca9447c3683e42e9e39193d0f60e02b8c1ad77a3dfff4df6f3b3c345d8ea3d4c4ef93485e9b5586862bab85d4b37110d3400fad
-DIST xfce4-session-4.17.2.tar.bz2 852648 BLAKE2B be74ee215d687b2f01c39e73ece464544cfa7acfb687c1d6cf1d585f53be3cbc96f22271d5b6d35e572667370fc9a6f928878d5cb98c6b7dad53845e54a55ca2 SHA512 dab9b155f1e0368680a2e8429394baef2e2f4890cf7aa0cc4d7d0a01df8cee4605848b9aaae5073d9fa13df8f9a08a5f2311c834590f9d3c3909d17d446b123c
DIST xfce4-session-4.18.0.tar.bz2 853627 BLAKE2B e2a4d2dfcdab677b738d2fc3857bb7db07a0918af5bd4977e0f04210d52d4fc94551187b0ff2e3b5289823aeba0e12dc00344043da0fed2b3b2207afda423731 SHA512 00fcae02004675a26e6d73998403cf0e3a36dfd3596315ee98567d302a10c344cc1b64dac782e02416f11f6db3c730792e8de7d2d0ea1a6e0f2b2b7dbee74f4c
DIST xfce4-session-4.18.1.tar.bz2 872771 BLAKE2B e9c0b972e1dc2b324d15c17dd317f151d7d4d169533752222f8347be36c1d070f888993be8ef8f590fda5632f66c5a6c973ed91dd95afe06418656c8ec129d54 SHA512 6e6a55138380b6e7ce98508f4d3a52a596882b2f244a1ebd0d1a4b7dd1814c93e6e27453b500cb9178889790f067e28c7c4479b39963511d8e579831a44ef973
diff --git a/xfce-base/xfce4-session/files/xfce4-session-4.10.1-alock_support_to_xflock4.patch b/xfce-base/xfce4-session/files/xfce4-session-4.10.1-alock_support_to_xflock4.patch
deleted file mode 100644
index 0582ecd020a3..000000000000
--- a/xfce-base/xfce4-session/files/xfce4-session-4.10.1-alock_support_to_xflock4.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-http://bugs.gentoo.org/501370
-http://bugzilla.xfce.org/show_bug.cgi?id=10679
-
---- a/scripts/xflock4
-+++ b/scripts/xflock4
-@@ -35,7 +35,8 @@
- # else run another access locking utility, if installed
- for lock_cmd in \
- "xlock -mode blank" \
-- "slock"
-+ "slock" \
-+ "alock -bg blank -auth pam"
- do
- set -- $lock_cmd
- if command -v -- $1 >/dev/null 2>&1; then
diff --git a/xfce-base/xfce4-session/xfce4-session-4.16.0.ebuild b/xfce-base/xfce4-session/xfce4-session-4.16.0.ebuild
deleted file mode 100644
index 81dfb2da9544..000000000000
--- a/xfce-base/xfce4-session/xfce4-session-4.16.0.ebuild
+++ /dev/null
@@ -1,76 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit xdg-utils
-
-DESCRIPTION="A session manager for the Xfce desktop environment"
-HOMEPAGE="https://docs.xfce.org/xfce/xfce4-session/start"
-SRC_URI="https://archive.xfce.org/src/xfce/${PN}/${PV%.*}/${P}.tar.bz2"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux"
-IUSE="nls policykit +xscreensaver"
-
-DEPEND=">=dev-libs/glib-2.50
- >=x11-libs/gtk+-3.22:3
- x11-libs/libSM
- x11-libs/libwnck:3
- x11-libs/libX11
- >=xfce-base/libxfce4util-4.15.2:=
- >=xfce-base/libxfce4ui-4.15.1:=
- >=xfce-base/xfconf-4.12:=
- policykit? ( >=sys-auth/polkit-0.102 )"
-RDEPEND="${DEPEND}
- x11-apps/iceauth
- x11-apps/xrdb
- nls? ( x11-misc/xdg-user-dirs )
- xscreensaver? ( || (
- xfce-extra/xfce4-screensaver
- >=x11-misc/xscreensaver-5.26
- >=x11-misc/xlockmore-5.43
- x11-misc/slock
- x11-misc/alock[pam]
- ) )"
-BDEPEND="
- dev-util/intltool
- sys-devel/gettext
- virtual/pkgconfig"
-
-PATCHES=(
- "${FILESDIR}"/${PN}-4.10.1-alock_support_to_xflock4.patch
-# TODO: this patch needs updating for the new version, and finding
-# upstream bug.
-# "${FILESDIR}"/${PN}-4.12.1-light-locker_support_to_xflock4.patch
-)
-
-src_configure() {
- local myconf=(
- $(use_enable policykit polkit)
- --with-xsession-prefix="${EPREFIX}"/usr
- ICEAUTH="${EPREFIX}"/usr/bin/iceauth
- )
-
- econf "${myconf[@]}"
-}
-
-src_install() {
- default
- find "${ED}" -name '*.la' -delete || die
-
- local sessiondir=/etc/X11/Sessions
- echo startxfce4 > "${T}"/Xfce4 || die
- exeinto ${sessiondir}
- doexe "${T}"/Xfce4
- dosym Xfce4 ${sessiondir}/Xfce
-}
-
-pkg_postinst() {
- xdg_icon_cache_update
-}
-
-pkg_postrm() {
- xdg_icon_cache_update
-}
diff --git a/xfce-base/xfce4-session/xfce4-session-4.17.2.ebuild b/xfce-base/xfce4-session/xfce4-session-4.17.2.ebuild
deleted file mode 100644
index 62d5619295d1..000000000000
--- a/xfce-base/xfce4-session/xfce4-session-4.17.2.ebuild
+++ /dev/null
@@ -1,77 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit xdg-utils
-
-DESCRIPTION="A session manager for the Xfce desktop environment"
-HOMEPAGE="
- https://docs.xfce.org/xfce/xfce4-session/start
- https://gitlab.xfce.org/xfce/xfce4-session
-"
-SRC_URI="https://archive.xfce.org/src/xfce/${PN}/${PV%.*}/${P}.tar.bz2"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
-IUSE="nls policykit +xscreensaver"
-
-DEPEND="
- >=dev-libs/glib-2.50
- >=x11-libs/gtk+-3.22:3
- x11-libs/libSM
- x11-libs/libwnck:3
- x11-libs/libX11
- >=xfce-base/libxfce4util-4.15.2:=
- >=xfce-base/libxfce4ui-4.15.1:=
- >=xfce-base/xfconf-4.12:=
- policykit? ( >=sys-auth/polkit-0.102 )
-"
-RDEPEND="
- ${DEPEND}
- x11-apps/iceauth
- x11-apps/xrdb
- nls? ( x11-misc/xdg-user-dirs )
- xscreensaver? (
- || (
- xfce-extra/xfce4-screensaver
- >=x11-misc/xscreensaver-5.26
- x11-misc/light-locker
- )
- )
-"
-BDEPEND="
- dev-util/intltool
- sys-devel/gettext
- virtual/pkgconfig
-"
-
-src_configure() {
- local myconf=(
- $(use_enable policykit polkit)
- --with-xsession-prefix="${EPREFIX}"/usr
- ICEAUTH="${EPREFIX}"/usr/bin/iceauth
- )
-
- econf "${myconf[@]}"
-}
-
-src_install() {
- default
- find "${ED}" -name '*.la' -delete || die
-
- exeinto /etc/X11/Sessions
- newexe - Xfce4 <<-EOF
- startxfce4
- EOF
- dosym Xfce4 /etc/X11/Sessions/Xfce
-}
-
-pkg_postinst() {
- xdg_icon_cache_update
-}
-
-pkg_postrm() {
- xdg_icon_cache_update
-}
^ permalink raw reply related [flat|nested] 2+ messages in thread
end of thread, other threads:[~2023-03-17 10:50 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2019-12-06 14:20 [gentoo-commits] repo/gentoo:master commit in: xfce-base/xfce4-session/files/, xfce-base/xfce4-session/ Michał Górny
-- strict thread matches above, loose matches on Subject: below --
2023-03-17 10:50 Michał Górny
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox