diff --git a/0001-add-open-terminal-when-clicking-right-key-in-desktop.patch b/0001-add-open-terminal-when-clicking-right-key-in-desktop.patch new file mode 100644 index 0000000000000000000000000000000000000000..e3d4f7e89915139f4f729f5555878caf6f6012ea --- /dev/null +++ b/0001-add-open-terminal-when-clicking-right-key-in-desktop.patch @@ -0,0 +1,85 @@ +From 44ba536ad0b22b3f89799e99edcecbf9f84820d4 Mon Sep 17 00:00:00 2001 +From: root +Date: Tue, 17 Mar 2020 14:38:42 +0800 +Subject: [PATCH] add open terminal when clicking right key in desktop + +--- + po/zh_CN.po | 5 ++++ + .../caja-desktop-icon-view-ui.xml | 1 + + src/file-manager/fm-desktop-icon-view.c | 25 +++++++++++++++++++ + 3 files changed, 31 insertions(+) + +diff --git a/po/zh_CN.po b/po/zh_CN.po +index 38cd51a..7f20991 100644 +--- a/po/zh_CN.po ++++ b/po/zh_CN.po +@@ -3696,6 +3696,11 @@ msgstr "创建新启动器" + msgid "Change Desktop _Background" + msgstr "更改桌面背景(_B)" + ++#. label, accelerator ++#: ../src/file-manager/fm-desktop-icon-view.c:778 ++msgid "Open Terminal..." ++msgstr "打开终端" ++ + #. tooltip + #: ../src/file-manager/fm-desktop-icon-view.c:774 + msgid "" +diff --git a/src/file-manager/caja-desktop-icon-view-ui.xml b/src/file-manager/caja-desktop-icon-view-ui.xml +index d437801..5654e4c 100644 +--- a/src/file-manager/caja-desktop-icon-view-ui.xml ++++ b/src/file-manager/caja-desktop-icon-view-ui.xml +@@ -9,6 +9,7 @@ + + + ++ + + + +diff --git a/src/file-manager/fm-desktop-icon-view.c b/src/file-manager/fm-desktop-icon-view.c +index 9205edc..fba954d 100644 +--- a/src/file-manager/fm-desktop-icon-view.c ++++ b/src/file-manager/fm-desktop-icon-view.c +@@ -652,6 +652,22 @@ action_new_launcher_callback (GtkAction *action, gpointer data) + + } + ++action_open_terminal_callback (GtkAction *action, gpointer data) ++{ ++ char *desktop_directory; ++ ++ g_assert (FM_DIRECTORY_VIEW (data)); ++ ++ desktop_directory = caja_get_desktop_directory (); ++ ++ caja_launch_application_from_command (gtk_widget_get_screen (GTK_WIDGET (data)), ++ "Mate Terminal", ++ "mate-terminal", ++ FALSE, ++ NULL, desktop_directory, NULL); ++ g_free (desktop_directory); ++ ++} + static void + action_change_background_callback (GtkAction *action, + gpointer data) +@@ -756,6 +772,15 @@ static const GtkActionEntry desktop_view_entries[] = + G_CALLBACK (action_new_launcher_callback) + }, + /* name, stock id */ ++ { ++ "Open Terminal", NULL, ++ /* label, accelerator */ ++ N_("Open Terminal..."), NULL, ++ /* tooltip */ ++ N_("Mate Terminal"), ++ G_CALLBACK (action_open_terminal_callback) ++ }, ++ /* name, stock id */ + { + "Change Background", NULL, + /* label, accelerator */ +-- +2.23.0 + diff --git a/0001-caja-po-translation.patch b/0001-caja-po-translation.patch new file mode 100644 index 0000000000000000000000000000000000000000..4f57f88838b81aad1609a74be266b200edafb2a9 --- /dev/null +++ b/0001-caja-po-translation.patch @@ -0,0 +1,25 @@ +From 3862f8a7eb8acc4d9ca565967f8723c27f02f6eb Mon Sep 17 00:00:00 2001 +From: root +Date: Tue, 17 Dec 2019 17:33:21 +0800 +Subject: [PATCH] caja-po-translation + +--- + po/zh_CN.po | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/po/zh_CN.po b/po/zh_CN.po +index 36f4a37..38cd51a 100644 +--- a/po/zh_CN.po ++++ b/po/zh_CN.po +@@ -329,7 +329,7 @@ msgstr "自动运行提示" + #: ../data/caja-folder-handler.desktop.in.h:1 ../src/caja-spatial-window.c:396 + #: ../src/caja-window-menus.c:557 ../src/caja-window.c:164 + msgid "Caja" +-msgstr "Caja" ++msgstr "文件管理器" + + #: ../data/caja-browser.desktop.in.h:2 + msgid "File Browser" +-- +2.23.0 + diff --git a/caja-1.22.2.tar.xz b/caja-1.22.2.tar.xz new file mode 100644 index 0000000000000000000000000000000000000000..dbb5762085551b8c49176ef3ca5c1924296d8fc8 Binary files /dev/null and b/caja-1.22.2.tar.xz differ diff --git a/caja.spec b/caja.spec new file mode 100644 index 0000000000000000000000000000000000000000..204e671ce69dc75245bd7a9b346a45a9a2101085 --- /dev/null +++ b/caja.spec @@ -0,0 +1,695 @@ +# Conditional for release and snapshot builds. Uncomment for release-builds. +%global rel_build 1 + +# This is needed, because src-url contains branched part of versioning-scheme. +%global branch 1.22 + +# Settings used for build from snapshots. +%{!?rel_build:%global commit ee0a62c8759040d84055425954de1f860bac8652} +%{!?rel_build:%global commit_date 20140223} +%{!?rel_build:%global shortcommit %(c=%{commit};echo ${c:0:7})} +%{!?rel_build:%global git_ver git%{commit_date}-%{shortcommit}} +%{!?rel_build:%global git_rel .git%{commit_date}.%{shortcommit}} +%{!?rel_build:%global git_tar %{name}-%{version}-%{git_ver}.tar.xz} + +Name: caja +Summary: File manager for MATE +Version: %{branch}.2 +%if 0%{?rel_build} +Release: 4%{?dist} +%else +Release: 0.11%{?git_rel}%{?dist} +%endif +License: GPLv2+ and LGPLv2+ +URL: http://mate-desktop.org + +# for downloading the tarball use 'spectool -g -R caja.spec' +# Source for release-builds. +%{?rel_build:Source0: http://pub.mate-desktop.org/releases/%{branch}/%{name}-%{version}.tar.xz} +# Source for snapshot-builds. +%{!?rel_build:Source0: http://git.mate-desktop.org/%{name}/snapshot/%{name}-%{commit}.tar.xz#/%{git_tar}} + +Patch1: caja_add-xfce-to-desktop-file-1.22.patch +# https://github.com/mate-desktop/caja/commit/ea81a5 +Patch2: caja_0001-canvas-item-Don-t-hyphenate-filenames-1.22.patch + +Patch3: 0001-caja-po-translation.patch + +Patch4: 0001-add-open-terminal-when-clicking-right-key-in-desktop.patch + +BuildRequires: dbus-glib-devel +BuildRequires: desktop-file-utils +BuildRequires: exempi-devel +BuildRequires: gobject-introspection-devel +BuildRequires: cairo-gobject-devel +BuildRequires: libexif-devel +BuildRequires: libselinux-devel +BuildRequires: libSM-devel +BuildRequires: libxml2-devel +BuildRequires: mate-common +BuildRequires: mate-desktop-devel +BuildRequires: pangox-compat-devel +BuildRequires: startup-notification-devel +BuildRequires: libnotify-devel + +Requires: gamin +Requires: filesystem +Requires: isoft-menus +Requires: gvfs + +# the main binary links against libcaja-extension.so +# don't depend on soname, rather on exact version +Requires: %{name}-extensions-common + +# needed for using mate-text-editor as stanalone in another DE +Requires: %{name}-schemas%{?_isa} = %{version}-%{release} + +%description +Caja (mate-file-manager) is the file manager and graphical shell +for the MATE desktop, +that makes it easy to manage your files and the rest of your system. +It allows to browse directories on local and remote file systems, preview +files and launch applications associated with them. +It is also responsible for handling the icons on the MATE desktop. + +%package core-extensions +Summary: Mate-file-manager extensions library +Requires: %{name}%{?_isa} = %{version}-%{release} +%if (0%{?fedora} >= 28 && 0%{?fedora} <= 32) +Provides: %{name}-extensions = %{version}-%{release} +Provides: %{name}-extensions%{?_isa} = %{version}-%{release} +Obsoletes: %{name}-extensions < 1.20.2-2 +%endif + +%description core-extensions +This package provides the libraries used by caja extensions. + +# needed for using mate-text-editor (pluma) as stanalone in another DE +%package schemas +Summary: Mate-file-manager schemas +License: LGPLv2+ + +%description schemas +This package provides the gsettings schemas for caja. + +%package devel +Summary: Support for developing mate-file-manager extensions +Requires: %{name}%{?_isa} = %{version}-%{release} + +%description devel +This package provides libraries and header files needed +for developing caja extensions. + + +%prep +%if 0%{?rel_build} +%autosetup -p1 +%else +%autosetup -n %{name}-%{commit} -p1 +%endif + +# disable startup notification +sed -i s/StartupNotify=true/StartupNotify=false/g data/caja-computer.desktop.in +sed -i s/StartupNotify=true/StartupNotify=false/g data/caja-home.desktop.in + +%if 0%{?rel_build} +#NOCONFIGURE=1 ./autogen.sh +%else # 0%{?rel_build} +# needed for git snapshots +NOCONFIGURE=1 ./autogen.sh +%endif # 0%{?rel_build} + +%build +%configure \ + --disable-static \ + --disable-schemas-compile \ + --disable-update-mimedb + +#drop unneeded direct library deps with --as-needed +# libtool doesn't make this easy, so we do it the hard way +sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0 /g' libtool + +make %{?_smp_mflags} V=1 + +%install +%{make_install} + +find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} ';' +find $RPM_BUILD_ROOT -name '*.a' -exec rm -f {} ';' + +rm -f $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/icon-theme.cache +rm -f $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/.icon-theme.cache + +mkdir -p $RPM_BUILD_ROOT%{_libdir}/caja/extensions-2.0 + +desktop-file-install \ + --delete-original \ + --dir=$RPM_BUILD_ROOT%{_datadir}/applications \ +$RPM_BUILD_ROOT%{_datadir}/applications/*.desktop + +# Avoid prelink to mess with caja - rhbz (#1228874) +mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/prelink.conf.d +cat << EOF > ${RPM_BUILD_ROOT}%{_sysconfdir}/prelink.conf.d/caja.conf +-b %{_libdir}/caja/ +-b %{_libdir}/libcaja-extension.so.* +-b %{_libexecdir}/caja-convert-metadata +-b %{_bindir}/caja +-b %{_bindir}/caja-autorun-software +-b %{_bindir}/caja-connect-server +-b %{_bindir}/caja-file-management-properties +EOF + +%find_lang %{name} --with-gnome --all-name + + +%files +%doc AUTHORS COPYING COPYING.LIB NEWS README +%{_bindir}/* +%{_datadir}/caja +%{_libdir}/caja/ +%{_sysconfdir}/prelink.conf.d/caja.conf +%{_datadir}/pixmaps/caja/ +%{_datadir}/applications/*.desktop +%{_datadir}/icons/hicolor/*/emblems/emblem-note.png +%{_mandir}/man1/* +%{_datadir}/metainfo/caja.appdata.xml +%{_datadir}/mime/packages/caja.xml +%{_datadir}/dbus-1/services/org.mate.freedesktop.FileManager1.service + +%files core-extensions +%{_libdir}/libcaja-extension.so.* +%{_libdir}/girepository-1.0/*.typelib + +%files schemas -f %{name}.lang +%{_datadir}/glib-2.0/schemas/org.mate.*.gschema.xml + +%files devel +%{_includedir}/caja/ +%{_libdir}/pkgconfig/* +%{_libdir}/*.so +%{_datadir}/gir-1.0/*.gir +%{_datadir}/gtk-doc/html/libcaja-extension + + +%changelog +* Fri Nov 22 2019 Wolfgang Ulbrich - 1.22.2-2 +- https://github.com/mate-desktop/caja/commit/ea81a5 +- Don't hyphenate filenames with pango-1.44 + +* Wed Sep 18 2019 Wolfgang Ulbrich - 1.22.2-1 +- update to 1.22.2 + +* Wed Jul 24 2019 Fedora Release Engineering - 1.22.1-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild + +* Fri Apr 26 2019 Wolfgang Ulbrich - 1.22.1-1 +- update to 1.22.1 + +* Mon Mar 04 2019 Wolfgang Ulbrich - 1.22.0-1 +- update to 1.22.0 + +* Thu Jan 31 2019 Fedora Release Engineering - 1.20.3-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild + +* Tue Dec 11 2018 Wolfgang Ulbrich - 1.20.3-1 +- test 1.20.3 + +* Thu Jul 12 2018 Fedora Release Engineering - 1.20.2-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild + +* Tue Jun 12 2018 Wolfgang Ulbrich - 1.20.2-2 +- rename caja-extension sub-package to avoid conflicts with +- debuginfo from caja-extensions + +* Fri Apr 06 2018 Wolfgang Ulbrich - 1.20.2-1 +- update to 1.20.2 + +* Tue Mar 27 2018 Wolfgang Ulbrich - 1.20.1-1 +- update to 1.20.1 + +* Sun Feb 11 2018 Wolfgang Ulbrich - 1.20.0-3 +- fix emblem and backgrounds preferences UI + +* Sun Feb 11 2018 Wolfgang Ulbrich - 1.20.0-2 +- drop obsolet scriptlet again + +* Sun Feb 11 2018 Wolfgang Ulbrich - 1.20.0-1 +- update to 1.20.0 release +- drop mimeinfo rpm scriptlet +- drop desktop-database rpm scriptlet +- drop GSettings Schema rpm scriptlet +- switch to using autosetup + +* Wed Feb 07 2018 Fedora Release Engineering - 1.19.3-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild + +* Sun Jan 07 2018 Igor Gnatenko - 1.19.3-2 +- Remove obsolete scriptlets + +* Mon Jan 01 2018 Wolfgang Ulbrich - 1.19.3-1 +- update to 1.19.3 +- use https://github.com/mate-desktop/caja/pull/891 + +* Wed Oct 11 2017 Wolfgang Ulbrich - 1.19.2-1 +- update to 1.19.2 release + +* Mon Aug 28 2017 Wolfgang Ulbrich - 1.19.1-2 +- use https://github.com/mate-desktop/caja/pull/837 +- use https://github.com/mate-desktop/caja/pull/838 + +* Sat Aug 26 2017 Wolfgang Ulbrich - 1.19.1-1 +- update to 1.19.1 + +* Wed Aug 09 2017 Wolfgang Ulbrich - 1.19.0-4 +- remove virtual provides + +* Wed Aug 02 2017 Fedora Release Engineering - 1.19.0-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild + +* Wed Jul 26 2017 Fedora Release Engineering - 1.19.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild + +* Thu May 11 2017 Wolfgang Ulbrich - 1.19.0-1 +- update to 1.19.0 release + +* Tue Apr 25 2017 Wolfgang Ulbrich - 1.18.2-3 +- fix opening download folder from Firefox "freezes" X +- https://github.com/mate-desktop/caja/commit/6ece67f + +* Tue Apr 25 2017 Wolfgang Ulbrich - 1.18.2-2 +- add some upstream patches +- Expand grid width to canvas +- use gtk+-3 bookmark location +- force icons size in open-with-dialog +- show correct right-click menu after making selection + +* Tue Apr 04 2017 Wolfgang Ulbrich - 1.18.2-1 +- update to 1.18.2 +- add upstream commit "Expand grid width to canvas" + +* Tue Apr 04 2017 Wolfgang Ulbrich - 1.18.1-1 +- update to 1.18.1 + +* Tue Mar 14 2017 Wolfgang Ulbrich - 1.18.0-1 +- update to 1.18.0 release + +* Fri Feb 10 2017 Fedora Release Engineering - 1.17.3-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild + +* Wed Jan 18 2017 Wolfgang Ulbrich - 1.17.3-1 +- update to 1.17.3 + +* Mon Jan 09 2017 Wolfgang Ulbrich - 1.17.2-1 +- update to 1.17.2 +- fix running under wayland session + +* Sat Dec 03 2016 Wolfgang Ulbrich - 1.17.1-1 +- update to 1.17.1 release + +* Thu Nov 17 2016 Wolfgang Ulbrich - 1.17.0-1 +- update to 1.17.0 release + +* Wed Oct 19 2016 Wolfgang Ulbrich - 1.16.1-1 +- update to 1.16.1 release +- fix Orca speaking + +* Thu Sep 22 2016 Wolfgang Ulbrich - 1.16.0-1 +- update to 1.16.0 release +- disable startup notification + +* Sat Aug 13 2016 Wolfgang Ulbrich - 1.15.4-1 +- update to 1.15.4 release + +* Wed Aug 10 2016 Wolfgang Ulbrich - 1.15.3-3 +- fix crash on changing wallpapers in non-compositor mode + +* Mon Aug 08 2016 Wolfgang Ulbrich - 1.15.3-2 +- fix desktop background rendering in noncomposited mode + +* Thu Aug 04 2016 Wolfgang Ulbrich - 1.15.3-1 +- update to 1.15.3 release + +* Sun Jul 24 2016 Wolfgang Ulbrich - 1.15.2-2 +- fix desktop redraw issues with gtk+-3.21.4 + +* Sat Jul 02 2016 Wolfgang Ulbrich - 1.15.2-1 +- update to 1.15.2 release + +* Sat Jul 02 2016 Wolfgang Ulbrich - 1.15.1-1 +- update to 1.15.1 release + +* Mon Jun 27 2016 Wolfgang Ulbrich - 1.15.0-2 +- don't show color and image backgounds menu entry + +* Thu Jun 09 2016 Wolfgang Ulbrich - 1.15.0-1 +- update to 1.15.0 release +- switch to gtk+3 + +* Sat May 21 2016 Wolfgang Ulbrich - 1.14.1-1 +- update to 1.14.1 release + +* Tue Apr 05 2016 Wolfgang Ulbrich - 1.14.0-1 +- update to 1.14.0 release + +* Mon Feb 22 2016 Wolfgang Ulbrich - 1.13.1-1 +- update to 1.13.1 release + +* Sun Feb 07 2016 Wolfgang Ulbrich - 1.13.0-1 +- update to 1.13.0 release +- try fix rhbz (#1291540) + +* Wed Feb 03 2016 Fedora Release Engineering - 1.12.2-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild + +* Sun Dec 27 2015 Wolfgang Ulbrich - 1.12.2-2 +- add XFCE to OnlyShowIn in caja-browser.desktop + +* Thu Dec 24 2015 Wolfgang Ulbrich - 1.12.2-1 +- update to 1.12.2 release +- remove upstreamed patch + +* Tue Dec 22 2015 Wolfgang Ulbrich - 1.12.1-2 +- change cajas behaviour in xfce session, rhbz (#1278079) + +* Tue Dec 01 2015 Wolfgang Ulbrich - 1.12.1-1 +- update to 1.12.1 release + +* Fri Nov 06 2015 Wolfgang Ulbrich - 1.12.0-1 +- update to 1.12.0 release + +* Wed Oct 21 2015 Wolfgang Ulbrich - 1.11.0-1 +- update to 1.11.0 release + +* Fri Sep 25 2015 Wolfgang Ulbrich - 1.10.4-1 +- update to 1.10.4 release +- remove upstreamed patches + +* Thu Sep 17 2015 Wolfgang Ulbrich - 1.10.3-2 +- fix crash if restore file from trash in f23 +- do not save position from last window + +* Tue Jul 21 2015 Wolfgang Ulbrich - 1.10.3-1 +- update to 1.10.3 release + +* Thu Jul 16 2015 Wolfgang Ulbrich - 1.10.2.1 +- update to 1.10.2 release +- remove upstreamed patches + +* Sat Jul 11 2015 Wolfgang Ulbrich - 1.10.1-7 +- use new help dir + +* Fri Jul 03 2015 Wolfgang Ulbrich - 1.10.0-6 +- revert 'allow caja --no-desktop in other desktops' + +* Fri Jul 03 2015 Wolfgang Ulbrich - 1.10.0-5 +- use old help from 1.8 + +* Sun Jun 28 2015 Wolfgang Ulbrich - 1.10.1.4 +- improve double click detection +- no daemon mode in other desktop environments +- allow caja --no-desktop in other desktops + +* Sat Jun 20 2015 Wolfgang Ulbrich - 1.10.1.3 +- fix caja help +- fix renaming of files (gtk3) +- add new bookmark behaviour +- drop old bookmarks patch + +* Wed Jun 17 2015 Fedora Release Engineering - 1.10.1-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild + +* Fri Jun 12 2015 Wolfgang Ulbrich - 1.10.1.1 +- update to 1.10.1 release +- add bookmarks patch again +- avoid prelink to mess with caja rhbz (#1228874) + +* Mon Apr 06 2015 Wolfgang Ulbrich - 1.10.0-1 +- update to 1.10.0 release + +* Wed Feb 25 2015 Wolfgang Ulbrich - 1.9.90.1 +- update to 1.9.90 release + +* Tue Jan 13 2015 Wolfgang Ulbrich - 1.9.4.1 +- update to 1.9.4 release + +* Tue Nov 11 2014 Wolfgang Ulbrich - 1.9.3-1 +- update to 1.9.3 release + +* Sun Oct 12 2014 Wolfgang Ulbrich - 1.9.2-1 +- update to 1.9.2 release +- adjust obsoletes + +* Fri Aug 15 2014 Fedora Release Engineering - 1.9.1-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild + +* Sat Jul 12 2014 Wolfgang Ulbrich - 1.9.1-1 +- update to 1.9.1 release +- move gtk-docs to -devel subpackage +- removed upstreamed patches + +* Tue Jul 08 2014 Rex Dieter 1.8.1-3 +- optimize/update scriptlets + +* Sat Jun 07 2014 Fedora Release Engineering - 1.8.1-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild + +* Sat Apr 26 2014 Wolfgang Ulbrich - 1.8.1-1 +- update to 1.8.1 release +- remove upstreamed patches + +* Sat Mar 22 2014 Wolfgang Ulbrich - 1.8.0-2 +- fix for x-caja-window issue, end of a long story +- remove consolekit usage +- don't use caja-autostart script anymore + +* Tue Mar 04 2014 Dan Mashal - 1.8.0-1 +- Update to 1.8.0 +- Turn autoreconf bit back on. This is still needed for rpath issue. + +* Sun Feb 23 2014 Wolfgang Ulbrich - 1.7.91-0.1.git20140223.ee0a62 +- update to latest git snapshot from 2014.02.23 +- remove debuging patch, fix rhbz (#1067234) +- move autoreconf to the right place +- remove delay from caja-autostart for testing proposal +- remove non existent COPYING-DOCS +- disable gtk-docs for dit snapshot builds + +* Wed Feb 12 2014 Dan Mashal - 1.7.2-2 +- Add autoreconf -fi to fix rpath issues. + +* Sun Feb 09 2014 Dan Mashal - 1.7.2-1 +- Update to 1.7.2 + +* Tue Jan 14 2014 Wolfgang Ulbrich - 1.7.1-1 +- update to 1.7.1 +- remove glib-2.39 fix, already fixed in upstream +- use gtk-docs for release build + +* Tue Dec 17 2013 Wolfgang Ulbrich - 1.7.1-0.6.git20131201.0ef48fa +- fix build against new glib2-39.2, 'g_memmove' is removed +- https://git.gnome.org/browse/glib/commit/?id=6e4a7fca431f53fdfd89afbe956212229cf52200 + +* Tue Dec 17 2013 Wolfgang Ulbrich - 1.7.1-0.5.git20131201.0ef48fa +- new patch for x-caja-window issue, it surpress creating x-caja-desktop-windows +- rename patches +- fix provides +- use modern 'make install' macro +- make Maintainers life easier and use better git snapshot usage, Thanks to Björn Esser + +* Sun Dec 08 2013 Wolfgang Ulbrich - 1.7.1-0.4.git0ef48fab +- add mimeinfo rpm scriplets again + +* Sun Dec 08 2013 Wolfgang Ulbrich - 1.7.1-0.3.git0ef48fab +- fix usage of %%{buildroot} +- use desktop-database rpm scriptlet instead of mimeinfo scriptlet + +* Sat Dec 07 2013 Wolfgang Ulbrich - 1.7.1-0.2.git0ef48fab +- fix all the macro-in-comment warnings +- add ldconfig scriptlets for the extension subpackage +- add versioned provides for the obsoleted packages +- remove licence tags from subpackages +- remove group tags from subpackages +- fix permission for caja-autostart script + +* Thu Dec 05 2013 Wolfgang Ulbrich - 1.7.1-0.1.git0ef48fab +- rename mate-file-manager to caja for f21 +- use latest git snapshot, 2013.12.05 + +* Thu Dec 05 2013 Dan Mashal - 1.7.0-1 +- Update to 1.7.0 + +* Thu Oct 10 2013 Wolfgang Ulbrich - 1.6.3-0.7.gitbf47018 +- add add autostart script to desktop file + +* Thu Oct 10 2013 Wolfgang Ulbrich - 1.6.3-0.6.gitbf47018 +- add a 3 secs delay for caja autostart and restart if killed + +* Mon Oct 07 2013 Wolfgang Ulbrich - 1.6.3-0.5.gitbf47018 +- add new caja-sidebar design for f20 + +* Mon Oct 07 2013 Wolfgang Ulbrich - 1.6.3-0.4.gitbf47018 +- allow dropping files to bookmarks +- fix https://github.com/mate-desktop/mate-file-manager/issues/122 + +* Sun Oct 06 2013 Wolfgang Ulbrich - 1.6.3-0.3.gitbf47018 +- fix caja crash if closing properties windows on dropbox folder + +* Sun Sep 22 2013 Wolfgang Ulbrich - 1.6.3-0.2.git73cc7e9 +- update latest git snapshot +- fix rhbz (#1005660) +- change open folders in spatial-mode +- fix spatial mode crash and shift+double click +- https://github.com/mate-desktop/mate-file-manager/issues/120 +- https://github.com/mate-desktop/mate-file-manager/issues/161 +- fixed thumbnail frame not being displayed for some files +- https://github.com/mate-desktop/mate-file-manager/issues/135 + +* Wed Sep 18 2013 Wolfgang Ulbrich - 1.6.3-0.1.git6278dcb +- update latest git snapshot +- fix rhbz (959444) +- remove upstreamed mate-file-manager_fix_privat-icons-dir.patch + +* Thu Aug 08 2013 Wolfgang Ulbrich - 1.6.2-3 +- move gsettings schemas to -schemas subpackage, to fix #959607 +- move locale to -schemas subpackage +- remove runtime require hicolor-icon-theme + +* Sat Aug 03 2013 Fedora Release Engineering - 1.6.2-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild + +* Sat Jul 20 2013 Wolfgang Ulbrich - 1.6.2-1 +- update to new upstream release +- remove in release included mate-file-manager_fix-radio-buttons.patch +- add upstream mate-file-manager_fix_privat-icons-dir.patch +- remove needless runtime require gsettings-desktop-schemas +- remove runtime require mate-icon-theme + +* Mon Jul 01 2013 Wolfgang Ulbrich - 1.6.1-9 +- set autostart to false in caja-autostart, fix rhbz #969663 +- and #978598 + +* Sun Jun 30 2013 Wolfgang Ulbrich - 1.6.1-8 +- add mate-file-manager_fix-radio-buttons.patch to fix rhbz #964357 +- clean up BR's +- add runtime require hicolor-icon-theme +- revert 1.6.1-7 changes + +* Thu Jun 20 2013 Dan Mashal - 1.6.1-7 +- Try caja without the autostart file (886029) + +* Sat Jun 15 2013 Wolfgang Ulbrich - 1.6.1-6 +- remove gsettings convert file + +* Thu Jun 06 2013 Wolfgang Ulbrich - 1.6.1-5 +- add AutostartCondition to caja-autostart.desktop + +* Wed May 22 2013 Wolfgang Ulbrich - 1.6.1-4 +- workaround for x-caja-desktop window issue +- add caja-autostart desktopfile to /etc/xdg/autostart + +* Wed May 15 2013 Dan Mashal - 1.6.1-3 +- Fix previous commit + +* Tue May 14 2013 Dan Mashal - 1.6.1-2 +- Own libdir/caja (961992) + +* Thu Apr 11 2013 Dan Mashal - 1.6.1-1 +- Update to latest upstream release. + +* Wed Apr 03 2013 Dan Mashal - 1.6.0-1 +- Update to latest 1.6.0 stable release. + +* Mon Mar 11 2013 Dan Mashal - 1.5.5-1 +- Update to latest upstream release + +* Sat Mar 02 2013 Dan Mashal - 1.5.4-1 +- Update to latest upstream release +- Add upstream patch + +* Mon Dec 03 2012 Dan Mashal - 1.5.2-1 +- Update to 1.5.2 release +- Drop all patches +- Update configure flags +- Clean up spec file + +* Sun Nov 25 2012 Leigh Scott - 1.5.1-2 +- upload source again as upstream switched it +- specfile cleanup + +* Fri Nov 23 2012 Leigh Scott - 1.5.1-1 +- update to 1.5.1 release +- drop upstream commits patch and other merged patch +- change source url and fix packagename in %%prep to suit + +* Thu Nov 22 2012 Leigh Scott - 1.5.0-6 +- update commits patch + +* Tue Nov 20 2012 Leigh Scott - 1.5.0-5 +- add git commits rollup patch, hopefully it fixes rhbz 868472 +- drop merged patch + +* Mon Nov 19 2012 Dan Mashal - 1.5.0-4 +- This change was reverted + +* Sun Nov 11 2012 Leigh Scott - 1.5.0-3 +- add patch to call gdk_pixbuf_loader_close() earlier (#558267) +- fix mistake in scriptlets + +* Mon Oct 29 2012 Leigh Scott - 1.5.0-2 +- add requires gsettings-desktop-schemas +- add build requires gsettings-desktop-schemas-devel + +* Mon Oct 29 2012 Leigh Scott - 1.5.0-1 +- update to 1.5.0 release +- add schema scriptlets and remove mateconf scriptlets +- drop un-needed requires and build requires and change style +- make directory for extensions and move to main package +- drop all patches not needed for building for now +- clean up spec file + +* Thu Oct 18 2012 Rex Dieter - 1.4.0-12 +- fix mate-doc xml error (patch out reference to non-existent caja-extension-i18n.xml) +- verbose build + +* Thu Oct 18 2012 Leigh Scott - 1.4.0-11 +- Drop caja_remove_mate-bg-crossfade patch as it was causing crash + +* Thu Oct 18 2012 Leigh Scott - 1.4.0-10 +- add patch to try and fix crash + +* Thu Oct 18 2012 Leigh Scott - 1.4.0-9 +- revert last commit "add autostart file for caja desktop" +- add no session delay patch + +* Thu Oct 18 2012 Leigh Scott - 1.4.0-8 +- add autostart file for caja desktop +- add build requires libxml2-devel + +* Mon Aug 20 2012 Wolfgang Ulbrich - 1.4.0-7 +- remove obsoleting stuff + +* Thu Aug 16 2012 Rex Dieter 1.4.0-6 +- drop needless ldconfig scriptlet on main pkg + +* Mon Aug 13 2012 Wolfgang Ulbrich - 1.4.0-5 +- fix desktop file handle +- fix obsolete caja from external repo + +* Sun Aug 12 2012 Wolfgang Ulbrich - 1.4.0-4 +- correct %%build section +- correct rpm scriplets +- correct %%prep section +- change .*z to .* in %%file section +- correct obsoletes +- some other fixes + +* Sun Aug 12 2012 Wolfgang Ulbrich - 1.4.0-3 +- obsoleting caja from external repo +- remove unecessary build requires + +* Tue Aug 07 2012 Wolfgang Ulbrich - 1.4.0-2 +- initial package for fedora + +* Sun Dec 25 2011 Wolfgang Ulbrich - 1.1.0-1 +- mate-file-manager.spec based on nautilus-2.32.0-1.fc14 spec + diff --git a/caja_0001-canvas-item-Don-t-hyphenate-filenames-1.22.patch b/caja_0001-canvas-item-Don-t-hyphenate-filenames-1.22.patch new file mode 100644 index 0000000000000000000000000000000000000000..1575731e52b6e677feb153d0fdbe29ab4a3bdb65 --- /dev/null +++ b/caja_0001-canvas-item-Don-t-hyphenate-filenames-1.22.patch @@ -0,0 +1,84 @@ +From ea81a5e3bd1cc8e9ba2b92ced9db1ebae803e24d Mon Sep 17 00:00:00 2001 +From: raveit65 +Date: Fri, 22 Nov 2019 21:29:30 +0100 +Subject: [PATCH] canvas-item: Don't hyphenate filenames + +fixes https://github.com/mate-desktop/caja/issues/1284 + +Pango 1.44 got the ability to automatically hyphenate on line breaks, +which is on by default, but can be set off by a new attribute. + +As a result, we now hyphenate filenames, which is confusing, because +a filename may already include hyphens. + +To restore the previous behavior, let's not insert hyphens when +breaking filenames in multiple lines. + +Inspired by https://gitlab.gnome.org/GNOME/nautilus/commit/9738d85 +--- + libcaja-private/caja-icon-canvas-item.c | 22 ++++++++++++++++++++++ + 1 file changed, 22 insertions(+) + +diff --git a/libcaja-private/caja-icon-canvas-item.c b/libcaja-private/caja-icon-canvas-item.c +index 71d56fc3..cb2d8316 100644 +--- a/libcaja-private/caja-icon-canvas-item.c ++++ b/libcaja-private/caja-icon-canvas-item.c +@@ -60,6 +60,14 @@ + #define MAX_TEXT_WIDTH_BESIDE 90 + #define MAX_TEXT_WIDTH_BESIDE_TOP_TO_BOTTOM 150 + ++#ifndef PANGO_CHECK_VERSION ++#define PANGO_CHECK_VERSION(major, minor, micro) \ ++ (PANGO_VERSION_MAJOR > (major) || \ ++ (PANGO_VERSION_MAJOR == (major) && PANGO_VERSION_MINOR > (minor)) || \ ++ (PANGO_VERSION_MAJOR == (major) && PANGO_VERSION_MINOR == (minor) && \ ++ PANGO_VERSION_MICRO >= (micro))) ++#endif ++ + /* special text height handling + * each item has three text height variables: + * + text_height: actual height of the displayed (i.e. on-screen) PangoLayout. +@@ -1967,12 +1975,18 @@ create_label_layout (CajaIconCanvasItem *item, + GString *str; + char *zeroified_text; + const char *p; ++ #if PANGO_CHECK_VERSION (1, 44, 0) ++ PangoAttrList *attr_list; ++ #endif + + canvas_item = EEL_CANVAS_ITEM (item); + + container = CAJA_ICON_CONTAINER (canvas_item->canvas); + context = gtk_widget_get_pango_context (GTK_WIDGET (canvas_item->canvas)); + layout = pango_layout_new (context); ++ #if PANGO_CHECK_VERSION (1, 44, 0) ++ attr_list = pango_attr_list_new (); ++ #endif + + zeroified_text = NULL; + +@@ -2019,6 +2033,11 @@ create_label_layout (CajaIconCanvasItem *item, + pango_layout_set_spacing (layout, LABEL_LINE_SPACING); + pango_layout_set_wrap (layout, PANGO_WRAP_WORD_CHAR); + ++ #if PANGO_CHECK_VERSION (1, 44, 0) ++ pango_attr_list_insert (attr_list, pango_attr_insert_hyphens_new (FALSE)); ++ pango_layout_set_attributes (layout, attr_list); ++ #endif ++ + /* Create a font description */ + if (container->details->font) + { +@@ -2034,6 +2053,9 @@ create_label_layout (CajaIconCanvasItem *item, + pango_layout_set_font_description (layout, desc); + pango_font_description_free (desc); + g_free (zeroified_text); ++ #if PANGO_CHECK_VERSION (1, 44, 0) ++ pango_attr_list_unref (attr_list); ++ #endif + + return layout; + } +-- +2.21.0 + diff --git a/caja_add-xfce-to-desktop-file-1.22.patch b/caja_add-xfce-to-desktop-file-1.22.patch new file mode 100644 index 0000000000000000000000000000000000000000..a782ce99375e7d2f336de51ff676c42c5c203521 --- /dev/null +++ b/caja_add-xfce-to-desktop-file-1.22.patch @@ -0,0 +1,9 @@ +diff -uprN caja-1.22.0-orig/data/caja-browser.desktop.in caja-1.22.0/data/caja-browser.desktop.in +--- caja-1.22.0-orig/data/caja-browser.desktop.in 2019-02-08 13:51:59.000000000 +0100 ++++ caja-1.22.0/data/caja-browser.desktop.in 2019-02-24 16:57:13.244536755 +0100 +@@ -10,4 +10,4 @@ StartupNotify=false + Type=Application + Categories=GTK;System;Utility;Core; + Keywords=files;browser;manager;MATE; +-OnlyShowIn=MATE; ++OnlyShowIn=MATE;XFCE;