1 |
commit: 55e4ad33378ad58c3dd34329670c7d0ff04e6880 |
2 |
Author: Pacho Ramos <pacho <AT> gentoo <DOT> org> |
3 |
AuthorDate: Fri Nov 15 20:14:57 2019 +0000 |
4 |
Commit: Pacho Ramos <pacho <AT> gentoo <DOT> org> |
5 |
CommitDate: Fri Nov 15 20:14:57 2019 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=55e4ad33 |
7 |
|
8 |
lxde-base/lxsession: Drop old |
9 |
|
10 |
Package-Manager: Portage-2.3.79, Repoman-2.3.18 |
11 |
Signed-off-by: Pacho Ramos <pacho <AT> gentoo.org> |
12 |
|
13 |
lxde-base/lxsession/Manifest | 1 - |
14 |
.../files/lxsession-0.5.2-key2-null.patch | 20 ------ |
15 |
lxde-base/lxsession/lxsession-0.5.2.ebuild | 72 ---------------------- |
16 |
lxde-base/lxsession/lxsession-0.5.4.ebuild | 63 ------------------- |
17 |
4 files changed, 156 deletions(-) |
18 |
|
19 |
diff --git a/lxde-base/lxsession/Manifest b/lxde-base/lxsession/Manifest |
20 |
index f640f1aba27..2c4208a6c52 100644 |
21 |
--- a/lxde-base/lxsession/Manifest |
22 |
+++ b/lxde-base/lxsession/Manifest |
23 |
@@ -1,2 +1 @@ |
24 |
-DIST lxsession-0.5.2.tar.xz 354092 BLAKE2B 3acbf1be74ed461d331ea8ed10e5c403057671d5f7f32c72951ba89681ad4b0b1a104c2962805738e5b414549e84db3e12327172ffe1b7c6f13a09e09c44fd0f SHA512 2e08e5263bb4ef9d8051e84997347a12d2f1ba75cf4e70f9e3ba783a509246f0d6efd672ac1cc1d0fffc8707710ddb148298449b5365deb6785623d596bc3da1 |
25 |
DIST lxsession-0.5.4.tar.xz 422756 BLAKE2B a04c67dbbb9da6405e165a05eb43d82f9d7ecc943147a8c5ab4fb5edf50b40b408db102ea1e96e142f61fcc2d1ead023685c33e1c26c09a4183882cfe9c5c930 SHA512 5b92d6e703ef692e3788554a3a34eca7bb4b7bb23d735af838c35bfaab142238eaeee3095176e5e4a7464468ab5478a596c670b0e2488f8599091f3e2fc8482b |
26 |
|
27 |
diff --git a/lxde-base/lxsession/files/lxsession-0.5.2-key2-null.patch b/lxde-base/lxsession/files/lxsession-0.5.2-key2-null.patch |
28 |
deleted file mode 100644 |
29 |
index 31c88a9caa6..00000000000 |
30 |
--- a/lxde-base/lxsession/files/lxsession-0.5.2-key2-null.patch |
31 |
+++ /dev/null |
32 |
@@ -1,20 +0,0 @@ |
33 |
---- lxsession-0.5.2/lxsession/settings.vala.key2 2014-10-18 01:54:57.000000000 +0900 |
34 |
-+++ lxsession-0.5.2/lxsession/settings.vala 2015-07-13 14:56:00.830117779 +0900 |
35 |
-@@ -56,7 +56,7 @@ namespace Lxsession |
36 |
- return return_map; |
37 |
- } |
38 |
- |
39 |
-- public void create_config_item (string categorie, string key1, string key2, string type, string? variable) |
40 |
-+ public void create_config_item (string categorie, string key1, string? key2, string type, string? variable) |
41 |
- { |
42 |
- /* only support string for now */ |
43 |
- string item_key = categorie + ";" + key1 + ";" + key2 + ";"; |
44 |
-@@ -71,7 +71,7 @@ namespace Lxsession |
45 |
- update_support_keys (categorie, key1, key2); |
46 |
- } |
47 |
- |
48 |
-- public void delete_config_item (string categorie, string key1, string key2, string type) |
49 |
-+ public void delete_config_item (string categorie, string key1, string? key2, string type) |
50 |
- { |
51 |
- /* only support string for now */ |
52 |
- string item_key = categorie + ";" + key1 + ";" + key2 + ";"; |
53 |
|
54 |
diff --git a/lxde-base/lxsession/lxsession-0.5.2.ebuild b/lxde-base/lxsession/lxsession-0.5.2.ebuild |
55 |
deleted file mode 100644 |
56 |
index 84ca13270d2..00000000000 |
57 |
--- a/lxde-base/lxsession/lxsession-0.5.2.ebuild |
58 |
+++ /dev/null |
59 |
@@ -1,72 +0,0 @@ |
60 |
-# Copyright 1999-2018 Gentoo Authors |
61 |
-# Distributed under the terms of the GNU General Public License v2 |
62 |
- |
63 |
-EAPI=6 |
64 |
-inherit vala autotools |
65 |
- |
66 |
-DESCRIPTION="LXDE session manager" |
67 |
-HOMEPAGE="https://wiki.lxde.org/en/LXSession" |
68 |
-SRC_URI="mirror://sourceforge/lxde/${P}.tar.xz" |
69 |
- |
70 |
-LICENSE="GPL-2" |
71 |
-KEYWORDS="~alpha amd64 arm ~arm64 ppc x86 ~x86-linux" |
72 |
-SLOT="0" |
73 |
- |
74 |
-# upower USE flag is enabled by default in the desktop profile |
75 |
-IUSE="nls upower" |
76 |
- |
77 |
-COMMON_DEPEND=" |
78 |
- dev-libs/glib:2 |
79 |
- dev-libs/dbus-glib |
80 |
- dev-libs/libgee:0 |
81 |
- dev-libs/libunique:1 |
82 |
- lxde-base/lxde-common |
83 |
- sys-auth/polkit |
84 |
- x11-libs/gtk+:2 |
85 |
- x11-libs/libX11 |
86 |
- sys-apps/dbus |
87 |
-" |
88 |
-RDEPEND="${COMMON_DEPEND} |
89 |
- !lxde-base/lxsession-edit |
90 |
- sys-apps/lsb-release |
91 |
- upower? ( sys-power/upower ) |
92 |
-" |
93 |
-DEPEND="${COMMON_DEPEND} |
94 |
- $(vala_depend) |
95 |
- dev-util/intltool |
96 |
- sys-devel/gettext |
97 |
- virtual/pkgconfig |
98 |
- x11-base/xorg-proto |
99 |
-" |
100 |
- |
101 |
-PATCHES=( |
102 |
- # Fedora patches |
103 |
- "${FILESDIR}"/${P}-reload.patch |
104 |
- "${FILESDIR}"/${P}-key2-null.patch |
105 |
- "${FILESDIR}"/${P}-notify-daemon-default.patch |
106 |
- "${FILESDIR}"/${P}-fix-invalid-memcpy.patch |
107 |
-) |
108 |
- |
109 |
-src_prepare() { |
110 |
- vala_src_prepare |
111 |
- |
112 |
- # Don't start in Xfce to avoid bugs like |
113 |
- # https://bugzilla.redhat.com/show_bug.cgi?id=616730 |
114 |
- sed -i 's/^NotShowIn=GNOME;KDE;/NotShowIn=GNOME;KDE;XFCE;/g' data/lxpolkit.desktop.in.in || die |
115 |
- |
116 |
- # fix icon in desktop file |
117 |
- # http://lxde.git.sourceforge.net/git/gitweb.cgi?p=lxde/lxsession-edit;a=commit;h=3789a96691eadac9b8f3bf3034a97645860bd138 |
118 |
- sed -i 's/^Icon=xfwm4/Icon=session-properties/g' data/lxsession-edit.desktop.in || die |
119 |
- |
120 |
- default |
121 |
- eautoreconf |
122 |
-} |
123 |
- |
124 |
-src_configure() { |
125 |
- # dbus is used for restart/shutdown (CK, logind?), and suspend/hibernate (UPower) |
126 |
- # gtk3 looks to not be ready, follow what other distributions are |
127 |
- # doing |
128 |
- econf \ |
129 |
- $(use_enable nls) \ |
130 |
- --disable-gtk3 |
131 |
-} |
132 |
|
133 |
diff --git a/lxde-base/lxsession/lxsession-0.5.4.ebuild b/lxde-base/lxsession/lxsession-0.5.4.ebuild |
134 |
deleted file mode 100644 |
135 |
index e9fb636e8f2..00000000000 |
136 |
--- a/lxde-base/lxsession/lxsession-0.5.4.ebuild |
137 |
+++ /dev/null |
138 |
@@ -1,63 +0,0 @@ |
139 |
-# Copyright 1999-2019 Gentoo Authors |
140 |
-# Distributed under the terms of the GNU General Public License v2 |
141 |
- |
142 |
-EAPI=7 |
143 |
-inherit vala autotools |
144 |
- |
145 |
-DESCRIPTION="LXDE session manager" |
146 |
-HOMEPAGE="https://wiki.lxde.org/en/LXSession" |
147 |
-SRC_URI="mirror://sourceforge/lxde/${P}.tar.xz" |
148 |
- |
149 |
-LICENSE="GPL-2" |
150 |
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ppc ~x86 ~x86-linux" |
151 |
-SLOT="0" |
152 |
- |
153 |
-# upower USE flag is enabled by default in the desktop profile |
154 |
-IUSE="nls upower" |
155 |
- |
156 |
-COMMON_DEPEND=" |
157 |
- dev-libs/glib:2 |
158 |
- dev-libs/dbus-glib |
159 |
- dev-libs/libgee:0 |
160 |
- dev-libs/libunique:1 |
161 |
- lxde-base/lxde-common |
162 |
- sys-auth/polkit |
163 |
- x11-libs/gtk+:2 |
164 |
- x11-libs/libX11 |
165 |
- sys-apps/dbus |
166 |
-" |
167 |
-RDEPEND="${COMMON_DEPEND} |
168 |
- !lxde-base/lxsession-edit |
169 |
- sys-apps/lsb-release |
170 |
- upower? ( sys-power/upower ) |
171 |
-" |
172 |
-DEPEND="${COMMON_DEPEND} |
173 |
- $(vala_depend) |
174 |
- dev-util/intltool |
175 |
- sys-devel/gettext |
176 |
- virtual/pkgconfig |
177 |
- x11-base/xorg-proto |
178 |
-" |
179 |
- |
180 |
-PATCHES=( |
181 |
- # Fedora patches |
182 |
- "${FILESDIR}"/${PN}-0.5.2-reload.patch |
183 |
- "${FILESDIR}"/${PN}-0.5.2-notify-daemon-default.patch |
184 |
- "${FILESDIR}"/${PN}-0.5.2-fix-invalid-memcpy.patch |
185 |
-) |
186 |
- |
187 |
-src_prepare() { |
188 |
- vala_src_prepare |
189 |
- |
190 |
- default |
191 |
- eautoreconf |
192 |
-} |
193 |
- |
194 |
-src_configure() { |
195 |
- # dbus is used for restart/shutdown (CK, logind?), and suspend/hibernate (UPower) |
196 |
- # gtk3 looks to not be ready, follow what other distributions are |
197 |
- # doing |
198 |
- econf \ |
199 |
- $(use_enable nls) \ |
200 |
- --disable-gtk3 |
201 |
-} |