powerel7
/
gui
2
0
Fork 0
Code Issues Pull Requests Releases Activity

cinnamon package update 

Signed-off-by: guibuilder_pel7x64builder0 <guibuilder@powerel.org>
master
guibuilder_pel7x64builder0 2018-11-28 01:25:06 +01:00
parent b072649791
commit c047bcbcbd
10 changed files with 1537 additions and 43 deletions

2
SOURCES/10_cinnamon-apps.gschema.override.in Normal file
View File

@ -0,0 +1,2 @@
[org.cinnamon]
favorite-apps=['firefox.desktop', '@pkg_manager@', 'cinnamon-settings.desktop', 'org.gnome.Terminal.desktop', 'nemo.desktop']

78
SOURCES/10_cinnamon-common.gschema.override Normal file
View File

@ -0,0 +1,78 @@
[org.cinnamon]
desktop-effects-minimize-effect='traditional'
number-workspaces=4
startup-animation=true
workspace-expo-view-as-grid=true
enable-indicators=false
enabled-applets=['panel1:right:0:systray@cinnamon.org', 'panel1:left:0:menu@cinnamon.org', 'panel1:left:1:show-desktop@cinnamon.org', 'panel1:left:2:panel-launchers@cinnamon.org', 'panel1:left:3:window-list@cinnamon.org', 'panel1:right:1:keyboard@cinnamon.org', 'panel1:right:2:notifications@cinnamon.org', 'panel1:right:3:removable-drives@cinnamon.org', 'panel1:right:4:user@cinnamon.org', 'panel1:right:5:network@cinnamon.org', 'panel1:right:6:blueberry@cinnamon.org', 'panel1:right:7:power@cinnamon.org', 'panel1:right:8:calendar@cinnamon.org', 'panel1:right:9:sound@cinnamon.org']
app-menu-label='Menu'

[org.cinnamon.sounds]
login-enabled=true
login-file='/usr/share/cinnamon-control-center/sounds/login.oga'
logout-enabled=true
logout-file='/usr/share/cinnamon-control-center/sounds/logout.ogg'
switch-enabled=true
switch-file='/usr/share/cinnamon-control-center/sounds/switch.oga'
close-enabled=true
close-file='/usr/share/cinnamon-control-center/sounds/close.oga'
map-enabled=true
map-file='/usr/share/cinnamon-control-center/sounds/map.oga'
minimize-enabled=true
minimize-file='/usr/share/cinnamon-control-center/sounds/minimize.oga'
maximize-enabled=true
maximize-file='/usr/share/cinnamon-control-center/sounds/maximize.oga'
unmaximize-enabled=true
unmaximize-file='/usr/share/cinnamon-control-center/sounds/unmaximize.oga'
tile-enabled=true
tile-file='/usr/share/cinnamon-control-center/sounds/tile.oga'
plug-enabled=true
plug-file='/usr/share/cinnamon-control-center/sounds/plug.oga'
unplug-enabled=true
unplug-file='/usr/share/cinnamon-control-center/sounds/unplug.oga'

[org.cinnamon.desktop.sound]
event-sounds=true
input-feedback-sounds=false
volume-sound-enabled=true
volume-sound-file='/usr/share/cinnamon-control-center/sounds/volume.oga'

[org.cinnamon.desktop.screensaver]
ask-for-away-message=false
font-date='Noto Sans 24'
font-message='Noto Sans 14'
show-clock=true
font-time='Noto Sans 64'

[org.cinnamon.settings-daemon.peripherals.keyboard]
input-sources-switcher='alt-shift'

[org.cinnamon.desktop.background]
primary-color='#023c88'
secondary-color='#5789ca'

[org.cinnamon.desktop.interface]
menus-have-icons=true
font-name='Noto Sans 9'
gtk-overlay-scrollbars=false
gtk-theme='Mint-Y-Dark-Aqua'
icon-theme='Mint-Y-Aqua'

[org.cinnamon.desktop.wm.preferences]
button-layout=':minimize,maximize,close'
titlebar-font='Noto Sans Bold 10'
theme='Mint-Y-Dark-Aqua'

[org.cinnamon.SessionManager]
quit-delay-toggle=true
prefer-hybrid-sleep=true

[org.cinnamon.settings-daemon.plugins.xsettings]
hinting='slight'
menus-have-icons=true

[org.cinnamon.settings-daemon.plugins.power]
lock-on-suspend=true

[org.cinnamon.theme]
name='Mint-Y-Dark-Aqua'

65
SOURCES/autostart.patch
View File

@ -1,45 +1,24 @@
From eff699165095bdc150d58e8dfca98af11c9ee2af Mon Sep 17 00:00:00 2001
From: Matthias Klumpp <matthias@tenstral.net>
Date: Thu, 17 Aug 2017 04:05:46 +0200
Subject: Add autostart .desktop file for user-dirs-update

The user-dirs update was traditionally done by an Xsession.d snippet,
which does not work in a Wayland session.
To avoid duplicating the .desktop file in every distribution, we ship it
upstream.

