Make sure to pick up the correct uuid.h header.

This commit is contained in:
ajacoutot 2013-03-31 09:09:09 +00:00
parent de1730826e
commit f5614502e8
4 changed files with 37 additions and 5 deletions

View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.92 2013/03/31 08:13:54 ajacoutot Exp $
# $OpenBSD: Makefile,v 1.93 2013/03/31 09:09:09 ajacoutot Exp $
SHARED_ONLY= Yes
@ -6,7 +6,7 @@ COMMENT= GNOME terminal
GNOME_PROJECT= gnome-terminal
GNOME_VERSION= 3.8.0
REVISION= 0
REVISION= 2
# GPLv3+
PERMIT_PACKAGE_CDROM= Yes

View File

@ -0,0 +1,16 @@
$OpenBSD: patch-src_terminal-prefs_c,v 1.1 2013/03/31 09:09:09 ajacoutot 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
@@ -20,7 +20,7 @@
#include <string.h>
-#include <uuid.h>
+#include <uuid/uuid.h>
#include <dconf.h>
#include <gtk/gtk.h>

View File

@ -0,0 +1,16 @@
$OpenBSD: patch-src_terminal-profiles-list_c,v 1.1 2013/03/31 09:09:09 ajacoutot Exp $
Only pickup uuid.h from e2fsprogs and don't get confused when ossp-uuid
is also installed.
--- src/terminal-profiles-list.c.orig Sun Mar 31 10:51:11 2013
+++ src/terminal-profiles-list.c Sun Mar 31 10:51:16 2013
@@ -25,7 +25,7 @@
#include "terminal-schemas.h"
#include <string.h>
-#include <uuid.h>
+#include <uuid/uuid.h>
/* Counts occurrences of @str in @strv */
static guint

View File

@ -1,7 +1,7 @@
$OpenBSD: patch-src_terminal-settings-list_c,v 1.1 2013/03/29 18:49:46 jasper Exp $
$OpenBSD: patch-src_terminal-settings-list_c,v 1.2 2013/03/31 09:09:09 ajacoutot Exp $
Only pickup uuid.h from e2fsprogs and don't get
confused when ossp-uuid is also installed.
Only pickup uuid.h from e2fsprogs and don't get confused when ossp-uuid
is also installed.
--- src/terminal-settings-list.c.orig Fri Mar 29 19:43:05 2013
+++ src/terminal-settings-list.c Fri Mar 29 19:43:12 2013