cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

- update seed to 3.1.1.1 (git master as of today)

Browse Source 
* unbreaks after recent gobject-introspection update
This commit is contained in:
jasper 2011-09-21 20:27:30 +00:00
parent 54469462f1
commit d4f38d862a
9 changed files with 22 additions and 263 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
x11/gnome/seed/Makefile
View File

@ -1,10 +1,9 @@
# $OpenBSD: Makefile,v 1.9 2011/09/20 22:54:25 jasper Exp $ # $OpenBSD: Makefile,v 1.10 2011/09/21 20:27:30 jasper Exp $
COMMENT= GObject JavaScriptCore bridge COMMENT= GObject JavaScriptCore bridge
GNOME_PROJECT= seed GNOME_PROJECT= seed
GNOME_VERSION= 3.0.0 GNOME_VERSION= 3.1.1.1 # XXX: git master as of 21-09-2011
REVISION= 5
SHARED_LIBS += seed-gtk3 0.0 # 0.0 SHARED_LIBS += seed-gtk3 0.0 # 0.0
CATEGORIES= devel www CATEGORIES= devel www
@ -16,8 +15,6 @@ PERMIT_PACKAGE_FTP= Yes
PERMIT_DISTFILES_CDROM= Yes PERMIT_DISTFILES_CDROM= Yes
PERMIT_DISTFILES_FTP= Yes PERMIT_DISTFILES_FTP= Yes
EXTRACT_SUFX= .tar.bz2
HOMEPAGE= http://live.gnome.org/Seed HOMEPAGE= http://live.gnome.org/Seed
MODULES= devel/gettext \ MODULES= devel/gettext \
@ -29,7 +26,7 @@ WANTLIB += c cairo cairo-gobject dbus-1 dbus-glib-1 drm enchant
WANTLIB += expat ffi fontconfig freetype gailutil-3 gdk-3 gdk_pixbuf-2.0 WANTLIB += expat ffi fontconfig freetype gailutil-3 gdk-3 gdk_pixbuf-2.0
WANTLIB += gio-2.0 girepository-1.0 glib-2.0 gmodule-2.0 gmp gobject-2.0 WANTLIB += gio-2.0 girepository-1.0 glib-2.0 gmodule-2.0 gmp gobject-2.0
WANTLIB += gstapp-0.10 gstbase-0.10 gstinterfaces-0.10 gstpbutils-0.10 WANTLIB += gstapp-0.10 gstbase-0.10 gstinterfaces-0.10 gstpbutils-0.10
WANTLIB += gstreamer-0.10 gstvideo-0.10 gthread-2.0 gtk-3 icudata WANTLIB += gstreamer-0.10 gstvideo-0.10 gthread-2.0 gtk-3 kvm icudata
WANTLIB += icui18n icuuc jpeg m mpfr pango-1.0 pangocairo-1.0 WANTLIB += icui18n icuuc jpeg m mpfr pango-1.0 pangocairo-1.0
WANTLIB += pangoft2-1.0 pcre pixman-1 png pthread pthread-stubs WANTLIB += pangoft2-1.0 pcre pixman-1 png pthread pthread-stubs
WANTLIB += readline soup-2.4 sqlite3 stdc++ termcap util webkitgtk-3.0 WANTLIB += readline soup-2.4 sqlite3 stdc++ termcap util webkitgtk-3.0
@ -37,10 +34,13 @@ WANTLIB += xcb xcb-render xcb-shm xml2 xslt z
BUILD_DEPENDS= ${RUN_DEPENDS} BUILD_DEPENDS= ${RUN_DEPENDS}
RUN_DEPENDS= x11/gnome/js-common RUN_DEPENDS= x11/gnome/js-common
LIB_DEPENDS= devel/gobject-introspection \ LIB_DEPENDS= devel/gobject-introspection>=1.30.0 \
devel/mpfr>=3.0.1 \ devel/mpfr>=3.0.1 \
www/webkit,gtk3 www/webkit,gtk3
# When updating, put back patch-*-Makefile_in
MASTER_SITES= http://distfiles.nl/
CONFIGURE_ARGS+= --enable-readline-module \ CONFIGURE_ARGS+= --enable-readline-module \
--enable-multiprocessing-module \ --enable-multiprocessing-module \
--enable-sqlite-module \ --enable-sqlite-module \

10
x11/gnome/seed/distinfo
View File

