diff options
author | gusi <gusi@df743ca5-7f9a-e211-a948-0013205c9059> | 2014-04-26 04:51:12 +0800 |
---|---|---|
committer | gusi <gusi@df743ca5-7f9a-e211-a948-0013205c9059> | 2014-04-26 04:51:12 +0800 |
commit | 524dc96813e9f340ae53b813743328e571e3c241 (patch) | |
tree | e318e5263bec7b301ced7549a8c11cfb3e7dceb2 /sysutils/cinnamon-settings-daemon | |
parent | 246fb069fe099292e89766d02baae6b78569c7a8 (diff) | |
download | marcuscom-ports-524dc96813e9f340ae53b813743328e571e3c241.tar marcuscom-ports-524dc96813e9f340ae53b813743328e571e3c241.tar.gz marcuscom-ports-524dc96813e9f340ae53b813743328e571e3c241.tar.bz2 marcuscom-ports-524dc96813e9f340ae53b813743328e571e3c241.tar.lz marcuscom-ports-524dc96813e9f340ae53b813743328e571e3c241.tar.xz marcuscom-ports-524dc96813e9f340ae53b813743328e571e3c241.tar.zst marcuscom-ports-524dc96813e9f340ae53b813743328e571e3c241.zip |
Update cinnamon to 2.2.3. Deal with the upower update to 0.99. Introduce
cinnamon-menus and mint-themes. Remove a lot of unused stuff in
misc/cinnamon-translations. Also try to remove deprecated stuff here and
there.
git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@19573 df743ca5-7f9a-e211-a948-0013205c9059
Diffstat (limited to 'sysutils/cinnamon-settings-daemon')
5 files changed, 10 insertions, 111 deletions
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 |