Update to gtk+3-3.4.4.

This commit is contained in:
ajacoutot 2012-07-16 06:36:01 +00:00
parent 5a72116b35
commit 6569228df9
4 changed files with 9 additions and 55 deletions

View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.42 2012/07/09 16:33:21 ajacoutot Exp $
# $OpenBSD: Makefile,v 1.43 2012/07/16 06:36:01 ajacoutot Exp $
SHARED_ONLY= Yes
@ -6,7 +6,7 @@ COMMENT-main= multi-platform graphical toolkit
COMMENT-docs= gtk+3 documentation
COMMENT-cups= gtk+3 CUPS print backend
V= 3.4.3
V= 3.4.4
DISTNAME= gtk+-${V}
EXTRACT_SUFX= .tar.xz
@ -14,8 +14,6 @@ PKGNAME-main= gtk+3-${V}
PKGNAME-docs= gtk+3-docs-${V}
PKGNAME-cups= gtk+3-cups-${V}
REVISION-main= 1
# grep ^GTK_BINARY_VERSION ${WRKSRC}/Makefile (after do-configure)
GTK_BINARY_VERSION=3.0.0
SUBST_VARS= GTK_BINARY_VERSION
@ -79,7 +77,7 @@ LIB_DEPENDS-cups= ${LIB_DEPENDS} \
STEM->=${V}:${BASE_PKGPATH},-main
WANTLIB-cups += ${WANTLIB}
WANTLIB-cups += asn1 crypto cups gdk-3 gssapi gtk-3 krb5 ssl colord
WANTLIB-cups += asn1 crypto cups gdk-3 gssapi gtk-3 krb5 ssl colord lcms2
USE_GMAKE= Yes
USE_LIBTOOL= Yes

View File

@ -1,5 +1,2 @@
MD5 (gtk+-3.4.3.tar.xz) = 5VLVLDsIJOuZhC3JxfSHXw==
RMD160 (gtk+-3.4.3.tar.xz) = HeglQVZCbWorS/1baB3vkydQJ/Y=
SHA1 (gtk+-3.4.3.tar.xz) = ZFFQ3cQXt70Qm5Vr7uvMz5SlDyQ=
SHA256 (gtk+-3.4.3.tar.xz) = hGAQRCqWWQRpzeFu1qH9/gk5fkNRZUWfBNMc+lcTeZ8=
SIZE (gtk+-3.4.3.tar.xz) = 12851676
SHA256 (gtk+-3.4.4.tar.xz) = 8VTkYAdQNNpMDOicMgAl3NRZ2iof3zLZKglSLqyiQsc=
SIZE (gtk+-3.4.4.tar.xz) = 12854476

View File

@ -1,7 +1,7 @@
$OpenBSD: patch-gtk_Makefile_in,v 1.11 2012/05/12 06:22:37 ajacoutot Exp $
--- gtk/Makefile.in.orig Sat May 12 01:00:34 2012
+++ gtk/Makefile.in Sat May 12 07:51:17 2012
@@ -862,7 +862,7 @@ INTROSPECTION_COMPILER_ARGS = \
$OpenBSD: patch-gtk_Makefile_in,v 1.12 2012/07/16 06:36:01 ajacoutot Exp $
--- gtk/Makefile.in.orig Sun Jul 15 19:02:16 2012
+++ gtk/Makefile.in Sun Jul 15 22:05:27 2012
@@ -884,7 +884,7 @@ INTROSPECTION_COMPILER_ARGS = \
SUBDIRS = a11y . tests
@HAVE_CUPS_FALSE@@HAVE_PAPI_CUPS_FALSE@@HAVE_PAPI_FALSE@GTK_PRINT_BACKENDS = file,lpr
@HAVE_CUPS_FALSE@@HAVE_PAPI_CUPS_FALSE@@HAVE_PAPI_TRUE@GTK_PRINT_BACKENDS = file,papi

View File

@ -1,41 +0,0 @@
$OpenBSD: patch-gtk_gtkmountoperation-x11_c,v 1.10 2012/07/09 17:21:27 ajacoutot Exp $
From 974212ec825d8d50bdea8ab955b6f19b8ed1672f Mon Sep 17 00:00:00 2001
From: Antoine Jacoutot <ajacoutot@gnome.org>
Date: Mon, 09 Jul 2012 16:20:34 +0000
Subject: OpenBSD: use G_N_ELEMENTS instead of nitems
--- gtk/gtkmountoperation-x11.c.orig Sun Mar 18 21:44:21 2012
+++ gtk/gtkmountoperation-x11.c Mon Jul 9 18:07:49 2012
@@ -731,11 +731,11 @@ pid_get_parent (GPid pid)
int mib[] = { CTL_KERN, KERN_PROC, KERN_PROC_PID, pid,
sizeof(struct kinfo_proc), 0 };
- if (sysctl(mib, nitems(mib), NULL, &len, NULL, 0) == -1)
+ if (sysctl(mib, G_N_ELEMENTS (mib), NULL, &len, NULL, 0) == -1)
return (-1);
mib[5] = (len / sizeof(struct kinfo_proc));
- if (sysctl(mib, nitems(mib), &kp, &len, NULL, 0) < 0)
+ if (sysctl(mib, G_N_ELEMENTS (mib), &kp, &len, NULL, 0) < 0)
return -1;
ppid = kp.p_ppid;
@@ -760,7 +760,7 @@ pid_get_env (GPid pid, const gchar *key)
key_len = strlen (key);
ret = NULL;
- if (sysctl(mib, nitems(mib), strs, &len, NULL, 0) != -1)
+ if (sysctl(mib, G_N_ELEMENTS (mib), strs, &len, NULL, 0) != -1)
{
for (i = 0; strs[i] != NULL; i++)
{
@@ -792,7 +792,7 @@ pid_get_command_line (GPid pid)
strs = (char **)realloc(strs, len);
- if (sysctl(mib, nitems(mib), strs, &len, NULL, 0) == -1) {
+ if (sysctl(mib, G_N_ELEMENTS (mib), strs, &len, NULL, 0) == -1) {
g_free (strs);
return ret;
}