@ -1,5 +1,5 @@
MD5 (gnome/seed-3.0.0.tar.bz2) = zYHTPNuXvQr6KNvm6XM1XQ== MD5 (gnome/seed-3.1.1.1.tar.xz) = fQkz/YkCr2u4TMQnm/G+Ig==
RMD160 (gnome/seed-3.0.0.tar.bz2) = zNYhvctPVfrbI+XBPKzIKljXWHg= RMD160 (gnome/seed-3.1.1.1.tar.xz) = HzlLDDn2u+KkOIS4KLN3Tlbzzj0=
SHA1 (gnome/seed-3.0.0.tar.bz2) = A+d9j4Fqr6Gsp8UH7GvqO4llPAg= SHA1 (gnome/seed-3.1.1.1.tar.xz) = uLEBYr6mtfkeMYriBRS0uILnBDA=
SHA256 (gnome/seed-3.0.0.tar.bz2) = x++ODHz+Yzxr+b/BOrVkWPBT37EreEx1zFDfp8+Ci+Y= SHA256 (gnome/seed-3.1.1.1.tar.xz) = IrEDMVr+unJ9YeuMI55w0i/fL+9u2dwB53fa8uZOKrQ=
SIZE (gnome/seed-3.0.0.tar.bz2) = 772779 SIZE (gnome/seed-3.1.1.1.tar.xz) = 638480

12
x11/gnome/seed/patches/patch-libseed_Makefile_in
View File

@ -1,12 +0,0 @@
$OpenBSD: patch-libseed_Makefile_in,v 1.1.1.1 2011/05/13 09:59:35 jasper Exp $
--- libseed/Makefile.in.orig Fri May 13 10:05:55 2011
+++ libseed/Makefile.in Fri May 13 10:06:05 2011
@@ -368,7 +368,7 @@ libseed@SEED_GTK_VERSION@_la_LIBADD = \
$(WEBKIT_LIBS) \
$(SEED_PROFILE_LIBS) \
$(SEED_OSX_LIBS) \
- $(FFI_LIBS) -ldl
+ $(FFI_LIBS)
seedheaders_HEADERS = seed.h seed-debug.h seed-module.h
seedheadersdir = $(pkgincludedir)@SEED_GTK_VERSION@

15
x11/gnome/seed/patches/patch-libseed_seed-closure_c
View File

@ -1,15 +0,0 @@
$OpenBSD: patch-libseed_seed-closure_c,v 1.2 2011/05/16 09:40:44 jasper Exp $
fix #650232 - Missing includes cause build to fail on OpenBSD
from upstream git: 7afc3b2138e559bfc65c056153141c2ccc747ac4
--- libseed/seed-closure.c.orig Fri May 13 10:02:01 2011
+++ libseed/seed-closure.c Fri May 13 10:02:13 2011
@@ -18,6 +18,7 @@
*/
#include "seed-private.h"
+#include <sys/types.h>
#include <sys/mman.h>
JSClassRef seed_native_callback_class;

54
x11/gnome/seed/patches/patch-libseed_seed-importer_c
View File

@ -1,54 +0,0 @@
$OpenBSD: patch-libseed_seed-importer_c,v 1.2 2011/05/16 09:40:44 jasper Exp $
fix #650233 Fix importing scripts on *BSD
from upstream git: 18861a32f2a251c323c21e172ad39fd91fc80e3f
--- libseed/seed-importer.c.orig Sat Apr 2 04:46:08 2011
+++ libseed/seed-importer.c Fri May 13 11:27:20 2011
@@ -19,6 +19,8 @@
#include <gio/gio.h>
#include <string.h>
+#include <stdlib.h>
+#include <unistd.h>
#include "seed-private.h"
@@ -656,8 +658,9 @@ seed_importer_handle_file (JSContextRef ctx,
JSValueRef js_file_dirname;
JSObjectRef global, c_global;
JSStringRef file_contents, file_name;
- gchar *contents, *walk, *file_path, *canonical, *absolute_path;
+ gchar *contents, *walk, *file_path, *canonical, *absolute_path, *normalp;
gchar *normalized_path;
+ gsize path_max;
file_path = g_build_filename (dir, file, NULL);
canonical = seed_importer_canonicalize_path (file_path);
@@ -711,15 +714,24 @@ seed_importer_handle_file (JSContextRef ctx,
g_path_get_dirname (file_path), NULL);
}
- normalized_path = realpath (absolute_path, NULL);
+#ifdef PATH_MAX
+ path_max = PATH_MAX;
+#else
+ path_max = pathconf (absolute_path, _PC_PATH_MAX);
+ if (path_max <= 0)
+ path_max = 4096;
+#endif
+ normalized_path = (gchar *) g_malloc (path_max);
+ normalp = realpath (absolute_path, normalized_path);
- js_file_dirname = seed_value_from_string (ctx, normalized_path, NULL);
+ js_file_dirname = seed_value_from_string (ctx, normalp, NULL);
seed_object_set_property (nctx, global, "__script_path__", js_file_dirname);
g_hash_table_insert (file_imports, canonical, global);
g_free (file_path);
g_free (absolute_path);
+ g_free (normalized_path);
JSEvaluateScript (nctx, file_contents, NULL, file_name, 0, exception);