https://bugs.freedesktop.org/show_bug.cgi?id=102303

diff --git a/Makefile.am b/Makefile.am
index 9a40e68..a3ef127 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -19,6 +19,9 @@ EXTRA_DIST= config.rpath translate.c autogen.sh \
xdgdir=$(sysconfdir)/xdg
xdg_DATA=user-dirs.conf user-dirs.defaults
Index: Cinnamon-3.6.6/files/usr/share/cinnamon-session/sessions/cinnamon.session
===================================================================
--- Cinnamon-3.6.6.orig/files/usr/share/cinnamon-session/sessions/cinnamon.session
+++ Cinnamon-3.6.6/files/usr/share/cinnamon-session/sessions/cinnamon.session
@@ -1,6 +1,6 @@
[Cinnamon Session]
Name=Cinnamon
-RequiredComponents=cinnamon;cinnamon-screensaver;nemo-autostart;nm-applet;cinnamon-killer-daemon;
+RequiredComponents=cinnamon;cinnamon-screensaver;nemo-autostart;cinnamon-killer-daemon;polkit-cinnamon-authentication-agent-1;
DesktopName=X-Cinnamon
Index: Cinnamon-3.6.6/files/usr/share/cinnamon-session/sessions/cinnamon2d.session
===================================================================
--- Cinnamon-3.6.6.orig/files/usr/share/cinnamon-session/sessions/cinnamon2d.session
+++ Cinnamon-3.6.6/files/usr/share/cinnamon-session/sessions/cinnamon2d.session
@@ -1,6 +1,6 @@
[Cinnamon Session]
Name=Cinnamon (Software Rendering)
-RequiredComponents=cinnamon2d;cinnamon-screensaver;nemo-autostart;nm-applet;cinnamon-killer-daemon;
+RequiredComponents=cinnamon2d;cinnamon-screensaver;nemo-autostart;cinnamon-killer-daemon;polkit-cinnamon-authentication-agent-1;
DesktopName=X-Cinnamon
+xdgautostartdir=$(xdgdir)/autostart
+xdgautostart_DATA = xdg-user-dirs.desktop
+
libraries = $(LIBINTL)
bin_PROGRAMS = \
diff --git a/xdg-user-dirs.desktop b/xdg-user-dirs.desktop
new file mode 100644
index 0000000..6b969d4
--- /dev/null
+++ b/xdg-user-dirs.desktop
@@ -0,0 +1,10 @@
+[Desktop Entry]
+Type=Application
+Name=User folders update
+TryExec=xdg-user-dirs-update
+Exec=xdg-user-dirs-update
+StartupNotify=false
+NoDisplay=true
+
+X-GNOME-Autostart-Phase=Initialization
+X-KDE-autostart-phase=1
--
cgit v0.10.2


13
SOURCES/default_panal_launcher.patch Normal file
View File

