summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--deskutils/nemo-extensions/Makefile8
-rw-r--r--deskutils/nemo-extensions/distinfo2
-rw-r--r--lang/cjs/Makefile10
-rw-r--r--lang/cjs/distinfo4
-rw-r--r--lang/cjs/pkg-plist23
-rw-r--r--misc/cinnamon-translations/Makefile12
-rw-r--r--misc/cinnamon-translations/distinfo4
-rw-r--r--misc/cinnamon-translations/pkg-plist2
-rw-r--r--sysutils/cinnamon-control-center/Makefile6
-rw-r--r--sysutils/cinnamon-control-center/distinfo4
-rw-r--r--sysutils/cinnamon-control-center/files/patch-configure.ac14
-rw-r--r--sysutils/cinnamon-control-center/files/patch-panels_Makefile.am10
-rw-r--r--sysutils/cinnamon-control-center/pkg-plist172
-rw-r--r--sysutils/cinnamon-settings-daemon/Makefile5
-rw-r--r--sysutils/cinnamon-settings-daemon/distinfo4
-rw-r--r--sysutils/cinnamon-settings-daemon/files/patch-configure.ac17
-rw-r--r--sysutils/cinnamon-settings-daemon/files/patch-plugins_power_csd-power-manager.c88
-rw-r--r--sysutils/cinnamon-settings-daemon/pkg-plist7
-rw-r--r--x11-fm/nemo/Makefile21
-rw-r--r--x11-fm/nemo/distinfo4
-rw-r--r--x11-fm/nemo/pkg-plist17
-rw-r--r--x11-themes/mint-themes/Makefile28
-rw-r--r--x11-themes/mint-themes/distinfo2
-rw-r--r--x11-themes/mint-themes/pkg-descr1
-rw-r--r--x11-themes/mint-themes/pkg-plist267
-rw-r--r--x11-wm/muffin/Makefile9
-rw-r--r--x11-wm/muffin/distinfo4
-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
45 files changed, 764 insertions, 311 deletions
diff --git a/deskutils/nemo-extensions/Makefile b/deskutils/nemo-extensions/Makefile
index a6c2eb09f..1f7ffa355 100644
--- a/deskutils/nemo-extensions/Makefile
+++ b/deskutils/nemo-extensions/Makefile
@@ -3,7 +3,7 @@
# $MCom$
PORTNAME= nemo-extensions
-PORTVERSION= 2.0.1
+PORTVERSION= 2.2.0
CATEGORIES= x11-fm gnome
DIST_SUBDIR= gnome3
@@ -39,11 +39,11 @@ GH_PROJECT= nemo-extensions
GH_COMMIT= 54f4d94
GH_TAGNAME= ${GH_COMMIT}
-INSTALLS_ICONS= yes
-USES= gettext gmake pathfix pkgconfig shebangfix
-SHEBANG_FILES= nemo-dropbox/dropbox.in
USE_GNOME= gconf2 gnomeprefix gnomedocutils gtksourceview3 intlhack \
introspection:build libxml2 pygtk2
+USES= gettext gmake pathfix pkgconfig shebangfix
+SHEBANG_FILES= nemo-dropbox/dropbox.in
+INSTALLS_ICONS= yes
USE_LDCONFIG= yes
CPPFLAGS+= -I${LOCALBASE}/include
LDFLAGS+= -L${LOCALBASE}/lib
diff --git a/deskutils/nemo-extensions/distinfo b/deskutils/nemo-extensions/distinfo
new file mode 100644
index 000000000..90cdb7632
--- /dev/null
+++ b/deskutils/nemo-extensions/distinfo
@@ -0,0 +1,2 @@
+SHA256 (gnome3/nemo-extensions-2.2.0.tar.gz) = 5e91a1c9083e3e38121059ee0fcafbb3c39d28d516dc2a1335947c6141b2dc99
+SIZE (gnome3/nemo-extensions-2.2.0.tar.gz) = 2621485
diff --git a/lang/cjs/Makefile b/lang/cjs/Makefile
index c145c6a34..2483dca82 100644
--- a/lang/cjs/Makefile
+++ b/lang/cjs/Makefile
@@ -3,7 +3,7 @@
# $MCom$
PORTNAME= cjs
-PORTVERSION= 2.0.0
+PORTVERSION= 2.2.0
CATEGORIES= lang gnome
MASTER_SITES= http://github.com/linuxmint/${PORTNAME}/archive/${PORTVERSION}.tar.gz?dummy=/
DIST_SUBDIR= gnome3
@@ -18,19 +18,17 @@ LIB_DEPENDS= libdbus-glib-1.so:${PORTSDIR}/devel/dbus-glib \
CONFLICTS_BUILD=spidermonkey17-1.7.*
USES= gettext gmake pathfix pkgconfig shebangfix
-USE_PYTHON_BUILD=yes
-USE_GNOME= cairo glib20 gnomeprefix introspection:build \
+USE_GNOME= cairo glib20 gnomeprefix introspection:build \
intlhack
+USE_PYTHON_BUILD=yes
USE_LDCONFIG= yes
PATHFIX_MAKEFILEIN= Makefile.am
GNU_CONFIGURE= yes
USE_AUTOTOOLS= libtool autoconf automake
-
-CONFIGURE_ARGS+=--enable-compile-warnings=no
-
CFLAGS+= -I${LOCALBASE}/include
CPPFLAGS+= -I${LOCALBASE}/include
LDFLAGS+= -L${LOCALBASE}/lib
+CONFIGURE_ARGS+=--enable-compile-warnings=no
SHEBANG_FILES= scripts/make-tests
python_OLD_CMD= /usr/bin/env python
diff --git a/lang/cjs/distinfo b/lang/cjs/distinfo
index c159687b9..1f5c63386 100644
--- a/lang/cjs/distinfo
+++ b/lang/cjs/distinfo
@@ -1,2 +1,2 @@
-SHA256 (gnome3/cjs-2.0.0.tar.gz) = 2fea6c491e6ce8567201f14c0e926181154d798d4811dd65da477c014bfb2a9a
-SIZE (gnome3/cjs-2.0.0.tar.gz) = 354808
+SHA256 (gnome3/cjs-2.2.0.tar.gz) = 47b707bdb334305a5aa8104233e8e2679209f5b95fb7f9e153d3a66c5e6917dc
+SIZE (gnome3/cjs-2.2.0.tar.gz) = 355511
diff --git a/lang/cjs/pkg-plist b/lang/cjs/pkg-plist
index f6588cea0..913e2aeb7 100644
--- a/lang/cjs/pkg-plist
+++ b/lang/cjs/pkg-plist
@@ -28,31 +28,42 @@ include/cjs-1.0/gi/param.h
include/cjs-1.0/gi/repo.h
include/cjs-1.0/gi/union.h
include/cjs-1.0/gi/value.h
-lib/libcjs-dbus.la
-lib/libcjs-dbus.so
-lib/libcjs-dbus.so.0
-lib/libcjs.la
-lib/libcjs.so
-lib/libcjs.so.0
lib/cjs/girepository-1.0/CjsPrivate-1.0.typelib
+lib/cjs-1.0/cairoNative.a
lib/cjs-1.0/cairoNative.la
lib/cjs-1.0/cairoNative.so
+lib/cjs-1.0/console.a
lib/cjs-1.0/console.la
lib/cjs-1.0/console.so
+lib/cjs-1.0/dbusNative.a
lib/cjs-1.0/dbusNative.la
lib/cjs-1.0/dbusNative.so
+lib/cjs-1.0/debugger.a
lib/cjs-1.0/debugger.la
lib/cjs-1.0/debugger.so
+lib/cjs-1.0/formatNative.a
lib/cjs-1.0/formatNative.la
lib/cjs-1.0/formatNative.so
+lib/cjs-1.0/gettextNative.a
lib/cjs-1.0/gettextNative.la
lib/cjs-1.0/gettextNative.so
+lib/cjs-1.0/langNative.a
lib/cjs-1.0/langNative.la
lib/cjs-1.0/langNative.so
+lib/cjs-1.0/mainloop.a
lib/cjs-1.0/mainloop.la
lib/cjs-1.0/mainloop.so
+lib/cjs-1.0/system.a
lib/cjs-1.0/system.la
lib/cjs-1.0/system.so
+lib/libcjs-dbus.a
+lib/libcjs-dbus.la
+lib/libcjs-dbus.so
+lib/libcjs-dbus.so.0
+lib/libcjs.a
+lib/libcjs.la
+lib/libcjs.so
+lib/libcjs.so.0
libdata/pkgconfig/cjs-1.0.pc
libdata/pkgconfig/cjs-dbus-1.0.pc
libdata/pkgconfig/cjs-internals-1.0.pc
diff --git a/misc/cinnamon-translations/Makefile b/misc/cinnamon-translations/Makefile
index 68cab3571..62bc0e425 100644
--- a/misc/cinnamon-translations/Makefile
+++ b/misc/cinnamon-translations/Makefile
@@ -3,7 +3,7 @@
# $MCom$
PORTNAME= cinnamon-translations
-PORTVERSION= 2.0.3
+PORTVERSION= 2.2.0
CATEGORIES= misc x11 gnome
MASTER_SITES= http://github.com/linuxmint/${PORTNAME}/archive/${PORTVERSION}.tar.gz?dummy=/
DIST_SUBDIR= gnome3
@@ -11,17 +11,9 @@ DIST_SUBDIR= gnome3
MAINTAINER= gnome@FreeBSD.org
COMMENT= Translations for the cinnamon desktop
-#USES= gettext gmake pathfix pkgconfig
-USE_XZ= yes
-#USE_GNOME= gnomeprefix gtk20 intltool introspection:build \
-# pygobject3 pygtk2
-USE_PYTHON= yes
+USES= tar:xz
NO_CONFIGURE= yes
NO_BUILD= yes
-PATHFIX_MAKEFILEIN= Makefile.am
-CONFIGURE_ARGS= --disable-docbook-docs
-CPPFLAGS+= -I${LOCALBASE}/include -Wformat-nonliteral
-LDFLAGS+= -L${LOCALBASE}/lib
do-install:
@(cd ${WRKSRC}/mo-export/ && ${CP} -pPR * ${STAGEDIR}${PREFIX}/share/locale)
diff --git a/misc/cinnamon-translations/distinfo b/misc/cinnamon-translations/distinfo
index bfaf085fa..ea0c54b1a 100644
--- a/misc/cinnamon-translations/distinfo
+++ b/misc/cinnamon-translations/distinfo
@@ -1,2 +1,2 @@
-SHA256 (gnome3/cinnamon-translations-2.0.3.tar.xz) = ec75f7414714e9f4144ffc8bba863b50a5bc43f3b1add94846d7e58e42d8831f
-SIZE (gnome3/cinnamon-translations-2.0.3.tar.xz) = 8422079
+SHA256 (gnome3/cinnamon-translations-2.2.0.tar.xz) = c98d394d2c7515b7fcab817aa4717a65c66f39f80507b22dc73160795e3adfe8
+SIZE (gnome3/cinnamon-translations-2.2.0.tar.xz) = 8422084
diff --git a/misc/cinnamon-translations/pkg-plist b/misc/cinnamon-translations/pkg-plist
index f122c5ae5..c19636786 100644
--- a/misc/cinnamon-translations/pkg-plist
+++ b/misc/cinnamon-translations/pkg-plist
@@ -406,6 +406,8 @@ share/locale/zh_TW/LC_MESSAGES/nemo.mo
share/locale/zu/LC_MESSAGES/cinnamon-control-center.mo
@dirrm share/locale/zu/LC_MESSAGES
@dirrm share/locale/zu
+@dirrm share/locale/zh_HK/LC_MESSAGES
+@dirrm share/locale/zh_HK
@dirrm share/locale/yi/LC_MESSAGES
@dirrm share/locale/yi
@dirrm share/locale/xh/LC_MESSAGES
diff --git a/sysutils/cinnamon-control-center/Makefile b/sysutils/cinnamon-control-center/Makefile
index 43b72d4a4..b19d4b5b8 100644
--- a/sysutils/cinnamon-control-center/Makefile
+++ b/sysutils/cinnamon-control-center/Makefile
@@ -3,8 +3,7 @@
# $MCom$
PORTNAME= cinnamon-control-center
-PORTVERSION= 2.0.9
-PORTREVISION= 1
+PORTVERSION= 2.2.3
CATEGORIES= sysutils gnome
MASTER_SITES= http://github.com/linuxmint/${PORTNAME}/archive/${PORTVERSION}.tar.gz?dummy=/
DIST_SUBDIR= gnome3
@@ -30,6 +29,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 \
libclutter-gst-2.0.so:${PORTSDIR}/multimedia/clutter-gst \
+ libcinnamon-menu-3.so:${PORTSDIR}/x11/cinnamon-menus \
libgjs.so:${PORTSDIR}/lang/gjs
RUN_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/dbus-python.pc:${PORTSDIR}/devel/py-dbus \
cinnamon-settings-daemon>=0:${PORTSDIR}/sysutils/cinnamon-settings-daemon \
@@ -37,7 +37,7 @@ RUN_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/dbus-python.pc:${PORTSDIR}/devel/py-
py*-lxml>=0:${PORTSDIR}/devel/py-lxml
USES= gettext gmake pathfix pkgconfig
-USE_GNOME= evolutiondataserver3 gconf2 gnomemenus3 gnomeprefix \
+USE_GNOME= evolutiondataserver3 gconf2 gnomeprefix \
gtk30 intlhack libgnomekbd
USE_XORG= x11 xfixes sm
USE_PYTHON= yes
diff --git a/sysutils/cinnamon-control-center/distinfo b/sysutils/cinnamon-control-center/distinfo
index 761ac8d11..b5e59566d 100644
--- a/sysutils/cinnamon-control-center/distinfo
+++ b/sysutils/cinnamon-control-center/distinfo
@@ -1,2 +1,2 @@
-SHA256 (gnome3/cinnamon-control-center-2.0.9.tar.gz) = 63bb179a50d5f873ed1c19de97966592eedbc055ce2829e4298223a75fc33b4e
-SIZE (gnome3/cinnamon-control-center-2.0.9.tar.gz) = 4798104
+SHA256 (gnome3/cinnamon-control-center-2.2.3.tar.gz) = 50a3da1282f7dcda7a9460aff18873bc83076b74c8dcbe9919e0a372672ae6c9
+SIZE (gnome3/cinnamon-control-center-2.2.3.tar.gz) = 4845770
diff --git a/sysutils/cinnamon-control-center/files/patch-configure.ac b/sysutils/cinnamon-control-center/files/patch-configure.ac
new file mode 100644
index 000000000..fd14a647c
--- /dev/null
+++ b/sysutils/cinnamon-control-center/files/patch-configure.ac
@@ -0,0 +1,14 @@
+--- configure.ac.orig 2014-04-24 12:32:11.672097031 +0000
++++ configure.ac 2014-04-24 12:32:19.716225256 +0000
+@@ -134,11 +134,6 @@
+ libpulse-mainloop-glib >= $PA_REQUIRED_VERSION)
+ PKG_CHECK_MODULES(UNIVERSAL_ACCESS_PANEL, $COMMON_MODULES)
+
+-PKG_CHECK_MODULES(NETWORK_MANAGER, NetworkManager >= $NETWORK_MANAGER_REQUIRED_VERSION
+- libnm-glib >= $NETWORK_MANAGER_REQUIRED_VERSION
+- libnm-util >= $NETWORK_MANAGER_REQUIRED_VERSION
+- libnm-gtk >= $NETWORK_MANAGER_REQUIRED_VERSION)
+-
+ # Check for libnm-gtk + 0.9.9.0
+ PKG_CHECK_MODULES(LIBNM_GTK_COMPAT, libnm-gtk >= $LIBNM_GTK_REQUIRED_VERSION
+ libnm-gtk >= $LIBNM_GTK_REQUIRED_VERSION,
diff --git a/sysutils/cinnamon-control-center/files/patch-panels_Makefile.am b/sysutils/cinnamon-control-center/files/patch-panels_Makefile.am
new file mode 100644
index 000000000..d9b36e97e
--- /dev/null
+++ b/sysutils/cinnamon-control-center/files/patch-panels_Makefile.am
@@ -0,0 +1,10 @@
+--- panels/Makefile.am.orig 2014-04-24 12:43:38.968046979 +0000
++++ panels/Makefile.am 2014-04-24 12:43:46.605454316 +0000
+@@ -10,7 +10,6 @@
+ power \
+ sound \
+ sound-nua \
+- network \
+ datetime
+
+ disabled_panels = $(NULL)
diff --git a/sysutils/cinnamon-control-center/pkg-plist b/sysutils/cinnamon-control-center/pkg-plist
index 534b28e33..ad6d79c5d 100644
--- a/sysutils/cinnamon-control-center/pkg-plist
+++ b/sysutils/cinnamon-control-center/pkg-plist
@@ -23,6 +23,9 @@ lib/cinnamon-control-center-1/panels/libscreen.so
lib/cinnamon-control-center-1/panels/libsoundnua.a
lib/cinnamon-control-center-1/panels/libsoundnua.la
lib/cinnamon-control-center-1/panels/libsoundnua.so
+lib/cinnamon-control-center-1/panels/libdate_time.a
+lib/cinnamon-control-center-1/panels/libdate_time.la
+lib/cinnamon-control-center-1/panels/libdate_time.so
lib/cinnamon-control-center-1/panels/libuniversal-access.a
lib/cinnamon-control-center-1/panels/libuniversal-access.la
lib/cinnamon-control-center-1/panels/libuniversal-access.so
@@ -32,13 +35,13 @@ lib/libcinnamon-control-center.so.1
libdata/pkgconfig/libcinnamon-control-center.pc
share/applications/cinnamon-color-panel.desktop
share/applications/cinnamon-control-center.desktop
+share/applications/cinnamon-datetime-panel.desktop
share/applications/cinnamon-display-panel.desktop
-share/applications/cinnamon-power-panel.desktop
share/applications/cinnamon-region-panel.desktop
-share/applications/cinnamon-screen-panel.desktop
share/applications/cinnamon-sound-nua-panel.desktop
share/applications/cinnamon-sound-panel.desktop
share/applications/cinnamon-universal-access-panel.desktop
+%%DATADIR%%/datetime/backward
%%DATADIR%%/icons/hicolor/16x16/devices/cin-audio-headset.svg
%%DATADIR%%/icons/hicolor/16x16/status/cin-audio-input-microphone-high.png
%%DATADIR%%/icons/hicolor/16x16/status/cin-audio-input-microphone-low.png
@@ -76,6 +79,91 @@ share/applications/cinnamon-universal-access-panel.desktop
%%DATADIR%%/icons/hicolor/48x48/devices/audio-speaker-right.svg
%%DATADIR%%/icons/hicolor/48x48/devices/audio-subwoofer-testing.svg
%%DATADIR%%/icons/hicolor/48x48/devices/audio-subwoofer.svg
+%%DATADIR%%/ui/datetime/bg.png
+%%DATADIR%%/ui/datetime/bg_dim.png
+%%DATADIR%%/ui/datetime/cc.png
+%%DATADIR%%/ui/datetime/datetime.ui
+%%DATADIR%%/ui/datetime/pin.png
+%%DATADIR%%/ui/datetime/timezone_-1.png
+%%DATADIR%%/ui/datetime/timezone_-10.png
+%%DATADIR%%/ui/datetime/timezone_-10_dim.png
+%%DATADIR%%/ui/datetime/timezone_-11.png
+%%DATADIR%%/ui/datetime/timezone_-11_dim.png
+%%DATADIR%%/ui/datetime/timezone_-1_dim.png
+%%DATADIR%%/ui/datetime/timezone_-2.png
+%%DATADIR%%/ui/datetime/timezone_-2_dim.png
+%%DATADIR%%/ui/datetime/timezone_-3.5.png
+%%DATADIR%%/ui/datetime/timezone_-3.5_dim.png
+%%DATADIR%%/ui/datetime/timezone_-3.png
+%%DATADIR%%/ui/datetime/timezone_-3_dim.png
+%%DATADIR%%/ui/datetime/timezone_-4.5.png
+%%DATADIR%%/ui/datetime/timezone_-4.5_dim.png
+%%DATADIR%%/ui/datetime/timezone_-4.png
+%%DATADIR%%/ui/datetime/timezone_-4_dim.png
+%%DATADIR%%/ui/datetime/timezone_-5.5.png
+%%DATADIR%%/ui/datetime/timezone_-5.5_dim.png
+%%DATADIR%%/ui/datetime/timezone_-5.png
+%%DATADIR%%/ui/datetime/timezone_-5_dim.png
+%%DATADIR%%/ui/datetime/timezone_-6.png
+%%DATADIR%%/ui/datetime/timezone_-6_dim.png
+%%DATADIR%%/ui/datetime/timezone_-7.png
+%%DATADIR%%/ui/datetime/timezone_-7_dim.png
+%%DATADIR%%/ui/datetime/timezone_-8.png
+%%DATADIR%%/ui/datetime/timezone_-8_dim.png
+%%DATADIR%%/ui/datetime/timezone_-9.5.png
+%%DATADIR%%/ui/datetime/timezone_-9.5_dim.png
+%%DATADIR%%/ui/datetime/timezone_-9.png
+%%DATADIR%%/ui/datetime/timezone_-9_dim.png
+%%DATADIR%%/ui/datetime/timezone_0.png
+%%DATADIR%%/ui/datetime/timezone_0_dim.png
+%%DATADIR%%/ui/datetime/timezone_1.png
+%%DATADIR%%/ui/datetime/timezone_10.5.png
+%%DATADIR%%/ui/datetime/timezone_10.5_dim.png
+%%DATADIR%%/ui/datetime/timezone_10.png
+%%DATADIR%%/ui/datetime/timezone_10_dim.png
+%%DATADIR%%/ui/datetime/timezone_11.5.png
+%%DATADIR%%/ui/datetime/timezone_11.5_dim.png
+%%DATADIR%%/ui/datetime/timezone_11.png
+%%DATADIR%%/ui/datetime/timezone_11_dim.png
+%%DATADIR%%/ui/datetime/timezone_12.75.png
+%%DATADIR%%/ui/datetime/timezone_12.75_dim.png
+%%DATADIR%%/ui/datetime/timezone_12.png
+%%DATADIR%%/ui/datetime/timezone_12_dim.png
+%%DATADIR%%/ui/datetime/timezone_13.png
+%%DATADIR%%/ui/datetime/timezone_13_dim.png
+%%DATADIR%%/ui/datetime/timezone_14.png
+%%DATADIR%%/ui/datetime/timezone_14_dim.png
+%%DATADIR%%/ui/datetime/timezone_1_dim.png
+%%DATADIR%%/ui/datetime/timezone_2.png
+%%DATADIR%%/ui/datetime/timezone_2_dim.png
+%%DATADIR%%/ui/datetime/timezone_3.5.png
+%%DATADIR%%/ui/datetime/timezone_3.5_dim.png
+%%DATADIR%%/ui/datetime/timezone_3.png
+%%DATADIR%%/ui/datetime/timezone_3_dim.png
+%%DATADIR%%/ui/datetime/timezone_4.5.png
+%%DATADIR%%/ui/datetime/timezone_4.5_dim.png
+%%DATADIR%%/ui/datetime/timezone_4.png
+%%DATADIR%%/ui/datetime/timezone_4_dim.png
+%%DATADIR%%/ui/datetime/timezone_5.5.png
+%%DATADIR%%/ui/datetime/timezone_5.5_dim.png
+%%DATADIR%%/ui/datetime/timezone_5.75.png
+%%DATADIR%%/ui/datetime/timezone_5.75_dim.png
+%%DATADIR%%/ui/datetime/timezone_5.png
+%%DATADIR%%/ui/datetime/timezone_5_dim.png
+%%DATADIR%%/ui/datetime/timezone_6.5.png
+%%DATADIR%%/ui/datetime/timezone_6.5_dim.png
+%%DATADIR%%/ui/datetime/timezone_6.png
+%%DATADIR%%/ui/datetime/timezone_6_dim.png
+%%DATADIR%%/ui/datetime/timezone_7.png
+%%DATADIR%%/ui/datetime/timezone_7_dim.png
+%%DATADIR%%/ui/datetime/timezone_8.75.png
+%%DATADIR%%/ui/datetime/timezone_8.75_dim.png
+%%DATADIR%%/ui/datetime/timezone_8.png
+%%DATADIR%%/ui/datetime/timezone_8_dim.png
+%%DATADIR%%/ui/datetime/timezone_9.5.png
+%%DATADIR%%/ui/datetime/timezone_9.5_dim.png
+%%DATADIR%%/ui/datetime/timezone_9.png
+%%DATADIR%%/ui/datetime/timezone_9_dim.png
share/cinnamon-control-center/ui/cinnamon-region-panel-layout-chooser.ui
share/cinnamon-control-center/ui/cinnamon-region-panel-options-dialog.ui
share/cinnamon-control-center/ui/cinnamon-region-panel.ui
@@ -93,35 +181,115 @@ share/icons/hicolor/16x16/apps/cin-multimedia-volume-control.svg
share/icons/hicolor/16x16/apps/cinnamon-power-manager.png
share/icons/hicolor/16x16/apps/cinnamon-preferences-color.png
share/icons/hicolor/16x16/apps/cinnamon-preferences-desktop-display.png
+share/icons/hicolor/16x16/apps/cinnamon-preferences-system-time.png
share/icons/hicolor/22x22/apps/cin-multimedia-volume-control.png
share/icons/hicolor/22x22/apps/cin-multimedia-volume-control.svg
share/icons/hicolor/22x22/apps/cinnamon-power-manager.png
share/icons/hicolor/22x22/apps/cinnamon-preferences-color.png
share/icons/hicolor/22x22/apps/cinnamon-preferences-desktop-display.png
+share/icons/hicolor/22x22/apps/cinnamon-preferences-system-time.png
share/icons/hicolor/24x24/apps/cin-multimedia-volume-control.png
share/icons/hicolor/24x24/apps/cinnamon-power-manager.png
share/icons/hicolor/24x24/apps/cinnamon-preferences-color.png
share/icons/hicolor/24x24/apps/cinnamon-preferences-desktop-display.png
share/icons/hicolor/256x256/apps/cinnamon-power-manager.png
share/icons/hicolor/256x256/apps/cinnamon-preferences-color.png
+share/icons/hicolor/256x256/apps/cinnamon-preferences-system-time.png
share/icons/hicolor/32x32/apps/cin-multimedia-volume-control.png
share/icons/hicolor/32x32/apps/cin-multimedia-volume-control.svg
share/icons/hicolor/32x32/apps/cinnamon-power-manager.png
share/icons/hicolor/32x32/apps/cinnamon-preferences-color.png
share/icons/hicolor/32x32/apps/cinnamon-preferences-desktop-display.png
+share/icons/hicolor/32x32/apps/cinnamon-preferences-system-time.png
share/icons/hicolor/48x48/apps/cin-multimedia-volume-control.png
share/icons/hicolor/48x48/apps/cinnamon-power-manager.png
share/icons/hicolor/48x48/apps/cinnamon-preferences-color.png
+share/icons/hicolor/48x48/apps/cinnamon-preferences-system-time.png
share/icons/hicolor/48x48/devices/cin-audio-headset.svg
share/icons/hicolor/64x64/apps/cinnamon-preferences-color.png
share/icons/hicolor/scalable/apps/cin-multimedia-volume-control.svg
share/icons/hicolor/scalable/apps/cinnamon-preferences-color.svg
share/icons/hicolor/scalable/apps/cinnamon-preferences-desktop-display.svg
+share/icons/hicolor/scalable/apps/cinnamon-preferences-system-time.svg
share/icons/hicolor/scalable/status/cin-audio-input-microphone-high-symbolic.svg
share/icons/hicolor/scalable/status/cin-audio-input-microphone-low-symbolic.svg
share/icons/hicolor/scalable/status/cin-audio-input-microphone-medium-symbolic.svg
share/icons/hicolor/scalable/status/cin-audio-input-microphone-muted-symbolic.svg
+share/locale/am/LC_MESSAGES/cinnamon-control-center-timezones.mo
+share/locale/ar/LC_MESSAGES/cinnamon-control-center-timezones.mo
+share/locale/as/LC_MESSAGES/cinnamon-control-center-timezones.mo
+share/locale/ast/LC_MESSAGES/cinnamon-control-center-timezones.mo
+share/locale/bg/LC_MESSAGES/cinnamon-control-center-timezones.mo
+share/locale/bn/LC_MESSAGES/cinnamon-control-center-timezones.mo
+share/locale/bn_IN/LC_MESSAGES/cinnamon-control-center-timezones.mo
+share/locale/bs/LC_MESSAGES/cinnamon-control-center-timezones.mo
+share/locale/ca/LC_MESSAGES/cinnamon-control-center-timezones.mo
+share/locale/cs/LC_MESSAGES/cinnamon-control-center-timezones.mo
+share/locale/cy/LC_MESSAGES/cinnamon-control-center-timezones.mo
+share/locale/da/LC_MESSAGES/cinnamon-control-center-timezones.mo
+share/locale/de/LC_MESSAGES/cinnamon-control-center-timezones.mo
+share/locale/el/LC_MESSAGES/cinnamon-control-center-timezones.mo
+share/locale/en_GB/LC_MESSAGES/cinnamon-control-center-timezones.mo
+share/locale/es/LC_MESSAGES/cinnamon-control-center-timezones.mo
+share/locale/et/LC_MESSAGES/cinnamon-control-center-timezones.mo
+share/locale/fa/LC_MESSAGES/cinnamon-control-center-timezones.mo
+share/locale/fi/LC_MESSAGES/cinnamon-control-center-timezones.mo
+share/locale/fr/LC_MESSAGES/cinnamon-control-center-timezones.mo
+share/locale/gl/LC_MESSAGES/cinnamon-control-center-timezones.mo
+share/locale/gu/LC_MESSAGES/cinnamon-control-center-timezones.mo
+share/locale/he/LC_MESSAGES/cinnamon-control-center-timezones.mo
+share/locale/hi/LC_MESSAGES/cinnamon-control-center-timezones.mo
+share/locale/hr/LC_MESSAGES/cinnamon-control-center-timezones.mo
+share/locale/hu/LC_MESSAGES/cinnamon-control-center-timezones.mo
+share/locale/id/LC_MESSAGES/cinnamon-control-center-timezones.mo
+share/locale/ilo/LC_MESSAGES/cinnamon-control-center-timezones.mo
+share/locale/is/LC_MESSAGES/cinnamon-control-center-timezones.mo
+share/locale/it/LC_MESSAGES/cinnamon-control-center-timezones.mo
+share/locale/ja/LC_MESSAGES/cinnamon-control-center-timezones.mo
+share/locale/ka/LC_MESSAGES/cinnamon-control-center-timezones.mo
+share/locale/kn/LC_MESSAGES/cinnamon-control-center-timezones.mo
+share/locale/ko/LC_MESSAGES/cinnamon-control-center-timezones.mo
+share/locale/ku/LC_MESSAGES/cinnamon-control-center-timezones.mo
+share/locale/lo/LC_MESSAGES/cinnamon-control-center-timezones.mo
+share/locale/lt/LC_MESSAGES/cinnamon-control-center-timezones.mo
+share/locale/lv/LC_MESSAGES/cinnamon-control-center-timezones.mo
+share/locale/mai/LC_MESSAGES/cinnamon-control-center-timezones.mo
+share/locale/mk/LC_MESSAGES/cinnamon-control-center-timezones.mo
+share/locale/ml/LC_MESSAGES/cinnamon-control-center-timezones.mo
+share/locale/mr/LC_MESSAGES/cinnamon-control-center-timezones.mo
+share/locale/ms/LC_MESSAGES/cinnamon-control-center-timezones.mo
+share/locale/nb/LC_MESSAGES/cinnamon-control-center-timezones.mo
+share/locale/nds/LC_MESSAGES/cinnamon-control-center-timezones.mo
+share/locale/nl/LC_MESSAGES/cinnamon-control-center-timezones.mo
+share/locale/nn/LC_MESSAGES/cinnamon-control-center-timezones.mo
+share/locale/or/LC_MESSAGES/cinnamon-control-center-timezones.mo
+share/locale/pa/LC_MESSAGES/cinnamon-control-center-timezones.mo
+share/locale/pl/LC_MESSAGES/cinnamon-control-center-timezones.mo
+share/locale/pt/LC_MESSAGES/cinnamon-control-center-timezones.mo
+share/locale/pt_BR/LC_MESSAGES/cinnamon-control-center-timezones.mo
+share/locale/ro/LC_MESSAGES/cinnamon-control-center-timezones.mo
+share/locale/ru/LC_MESSAGES/cinnamon-control-center-timezones.mo
+share/locale/si/LC_MESSAGES/cinnamon-control-center-timezones.mo
+share/locale/sk/LC_MESSAGES/cinnamon-control-center-timezones.mo
+share/locale/sl/LC_MESSAGES/cinnamon-control-center-timezones.mo
+share/locale/sq/LC_MESSAGES/cinnamon-control-center-timezones.mo
+share/locale/sr/LC_MESSAGES/cinnamon-control-center-timezones.mo
+share/locale/sr@latin/LC_MESSAGES/cinnamon-control-center-timezones.mo
+share/locale/sv/LC_MESSAGES/cinnamon-control-center-timezones.mo
+share/locale/ta/LC_MESSAGES/cinnamon-control-center-timezones.mo
+share/locale/te/LC_MESSAGES/cinnamon-control-center-timezones.mo
+share/locale/tr/LC_MESSAGES/cinnamon-control-center-timezones.mo
+share/locale/uk/LC_MESSAGES/cinnamon-control-center-timezones.mo
+share/locale/ur/LC_MESSAGES/cinnamon-control-center-timezones.mo
+share/locale/vi/LC_MESSAGES/cinnamon-control-center-timezones.mo
+share/locale/zh_CN/LC_MESSAGES/cinnamon-control-center-timezones.mo
+share/locale/zh_TW/LC_MESSAGES/cinnamon-control-center-timezones.mo
share/polkit-1/rules.d/cinnamon-control-center.rules
+@dirrmtry share/locale/ilo/LC_MESSAGES
+@dirrmtry share/locale/ilo
+@dirrm %%DATADIR%%/datetime
+@dirrm %%DATADIR%%
+@dirrm share/cinnamon-control-center/ui/datetime
@dirrm share/cinnamon-control-center/ui
@dirrm share/cinnamon-control-center/icons/hicolor/48x48/devices
@dirrm share/cinnamon-control-center/icons/hicolor/48x48
diff --git a/sysutils/cinnamon-settings-daemon/Makefile b/sysutils/cinnamon-settings-daemon/Makefile
index 4e4704565..58645bb66 100644
--- a/sysutils/cinnamon-settings-daemon/Makefile
+++ b/sysutils/cinnamon-settings-daemon/Makefile
@@ -3,8 +3,7 @@
# $MCom$
PORTNAME= cinnamon-settings-daemon
-PORTVERSION= 2.0.8
-PORTREVISION= 1
+PORTVERSION= 2.2.1
CATEGORIES= sysutils gnome
MASTER_SITES= http://github.com/linuxmint/${PORTNAME}/archive/${PORTVERSION}.tar.gz?dummy=/
DIST_SUBDIR= gnome3
@@ -84,6 +83,8 @@ PLIST_SUB+= SMARTCARD="@comment "
post-patch:
@${REINPLACE_CMD} -e 's|/etc/gnome|${PREFIX}/etc/gnome|g' \
${WRKSRC}/data/org.cinnamon.settings-daemon.plugins.xrandr.gschema.xml.in.in
+ @${REINPLACE_CMD} -e '/wacom/d' \
+ ${WRKSRC}/data/Makefile.am
pre-configure:
cd ${WRKSRC} && NOCONFIGURE=yes ${SH} ./autogen.sh
diff --git a/sysutils/cinnamon-settings-daemon/distinfo b/sysutils/cinnamon-settings-daemon/distinfo
index caa3a8243..3dac53858 100644
--- a/sysutils/cinnamon-settings-daemon/distinfo
+++ b/sysutils/cinnamon-settings-daemon/distinfo
@@ -1,2 +1,2 @@
-SHA256 (gnome3/cinnamon-settings-daemon-2.0.8.tar.xz) = 6889f021acab93d146c78fe8aa540a83a12260232e1ea5f697037a7c94c877fd
-SIZE (gnome3/cinnamon-settings-daemon-2.0.8.tar.xz) = 2944024
+SHA256 (gnome3/cinnamon-settings-daemon-2.2.1.tar.xz) = 89798977ad44fa4cfaff26d93e21b29f1a9a6a68a1c57c30e5414ad2159a849e
+SIZE (gnome3/cinnamon-settings-daemon-2.2.1.tar.xz) = 2993922
diff --git a/sysutils/cinnamon-settings-daemon/files/patch-configure.ac b/sysutils/cinnamon-settings-daemon/files/patch-configure.ac
deleted file mode 100644
index fbd1beeae..000000000
--- a/sysutils/cinnamon-settings-daemon/files/patch-configure.ac
+++ /dev/null
@@ -1,17 +0,0 @@
---- configure.ac.orig 2014-04-04 08:09:33.522271204 +0000
-+++ configure.ac 2014-04-04 08:09:38.282271249 +0000
-@@ -73,6 +73,14 @@
- x11
- )
-
-+# We can only support old upower
-+# 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(XI23, gtk+-3.0 >= $GTK_XINPUT_2_3_VERSION, have_xi_23=yes, have_xi_23=no)
- if test x$have_xi_23 = xyes ; then
- AC_DEFINE(XI_23, 1, [Defined if GTK version is higher than 3.7.8])
diff --git a/sysutils/cinnamon-settings-daemon/files/patch-plugins_power_csd-power-manager.c b/sysutils/cinnamon-settings-daemon/files/patch-plugins_power_csd-power-manager.c
deleted file mode 100644
index 973ac5101..000000000
--- a/sysutils/cinnamon-settings-daemon/files/patch-plugins_power_csd-power-manager.c
+++ /dev/null
@@ -1,88 +0,0 @@
---- plugins/power/csd-power-manager.c.orig 2013-11-25 18:39:23.000000000 +0000
-+++ plugins/power/csd-power-manager.c 2014-04-04 09:06:44.968035344 +0000
-@@ -1158,7 +1158,11 @@
- GError *error = NULL;
-
- /* get devices from UPower */
-+#ifdef HAVE_OLD_UPOWER
- ret = up_client_enumerate_devices_sync (manager->priv->up_client, NULL, &error);
-+#else
-+ ret = FALSE;
-+#endif
- if (!ret) {
- g_warning ("failed to get device list: %s", error->message);
- g_error_free (error);
-@@ -1306,13 +1310,17 @@
-
- policy = g_settings_get_enum (manager->priv->settings, "critical-battery-action");
- if (policy == CSD_POWER_ACTION_SUSPEND) {
-+#ifdef HAVE_OLD_UPOWER
- if (is_ups == FALSE &&
- up_client_get_can_suspend (manager->priv->up_client))
- return policy;
-+#endif
- return CSD_POWER_ACTION_SHUTDOWN;
- } else if (policy == CSD_POWER_ACTION_HIBERNATE) {
-+#ifdef HAVE_OLD_UPOWER
- if (up_client_get_can_hibernate (manager->priv->up_client))
- return policy;
-+#endif
- return CSD_POWER_ACTION_SHUTDOWN;
- }
-
-@@ -2303,7 +2311,11 @@
- /* check we won't melt when the lid is closed */
- if (action_type != CSD_POWER_ACTION_SUSPEND &&
- action_type != CSD_POWER_ACTION_HIBERNATE) {
-+#ifdef HAVE_OLD_UPOWER
- if (up_client_get_lid_force_sleep (manager->priv->up_client)) {
-+#else
-+ if (0){
-+#endif
- g_warning ("to prevent damage, now forcing suspend");
- do_power_action_type (manager, CSD_POWER_ACTION_SUSPEND);
- return;
-@@ -2377,7 +2389,11 @@
- }
-
- /* same state */
-+#ifdef HAVE_OLD_UPOWER
- tmp = up_client_get_lid_is_closed (manager->priv->up_client);
-+#else
-+ tmp = FALSE;
-+#endif
- if (manager->priv->lid_is_closed == tmp)
- return;
- manager->priv->lid_is_closed = tmp;
-@@ -3539,6 +3555,7 @@
- manager);
- }
-
-+#ifdef HAVE_OLD_UPOWER
- static void
- upower_notify_sleep_cb (UpClient *client,
- UpSleepKind sleep_kind,
-@@ -3602,6 +3619,7 @@
- g_error_free (error);
- }
- }
-+#endif
-
- static void
- idle_send_to_sleep (CsdPowerManager *manager)
-@@ -3838,11 +3856,15 @@
- G_CALLBACK (engine_settings_key_changed_cb), manager);
- manager->priv->settings_screensaver = g_settings_new ("org.cinnamon.desktop.screensaver");
- manager->priv->up_client = up_client_new ();
-+#ifdef HAVE_OLD_UPOWER
- g_signal_connect (manager->priv->up_client, "notify-sleep",
- G_CALLBACK (upower_notify_sleep_cb), manager);
- g_signal_connect (manager->priv->up_client, "notify-resume",
- G_CALLBACK (upower_notify_resume_cb), manager);
- manager->priv->lid_is_closed = up_client_get_lid_is_closed (manager->priv->up_client);
-+#else
-+ manager->priv->lid_is_closed = FALSE;
-+#endif
- g_signal_connect (manager->priv->up_client, "device-added",
- G_CALLBACK (engine_device_added_cb), manager);
- g_signal_connect (manager->priv->up_client, "device-removed",
diff --git a/sysutils/cinnamon-settings-daemon/pkg-plist b/sysutils/cinnamon-settings-daemon/pkg-plist
index 411dccb4f..595653d98 100644
--- a/sysutils/cinnamon-settings-daemon/pkg-plist
+++ b/sysutils/cinnamon-settings-daemon/pkg-plist
@@ -3,6 +3,7 @@ include/cinnamon-settings-daemon-3.0/cinnamon-settings-daemon/cinnamon-settings-
include/cinnamon-settings-daemon-3.0/cinnamon-settings-daemon/csd-enums.h
lib/cinnamon-settings-daemon-3.0/a11y-keyboard.cinnamon-settings-plugin
lib/cinnamon-settings-daemon-3.0/a11y-settings.cinnamon-settings-plugin
+lib/cinnamon-settings-daemon-3.0/automount.cinnamon-settings-plugin
lib/cinnamon-settings-daemon-3.0/clipboard.cinnamon-settings-plugin
lib/cinnamon-settings-daemon-3.0/color.cinnamon-settings-plugin
lib/cinnamon-settings-daemon-3.0/cursor.cinnamon-settings-plugin
@@ -14,6 +15,9 @@ lib/cinnamon-settings-daemon-3.0/liba11y-keyboard.so
lib/cinnamon-settings-daemon-3.0/liba11y-settings.a
lib/cinnamon-settings-daemon-3.0/liba11y-settings.la
lib/cinnamon-settings-daemon-3.0/liba11y-settings.so
+lib/cinnamon-settings-daemon-3.0/libautomount.a
+lib/cinnamon-settings-daemon-3.0/libautomount.la
+lib/cinnamon-settings-daemon-3.0/libautomount.so
lib/cinnamon-settings-daemon-3.0/libclipboard.a
lib/cinnamon-settings-daemon-3.0/libclipboard.la
lib/cinnamon-settings-daemon-3.0/libclipboard.so
@@ -69,7 +73,7 @@ lib/cinnamon-settings-daemon-3.0/sound.cinnamon-settings-plugin
lib/cinnamon-settings-daemon-3.0/xrandr.cinnamon-settings-plugin
lib/cinnamon-settings-daemon-3.0/xsettings.cinnamon-settings-plugin
libdata/pkgconfig/cinnamon-settings-daemon.pc
-libexec/cinnamon-fallback-mount-helper
+libexec/csd-test-automount
libexec/cinnamon-settings-daemon
libexec/csd-datetime-mechanism
libexec/csd-locate-pointer
@@ -86,7 +90,6 @@ libexec/csd-test-smartcard
libexec/csd-test-sound
libexec/csd-test-xsettings
man/man1/cinnamon-settings-daemon.1.gz
-share/applications/cinnamon-fallback-mount-helper.desktop
share/applications/cinnamon-settings-daemon.desktop
share/cinnamon-settings-daemon-3.0/input-device-example.sh
%%DATADIR%%/csd-a11y-preferences-dialog.ui
diff --git a/x11-fm/nemo/Makefile b/x11-fm/nemo/Makefile
index 91252686f..17a243ddb 100644
--- a/x11-fm/nemo/Makefile
+++ b/x11-fm/nemo/Makefile
@@ -3,7 +3,7 @@
# $MCom$
PORTNAME= nemo
-PORTVERSION= 2.0.8
+PORTVERSION= 2.2.0
CATEGORIES= x11-fm gnome
MASTER_SITES= http://github.com/linuxmint/${PORTNAME}/archive/${PORTVERSION}.tar.gz?dummy=/
DIST_SUBDIR= gnome3
@@ -13,6 +13,7 @@ COMMENT= File manager for the Cinnamon desktop
BUILD_DEPENDS= ${LOCALBASE}/share/icons/gnome/index.theme:${PORTSDIR}/misc/gnome-icon-theme \
gtkdocize:${PORTSDIR}/textproc/gtk-doc \
+ py*-polib>=0:${PORTSDIR}/devel/py-polib \
gnome-autogen.sh:${PORTSDIR}/devel/gnome-common \
${LOCALBASE}/libdata/pkgconfig/gsettings-desktop-schemas.pc:${PORTSDIR}/devel/gsettings-desktop-schemas
LIB_DEPENDS= libexif.so:${PORTSDIR}/graphics/libexif \
@@ -24,11 +25,12 @@ RUN_DEPENDS= ${LOCALBASE}/share/icons/gnome/index.theme:${PORTSDIR}/misc/gnome-i
USES= desktop-file-utils gettext gmake pathfix \
pkgconfig shared-mime-info
-USE_GNOME= gnomeprefix intlhack gnomedesktop3 libxml2 \
- introspection:build
+USE_GNOME= gnomedesktop3 gnomeprefix intlhack introspection:build \
+ libxml2 pygobject3
INSTALLS_ICONS= yes
-USE_LDCONFIG= yes
+USE_PYTHON= 2
USE_AUTOTOOLS= libtool autoconf automake
+USE_LDCONFIG= yes
CPPFLAGS+= -I${LOCALBASE}/include
LDFLAGS+= -L${LOCALBASE}/lib ${PTHREAD_LIBS}
CONFIGURE_ARGS= --enable-static --disable-packagekit
@@ -71,8 +73,17 @@ post-patch:
${WRKSRC}/data/nemo.xml.in \
${WRKSRC}/libnemo-private/nemo-file-utilities.h
+# @${REINPLACE_CMD} '/merge_action/d' \
+# ${WRKSRC}/files/Makefile.in
+
@${FIND} ${WRKSRC} -name \* | ${XARGS} ${EGREP} -l "#!.*\/usr\/bin\/python" | \
- ${XARGS} ${REINPLACE_CMD} -I "" -e "s|#!.*python.*|#!/usr/bin/env python|g"
+ ${XARGS} ${REINPLACE_CMD} -I "" -e "s|#!.*python.*|#!${PYTHON_CMD}|g"
+
+ @${REINPLACE_CMD} 's|\"/usr|\"${PREFIX}|g' \
+ ${WRKSRC}/data/merge_action_strings
+
+ @${REINPLACE_CMD} 's|"files", "usr"|"files", "${PREFIX}".strip("/")|g' \
+ ${WRKSRC}/data/merge_action_strings
pre-configure:
cd ${WRKSRC} && NOCONFIGURE=yes ${SH} ./autogen.sh
diff --git a/x11-fm/nemo/distinfo b/x11-fm/nemo/distinfo
index 8ff3ca826..ed9ac3089 100644
--- a/x11-fm/nemo/distinfo
+++ b/x11-fm/nemo/distinfo
@@ -1,2 +1,2 @@
-SHA256 (gnome3/nemo-2.0.8.tar.gz) = e061bd231493737e64c05448bbab29dcd34a0bcc37f0d6240b5f08109e92dbf0
-SIZE (gnome3/nemo-2.0.8.tar.gz) = 1341780
+SHA256 (gnome3/nemo-2.2.0.tar.gz) = aa72fed472cfed47963f955506684c6a20b957d9dc5385cb55376f30d3589b61
+SIZE (gnome3/nemo-2.2.0.tar.gz) = 1341504
diff --git a/x11-fm/nemo/pkg-plist b/x11-fm/nemo/pkg-plist
index b5147af0a..70b214c23 100644
--- a/x11-fm/nemo/pkg-plist
+++ b/x11-fm/nemo/pkg-plist
@@ -35,6 +35,18 @@ share/icons/hicolor/22x22/apps/nemo.png
share/icons/hicolor/24x24/apps/nemo.png
share/icons/hicolor/32x32/apps/nemo.png
share/icons/hicolor/scalable/actions/location-symbolic.svg
+share/icons/hicolor/scalable/actions/nemo-edit-find-symbolic.svg
+share/icons/hicolor/scalable/actions/nemo-folder-new-symbolic.svg
+share/icons/hicolor/scalable/actions/nemo-go-home-symbolic.svg
+share/icons/hicolor/scalable/actions/nemo-go-next-symbolic.svg
+share/icons/hicolor/scalable/actions/nemo-go-previous-symbolic.svg
+share/icons/hicolor/scalable/actions/nemo-go-up-symbolic.svg
+share/icons/hicolor/scalable/actions/nemo-view-refresh-symbolic.svg
+share/icons/hicolor/scalable/actions/sidebar-hide-symbolic.svg
+share/icons/hicolor/scalable/actions/sidebar-places-symbolic.svg
+share/icons/hicolor/scalable/actions/sidebar-show-symbolic.svg
+share/icons/hicolor/scalable/actions/sidebar-tree-symbolic.svg
+share/icons/hicolor/scalable/actions/view-compact-symbolic.svg
share/icons/hicolor/scalable/status/progress-0-symbolic.svg
share/icons/hicolor/scalable/status/progress-10-symbolic.svg
share/icons/hicolor/scalable/status/progress-100-symbolic.svg
@@ -46,11 +58,6 @@ share/icons/hicolor/scalable/status/progress-60-symbolic.svg
share/icons/hicolor/scalable/status/progress-70-symbolic.svg
share/icons/hicolor/scalable/status/progress-80-symbolic.svg
share/icons/hicolor/scalable/status/progress-90-symbolic.svg
-share/icons/hicolor/scalable/actions/sidebar-hide-symbolic.svg
-share/icons/hicolor/scalable/actions/sidebar-places-symbolic.svg
-share/icons/hicolor/scalable/actions/sidebar-show-symbolic.svg
-share/icons/hicolor/scalable/actions/sidebar-tree-symbolic.svg
-share/icons/hicolor/scalable/actions/view-compact-symbolic.svg
share/icons/hicolor/scalable/apps/nemo.svg
share/mime/application/nemo-action.xml
share/mime/application/x-nemo-saved-search.xml
diff --git a/x11-themes/mint-themes/Makefile b/x11-themes/mint-themes/Makefile
new file mode 100644
index 000000000..86c869ba8
--- /dev/null
+++ b/x11-themes/mint-themes/Makefile
@@ -0,0 +1,28 @@
+# Created by: Gustau Perez i Querol <gustau.perez@gmail.com>
+# $FreeBSD$
+# $MCom$
+
+PORTNAME= mint-themes
+PORTVERSION= 0.0.41cf70d
+CATEGORIES= x11-themes gnome
+DIST_SUBDIR= gnome3
+
+MAINTAINER= gnome@FreeBSD.org
+COMMENT= Themes for the cinnamon desktop
+
+USE_GITHUB= yes
+GH_ACCOUNT= linuxmint
+GH_PROJECT= mint-themes
+GH_COMMIT= 41cf70d
+GH_TAGNAME= ${GH_COMMIT}
+
+WRKSRC= ${WRKDIR}/linuxmint-${PORTNAME}-41cf70d
+
+USES= zip
+NO_CONFIGURE= yes
+NO_BUILD= yes
+
+do-install:
+ @(cd ${WRKSRC}/usr/share/themes/ && ${CP} -pPR * ${STAGEDIR}${PREFIX}/share/themes/)
+
+.include <bsd.port.mk>
diff --git a/x11-themes/mint-themes/distinfo b/x11-themes/mint-themes/distinfo
new file mode 100644
index 000000000..cc41b9d05
--- /dev/null
+++ b/x11-themes/mint-themes/distinfo
@@ -0,0 +1,2 @@
+SHA256 (gnome3/mint-themes-0.0.41cf70d.zip) = f383758d8748593a404201e5b9edc2876743a30bb47c6135590d39b144e77fd7
+SIZE (gnome3/mint-themes-0.0.41cf70d.zip) = 1800482
diff --git a/x11-themes/mint-themes/pkg-descr b/x11-themes/mint-themes/pkg-descr
new file mode 100644
index 000000000..b8ea8c126
--- /dev/null
+++ b/x11-themes/mint-themes/pkg-descr
@@ -0,0 +1 @@
+Translations for cinnamon desktop
diff --git a/x11-themes/mint-themes/pkg-plist b/x11-themes/mint-themes/pkg-plist
new file mode 100644
index 000000000..e7cf5154a
--- /dev/null
+++ b/x11-themes/mint-themes/pkg-plist
@@ -0,0 +1,267 @@
+share/themes/index.theme
+share/themes/gtk-2.0/gtkrc
+share/themes/gtk-2.0/images/arrows/arrow-left-insensitive.svg
+share/themes/gtk-2.0/images/arrows/arrow-left.svg
+share/themes/gtk-2.0/images/arrows/arrow-right-insensitive.svg
+share/themes/gtk-2.0/images/arrows/arrow-right.svg
+share/themes/gtk-2.0/images/arrows/small-arrow-down-insensitive.svg
+share/themes/gtk-2.0/images/arrows/small-arrow-down.svg
+share/themes/gtk-2.0/images/arrows/small-arrow-up-insensitive.svg
+share/themes/gtk-2.0/images/arrows/small-arrow-up.svg
+share/themes/gtk-2.0/images/button/button-active-hover.svg
+share/themes/gtk-2.0/images/button/button-active.svg
+share/themes/gtk-2.0/images/button/button-default.svg
+share/themes/gtk-2.0/images/button/button-focus.svg
+share/themes/gtk-2.0/images/button/button-hover.svg
+share/themes/gtk-2.0/images/button/button-insensitive.svg
+share/themes/gtk-2.0/images/button/button.svg
+share/themes/gtk-2.0/images/button/pathbar-button-active-hover.svg
+share/themes/gtk-2.0/images/button/pathbar-button-active.svg
+share/themes/gtk-2.0/images/button/pathbar-button-hover.svg
+share/themes/gtk-2.0/images/button/pathbar-button.svg
+share/themes/gtk-2.0/images/check-radio/checkbg.png
+share/themes/gtk-2.0/images/check-radio/checkbox-checked-insensitive.svg
+share/themes/gtk-2.0/images/check-radio/checkbox-checked.svg
+share/themes/gtk-2.0/images/check-radio/checkbox-unchecked-insensitive.svg
+share/themes/gtk-2.0/images/check-radio/checkbox-unchecked.svg
+share/themes/gtk-2.0/images/check-radio/radio-selected-insensitive.svg
+share/themes/gtk-2.0/images/check-radio/radio-selected.svg
+share/themes/gtk-2.0/images/check-radio/radio-unselected-insensitive.svg
+share/themes/gtk-2.0/images/check-radio/radio-unselected.svg
+share/themes/gtk-2.0/images/entry/entry-bg-insensitive.svg
+share/themes/gtk-2.0/images/entry/entry-bg.svg
+share/themes/gtk-2.0/images/entry/entry-insensitive.svg
+share/themes/gtk-2.0/images/entry/entry.svg
+share/themes/gtk-2.0/images/entry/notebook-entry-bg-insensitive.svg
+share/themes/gtk-2.0/images/entry/notebook-entry-insensitive.svg
+share/themes/gtk-2.0/images/entry/notebook-entry.svg
+share/themes/gtk-2.0/images/expanders/closed.svg
+share/themes/gtk-2.0/images/expanders/open.svg
+share/themes/gtk-2.0/images/frames/frame-gap-end.png
+share/themes/gtk-2.0/images/frames/frame-gap-end.svg
+share/themes/gtk-2.0/images/frames/frame-gap-start.png
+share/themes/gtk-2.0/images/frames/frame-gap-start.svg
+share/themes/gtk-2.0/images/frames/frame.svg
+share/themes/gtk-2.0/images/handles/pane-separator-grip-vertical.svg
+share/themes/gtk-2.0/images/handles/pane-separator-grip.svg
+share/themes/gtk-2.0/images/mintmenu/bc-dark.png
+share/themes/gtk-2.0/images/mintmenu/bc-light.png
+share/themes/gtk-2.0/images/mintmenu/bc.png
+share/themes/gtk-2.0/images/notebook/gap-bottom-left.svg
+share/themes/gtk-2.0/images/notebook/gap-bottom-right.svg
+share/themes/gtk-2.0/images/notebook/gap-bottom.svg
+share/themes/gtk-2.0/images/notebook/gap-left.svg
+share/themes/gtk-2.0/images/notebook/gap-right.svg
+share/themes/gtk-2.0/images/notebook/gap-top-left.svg
+share/themes/gtk-2.0/images/notebook/gap-top-right.svg
+share/themes/gtk-2.0/images/notebook/gap-top.svg
+share/themes/gtk-2.0/images/notebook/notebook.svg
+share/themes/gtk-2.0/images/notebook/null.png
+share/themes/gtk-2.0/images/notebook/tab-bottom-active.svg
+share/themes/gtk-2.0/images/notebook/tab-bottom.svg
+share/themes/gtk-2.0/images/notebook/tab-left-active.svg
+share/themes/gtk-2.0/images/notebook/tab-left.svg
+share/themes/gtk-2.0/images/notebook/tab-right-active.svg
+share/themes/gtk-2.0/images/notebook/tab-right.svg
+share/themes/gtk-2.0/images/notebook/tab-top-active.svg
+share/themes/gtk-2.0/images/notebook/tab-top.svg
+share/themes/gtk-2.0/images/other/close.png
+share/themes/gtk-2.0/images/other/focus.svg
+share/themes/gtk-2.0/images/other/null.png
+share/themes/gtk-2.0/images/panel/panel-active.svg
+share/themes/gtk-2.0/images/panel/panel-normal.svg
+share/themes/gtk-2.0/images/scroll/slider-h-hover.svg
+share/themes/gtk-2.0/images/scroll/slider-h.svg
+share/themes/gtk-2.0/images/scroll/slider-v-hover.svg
+share/themes/gtk-2.0/images/scroll/slider-v.svg
+share/themes/gtk-2.0/images/scroll/trough-h.svg
+share/themes/gtk-2.0/images/scroll/trough-horizontal.svg
+share/themes/gtk-2.0/images/scroll/trough-v.svg
+share/themes/gtk-2.0/images/scroll/trough-vertical.svg
+share/themes/gtk-2.0/images/separators/separator-vertical.svg
+share/themes/gtk-2.0/images/separators/separator.svg
+share/themes/gtk-2.0/images/separators/toolbar-separator-vertical.svg
+share/themes/gtk-2.0/images/separators/toolbar-separator.svg
+share/themes/gtk-2.0/images/toolbars/inline-toolbar.svg
+share/themes/gtk-2.0/images/toolbars/toolbar-vertical.svg
+share/themes/gtk-2.0/images/toolbars/toolbar.svg
+share/themes/gtk-2.0/images/treeview/iconview-selected.svg
+share/themes/gtk-2.0/images/treeview/progress-bar.svg
+share/themes/gtk-2.0/images/treeview/progress-trough.svg
+share/themes/gtk-2.0/images/treeview/row-selected.svg
+share/themes/gtk-2.0/styles/bars.rc
+share/themes/gtk-2.0/styles/buttons.rc
+share/themes/gtk-2.0/styles/check-radio.rc
+share/themes/gtk-2.0/styles/chrome.rc
+share/themes/gtk-2.0/styles/entry.rc
+share/themes/gtk-2.0/styles/file-manager.rc
+share/themes/gtk-2.0/styles/frames.rc
+share/themes/gtk-2.0/styles/handlebox.rc
+share/themes/gtk-2.0/styles/inkscape.rc
+share/themes/gtk-2.0/styles/label-icon.rc
+share/themes/gtk-2.0/styles/menus.rc
+share/themes/gtk-2.0/styles/mintmenu.rc
+share/themes/gtk-2.0/styles/notebook.rc
+share/themes/gtk-2.0/styles/panel.rc
+share/themes/gtk-2.0/styles/scrolled-window.rc
+share/themes/gtk-2.0/styles/separators.rc
+share/themes/gtk-2.0/styles/sliders.rc
+share/themes/gtk-2.0/styles/synaptic.rc
+share/themes/gtk-2.0/styles/terminal.rc
+share/themes/gtk-2.0/styles/text-editor.rc
+share/themes/gtk-2.0/styles/views.rc
+share/themes/gtk-3.0/.gitkeep
+share/themes/metacity-1/close-focus-none.svg
+share/themes/metacity-1/close-focus-normal.svg
+share/themes/metacity-1/close-focus.svg
+share/themes/metacity-1/close-pressed.svg
+share/themes/metacity-1/maximize-focus-none.svg
+share/themes/metacity-1/maximize-focus-normal.svg
+share/themes/metacity-1/maximize-focus.svg
+share/themes/metacity-1/menu-focus-none.svg
+share/themes/metacity-1/menu-focus-normal.svg
+share/themes/metacity-1/menu-focus.svg
+share/themes/metacity-1/menu-pressed.svg
+share/themes/metacity-1/metacity-theme-1.xml
+share/themes/metacity-1/metacity-theme-3.xml
+share/themes/metacity-1/minimize-focus-none.svg
+share/themes/metacity-1/minimize-focus-normal.svg
+share/themes/metacity-1/minimize-focus.svg
+share/themes/metacity-1/shade-focus-none.svg
+share/themes/metacity-1/shade-focus-normal.svg
+share/themes/metacity-1/shade-focus.svg
+share/themes/metacity-1/stick-focus-none.svg
+share/themes/metacity-1/stick-focus-normal.svg
+share/themes/metacity-1/stick-focus.svg
+share/themes/metacity-1/unshade-focus-none.svg
+share/themes/metacity-1/unshade-focus-normal.svg
+share/themes/metacity-1/unshade-focus.svg
+share/themes/metacity-1/unstick-focus-none.svg
+share/themes/metacity-1/unstick-focus-normal.svg
+share/themes/metacity-1/unstick-focus.svg
+share/themes/xfwm4/base-inactive.png
+share/themes/xfwm4/base.png
+share/themes/xfwm4/bottom-active.xpm
+share/themes/xfwm4/bottom-inactive.xpm
+share/themes/xfwm4/bottom-left-active.xpm
+share/themes/xfwm4/bottom-left-inactive.xpm
+share/themes/xfwm4/bottom-right-active.xpm
+share/themes/xfwm4/bottom-right-inactive.xpm
+share/themes/xfwm4/close-active.png
+share/themes/xfwm4/close-active.xpm
+share/themes/xfwm4/close-inactive.png
+share/themes/xfwm4/close-inactive.xpm
+share/themes/xfwm4/close-prelight.png
+share/themes/xfwm4/close-prelight.xpm
+share/themes/xfwm4/close-pressed.png
+share/themes/xfwm4/close-pressed.xpm
+share/themes/xfwm4/hide-active.png
+share/themes/xfwm4/hide-active.xpm
+share/themes/xfwm4/hide-inactive.png
+share/themes/xfwm4/hide-inactive.xpm
+share/themes/xfwm4/hide-prelight.png
+share/themes/xfwm4/hide-prelight.xpm
+share/themes/xfwm4/hide-pressed.png
+share/themes/xfwm4/hide-pressed.xpm
+share/themes/xfwm4/left-active.xpm
+share/themes/xfwm4/left-inactive.xpm
+share/themes/xfwm4/maximize-active.png
+share/themes/xfwm4/maximize-active.xpm
+share/themes/xfwm4/maximize-inactive.png
+share/themes/xfwm4/maximize-inactive.xpm
+share/themes/xfwm4/maximize-prelight.png
+share/themes/xfwm4/maximize-prelight.xpm
+share/themes/xfwm4/maximize-pressed.png
+share/themes/xfwm4/maximize-pressed.xpm
+share/themes/xfwm4/menu-active.png
+share/themes/xfwm4/menu-active.xpm
+share/themes/xfwm4/menu-inactive.png
+share/themes/xfwm4/menu-inactive.xpm
+share/themes/xfwm4/menu-prelight.png
+share/themes/xfwm4/menu-prelight.xpm
+share/themes/xfwm4/menu-pressed.png
+share/themes/xfwm4/menu-pressed.xpm
+share/themes/xfwm4/right-active.xpm
+share/themes/xfwm4/right-inactive.xpm
+share/themes/xfwm4/shade-active.png
+share/themes/xfwm4/shade-active.xpm
+share/themes/xfwm4/shade-inactive.png
+share/themes/xfwm4/shade-inactive.xpm
+share/themes/xfwm4/shade-prelight.png
+share/themes/xfwm4/shade-prelight.xpm
+share/themes/xfwm4/shade-pressed.png
+share/themes/xfwm4/shade-pressed.xpm
+share/themes/xfwm4/shade-toggled-active.png
+share/themes/xfwm4/shade-toggled-active.xpm
+share/themes/xfwm4/shade-toggled-inactive.png
+share/themes/xfwm4/shade-toggled-inactive.xpm
+share/themes/xfwm4/shade-toggled-prelight.png
+share/themes/xfwm4/shade-toggled-prelight.xpm
+share/themes/xfwm4/shade-toggled-pressed.png
+share/themes/xfwm4/shade-toggled-pressed.xpm
+share/themes/xfwm4/stick-active.png
+share/themes/xfwm4/stick-active.xpm
+share/themes/xfwm4/stick-inactive.png
+share/themes/xfwm4/stick-inactive.xpm
+share/themes/xfwm4/stick-prelight.png
+share/themes/xfwm4/stick-prelight.xpm
+share/themes/xfwm4/stick-pressed.png
+share/themes/xfwm4/stick-pressed.xpm
+share/themes/xfwm4/stick-toggled-active.png
+share/themes/xfwm4/stick-toggled-active.xpm
+share/themes/xfwm4/stick-toggled-inactive.png
+share/themes/xfwm4/stick-toggled-inactive.xpm
+share/themes/xfwm4/stick-toggled-prelight.png
+share/themes/xfwm4/stick-toggled-prelight.xpm
+share/themes/xfwm4/stick-toggled-pressed.png
+share/themes/xfwm4/stick-toggled-pressed.xpm
+share/themes/xfwm4/themerc
+share/themes/xfwm4/title-1-active.png
+share/themes/xfwm4/title-1-active.xpm
+share/themes/xfwm4/title-1-inactive.png
+share/themes/xfwm4/title-1-inactive.xpm
+share/themes/xfwm4/title-2-active.png
+share/themes/xfwm4/title-2-active.xpm
+share/themes/xfwm4/title-2-inactive.png
+share/themes/xfwm4/title-2-inactive.xpm
+share/themes/xfwm4/title-3-active.png
+share/themes/xfwm4/title-3-active.xpm
+share/themes/xfwm4/title-3-inactive.png
+share/themes/xfwm4/title-3-inactive.xpm
+share/themes/xfwm4/title-4-active.png
+share/themes/xfwm4/title-4-active.xpm
+share/themes/xfwm4/title-4-inactive.png
+share/themes/xfwm4/title-4-inactive.xpm
+share/themes/xfwm4/title-5-active.png
+share/themes/xfwm4/title-5-active.xpm
+share/themes/xfwm4/title-5-inactive.png
+share/themes/xfwm4/title-5-inactive.xpm
+share/themes/xfwm4/top-left-active.png
+share/themes/xfwm4/top-left-active.xpm
+share/themes/xfwm4/top-left-inactive.png
+share/themes/xfwm4/top-left-inactive.xpm
+share/themes/xfwm4/top-right-active.png
+share/themes/xfwm4/top-right-active.xpm
+share/themes/xfwm4/top-right-inactive.png
+share/themes/xfwm4/top-right-inactive.xpm
+@dirrm share/themes/metacity-1
+@dirrm share/themes/gtk-3.0
+@dirrm share/themes/gtk-2.0/styles
+@dirrm share/themes/gtk-2.0/images/treeview
+@dirrm share/themes/gtk-2.0/images/toolbars
+@dirrm share/themes/gtk-2.0/images/separators
+@dirrm share/themes/gtk-2.0/images/scroll
+@dirrm share/themes/gtk-2.0/images/panel
+@dirrm share/themes/gtk-2.0/images/other
+@dirrm share/themes/gtk-2.0/images/notebook
+@dirrm share/themes/gtk-2.0/images/mintmenu
+@dirrm share/themes/gtk-2.0/images/handles
+@dirrm share/themes/gtk-2.0/images/frames
+@dirrm share/themes/gtk-2.0/images/expanders
+@dirrm share/themes/gtk-2.0/images/entry
+@dirrm share/themes/gtk-2.0/images/check-radio
+@dirrm share/themes/gtk-2.0/images/button
+@dirrm share/themes/gtk-2.0/images/arrows
+@dirrm share/themes/gtk-2.0/images
+@dirrm share/themes/gtk-2.0
+@dirrmtry share/themes
diff --git a/x11-wm/muffin/Makefile b/x11-wm/muffin/Makefile
index 4baaee60c..f0716de69 100644
--- a/x11-wm/muffin/Makefile
+++ b/x11-wm/muffin/Makefile
@@ -3,8 +3,7 @@
# $MCom$
PORTNAME= muffin
-PORTVERSION= 2.0.5
-PORTREVISION= 2
+PORTVERSION= 2.2.1
CATEGORIES= x11-wm gnome
MASTER_SITES= http://github.com/linuxmint/${PORTNAME}/archive/${PORTVERSION}.tar.gz?dummy=/
DIST_SUBDIR= gnome3
@@ -23,12 +22,12 @@ LIB_DEPENDS= libstartup-notification-1.so:${PORTSDIR}/x11/startup-notification \
RUN_DEPENDS= zenity3>=3.0.0:${PORTSDIR}/x11/zenity3
USES= gettext gmake pathfix pkgconfig
-USE_GNOME= gnomedocutils gnomehier gnomeprefix gtk30 \
+USE_GNOME= gconf2 gnomedocutils gnomehier gnomeprefix gtk30 \
intlhack introspection:build
+USE_AUTOTOOLS= libtool autoconf automake
+USE_CSTD= gnu89
USE_XORG= x11 xext xrandr xcomposite xcursor xinerama ice sm
USE_PYTHON= yes
-USE_CSTD= gnu89
-USE_AUTOTOOLS= libtool autoconf automake
USE_LDCONFIG= yes
CPPFLAGS+= -I${LOCALBASE}/include
LDFLAGS+= -L${LOCALBASE}/lib
diff --git a/x11-wm/muffin/distinfo b/x11-wm/muffin/distinfo
index 292423415..c15bf9936 100644
--- a/x11-wm/muffin/distinfo
+++ b/x11-wm/muffin/distinfo
@@ -1,2 +1,2 @@
-SHA256 (gnome3/muffin-2.0.5.tar.gz) = 81a57d452ea88ea926b284248033f021960400b3b9d13f5a334a77cf3bd4c7ee
-SIZE (gnome3/muffin-2.0.5.tar.gz) = 2701294
+SHA256 (gnome3/muffin-2.2.1.tar.gz) = aec5062ca53364e5077694ef0848b7a4efe384f19d41736c2f7d86e53ce5c009
+SIZE (gnome3/muffin-2.2.1.tar.gz) = 2705007
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