Date: Monday, November 7, 2016 @ 23:05:21
Author: faidoc
Revision: 195104
archrelease: copy trunk to community-i686, community-x86_64
Added:
cinnamon/repos/community-i686/PKGBUILD
(from rev 195103, cinnamon/trunk/PKGBUILD)
cinnamon/repos/community-i686/default-theme.patch
(from rev 195103, cinnamon/trunk/default-theme.patch)
cinnamon/repos/community-i686/set_wheel.patch
(from rev 195103, cinnamon/trunk/set_wheel.patch)
cinnamon/repos/community-x86_64/PKGBUILD
(from rev 195103, cinnamon/trunk/PKGBUILD)
cinnamon/repos/community-x86_64/default-theme.patch
(from rev 195103, cinnamon/trunk/default-theme.patch)
cinnamon/repos/community-x86_64/set_wheel.patch
(from rev 195103, cinnamon/trunk/set_wheel.patch)
Deleted:
cinnamon/repos/community-i686/0001-Remove-dependency-on-GConf.patch
cinnamon/repos/community-i686/0001-removable-drives-applet-don-t-hardcode-Nemo.patch
cinnamon/repos/community-i686/PKGBUILD
cinnamon/repos/community-i686/default-theme.patch
cinnamon/repos/community-i686/set_wheel.patch
cinnamon/repos/community-x86_64/0001-Remove-dependency-on-GConf.patch
cinnamon/repos/community-x86_64/0001-removable-drives-applet-don-t-hardcode-Nemo.patch
cinnamon/repos/community-x86_64/PKGBUILD
cinnamon/repos/community-x86_64/default-theme.patch
cinnamon/repos/community-x86_64/set_wheel.patch
-------------------------------------------------------------------------+
/PKGBUILD | 228
++++++++++
/default-theme.patch | 50
++
/set_wheel.patch | 112
++++
community-i686/0001-Remove-dependency-on-GConf.patch | 118
-----
community-i686/0001-removable-drives-applet-don-t-hardcode-Nemo.patch | 39
-
community-i686/PKGBUILD | 124
-----
community-i686/default-theme.patch | 25
-
community-i686/set_wheel.patch | 56
--
community-x86_64/0001-Remove-dependency-on-GConf.patch | 118
-----
community-x86_64/0001-removable-drives-applet-don-t-hardcode-Nemo.patch | 39
-
community-x86_64/PKGBUILD | 124
-----
community-x86_64/default-theme.patch | 25
-
community-x86_64/set_wheel.patch | 56
--
13 files changed, 390 insertions(+), 724 deletions(-)
Deleted: community-i686/0001-Remove-dependency-on-GConf.patch
===================================================================
--- community-i686/0001-Remove-dependency-on-GConf.patch 2016-11-07
23:04:26 UTC (rev 195103)
+++ community-i686/0001-Remove-dependency-on-GConf.patch 2016-11-07
23:05:21 UTC (rev 195104)
@@ -1,118 +0,0 @@
-From a4da077b8098e000b7791f1de6d59102c0f4ab68 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Ball=C3=B3=20Gy=C3=B6rgy?= <ballog...@gmail.com>
-Date: Sat, 15 Oct 2016 13:08:41 +0200
-Subject: [PATCH] Remove dependency on GConf
-
-It was used only in a11y applet to get /apps/metacity/general/visual_bell
config. But metacity don't use this config a long time ago.
----
- configure.ac | 2 +-
- debian/control | 3 ---
- .../cinnamon/applets/a...@cinnamon.org/applet.js | 23 ----------------------
- 3 files changed, 1 insertion(+), 27 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index 147e108..db9e9d2 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -75,7 +75,7 @@ PKG_CHECK_MODULES(CINNAMON, gio-2.0 >= $GIO_MIN_VERSION
- gtk+-3.0 >= $GTK_MIN_VERSION
- libmuffin >= $MUFFIN_MIN_VERSION
- cjs-internals-1.0 >= $GJS_MIN_VERSION
-- libcinnamon-menu-3.0 $recorder_modules gconf-2.0
-+ libcinnamon-menu-3.0 $recorder_modules
- gdk-x11-3.0 libsoup-2.4 gl
- clutter-x11-1.0 >= $CLUTTER_MIN_VERSION
- libstartup-notification-1.0 >=
$STARTUP_NOTIFICATION_MIN_VERSION
-diff --git a/debian/control b/debian/control
-index 71df6c1..a4f0761 100644
---- a/debian/control
-+++ b/debian/control
-@@ -18,7 +18,6 @@ Build-Depends: debhelper (>= 9),
- libcaribou-dev,
- libcroco3-dev (>= 0.6.2),
- libdbus-glib-1-dev,
-- libgconf2-dev,
- libgirepository1.0-dev (>= 0.9.2),
- libglib2.0-dev (>= 2.37.3),
- libgnome-bluetooth-dev (>= 3.1.0),
-@@ -68,7 +67,6 @@ Depends: cinnamon-common (= ${source:Version}),
- gnome-icon-theme-symbolic (>= 2.91),
- ${icon-theme:Depends},
- gir1.2-accountsservice-1.0,
-- gir1.2-gconf-2.0,
- gir1.2-gkbd-3.0,
- gir1.2-gnomebluetooth-1.0,
- gir1.2-keybinder-3.0,
-@@ -91,7 +89,6 @@ Depends: cinnamon-common (= ${source:Version}),
- python3-dbus,
- python,
- python-dbus,
-- python-gconf,
- python-imaging,
- python-gi-cairo,
- python-gtk2,
-diff --git a/files/usr/share/cinnamon/applets/a...@cinnamon.org/applet.js
b/files/usr/share/cinnamon/applets/a...@cinnamon.org/applet.js
-index c92a73a..9392fbc 100644
---- a/files/usr/share/cinnamon/applets/a...@cinnamon.org/applet.js
-+++ b/files/usr/share/cinnamon/applets/a...@cinnamon.org/applet.js
-@@ -2,7 +2,6 @@ const PopupMenu = imports.ui.popupMenu;
- const Gio = imports.gi.Gio;
- const Lang = imports.lang;
- const Applet = imports.ui.applet;
--const GConf = imports.gi.GConf;
- const Main = imports.ui.main;
- const Gdk = imports.gi.Gdk;
-
-@@ -21,9 +20,6 @@ const DPI_FACTOR_LARGE = 1.25;
- const DPI_FACTOR_LARGER = 1.5;
- const DPI_FACTOR_LARGEST = 2.0;
-
--const KEY_META_DIR = '/apps/metacity/general';
--const KEY_VISUAL_BELL = KEY_META_DIR + '/visual_bell';
--
- const DESKTOP_INTERFACE_SCHEMA = 'org.cinnamon.desktop.interface';
- const KEY_GTK_THEME = 'gtk-theme';
- const KEY_ICON_THEME = 'icon-theme';
-@@ -54,9 +50,6 @@ MyApplet.prototype = {
- this.menu = new Applet.AppletPopupMenu(this, orientation);
- this.menuManager.addMenu(this.menu);
-
-- let client = GConf.Client.get_default();
-- client.add_dir(KEY_META_DIR,
GConf.ClientPreloadType.PRELOAD_ONELEVEL, null);
--
- let highContrast = this._buildHCItem();
- this.menu.addMenuItem(highContrast);
-
-@@ -75,9 +68,6 @@ MyApplet.prototype = {
-
'screen-keyboard-enabled');
- this.menu.addMenuItem(screenKeyboard);
-
-- let visualBell = this._buildItemGConf(_("Visual Alerts"), client,
KEY_VISUAL_BELL);
-- this.menu.addMenuItem(visualBell);
--
- let stickyKeys = this._buildItem(_("Sticky Keys"), A11Y_SCHEMA,
KEY_STICKY_KEYS_ENABLED);
- this.menu.addMenuItem(stickyKeys);
-
-@@ -152,19 +142,6 @@ MyApplet.prototype = {
- return widget;
- },
-
-- _buildItemGConf: function(string, client, key) {
-- function on_get() {
-- return client.get_bool(key);
-- }
-- let widget = this._buildItemExtended(string,
-- client.get_bool(key),
-- client.key_is_writable(key),
-- function(enabled) {
-- client.set_bool(key, enabled);
-- });
-- return widget;
-- },
--
- _buildItem: function(string, schema, key) {
- let settings = new Gio.Settings({ schema_id: schema });
- let widget = this._buildItemExtended(string,
---
-2.10.0
-
Deleted: community-i686/0001-removable-drives-applet-don-t-hardcode-Nemo.patch
===================================================================
--- community-i686/0001-removable-drives-applet-don-t-hardcode-Nemo.patch
2016-11-07 23:04:26 UTC (rev 195103)
+++ community-i686/0001-removable-drives-applet-don-t-hardcode-Nemo.patch
2016-11-07 23:05:21 UTC (rev 195104)
@@ -1,39 +0,0 @@
-From bbfec76b2e914df74c1ccf1a59d9a95df0294846 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Ball=C3=B3=20Gy=C3=B6rgy?= <ballog...@gmail.com>
-Date: Wed, 14 Sep 2016 14:21:34 +0200
-Subject: [PATCH] removable-drives applet: don't hardcode Nemo
-
-Use Gio to open the default file manager at home dir.
----
- .../cinnamon/applets/removable-dri...@cinnamon.org/applet.js | 9 +++++----
- 1 file changed, 5 insertions(+), 4 deletions(-)
-
-diff --git
a/files/usr/share/cinnamon/applets/removable-dri...@cinnamon.org/applet.js
b/files/usr/share/cinnamon/applets/removable-dri...@cinnamon.org/applet.js
-index b3143de..b61445c 100644
---- a/files/usr/share/cinnamon/applets/removable-dri...@cinnamon.org/applet.js
-+++ b/files/usr/share/cinnamon/applets/removable-dri...@cinnamon.org/applet.js
-@@ -1,6 +1,7 @@
- const Lang = imports.lang;
- const St = imports.gi.St;
--const Cinnamon = imports.gi.Cinnamon;
-+const GLib = imports.gi.GLib;
-+const Gio = imports.gi.Gio;
- const Applet = imports.ui.applet;
- const Main = imports.ui.main;
- const PopupMenu = imports.ui.popupMenu;
-@@ -63,9 +64,9 @@ MyApplet.prototype = {
-
- this.menu.addMenuItem(new PopupMenu.PopupSeparatorMenuItem());
- this.menu.addAction(_("Open file manager"), function(event) {
-- let appSystem = Cinnamon.AppSystem.get_default();
-- let app = appSystem.lookup_app('nemo.desktop');
-- app.activate_full(-1, event.get_time());
-+ let homeFile = Gio.file_new_for_path(GLib.get_home_dir());
-+ let homeUri = homeFile.get_uri();
-+ Gio.app_info_launch_default_for_uri(homeUri, null);
- });
-
- Main.placesManager.connect('mounts-updated', Lang.bind(this,
this._update));
---
-2.10.0
-
Deleted: community-i686/PKGBUILD
===================================================================
--- community-i686/PKGBUILD 2016-11-07 23:04:26 UTC (rev 195103)
+++ community-i686/PKGBUILD 2016-11-07 23:05:21 UTC (rev 195104)
@@ -1,124 +0,0 @@
-# $Id$
-# Maintainer: Alexandre Filgueira <alexfilgue...@cinnarch.com>
-# Contributor: M0Rf30
-# Contributor: unifiedlinux
-# Contributor: CReimer
-
-pkgname=cinnamon
-pkgver=3.0.7
-pkgrel=2
-pkgdesc="Linux desktop which provides advanced innovative features and a
traditional user experience"
-arch=('i686' 'x86_64')
-url="https://github.com/linuxmint/Cinnamon";
-license=('GPL2')
-depends=('accountsservice' 'caribou' 'cinnamon-settings-daemon'
'cinnamon-session'
- 'cinnamon-translations' 'cjs' 'clutter-gtk' 'gnome-backgrounds'
- 'gnome-themes-standard' 'gstreamer' 'libgnome-keyring'
'libkeybinder3' 'librsvg'
- 'networkmanager' 'muffin' 'python2-cairo' 'python2-dbus'
'python2-pillow'
- 'python2-pam' 'python2-pexpect' 'python2-pyinotify' 'python2-lxml'
- 'cinnamon-control-center' 'cinnamon-screensaver' 'cinnamon-menus'
'libgnomekbd'
- 'network-manager-applet' 'nemo' 'polkit-gnome')
-makedepends=('gnome-common' 'intltool' 'gtk-doc' 'gobject-introspection')
-optdepends=('blueberry: Bluetooth support'
- 'system-config-printer: printer settings')
-options=('!emptydirs')
-source=("$pkgname-$pkgver.tar.gz::https://github.com/linuxmint/Cinnamon/archive/$pkgver.tar.gz";
- "set_wheel.patch"
- "default-theme.patch"
- "0001-removable-drives-applet-don-t-hardcode-Nemo.patch"
- "0001-Remove-dependency-on-GConf.patch")
-sha256sums=('0aa0ce174a4638f54ddb2f0dc1f93a847678fa225c7a4fae718ffd14f1c8694f'
- '97542a424fa83c18c8c8a6d27c089129f30b6fb4cc128c662ac0da3aebf42dcc'
- '566585873f38a79ec248b916645a2e081abec3c6d4df2c34339cde1f35375cc5'
- '3c686ba7f180c24c845cd29ffaf431d5d0d64aa71992353ed2304b8e2a962b43'
- 'dc7e976c2868cde6c69e36516da50d985de028738c78d10017507bb1867c99ba')
-
-prepare() {
- cd ${srcdir}/Cinnamon*
-
- # Python2 fix
- sed -i 's:/usr/bin/python :/usr/bin/python2 :'
files/usr/bin/cinnamon-menu-editor
- find -type f | xargs sed -i 's@^#!.*python$@#!/usr/bin/python2@'
-
- # Use wheel group instread of sudo (taken from Fedora)
- patch -Np1 -i ../set_wheel.patch
-
- # Set default theme to 'cinnamon'
- patch -Np1 -i ../default-theme.patch
-
- # removable-drives applet: don't hardcode Nemo
- patch -Np1 -i ../0001-removable-drives-applet-don-t-hardcode-Nemo.patch
-
- # Remove dependency on GConf
- patch -Np1 -i ../0001-Remove-dependency-on-GConf.patch
-
- # Add polkit agent to required components
- sed -i
's/RequiredComponents=\(.*\)$/RequiredComponents=\1polkit-gnome-authentication-agent-1;/'
\
- files/usr/share/cinnamon-session/sessions/cinnamon*.session
-
- # Use pkexec instead of gksu
- sed -i 's/gksu/pkexec/' files/usr/bin/cinnamon-settings-users
-
- # Check for the cc-panel path, not for the unneeded binary
- sed -i
's|/usr/bin/cinnamon-control-center|/usr/lib/cinnamon-control-center-1/panels|'
\
- files/usr/bin/cinnamon-settings
-
- # Cinnamon has no upstream backgrounds, use GNOME backgrounds instead
- sed -i
's|/usr/share/cinnamon-background-properties|/usr/share/gnome-background-properties|'
\
- files/usr/share/cinnamon/cinnamon-settings/modules/cs_backgrounds.py
-
- # Fix selected background color in Cinnamon Settings for Adwaita theme
- sed -i 's/@selected_bg_color;/@theme_selected_bg_color;/' \
- files/usr/share/cinnamon/cinnamon-settings/cinnamon-settings.py
-
- # GNOME Terminal desktop file was renamed in GNOME 3.20
- sed -i 's/gnome-terminal.desktop/org.gnome.Terminal.desktop/'
data/org.cinnamon.gschema.xml.in \
-
files/usr/share/cinnamon/applets/panel-launch...@cinnamon.org/settings-schema.json
-
- # Replace MintInstall with GNOME Software
- sed -i 's/mintinstall.desktop/org.gnome.Software.desktop/'
data/org.cinnamon.gschema.xml.in
-
- # Fix missing icons with the Adwaita theme
- sed -i 's/"gtk-file"/"text-x-preview"/'
docs/applets-examples/fin...@cinnamon.org/applet.js src/cinnamon-util.c
- sed -i "s/SECONDARY, 'ok'/SECONDARY, 'gtk-ok'/
- s/SECONDARY, 'stop'/SECONDARY, 'process-stop'/"
files/usr/share/cinnamon/cinnamon-desktop-editor/cinnamon-desktop-editor.py
- sed -i "s/'gnome-panel-launcher'/'system-run'/"
files/usr/share/cinnamon/cinnamon-desktop-editor/cinnamon-desktop-editor.py
- sed -i 's/icon_name">gnome-panel-launcher/icon_name">system-run/'
files/usr/share/cinnamon/cinnamon-desktop-editor/launcher-editor.ui
- sed -i 's/"reload"/"view-refresh"/'
files/usr/share/cinnamon/cinnamon-settings-users/cinnamon-settings-users.py
- sed -i 's/"gtk-dialog-question"/"dialog-question"/
- s/"gtk-directory"/"folder"/'
files/usr/share/cinnamon/cinnamon-settings/modules/cs_default.py
- sed -i 's/"display"/"video-display"/
- s/"access"/"preferences-desktop-accessibility"/
- s/"gnome-panel-launcher"/"system-run"/'
files/usr/share/cinnamon/cinnamon-settings/modules/cs_keyboard.py
- sed -i 's/"reload"/"view-refresh"/'
files/usr/share/cinnamon/cinnamon-settings/modules/cs_user.py
- sed -i 's/"stock_calendar"/"x-office-calendar"/'
files/usr/share/cinnamon/applets/calen...@cinnamon.org/metadata.json
- sed -i 's/"keyboard"/"input-keyboard"/'
files/usr/share/cinnamon/applets/keybo...@cinnamon.org/metadata.json
- sed -i 's/"desktop"/"user-desktop"/'
files/usr/share/cinnamon/applets/show-desk...@cinnamon.org/metadata.json
- sed -i 's/"stock_volume"/"audio-volume-high"/'
files/usr/share/cinnamon/applets/so...@cinnamon.org/metadata.json
- sed -i 's/"stock_calendar"/"x-office-calendar"/'
files/usr/share/cinnamon/desklets/cl...@cinnamon.org/metadata.json
-
- # Remove broken symlink
- rm files/etc/xdg/menus/cinnamon-applications-merged
-}
-
-build() {
- cd ${srcdir}/Cinnamon*
-
- ./autogen.sh --prefix=/usr \
- --sysconfdir=/etc \
- --libexecdir=/usr/lib/cinnamon \
- --localstatedir=/var \
- --disable-static \
- --disable-schemas-compile \
- --enable-compile-warnings=yes
-
- #https://bugzilla.gnome.org/show_bug.cgi?id=656231
- sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool
-
- make
-}
-
-package() {
- cd ${srcdir}/Cinnamon*
- make DESTDIR="${pkgdir}" install
-}
Copied: cinnamon/repos/community-i686/PKGBUILD (from rev 195103,
cinnamon/trunk/PKGBUILD)
===================================================================
--- community-i686/PKGBUILD (rev 0)
+++ community-i686/PKGBUILD 2016-11-07 23:05:21 UTC (rev 195104)
@@ -0,0 +1,114 @@
+# $Id$
+# Maintainer: Alexandre Filgueira <alexfilgue...@cinnarch.com>
+# Contributor: M0Rf30
+# Contributor: unifiedlinux
+# Contributor: CReimer
+
+pkgname=cinnamon
+pkgver=3.2.0
+pkgrel=1
+pkgdesc="Linux desktop which provides advanced innovative features and a
traditional user experience"
+arch=('i686' 'x86_64')
+url="https://github.com/linuxmint/Cinnamon";
+license=('GPL2')
+depends=('accountsservice' 'caribou' 'cinnamon-settings-daemon'
'cinnamon-session'
+ 'cinnamon-translations' 'cjs' 'clutter-gtk' 'gnome-backgrounds'
+ 'gnome-themes-standard' 'gstreamer' 'libgnome-keyring'
'libkeybinder3' 'librsvg'
+ 'networkmanager' 'muffin' 'python2-cairo' 'python2-dbus'
'python2-pillow'
+ 'python2-pam' 'python2-pexpect' 'python2-pyinotify' 'python2-lxml'
+ 'cinnamon-control-center' 'cinnamon-screensaver' 'cinnamon-menus'
'libgnomekbd'
+ 'network-manager-applet' 'nemo' 'polkit-gnome')
+makedepends=('gnome-common' 'intltool' 'gtk-doc' 'gobject-introspection')
+optdepends=('blueberry: Bluetooth support'
+ 'system-config-printer: printer settings')
+options=('!emptydirs')
+source=("$pkgname-$pkgver.tar.gz::https://github.com/linuxmint/Cinnamon/archive/$pkgver.tar.gz";
+ "set_wheel.patch"
+ "default-theme.patch")
+sha256sums=('c1473aabb01329c07bf1e28148cb410255700f4dd237195b7790e9bcdb69b89d'
+ '97542a424fa83c18c8c8a6d27c089129f30b6fb4cc128c662ac0da3aebf42dcc'
+ '566585873f38a79ec248b916645a2e081abec3c6d4df2c34339cde1f35375cc5')
+
+prepare() {
+ cd ${srcdir}/Cinnamon*
+
+ # Python2 fix
+ sed -i 's:/usr/bin/python :/usr/bin/python2 :'
files/usr/bin/cinnamon-menu-editor
+ find -type f | xargs sed -i 's@^#!.*python$@#!/usr/bin/python2@'
+
+ # Use wheel group instread of sudo (taken from Fedora)
+ patch -Np1 -i ../set_wheel.patch
+
+ # Set default theme to 'cinnamon'
+ patch -Np1 -i ../default-theme.patch
+
+ # Add polkit agent to required components
+ sed -i
's/RequiredComponents=\(.*\)$/RequiredComponents=\1polkit-gnome-authentication-agent-1;/'
\
+ files/usr/share/cinnamon-session/sessions/cinnamon*.session
+
+ # Use pkexec instead of gksu
+ sed -i 's/gksu/pkexec/' files/usr/bin/cinnamon-settings-users
+
+ # Check for the cc-panel path, not for the unneeded binary
+ sed -i
's|/usr/bin/cinnamon-control-center|/usr/lib/cinnamon-control-center-1/panels|'
\
+ files/usr/bin/cinnamon-settings
+
+ # Cinnamon has no upstream backgrounds, use GNOME backgrounds instead
+ sed -i
's|/usr/share/cinnamon-background-properties|/usr/share/gnome-background-properties|'
\
+ files/usr/share/cinnamon/cinnamon-settings/modules/cs_backgrounds.py
+
+ # Fix selected background color in Cinnamon Settings for Adwaita theme
+ sed -i 's/@selected_bg_color;/@theme_selected_bg_color;/' \
+ files/usr/share/cinnamon/cinnamon-settings/cinnamon-settings.py
+
+ # GNOME Terminal desktop file was renamed in GNOME 3.20
+ sed -i 's/gnome-terminal.desktop/org.gnome.Terminal.desktop/'
data/org.cinnamon.gschema.xml.in \
+
files/usr/share/cinnamon/applets/panel-launch...@cinnamon.org/settings-schema.json
+
+ # Replace MintInstall with GNOME Software
+ sed -i 's/mintinstall.desktop/org.gnome.Software.desktop/'
data/org.cinnamon.gschema.xml.in
+
+ # Fix missing icons with the Adwaita theme
+ sed -i 's/"gtk-file"/"text-x-preview"/'
docs/applets-examples/fin...@cinnamon.org/applet.js src/cinnamon-util.c
+ sed -i "s/SECONDARY, 'ok'/SECONDARY, 'gtk-ok'/
+ s/SECONDARY, 'stop'/SECONDARY, 'process-stop'/"
files/usr/share/cinnamon/cinnamon-desktop-editor/cinnamon-desktop-editor.py
+ sed -i "s/'gnome-panel-launcher'/'system-run'/"
files/usr/share/cinnamon/cinnamon-desktop-editor/cinnamon-desktop-editor.py
+ sed -i 's/icon_name">gnome-panel-launcher/icon_name">system-run/'
files/usr/share/cinnamon/cinnamon-desktop-editor/launcher-editor.ui
+ sed -i 's/"reload"/"view-refresh"/'
files/usr/share/cinnamon/cinnamon-settings-users/cinnamon-settings-users.py
+ sed -i 's/"gtk-dialog-question"/"dialog-question"/
+ s/"gtk-directory"/"folder"/'
files/usr/share/cinnamon/cinnamon-settings/modules/cs_default.py
+ sed -i 's/"display"/"video-display"/
+ s/"access"/"preferences-desktop-accessibility"/
+ s/"gnome-panel-launcher"/"system-run"/'
files/usr/share/cinnamon/cinnamon-settings/modules/cs_keyboard.py
+ sed -i 's/"reload"/"view-refresh"/'
files/usr/share/cinnamon/cinnamon-settings/modules/cs_user.py
+ sed -i 's/"stock_calendar"/"x-office-calendar"/'
files/usr/share/cinnamon/applets/calen...@cinnamon.org/metadata.json
+ sed -i 's/"keyboard"/"input-keyboard"/'
files/usr/share/cinnamon/applets/keybo...@cinnamon.org/metadata.json
+ sed -i 's/"desktop"/"user-desktop"/'
files/usr/share/cinnamon/applets/show-desk...@cinnamon.org/metadata.json
+ sed -i 's/"stock_volume"/"audio-volume-high"/'
files/usr/share/cinnamon/applets/so...@cinnamon.org/metadata.json
+ sed -i 's/"stock_calendar"/"x-office-calendar"/'
files/usr/share/cinnamon/desklets/cl...@cinnamon.org/metadata.json
+
+ # Remove broken symlink
+ rm files/etc/xdg/menus/cinnamon-applications-merged
+}
+
+build() {
+ cd ${srcdir}/Cinnamon*
+
+ ./autogen.sh --prefix=/usr \
+ --sysconfdir=/etc \
+ --libexecdir=/usr/lib/cinnamon \
+ --localstatedir=/var \
+ --disable-static \
+ --disable-schemas-compile \
+ --enable-compile-warnings=yes
+
+ #https://bugzilla.gnome.org/show_bug.cgi?id=656231
+ sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool
+
+ make
+}
+
+package() {
+ cd ${srcdir}/Cinnamon*
+ make DESTDIR="${pkgdir}" install
+}
Deleted: community-i686/default-theme.patch
===================================================================
--- community-i686/default-theme.patch 2016-11-07 23:04:26 UTC (rev 195103)
+++ community-i686/default-theme.patch 2016-11-07 23:05:21 UTC (rev 195104)
@@ -1,25 +0,0 @@
-From 36af45f699daa886a3c3fc3187e0b24b193294ad Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Ball=C3=B3=20Gy=C3=B6rgy?= <ballog...@gmail.com>
-Date: Sat, 22 Nov 2014 22:39:39 +0100
-Subject: [PATCH] Set default theme to 'cinnamon'
-
----
- data/org.cinnamon.gschema.xml.in | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/data/org.cinnamon.gschema.xml.in
b/data/org.cinnamon.gschema.xml.in
-index 91fa171..9f56e4c 100644
---- a/data/org.cinnamon.gschema.xml.in
-+++ b/data/org.cinnamon.gschema.xml.in
-@@ -581,7 +581,7 @@
- <schema id="org.cinnamon.theme" path="/org/cinnamon/theme/"
- gettext-domain="@GETTEXT_PACKAGE@">
- <key name="name" type="s">
-- <default>""</default>
-+ <default>"cinnamon"</default>
- <_summary>Theme name</_summary>
- <_description>
- The name of the theme
---
-2.1.3
-
Copied: cinnamon/repos/community-i686/default-theme.patch (from rev 195103,
cinnamon/trunk/default-theme.patch)
===================================================================
--- community-i686/default-theme.patch (rev 0)
+++ community-i686/default-theme.patch 2016-11-07 23:05:21 UTC (rev 195104)
@@ -0,0 +1,25 @@
+From 36af45f699daa886a3c3fc3187e0b24b193294ad Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Ball=C3=B3=20Gy=C3=B6rgy?= <ballog...@gmail.com>
+Date: Sat, 22 Nov 2014 22:39:39 +0100
+Subject: [PATCH] Set default theme to 'cinnamon'
+
+---
+ data/org.cinnamon.gschema.xml.in | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/data/org.cinnamon.gschema.xml.in
b/data/org.cinnamon.gschema.xml.in
+index 91fa171..9f56e4c 100644
+--- a/data/org.cinnamon.gschema.xml.in
++++ b/data/org.cinnamon.gschema.xml.in
+@@ -581,7 +581,7 @@
+ <schema id="org.cinnamon.theme" path="/org/cinnamon/theme/"
+ gettext-domain="@GETTEXT_PACKAGE@">
+ <key name="name" type="s">
+- <default>""</default>
++ <default>"cinnamon"</default>
+ <_summary>Theme name</_summary>
+ <_description>
+ The name of the theme
+--
+2.1.3
+
Deleted: community-i686/set_wheel.patch
===================================================================
--- community-i686/set_wheel.patch 2016-11-07 23:04:26 UTC (rev 195103)
+++ community-i686/set_wheel.patch 2016-11-07 23:05:21 UTC (rev 195104)
@@ -1,56 +0,0 @@
----
a/files/usr/share/cinnamon/cinnamon-settings-users/cinnamon-settings-users.py
-+++
b/files/usr/share/cinnamon/cinnamon-settings-users/cinnamon-settings-users.py
-@@ -147,12 +147,11 @@
-
- class PasswordDialog(Gtk.Dialog):
-
-- def __init__ (self, user, password_mask, group_mask):
-+ def __init__ (self, user, password_mask):
- super(PasswordDialog, self).__init__()
-
- self.user = user
- self.password_mask = password_mask
-- self.group_mask = group_mask
-
- self.set_modal(True)
- self.set_skip_taskbar_hint(True)
-@@ -218,14 +217,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(u'\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):
-@@ -563,7 +555,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)
-+ dialog = PasswordDialog(user, self.password_mask)
- response = dialog.run()
-
- def _on_groups_button_clicked(self, widget):
-@@ -807,11 +799,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()
-
Copied: cinnamon/repos/community-i686/set_wheel.patch (from rev 195103,
cinnamon/trunk/set_wheel.patch)
===================================================================
--- community-i686/set_wheel.patch (rev 0)
+++ community-i686/set_wheel.patch 2016-11-07 23:05:21 UTC (rev 195104)
@@ -0,0 +1,56 @@
+---
a/files/usr/share/cinnamon/cinnamon-settings-users/cinnamon-settings-users.py
++++
b/files/usr/share/cinnamon/cinnamon-settings-users/cinnamon-settings-users.py
+@@ -147,12 +147,11 @@
+
+ class PasswordDialog(Gtk.Dialog):
+
+- def __init__ (self, user, password_mask, group_mask):
++ def __init__ (self, user, password_mask):
+ super(PasswordDialog, self).__init__()
+
+ self.user = user
+ self.password_mask = password_mask
+- self.group_mask = group_mask
+
+ self.set_modal(True)
+ self.set_skip_taskbar_hint(True)
+@@ -218,14 +217,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(u'\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):
+@@ -563,7 +555,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)
++ dialog = PasswordDialog(user, self.password_mask)
+ response = dialog.run()
+
+ def _on_groups_button_clicked(self, widget):
+@@ -807,11 +799,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()
+
Deleted: community-x86_64/0001-Remove-dependency-on-GConf.patch
===================================================================
--- community-x86_64/0001-Remove-dependency-on-GConf.patch 2016-11-07
23:04:26 UTC (rev 195103)
+++ community-x86_64/0001-Remove-dependency-on-GConf.patch 2016-11-07
23:05:21 UTC (rev 195104)
@@ -1,118 +0,0 @@
-From a4da077b8098e000b7791f1de6d59102c0f4ab68 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Ball=C3=B3=20Gy=C3=B6rgy?= <ballog...@gmail.com>
-Date: Sat, 15 Oct 2016 13:08:41 +0200
-Subject: [PATCH] Remove dependency on GConf
-
-It was used only in a11y applet to get /apps/metacity/general/visual_bell
config. But metacity don't use this config a long time ago.
----
- configure.ac | 2 +-
- debian/control | 3 ---
- .../cinnamon/applets/a...@cinnamon.org/applet.js | 23 ----------------------
- 3 files changed, 1 insertion(+), 27 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index 147e108..db9e9d2 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -75,7 +75,7 @@ PKG_CHECK_MODULES(CINNAMON, gio-2.0 >= $GIO_MIN_VERSION
- gtk+-3.0 >= $GTK_MIN_VERSION
- libmuffin >= $MUFFIN_MIN_VERSION
- cjs-internals-1.0 >= $GJS_MIN_VERSION
-- libcinnamon-menu-3.0 $recorder_modules gconf-2.0
-+ libcinnamon-menu-3.0 $recorder_modules
- gdk-x11-3.0 libsoup-2.4 gl
- clutter-x11-1.0 >= $CLUTTER_MIN_VERSION
- libstartup-notification-1.0 >=
$STARTUP_NOTIFICATION_MIN_VERSION
-diff --git a/debian/control b/debian/control
-index 71df6c1..a4f0761 100644
---- a/debian/control
-+++ b/debian/control
-@@ -18,7 +18,6 @@ Build-Depends: debhelper (>= 9),
- libcaribou-dev,
- libcroco3-dev (>= 0.6.2),
- libdbus-glib-1-dev,
-- libgconf2-dev,
- libgirepository1.0-dev (>= 0.9.2),
- libglib2.0-dev (>= 2.37.3),
- libgnome-bluetooth-dev (>= 3.1.0),
-@@ -68,7 +67,6 @@ Depends: cinnamon-common (= ${source:Version}),
- gnome-icon-theme-symbolic (>= 2.91),
- ${icon-theme:Depends},
- gir1.2-accountsservice-1.0,
-- gir1.2-gconf-2.0,
- gir1.2-gkbd-3.0,
- gir1.2-gnomebluetooth-1.0,
- gir1.2-keybinder-3.0,
-@@ -91,7 +89,6 @@ Depends: cinnamon-common (= ${source:Version}),
- python3-dbus,
- python,
- python-dbus,
-- python-gconf,
- python-imaging,
- python-gi-cairo,
- python-gtk2,
-diff --git a/files/usr/share/cinnamon/applets/a...@cinnamon.org/applet.js
b/files/usr/share/cinnamon/applets/a...@cinnamon.org/applet.js
-index c92a73a..9392fbc 100644
---- a/files/usr/share/cinnamon/applets/a...@cinnamon.org/applet.js
-+++ b/files/usr/share/cinnamon/applets/a...@cinnamon.org/applet.js
-@@ -2,7 +2,6 @@ const PopupMenu = imports.ui.popupMenu;
- const Gio = imports.gi.Gio;
- const Lang = imports.lang;
- const Applet = imports.ui.applet;
--const GConf = imports.gi.GConf;
- const Main = imports.ui.main;
- const Gdk = imports.gi.Gdk;
-
-@@ -21,9 +20,6 @@ const DPI_FACTOR_LARGE = 1.25;
- const DPI_FACTOR_LARGER = 1.5;
- const DPI_FACTOR_LARGEST = 2.0;
-
--const KEY_META_DIR = '/apps/metacity/general';
--const KEY_VISUAL_BELL = KEY_META_DIR + '/visual_bell';
--
- const DESKTOP_INTERFACE_SCHEMA = 'org.cinnamon.desktop.interface';
- const KEY_GTK_THEME = 'gtk-theme';
- const KEY_ICON_THEME = 'icon-theme';
-@@ -54,9 +50,6 @@ MyApplet.prototype = {
- this.menu = new Applet.AppletPopupMenu(this, orientation);
- this.menuManager.addMenu(this.menu);
-
-- let client = GConf.Client.get_default();
-- client.add_dir(KEY_META_DIR,
GConf.ClientPreloadType.PRELOAD_ONELEVEL, null);
--
- let highContrast = this._buildHCItem();
- this.menu.addMenuItem(highContrast);
-
-@@ -75,9 +68,6 @@ MyApplet.prototype = {
-
'screen-keyboard-enabled');
- this.menu.addMenuItem(screenKeyboard);
-
-- let visualBell = this._buildItemGConf(_("Visual Alerts"), client,
KEY_VISUAL_BELL);
-- this.menu.addMenuItem(visualBell);
--
- let stickyKeys = this._buildItem(_("Sticky Keys"), A11Y_SCHEMA,
KEY_STICKY_KEYS_ENABLED);
- this.menu.addMenuItem(stickyKeys);
-
-@@ -152,19 +142,6 @@ MyApplet.prototype = {
- return widget;
- },
-
-- _buildItemGConf: function(string, client, key) {
-- function on_get() {
-- return client.get_bool(key);
-- }
-- let widget = this._buildItemExtended(string,
-- client.get_bool(key),
-- client.key_is_writable(key),
-- function(enabled) {
-- client.set_bool(key, enabled);
-- });
-- return widget;
-- },
--
- _buildItem: function(string, schema, key) {
- let settings = new Gio.Settings({ schema_id: schema });
- let widget = this._buildItemExtended(string,
---
-2.10.0
-
Deleted: community-x86_64/0001-removable-drives-applet-don-t-hardcode-Nemo.patch
===================================================================
--- community-x86_64/0001-removable-drives-applet-don-t-hardcode-Nemo.patch
2016-11-07 23:04:26 UTC (rev 195103)
+++ community-x86_64/0001-removable-drives-applet-don-t-hardcode-Nemo.patch
2016-11-07 23:05:21 UTC (rev 195104)
@@ -1,39 +0,0 @@
-From bbfec76b2e914df74c1ccf1a59d9a95df0294846 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Ball=C3=B3=20Gy=C3=B6rgy?= <ballog...@gmail.com>
-Date: Wed, 14 Sep 2016 14:21:34 +0200
-Subject: [PATCH] removable-drives applet: don't hardcode Nemo
-
-Use Gio to open the default file manager at home dir.
----
- .../cinnamon/applets/removable-dri...@cinnamon.org/applet.js | 9 +++++----
- 1 file changed, 5 insertions(+), 4 deletions(-)
-
-diff --git
a/files/usr/share/cinnamon/applets/removable-dri...@cinnamon.org/applet.js
b/files/usr/share/cinnamon/applets/removable-dri...@cinnamon.org/applet.js
-index b3143de..b61445c 100644
---- a/files/usr/share/cinnamon/applets/removable-dri...@cinnamon.org/applet.js
-+++ b/files/usr/share/cinnamon/applets/removable-dri...@cinnamon.org/applet.js
-@@ -1,6 +1,7 @@
- const Lang = imports.lang;
- const St = imports.gi.St;
--const Cinnamon = imports.gi.Cinnamon;
-+const GLib = imports.gi.GLib;
-+const Gio = imports.gi.Gio;
- const Applet = imports.ui.applet;
- const Main = imports.ui.main;
- const PopupMenu = imports.ui.popupMenu;
-@@ -63,9 +64,9 @@ MyApplet.prototype = {
-
- this.menu.addMenuItem(new PopupMenu.PopupSeparatorMenuItem());
- this.menu.addAction(_("Open file manager"), function(event) {
-- let appSystem = Cinnamon.AppSystem.get_default();
-- let app = appSystem.lookup_app('nemo.desktop');
-- app.activate_full(-1, event.get_time());
-+ let homeFile = Gio.file_new_for_path(GLib.get_home_dir());
-+ let homeUri = homeFile.get_uri();
-+ Gio.app_info_launch_default_for_uri(homeUri, null);
- });
-
- Main.placesManager.connect('mounts-updated', Lang.bind(this,
this._update));
---
-2.10.0
-
Deleted: community-x86_64/PKGBUILD
===================================================================
--- community-x86_64/PKGBUILD 2016-11-07 23:04:26 UTC (rev 195103)
+++ community-x86_64/PKGBUILD 2016-11-07 23:05:21 UTC (rev 195104)
@@ -1,124 +0,0 @@
-# $Id$
-# Maintainer: Alexandre Filgueira <alexfilgue...@cinnarch.com>
-# Contributor: M0Rf30
-# Contributor: unifiedlinux
-# Contributor: CReimer
-
-pkgname=cinnamon
-pkgver=3.0.7
-pkgrel=2
-pkgdesc="Linux desktop which provides advanced innovative features and a
traditional user experience"
-arch=('i686' 'x86_64')
-url="https://github.com/linuxmint/Cinnamon";
-license=('GPL2')
-depends=('accountsservice' 'caribou' 'cinnamon-settings-daemon'
'cinnamon-session'
- 'cinnamon-translations' 'cjs' 'clutter-gtk' 'gnome-backgrounds'
- 'gnome-themes-standard' 'gstreamer' 'libgnome-keyring'
'libkeybinder3' 'librsvg'
- 'networkmanager' 'muffin' 'python2-cairo' 'python2-dbus'
'python2-pillow'
- 'python2-pam' 'python2-pexpect' 'python2-pyinotify' 'python2-lxml'
- 'cinnamon-control-center' 'cinnamon-screensaver' 'cinnamon-menus'
'libgnomekbd'
- 'network-manager-applet' 'nemo' 'polkit-gnome')
-makedepends=('gnome-common' 'intltool' 'gtk-doc' 'gobject-introspection')
-optdepends=('blueberry: Bluetooth support'
- 'system-config-printer: printer settings')
-options=('!emptydirs')
-source=("$pkgname-$pkgver.tar.gz::https://github.com/linuxmint/Cinnamon/archive/$pkgver.tar.gz";
- "set_wheel.patch"
- "default-theme.patch"
- "0001-removable-drives-applet-don-t-hardcode-Nemo.patch"
- "0001-Remove-dependency-on-GConf.patch")
-sha256sums=('0aa0ce174a4638f54ddb2f0dc1f93a847678fa225c7a4fae718ffd14f1c8694f'
- '97542a424fa83c18c8c8a6d27c089129f30b6fb4cc128c662ac0da3aebf42dcc'
- '566585873f38a79ec248b916645a2e081abec3c6d4df2c34339cde1f35375cc5'
- '3c686ba7f180c24c845cd29ffaf431d5d0d64aa71992353ed2304b8e2a962b43'
- 'dc7e976c2868cde6c69e36516da50d985de028738c78d10017507bb1867c99ba')
-
-prepare() {
- cd ${srcdir}/Cinnamon*
-
- # Python2 fix
- sed -i 's:/usr/bin/python :/usr/bin/python2 :'
files/usr/bin/cinnamon-menu-editor
- find -type f | xargs sed -i 's@^#!.*python$@#!/usr/bin/python2@'
-
- # Use wheel group instread of sudo (taken from Fedora)
- patch -Np1 -i ../set_wheel.patch
-
- # Set default theme to 'cinnamon'
- patch -Np1 -i ../default-theme.patch
-
- # removable-drives applet: don't hardcode Nemo
- patch -Np1 -i ../0001-removable-drives-applet-don-t-hardcode-Nemo.patch
-
- # Remove dependency on GConf
- patch -Np1 -i ../0001-Remove-dependency-on-GConf.patch
-
- # Add polkit agent to required components
- sed -i
's/RequiredComponents=\(.*\)$/RequiredComponents=\1polkit-gnome-authentication-agent-1;/'
\
- files/usr/share/cinnamon-session/sessions/cinnamon*.session
-
- # Use pkexec instead of gksu
- sed -i 's/gksu/pkexec/' files/usr/bin/cinnamon-settings-users
-
- # Check for the cc-panel path, not for the unneeded binary
- sed -i
's|/usr/bin/cinnamon-control-center|/usr/lib/cinnamon-control-center-1/panels|'
\
- files/usr/bin/cinnamon-settings
-
- # Cinnamon has no upstream backgrounds, use GNOME backgrounds instead
- sed -i
's|/usr/share/cinnamon-background-properties|/usr/share/gnome-background-properties|'
\
- files/usr/share/cinnamon/cinnamon-settings/modules/cs_backgrounds.py
-
- # Fix selected background color in Cinnamon Settings for Adwaita theme
- sed -i 's/@selected_bg_color;/@theme_selected_bg_color;/' \
- files/usr/share/cinnamon/cinnamon-settings/cinnamon-settings.py
-
- # GNOME Terminal desktop file was renamed in GNOME 3.20
- sed -i 's/gnome-terminal.desktop/org.gnome.Terminal.desktop/'
data/org.cinnamon.gschema.xml.in \
-
files/usr/share/cinnamon/applets/panel-launch...@cinnamon.org/settings-schema.json
-
- # Replace MintInstall with GNOME Software
- sed -i 's/mintinstall.desktop/org.gnome.Software.desktop/'
data/org.cinnamon.gschema.xml.in
-
- # Fix missing icons with the Adwaita theme
- sed -i 's/"gtk-file"/"text-x-preview"/'
docs/applets-examples/fin...@cinnamon.org/applet.js src/cinnamon-util.c
- sed -i "s/SECONDARY, 'ok'/SECONDARY, 'gtk-ok'/
- s/SECONDARY, 'stop'/SECONDARY, 'process-stop'/"
files/usr/share/cinnamon/cinnamon-desktop-editor/cinnamon-desktop-editor.py
- sed -i "s/'gnome-panel-launcher'/'system-run'/"
files/usr/share/cinnamon/cinnamon-desktop-editor/cinnamon-desktop-editor.py
- sed -i 's/icon_name">gnome-panel-launcher/icon_name">system-run/'
files/usr/share/cinnamon/cinnamon-desktop-editor/launcher-editor.ui
- sed -i 's/"reload"/"view-refresh"/'
files/usr/share/cinnamon/cinnamon-settings-users/cinnamon-settings-users.py
- sed -i 's/"gtk-dialog-question"/"dialog-question"/
- s/"gtk-directory"/"folder"/'
files/usr/share/cinnamon/cinnamon-settings/modules/cs_default.py
- sed -i 's/"display"/"video-display"/
- s/"access"/"preferences-desktop-accessibility"/
- s/"gnome-panel-launcher"/"system-run"/'
files/usr/share/cinnamon/cinnamon-settings/modules/cs_keyboard.py
- sed -i 's/"reload"/"view-refresh"/'
files/usr/share/cinnamon/cinnamon-settings/modules/cs_user.py
- sed -i 's/"stock_calendar"/"x-office-calendar"/'
files/usr/share/cinnamon/applets/calen...@cinnamon.org/metadata.json
- sed -i 's/"keyboard"/"input-keyboard"/'
files/usr/share/cinnamon/applets/keybo...@cinnamon.org/metadata.json
- sed -i 's/"desktop"/"user-desktop"/'
files/usr/share/cinnamon/applets/show-desk...@cinnamon.org/metadata.json
- sed -i 's/"stock_volume"/"audio-volume-high"/'
files/usr/share/cinnamon/applets/so...@cinnamon.org/metadata.json
- sed -i 's/"stock_calendar"/"x-office-calendar"/'
files/usr/share/cinnamon/desklets/cl...@cinnamon.org/metadata.json
-
- # Remove broken symlink
- rm files/etc/xdg/menus/cinnamon-applications-merged
-}
-
-build() {
- cd ${srcdir}/Cinnamon*
-
- ./autogen.sh --prefix=/usr \
- --sysconfdir=/etc \
- --libexecdir=/usr/lib/cinnamon \
- --localstatedir=/var \
- --disable-static \
- --disable-schemas-compile \
- --enable-compile-warnings=yes
-
- #https://bugzilla.gnome.org/show_bug.cgi?id=656231
- sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool
-
- make
-}
-
-package() {
- cd ${srcdir}/Cinnamon*
- make DESTDIR="${pkgdir}" install
-}
Copied: cinnamon/repos/community-x86_64/PKGBUILD (from rev 195103,
cinnamon/trunk/PKGBUILD)
===================================================================
--- community-x86_64/PKGBUILD (rev 0)
+++ community-x86_64/PKGBUILD 2016-11-07 23:05:21 UTC (rev 195104)
@@ -0,0 +1,114 @@
+# $Id$
+# Maintainer: Alexandre Filgueira <alexfilgue...@cinnarch.com>
+# Contributor: M0Rf30
+# Contributor: unifiedlinux
+# Contributor: CReimer
+
+pkgname=cinnamon
+pkgver=3.2.0
+pkgrel=1
+pkgdesc="Linux desktop which provides advanced innovative features and a
traditional user experience"
+arch=('i686' 'x86_64')
+url="https://github.com/linuxmint/Cinnamon";
+license=('GPL2')
+depends=('accountsservice' 'caribou' 'cinnamon-settings-daemon'
'cinnamon-session'
+ 'cinnamon-translations' 'cjs' 'clutter-gtk' 'gnome-backgrounds'
+ 'gnome-themes-standard' 'gstreamer' 'libgnome-keyring'
'libkeybinder3' 'librsvg'
+ 'networkmanager' 'muffin' 'python2-cairo' 'python2-dbus'
'python2-pillow'
+ 'python2-pam' 'python2-pexpect' 'python2-pyinotify' 'python2-lxml'
+ 'cinnamon-control-center' 'cinnamon-screensaver' 'cinnamon-menus'
'libgnomekbd'
+ 'network-manager-applet' 'nemo' 'polkit-gnome')
+makedepends=('gnome-common' 'intltool' 'gtk-doc' 'gobject-introspection')
+optdepends=('blueberry: Bluetooth support'
+ 'system-config-printer: printer settings')
+options=('!emptydirs')
+source=("$pkgname-$pkgver.tar.gz::https://github.com/linuxmint/Cinnamon/archive/$pkgver.tar.gz";
+ "set_wheel.patch"
+ "default-theme.patch")
+sha256sums=('c1473aabb01329c07bf1e28148cb410255700f4dd237195b7790e9bcdb69b89d'
+ '97542a424fa83c18c8c8a6d27c089129f30b6fb4cc128c662ac0da3aebf42dcc'
+ '566585873f38a79ec248b916645a2e081abec3c6d4df2c34339cde1f35375cc5')
+
+prepare() {
+ cd ${srcdir}/Cinnamon*
+
+ # Python2 fix
+ sed -i 's:/usr/bin/python :/usr/bin/python2 :'
files/usr/bin/cinnamon-menu-editor
+ find -type f | xargs sed -i 's@^#!.*python$@#!/usr/bin/python2@'
+
+ # Use wheel group instread of sudo (taken from Fedora)
+ patch -Np1 -i ../set_wheel.patch
+
+ # Set default theme to 'cinnamon'
+ patch -Np1 -i ../default-theme.patch
+
+ # Add polkit agent to required components
+ sed -i
's/RequiredComponents=\(.*\)$/RequiredComponents=\1polkit-gnome-authentication-agent-1;/'
\
+ files/usr/share/cinnamon-session/sessions/cinnamon*.session
+
+ # Use pkexec instead of gksu
+ sed -i 's/gksu/pkexec/' files/usr/bin/cinnamon-settings-users
+
+ # Check for the cc-panel path, not for the unneeded binary
+ sed -i
's|/usr/bin/cinnamon-control-center|/usr/lib/cinnamon-control-center-1/panels|'
\
+ files/usr/bin/cinnamon-settings
+
+ # Cinnamon has no upstream backgrounds, use GNOME backgrounds instead
+ sed -i
's|/usr/share/cinnamon-background-properties|/usr/share/gnome-background-properties|'
\
+ files/usr/share/cinnamon/cinnamon-settings/modules/cs_backgrounds.py
+
+ # Fix selected background color in Cinnamon Settings for Adwaita theme
+ sed -i 's/@selected_bg_color;/@theme_selected_bg_color;/' \
+ files/usr/share/cinnamon/cinnamon-settings/cinnamon-settings.py
+
+ # GNOME Terminal desktop file was renamed in GNOME 3.20
+ sed -i 's/gnome-terminal.desktop/org.gnome.Terminal.desktop/'
data/org.cinnamon.gschema.xml.in \
+
files/usr/share/cinnamon/applets/panel-launch...@cinnamon.org/settings-schema.json
+
+ # Replace MintInstall with GNOME Software
+ sed -i 's/mintinstall.desktop/org.gnome.Software.desktop/'
data/org.cinnamon.gschema.xml.in
+
+ # Fix missing icons with the Adwaita theme
+ sed -i 's/"gtk-file"/"text-x-preview"/'
docs/applets-examples/fin...@cinnamon.org/applet.js src/cinnamon-util.c
+ sed -i "s/SECONDARY, 'ok'/SECONDARY, 'gtk-ok'/
+ s/SECONDARY, 'stop'/SECONDARY, 'process-stop'/"
files/usr/share/cinnamon/cinnamon-desktop-editor/cinnamon-desktop-editor.py
+ sed -i "s/'gnome-panel-launcher'/'system-run'/"
files/usr/share/cinnamon/cinnamon-desktop-editor/cinnamon-desktop-editor.py
+ sed -i 's/icon_name">gnome-panel-launcher/icon_name">system-run/'
files/usr/share/cinnamon/cinnamon-desktop-editor/launcher-editor.ui
+ sed -i 's/"reload"/"view-refresh"/'
files/usr/share/cinnamon/cinnamon-settings-users/cinnamon-settings-users.py
+ sed -i 's/"gtk-dialog-question"/"dialog-question"/
+ s/"gtk-directory"/"folder"/'
files/usr/share/cinnamon/cinnamon-settings/modules/cs_default.py
+ sed -i 's/"display"/"video-display"/
+ s/"access"/"preferences-desktop-accessibility"/
+ s/"gnome-panel-launcher"/"system-run"/'
files/usr/share/cinnamon/cinnamon-settings/modules/cs_keyboard.py
+ sed -i 's/"reload"/"view-refresh"/'
files/usr/share/cinnamon/cinnamon-settings/modules/cs_user.py
+ sed -i 's/"stock_calendar"/"x-office-calendar"/'
files/usr/share/cinnamon/applets/calen...@cinnamon.org/metadata.json
+ sed -i 's/"keyboard"/"input-keyboard"/'
files/usr/share/cinnamon/applets/keybo...@cinnamon.org/metadata.json
+ sed -i 's/"desktop"/"user-desktop"/'
files/usr/share/cinnamon/applets/show-desk...@cinnamon.org/metadata.json
+ sed -i 's/"stock_volume"/"audio-volume-high"/'
files/usr/share/cinnamon/applets/so...@cinnamon.org/metadata.json
+ sed -i 's/"stock_calendar"/"x-office-calendar"/'
files/usr/share/cinnamon/desklets/cl...@cinnamon.org/metadata.json
+
+ # Remove broken symlink
+ rm files/etc/xdg/menus/cinnamon-applications-merged
+}
+
+build() {
+ cd ${srcdir}/Cinnamon*
+
+ ./autogen.sh --prefix=/usr \
+ --sysconfdir=/etc \
+ --libexecdir=/usr/lib/cinnamon \
+ --localstatedir=/var \
+ --disable-static \
+ --disable-schemas-compile \
+ --enable-compile-warnings=yes
+
+ #https://bugzilla.gnome.org/show_bug.cgi?id=656231
+ sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool
+
+ make
+}
+
+package() {
+ cd ${srcdir}/Cinnamon*
+ make DESTDIR="${pkgdir}" install
+}
Deleted: community-x86_64/default-theme.patch
===================================================================
--- community-x86_64/default-theme.patch 2016-11-07 23:04:26 UTC (rev
195103)
+++ community-x86_64/default-theme.patch 2016-11-07 23:05:21 UTC (rev
195104)
@@ -1,25 +0,0 @@
-From 36af45f699daa886a3c3fc3187e0b24b193294ad Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Ball=C3=B3=20Gy=C3=B6rgy?= <ballog...@gmail.com>
-Date: Sat, 22 Nov 2014 22:39:39 +0100
-Subject: [PATCH] Set default theme to 'cinnamon'
-
----
- data/org.cinnamon.gschema.xml.in | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/data/org.cinnamon.gschema.xml.in
b/data/org.cinnamon.gschema.xml.in
-index 91fa171..9f56e4c 100644
---- a/data/org.cinnamon.gschema.xml.in
-+++ b/data/org.cinnamon.gschema.xml.in
-@@ -581,7 +581,7 @@
- <schema id="org.cinnamon.theme" path="/org/cinnamon/theme/"
- gettext-domain="@GETTEXT_PACKAGE@">
- <key name="name" type="s">
-- <default>""</default>
-+ <default>"cinnamon"</default>
- <_summary>Theme name</_summary>
- <_description>
- The name of the theme
---
-2.1.3
-
Copied: cinnamon/repos/community-x86_64/default-theme.patch (from rev 195103,
cinnamon/trunk/default-theme.patch)
===================================================================
--- community-x86_64/default-theme.patch (rev 0)
+++ community-x86_64/default-theme.patch 2016-11-07 23:05:21 UTC (rev
195104)
@@ -0,0 +1,25 @@
+From 36af45f699daa886a3c3fc3187e0b24b193294ad Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Ball=C3=B3=20Gy=C3=B6rgy?= <ballog...@gmail.com>
+Date: Sat, 22 Nov 2014 22:39:39 +0100
+Subject: [PATCH] Set default theme to 'cinnamon'
+
+---
+ data/org.cinnamon.gschema.xml.in | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/data/org.cinnamon.gschema.xml.in
b/data/org.cinnamon.gschema.xml.in
+index 91fa171..9f56e4c 100644
+--- a/data/org.cinnamon.gschema.xml.in
++++ b/data/org.cinnamon.gschema.xml.in
+@@ -581,7 +581,7 @@
+ <schema id="org.cinnamon.theme" path="/org/cinnamon/theme/"
+ gettext-domain="@GETTEXT_PACKAGE@">
+ <key name="name" type="s">
+- <default>""</default>
++ <default>"cinnamon"</default>
+ <_summary>Theme name</_summary>
+ <_description>
+ The name of the theme
+--
+2.1.3
+
Deleted: community-x86_64/set_wheel.patch
===================================================================
--- community-x86_64/set_wheel.patch 2016-11-07 23:04:26 UTC (rev 195103)
+++ community-x86_64/set_wheel.patch 2016-11-07 23:05:21 UTC (rev 195104)
@@ -1,56 +0,0 @@
----
a/files/usr/share/cinnamon/cinnamon-settings-users/cinnamon-settings-users.py
-+++
b/files/usr/share/cinnamon/cinnamon-settings-users/cinnamon-settings-users.py
-@@ -147,12 +147,11 @@
-
- class PasswordDialog(Gtk.Dialog):
-
-- def __init__ (self, user, password_mask, group_mask):
-+ def __init__ (self, user, password_mask):
- super(PasswordDialog, self).__init__()
-
- self.user = user
- self.password_mask = password_mask
-- self.group_mask = group_mask
-
- self.set_modal(True)
- self.set_skip_taskbar_hint(True)
-@@ -218,14 +217,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(u'\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):
-@@ -563,7 +555,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)
-+ dialog = PasswordDialog(user, self.password_mask)
- response = dialog.run()
-
- def _on_groups_button_clicked(self, widget):
-@@ -807,11 +799,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()
-
Copied: cinnamon/repos/community-x86_64/set_wheel.patch (from rev 195103,
cinnamon/trunk/set_wheel.patch)
===================================================================
--- community-x86_64/set_wheel.patch (rev 0)
+++ community-x86_64/set_wheel.patch 2016-11-07 23:05:21 UTC (rev 195104)
@@ -0,0 +1,56 @@
+---
a/files/usr/share/cinnamon/cinnamon-settings-users/cinnamon-settings-users.py
++++
b/files/usr/share/cinnamon/cinnamon-settings-users/cinnamon-settings-users.py
+@@ -147,12 +147,11 @@
+
+ class PasswordDialog(Gtk.Dialog):
+
+- def __init__ (self, user, password_mask, group_mask):
++ def __init__ (self, user, password_mask):
+ super(PasswordDialog, self).__init__()
+
+ self.user = user
+ self.password_mask = password_mask
+- self.group_mask = group_mask
+
+ self.set_modal(True)
+ self.set_skip_taskbar_hint(True)
+@@ -218,14 +217,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(u'\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):
+@@ -563,7 +555,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)
++ dialog = PasswordDialog(user, self.password_mask)
+ response = dialog.run()
+
+ def _on_groups_button_clicked(self, widget):
+@@ -807,11 +799,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()
+
