diff --git a/10_cinnamon-common.gschema.override b/10_cinnamon-common.gschema.override index 859a940c64d005c4f9ff35686656d405df7938f6..2018dcf2726d4454847471c179c48d4784fab7e3 100644 --- a/10_cinnamon-common.gschema.override +++ b/10_cinnamon-common.gschema.override @@ -66,11 +66,10 @@ icon-theme='Mint-Y-Dark-Aqua' [org.cinnamon.desktop.wm.preferences] button-layout=':minimize,maximize,close' titlebar-font='Noto Sans Bold 10' -theme='Mint-Y' [org.cinnamon.SessionManager] quit-delay-toggle=true -prefer-hybrid-sleep=true +prefer-hybrid-sleep=false [org.cinnamon.settings-daemon.plugins.xsettings] hinting='slight' diff --git a/cinnamon-5.2.7.tar.gz b/cinnamon-5.2.7.tar.gz deleted file mode 100644 index 25c9a26794521d2b7c5c2273e7f271c255cfe75d..0000000000000000000000000000000000000000 Binary files a/cinnamon-5.2.7.tar.gz and /dev/null differ diff --git a/cinnamon-5.6.5.tar.gz b/cinnamon-5.6.5.tar.gz new file mode 100644 index 0000000000000000000000000000000000000000..47c628f41e346eec8f3ca869cd06a98ef7d83acf Binary files /dev/null and b/cinnamon-5.6.5.tar.gz differ diff --git a/cinnamon.spec b/cinnamon.spec index e5a3cec24d70e2f259e375514e67ee564793e6e0..2f64553d2b6d71597608f63728c0c646de36110d 100644 --- a/cinnamon.spec +++ b/cinnamon.spec @@ -1,17 +1,17 @@ %global __requires_exclude ^lib%{name}.so|^lib%{name}-js.so -%global cjs_version 5.4.0 -%global cinnamon_desktop_version 5.2.0 -%global cinnamon_translations_version 5.2.0 +%global cjs_version 5.6.0 +%global cinnamon_desktop_version 5.6.0 +%global cinnamon_translations_version 5.6.0 %global gobject_introspection_version 1.38.0 -%global muffin_version 5.2.0 +%global muffin_version 5.6.1 %global json_glib_version 0.13.2 %global __python %{__python3} Name: cinnamon -Version: 5.2.7 -Release: 4 +Version: 5.6.5 +Release: 1 Summary: Window management and application launching for GNOME License: GPLv2+ and LGPLv2+ URL: https://github.com/linuxmint/%{name} @@ -25,8 +25,6 @@ Patch1: set_wheel.patch #Patch2: revert_25aef37.patch Patch3: default_panal_launcher.patch Patch4: remove_crap_from_menu.patch -Patch5: fix-meson-0.61.5-build.patch -Patch6: show_menu-icon.patch ExcludeArch: %{ix86} @@ -37,7 +35,6 @@ BuildRequires: python3-rpm-macros BuildRequires: pkgconfig(cjs-1.0) >= %{cjs_version} BuildRequires: pkgconfig(dbus-glib-1) BuildRequires: pkgconfig(gl) -BuildRequires: pkgconfig(gnome-bluetooth-3.0) BuildRequires: pkgconfig(libgnome-menu-3.0) BuildRequires: pkgconfig(lib%{name}-menu-3.0) BuildRequires: pkgconfig(%{name}-desktop) >= %{cinnamon_desktop_version} @@ -47,16 +44,16 @@ BuildRequires: pkgconfig(upower-glib) BuildRequires: pkgconfig(libnm) BuildRequires: pkgconfig(polkit-agent-1) BuildRequires: pkgconfig(gudev-1.0) +BuildRequires: pkgconfig(xapp) # for screencast recorder functionality BuildRequires: pkgconfig(gstreamer-1.0) BuildRequires: intltool BuildRequires: pkgconfig(libcanberra) -BuildRequires: pkgconfig(libsoup-2.4) # used in unused BigThemeImage BuildRequires: pkgconfig(librsvg-2.0) -BuildRequires: pkgconfig(libmuffin) >= %{muffin_version} +BuildRequires: pkgconfig(libmuffin-0) >= %{muffin_version} BuildRequires: pkgconfig(libpulse) # Bootstrap requirements @@ -73,6 +70,9 @@ BuildRequires: pkgconfig(xorg-wacom) %endif BuildRequires: pkgconfig(xtst) +# Add a soup version requirement to cinnamon's environment. +Requires: libsoup + Requires: %{name}-desktop%{?_isa} >= %{cinnamon_desktop_version} Requires: muffin%{?_isa} >= %{muffin_version} Requires: cjs%{?_isa} >= %{cjs_version} @@ -103,6 +103,7 @@ Requires: caribou%{?_isa} Requires: accountsservice-libs%{?_isa} # needed for settings +Requires: gsound Requires: libtimezonemap%{?_isa} Requires: python3-distro Requires: python3-pytz @@ -141,7 +142,7 @@ Requires: xapps%{?_isa} Requires: python3-xapps-overrides%{?_isa} # required for calendar applet -Recommends: gnome-calendar +Recommends: %{name}-calendar-server%{?_isa} = %{version}-%{release} # required for network applet Requires: nm-connection-editor%{?_isa} @@ -159,9 +160,15 @@ Requires: wget%{?_isa} # required for printer applet Requires: cups-client%{?_isa} +# required for spice +Requires: gettext + Provides: desktop-notification-daemon Provides: bundled(libcroco) = 0.6.12 +Requires: evolution-data-server%{?_isa} +Requires: gnome-calendar%{?_isa} + %description Cinnamon is a Linux desktop which provides advanced innovative features and a traditional user experience. @@ -181,6 +188,7 @@ This package contains the code documentation for various Cinnamon components. %prep %autosetup -p1 +%{__sed} -i -e '/default/ s@false@true@' files%{_datadir}/%{name}/applets/menu\@cinnamon.org/settings-schema.json %{__sed} -i -e 's@gksu@pkexec@g' files%{_bindir}/%{name}-settings-users %{__sed} -i -e 's@gnome-orca@orca@g' files%{_datadir}/%{name}/%{name}-settings/modules/cs_accessibility.py @@ -206,6 +214,7 @@ chmod a-x files%{_datadir}/%{name}/%{name}-settings/bin/__init__.py %install %meson_install +%py_byte_compile %{__python3} %{buildroot}%{_datadir}/%{name}/ # install polkit autostart desktop file %{__install} --target-directory=%{buildroot}%{_datadir}/applications \ @@ -228,11 +237,9 @@ EOF # Provide symlink for the background-propeties. %{__ln_s} %{_datadir}/gnome-background-properties %{buildroot}%{_datadir}/%{name}-background-properties - %check %{_bindir}/desktop-file-validate %{buildroot}%{_datadir}/applications/*.desktop - %files %doc README.rst AUTHORS %license COPYING @@ -244,6 +251,7 @@ EOF %{_datadir}/glib-2.0/schemas/* %{_datadir}/%{name}-session/sessions/* %{_datadir}/icons/hicolor/*/*/*.svg +%{_datadir}/icons/hicolor/*/*/*.png %{_datadir}/polkit-1/actions/org.%{name}.settings-users.policy %{_datadir}/xsessions/* %{_datadir}/%{name}/ @@ -257,6 +265,9 @@ EOF %doc %{_datadir}/gtk-doc/html/*/ %changelog +* Mon Jan 02 2023 lin zhang - 5.6.5-1 +- update to 5.6.5 + * Thu Sep 01 2022 wenlong ding - 5.2.7-4 - Add show_menu-icon.patch to show menu icons. - Change spec file: setting default openEuler wallpaper diff --git a/default_panal_launcher.patch b/default_panal_launcher.patch index b6ac6c3e6b0515107af28e2dd67ad826f66f2d79..a5efd8f6e477087b0a0ab6b4c687b4d4673fa5c2 100644 --- a/default_panal_launcher.patch +++ b/default_panal_launcher.patch @@ -4,8 +4,8 @@ }, "pinned-apps": { "type": "generic", -- "default": ["firefox.desktop", "org.gnome.Terminal.desktop", "nemo.desktop"] -+ "default": ["firefox.desktop", "mozilla-thunderbird.desktop", "org.gnome.Terminal.desktop", "nemo.desktop"] +- "default": ["nemo.desktop", "firefox.desktop", "org.gnome.Terminal.desktop"] ++ "default": ["nemo.desktop", "firefox.desktop", "mozilla-thunderbird.desktop", "org.gnome.Terminal.desktop"] }, "group-apps": { "type": "checkbox", diff --git a/fix-meson-0.61.5-build.patch b/fix-meson-0.61.5-build.patch deleted file mode 100644 index e28c15fd729cc8b4208b51eada92b2e87d033af5..0000000000000000000000000000000000000000 --- a/fix-meson-0.61.5-build.patch +++ /dev/null @@ -1,35 +0,0 @@ -diff -up cinnamon-5.2.7/docs/reference/cinnamon-js/meson.build.orig cinnamon-5.2.7/docs/reference/cinnamon-js/meson.build ---- cinnamon-5.2.7/docs/reference/cinnamon-js/meson.build.orig 2022-06-28 07:07:56.936000000 +0000 -+++ cinnamon-5.2.7/docs/reference/cinnamon-js/meson.build 2022-06-28 07:08:40.888000000 +0000 -@@ -12,7 +12,6 @@ gnome.gtkdoc( - 'cinnamon-js', - mode: 'xml', - main_xml: 'cinnamon-js-docs.sgml', -- dependencies: parts_files, - src_dir: meson.current_build_dir(), - install: true, - ) -diff -up cinnamon-5.2.7/src/meson.build.orig cinnamon-5.2.7/src/meson.build ---- cinnamon-5.2.7/src/meson.build.orig 2022-06-28 07:07:30.696000000 +0000 -+++ cinnamon-5.2.7/src/meson.build 2022-06-28 07:06:51.720000000 +0000 -@@ -196,7 +196,7 @@ cinnamon_gir = gnome.generate_gir( - includes: cinnamon_gir_includes, - install: true, - install_dir_typelib: pkglibdir, -- install_dir_gir: [false], -+ install_dir_gir: false, - extra_args: [ - '-DST_COMPILATION', - '--quiet', -diff -up cinnamon-5.2.7/src/st/meson.build.orig cinnamon-5.2.7/src/st/meson.build ---- cinnamon-5.2.7/src/st/meson.build.orig 2022-06-28 07:02:58.008000000 +0000 -+++ cinnamon-5.2.7/src/st/meson.build 2022-06-28 07:03:11.224000000 +0000 -@@ -213,7 +213,7 @@ st_gir = gnome.generate_gir( - includes: st_gir_includes, - install: true, - install_dir_typelib: pkglibdir, -- install_dir_gir: [false], -+ install_dir_gir: false, - extra_args: [ - '-DST_COMPILATION', - '--quiet', diff --git a/set_wheel.patch b/set_wheel.patch index 32dae0738611874e06a068b39d53f36ac1af4807..72a55c893e11e8d66714f04f1d968b45b7641899 100644 --- a/set_wheel.patch +++ b/set_wheel.patch @@ -34,7 +34,7 @@ Index: Cinnamon-3.6.6/files/usr/share/cinnamon/cinnamon-settings-users/cinnamon- def set_passwords_visibility(self): @@ -570,7 +562,7 @@ model, treeiter = self.users_treeview.get_selection().get_selected() - if treeiter != None: + if treeiter is not None: user = model[treeiter][INDEX_USER_OBJECT] - dialog = PasswordDialog(user, self.password_mask, self.groups_label, self.window) + dialog = PasswordDialog(user, self.password_mask, self.window) diff --git a/show_menu-icon.patch b/show_menu-icon.patch deleted file mode 100644 index 851a462a564452b6682177345537b93f5299c65a..0000000000000000000000000000000000000000 --- a/show_menu-icon.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -Nur cinnamon-5.2.7.bak/files/usr/share/cinnamon/applets/menu@cinnamon.org/settings-schema.json cinnamon-5.2.7/files/usr/share/cinnamon/applets/menu@cinnamon.org/settings-schema.json ---- cinnamon-5.2.7.bak/files/usr/share/cinnamon/applets/menu@cinnamon.org/settings-schema.json 2022-09-01 09:56:46.604661650 +0800 -+++ cinnamon-5.2.7/files/usr/share/cinnamon/applets/menu@cinnamon.org/settings-schema.json 2022-09-01 10:01:14.701646388 +0800 -@@ -42,7 +42,7 @@ - }, - "menu-custom" : { - "type" : "switch", -- "default" : false, -+ "default" : true, - "description" : "Use a custom icon and label", - "tooltip" : "Check this to specify a custom icon and label" - }, diff --git a/using-gjs.patch b/using-gjs.patch deleted file mode 100644 index a3fd6b1750cd7d1320a7e2fea61540f78938250d..0000000000000000000000000000000000000000 --- a/using-gjs.patch +++ /dev/null @@ -1,60 +0,0 @@ -diff -up cinnamon-5.2.7/meson.build.bak cinnamon-5.2.7/meson.build ---- cinnamon-5.2.7/meson.build.bak 2022-05-07 16:27:59.984113660 +0800 -+++ cinnamon-5.2.7/meson.build 2022-05-07 16:26:51.983776903 +0800 -@@ -21,7 +21,7 @@ po_dir = join_paths(meson.source_root(), - dbus_services_dir = dependency('dbus-1').get_pkgconfig_variable('session_bus_services_dir', define_variable: ['datadir', datadir]) - - # dependencies --cjs = dependency('cjs-1.0', version: '>= 4.8.0') -+gjs = dependency('gjs-1.0', version: '>= 1.17.1') - clutter = dependency('muffin-clutter-0') - cmenu = dependency('libcinnamon-menu-3.0', version: '>= 4.8.0') - cogl = dependency('muffin-cogl-0') -diff -up cinnamon-5.2.7/src/cinnamon-global-private.h.bak cinnamon-5.2.7/src/cinnamon-global-private.h ---- cinnamon-5.2.7/src/cinnamon-global-private.h.bak 2022-05-07 16:30:35.221599567 +0800 -+++ cinnamon-5.2.7/src/cinnamon-global-private.h 2022-05-07 16:30:51.079444900 +0800 -@@ -27,7 +27,7 @@ - #include "cinnamon-wm.h" - #include "st.h" - --#include -+#include - - struct _CinnamonGlobal { - GObject parent; -diff -up cinnamon-5.2.7/src/cinnamon-plugin.c.bak cinnamon-5.2.7/src/cinnamon-plugin.c ---- cinnamon-5.2.7/src/cinnamon-plugin.c.bak 2022-05-07 16:30:01.213931254 +0800 -+++ cinnamon-5.2.7/src/cinnamon-plugin.c 2022-05-07 16:30:12.543820758 +0800 -@@ -35,7 +35,7 @@ - #include - #include - #endif --#include -+#include - #include - #include - -diff -up cinnamon-5.2.7/src/meson.build.bak cinnamon-5.2.7/src/meson.build ---- cinnamon-5.2.7/src/meson.build.bak 2022-05-07 16:31:00.343354545 +0800 -+++ cinnamon-5.2.7/src/meson.build 2022-05-07 16:31:10.374256708 +0800 -@@ -83,7 +83,7 @@ tray_sources = [ - - libcinnamon_deps = [ - atk, -- cjs, -+ gjs, - clutter, - cmenu, - cogl, -diff -up cinnamon-5.2.7/src/run-js-test.c.bak cinnamon-5.2.7/src/run-js-test.c ---- cinnamon-5.2.7/src/run-js-test.c.bak 2022-05-07 16:29:27.746257684 +0800 -+++ cinnamon-5.2.7/src/run-js-test.c 2022-05-07 16:29:40.631132018 +0800 -@@ -33,7 +33,7 @@ - #include - #include - #include --#include -+#include - #include - - #include "cinnamon-global.h"