update to gnome-terminal-3.8.1

This commit is contained in:
jasper 2013-04-15 18:57:55 +00:00
parent 12bbfc3add
commit 129ae65f6d
6 changed files with 16 additions and 59 deletions

View File

@ -1,11 +1,11 @@
# $OpenBSD: Makefile,v 1.99 2013/04/14 16:27:44 ajacoutot Exp $
# $OpenBSD: Makefile,v 1.100 2013/04/15 18:57:55 jasper Exp $
SHARED_ONLY= Yes
COMMENT= GNOME terminal
GNOME_PROJECT= gnome-terminal
GNOME_VERSION= 3.8.0.1
GNOME_VERSION= 3.8.1
# GPLv3+
PERMIT_PACKAGE_CDROM= Yes

View File

@ -1,2 +1,2 @@
SHA256 (gnome/gnome-terminal-3.8.0.1.tar.xz) = uSGFmP9M8krTFxYNN9Rj+YI1GSlaxN50FxOcQ5WMVl4=
SIZE (gnome/gnome-terminal-3.8.0.1.tar.xz) = 1610932
SHA256 (gnome/gnome-terminal-3.8.1.tar.xz) = xJr6smlzIl9B7TWp1bUYDWIHdX5SQFZlYUazBpLzn/8=
SIZE (gnome/gnome-terminal-3.8.1.tar.xz) = 1612340

View File

@ -1,7 +1,7 @@
$OpenBSD: patch-src_client_c,v 1.2 2013/03/31 08:13:54 ajacoutot Exp $
--- src/client.c.orig Wed Mar 20 11:09:31 2013
+++ src/client.c Sat Mar 30 19:01:02 2013
@@ -520,7 +520,11 @@ parse_arguments (int *argcp,
$OpenBSD: patch-src_client_c,v 1.3 2013/04/15 18:57:55 jasper Exp $
--- src/client.c.orig Mon Apr 15 15:51:52 2013
+++ src/client.c Mon Apr 15 20:55:57 2013
@@ -521,7 +521,11 @@ parse_arguments (int *argcp,
* because we want to use the value from PWD (if it is correct).
* See bug 502146.
*/

View File

@ -1,10 +1,10 @@
$OpenBSD: patch-src_terminal-prefs_c,v 1.1 2013/03/31 09:09:09 ajacoutot Exp $
$OpenBSD: patch-src_terminal-prefs_c,v 1.2 2013/04/15 18:57:55 jasper Exp $
Only pickup uuid.h from e2fsprogs and don't get confused when ossp-uuid
is also installed.
--- src/terminal-prefs.c.orig Sun Mar 31 10:49:42 2013
+++ src/terminal-prefs.c Sun Mar 31 10:49:57 2013
--- src/terminal-prefs.c.orig Mon Apr 15 15:51:46 2013
+++ src/terminal-prefs.c Mon Apr 15 20:55:57 2013
@@ -20,7 +20,7 @@
#include <string.h>
@ -13,4 +13,4 @@ is also installed.
+#include <uuid/uuid.h>
#include <dconf.h>
#include <gtk/gtk.h>
#include <glib.h>

View File

@ -1,43 +0,0 @@
$OpenBSD: patch-src_terminal-screen_c,v 1.8 2013/04/08 12:11:52 jasper Exp $
From b7df4813c7b85377309f8b9aecd6cae37af3cb0a Mon Sep 17 00:00:00 2001
From: Christian Persch <chpe@gnome.org>
Date: Mon, 08 Apr 2013 12:04:16 +0000
Subject: screen: Portability fix
https://bugzilla.gnome.org/show_bug.cgi?id=697024
--- src/terminal-screen.c.orig Wed Mar 20 11:09:31 2013
+++ src/terminal-screen.c Mon Apr 8 14:09:17 2013
@@ -16,7 +16,7 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#include <config.h>
+#include "config.h"
#define _GNU_SOURCE /* for dup3 */
#include "terminal-screen.h"
@@ -188,6 +188,22 @@ static const TerminalRegexPattern url_regex_patterns[]
static GRegex **url_regexes;
static TerminalURLFlavour *url_regex_flavors;
static guint n_url_regexes;
+
+/* See bug #697024 */
+#ifndef __linux__
+
+#undef dup3
+#define dup3 fake_dup3
+
+static int
+fake_dup3 (int fd, int fd2, int flags)
+{
+ if (dup2 (fd, fd2) == -1)
+ return -1;
+
+ return fcntl (fd2, F_SETFD, flags);
+}
+#endif /* !__linux__ */
G_DEFINE_TYPE (TerminalScreen, terminal_screen, VTE_TYPE_TERMINAL)

View File

@ -1,7 +1,7 @@
$OpenBSD: patch-src_terminal_c,v 1.4 2013/03/31 08:13:54 ajacoutot Exp $
--- src/terminal.c.orig Wed Mar 20 11:09:32 2013
+++ src/terminal.c Sat Mar 30 19:00:38 2013
@@ -231,7 +231,11 @@ main (int argc, char **argv)
$OpenBSD: patch-src_terminal_c,v 1.5 2013/04/15 18:57:55 jasper Exp $
--- src/terminal.c.orig Mon Apr 15 15:51:46 2013
+++ src/terminal.c Mon Apr 15 20:55:57 2013
@@ -230,7 +230,11 @@ main (int argc, char **argv)
* because we want to use the value from PWD (if it is correct).
* See bug 502146.
*/