cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update to gtk+3-3.18.1.

Browse Source
This commit is contained in:
ajacoutot 2015-10-03 20:37:27 +00:00
parent 317db219ac
commit 0fd81d9446
4 changed files with 5 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
x11/gtk+3/Makefile
View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.140 2015/09/24 10:28:18 ajacoutot Exp $
# $OpenBSD: Makefile,v 1.141 2015/10/03 20:37:27 ajacoutot Exp $
SHARED_ONLY= Yes
@ -8,7 +8,7 @@ COMMENT-cloudprint= gtk+3 Google Cloud Print backend
COMMENT-guic= gtk+ icon theme caching utility
GNOME_PROJECT= gtk+
GNOME_VERSION= 3.18.0
GNOME_VERSION= 3.18.1
PKGNAME-main= gtk+3-${GNOME_VERSION}
PKGNAME-cups= gtk+3-cups-${GNOME_VERSION}

4
x11/gtk+3/distinfo
View File

@ -1,2 +1,2 @@
SHA256 (gtk+-3.18.0.tar.xz) = f7iuJXQDMX04UrrSjQZNNfZ+l4sf7Ytx1Zl+hyBCcbk=
SIZE (gtk+-3.18.0.tar.xz) = 18982948
SHA256 (gtk+-3.18.1.tar.xz) = vSecuxnz/aB0yJzw7fnn2V7ui4ibaInRbC9/D2veupI=
SIZE (gtk+-3.18.1.tar.xz) = 18903020

34
x11/gtk+3/patches/patch-gtk_gtkcssselector_c
View File

@ -1,34 +0,0 @@
$OpenBSD: patch-gtk_gtkcssselector_c,v 1.1 2015/09/24 10:28:18 ajacoutot Exp $
From a080cb40b90e9893fd9dd0c47367808744c17e22 Mon Sep 17 00:00:00 2001
From: Emmanuele Bassi <ebassi@gnome.org>
Date: Wed, 23 Sep 2015 11:01:46 +0100
Subject: Improve compiler detection for __builtin_popcount(
--- gtk/gtkcssselector.c.orig Fri Sep 18 12:54:51 2015
+++ gtk/gtkcssselector.c Wed Sep 23 14:57:10 2015
@@ -25,6 +25,11 @@
#include "gtkcssprovider.h"
#include "gtkstylecontextprivate.h"
+#if defined(_MSC_VER) && _MSC_VER > 1500
+# include <intrin.h>
+# define __builtin_popcount(n) __popcount(n)
+#endif
+
typedef struct _GtkCssSelectorClass GtkCssSelectorClass;
typedef gboolean (* GtkCssSelectorForeachFunc) (const GtkCssSelector *selector,
const GtkCssMatcher *matcher,
@@ -749,7 +754,11 @@ gtk_css_selector_region_get_change (const GtkCssSelect
static inline guint
count_bits (guint n)
{
-#if defined(__GNUC__)
+#if defined(__GNUC__) && (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 5))
+ return (guint) __builtin_popcount (n);
+#elif defined(__clang__) && (__clang_major__ > 3 || (__clang_major__ == 3 && __clang_minor__ >= 1))
+ return (guint) __builtin_popcount (n);
+#elif defined(_MSC_VER) && _MSC_VER > 1500
return (guint) __builtin_popcount (n);
#else
guint result = 0;

5
x11/gtk+3/pkg/PLIST-main
View File

@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST-main,v 1.34 2015/09/24 10:28:18 ajacoutot Exp $
@comment $OpenBSD: PLIST-main,v 1.35 2015/10/03 20:37:27 ajacoutot Exp $
@conflict gtk+3-docs-*
@pkgpath x11/gtk+3,-docs
@unexec-delete rm -f %D/lib/gtk-3.0/3.0.0/immodules.cache
@ -462,7 +462,6 @@ share/gtk-doc/html/gail-libgail-util3/gail-libgail-util3-GailTextUtil.html
share/gtk-doc/html/gail-libgail-util3/gail-libgail-util3.devhelp2
share/gtk-doc/html/gail-libgail-util3/home.png
share/gtk-doc/html/gail-libgail-util3/index.html
share/gtk-doc/html/gail-libgail-util3/index.sgml
share/gtk-doc/html/gail-libgail-util3/left-insensitive.png
share/gtk-doc/html/gail-libgail-util3/left.png
share/gtk-doc/html/gail-libgail-util3/libgail-util-main.html
@ -563,7 +562,6 @@ share/gtk-doc/html/gdk3/help_cursor.png
share/gtk-doc/html/gdk3/home.png
share/gtk-doc/html/gdk3/icon.png
share/gtk-doc/html/gdk3/index.html
share/gtk-doc/html/gdk3/index.sgml
share/gtk-doc/html/gdk3/iron_cross.png
share/gtk-doc/html/gdk3/left-insensitive.png
share/gtk-doc/html/gdk3/left.png
@ -1035,7 +1033,6 @@ share/gtk-doc/html/gtk3/home.png
share/gtk-doc/html/gtk3/icon-view.png
share/gtk-doc/html/gtk3/image.png
share/gtk-doc/html/gtk3/index.html
share/gtk-doc/html/gtk3/index.sgml
share/gtk-doc/html/gtk3/info-bar.png
share/gtk-doc/html/gtk3/inspector.png
share/gtk-doc/html/gtk3/label.png