Update to gnome-builder-3.16.1.

This commit is contained in:
ajacoutot 2015-04-14 07:52:24 +00:00
parent d54957052b
commit 225104bd1b
7 changed files with 36 additions and 70 deletions

View File

@ -1,11 +1,11 @@
# $OpenBSD: Makefile,v 1.1.1.1 2015/04/06 10:06:09 ajacoutot Exp $
# $OpenBSD: Makefile,v 1.2 2015/04/14 07:52:24 ajacoutot Exp $
SHARED_ONLY= Yes
COMMENT= IDE for GNOME
GNOME_PROJECT= gnome-builder
GNOME_VERSION= 3.16.0
GNOME_VERSION= 3.16.1
SHARED_LIBS += ide-1.0 0.0 # unknown
@ -48,11 +48,11 @@ MODPY_VERSION= ${MODPY_DEFAULT_VERSION_3}
MODGNOME_TOOLS= desktop-file-utils gobject-introspection \
gtk-update-icon-cache
LIB_DEPENDS= devel/libgit2/libgit2-glib \
LIB_DEPENDS= devel/libgit2/libgit2-glib>=0.22.6 \
devel/llvm \
x11/gnome/devhelp \
x11/gnome/gjs \
x11/gtksourceview3
x11/gtksourceview3>=3.16.1
CONFIGURE_ENV= ac_cv_path_PYTHON3_CONFIG=python${MODPY_VERSION}-config

View File

@ -1,2 +1,2 @@
SHA256 (gnome/gnome-builder-3.16.0.tar.xz) = jEs9rlFs3P/hRw9iHboK5tDRS3dl5P8Tf6TKB0PYbas=
SIZE (gnome/gnome-builder-3.16.0.tar.xz) = 1506368
SHA256 (gnome/gnome-builder-3.16.1.tar.xz) = HLm2bzsKa5miNgurFV2foXSOWoBZBIG0vOkAo3gGSUc=
SIZE (gnome/gnome-builder-3.16.1.tar.xz) = 1678940

View File

@ -1,7 +1,7 @@
$OpenBSD: patch-Makefile_in,v 1.1.1.1 2015/04/06 10:06:09 ajacoutot Exp $
--- Makefile.in.orig Mon Apr 6 10:56:01 2015
+++ Makefile.in Mon Apr 6 10:56:09 2015
@@ -1545,7 +1545,6 @@ libide_1_0_la_CXXFLAGS = \
$OpenBSD: patch-Makefile_in,v 1.2 2015/04/14 07:52:24 ajacoutot Exp $
--- Makefile.in.orig Tue Apr 14 01:58:31 2015
+++ Makefile.in Tue Apr 14 08:14:10 2015
@@ -1634,7 +1634,6 @@ libide_1_0_la_CXXFLAGS = \
$(NULL)
libide_1_0_la_LDFLAGS = \

View File

@ -0,0 +1,23 @@
$OpenBSD: patch-libide_ide-highlight-index_c,v 1.1 2015/04/14 07:52:24 ajacoutot Exp $
https://bugzilla.gnome.org/show_bug.cgi?id=747826
--- libide/ide-highlight-index.c.orig Tue Apr 14 09:39:12 2015
+++ libide/ide-highlight-index.c Tue Apr 14 09:40:00 2015
@@ -21,6 +21,7 @@
#include <string.h>
#include <sys/types.h>
#include <sys/user.h>
+#include <unistd.h>
#include "ide-debug.h"
#include "ide-highlight-index.h"
@@ -47,7 +48,7 @@ ide_highlight_index_new (void)
ret = g_new0 (IdeHighlightIndex, 1);
ret->ref_count = 1;
- ret->strings = g_string_chunk_new (PAGE_SIZE);
+ ret->strings = g_string_chunk_new (sysconf (_SC_PAGE_SIZE));
ret->index = g_hash_table_new (g_str_hash, g_str_equal);
return ret;

View File

