diff --git a/x11/gnome/terminal/Makefile b/x11/gnome/terminal/Makefile index 4a2da0e9a0c..34274bca210 100644 --- a/x11/gnome/terminal/Makefile +++ b/x11/gnome/terminal/Makefile @@ -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 diff --git a/x11/gnome/terminal/patches/patch-src_terminal-prefs_c b/x11/gnome/terminal/patches/patch-src_terminal-prefs_c new file mode 100644 index 00000000000..4608a93d323 --- /dev/null +++ b/x11/gnome/terminal/patches/patch-src_terminal-prefs_c @@ -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 + +-#include ++#include + #include + + #include diff --git a/x11/gnome/terminal/patches/patch-src_terminal-profiles-list_c b/x11/gnome/terminal/patches/patch-src_terminal-profiles-list_c new file mode 100644 index 00000000000..62f5fff246f --- /dev/null +++ b/x11/gnome/terminal/patches/patch-src_terminal-profiles-list_c @@ -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 +-#include ++#include + + /* Counts occurrences of @str in @strv */ + static guint diff --git a/x11/gnome/terminal/patches/patch-src_terminal-settings-list_c b/x11/gnome/terminal/patches/patch-src_terminal-settings-list_c index 5a1206574d5..24a68f21110 100644 --- a/x11/gnome/terminal/patches/patch-src_terminal-settings-list_c +++ b/x11/gnome/terminal/patches/patch-src_terminal-settings-list_c @@ -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