19
x11/gnome/seed/patches/patch-libseed_seed-private_h
View File

@ -1,19 +0,0 @@
$OpenBSD: patch-libseed_seed-private_h,v 1.2 2011/05/16 09:40:44 jasper Exp $
fix #650232 - Missing includes cause build to fail on OpenBSD
from upstream git: 7afc3b2138e559bfc65c056153141c2ccc747ac4
--- libseed/seed-private.h.orig Fri May 13 10:03:20 2011
+++ libseed/seed-private.h Fri May 13 10:05:11 2011
@@ -20,8 +20,10 @@
#ifndef _SEED_PRIVATE_H
#define _SEED_PRIVATE_H
-#include <stdlib.h>
#include <sys/types.h>
+#include <pthread.h>
+
+#include <stdlib.h>
#include <JavaScriptCore/JavaScript.h>
#include <glib.h>
#include <glib-object.h>

106
x11/gnome/seed/patches/patch-modules_os_seed-os_c
View File

@ -1,104 +1,16 @@
$OpenBSD: patch-modules_os_seed-os_c,v 1.4 2011/05/27 13:12:34 jasper Exp $ $OpenBSD: patch-modules_os_seed-os_c,v 1.5 2011/09/21 20:27:31 jasper Exp $
fix #650234 Add FreeBSD/OpenBSD support to os/seed-os.c fix #650234 Add FreeBSD/OpenBSD support to os/seed-os.c
from upstream git: 03c808137331be912e9adde997dd2830cf2e5593 from upstream git: 03c808137331be912e9adde997dd2830cf2e5593
--- modules/os/seed-os.c.orig Tue Feb 22 23:44:01 2011 --- modules/os/seed-os.c.orig Tue May 17 18:46:37 2011
+++ modules/os/seed-os.c Fri May 27 15:10:56 2011 +++ modules/os/seed-os.c Wed Sep 21 13:17:45 2011
@@ -29,8 +29,19 @@ @@ -38,6 +38,8 @@
#include <termios.h>
#include <sys/stat.h> #if defined(__FreeBSD__)
#include <sys/utsname.h> #include <libutil.h>
+#if defined(__FreeBSD__) || defined(__OpenBSD__)
+#include <sys/param.h>
+#endif
#include <sys/types.h>
+#include <sys/ioctl.h>
+#include <termios.h>
+#if defined(__FreeBSD__)
+#include <libutil.h>
+#elif defined(__OpenBSD__) +#elif defined(__OpenBSD__)
+#include <util.h> +#include <util.h>
+#endif
+#include <unistd.h>
#include <fcntl.h>
@@ -54,18 +65,32 @@ seed_os_realpath (SeedContext ctx,
const SeedValue arguments[],
SeedException * exception)
{
+ SeedValue sv;
gchar *arg;
+ gchar *resolved_path;
gchar *ret;
+ gsize path_max;
if (argument_count != 1)
{
EXPECTED_EXCEPTION("os.realpath", "1 argument");
}
arg = seed_value_to_string (ctx, arguments[0], exception);
- ret = realpath(arg, NULL);
+#ifdef PATH_MAX
+ path_max = PATH_MAX;
+#else
+ path_max = pathconf (arg, _PC_PATH_MAX);
+ if (path_max <= 0)
+ path_max = 4096;
+#endif
+ resolved_path = (gchar *) g_malloc (path_max);
+ ret = realpath(arg, resolved_path);
g_free (arg);
- return seed_value_from_string (ctx, ret, exception);
+ sv = seed_value_from_string (ctx, ret, exception);
+ g_free (resolved_path);
+
+ return sv;
}
SeedValue
@@ -559,7 +584,12 @@ seed_os_unsetenv (SeedContext ctx,
}
arg = seed_value_to_string (ctx, arguments[0], exception);
+#if __FreeBSD_version < 700000
+ ret = 0;
+ unsetenv (arg);
+#else
ret = unsetenv (arg);
+#endif
g_free (arg);
return seed_value_from_int (ctx, ret, exception);
@@ -702,6 +732,7 @@ seed_os_fdatasync (SeedContext ctx,
const SeedValue arguments[],
SeedException * exception)
{
+#if !defined(__FreeBSD__) && !defined(__OpenBSD__)
gint fd;
if (argument_count != 1)
@@ -711,6 +742,10 @@ seed_os_fdatasync (SeedContext ctx,
fd = seed_value_to_int (ctx, arguments[0], exception);
return seed_value_from_int (ctx, fdatasync (fd), exception);
+#else
+ errno = ENOSYS;
+ return seed_value_from_int (ctx, -1, exception);
+#endif
}
SeedValue
@@ -1113,7 +1148,9 @@ seed_module_init(SeedEngine * eng)
#if defined (O_DIRECT)
OS_DEFINE_QUICK_ENUM (O_DIRECT);
#endif #endif
+#if defined (O_DIRECTORY) #include <unistd.h>
OS_DEFINE_QUICK_ENUM (O_DIRECTORY);
+#endif
OS_DEFINE_QUICK_ENUM (O_NOFOLLOW);
#if defined (O_NOATIME)
OS_DEFINE_QUICK_ENUM (O_NOATIME);

15
x11/gnome/seed/patches/patch-modules_readline_Makefile_in
View File

@ -1,15 +0,0 @@
$OpenBSD: patch-modules_readline_Makefile_in,v 1.1 2011/05/15 14:11:52 jasper Exp $
Prevent undefined symbols from readline module.
--- modules/readline/Makefile.in.orig Sun May 15 16:06:47 2011
+++ modules/readline/Makefile.in Sun May 15 16:06:50 2011
@@ -332,7 +332,7 @@ top_srcdir = @top_srcdir@
@BUILD_READLINE_MODULE_TRUE@libseed_readline_la_LIBADD = \
@BUILD_READLINE_MODULE_TRUE@ $(top_builddir)/libseed/libseed@SEED_GTK_VERSION@.la \
-@BUILD_READLINE_MODULE_TRUE@ -lreadline \
+@BUILD_READLINE_MODULE_TRUE@ -lreadline -ltermcap \
@BUILD_READLINE_MODULE_TRUE@ $(SEED_PROFILE_LIBS)
all: all-am

40
x11/gnome/seed/pkg/PLIST
View File

@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST,v 1.4 2011/07/26 15:36:27 ajacoutot Exp $ @comment $OpenBSD: PLIST,v 1.5 2011/09/21 20:27:31 jasper Exp $
%%SHARED%% %%SHARED%%
@bin bin/seed @bin bin/seed
include/seed-gtk3/ include/seed-gtk3/
@ -82,44 +82,6 @@ share/doc/seed/tutorial/4.png
share/doc/seed/tutorial/packing.png share/doc/seed/tutorial/packing.png
share/doc/seed/tutorial/packing.svg share/doc/seed/tutorial/packing.svg
share/doc/seed/tutorial/tutorial.html share/doc/seed/tutorial/tutorial.html
share/gtk-doc/
share/gtk-doc/html/
share/gtk-doc/html/seed/
share/gtk-doc/html/seed/GtkBuilder-module.html
share/gtk-doc/html/seed/Sandbox-module.html
share/gtk-doc/html/seed/api.html
share/gtk-doc/html/seed/home.png
share/gtk-doc/html/seed/index.html
share/gtk-doc/html/seed/index.sgml
share/gtk-doc/html/seed/ix01.html
share/gtk-doc/html/seed/js.html
share/gtk-doc/html/seed/left.png
share/gtk-doc/html/seed/modules.html
share/gtk-doc/html/seed/readline-module.html
share/gtk-doc/html/seed/right.png
share/gtk-doc/html/seed/seed-Contexts.html
share/gtk-doc/html/seed/seed-Evaluation.html
share/gtk-doc/html/seed/seed-Exceptions.html
share/gtk-doc/html/seed/seed-Initialization.html
share/gtk-doc/html/seed/seed-JS-Objects.html
share/gtk-doc/html/seed/seed-JavaScript-Classes.html
share/gtk-doc/html/seed/seed-Modules.html
share/gtk-doc/html/seed/seed-Native-Functions.html
share/gtk-doc/html/seed/seed-Native-Type-Conversion.html
share/gtk-doc/html/seed/seed-Operating-on-Native-Types.html
share/gtk-doc/html/seed/seed-SeedClosure.html
share/gtk-doc/html/seed/seed-Signals.html
share/gtk-doc/html/seed/seed-building.html
share/gtk-doc/html/seed/seed-contact.html
share/gtk-doc/html/seed/seed-importer.html
share/gtk-doc/html/seed/seed-introduction.html
share/gtk-doc/html/seed/seed.devhelp
share/gtk-doc/html/seed/seed.devhelp2
share/gtk-doc/html/seed/seed.html
share/gtk-doc/html/seed/sqlite-module.html
share/gtk-doc/html/seed/style.css
share/gtk-doc/html/seed/types.html
share/gtk-doc/html/seed/up.png
share/seed-gtk3/ share/seed-gtk3/
share/seed-gtk3/dbus.js share/seed-gtk3/dbus.js
share/seed-gtk3/extensions/ share/seed-gtk3/extensions/