diff options
Diffstat (limited to 'mate-base/caja')
-rw-r--r-- | mate-base/caja/Manifest | 7 | ||||
-rw-r--r-- | mate-base/caja/caja-1.22.1.ebuild | 4 | ||||
-rw-r--r-- | mate-base/caja/caja-1.22.3-r1.ebuild | 94 | ||||
-rw-r--r-- | mate-base/caja/caja-1.24.0.ebuild | 93 | ||||
-rw-r--r-- | mate-base/caja/files/caja-1.22.3-gcc-10-fno-common.patch | 100 |
5 files changed, 295 insertions, 3 deletions
diff --git a/mate-base/caja/Manifest b/mate-base/caja/Manifest index ad632ee8c56a..b0eaf98ff752 100644 --- a/mate-base/caja/Manifest +++ b/mate-base/caja/Manifest @@ -1,3 +1,8 @@ +AUX caja-1.22.3-gcc-10-fno-common.patch 3373 BLAKE2B 7e1b665c6f2a7816fe2f13fbe0dfc0670e9e5f1c695c8602f7c594a0174ca5f000dec088800992514ef8be1042c12b83011b54fbcb4a772c400047263c356cd8 SHA512 3522d44fd7a98c9a258fe32d06eb9ba7406e1a1e3e6528519b36c7761e980c2eb3782f2cb0d38eb722a75f75fa18c8c9e33e3e76d339124b598fbe544936cb55 DIST caja-1.22.1.tar.xz 3462248 BLAKE2B d9c7c643778678e9562e0a2b79d04ea13eddd58dce00820d78452d670438aaef2ac86cc7ce341437c1496094ee625f462d0654c53a26705e835a6c612549792f SHA512 dea2e9cac7802df5335a716a1a7df149b637014525202600f4bf3eab293eff29bf2df66df22203aa036898149cb26ba1d05491234dc75203480925cce0333a17 -EBUILD caja-1.22.1.ebuild 2020 BLAKE2B 9be3ce9b680dee4987806c2fbc739f7d4eb3f96c08c136553f144ed34a672a86344698fc55fc3f2cbc55b740fc84e1c6efbe6c432e9bfec6f5f22a183c3a1503 SHA512 f4e6ee1163f4de21623fc8de82d26a6ba19bda87ed5e93034358833f6812928c09db671dc8c8d0f2c400145cd08725bae4e705708ecc75e135b61c17aa362086 +DIST caja-1.22.3.tar.xz 3493232 BLAKE2B a47e94380e882b8fab16ef615dd8938063c77f7f5edfcae816fb4c3d9b84e261902dbb07a8d3ba40d32487df61050dfacc464e2b5510785748d0199a13c082f8 SHA512 9063bd0a9b6fd815f76cfefd9e87eed88588821376d0c46df9cd3ea1cada828bcee4f5f2ddb42be0178ab09a4519b34bded62cebf201dbde5dda1cf3bad95c22 +DIST caja-1.24.0.tar.xz 5221716 BLAKE2B 66d628ac0f50e2c388935420e29dfe15a8f5f127fd7b39e92ebbd67b6c929cda1a2dec1f510fb89890602adaef6a741f0ee3e15d27ab9741c5223c7966b3b908 SHA512 a68b23876cfa1171d5b1c75e4998c6b15f0ceebdc4fcaabb8d362e32e35b915b1a91a38648532ac8acc162dac50aeb4d07eff417ce2db7a8c50d68bd38a0b548 +EBUILD caja-1.22.1.ebuild 2014 BLAKE2B a027af499242963207478098091b4f8c0042828508175da62a5f7bfc0d4c3848efa99383f6f035218ba0e63d6490d81fbaf8a6b7ce22926f7c570fd1b9a1a144 SHA512 5a3fcf4bb8f1d38eb9960371244a5d55f88b6fd6b0b17e090ad830e097b46cf18315ca67c584cbd7adc3f41f166f3ac8bef159f01d9b1fa94b180df08d00dec7 +EBUILD caja-1.22.3-r1.ebuild 2073 BLAKE2B 9b801fe8ca56b5e032372cb6f06319e57258004a44abec8eeff219cfb9b401b4dd85035df73a479670ae714bf4e685f98e30364a637c2896eecd9e332da136d6 SHA512 d7063545ba95af905bf9a82855671f8654ce7918a49ff91be6fc656bcb9fdcf6befbc176db39de699f13fb1215932925552b8570d5cf5ddb6d437dc101b1b116 +EBUILD caja-1.24.0.ebuild 2052 BLAKE2B d3f84d9d29b973043f6e3eca2e6ce62aea6cc925e3522bd2211f5fdee9880e4758c3f932dc46478ec5486595491296cfb7ed7a0d89dc41c16277bc7389640176 SHA512 40e7c5c53859127332c928cdc21ed6d87f822e9bffc211366b8cbe657f36965e1ea99d30a548942219a7905cdfd03229b29314077749f08c23b3837e3bda1532 MISC metadata.xml 621 BLAKE2B a717b23dad86bcba48b97bec310d1dfb161a3c9ab051e84408f08409c45b1fad5fed38af6af2f75a54e3c29cf635ce5843d54af60a3ad22ed74fbafa0d8fab59 SHA512 95daee371a545e58bcf73daad3261589442121c6f6216d45fcb03e02e8e0d979d45527aa23d4252a60c25b6e9ff2b21d17f504724aaeae3ff97e745e23d963ca diff --git a/mate-base/caja/caja-1.22.1.ebuild b/mate-base/caja/caja-1.22.1.ebuild index 606cd126e0bb..008adb1b2ed2 100644 --- a/mate-base/caja/caja-1.22.1.ebuild +++ b/mate-base/caja/caja-1.22.1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -12,7 +12,7 @@ if [[ ${PV} != 9999 ]]; then fi DESCRIPTION="Caja file manager for the MATE desktop" -LICENSE="GPL-2 LGPL-2 FDL-1.1" +LICENSE="GPL-2+ LGPL-2+" SLOT="0" IUSE="+introspection +mate packagekit xmp" 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.24.0.ebuild b/mate-base/caja/caja-1.24.0.ebuild new file mode 100644 index 000000000000..78c7847c757b --- /dev/null +++ b/mate-base/caja/caja-1.24.0.ebuild @@ -0,0 +1,93 @@ +# 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" + +COMMON_DEPEND=" + dev-libs/atk + >=dev-libs/glib-2.58.1: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 + x11-libs/cairo + >=x11-libs/gdk-pixbuf-2.36.5: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 ) +" + +RDEPEND="${COMMON_DEPEND} + virtual/libintl + !!mate-base/mate-file-manager +" + +DEPEND="${COMMON_DEPEND} + >=dev-lang/perl-5:= + dev-util/gdbus-codegen + dev-util/glib-utils + dev-util/gtk-doc + dev-util/gtk-doc-am + >=sys-devel/gettext-0.19.8:* + 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 <robert.buj@gmail.com> +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 <gio/gio.h> + #include <math.h> + #include <stdio.h> +-#include <libcaja-private/caja-global-preferences.h> + + 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; + } |