Hello community, here is the log from the commit of package cinnamon for openSUSE:Leap:15.2 checked in at 2020-02-21 23:52:45 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Leap:15.2/cinnamon (Old) and /work/SRC/openSUSE:Leap:15.2/.cinnamon.new.26092 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "cinnamon" Fri Feb 21 23:52:45 2020 rev:19 rq:777430 version:4.2.3 Changes: -------- --- /work/SRC/openSUSE:Leap:15.2/cinnamon/cinnamon.changes 2020-01-15 14:50:11.429406880 +0100 +++ /work/SRC/openSUSE:Leap:15.2/.cinnamon.new.26092/cinnamon.changes 2020-02-21 23:52:46.976975594 +0100 @@ -1,0 +2,525 @@ +Wed Aug 7 05:35:38 UTC 2019 - Marguerite Su <[email protected]> + +- refresh cinnamon-settings-4.2.3-tinycss2.patch + * get_declaration wants the int_value of DimensionToken + not a str + +------------------------------------------------------------------- +Tue Aug 6 05:05:55 UTC 2019 - Marguerite Su <[email protected]> + +- add cinnamon-settings-4.2.3-tinycss2.patch(boo#) + * port GtkCssEditor class to rely on tinycss2, the + former tinycss is obsolete and doesn't exist on + openSUSE + +------------------------------------------------------------------- +Sun Jul 28 04:55:01 UTC 2019 - Marguerite Su <[email protected]> + +- Update to version 4.2.3: + * cinnamon-app-system.c: Fix a leak, nothing was freeing the + GPtrArrays for collecting apps with duplicate names. + * Privacy settings: Add missing import + * Sound settings: Make the module slightly taller + * menu applet: only update label on orientation change + * cinnamon-window-tracker: Add a window-app-changed signal + to notify the window list when a window<-> app association + changes. + +------------------------------------------------------------------- +Fri Jul 26 04:02:42 UTC 2019 - Marguerite Su <[email protected]> + +- add cinnamon-fix-typelib-false-positive.patch back + * dependency generator will mistakenly generate a + typelib(Webkit) dependency. it was caused by an + inline comment. + +------------------------------------------------------------------- +Sun Jul 21 13:10:00 UTC 2019 - Marguerite Su <[email protected]> + +- Update to version 4.2.2: + * Main: Don't warn about 2D in live mode + * Main: Rephrase 2D warning and link to driver manager + * Stop using deprecated function Settings.prototpe.bindProperty + +------------------------------------------------------------------- +Sun Jul 21 12:56:29 UTC 2019 - Marguerite Su <[email protected]> + +- Update to version 4.2.1: + * cs_themes.py: Reword scrollbar click behavior setting slightly. + * cs_power.py: Create UPower.DeviceLevel if it doesn't exist + (needed for upower < 0.99.0). + * cs_themes: Set a more realistic lower and upper limits for the + scrollbar size slider, and fix its page size to 2. + * Fixed checking whether device is already set. + * sound applet: show seekbar for Audacious + * Privacy settings: Specify GI version + * Privacy settings: Add support for connectivity checking + +------------------------------------------------------------------- +Mon Jul 8 02:35:54 UTC 2019 - Dead Mozay <[email protected]> + +- Corrected source + +------------------------------------------------------------------- +Mon Jul 1 03:09:28 UTC 2019 - Dead Mozay <[email protected]> + +- Update to version 4.2.0: + * Remove patch cinnamon-settings.patch + * Remove patch cinnamon-fix-typelib-false-positive.patch + * Add printers applet (#8485) + * cinnamon-app: initialise a variable (#8486) + * cinnamon-doc-system: tidyup of recents (#8487) + * st-texture-cache: use a slightly more efficient linked list method (#8488) + * PIL: remove unnnecessary version check and code fork (#8496) + * Make the sync method configurable (#8481) + * cinnamon-doc-system: Switch back to GSList (#8502) + * st-icon: quiet a build warning (#8501) + * Replace some GLib wrappers (#8443) + * Improve property access performance (#8245) + * Reduce public function invocation in C code for simple getters with no logic (#8395) + * wm: Apply window effects to clones (#8497) + * layout: Misc. clean up (#8465) + * cinnamon-settings-ui: Remove the hack to center the stack switcher (#8520) + * workspace-switcher applet: Fix updating the focus window position and size at startup, and ensure the focus window starts out on top of the graph button. + * Fix: update the input regions when going fullscreen (#8523) + * runDialog: Fix run dialog not opening when cursor is hovering over a panel + * messageTray: Call updateRegions after notifications complete their effect + * SettingsWidgets: Remove obsolete classes + * SettingsWidgets: Convert to use the new style used in xapps (#8577) + * cinnamon-settings.py: Improve bring_selection_into_view calculations. + * windowEffects: Fix opacity during the close effect, stacking during the minimize effect (#8596) + * layout: Ensure regions update after the keyboard is hidden (#8585) + * overview: Fix some thumbnails not appearing (#8594) + * st-label: Move St-specific shadow processing out of the paint vfunc (#8588) + * layoutManager: Always update regions when untracking an actor (#8601) + * window-list: Fix skip_taskbar call on metawindow + * Revert "runDialog: Fix run dialog not opening when cursor is hovering over a panel" + * Revert rect caching and obstructed windows optimizations (#8606) + * build(deps): bump js-yaml from 3.12.0 to 3.13.1 (#8610) + * git ignore auto-generated files (#8586) + * issue template: Request info about daily builds PPA usage (#8605) + * Update vulnerable NPM dependencies (#8614) + * Change onscreen keyboard icon to input-keyboard + * Remove All Caps from default workspace naming (#8513) + * cinnamon-settings-users.py: update symlink vulnerability fix (#8515) + * Consider the "last-edited" field as integer even when enclosed in quotation marks. (#8459) + * Fix: update the input regions when going fullscreen (#8523) + * messageTray: Call updateRegions after notifications complete their effect + * layoutManager: Always update regions when untracking an actor + * Revert layout.js optimizations (#8624) + * Revert some changes to fix icon and text shadow issues on the panel (#8630) + * Notifications: Small fixes + * Use ConsoleKit instead of old upower for suspend/hibernate (cs_power.py) (#8438) + * Workspace switcher applet settings: add tooltip with informative note (#8524) + * overview: Fix some thumbnails not appearing (#8594) + * cinnamon2d: Remove CLUTTER_PAINT=disable-clipped-redraws + * Xlets removal confirmation dialogs (#8636) + * Add a utility script for accessing cinnamon's dbus methods from a terminal (#8628) + * Ripples: use St.Widget instead of St.BoxLayout (#8640) + * Fix misplaced windows in overview + * st-theme-node.c: Allow parsing of 'symbolic' (and -warning, -error, and -success) as a color. + * spacer applet: Outline applet during panel edit mode to make spacers more apparent when arranging panel items. + * appsys: When processing apps in the menu tree, watch for and de- (#8550) + * l10n: Update POT + * l10n: Generate additional files + * runDialog.js: Go back to using the original spawnCommandLineAsync, as well as the original code using it in runDialog. + * modemManager: fix cjs warning (#8667) + * "Peek" panel for 1.5 seconds when highlighted (#8659) + * Notifications applet: proper i18n of plurals (#8645) + * st: pass framebuffer parameter to avoid excess call to get_draw_framebuffer (#8590) + * cinnamon-settings: Use global proxy settings when available (#8589) + * st: Move processing after early returns where possible (#8576) + * Workspace switcher: shade labels of empty workspaces in simple button mode (#8555) + * [email protected]: improved support for multiple batteries (#8400) + * Systray: Indicator alignment fix (#8208) + * Cinnamon Settings: Adding capability to open specific tab and choose sort type (#8333) + * Menu: Tune search results + * Cinnamon Settings: Fix search for locales with a non-Latin character set (#8674) + * cinnamon-xlet-makepot: Switch to subprocess module + * theme settings: Add capability to override some scrollbar-related Gtk settings. (#8547) + * l10n: Update POT + * Add files/usr/share/applications/cinnamon-settings-online-accounts.desktop + +------------------------------------------------------------------- +Wed May 8 05:59:43 UTC 2019 - Dead Mozay <[email protected]> + +- Added dependency without which the desktop environment stopped running boo#1134293 + +------------------------------------------------------------------- +Wed Apr 24 03:03:32 UTC 2019 - Dead Mozay <[email protected]> + +- Add cinnamon-settings.patch. Fix crash cinnamon control center boo#1133036 + +------------------------------------------------------------------- +Tue Apr 23 11:23:20 UTC 2019 - Dead Mozay <[email protected]> + +- Update to version 4.0.10: + * cinnamon-desktop-editor.py: Check for item_path before modifying it. + +------------------------------------------------------------------- +Thu Mar 14 15:30:51 UTC 2019 - Dead Mozay <[email protected]> + +- Update to version 4.0.9: + * menu/desktop editor: Run update-desktop-database on the user's applications folder when modifying a desktop entry. + * window-list: Prevent _addWindow from getting called before windows finish mapping (#8180) + * PopupSubMenu: Set sourceActor active before closing menu (#8242) + * st-private: Don't try to create shadow for empty texture (#8217) + * Cinnamon Settings: Make directly launched modules feel like standalone apps (#8146) + * GWL: Fix blurry logout/shutdown dialog icon + * RunDialog: Fix pkexec support + * gwl: Fix incorrect app group button widths on close with labels enabled (#8137) + * GWL: Launch new instances on Shift+Click + * cinnamon-settings: Fix if->elif statement + * Stock theme - fix expo workspace entry not expanding to fit scaled fonts (#8142) + * cs_default.py: Improve heuristic used to find calculator programs. + * cd_keyboard.py: Escape the accel label when setting the markup for the shortcut conflict-resolution dialog. + * cs_fonts.py: Rename title to 'Font Selection' so it doesn't conflict with the font viewer (also called 'Fonts'). + * l10n: Regenerate cs_fonts desktop file + * gwl: Always persist pinned apps' positioning after drag, fix duplicate thumbnails on init in vertical menu orientation (#8115) + * menu-applet: fix broken option `Open menu on hover` (#8117) + * gwl: Fix the thumbnail menu not closing when using Super + # keys (#8121) + * gwl: Always check the skip-taskbar hint (#8126) + * window-list: Fix icons not appearing for some apps (#8123) + * gwl: add missing icons for libreoffice actions (#8127) + * gwl: Only use notify::icon signal for un-grouped apps (#8113) + * gwl: Add support for dragging files to windows from the thumbnail menu (#8118) + * gwl: Fix a couple ungrouped mode bugs, fix thumbnail menu positioning on window add/remove (#8120) + * gwl: Fix DND ops originating from menu items leaving large gaps (#8125) + * Revert "gwl: Open new windows by holding ctrl and left clicking (#8103)" + * gwl: Open new windows by holding ctrl and left clicking + * Revert "Panel settings: Move symbolic setting to customize section" + * Update muffin minimum required version (#8076) + * grouped window list: appGroup.js: account for the desktop scale factor when determining window list item widths + * menu-applet: fix vanishing system buttons (#8107) + * Settings: Fix mintlocale-im launcher + * fix broken slideshow applet (#8099) + * AppletManager: perform _removeAppletFromPanel on idle (#8101) + * utils: Simplify URL regex to only support one layer of parentheses (#8079) ++++ 704 more lines (skipped) ++++ between /work/SRC/openSUSE:Leap:15.2/cinnamon/cinnamon.changes ++++ and /work/SRC/openSUSE:Leap:15.2/.cinnamon.new.26092/cinnamon.changes Old: ---- Cinnamon-3.6.7.tar.gz cinnamon-network-user-connections.patch cinnamon-no-gksu-requirement.patch cinnamon-settings-fix-symlink-vuln.patch New: ---- cinnamon-4.2.3.tar.gz cinnamon-fix-cogl.patch cinnamon-settings-4.2.3-tinycss2.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ cinnamon.spec ++++++ --- /var/tmp/diff_new_pack.AaVVzm/_old 2020-02-21 23:52:48.092977812 +0100 +++ /var/tmp/diff_new_pack.AaVVzm/_new 2020-02-21 23:52:48.092977812 +0100 @@ -1,7 +1,7 @@ # # spec file for package cinnamon # -# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -12,42 +12,37 @@ # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. -# Please submit bugfixes or comments via http://bugs.opensuse.org/ +# Please submit bugfixes or comments via https://bugs.opensuse.org/ # -%define __requires_exclude typelib\\((Cinnamon|St)\\) -%define __provides_exclude typelib\\(.*\\) -%define _name Cinnamon -%define _version 3.6.0 +%define _version 4.0.0 Name: cinnamon -Version: 3.6.7 +Version: 4.2.3 Release: 0 Summary: GNU/Linux Desktop featuring a traditional layout License: GPL-2.0-or-later AND LGPL-2.1-only Group: System/GUI/Other -URL: https://github.com/linuxmint/Cinnamon -Source: https://github.com/linuxmint/%{_name}/archive/%{version}.tar.gz#/%{_name}-%{version}.tar.gz +URL: https://github.com/linuxmint/cinnamon +Source: https://github.com/linuxmint/cinnamon/archive/%{version}/%{name}-%{version}.tar.gz # Some documentation for people writing branding packages, shipped in the branding-upstream package. Source1: README.Gsettings-overrides # PATCH-FIX-OPENSUSE cinnamon-wheel-and-sbin-path [email protected] -- Make full sbin paths and use wheel as a sudo group. Patch0: %{name}-wheel-and-sbin-path.patch -# PATCH-FIX-UPSTREAM cinnamon-network-user-connections.patch [email protected] -- Do not ask password everytime for wireless networks at login. -Patch1: %{name}-network-user-connections.patch # PATCH-FIX-OPENSUSE cinnamon-settings-native.patch [email protected] -- Remove foreign configuration tools and add openSUSE's native. Patch2: %{name}-settings-native.patch # PATCH-FIX-OPENSUSE cinnamon-settings-xscreensaver-path.patch boo#960165 [email protected] -- Fix xscreensaver configs path. Patch3: %{name}-settings-xscreensaver-path.patch # PATCH-FEATURE-OPENSUSE cinnamon-favourite-applications.patch [email protected] -- Remove mintinstall from favourites and add YaST. Patch4: %{name}-favourite-applications.patch -# PATCH-FIX-OPENSUSE cinnamon-fix-typelib-false-positive.patch [email protected] -- Avoid any false positives in typelib detection. -Patch5: %{name}-fix-typelib-false-positive.patch -# PATCH-FIX-OPENSUSE cinnamon-no-gksu-requirement.patch [email protected] -- Don't require gksu. -Patch6: %{name}-no-gksu-requirement.patch -# PATCH-FIX-UPSTREAM cinnamon-settings-fix-symlink-vuln.patch CVE-2018-13054 bsc#1083067 [email protected] -- Fix symlink attack vulnerability (commit 66e54f4). -Patch7: %{name}-settings-fix-symlink-vuln.patch +# PATCH-FIX-OPENSUSE cinnamon-fix-cogl.patch [email protected] -- Fix compilation with Cogl. +Patch6: %{name}-fix-cogl.patch # PATCH-FEATURE-OPENSUSE cinnamon-fallback-icewm.patch [email protected] -- Use IceWM as fallback. -Patch8: %{name}-fallback-icewm.patch +Patch7: %{name}-fallback-icewm.patch +# PATCH-FIX-OPENSUSE cinnamon-fix-typelib-false-positive.patch [email protected] -- remove false typelib(Webkit) dependency +Patch8: %{name}-fix-typelib-false-positive.patch +# PATCH-FIx-UPSTREAM cinnamon-settings-4.2.3-tinycss2.patch +Patch9: %{name}-settings-4.2.3-tinycss2.patch BuildRequires: autoconf BuildRequires: autoconf-archive BuildRequires: automake @@ -62,17 +57,16 @@ BuildRequires: libtool BuildRequires: pkgconfig BuildRequires: python3-devel +BuildRequires: python3-xml BuildRequires: update-desktop-files BuildRequires: pkgconfig(cinnamon-desktop) >= %{_version} BuildRequires: pkgconfig(cjs-1.0) -BuildRequires: pkgconfig(gnome-bluetooth-1.0) +BuildRequires: pkgconfig(dbus-glib-1) BuildRequires: pkgconfig(gobject-introspection-1.0) BuildRequires: pkgconfig(gstreamer-1.0) BuildRequires: pkgconfig(libcinnamon-menu-3.0) BuildRequires: pkgconfig(libcroco-0.6) BuildRequires: pkgconfig(libmuffin) >= %{_version} -BuildRequires: pkgconfig(libnm-glib) -BuildRequires: pkgconfig(libnm-util) BuildRequires: pkgconfig(libsoup-2.4) BuildRequires: pkgconfig(libstartup-notification-1.0) BuildRequires: pkgconfig(polkit-agent-1) @@ -84,20 +78,31 @@ Requires: cinnamon-settings-daemon >= %{_version} Requires: cjs >= %{_version} Requires: cups-pk-helper +Requires: dbus-1 Requires: gettext-runtime Requires: glib2-tools Requires: iso-country-flags-png Requires: libcinnamon-desktop-data >= %{_version} # gkbd-capplet / gkbd-keyboard-display. +Requires: gnomekbd-tools Requires: libgnomekbd Requires: muffin >= %{_version} Requires: nemo Requires: pkgconfig Requires: polkit-gnome +Requires: python3-Pillow +Requires: python3-cairo Requires: python3-gobject +Requires: python3-gobject-Gdk +Requires: python3-gobject-cairo +Requires: python3-pexpect +Requires: python3-pyinotify +Requires: python3-python-pam +Requires: python3-tinycss2 Requires: v4l-tools Requires: wget -Requires: xdg-utils +Requires: xdg-user-dirs +Requires: xdg-user-dirs-gtk Requires(post): update-alternatives Requires(postun): update-alternatives Recommends: %{name}-lang @@ -119,37 +124,13 @@ Provides: typelib-1_0-Cinnamon-0_1 = %{version} Obsoletes: typelib-1_0-Cinnamon-0_1 < %{version} %if 0%{?suse_version} >= 1500 -BuildRequires: python2-devel +BuildRequires: pkgconfig(libnm) Requires: NetworkManager-applet -Requires: python2-Pillow -Requires: python2-cairo -Requires: python2-dbus-python -Requires: python2-gobject -Requires: python2-gobject-cairo -Requires: python2-pexpect -Requires: python2-pyinotify -Requires: python2-python-pam Requires: python3-dbus-python %else -BuildRequires: python-devel +BuildRequires: pkgconfig(libnm-glib) Requires: NetworkManager-gnome -Requires: dbus-1-python Requires: dbus-1-python3 -Requires: python-Pillow -Requires: python-cairo -Requires: python-gobject -Requires: python-gobject-cairo -Requires: python-pam -Requires: python-pexpect -Requires: python-pyinotify -%endif -%if 0%{?suse_version} >= 1500 || 0%{?sle_version} >= 120200 -Requires: python3-gobject-Gdk -%if 0%{?suse_version} >= 1500 -Requires: python2-gobject-Gdk -%else -Requires: python-gobject-Gdk -%endif %endif %description @@ -189,26 +170,46 @@ This package provides upstream defaults for settings stored with GSettings and applications used by the MIME system. +%package devel-doc +Summary: Development Documentation files for Cinnamon +Group: System/GUI/Other +BuildArch: noarch +Requires: %{name} = %{version}-%{release} + +%description devel-doc +This package contains the code documentation for various Cinnamon components. + %prep -%setup -q -n %{_name}-%{version} +%setup -q -n %{name}-%{version} %patch0 -p1 -%patch1 -p1 %patch2 -p1 %patch3 -p1 %patch4 -p1 -%patch5 -p1 %patch6 -p1 %patch7 -p1 %patch8 -p1 +%patch9 -p1 cp -a %{SOURCE1} . +for file in files%{_datadir}/%{name}/%{name}-settings/bin/*.py files%{_datadir}/%{name}/%{name}-looking-glass/*.py \ + files%{_datadir}/%{name}/%{name}-settings/modules/cs_{applets,desklets}.py; do + chmod a+x $file +done +chmod a-x files%{_datadir}/%{name}/%{name}-settings/bin/__init__.py + +sed -i -e 's!imports.gi.NMClient!imports_gi_NMClient!g' js/ui/extension.js + %build NOCONFIGURE=1 ./autogen.sh %configure \ + --disable-static \ --disable-schemas-compile \ - --enable-gtk-doc \ + --disable-silent-rules \ + --enable-introspection=yes \ + --enable-compile-warnings=no \ --with-ca-certificates=%{_sysconfdir}/ssl/ca-bundle.pem -make %{?_smp_mflags} V=1 + +%make_build %install %make_install @@ -225,7 +226,7 @@ dirname $(find %{buildroot}%{_datadir} -type f -name '*.py') | sort -u | while read dir; do # Compile Python bytecode. - %py_compile . + %py3_compile . done mkdir -p %{buildroot}%{_sysconfdir}/alternatives/ @@ -233,7 +234,8 @@ ln -s %{_sysconfdir}/alternatives/default-xsession.desktop \ %{buildroot}%{_datadir}/xsessions/default.desktop -find %{buildroot} -type f -name "*.la" -delete -print +%{_bindir}/find %{buildroot}%{_libdir} -name '*.a' -print -delete +%{_bindir}/find %{buildroot}%{_libdir} -name '*.la' -print -delete %fdupes %{buildroot}%{_datadir}/ %suse_update_desktop_file %{name}-settings @@ -276,39 +278,25 @@ %files %license COPYING %doc AUTHORS README.rst debian/changelog -%dir %{_sysconfdir}/xdg/menus/ -%config %{_sysconfdir}/xdg/menus/%{name}-applications.menu -%config %{_sysconfdir}/xdg/menus/%{name}-applications-merged +%{_bindir}/* +%config(noreplace) %{_sysconfdir}/xdg/menus/* %ghost %{_sysconfdir}/alternatives/default-xsession.desktop -%{_bindir}/%{name}* -%{_bindir}/xlet-settings -%{_libexecdir}/%{name}*/ -%dir %{_libdir}/%{name}/ -%{_libdir}/%{name}/*.so -%{_libdir}/%{name}/extensions/ -# Note the requirements exclude list above. -%{_libdir}/%{name}/Cinnamon-0.1.typelib -%{_libdir}/%{name}/St-1.0.typelib +%ghost %{_sysconfdir}/alternatives/default.desktop +%{_datadir}/cinnamon-session +%{_datadir}/cinnamon-session/sessions +%{_datadir}/applications/* +%{_datadir}/dbus-1/services/org.Cinnamon.*.service +%{_datadir}/desktop-directories/* +%{_datadir}/%{name}-session/sessions/* +%exclude %{_datadir}/%{name}/theme/menu*.svg +%{_datadir}/icons/hicolor/*/*/*.svg +%{_datadir}/polkit-1/actions/org.%{name}.settings-users.policy +%{_datadir}/xsessions/* %{_datadir}/%{name}/ %{_datadir}/%{name}-background-properties -%exclude %{_datadir}/%{name}/theme/menu*.svg -%{_datadir}/%{name}-session/ -%{_datadir}/xsessions/*.desktop -%{_datadir}/applications/%{name}*.desktop -%{_datadir}/icons/hicolor/*/apps/*.* -%{_datadir}/icons/hicolor/*/*/cs-*.* -%{_datadir}/icons/hicolor/*/*/pan-*.* -%{_datadir}/icons/hicolor/*/actions/*-lock-*.* -%{_datadir}/icons/hicolor/*/actions/list-edit-*.* -%{_datadir}/icons/hicolor/*/devices/audio-*.* -%{_datadir}/icons/hicolor/*/devices/bluetooth.* -%{_datadir}/icons/hicolor/*/devices/cpu*.* -%{_mandir}/man?/*%{name}*.?%{?ext_man} -%{_datadir}/dbus-1/services/org.Cinnamon.*.service -%{_datadir}/polkit-1/actions/org.cinnamon.settings-users.policy -%dir %{_datadir}/desktop-directories/ -%{_datadir}/desktop-directories/%{name}-*.directory -%{_datadir}/gtk-doc/* +%{_libdir}/%{name}/ +%{_libexecdir}/%{name}/ +%{_mandir}/man1/* %files gschemas %{_datadir}/glib-2.0/schemas/org.cinnamon.gschema.xml @@ -317,4 +305,7 @@ %doc README.Gsettings-overrides %{_datadir}/%{name}/theme/menu*.svg +%files devel-doc +%doc %{_datadir}/gtk-doc/html/*/ + %changelog ++++++ Cinnamon-3.6.7.tar.gz -> cinnamon-4.2.3.tar.gz ++++++ ++++ 89614 lines of diff (skipped) ++++++ cinnamon-fallback-icewm.patch ++++++ --- /var/tmp/diff_new_pack.AaVVzm/_old 2020-02-21 23:52:48.480978583 +0100 +++ /var/tmp/diff_new_pack.AaVVzm/_new 2020-02-21 23:52:48.484978592 +0100 @@ -1,15 +1,14 @@ --- a/files/usr/bin/cinnamon-launcher +++ b/files/usr/bin/cinnamon-launcher -@@ -3,7 +3,7 @@ - """ Launches or restarts cinnamon - """ +@@ -11,22 +11,13 @@ import gi + gi.require_version('Gtk', '3.0') # noqa + from gi.repository import Gtk -FALLBACK_COMMAND = "metacity" +FALLBACK_COMMAND = "icewm" FALLBACK_ARGS = ("--replace",) - import os -@@ -18,15 +18,6 @@ gettext.install("cinnamon", "/usr/share/ + gettext.install("cinnamon", "/usr/share/locale") panel_process_name = None panel_cmd = None @@ -23,5 +22,5 @@ - panel_process_name = "tint2" - panel_cmd = "killall tint2; tint2 &" + def confirm_restart(): - d = Gtk.MessageDialog(parent=None, flags=0, message_type=Gtk.MessageType.WARNING, buttons=Gtk.ButtonsType.YES_NO) ++++++ cinnamon-favourite-applications.patch ++++++ --- /var/tmp/diff_new_pack.AaVVzm/_old 2020-02-21 23:52:48.492978607 +0100 +++ /var/tmp/diff_new_pack.AaVVzm/_new 2020-02-21 23:52:48.492978607 +0100 @@ -1,11 +1,11 @@ --- a/data/org.cinnamon.gschema.xml.in +++ b/data/org.cinnamon.gschema.xml.in -@@ -388,7 +388,7 @@ +@@ -412,7 +412,7 @@ </key> <key name="favorite-apps" type="as"> -- <default>[ 'firefox.desktop', 'mintinstall.desktop', 'cinnamon-settings.desktop', 'hexchat.desktop', 'gnome-terminal.desktop', 'nemo.desktop' ]</default> -+ <default>[ 'firefox.desktop', 'YaST.desktop', 'cinnamon-settings.desktop', 'pidgin.desktop', 'gnome-terminal.desktop', 'nemo.desktop' ]</default> +- <default>[ 'firefox.desktop', 'mintinstall.desktop', 'cinnamon-settings.desktop', 'hexchat.desktop', 'org.gnome.Terminal.desktop', 'nemo.desktop' ]</default> ++ <default>[ 'firefox.desktop', 'YaST.desktop', 'cinnamon-settings.desktop', 'pidgin.desktop', 'org.gnome.Terminal.desktop', 'nemo.desktop' ]</default> <_summary>List of desktop file IDs for favorite applications</_summary> <_description> The applications corresponding to these identifiers ++++++ cinnamon-fix-cogl.patch ++++++ --- a/src/Makefile.am +++ b/src/Makefile.am @@ -157,6 +157,7 @@ libcinnamon_la_SOURCES += $(cinnamon_rec noinst_PROGRAMS += test-recorder test_recorder_CPPFLAGS = $(WARN_CFLAGS) \ + $(cinnamon_cflags) \ $(TEST_CINNAMON_RECORDER_CFLAGS) \ $(ST_CFLAGS) test_recorder_LDADD = $(TEST_CINNAMON_RECORDER_LIBS) \ ++++++ cinnamon-fix-typelib-false-positive.patch ++++++ --- /var/tmp/diff_new_pack.AaVVzm/_old 2020-02-21 23:52:48.504978631 +0100 +++ /var/tmp/diff_new_pack.AaVVzm/_new 2020-02-21 23:52:48.504978631 +0100 @@ -1,6 +1,8 @@ ---- a/js/ui/indicatorManager.js -+++ b/js/ui/indicatorManager.js -@@ -1039,7 +1039,7 @@ IndicatorActor.prototype = { +Index: cinnamon-4.2.3/js/ui/indicatorManager.js +=================================================================== +--- cinnamon-4.2.3.orig/js/ui/indicatorManager.js ++++ cinnamon-4.2.3/js/ui/indicatorManager.js +@@ -1055,7 +1055,7 @@ IndicatorActor.prototype = { // FIXME: The Tooltips are an object and is render in html format. To show the real tooltips // (this._indicator.toolTip), we will need a good html parser. ++++++ cinnamon-settings-4.2.3-tinycss2.patch ++++++ Index: cinnamon-4.2.3/files/usr/share/cinnamon/cinnamon-settings/bin/CinnamonGtkSettings.py =================================================================== --- cinnamon-4.2.3.orig/files/usr/share/cinnamon/cinnamon-settings/bin/CinnamonGtkSettings.py +++ cinnamon-4.2.3/files/usr/share/cinnamon/cinnamon-settings/bin/CinnamonGtkSettings.py @@ -3,8 +3,7 @@ import os.path import signal -import tinycss -from tinycss import tokenizer +import tinycss2 import gi gi.require_version("Gtk", "3.0") @@ -87,13 +86,37 @@ class GtkCssEditor: self._path = os.path.join(GLib.get_user_config_dir(), "gtk-3.0", "gtk.css") - - self.parser = tinycss.make_parser() + rules = [] try: - self.stylesheet = self.parser.parse_stylesheet_file(self._path) + stylesheet = tinycss2.parse_stylesheet_bytes(open(self._path, 'rb').read()) + for rs in stylesheet[0]: + if type(rs) == tinycss2.ast.ParseError: + continue + rules.append(rs) + self.stylesheet = rules except FileNotFoundError: - self.stylesheet = tinycss.css21.Stylesheet(rules=[], errors=[], encoding="utf-8") + self.stylesheet = rules + + def _serialize_selector(self, rule): + at_css = "" + if type(rule) == tinycss2.ast.AtRule: + at_css += "@" + rule.at_keyword + at_css += self._serialize_prelude(rule.prelude) + return at_css + + def _serialize_prelude(self, prelude): + at_css = "" + for cv in prelude: + if type(cv) == tinycss2.ast.WhitespaceToken: + at_css += " " + elif type(cv) == tinycss2.ast.HashToken: + at_css += "#" + cv.value + elif type(cv) == tinycss2.ast.FunctionBlock: + next + else: + at_css += cv.value + return at_css.strip() def get_ruleset(self, selector_css): """ @@ -101,21 +124,30 @@ class GtkCssEditor: If it isn't currently defined, returns an empty one. """ - for rs in self.stylesheet.rules: - if rs.selector.as_css() == selector_css: - return rs + idx = 0 + for rs in self.stylesheet: + if type(rs) == tinycss2.ast.AtRule or type(rs) == tinycss2.ast.QualifiedRule: + if self._serialize_selector(rs) == selector_css: + return rs, idx + idx += 1 - new_ruleset = tinycss.css21.RuleSet(tokenizer.tokenize_flat(selector_css), [], None, None) - self.stylesheet.rules.append(new_ruleset) + new_ruleset = tinycss2.parse_one_rule(selector_css + " {}", False) + self.stylesheet.append(new_ruleset) - return new_ruleset + return new_ruleset, len(self.stylesheet) - 1 def get_declaration(self, selector, decl_name): - rs = self.get_ruleset(selector) + rs, _ = self.get_ruleset(selector) + + declarations = tinycss2.parse_declaration_list(rs.content, True, True) - for declaration in rs.declarations: + for declaration in declarations: if decl_name == declaration.name: - return declaration.value[0].value + decl_value = None + for component_value in declaration.value: + if type(component_value) == tinycss2.ast.DimensionToken: + decl_value = component_value.value + return decl_value return None @@ -124,41 +156,67 @@ class GtkCssEditor: # get modified, they become invalid (or I'm doing something wrong) self.remove_declaration(selector, decl_name) - rs = self.get_ruleset(selector) - - value_token = tokenizer.tokenize_flat(value_as_str) - - # Make a new declaration, add it to the ruleset - new_decl = tinycss.css21.Declaration(decl_name, value_token, None, None, None) + rs, idx = self.get_ruleset(selector) + # rs.content[0].value: the value of the WhitespaceToken is the actual indent + prefix = "\n\t" + if len(rs.content) > 0: + prefix = rs.content[0].value + + component_values = tinycss2.parse_component_value_list(prefix + decl_name + ": " + value_as_str + ";") + for component_value in component_values: + self.stylesheet[idx].content.append(component_value) + + def _remove_declaration_from_content(self, declaration, content): + idx = 0 + ident_idx = 0 + found_ident = False + done = False + new_content = [] + for component_value in content: + idx += 1 + if len(content) != idx and type(content[idx]) == tinycss2.ast.IdentToken and content[idx].value == declaration.name and type(component_value) == tinycss2.ast.WhitespaceToken: + continue + if type(component_value) == tinycss2.ast.IdentToken and component_value.value == declaration.name: + found_ident = True + continue + if found_ident: + if type(component_value) == tinycss2.ast.LiteralToken: + if ident_idx == 0 or done == True: + done = False + continue + if len(declaration.value) - 1 == ident_idx and component_value == declaration.value[ident_idx]: + done = True + continue + if component_value == declaration.value[ident_idx] and content[idx] == declaration.value[ident_idx + 1]: + ident_idx += 1 + continue + new_content.append(component_value) - rs.declarations.append(new_decl) + return new_content def remove_declaration(self, selector, decl_name): - rs = self.get_ruleset(selector) + rs, idx = self.get_ruleset(selector) if not rs: return - for declaration in rs.declarations: + declarations = tinycss2.parse_declaration_list(rs.content, True, True) + + for declaration in declarations: if decl_name == declaration.name: - rs.declarations.remove(declaration) + new_content = self._remove_declaration_from_content(declaration, rs.content) - if len(rs.declarations) == 0: - self.stylesheet.rules.remove(rs) + if len(new_content) == 0: + self.stylesheet.remove(rs) + break + self.stylesheet[idx].content = new_content break def save_stylesheet(self): out = "" - - for rs in self.stylesheet.rules: - out += rs.selector.as_css() + " {\n" - - for decl in rs.declarations: - out += " " + decl.name + ": " + decl.value.as_css() + ";\n" - - out += "}\n" - + for rs in self.stylesheet: + out += rs.serialize() with open(self._path, "w+") as f: f.write(out) ++++++ cinnamon-settings-native.patch ++++++ --- /var/tmp/diff_new_pack.AaVVzm/_old 2020-02-21 23:52:48.516978655 +0100 +++ /var/tmp/diff_new_pack.AaVVzm/_new 2020-02-21 23:52:48.516978655 +0100 @@ -1,18 +1,10 @@ --- a/files/usr/share/cinnamon/cinnamon-settings/cinnamon-settings.py +++ b/files/usr/share/cinnamon/cinnamon-settings/cinnamon-settings.py -@@ -79,12 +79,10 @@ STANDALONE_MODULES = [ - # Label Executable Icon Category Keywords for filter - [_("Printers"), "system-config-printer", "cs-printer", "hardware", _("printers, laser, inkjet")], - [_("Firewall"), "gufw", "cs-firewall", "admin", _("firewall, block, filter, programs")], -- [_("Languages"), "mintlocale", "cs-language", "prefs", _("language, install, foreign")], -- [_("Input Method"), "mintlocale im", "cs-input-method", "prefs", _("language, install, foreign, input, method, chinese, korean, japanese, typing")], -- [_("Login Window"), "gksu /usr/sbin/mdmsetup", "cs-login", "admin", _("login, mdm, gdm, manager, user, password, startup, switch")], -+ [_("Login Window"), "xdg-su -c /usr/sbin/mdmsetup", "cs-login", "admin", _("login, mdm, gdm, manager, user, password, startup, switch")], - [_("Login Window"), "lightdm-settings", "cs-login", "admin", _("login, lightdm, mdm, gdm, manager, user, password, startup, switch")], -- [_("Driver Manager"), "mintdrivers", "cs-drivers", "admin", _("video, driver, wifi, card, hardware, proprietary, nvidia, radeon, nouveau, fglrx")], -- [_("Software Sources"), "mintsources", "cs-sources", "admin", _("ppa, repository, package, source, download")], -+ [_("Login Window"), "xdg-su -c /usr/bin/lightdm-gtk-greeter-settings", "cs-login", "admin", _("login, lightdm, mdm, gdm, manager, user, password, startup, switch")], -+ [_("YaST"), "xdg-su -c /sbin/yast2", "yast", "admin", _("system, admin, yast2, settings")], - [_("Users and Groups"), "cinnamon-settings-users", "cs-user-accounts", "admin", _("user, users, account, accounts, group, groups, password")], - [_("Bluetooth"), "blueberry", "cs-bluetooth", "hardware", _("bluetooth, dongle, transfer, mobile")], - [_("Manage Services and Units"), "systemd-manager-pkexec", "cs-sources", "admin", _("systemd, units, services, systemctl, init")] +@@ -87,6 +87,7 @@ STANDALONE_MODULES = [ + [_("Software Sources"), "pkexec mintsources", "cs-sources", "admin", _("ppa, repository, package, source, download")], + [_("Package Management"), "dnfdragora", "cs-sources", "admin", _("update, install, repository, package, source, download")], + [_("Package Management"), "yumex-dnf", "cs-sources", "admin", _("update, install, repository, package, source, download")], ++ [_("YaST"), "xdg-su -c /sbin/yast2", "yast", "admin", _("system, admin, yast2, settings")], + [_("Users and Groups"), "cinnamon-settings-users", "cs-user-accounts", "admin", _("user, users, account, accounts, group, groups, password")], + [_("Bluetooth"), "blueberry", "cs-bluetooth", "hardware", _("bluetooth, dongle, transfer, mobile")], + [_("Manage Services and Units"), "systemd-manager-pkexec", "cs-sources", "admin", _("systemd, units, services, systemctl, init")] ++++++ cinnamon-wheel-and-sbin-path.patch ++++++ --- /var/tmp/diff_new_pack.AaVVzm/_old 2020-02-21 23:52:48.524978670 +0100 +++ /var/tmp/diff_new_pack.AaVVzm/_new 2020-02-21 23:52:48.524978670 +0100 @@ -17,7 +17,7 @@ --- a/files/usr/share/cinnamon/cinnamon-settings-users/cinnamon-settings-users.py +++ b/files/usr/share/cinnamon/cinnamon-settings-users/cinnamon-settings-users.py -@@ -153,12 +153,11 @@ class EditableEntry (Gtk.Notebook): +@@ -182,12 +182,11 @@ class EditableEntry (Gtk.Notebook): class PasswordDialog(Gtk.Dialog): @@ -31,7 +31,7 @@ self.set_modal(True) self.set_skip_taskbar_hint(True) -@@ -224,14 +223,7 @@ class PasswordDialog(Gtk.Dialog): +@@ -253,14 +252,7 @@ class PasswordDialog(Gtk.Dialog): def change_password(self): newpass = self.new_password.get_text() self.user.set_password(newpass, "") @@ -42,12 +42,12 @@ - mask.remove("nopasswdlogin") - mask = ", ".join(mask) - self.group_mask.set_text(mask) -- self.password_mask.set_text(u'\u2022\u2022\u2022\u2022\u2022\u2022') -+ self.password_mask.set_text(u'\u2022\u2022\u2022\u2022\u2022\u2022') +- self.password_mask.set_text('\u2022\u2022\u2022\u2022\u2022\u2022') ++ self.password_mask.set_text('\u2022\u2022\u2022\u2022\u2022\u2022') self.destroy() def set_passwords_visibility(self): -@@ -570,7 +562,7 @@ class Module: +@@ -599,7 +591,7 @@ class Module: model, treeiter = self.users_treeview.get_selection().get_selected() if treeiter != None: user = model[treeiter][INDEX_USER_OBJECT] @@ -56,7 +56,7 @@ response = dialog.run() def _on_groups_button_clicked(self, widget): -@@ -581,7 +573,7 @@ class Module: +@@ -610,7 +602,7 @@ class Module: response = dialog.run() if response == Gtk.ResponseType.OK: groups = dialog.get_selected_groups() @@ -65,7 +65,7 @@ groups.sort() self.groups_label.set_text(", ".join(groups)) dialog.destroy() -@@ -839,11 +831,11 @@ class Module: +@@ -876,11 +868,11 @@ class Module: pixbuf = GdkPixbuf.Pixbuf.new_from_file_at_size("/usr/share/cinnamon/faces/user-generic.png", 48, 48) description = "<b>%s</b>\n%s" % (fullname, username) piter = self.users.append(None, [new_user, pixbuf, description]) @@ -80,7 +80,7 @@ self.load_groups() dialog.destroy() -@@ -888,7 +880,7 @@ class Module: +@@ -925,7 +917,7 @@ class Module: d.set_default_response(Gtk.ResponseType.NO) r = d.run() if r == Gtk.ResponseType.YES: @@ -89,7 +89,7 @@ self.load_groups() d.destroy() -@@ -896,7 +888,7 @@ class Module: +@@ -933,7 +925,7 @@ class Module: dialog = GroupDialog(_("Group Name"), "", self.window) response = dialog.run() if response == Gtk.ResponseType.OK: @@ -98,7 +98,7 @@ self.load_groups() dialog.destroy() -@@ -907,7 +899,7 @@ class Module: +@@ -944,7 +936,7 @@ class Module: dialog = GroupDialog(_("Group Name"), group, self.window) response = dialog.run() if response == Gtk.ResponseType.OK:
