diff options
author | Koop Mast <kwm@FreeBSD.org> | 2014-12-03 09:18:23 +0000 |
---|---|---|
committer | Koop Mast <kwm@FreeBSD.org> | 2014-12-03 09:18:23 +0000 |
commit | 6ce4980916f67851d29fde70453953cd55e7edf5 (patch) | |
tree | 9021a26f76674a75f55054140dbaa1e2146de3d6 /x11-toolkits | |
parent | - Move the project over to GitHub, together with our patches (diff) |
Update GNOME to 3.14.2.
This update was brought to you in collaboration with Gustua Perez
Make sure gtk30 pulls it the default theme (adwaita-icon-theme).
Update the extra gnome-shell-extensions so they work with gnome-shell 3.14.
Drop metacity from gnome3 meta-port.
Remove the gtile gnome-shell extension since it proven to be buggy.
Exp-run done by antoine@ for gdk-pixbuf2 deprecated API.
PR: 195414
Obtained from: gnome dev repo
Notes
Notes:
svn path=/head/; revision=373802
Diffstat (limited to 'x11-toolkits')
-rw-r--r-- | x11-toolkits/gtk20/Makefile | 1 | ||||
-rw-r--r-- | x11-toolkits/gtk30/Makefile | 8 | ||||
-rw-r--r-- | x11-toolkits/gtk30/distinfo | 4 | ||||
-rw-r--r-- | x11-toolkits/gtk30/pkg-plist | 2 | ||||
-rw-r--r-- | x11-toolkits/gtksourceview3/Makefile | 4 | ||||
-rw-r--r-- | x11-toolkits/gtksourceview3/distinfo | 4 | ||||
-rw-r--r-- | x11-toolkits/libwnck3/Makefile | 2 | ||||
-rw-r--r-- | x11-toolkits/libwnck3/distinfo | 4 | ||||
-rw-r--r-- | x11-toolkits/vte3/Makefile | 2 | ||||
-rw-r--r-- | x11-toolkits/vte3/distinfo | 4 | ||||
-rw-r--r-- | x11-toolkits/vte3/files/patch-src_vteterminal.h | 21 | ||||
-rw-r--r-- | x11-toolkits/vte3/pkg-plist | 9 |
12 files changed, 19 insertions, 46 deletions
diff --git a/x11-toolkits/gtk20/Makefile b/x11-toolkits/gtk20/Makefile index 63686b60d3c3..c508a874d406 100644 --- a/x11-toolkits/gtk20/Makefile +++ b/x11-toolkits/gtk20/Makefile @@ -57,6 +57,7 @@ post-patch: @${FIND} ${WRKSRC} -name Makefile.in | ${XARGS} ${GREP} -l lgmodule | \ ${XARGS} ${REINPLACE_CMD} -e 's|-lgmodule|@GMODULE_LIBS@|g' @${REINPLACE_CMD} -e 's|[{]libdir[}]/locale|{datadir}/locale|g' \ + -e 's|-DGDK_PIXBUF_DISABLE_DEPRECATED||g' \ ${WRKSRC}/configure @${REINPLACE_CMD} -e 's|@LN_S@|${LN} -sf|' ${WRKSRC}/gtk/Makefile.in @${REINPLACE_CMD} -e 's|file,cups|file,cups,lpr|' \ diff --git a/x11-toolkits/gtk30/Makefile b/x11-toolkits/gtk30/Makefile index db1d03f3c113..85faf7cfc76c 100644 --- a/x11-toolkits/gtk30/Makefile +++ b/x11-toolkits/gtk30/Makefile @@ -1,11 +1,11 @@ # Created by: Vanilla I. Shu <vanilla@MinJe.com.TW> # $FreeBSD$ -# $MCom: ports/trunk/x11-toolkits/gtk30/Makefile 19945 2014-10-15 05:41:04Z gusi $ +# $MCom: ports/trunk/x11-toolkits/gtk30/Makefile 20051 2014-11-10 09:39:43Z gusi $ # Please keep gtk30 and x11-themes/gnome-themes-standard minor version in sync PORTNAME= gtk -PORTVERSION= 3.14.3 -PORTREVISION?= 1 +PORTVERSION= 3.14.5 +PORTREVISION?= 0 CATEGORIES= x11-toolkits MASTER_SITES= GNOME MASTER_SITE_SUBDIR= sources/gtk+/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/} @@ -43,7 +43,7 @@ CPPFLAGS+= -I${LOCALBASE}/include -fno-omit-frame-pointer LIBS+= -L${LOCALBASE}/lib INSTALL_TARGET= install-strip -LIBVERSION= 0.1400.3 +LIBVERSION= 0.1400.5 PLIST_SUB+= LIBVERSION=${LIBVERSION} GLIB_SCHEMAS= org.gtk.Demo.gschema.xml \ diff --git a/x11-toolkits/gtk30/distinfo b/x11-toolkits/gtk30/distinfo index 41108098aedc..5b51cf2ece85 100644 --- a/x11-toolkits/gtk30/distinfo +++ b/x11-toolkits/gtk30/distinfo @@ -1,2 +1,2 @@ -SHA256 (gnome3/gtk+-3.14.3.tar.xz) = 5e8c62b932f4f0384c3c8cbf251f65978bdecde3211bb16e4c2bde5d8b3af72f -SIZE (gnome3/gtk+-3.14.3.tar.xz) = 15646820 +SHA256 (gnome3/gtk+-3.14.5.tar.xz) = ba70f5ccde6646c6d8aa5a6398794b7bcf23fc45af22580a215d258f392dbbe2 +SIZE (gnome3/gtk+-3.14.5.tar.xz) = 15666824 diff --git a/x11-toolkits/gtk30/pkg-plist b/x11-toolkits/gtk30/pkg-plist index aac9078c29ef..204aa37bac3f 100644 --- a/x11-toolkits/gtk30/pkg-plist +++ b/x11-toolkits/gtk30/pkg-plist @@ -647,8 +647,6 @@ share/locale/zh_TW/LC_MESSAGES/gtk30-properties.mo share/locale/zh_TW/LC_MESSAGES/gtk30.mo share/themes/Default/gtk-3.0/gtk-keys.css share/themes/Emacs/gtk-3.0/gtk-keys.css -@exec /usr/bin/find %%LOCALBASE%%/share/icons -type d -depth 1 -exec %D/bin/gtk-update-icon-cache -q -f {} \; 2>/dev/null || /usr/bin/true -@unexec /usr/bin/find %%LOCALBASE%%/share/icons -type f -depth 2 -name icon-theme.cache -delete 2>/dev/null || /usr/bin/true @exec %D/bin/gtk-query-immodules-3.0 --update-cache > /dev/null 2>&1 || /usr/bin/true @rmtry lib/gtk-3.0/%%GTK3_VERSION%%/immodules.cache @exec /bin/mkdir -p %D/lib/gtk-3.0/modules diff --git a/x11-toolkits/gtksourceview3/Makefile b/x11-toolkits/gtksourceview3/Makefile index 9618de9c0e36..5a88d1accc19 100644 --- a/x11-toolkits/gtksourceview3/Makefile +++ b/x11-toolkits/gtksourceview3/Makefile @@ -1,9 +1,9 @@ # Created by: Joe Marcus Clarke <marcus@FreeBSD.org> # $FreeBSD$ -# $MCom: ports/trunk/x11-toolkits/gtksourceview3/Makefile 19949 2014-10-15 06:25:06Z gusi $ +# $MCom: ports/trunk/x11-toolkits/gtksourceview3/Makefile 20046 2014-11-10 07:00:12Z gusi $ PORTNAME= gtksourceview -PORTVERSION= 3.14.1 +PORTVERSION= 3.14.2 CATEGORIES= x11-toolkits gnome MASTER_SITES= GNOME PKGNAMESUFFIX= 3 diff --git a/x11-toolkits/gtksourceview3/distinfo b/x11-toolkits/gtksourceview3/distinfo index b63f947b2ca2..642ecb68339d 100644 --- a/x11-toolkits/gtksourceview3/distinfo +++ b/x11-toolkits/gtksourceview3/distinfo @@ -1,2 +1,2 @@ -SHA256 (gnome3/gtksourceview-3.14.1.tar.xz) = 52dc100694a81b16a961c7c2e09f643e8e40a0947e595d5fda62b1ad76b9ae27 -SIZE (gnome3/gtksourceview-3.14.1.tar.xz) = 1254580 +SHA256 (gnome3/gtksourceview-3.14.2.tar.xz) = b3c4a4f464fdb23ecc708a61c398aa3003e05adcd7d7223d48d9c04fe87524ad +SIZE (gnome3/gtksourceview-3.14.2.tar.xz) = 1254408 diff --git a/x11-toolkits/libwnck3/Makefile b/x11-toolkits/libwnck3/Makefile index f318e3328b54..b16f4cd0368b 100644 --- a/x11-toolkits/libwnck3/Makefile +++ b/x11-toolkits/libwnck3/Makefile @@ -3,7 +3,7 @@ # $MCom: ports/trunk/x11-toolkits/libwnck3/Makefile 19952 2014-10-15 08:11:00Z gusi $ PORTNAME= libwnck -PORTVERSION= 3.4.9 +PORTVERSION= 3.14.0 CATEGORIES= x11-toolkits gnome MASTER_SITES= GNOME PKGNAMESUFFIX= 3 diff --git a/x11-toolkits/libwnck3/distinfo b/x11-toolkits/libwnck3/distinfo index e5fff55593d1..e42ae9418b67 100644 --- a/x11-toolkits/libwnck3/distinfo +++ b/x11-toolkits/libwnck3/distinfo @@ -1,2 +1,2 @@ -SHA256 (gnome3/libwnck-3.4.9.tar.xz) = 96e6353f2701a1ea565ece54d791a7bebef1832d96126f7377c54bb3516682c4 -SIZE (gnome3/libwnck-3.4.9.tar.xz) = 674396 +SHA256 (gnome3/libwnck-3.14.0.tar.xz) = f5080076346609b4c36394b879f3a86b92ced3b90a37cb54c8e9a14f00e7921c +SIZE (gnome3/libwnck-3.14.0.tar.xz) = 675916 diff --git a/x11-toolkits/vte3/Makefile b/x11-toolkits/vte3/Makefile index 775eceb07556..68aa09ec39db 100644 --- a/x11-toolkits/vte3/Makefile +++ b/x11-toolkits/vte3/Makefile @@ -3,7 +3,7 @@ # $MCom: ports/trunk/x11-toolkits/vte3/Makefile 19957 2014-10-15 11:07:14Z gusi $ PORTNAME?= vte -PORTVERSION= 0.38.0 +PORTVERSION= 0.38.2 PORTREVISION?= 0 CATEGORIES= x11-toolkits gnome MASTER_SITES= GNOME diff --git a/x11-toolkits/vte3/distinfo b/x11-toolkits/vte3/distinfo index 478d42341a1a..571dd8fc0ae0 100644 --- a/x11-toolkits/vte3/distinfo +++ b/x11-toolkits/vte3/distinfo @@ -1,2 +1,2 @@ -SHA256 (gnome3/vte-0.38.0.tar.xz) = 5cfff28dc9364e82f51293796d541c9229299766283283da06c3d82b6d178fd2 -SIZE (gnome3/vte-0.38.0.tar.xz) = 1003184 +SHA256 (gnome3/vte-0.38.2.tar.xz) = b2daba79229c84de3fbc41fcbb160c8d7ca50523fc01dedefada27e75ecc7de5 +SIZE (gnome3/vte-0.38.2.tar.xz) = 1005048 diff --git a/x11-toolkits/vte3/files/patch-src_vteterminal.h b/x11-toolkits/vte3/files/patch-src_vteterminal.h deleted file mode 100644 index 3672eff1fb00..000000000000 --- a/x11-toolkits/vte3/files/patch-src_vteterminal.h +++ /dev/null @@ -1,21 +0,0 @@ -From 45deae03e8d0d53de82de14fbe189930d7133592 Mon Sep 17 00:00:00 2001 -From: Jasper Lievisse Adriaanse <jasper@humppa.nl> -Date: Mon, 15 Sep 2014 09:01:47 +0200 -Subject: Prevent redefinition of VteCharAttributes as that breaks GCC 4.2 - - -diff --git a/src/vteterminal.h b/src/vteterminal.h -index d5dc089..88e21b8 100644 ---- src/vteterminal.h -+++ src/vteterminal.h -@@ -111,7 +111,6 @@ struct _VteTerminalClass { - }; - - /* The structure we return as the supplemental attributes for strings. */ --typedef struct _VteCharAttributes VteCharAttributes; - struct _VteCharAttributes { - /*< private >*/ - long row, column; --- -cgit v0.10.1 - diff --git a/x11-toolkits/vte3/pkg-plist b/x11-toolkits/vte3/pkg-plist index f10e16771f5e..c44e3db27ca8 100644 --- a/x11-toolkits/vte3/pkg-plist +++ b/x11-toolkits/vte3/pkg-plist @@ -11,16 +11,10 @@ include/vte-%%VERSION%%/vte/vteversion.h lib/girepository-1.0/Vte-%%VERSION%%.typelib lib/libvte-%%VERSION%%.so lib/libvte-%%VERSION%%.so.0 -lib/libvte-%%VERSION%%.so.0.3800.0 +lib/libvte-%%VERSION%%.so.0.3800.2 libdata/pkgconfig/vte-%%VERSION%%.pc share/doc/vte-%%VERSION%%/VteTerminal.html share/doc/vte-%%VERSION%%/annotation-glossary.html -share/doc/vte-%%VERSION%%/api-index-0-20.html -share/doc/vte-%%VERSION%%/api-index-0-24.html -share/doc/vte-%%VERSION%%/api-index-0-26.html -share/doc/vte-%%VERSION%%/api-index-0-28.html -share/doc/vte-%%VERSION%%/api-index-0-34.html -share/doc/vte-%%VERSION%%/api-index-0-36.html share/doc/vte-%%VERSION%%/api-index-deprecated.html share/doc/vte-%%VERSION%%/api-index-full.html share/doc/vte-%%VERSION%%/ch01.html @@ -75,6 +69,7 @@ share/locale/fi/LC_MESSAGES/vte-%%VERSION%%.mo share/locale/fr/LC_MESSAGES/vte-%%VERSION%%.mo share/locale/fur/LC_MESSAGES/vte-%%VERSION%%.mo share/locale/ga/LC_MESSAGES/vte-%%VERSION%%.mo +share/locale/gd/LC_MESSAGES/vte-%%VERSION%%.mo share/locale/gl/LC_MESSAGES/vte-%%VERSION%%.mo share/locale/gu/LC_MESSAGES/vte-%%VERSION%%.mo share/locale/he/LC_MESSAGES/vte-%%VERSION%%.mo |