Gentoo Archives: gentoo-commits

From: Adam Feldman <np-hardass@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: mate-base/caja/files/, mate-base/caja/
Date: Wed, 02 Sep 2020 06:02:18
Message-Id: 1599026514.dbaf31d330187336dd4866ef630afdd83b973299.np-hardass@gentoo
1 commit: dbaf31d330187336dd4866ef630afdd83b973299
2 Author: Oz N Tiram <oz.tiram <AT> gmail <DOT> com>
3 AuthorDate: Thu Aug 20 20:02:13 2020 +0000
4 Commit: Adam Feldman <np-hardass <AT> gentoo <DOT> org>
5 CommitDate: Wed Sep 2 06:01:54 2020 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dbaf31d3
7
8 mate-base/caja: drop 1.22.3-r1
9
10 Also, drop unused patches.
11
12 Package-Manager: Portage-2.3.103, Repoman-2.3.23
13 Signed-off-by: Oz Tiram <oz.tiram <AT> gmail.com>
14 Signed-off-by: Adam Feldman <NP-Hardass <AT> gentoo.org>
15
16 mate-base/caja/Manifest | 1 -
17 mate-base/caja/caja-1.22.3-r1.ebuild | 94 -------------------
18 .../caja/files/caja-1.22.3-gcc-10-fno-common.patch | 100 ---------------------
19 3 files changed, 195 deletions(-)
20
21 diff --git a/mate-base/caja/Manifest b/mate-base/caja/Manifest
22 index b2802f8ac3d..4f1ee85d03a 100644
23 --- a/mate-base/caja/Manifest
24 +++ b/mate-base/caja/Manifest
25 @@ -1,2 +1 @@
26 -DIST caja-1.22.3.tar.xz 3493232 BLAKE2B a47e94380e882b8fab16ef615dd8938063c77f7f5edfcae816fb4c3d9b84e261902dbb07a8d3ba40d32487df61050dfacc464e2b5510785748d0199a13c082f8 SHA512 9063bd0a9b6fd815f76cfefd9e87eed88588821376d0c46df9cd3ea1cada828bcee4f5f2ddb42be0178ab09a4519b34bded62cebf201dbde5dda1cf3bad95c22
27 DIST caja-1.24.0.tar.xz 5221716 BLAKE2B 66d628ac0f50e2c388935420e29dfe15a8f5f127fd7b39e92ebbd67b6c929cda1a2dec1f510fb89890602adaef6a741f0ee3e15d27ab9741c5223c7966b3b908 SHA512 a68b23876cfa1171d5b1c75e4998c6b15f0ceebdc4fcaabb8d362e32e35b915b1a91a38648532ac8acc162dac50aeb4d07eff417ce2db7a8c50d68bd38a0b548
28
29 diff --git a/mate-base/caja/caja-1.22.3-r1.ebuild b/mate-base/caja/caja-1.22.3-r1.ebuild
30 deleted file mode 100644
31 index bee9e5f807f..00000000000
32 --- a/mate-base/caja/caja-1.22.3-r1.ebuild
33 +++ /dev/null
34 @@ -1,94 +0,0 @@
35 -# Copyright 1999-2020 Gentoo Authors
36 -# Distributed under the terms of the GNU General Public License v2
37 -
38 -EAPI=6
39 -
40 -MATE_LA_PUNT="yes"
41 -
42 -inherit mate virtualx
43 -
44 -if [[ ${PV} != 9999 ]]; then
45 - KEYWORDS="amd64 ~arm ~arm64 x86"
46 -fi
47 -
48 -DESCRIPTION="Caja file manager for the MATE desktop"
49 -LICENSE="GPL-2+ LGPL-2+"
50 -SLOT="0"
51 -
52 -IUSE="+introspection +mate packagekit xmp"
53 -
54 -RDEPEND="
55 - dev-libs/atk
56 - >=dev-libs/glib-2.50:2
57 - >=dev-libs/libxml2-2.4.7:2
58 - gnome-base/dconf
59 - >=gnome-base/gvfs-1.10.1:0[udisks]
60 - >=mate-base/mate-desktop-1.17.3:0
61 - >=media-libs/libexif-0.6.14:0
62 - virtual/libintl
63 - x11-libs/cairo
64 - x11-libs/gdk-pixbuf:2
65 - >=x11-libs/gtk+-3.22:3[introspection?]
66 - >=x11-libs/libnotify-0.7.0:0
67 - x11-libs/libICE
68 - x11-libs/libSM
69 - x11-libs/libX11
70 - x11-libs/libXext
71 - x11-libs/libXft
72 - x11-libs/libXrender
73 - >=x11-libs/pango-1.1.2
74 - introspection? ( >=dev-libs/gobject-introspection-0.6.4:= )
75 - packagekit? ( app-admin/packagekit-base )
76 - xmp? ( >=media-libs/exempi-1.99.5:2 )
77 - !!mate-base/mate-file-manager"
78 -
79 -DEPEND="${RDEPEND}
80 - >=dev-lang/perl-5:=
81 - dev-util/gdbus-codegen
82 - dev-util/glib-utils
83 - dev-util/gtk-doc
84 - dev-util/gtk-doc-am
85 - >=dev-util/intltool-0.40.1
86 - sys-devel/gettext
87 - virtual/pkgconfig"
88 -
89 -PDEPEND="mate? ( >=x11-themes/mate-icon-theme-${MATE_BRANCH} )"
90 -
91 -# TODO: Test fails because Caja is not merged yet:
92 -# GLib-GIO-ERROR **: Settings schema 'org.mate.caja.preferences' is not installed
93 -RESTRICT="test"
94 -
95 -PATCHES=(
96 - "${FILESDIR}/${P}-gcc-10-fno-common.patch"
97 -)
98 -
99 -src_prepare() {
100 - # Remove unnecessary CFLAGS.
101 - sed -i -e 's:-DG.*DISABLE_DEPRECATED::g' \
102 - configure.ac eel/Makefile.am || die
103 -
104 - mate_src_prepare
105 -}
106 -
107 -src_configure() {
108 - mate_src_configure \
109 - --disable-update-mimedb \
110 - $(use_enable introspection) \
111 - $(use_enable packagekit) \
112 - $(use_enable xmp)
113 -}
114 -
115 -src_test() {
116 - unset SESSION_MANAGER
117 - unset DBUS_SESSION_BUS_ADDRESS
118 -
119 - Xemake check || die "Test phase failed"
120 -}
121 -
122 -pkg_postinst() {
123 - mate_pkg_postinst
124 -
125 - elog "Caja can use gstreamer to preview audio files. Just make sure"
126 - elog "to have the necessary plugins available to play the media type you"
127 - elog "want to preview."
128 -}
129
130 diff --git a/mate-base/caja/files/caja-1.22.3-gcc-10-fno-common.patch b/mate-base/caja/files/caja-1.22.3-gcc-10-fno-common.patch
131 deleted file mode 100644
132 index 41d0174e4d2..00000000000
133 --- a/mate-base/caja/files/caja-1.22.3-gcc-10-fno-common.patch
134 +++ /dev/null
135 @@ -1,100 +0,0 @@
136 -From 6bf49f348d8ce6debc8f645b667422bb9a261a2b Mon Sep 17 00:00:00 2001
137 -From: rbuj <robert.buj@×××××.com>
138 -Date: Thu, 30 Jan 2020 10:56:12 +0100
139 -Subject: [PATCH] Fix build using gcc 10 -fno-common flag
140 -
141 ----
142 - eel/eel-background.c | 6 ++++--
143 - libcaja-private/caja-global-preferences.c | 13 ++++++++++++
144 - libcaja-private/caja-global-preferences.h | 24 +++++++++++------------
145 - 3 files changed, 29 insertions(+), 14 deletions(-)
146 -
147 -diff --git a/libcaja-private/caja-global-preferences.c b/libcaja-private/caja-global-preferences.c
148 -index 2d3c3466c..2f1d90886 100644
149 ---- a/libcaja-private/caja-global-preferences.c
150 -+++ b/libcaja-private/caja-global-preferences.c
151 -@@ -35,6 +35,19 @@
152 - #include "caja-file-utilities.h"
153 - #include "caja-file.h"
154 -
155 -+GSettings *caja_preferences;
156 -+GSettings *caja_media_preferences;
157 -+GSettings *caja_window_state;
158 -+GSettings *caja_icon_view_preferences;
159 -+GSettings *caja_desktop_preferences;
160 -+GSettings *caja_tree_sidebar_preferences;
161 -+GSettings *caja_compact_view_preferences;
162 -+GSettings *caja_list_view_preferences;
163 -+GSettings *caja_extension_preferences;
164 -+
165 -+GSettings *mate_background_preferences;
166 -+GSettings *mate_lockdown_preferences;
167 -+
168 - /*
169 - * Public functions
170 - */
171 -diff --git a/libcaja-private/caja-global-preferences.h b/libcaja-private/caja-global-preferences.h
172 -index 2eec02b4a..832811574 100644
173 ---- a/libcaja-private/caja-global-preferences.h
174 -+++ b/libcaja-private/caja-global-preferences.h
175 -@@ -212,18 +212,18 @@ typedef enum
176 - void caja_global_preferences_init (void);
177 - char *caja_global_preferences_get_default_folder_viewer_preference_as_iid (void);
178 -
179 --GSettings *caja_preferences;
180 --GSettings *caja_media_preferences;
181 --GSettings *caja_window_state;
182 --GSettings *caja_icon_view_preferences;
183 --GSettings *caja_desktop_preferences;
184 --GSettings *caja_tree_sidebar_preferences;
185 --GSettings *caja_compact_view_preferences;
186 --GSettings *caja_list_view_preferences;
187 --GSettings *caja_extension_preferences;
188 --
189 --GSettings *mate_background_preferences;
190 --GSettings *mate_lockdown_preferences;
191 -+extern GSettings *caja_preferences;
192 -+extern GSettings *caja_media_preferences;
193 -+extern GSettings *caja_window_state;
194 -+extern GSettings *caja_icon_view_preferences;
195 -+extern GSettings *caja_desktop_preferences;
196 -+extern GSettings *caja_tree_sidebar_preferences;
197 -+extern GSettings *caja_compact_view_preferences;
198 -+extern GSettings *caja_list_view_preferences;
199 -+extern GSettings *caja_extension_preferences;
200 -+
201 -+extern GSettings *mate_background_preferences;
202 -+extern GSettings *mate_lockdown_preferences;
203 -
204 - G_END_DECLS
205 -
206 ---- a/eel/eel-background.c 2020-04-06 17:58:28.060044227 -0400
207 -+++ b/eel/eel-background.c 2020-04-06 18:01:18.246099978 -0400
208 -@@ -36,7 +36,6 @@
209 - #include <gio/gio.h>
210 - #include <math.h>
211 - #include <stdio.h>
212 --#include <libcaja-private/caja-global-preferences.h>
213 -
214 - enum
215 - {
216 -@@ -427,6 +426,7 @@
217 - static void
218 - init_fade (EelBackground *self)
219 - {
220 -+ GSettings *mate_background_preferences;
221 - GtkWidget *widget = self->details->widget;
222 - gboolean do_fade;
223 -
224 -@@ -434,8 +434,11 @@
225 - return;
226 - }
227 -
228 -+ mate_background_preferences = g_settings_new ("org.mate.background");
229 - do_fade = g_settings_get_boolean (mate_background_preferences,
230 - MATE_BG_KEY_BACKGROUND_FADE);
231 -+ g_object_unref (mate_background_preferences);
232 -+
233 - if (!do_fade) {
234 - return;
235 - }