From a305a50eb6bda3b594e8442dd4ec67866950a2d6 Mon Sep 17 00:00:00 2001 From: Adam Feldman Date: Mon, 6 Apr 2020 18:09:24 -0400 Subject: mate-base/caja: Fix #708644 Closes: https://bugs.gentoo.org/708644 Package-Manager: Portage-2.3.96, Repoman-2.3.21 Signed-off-by: Adam Feldman --- mate-base/caja/caja-1.22.3-r1.ebuild | 94 +++++++++++++++++++ mate-base/caja/caja-1.22.3.ebuild | 90 ------------------- .../caja/files/caja-1.22.3-gcc-10-fno-common.patch | 100 +++++++++++++++++++++ 3 files changed, 194 insertions(+), 90 deletions(-) create mode 100644 mate-base/caja/caja-1.22.3-r1.ebuild delete mode 100644 mate-base/caja/caja-1.22.3.ebuild create mode 100644 mate-base/caja/files/caja-1.22.3-gcc-10-fno-common.patch (limited to 'mate-base') diff --git a/mate-base/caja/caja-1.22.3-r1.ebuild b/mate-base/caja/caja-1.22.3-r1.ebuild new file mode 100644 index 000000000000..1167ca298cd1 --- /dev/null +++ b/mate-base/caja/caja-1.22.3-r1.ebuild @@ -0,0 +1,94 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +MATE_LA_PUNT="yes" + +inherit mate virtualx + +if [[ ${PV} != 9999 ]]; then + KEYWORDS="~amd64 ~arm ~arm64 ~x86" +fi + +DESCRIPTION="Caja file manager for the MATE desktop" +LICENSE="GPL-2+ LGPL-2+" +SLOT="0" + +IUSE="+introspection +mate packagekit xmp" + +RDEPEND=" + dev-libs/atk + >=dev-libs/glib-2.50:2 + >=dev-libs/libxml2-2.4.7:2 + gnome-base/dconf + >=gnome-base/gvfs-1.10.1:0[udisks] + >=mate-base/mate-desktop-1.17.3:0 + >=media-libs/libexif-0.6.14:0 + virtual/libintl + x11-libs/cairo + x11-libs/gdk-pixbuf:2 + >=x11-libs/gtk+-3.22:3[introspection?] + >=x11-libs/libnotify-0.7.0:0 + x11-libs/libICE + x11-libs/libSM + x11-libs/libX11 + x11-libs/libXext + x11-libs/libXft + x11-libs/libXrender + >=x11-libs/pango-1.1.2 + introspection? ( >=dev-libs/gobject-introspection-0.6.4:= ) + packagekit? ( app-admin/packagekit-base ) + xmp? ( >=media-libs/exempi-1.99.5:2 ) + !!mate-base/mate-file-manager" + +DEPEND="${RDEPEND} + >=dev-lang/perl-5:= + dev-util/gdbus-codegen + dev-util/glib-utils + dev-util/gtk-doc + dev-util/gtk-doc-am + >=dev-util/intltool-0.40.1 + sys-devel/gettext + virtual/pkgconfig" + +PDEPEND="mate? ( >=x11-themes/mate-icon-theme-${MATE_BRANCH} )" + +# TODO: Test fails because Caja is not merged yet: +# GLib-GIO-ERROR **: Settings schema 'org.mate.caja.preferences' is not installed +RESTRICT="test" + +PATCHES=( + "${FILESDIR}/${P}-gcc-10-fno-common.patch" +) + +src_prepare() { + # Remove unnecessary CFLAGS. + sed -i -e 's:-DG.*DISABLE_DEPRECATED::g' \ + configure.ac eel/Makefile.am || die + + mate_src_prepare +} + +src_configure() { + mate_src_configure \ + --disable-update-mimedb \ + $(use_enable introspection) \ + $(use_enable packagekit) \ + $(use_enable xmp) +} + +src_test() { + unset SESSION_MANAGER + unset DBUS_SESSION_BUS_ADDRESS + + Xemake check || die "Test phase failed" +} + +pkg_postinst() { + mate_pkg_postinst + + elog "Caja can use gstreamer to preview audio files. Just make sure" + elog "to have the necessary plugins available to play the media type you" + elog "want to preview." +} diff --git a/mate-base/caja/caja-1.22.3.ebuild b/mate-base/caja/caja-1.22.3.ebuild deleted file mode 100644 index 9f8692d776cb..000000000000 --- a/mate-base/caja/caja-1.22.3.ebuild +++ /dev/null @@ -1,90 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -MATE_LA_PUNT="yes" - -inherit mate virtualx - -if [[ ${PV} != 9999 ]]; then - KEYWORDS="~amd64 ~arm ~arm64 ~x86" -fi - -DESCRIPTION="Caja file manager for the MATE desktop" -LICENSE="GPL-2+ LGPL-2+" -SLOT="0" - -IUSE="+introspection +mate packagekit xmp" - -RDEPEND=" - dev-libs/atk - >=dev-libs/glib-2.50:2 - >=dev-libs/libxml2-2.4.7:2 - gnome-base/dconf - >=gnome-base/gvfs-1.10.1:0[udisks] - >=mate-base/mate-desktop-1.17.3:0 - >=media-libs/libexif-0.6.14:0 - virtual/libintl - x11-libs/cairo - x11-libs/gdk-pixbuf:2 - >=x11-libs/gtk+-3.22:3[introspection?] - >=x11-libs/libnotify-0.7.0:0 - x11-libs/libICE - x11-libs/libSM - x11-libs/libX11 - x11-libs/libXext - x11-libs/libXft - x11-libs/libXrender - >=x11-libs/pango-1.1.2 - introspection? ( >=dev-libs/gobject-introspection-0.6.4:= ) - packagekit? ( app-admin/packagekit-base ) - xmp? ( >=media-libs/exempi-1.99.5:2 ) - !!mate-base/mate-file-manager" - -DEPEND="${RDEPEND} - >=dev-lang/perl-5:= - dev-util/gdbus-codegen - dev-util/glib-utils - dev-util/gtk-doc - dev-util/gtk-doc-am - >=dev-util/intltool-0.40.1 - sys-devel/gettext - virtual/pkgconfig" - -PDEPEND="mate? ( >=x11-themes/mate-icon-theme-${MATE_BRANCH} )" - -# TODO: Test fails because Caja is not merged yet: -# GLib-GIO-ERROR **: Settings schema 'org.mate.caja.preferences' is not installed -RESTRICT="test" - -src_prepare() { - # Remove unnecessary CFLAGS. - sed -i -e 's:-DG.*DISABLE_DEPRECATED::g' \ - configure.ac eel/Makefile.am || die - - mate_src_prepare -} - -src_configure() { - mate_src_configure \ - --disable-update-mimedb \ - $(use_enable introspection) \ - $(use_enable packagekit) \ - $(use_enable xmp) -} - -src_test() { - unset SESSION_MANAGER - unset DBUS_SESSION_BUS_ADDRESS - - Xemake check || die "Test phase failed" -} - -pkg_postinst() { - mate_pkg_postinst - - elog "Caja can use gstreamer to preview audio files. Just make sure" - elog "to have the necessary plugins available to play the media type you" - elog "want to preview." -} 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 new file mode 100644 index 000000000000..41d0174e4d21 --- /dev/null +++ b/mate-base/caja/files/caja-1.22.3-gcc-10-fno-common.patch @@ -0,0 +1,100 @@ +From 6bf49f348d8ce6debc8f645b667422bb9a261a2b Mon Sep 17 00:00:00 2001 +From: rbuj +Date: Thu, 30 Jan 2020 10:56:12 +0100 +Subject: [PATCH] Fix build using gcc 10 -fno-common flag + +--- + eel/eel-background.c | 6 ++++-- + libcaja-private/caja-global-preferences.c | 13 ++++++++++++ + libcaja-private/caja-global-preferences.h | 24 +++++++++++------------ + 3 files changed, 29 insertions(+), 14 deletions(-) + +diff --git a/libcaja-private/caja-global-preferences.c b/libcaja-private/caja-global-preferences.c +index 2d3c3466c..2f1d90886 100644 +--- a/libcaja-private/caja-global-preferences.c ++++ b/libcaja-private/caja-global-preferences.c +@@ -35,6 +35,19 @@ + #include "caja-file-utilities.h" + #include "caja-file.h" + ++GSettings *caja_preferences; ++GSettings *caja_media_preferences; ++GSettings *caja_window_state; ++GSettings *caja_icon_view_preferences; ++GSettings *caja_desktop_preferences; ++GSettings *caja_tree_sidebar_preferences; ++GSettings *caja_compact_view_preferences; ++GSettings *caja_list_view_preferences; ++GSettings *caja_extension_preferences; ++ ++GSettings *mate_background_preferences; ++GSettings *mate_lockdown_preferences; ++ + /* + * Public functions + */ +diff --git a/libcaja-private/caja-global-preferences.h b/libcaja-private/caja-global-preferences.h +index 2eec02b4a..832811574 100644 +--- a/libcaja-private/caja-global-preferences.h ++++ b/libcaja-private/caja-global-preferences.h +@@ -212,18 +212,18 @@ typedef enum + void caja_global_preferences_init (void); + char *caja_global_preferences_get_default_folder_viewer_preference_as_iid (void); + +-GSettings *caja_preferences; +-GSettings *caja_media_preferences; +-GSettings *caja_window_state; +-GSettings *caja_icon_view_preferences; +-GSettings *caja_desktop_preferences; +-GSettings *caja_tree_sidebar_preferences; +-GSettings *caja_compact_view_preferences; +-GSettings *caja_list_view_preferences; +-GSettings *caja_extension_preferences; +- +-GSettings *mate_background_preferences; +-GSettings *mate_lockdown_preferences; ++extern GSettings *caja_preferences; ++extern GSettings *caja_media_preferences; ++extern GSettings *caja_window_state; ++extern GSettings *caja_icon_view_preferences; ++extern GSettings *caja_desktop_preferences; ++extern GSettings *caja_tree_sidebar_preferences; ++extern GSettings *caja_compact_view_preferences; ++extern GSettings *caja_list_view_preferences; ++extern GSettings *caja_extension_preferences; ++ ++extern GSettings *mate_background_preferences; ++extern GSettings *mate_lockdown_preferences; + + G_END_DECLS + +--- a/eel/eel-background.c 2020-04-06 17:58:28.060044227 -0400 ++++ b/eel/eel-background.c 2020-04-06 18:01:18.246099978 -0400 +@@ -36,7 +36,6 @@ + #include + #include + #include +-#include + + enum + { +@@ -427,6 +426,7 @@ + static void + init_fade (EelBackground *self) + { ++ GSettings *mate_background_preferences; + GtkWidget *widget = self->details->widget; + gboolean do_fade; + +@@ -434,8 +434,11 @@ + return; + } + ++ mate_background_preferences = g_settings_new ("org.mate.background"); + do_fade = g_settings_get_boolean (mate_background_preferences, + MATE_BG_KEY_BACKGROUND_FADE); ++ g_object_unref (mate_background_preferences); ++ + if (!do_fade) { + return; + } -- cgit v1.2.3