diff options
| author | kwm <kwm@FreeBSD.org> | 2014-12-31 04:13:46 +0800 |
|---|---|---|
| committer | kwm <kwm@FreeBSD.org> | 2014-12-31 04:13:46 +0800 |
| commit | 816bd153bdd241d15760e1f3157b6599b480a604 (patch) | |
| tree | f8d16b26e7f6882796704c78c3316de2d96ca435 /sysutils/cinnamon-control-center | |
| parent | 2708491b9858faea7fe6e4a4c93aec5355aeaf49 (diff) | |
| download | freebsd-ports-gnome-816bd153bdd241d15760e1f3157b6599b480a604.tar.gz freebsd-ports-gnome-816bd153bdd241d15760e1f3157b6599b480a604.tar.zst freebsd-ports-gnome-816bd153bdd241d15760e1f3157b6599b480a604.zip | |
Update cinnamon to 2.4, this should fix [1] and [2].
Update totem to 3.14 now that we have gstreamer 1.4 and minor gnome updates.
Update evolution suite to 3.12.9.
Make sure gtk30 pulls in adwait-icon-theme, since it now the default theme [3].
PR: 195290 [1], 195289 [2], 195455 [3]
Obtained from: gnome devel repo
Diffstat (limited to 'sysutils/cinnamon-control-center')
6 files changed, 16 insertions, 43 deletions
diff --git a/sysutils/cinnamon-control-center/Makefile b/sysutils/cinnamon-control-center/Makefile index 8bf8db0cc68d..f939402eb56d 100644 --- a/sysutils/cinnamon-control-center/Makefile +++ b/sysutils/cinnamon-control-center/Makefile @@ -1,9 +1,8 @@ # Created by: Gustau Perez i Querol <gustau.perez@gmail.com> # $FreeBSD$ -# $MCom: ports/trunk/sysutils/cinnamon-control-center/Makefile 20008 2014-10-21 15:13:35Z gusi $ PORTNAME= cinnamon-control-center -PORTVERSION= 2.2.11 +PORTVERSION= 2.4.2 CATEGORIES= sysutils gnome MASTER_SITES= http://github.com/linuxmint/${PORTNAME}/archive/${PORTVERSION}.tar.gz?dummy=/ DIST_SUBDIR= gnome3 diff --git a/sysutils/cinnamon-control-center/distinfo b/sysutils/cinnamon-control-center/distinfo index 400660147486..f4e6f3f2a34a 100644 --- a/sysutils/cinnamon-control-center/distinfo +++ b/sysutils/cinnamon-control-center/distinfo @@ -1,2 +1,2 @@ -SHA256 (gnome3/cinnamon-control-center-2.2.11.tar.gz) = 9cd9d9dcad3a6f9a1957f3c92a2be5316dd74a91e9efa62a6e5f9fada110929f -SIZE (gnome3/cinnamon-control-center-2.2.11.tar.gz) = 4855291 +SHA256 (gnome3/cinnamon-control-center-2.4.2.tar.gz) = 7d25193a3cc13c12f22864f3c9a907acfaa616392cb2b7ab4e0624f0d200f188 +SIZE (gnome3/cinnamon-control-center-2.4.2.tar.gz) = 4305006 diff --git a/sysutils/cinnamon-control-center/files/patch-configure.ac b/sysutils/cinnamon-control-center/files/patch-configure.ac index fd14a647c451..d88cdc465cec 100644 --- a/sysutils/cinnamon-control-center/files/patch-configure.ac +++ b/sysutils/cinnamon-control-center/files/patch-configure.ac @@ -1,14 +1,16 @@ ---- 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) +--- configure.ac.orig 2014-11-12 01:19:37.000000000 +0100 ++++ configure.ac 2014-11-24 22:20:09.360210664 +0100 +@@ -138,13 +138,6 @@ + #---------------------------------------------- + # Network Manager Stuff -PKG_CHECK_MODULES(NETWORK_MANAGER, NetworkManager >= $NETWORK_MANAGER_REQUIRED_VERSION - libnm-glib >= $NETWORK_MANAGER_REQUIRED_VERSION +- libnm-glib-vpn >= $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, +- libnm-gtk >= $NETWORK_MANAGER_APPLET_REQUIRED_VERSION +- mm-glib >= $MODEM_MANAGER_REQUIRED_VERSION, +- [have_networkmanager=yes], have_networkmanager=no) + if test "x$have_networkmanager" = xno ; then + AC_MSG_WARN(*** Network panel will not be built (NetworkManager or ModemManager not found) ***) + else diff --git a/sysutils/cinnamon-control-center/files/patch-panels_Makefile.am b/sysutils/cinnamon-control-center/files/patch-panels_Makefile.am deleted file mode 100644 index d9b36e97ec52..000000000000 --- a/sysutils/cinnamon-control-center/files/patch-panels_Makefile.am +++ /dev/null @@ -1,10 +0,0 @@ ---- 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/files/patch-unused-panels_user-accounts_um-utils.c b/sysutils/cinnamon-control-center/files/patch-unused-panels_user-accounts_um-utils.c deleted file mode 100644 index 58c72f61747d..000000000000 --- a/sysutils/cinnamon-control-center/files/patch-unused-panels_user-accounts_um-utils.c +++ /dev/null @@ -1,19 +0,0 @@ ---- unused-panels/user-accounts/um-utils.c.orig 2013-11-24 13:33:13.594698498 +0000 -+++ unused-panels/user-accounts/um-utils.c 2013-11-24 13:33:34.715696820 +0000 -@@ -25,7 +25,15 @@ - #include <stdlib.h> - #include <sys/types.h> - #include <pwd.h> --#include <utmp.h> -+#include <sys/param.h> -+#if __FreeBSD_version < 900000 -+ #include <utmp.h> -+#else -+#include <utmpx.h> -+/* from the old utmp.h */ -+#define UT_NAMESIZE 16 -+#endif -+ - - #include <glib.h> - #include <glib/gi18n-lib.h> diff --git a/sysutils/cinnamon-control-center/pkg-plist b/sysutils/cinnamon-control-center/pkg-plist index c4c1d20bf470..568a538f9f29 100644 --- a/sysutils/cinnamon-control-center/pkg-plist +++ b/sysutils/cinnamon-control-center/pkg-plist @@ -22,6 +22,7 @@ lib/cinnamon-control-center-1/panels/libsoundnua.so lib/cinnamon-control-center-1/panels/libuniversal-access.a lib/cinnamon-control-center-1/panels/libuniversal-access.so lib/libcinnamon-control-center.so +lib/libcinnamon-control-center.so.1 lib/libcinnamon-control-center.so.1.0.0 libdata/pkgconfig/libcinnamon-control-center.pc share/applications/cinnamon-color-panel.desktop |