@ -1,30 +0,0 @@
$OpenBSD: patch-libide_ide-log_c,v 1.2 2015/04/06 19:58:15 ajacoutot Exp $
From 42a3d2a4ca6793d1ff8dd97914999921268c2667 Mon Sep 17 00:00:00 2001
From: Antoine Jacoutot <ajacoutot@gnome.org>
Date: Mon, 6 Apr 2015 11:23:26 +0200
Subject: Fix build on OpenBSD.
--- libide/ide-log.c.orig Tue Mar 24 00:58:20 2015
+++ libide/ide-log.c Mon Apr 6 01:39:42 2015
@@ -24,9 +24,9 @@
# include <sys/utsname.h>
# include <sys/types.h>
# include <sys/syscall.h>
-#elif defined __FreeBSD__
+#elif defined __FreeBSD__ || defined __OpenBSD__
# include <sys/utsname.h>
-#endif /* !__linux__ && !__FreeBSD__ */
+#endif /* !__linux__ && !__FreeBSD__ && !__OpenBSD__ */
#include <glib.h>
#include <string.h>
@@ -204,7 +204,7 @@ ide_log_init (gboolean stdout_,
g_ptr_array_add (channels, channel);
}
-#if defined __linux__ || defined __FreeBSD__
+#if defined __linux__ || defined __FreeBSD__ || defined __OpenBSD__
uname (&u);
memcpy (hostname, u.nodename, sizeof (hostname));
#else

View File

@ -1,18 +0,0 @@
$OpenBSD: patch-libide_local_ide-local-device_c,v 1.1.1.1 2015/04/06 10:06:09 ajacoutot Exp $
From 1e48740c3f855a309683f6bcffbc14c045074499 Mon Sep 17 00:00:00 2001
From: Ting-Wei Lan <lantw@src.gnome.org>
Date: Sun, 29 Mar 2015 02:08:09 +0800
Subject: libide: don't attach -gnu to the local system type instead of failing
--- libide/local/ide-local-device.c.orig Tue Mar 24 00:58:20 2015
+++ libide/local/ide-local-device.c Mon Apr 6 00:20:46 2015
@@ -50,7 +50,7 @@ get_system_type (void)
#ifdef __GLIBC__
return g_strdup_printf ("%s-%s-%s", u.machine, os_lower, "gnu");
#else
-# error Your platform is not yet supported.
+ return g_strdup_printf ("%s-%s", u.machine, os_lower);
#endif
}

View File

@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST,v 1.1.1.1 2015/04/06 10:06:09 ajacoutot Exp $
@comment $OpenBSD: PLIST,v 1.2 2015/04/14 07:52:24 ajacoutot Exp $
@bin bin/gnome-builder
lib/girepository-1.0/Ide-1.0.typelib
lib/libide-1.0.a
@ -16,6 +16,7 @@ share/gir-1.0/Ide-1.0.gir
share/glib-2.0/schemas/org.gnome.builder.editor.gschema.xml
share/glib-2.0/schemas/org.gnome.builder.editor.language.gschema.xml
share/glib-2.0/schemas/org.gnome.builder.experimental.gschema.xml
share/glib-2.0/schemas/org.gnome.builder.project-tree.gschema.xml
share/gtksourceview-3.0/styles/builder-dark.xml
share/gtksourceview-3.0/styles/builder.xml
share/icons/hicolor/16x16/apps/builder.png
@ -24,17 +25,7 @@ share/icons/hicolor/256x256/apps/builder.png
share/icons/hicolor/32x32/apps/builder.png
share/icons/hicolor/48x48/apps/builder.png
share/icons/hicolor/512x512/apps/builder.png
share/icons/hicolor/scalable/actions/builder-split-tab-symbolic.svg
share/icons/hicolor/scalable/apps/builder-documentation-symbolic.svg
share/icons/hicolor/scalable/apps/builder-editor-symbolic.svg
share/icons/hicolor/scalable/autocomplete/
share/icons/hicolor/scalable/autocomplete/lang-class-symbolic.svg
share/icons/hicolor/scalable/autocomplete/lang-enum-symbolic.svg
share/icons/hicolor/scalable/autocomplete/lang-enum-value-symbolic.svg
share/icons/hicolor/scalable/autocomplete/lang-function-symbolic.svg
share/icons/hicolor/scalable/autocomplete/lang-method-symbolic.svg
share/icons/hicolor/scalable/autocomplete/lang-struct-symbolic.svg
share/icons/hicolor/scalable/autocomplete/struct-field-symbolic.svg
share/icons/hicolor/scalable/apps/builder-symbolic.svg
share/locale/bs/LC_MESSAGES/gnome-builder.mo
share/locale/cs/LC_MESSAGES/gnome-builder.mo
share/locale/de/LC_MESSAGES/gnome-builder.mo