public inbox for git-commits@fedoraproject.org
help / color / mirror / Atom feed
From: Michal Schorm <mschorm@redhat.com>
To: git-commits@fedoraproject.org
Subject: [rpms/cinnamon] rawhide: Clean up 'remove_crap_from_menu.patch': remove stale entries, update renamed files
Date: Tue, 28 Jul 2026 07:59:07 GMT	[thread overview]
Message-ID: <178522554780.1.15565722485769692247.rpms-cinnamon-1b74409645cb@fedoraproject.org> (raw)

            A new commit has been pushed.

            Repo   : rpms/cinnamon
            Branch : rawhide
            Commit : 1b74409645cb565562ffdc410d23026254db1a20
            Author : Michal Schorm <mschorm@redhat.com>
            Date   : 2026-07-26T19:23:27+02:00
            Stats  : +7/-15 in 1 file(s)
            URL    : https://src.fedoraproject.org/rpms/cinnamon/c/1b74409645cb565562ffdc410d23026254db1a20?branch=rawhide

            Log:
            Clean up 'remove_crap_from_menu.patch': remove stale entries, update renamed files

This patch hides non-Cinnamon desktop entries from the application
menu. Several entries referenced packages or filenames that no longer
exist in Fedora, and two desktop files were renamed upstream.

Removed (packages retired from Fedora):
- 'onboard.desktop', 'onboard-settings.desktop': onboard (on-screen
  keyboard) is not packaged in Fedora
- 'system-config-users.desktop': system-config-users was retired
- 'fedora-release-notes.webapp.desktop': fedora-release-notes was
  retired

Updated (desktop files renamed upstream):
- 'yelp.desktop' -> 'org.gnome.Yelp.desktop': yelp adopted the
  reverse-DNS naming convention; the old filename is a no-op
- 'xscreensaver-properties.desktop' -> 'xscreensaver-settings.desktop':
  xscreensaver-base renamed this file; the old exclusion was a no-op

Still valid (packages exist in Fedora):
- 'org.gnome.Nautilus.desktop': nautilus (Cinnamon uses nemo)
- 'redhat-usermount.desktop': usermode-gtk
- 'redhat-userinfo.desktop': usermode-gtk
- 'redhat-userpasswd.desktop': usermode-gtk

Also updated the patch header from the stale 'Cinnamon-3.6.6'
directory reference (from the original 2017 patch, commit e52629d)
to standard 'a/' / 'b/' prefixes.

  Patch originally created: a8d3e58 (2015-07-20)
  Stale entries added: e52629d (2017-07-11, "remove more useless apps
    from menu")

Co-Authored-By: Claude AI <noreply@anthropic.com>

---
diff --git a/remove_crap_from_menu.patch b/remove_crap_from_menu.patch
index 9ff46e6..76725f2 100644
--- a/remove_crap_from_menu.patch
+++ b/remove_crap_from_menu.patch
@@ -1,45 +1,37 @@
-Index: Cinnamon-3.6.6/files/etc/xdg/menus/cinnamon-applications.menu
-===================================================================
---- Cinnamon-3.6.6.orig/files/etc/xdg/menus/cinnamon-applications.menu
-+++ Cinnamon-3.6.6/files/etc/xdg/menus/cinnamon-applications.menu
+--- a/files/etc/xdg/menus/cinnamon-applications.menu
++++ b/files/etc/xdg/menus/cinnamon-applications.menu
 @@ -26,6 +26,8 @@
  	     applications here -->
          <Not><Category>Accessibility</Category></Not>
          <Not><Category>System</Category></Not>
 +        <Not><Filename>org.gnome.Nautilus.desktop</Filename></Not>
-+        <Not><Filename>yelp.desktop</Filename></Not>
++        <Not><Filename>org.gnome.Yelp.desktop</Filename></Not>
        </And>
      </Include>
    </Menu> <!-- End Accessories -->
-@@ -136,6 +139,9 @@
+@@ -136,6 +138,7 @@
          <Not><Category>Core</Category></Not>
          <Not><Category>Settings</Category></Not>
          <Not><Category>Screensaver</Category></Not>
-+        <Not><Filename>onboard.desktop</Filename></Not>
 +        <Not><Filename>redhat-usermount.desktop</Filename></Not>
-+        <Not><Filename>fedora-release-notes.webapp.desktop</Filename></Not>
        </And>
      </Include>
    </Menu> <!-- End Other -->
-@@ -158,6 +164,11 @@
+@@ -158,6 +161,9 @@
        <And>
          <Category>Settings</Category>
          <Not><Category>System</Category></Not>
-+        <Not><Filename>onboard-settings.desktop</Filename></Not>
 +        <Not><Filename>redhat-userinfo.desktop</Filename></Not>
 +        <Not><Filename>redhat-userpasswd.desktop</Filename></Not>
-+        <Not><Filename>system-config-users.desktop</Filename></Not>
-+        <Not><Filename>xscreensaver-properties.desktop</Filename></Not>
++        <Not><Filename>xscreensaver-settings.desktop</Filename></Not>
        </And>
      </Include>
    </Menu>
-@@ -176,6 +187,9 @@
+@@ -176,6 +182,7 @@
        <And>
          <Category>System</Category>
          <Not><Category>Settings</Category></Not>
 +        <Not><Filename>redhat-usermount.desktop</Filename></Not>
-+        <Not><Filename>system-config-users.desktop</Filename></Not>
-+        <Not><Filename>fedora-release-notes.webapp.desktop</Filename></Not>
        </And>
      </Include>
    </Menu>     <!-- End System Settings -->

                 reply	other threads:[~2026-07-28  7:59 UTC|newest]

Thread overview: [no followups] expand[flat|nested]  mbox.gz  Atom feed

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=178522554780.1.15565722485769692247.rpms-cinnamon-1b74409645cb@fedoraproject.org \
    --to=mschorm@redhat.com \
    --cc=git-commits@fedoraproject.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox