summaryrefslogtreecommitdiffstats
path: root/x11
diff options
context:
space:
mode:
Diffstat (limited to 'x11')
-rw-r--r--x11/cinnamon-desktop/Makefile5
-rw-r--r--x11/cinnamon-desktop/distinfo4
-rw-r--r--x11/cinnamon-menus/Makefile41
-rw-r--r--x11/cinnamon-menus/distinfo2
-rw-r--r--x11/cinnamon-menus/files/KDE.directory5
-rw-r--r--x11/cinnamon-menus/pkg-descr4
-rw-r--r--x11/cinnamon-menus/pkg-plist10
-rw-r--r--x11/cinnamon-screensaver/Makefile5
-rw-r--r--x11/cinnamon-screensaver/distinfo4
-rw-r--r--x11/cinnamon-session/Makefile5
-rw-r--r--x11/cinnamon-session/distinfo4
-rw-r--r--x11/cinnamon-session/files/patch-cinnamon-session_csm-logout-dialog.c53
-rw-r--r--x11/cinnamon-session/files/patch-configure.ac17
-rw-r--r--x11/cinnamon/Makefile16
-rw-r--r--x11/cinnamon/distinfo4
-rw-r--r--x11/cinnamon/files/patch-src_Makefile.am8
-rw-r--r--x11/cinnamon/files/patch-src_cinnamon-global.c13
-rw-r--r--x11/cinnamon/pkg-plist130
18 files changed, 186 insertions, 144 deletions
diff --git a/x11/cinnamon-desktop/Makefile b/x11/cinnamon-desktop/Makefile
index ee2d40bf9..029c5113c 100644
--- a/x11/cinnamon-desktop/Makefile
+++ b/x11/cinnamon-desktop/Makefile
@@ -3,7 +3,7 @@
# $MCom$
PORTNAME= cinnamon-desktop
-PORTVERSION= 2.0.4
+PORTVERSION= 2.2.0
CATEGORIES= x11 gnome
MASTER_SITES= http://github.com/linuxmint/${PORTNAME}/archive/${PORTVERSION}.tar.gz?dummy=/
DIST_SUBDIR= gnome3
@@ -44,8 +44,7 @@ GLIB_SCHEMAS= org.cinnamon.desktop.a11y.applications.gschema.xml \
org.cinnamon.desktop.sound.gschema.xml \
org.cinnamon.desktop.thumbnail-cache.gschema.xml \
org.cinnamon.desktop.thumbnailers.gschema.xml \
- org.cinnamon.desktop.wm.preferences.gschema.xml \
- org.cinnamon.system.locale.gschema.xml
+ org.cinnamon.desktop.wm.preferences.gschema.xml
pre-configure:
cd ${WRKSRC} && NOCONFIGURE=yes ${SH} ./autogen.sh
diff --git a/x11/cinnamon-desktop/distinfo b/x11/cinnamon-desktop/distinfo
index 2ec43db72..094cb9d33 100644
--- a/x11/cinnamon-desktop/distinfo
+++ b/x11/cinnamon-desktop/distinfo
@@ -1,2 +1,2 @@
-SHA256 (gnome3/cinnamon-desktop-2.0.4.tar.xz) = 039a789fc8fca52cf1ceaeec8b7ad9ccc122ea38990186cabea814118e8ddcb3
-SIZE (gnome3/cinnamon-desktop-2.0.4.tar.xz) = 555111
+SHA256 (gnome3/cinnamon-desktop-2.2.0.tar.xz) = 4f833a3914b7e822c1dd6a495b688d614c4ae6663faa3d0b74d948dae3bcf33b
+SIZE (gnome3/cinnamon-desktop-2.2.0.tar.xz) = 556338
diff --git a/x11/cinnamon-menus/Makefile b/x11/cinnamon-menus/Makefile
new file mode 100644
index 000000000..869b16a5c
--- /dev/null
+++ b/x11/cinnamon-menus/Makefile
@@ -0,0 +1,41 @@
+# Created by: Gustau Perez i Querol <gustau.perez@gmail.com>
+# $FreeBSD$
+# $MCom$
+
+PORTNAME= cinnamon-menus
+PORTVERSION= 2.2.0
+CATEGORIES= x11 gnome
+MASTER_SITES= http://github.com/linuxmint/${PORTNAME}/archive/${PORTVERSION}.tar.gz?dummy=/
+DIST_SUBDIR= gnome3
+
+MAINTAINER= gnome@FreeBSD.org
+COMMENT= Additional UI API for cinnamon
+
+BUILD_DEPENDS= gnome-autogen.sh:${PORTSDIR}/devel/gnome-common \
+ ${LOCALBASE}/libdata/pkgconfig/xkeyboard-config.pc:${PORTSDIR}/x11/xkeyboard-config \
+ ${LOCALBASE}/libdata/pkgconfig/xkbfile.pc:${PORTSDIR}/x11/libxkbfile
+RUN_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/xkeyboard-config.pc:${PORTSDIR}/x11/xkeyboard-config \
+ ${LOCALBASE}/libdata/pkgconfig/xkbfile.pc:${PORTSDIR}/x11/libxkbfile
+
+USES= gettext gmake libtool pathfix pkgconfig tar:xz
+USE_GNOME= gnomehier gnomeprefix gtk30 intlhack introspection:build
+USE_PYTHON= yes
+USE_LDCONFIG= yes
+GNU_CONFIGURE= yes
+USE_AUTOTOOLS= autoconf automake libtool
+PATHFIX_MAKEFILEIN= Makefile.am
+CPPFLAGS+= -I${LOCALBASE}/include
+LDFLAGS+= -L${LOCALBASE}/lib
+
+post-patch:
+ @${SED} -e 's|/usr/local|${LOCALBASE}|g' \
+ < ${FILESDIR}/KDE.directory > ${WRKSRC}/KDE.directory
+
+post-install:
+ @${INSTALL_DATA} ${WRKSRC}/KDE.directory \
+ ${STAGEDIR}${PREFIX}/share/desktop-directories
+
+pre-configure:
+ cd ${WRKSRC} && NOCONFIGURE=yes ${SH} ./autogen.sh
+
+.include <bsd.port.mk>
diff --git a/x11/cinnamon-menus/distinfo b/x11/cinnamon-menus/distinfo
new file mode 100644
index 000000000..fb9742cb0
--- /dev/null
+++ b/x11/cinnamon-menus/distinfo
@@ -0,0 +1,2 @@
+SHA256 (gnome3/cinnamon-menus-2.2.0.tar.xz) = e354273c29bc610925d81263c90c9e67137a39fb8d241e125d530842a60ec286
+SIZE (gnome3/cinnamon-menus-2.2.0.tar.xz) = 542548
diff --git a/x11/cinnamon-menus/files/KDE.directory b/x11/cinnamon-menus/files/KDE.directory
new file mode 100644
index 000000000..d8cacb750
--- /dev/null
+++ b/x11/cinnamon-menus/files/KDE.directory
@@ -0,0 +1,5 @@
+[Desktop Entry]
+Name=KDE
+Comment=Some comment about KDE menu
+Icon=/usr/local/share/icons/default.kde/48x48/apps/kmenu.png
+Type=Directory
diff --git a/x11/cinnamon-menus/pkg-descr b/x11/cinnamon-menus/pkg-descr
new file mode 100644
index 000000000..195e8f44d
--- /dev/null
+++ b/x11/cinnamon-menus/pkg-descr
@@ -0,0 +1,4 @@
+This package is a replacemenent of gnome-menus for
+the cinnamon project.
+
+WWW: https://github.com/linuxmint/cinnamon-menus
diff --git a/x11/cinnamon-menus/pkg-plist b/x11/cinnamon-menus/pkg-plist
new file mode 100644
index 000000000..ca1b3c8e1
--- /dev/null
+++ b/x11/cinnamon-menus/pkg-plist
@@ -0,0 +1,10 @@
+include/cinnamon-menus-3.0/gmenu-tree.h
+lib/libcinnamon-menu-3.a
+lib/libcinnamon-menu-3.la
+lib/libcinnamon-menu-3.so
+lib/libcinnamon-menu-3.so.0
+lib/libcinnamon-menu-3.so.0.0.1
+lib/girepository-1.0/CMenu-3.0.typelib
+libdata/pkgconfig/libcinnamon-menu-3.0.pc
+share/gir-1.0/CMenu-3.0.gir
+@dirrm include/cinnamon-menus-3.0
diff --git a/x11/cinnamon-screensaver/Makefile b/x11/cinnamon-screensaver/Makefile
index b7aa845b8..a5185f8fd 100644
--- a/x11/cinnamon-screensaver/Makefile
+++ b/x11/cinnamon-screensaver/Makefile
@@ -3,7 +3,7 @@
# $MCom$
PORTNAME= cinnamon-screensaver
-PORTVERSION= 2.0.3
+PORTVERSION= 2.2.0
MASTER_SITES= http://github.com/linuxmint/${PORTNAME}/archive/${PORTVERSION}.tar.gz?dummy=/
CATEGORIES= x11 gnome
DIST_SUBDIR= gnome3
@@ -20,8 +20,7 @@ RUN_DEPENDS= pam_helper:${PORTSDIR}/security/pam_helper \
gsettings-desktop-schemas>=3.2.0:${PORTSDIR}/devel/gsettings-desktop-schemas \
${LOCALBASE}/lib/pam_gnome_keyring.so:${PORTSDIR}/security/gnome-keyring
-USE_XZ= yes
-USES= gettext gmake pathfix pkgconfig
+USES= gettext gmake pathfix pkgconfig tar:xz
USE_XORG= x11 xext xxf86vm xxf86misc xscrnsaver
USE_GNOME= gnomedesktop3 gnomeprefix intlhack libgnomekbd libxml2
GNU_CONFIGURE= yes
diff --git a/x11/cinnamon-screensaver/distinfo b/x11/cinnamon-screensaver/distinfo
index fe9e78574..c544456e4 100644
--- a/x11/cinnamon-screensaver/distinfo
+++ b/x11/cinnamon-screensaver/distinfo
@@ -1,2 +1,2 @@
-SHA256 (gnome3/cinnamon-screensaver-2.0.3.tar.xz) = 00c866e98994afc8939d1d347de631cebaa6ec34ad59646a7ccd223bd757cc7d
-SIZE (gnome3/cinnamon-screensaver-2.0.3.tar.xz) = 141635
+SHA256 (gnome3/cinnamon-screensaver-2.2.0.tar.xz) = 2ba075f8bceb5ff853d76b0426e0d3fedcfd503016c4752f1e5b3813b0d8aef9
+SIZE (gnome3/cinnamon-screensaver-2.2.0.tar.xz) = 141541
diff --git a/x11/cinnamon-session/Makefile b/x11/cinnamon-session/Makefile
index ab83f648d..c7642de9a 100644
--- a/x11/cinnamon-session/Makefile
+++ b/x11/cinnamon-session/Makefile
@@ -3,7 +3,7 @@
# $MCom$
PORTNAME= cinnamon-session
-PORTVERSION= 2.0.6
+PORTVERSION= 2.2.0
CATEGORIES= x11 gnome
MASTER_SITES= http://github.com/linuxmint/${PORTNAME}/archive/${PORTVERSION}.tar.gz?dummy=/
DIST_SUBDIR= gnome3
@@ -15,7 +15,8 @@ BUILD_DEPENDS= gnome-autogen.sh:${PORTSDIR}/devel/gnome-common
LIB_DEPENDS= libdbus-glib-1.so:${PORTSDIR}/devel/dbus-glib \
libexecinfo.so:${PORTSDIR}/devel/libexecinfo \
libjson-glib-1.0.so:${PORTSDIR}/devel/json-glib \
- libupower-glib.so:${PORTSDIR}/sysutils/upower
+ libupower-glib.so:${PORTSDIR}/sysutils/upower \
+ libcanberra.so:${PORTSDIR}/audio/libcanberra
RUN_DEPENDS= ${LOCALBASE}/sbin/console-kit-daemon:${PORTSDIR}/sysutils/consolekit \
${LOCALBASE}/bin/xdpyinfo:${PORTSDIR}/x11/xdpyinfo
diff --git a/x11/cinnamon-session/distinfo b/x11/cinnamon-session/distinfo
index 67571a0fe..360f0eb3d 100644
--- a/x11/cinnamon-session/distinfo
+++ b/x11/cinnamon-session/distinfo
@@ -1,2 +1,2 @@
-SHA256 (gnome3/cinnamon-session-2.0.6.tar.xz) = 831a63f31bd5c0f5dcaee833d3e43e50e8c9d540cbe931e71b8e0f79ede14567
-SIZE (gnome3/cinnamon-session-2.0.6.tar.xz) = 897506
+SHA256 (gnome3/cinnamon-session-2.2.0.tar.xz) = b6ce4672a9b4fcd241c21a6b1921ff461e0c6e9fbeef4d4e9b1185785374ffae
+SIZE (gnome3/cinnamon-session-2.2.0.tar.xz) = 900954
diff --git a/x11/cinnamon-session/files/patch-cinnamon-session_csm-logout-dialog.c b/x11/cinnamon-session/files/patch-cinnamon-session_csm-logout-dialog.c
index 05a0ad9e2..6857daee2 100644
--- a/x11/cinnamon-session/files/patch-cinnamon-session_csm-logout-dialog.c
+++ b/x11/cinnamon-session/files/patch-cinnamon-session_csm-logout-dialog.c
@@ -1,45 +1,20 @@
---- cinnamon-session/csm-logout-dialog.c.orig 2013-11-22 10:57:50.000000000 +0000
-+++ cinnamon-session/csm-logout-dialog.c 2014-04-03 10:33:35.297012436 +0000
-@@ -176,13 +176,21 @@
- static gboolean
- csm_logout_supports_system_suspend (CsmLogoutDialog *logout_dialog)
- {
-+#ifdef HAVE_OLD_UPOWER
- return ( csm_system_can_suspend (logout_dialog->priv->system) || up_client_get_can_suspend (logout_dialog->priv->up_client) );
+--- cinnamon-session/csm-logout-dialog.c.orig 2014-04-12 10:25:22.000000000 +0000
++++ cinnamon-session/csm-logout-dialog.c 2014-04-24 08:07:46.179191996 +0000
+@@ -188,6 +188,8 @@
+ return csm_system_can_suspend (logout_dialog->priv->system);
+ #elif defined(HAVE_OLD_UPOWER)
+ return up_client_get_can_suspend (logout_dialog->priv->up_client);
+#else
-+ return ( csm_system_can_suspend (logout_dialog->priv->system) || FALSE );
-+#endif
++ return FALSE;
+ #endif
}
- static gboolean
- csm_logout_supports_system_hibernate (CsmLogoutDialog *logout_dialog)
- {
-+#ifdef HAVE_OLD_UPOWER
- return ( csm_system_can_hibernate (logout_dialog->priv->system) || up_client_get_can_hibernate (logout_dialog->priv->up_client) );
+@@ -198,6 +200,8 @@
+ return csm_system_can_hibernate (logout_dialog->priv->system);
+ #elif defined(HAVE_OLD_UPOWER)
+ return up_client_get_can_hibernate (logout_dialog->priv->up_client);
+#else
-+ return ( csm_system_can_hibernate (logout_dialog->priv->system) || FALSE );
-+#endif
++ return FALSE;
+ #endif
}
- static gboolean
-@@ -308,11 +316,20 @@
- secondary_text = g_strdup (seconds_warning);
- }
-
-+#ifdef __clang__
-+#pragma clang diagnostic push
-+#pragma clang diagnostic ignored "-Wformat-nonliteral"
-+#endif
-+
- gtk_message_dialog_format_secondary_text (GTK_MESSAGE_DIALOG (logout_dialog),
- secondary_text,
- seconds_to_show,
- NULL);
-
-+#ifdef __clang__
-+#pragma clang diagnostic pop
-+#endif
-+
- logout_dialog->priv->timeout--;
-
- g_free (secondary_text);
diff --git a/x11/cinnamon-session/files/patch-configure.ac b/x11/cinnamon-session/files/patch-configure.ac
deleted file mode 100644
index e4eff67f1..000000000
--- a/x11/cinnamon-session/files/patch-configure.ac
+++ /dev/null
@@ -1,17 +0,0 @@
---- configure.ac.orig 2014-04-03 10:17:42.338695284 +0000
-+++ configure.ac 2014-04-03 10:17:53.064698929 +0000
-@@ -56,6 +56,14 @@
- json-glib-1.0 >= $JSON_GLIB_REQUIRED
- )
-
-+dnl We can only support old upower
-+dnl https://bugzilla.gnome.org/show_bug.cgi?id=710383
-+PKG_CHECK_MODULES(UPOWER, upower-glib < 0.99.0, have_old_upower=yes, have_old_upower=no)
-+AS_IF([test x$have_old_upower = xyes], [
-+ AC_DEFINE([HAVE_OLD_UPOWER], [1], [Define if we have an older upower])
-+])
-+AM_CONDITIONAL(HAVE_OLD_UPOWER, test x$have_old_upower = xyes)
-+
- PKG_CHECK_MODULES(SESSION_PROPERTIES,
- glib-2.0 >= $GLIB_REQUIRED
- gtk+-3.0 >= $GTK3_REQUIRED
diff --git a/x11/cinnamon/Makefile b/x11/cinnamon/Makefile
index 81a3aab31..98fc5c397 100644
--- a/x11/cinnamon/Makefile
+++ b/x11/cinnamon/Makefile
@@ -3,8 +3,7 @@
# $MCom$
PORTNAME= cinnamon
-PORTVERSION= 2.0.14
-PORTREVISION= 2
+PORTVERSION= 2.2.3
CATEGORIES= x11 gnome
MASTER_SITES= http://github.com/linuxmint/${PORTNAME}/archive/${PORTVERSION}.tar.gz?dummy=/
DIST_SUBDIR= gnome3
@@ -25,6 +24,7 @@ LIB_DEPENDS= libstartup-notification-1.so:${PORTSDIR}/x11/startup-notification \
libdbus-glib-1.so:${PORTSDIR}/devel/dbus-glib \
libclutter-glx-1.0.so:${PORTSDIR}/graphics/clutter \
libcjs.so:${PORTSDIR}/lang/cjs \
+ libcinnamon-menu-3.so:${PORTSDIR}/x11/cinnamon-menus \
libaccountsservice.so:${PORTSDIR}/sysutils/accountsservice
RUN_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/dbus-python.pc:${PORTSDIR}/devel/py-dbus \
${LOCALBASE}/share/certs/ca-root-nss.crt:${PORTSDIR}/security/ca_root_nss \
@@ -39,13 +39,14 @@ RUN_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/dbus-python.pc:${PORTSDIR}/devel/py-
WRKSRC= ${WRKDIR}/Cinnamon-${PORTVERSION}
USES= gettext gmake pathfix pkgconfig shebangfix
-USE_GNOME= evolutiondataserver3 gconf2 gnomedesktop3 gnomemenus3 \
+USE_GNOME= evolutiondataserver3 gconf2 gnomedesktop3 \
gnomeprefix gtk30 intlhack introspection:build
# this happens before moving the file to ${PREFIX} (which then will be copied to ${STAGEDIR}${PREFIX})
SHEBANG_FILES= files/usr/bin/cinnamon2d
USE_AUTOTOOLS= libtool autoconf automake
USE_XORG= x11 xfixes sm
USE_GSTREAMER= theora vp8 ogg
+INSTALLS_ICONS= yes
USE_LDCONFIG= yes
GNU_CONFIGURE= yes
USE_PYTHON= yes
@@ -122,6 +123,15 @@ post-patch:
${WRKSRC}/files${PREFIX}/bin/cinnamon-settings \
${WRKSRC}/files${PREFIX}/bin/cinnamon-launcher
+ @${REINPLACE_CMD} -e '/cs-tablet/d; /cs-bluetooth/d; /cs-network/d' \
+ ${WRKSRC}/files${PREFIX}/lib/cinnamon-settings/cinnamon-settings.py
+
+ @${REINPLACE_CMD} -e '/increase-opacity/d; /decrease-opacity/d' \
+ ${WRKSRC}/files${PREFIX}/lib/cinnamon-settings/modules/cs_keyboard.py
+
+ #@${REINPLACE_CMD} -e 's/SIZE\/$$$$CONTEXT/CONTEXT\/$$$$SIZE/g' \
+ # ${WRKSRC}/data/icons/Makefile.am
+
@${REINPLACE_CMD} -e 's|=/usr/bin/|=${PREFIX}/bin/|g' \
${WRKSRC}/files${PREFIX}/share/xsessions/cinnamon2d.desktop \
${WRKSRC}/files${PREFIX}/share/xsessions/cinnamon.desktop \
diff --git a/x11/cinnamon/distinfo b/x11/cinnamon/distinfo
index e4c86ba75..c3ac121da 100644
--- a/x11/cinnamon/distinfo
+++ b/x11/cinnamon/distinfo
@@ -1,2 +1,2 @@
-SHA256 (gnome3/cinnamon-2.0.14.tar.gz) = 447f65ceb22a40717656d3d708d16ad450802298d783b23004b6e8d3c8d7da85
-SIZE (gnome3/cinnamon-2.0.14.tar.gz) = 2607337
+SHA256 (gnome3/cinnamon-2.2.3.tar.gz) = 9151452f81ffb7edc28cbdb107818f64bb9bd55610711781345418166372f0fe
+SIZE (gnome3/cinnamon-2.2.3.tar.gz) = 2638409
diff --git a/x11/cinnamon/files/patch-src_Makefile.am b/x11/cinnamon/files/patch-src_Makefile.am
index 88a0e7bb1..b3bdb04fb 100644
--- a/x11/cinnamon/files/patch-src_Makefile.am
+++ b/x11/cinnamon/files/patch-src_Makefile.am
@@ -1,11 +1,11 @@
---- src/Makefile.am.orig 2013-11-26 09:57:11.203682346 +0000
-+++ src/Makefile.am 2013-11-26 09:58:16.645680722 +0000
+--- src/Makefile.am.orig 2014-04-12 14:28:57.000000000 +0000
++++ src/Makefile.am 2014-04-24 15:24:43.261840738 +0000
@@ -267,7 +267,7 @@
libcinnamon_la_CPPFLAGS = $(cinnamon_cflags)
Cinnamon-0.1.gir: libcinnamon.la St-1.0.gir
--Cinnamon_0_1_gir_INCLUDES = Clutter-1.0 ClutterX11-1.0 Meta-Muffin.0 Soup-2.4 GMenu-3.0 NetworkManager-1.0 NMClient-1.0
-+Cinnamon_0_1_gir_INCLUDES = Clutter-1.0 ClutterX11-1.0 Meta-Muffin.0 Soup-2.4 GMenu-3.0
+-Cinnamon_0_1_gir_INCLUDES = Clutter-1.0 ClutterX11-1.0 Meta-Muffin.0 Soup-2.4 CMenu-3.0 NetworkManager-1.0 NMClient-1.0
++Cinnamon_0_1_gir_INCLUDES = Clutter-1.0 ClutterX11-1.0 Meta-Muffin.0 Soup-2.4 CMenu-3.0
Cinnamon_0_1_gir_CFLAGS = $(libcinnamon_la_CPPFLAGS) -I $(srcdir)
Cinnamon_0_1_gir_LIBS = libcinnamon.la
Cinnamon_0_1_gir_FILES = $(libcinnamon_la_gir_sources)
diff --git a/x11/cinnamon/files/patch-src_cinnamon-global.c b/x11/cinnamon/files/patch-src_cinnamon-global.c
deleted file mode 100644
index 1ab1605c6..000000000
--- a/x11/cinnamon/files/patch-src_cinnamon-global.c
+++ /dev/null
@@ -1,13 +0,0 @@
---- src/cinnamon-global.c.orig 2014-04-04 09:39:11.488900078 +0000
-+++ src/cinnamon-global.c 2014-04-04 09:39:20.117899806 +0000
-@@ -477,8 +477,8 @@
- G_PARAM_READABLE));
- }
-
--/**•
-- * _cinnamon_global_init: (skip)•
-+/**
-+ * _cinnamon_global_init: (skip)
- * @first_property_name: the name of the first property
- * @...: the value of the first property, followed optionally by more
- * name/value pairs, followed by %NULL
diff --git a/x11/cinnamon/pkg-plist b/x11/cinnamon/pkg-plist
index b59ecfce2..72a634589 100644
--- a/x11/cinnamon/pkg-plist
+++ b/x11/cinnamon/pkg-plist
@@ -36,10 +36,11 @@ lib/cinnamon-menu-editor/cme/MenuEditor.py
lib/cinnamon-menu-editor/cme/__init__.py
lib/cinnamon-menu-editor/cme/config.py
lib/cinnamon-menu-editor/cme/util.py
-lib/cinnamon-screensaver-lock-dialog/cinnamon-screensaver-lock-dialog.glade
lib/cinnamon-screensaver-lock-dialog/cinnamon-screensaver-lock-dialog.py
+lib/cinnamon-screensaver-lock-dialog/cinnamon-screensaver-lock-dialog.ui
lib/cinnamon-settings/cinnamon-settings.py
lib/cinnamon-settings/cinnamon-settings.ui
+lib/cinnamon-settings/modules/cs_power.py
lib/cinnamon-settings/bin/ExtensionCore.py
lib/cinnamon-settings/bin/SettingsWidgets.py
lib/cinnamon-settings/bin/Spices.py
@@ -51,55 +52,6 @@ lib/cinnamon-settings/bin/imtools.py
lib/cinnamon-settings/bin/installSchema.py
lib/cinnamon-settings/bin/removeSchema.py
lib/cinnamon-settings/bin/xlet-settings.ui
-lib/cinnamon-settings/data/cinnamon.png
-lib/cinnamon-settings/data/inactive.png
-lib/cinnamon-settings/data/installed.svg
-lib/cinnamon-settings/data/running.svg
-lib/cinnamon-settings/data/system.svg
-lib/cinnamon-settings/data/update.svg
-lib/cinnamon-settings/data/user.png
-lib/cinnamon-settings/data/icons/applets.svg
-lib/cinnamon-settings/data/icons/backgrounds.svg
-lib/cinnamon-settings/data/icons/bluetooth.svg
-lib/cinnamon-settings/data/icons/cat-admin.svg
-lib/cinnamon-settings/data/icons/cat-appearance.svg
-lib/cinnamon-settings/data/icons/cat-hardware.svg
-lib/cinnamon-settings/data/icons/cat-prefs.svg
-lib/cinnamon-settings/data/icons/color.svg
-lib/cinnamon-settings/data/icons/date-time.svg
-lib/cinnamon-settings/data/icons/default-applications.svg
-lib/cinnamon-settings/data/icons/desklets.svg
-lib/cinnamon-settings/data/icons/desktop-effects.svg
-lib/cinnamon-settings/data/icons/desktop.svg
-lib/cinnamon-settings/data/icons/details.svg
-lib/cinnamon-settings/data/icons/display.svg
-lib/cinnamon-settings/data/icons/drivers.svg
-lib/cinnamon-settings/data/icons/extensions.svg
-lib/cinnamon-settings/data/icons/firewall.svg
-lib/cinnamon-settings/data/icons/fonts.svg
-lib/cinnamon-settings/data/icons/general.svg
-lib/cinnamon-settings/data/icons/keyboard.svg
-lib/cinnamon-settings/data/icons/language.svg
-lib/cinnamon-settings/data/icons/login.svg
-lib/cinnamon-settings/data/icons/mouse.svg
-lib/cinnamon-settings/data/icons/network.svg
-lib/cinnamon-settings/data/icons/overview.svg
-lib/cinnamon-settings/data/icons/panel.svg
-lib/cinnamon-settings/data/icons/power.svg
-lib/cinnamon-settings/data/icons/printer.svg
-lib/cinnamon-settings/data/icons/region.svg
-lib/cinnamon-settings/data/icons/screen.svg
-lib/cinnamon-settings/data/icons/screensaver.svg
-lib/cinnamon-settings/data/icons/sound.svg
-lib/cinnamon-settings/data/icons/sources.svg
-lib/cinnamon-settings/data/icons/startup-programs.svg
-lib/cinnamon-settings/data/icons/themes.svg
-lib/cinnamon-settings/data/icons/tiling.svg
-lib/cinnamon-settings/data/icons/universal-access.svg
-lib/cinnamon-settings/data/icons/user-accounts.svg
-lib/cinnamon-settings/data/icons/user.svg
-lib/cinnamon-settings/data/icons/windows.svg
-lib/cinnamon-settings/data/icons/workspaces.svg
lib/cinnamon-settings/data/spices/applet-detail.html
lib/cinnamon-settings/data/spices/jquery.js
lib/cinnamon-settings/modules/cs_applets.py
@@ -137,7 +89,29 @@ man/man1/gnome-session-cinnamon.1.gz
man/man1/gnome-session-cinnamon2d.1.gz
share/applications/cinnamon-add-panel-launcher.desktop
share/applications/cinnamon-menu-editor.desktop
+share/applications/cinnamon-settings-applets.desktop
+share/applications/cinnamon-settings-backgrounds.desktop
+share/applications/cinnamon-settings-calendar.desktop
+share/applications/cinnamon-settings-default.desktop
+share/applications/cinnamon-settings-desklets.desktop
+share/applications/cinnamon-settings-desktop.desktop
+share/applications/cinnamon-settings-effects.desktop
+share/applications/cinnamon-settings-extensions.desktop
+share/applications/cinnamon-settings-fonts.desktop
+share/applications/cinnamon-settings-general.desktop
+share/applications/cinnamon-settings-hotcorner.desktop
+share/applications/cinnamon-settings-info.desktop
+share/applications/cinnamon-settings-keyboard.desktop
+share/applications/cinnamon-settings-mouse.desktop
+share/applications/cinnamon-settings-panel.desktop
+share/applications/cinnamon-settings-power.desktop
+share/applications/cinnamon-settings-screensaver.desktop
+share/applications/cinnamon-settings-themes.desktop
+share/applications/cinnamon-settings-tiling.desktop
+share/applications/cinnamon-settings-user.desktop
share/applications/cinnamon-settings-users.desktop
+share/applications/cinnamon-settings-windows.desktop
+share/applications/cinnamon-settings-workspaces.desktop
share/applications/cinnamon-settings.desktop
share/applications/cinnamon.desktop
share/applications/cinnamon2d.desktop
@@ -423,10 +397,12 @@ share/applications/cinnamon2d.desktop
%%DATADIR%%/applets/notifications@cinnamon.org/low-notif-symbolic.svg
%%DATADIR%%/applets/notifications@cinnamon.org/metadata.json
%%DATADIR%%/applets/notifications@cinnamon.org/normal-notif-symbolic.svg
+%%DATADIR%%/applets/notifications@cinnamon.org/settings-schema.json
%%DATADIR%%/applets/panel-launchers@cinnamon.org/applet.js
%%DATADIR%%/applets/panel-launchers@cinnamon.org/metadata.json
%%DATADIR%%/applets/power@cinnamon.org/applet.js
%%DATADIR%%/applets/power@cinnamon.org/metadata.json
+%%DATADIR%%/applets/power@cinnamon.org/settings-schema.json
%%DATADIR%%/applets/recent@cinnamon.org/applet.js
%%DATADIR%%/applets/recent@cinnamon.org/metadata.json
%%DATADIR%%/applets/removable-drives@cinnamon.org/applet.js
@@ -447,6 +423,7 @@ share/applications/cinnamon2d.desktop
%%DATADIR%%/applets/show-desktop@cinnamon.org/metadata.json
%%DATADIR%%/applets/sound@cinnamon.org/applet.js
%%DATADIR%%/applets/sound@cinnamon.org/metadata.json
+%%DATADIR%%/applets/sound@cinnamon.org/settings-schema.json
%%DATADIR%%/applets/spacer@cinnamon.org/applet.js
%%DATADIR%%/applets/spacer@cinnamon.org/metadata.json
%%DATADIR%%/applets/spacer@cinnamon.org/settings-schema.json
@@ -457,6 +434,7 @@ share/applications/cinnamon2d.desktop
%%DATADIR%%/applets/user@cinnamon.org/applet.js
%%DATADIR%%/applets/user@cinnamon.org/icon.png
%%DATADIR%%/applets/user@cinnamon.org/metadata.json
+%%DATADIR%%/applets/user@cinnamon.org/settings-schema.json
%%DATADIR%%/applets/user@cinnamon.org/stylesheet.css
%%DATADIR%%/applets/window-list@cinnamon.org/applet.js
%%DATADIR%%/applets/window-list@cinnamon.org/metadata.json
@@ -582,6 +560,7 @@ share/applications/cinnamon2d.desktop
%%DATADIR%%/js/ui/settings.js
%%DATADIR%%/js/ui/soundManager.js
%%DATADIR%%/js/ui/statusIconDispatcher.js
+%%DATADIR%%/js/ui/systray.js
%%DATADIR%%/js/ui/themeManager.js
%%DATADIR%%/js/ui/tooltips.js
%%DATADIR%%/js/ui/tweener.js
@@ -611,7 +590,7 @@ share/applications/cinnamon2d.desktop
%%DATADIR%%/theme/close-window.svg
%%DATADIR%%/theme/close.svg
%%DATADIR%%/theme/corner-ripple.png
-%%DATADIR%%/theme/menu.png
+%%DATADIR%%/theme/menu.svg
%%DATADIR%%/theme/overview-hover.png
%%DATADIR%%/theme/overview.png
%%DATADIR%%/theme/player-paused.svg
@@ -653,9 +632,57 @@ share/desktop-directories/cinnamon-system-tools.directory
share/desktop-directories/cinnamon-system.directory
share/desktop-directories/cinnamon-utility-accessibility.directory
share/desktop-directories/cinnamon-utility.directory
+share/polkit-1/actions/org.cinnamon.settings-users.policy
share/xsessions/cinnamon.desktop
share/xsessions/cinnamon2d.desktop
@dirrm share/xsessions
+share/icons/hicolor/scalable/categories/cs-applets.svg
+share/icons/hicolor/scalable/categories/cs-backgrounds.svg
+share/icons/hicolor/scalable/categories/cs-bluetooth.svg
+share/icons/hicolor/scalable/categories/cs-cat-admin.svg
+share/icons/hicolor/scalable/categories/cs-cat-appearance.svg
+share/icons/hicolor/scalable/categories/cs-cat-hardware.svg
+share/icons/hicolor/scalable/categories/cs-cat-prefs.svg
+share/icons/hicolor/scalable/categories/cs-color.svg
+share/icons/hicolor/scalable/categories/cs-date-time.svg
+share/icons/hicolor/scalable/categories/cs-default-applications.svg
+share/icons/hicolor/scalable/categories/cs-desklets.svg
+share/icons/hicolor/scalable/categories/cs-desktop-effects.svg
+share/icons/hicolor/scalable/categories/cs-desktop.svg
+share/icons/hicolor/scalable/categories/cs-details.svg
+share/icons/hicolor/scalable/categories/cs-display.svg
+share/icons/hicolor/scalable/categories/cs-drivers.svg
+share/icons/hicolor/scalable/categories/cs-extensions.svg
+share/icons/hicolor/scalable/categories/cs-firewall.svg
+share/icons/hicolor/scalable/categories/cs-fonts.svg
+share/icons/hicolor/scalable/categories/cs-general.svg
+share/icons/hicolor/scalable/categories/cs-keyboard.svg
+share/icons/hicolor/scalable/categories/cs-language.svg
+share/icons/hicolor/scalable/categories/cs-login.svg
+share/icons/hicolor/scalable/categories/cs-mouse.svg
+share/icons/hicolor/scalable/categories/cs-network.svg
+share/icons/hicolor/scalable/categories/cs-overview.svg
+share/icons/hicolor/scalable/categories/cs-panel.svg
+share/icons/hicolor/scalable/categories/cs-power.svg
+share/icons/hicolor/scalable/categories/cs-printer.svg
+share/icons/hicolor/scalable/categories/cs-region.svg
+share/icons/hicolor/scalable/categories/cs-screen.svg
+share/icons/hicolor/scalable/categories/cs-screensaver.svg
+share/icons/hicolor/scalable/categories/cs-sound.svg
+share/icons/hicolor/scalable/categories/cs-sources.svg
+share/icons/hicolor/scalable/categories/cs-startup-programs.svg
+share/icons/hicolor/scalable/categories/cs-tablet.svg
+share/icons/hicolor/scalable/categories/cs-themes.svg
+share/icons/hicolor/scalable/categories/cs-tiling.svg
+share/icons/hicolor/scalable/categories/cs-universal-access.svg
+share/icons/hicolor/scalable/categories/cs-user-accounts.svg
+share/icons/hicolor/scalable/categories/cs-user.svg
+share/icons/hicolor/scalable/categories/cs-windows.svg
+share/icons/hicolor/scalable/categories/cs-workspaces.svg
+share/icons/hicolor/scalable/emblems/cs-xlet-installed.svg
+share/icons/hicolor/scalable/emblems/cs-xlet-running.svg
+share/icons/hicolor/scalable/emblems/cs-xlet-system.svg
+share/icons/hicolor/scalable/emblems/cs-xlet-update.svg
@dirrm %%DATADIR%%/theme
@dirrm %%DATADIR%%/shaders
@dirrm %%DATADIR%%/search_providers
@@ -704,7 +731,6 @@ share/xsessions/cinnamon2d.desktop
@dirrm libexec/cinnamon
@dirrm lib/cinnamon-settings/modules
@dirrm lib/cinnamon-settings/data/spices
-@dirrm lib/cinnamon-settings/data/icons
@dirrm lib/cinnamon-settings/data
@dirrm lib/cinnamon-settings/bin
@dirrm lib/cinnamon-settings-users