@ -0,0 +1,13 @@
Index: Cinnamon-3.6.6/files/usr/share/cinnamon/applets/panel-launchers@cinnamon.org/settings-schema.json
===================================================================
--- Cinnamon-3.6.6.orig/files/usr/share/cinnamon/applets/panel-launchers@cinnamon.org/settings-schema.json
+++ Cinnamon-3.6.6/files/usr/share/cinnamon/applets/panel-launchers@cinnamon.org/settings-schema.json
@@ -5,7 +5,7 @@
},
"launcherList": {
"type": "generic",
- "default": ["firefox.desktop", "org.gnome.Terminal.desktop", "nemo.desktop"]
+ "default": ["firefox.desktop", "mozilla-thunderbird.desktop", "org.gnome.Terminal.desktop", "nemo.desktop"]
},
"allow-dragging": {
"type": "switch",

10
SOURCES/polkit-cinnamon-authentication-agent-1.desktop Normal file
View File

@ -0,0 +1,10 @@
[Desktop Entry]
Name=PolicyKit Authentication Agent
Comment=PolicyKit Authentication Agent
Exec=/usr/libexec/polkit-gnome-authentication-agent-1
Terminal=false
Type=Application
Categories=
NoDisplay=true
OnlyShowIn=X-Cinnamon;
X-GNOME-AutoRestart=true

53
SOURCES/remove_crap_from_menu.patch Normal file
View File

@ -0,0 +1,53 @@
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
@@ -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>
</And>
</Include>
</Menu> <!-- End Accessories -->
@@ -38,6 +40,7 @@
<And>
<Category>Accessibility</Category>
<Not><Category>Settings</Category></Not>
+ <Not><Filename>onboard.desktop</Filename></Not>
</And>
</Include>
</Menu> <!-- End Accessibility -->
@@ -136,6 +139,9 @@
<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 @@
<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>
</And>
</Include>
</Menu>
@@ -176,6 +187,9 @@
<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 -->

12
SOURCES/replace-metacity-with-openbox.patch Normal file
View File

@ -0,0 +1,12 @@
--- Cinnamon-3.8.0.orig/files/usr/bin/cinnamon-launcher
+++ Cinnamon-3.8.0/files/usr/bin/cinnamon-launcher
@@ -11,7 +11,7 @@
gi.require_version('Gtk', '3.0') # noqa
from gi.repository import Gtk
-FALLBACK_COMMAND = "metacity"
+FALLBACK_COMMAND = "openbox"
FALLBACK_ARGS = ("--replace",)
gettext.install("cinnamon", "/usr/share/locale")

30
SOURCES/revert_25aef37.patch Normal file
View File

@ -0,0 +1,30 @@
Index: Cinnamon-3.6.6/files/usr/share/cinnamon/cinnamon-settings-users/cinnamon-settings-users.py
===================================================================
--- Cinnamon-3.6.6.orig/files/usr/share/cinnamon/cinnamon-settings-users/cinnamon-settings-users.py
+++ Cinnamon-3.6.6/files/usr/share/cinnamon/cinnamon-settings-users/cinnamon-settings-users.py
@@ -53,10 +53,9 @@
print(detail)
def _on_entry_changed(self, entry):
- name = entry.get_text()
- if " " in name or name.lower() != name:
+ if " " in entry.get_text():
entry.set_icon_from_icon_name(Gtk.EntryIconPosition.SECONDARY, "dialog-warning-symbolic")
- entry.set_icon_tooltip_text(Gtk.EntryIconPosition.SECONDARY, _("The group name cannot contain upper-case or space characters"))
+ entry.set_icon_tooltip_text(Gtk.EntryIconPosition.SECONDARY, _("The group name cannot contain space characters"))
self.set_response_sensitive(Gtk.ResponseType.OK, False)
else:
entry.set_icon_from_icon_name(Gtk.EntryIconPosition.SECONDARY, None)
@@ -367,9 +366,9 @@
fullname = self.realname_entry.get_text()
username = self.username_entry.get_text()
valid = True
- if re.search('[^a-z0-9_.-]', username):
+ if " " in username:
self.username_entry.set_icon_from_icon_name(Gtk.EntryIconPosition.SECONDARY, "dialog-warning-symbolic")
- self.username_entry.set_icon_tooltip_text(Gtk.EntryIconPosition.SECONDARY, _("Invalid username"))
+ self.username_entry.set_icon_tooltip_text(Gtk.EntryIconPosition.SECONDARY, _("The username cannot contain space characters"))
valid = False
else:
self.username_entry.set_icon_from_icon_name(Gtk.EntryIconPosition.SECONDARY, None)

59
SOURCES/set_wheel.patch Normal file
View File

@ -0,0 +1,59 @@
Index: Cinnamon-3.6.6/files/usr/share/cinnamon/cinnamon-settings-users/cinnamon-settings-users.py
===================================================================
--- Cinnamon-3.6.6.orig/files/usr/share/cinnamon/cinnamon-settings-users/cinnamon-settings-users.py
+++ Cinnamon-3.6.6/files/usr/share/cinnamon/cinnamon-settings-users/cinnamon-settings-users.py
@@ -153,12 +153,11 @@
class PasswordDialog(Gtk.Dialog):
- def __init__ (self, user, password_mask, group_mask, parent = None):
+ def __init__ (self, user, password_mask, parent = None):
super(PasswordDialog, self).__init__(None, parent)
self.user = user
self.password_mask = password_mask
- self.group_mask = group_mask
self.set_modal(True)
self.set_skip_taskbar_hint(True)
@@ -224,14 +223,7 @@
def change_password(self):
newpass = self.new_password.get_text()
self.user.set_password(newpass, "")
- mask = self.group_mask.get_text()
- if "nopasswdlogin" in mask:
- subprocess.call(["gpasswd", "-d", self.user.get_user_name(), "nopasswdlogin"])
- mask = mask.split(", ")
- mask.remove("nopasswdlogin")
- mask = ", ".join(mask)
- self.group_mask.set_text(mask)
- self.password_mask.set_text('\u2022\u2022\u2022\u2022\u2022\u2022')
+ self.password_mask.set_text(u'\u2022\u2022\u2022\u2022\u2022\u2022')
self.destroy()
def set_passwords_visibility(self):
@@ -570,7 +562,7 @@
model, treeiter = self.users_treeview.get_selection().get_selected()
if treeiter != 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)
response = dialog.run()
def _on_groups_button_clicked(self, widget):
@@ -839,11 +831,11 @@
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])
- # Add the user to his/her own group and sudo if Administrator was selected
+ # Add the user to his/her own group and wheel if Administrator was selected
if dialog.account_type_combo.get_active() == 1:
- subprocess.call(["usermod", username, "-G", "%s,sudo,nopasswdlogin" % username])
+ subprocess.call(["usermod", username, "-G", "%s,wheel" % username])
else:
- subprocess.call(["usermod", username, "-G", "%s,nopasswdlogin" % username])
+ subprocess.call(["usermod", username, "-G", "%s" % username])
self.load_groups()
dialog.destroy()

1258
SPECS/cinnamon.spec Normal file
View File

File diff suppressed because it is too large Load Diff