diff options
author | kwm <kwm@df743ca5-7f9a-e211-a948-0013205c9059> | 2010-12-01 06:00:17 +0800 |
---|---|---|
committer | kwm <kwm@df743ca5-7f9a-e211-a948-0013205c9059> | 2010-12-01 06:00:17 +0800 |
commit | 2e4d2e942a99fbc51adebabc4cd543a91491ba37 (patch) | |
tree | 5fb7c33c9eb700d394e22ec7c7faf4258b91ea3b /devel/seed/files | |
parent | 2d95636f2e1c4896bca367221f0b972b5903e72a (diff) | |
download | marcuscom-ports-2e4d2e942a99fbc51adebabc4cd543a91491ba37.tar marcuscom-ports-2e4d2e942a99fbc51adebabc4cd543a91491ba37.tar.gz marcuscom-ports-2e4d2e942a99fbc51adebabc4cd543a91491ba37.tar.bz2 marcuscom-ports-2e4d2e942a99fbc51adebabc4cd543a91491ba37.tar.lz marcuscom-ports-2e4d2e942a99fbc51adebabc4cd543a91491ba37.tar.xz marcuscom-ports-2e4d2e942a99fbc51adebabc4cd543a91491ba37.tar.zst marcuscom-ports-2e4d2e942a99fbc51adebabc4cd543a91491ba37.zip |
Clean up after 2.32 got committed. Only gdm 2.32 isn't committed because of
focus issues. And it doesn't seem it getting any traction upstream.
Next stop GNOME 3.0.
git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@14916 df743ca5-7f9a-e211-a948-0013205c9059
Diffstat (limited to 'devel/seed/files')
-rw-r--r-- | devel/seed/files/Seed.js | 203 | ||||
-rw-r--r-- | devel/seed/files/patch-libseed_seed-importer.c | 49 | ||||
-rw-r--r-- | devel/seed/files/patch-modules_gettext_seed-gettext.c | 27 | ||||
-rw-r--r-- | devel/seed/files/patch-modules_os_seed-os.c | 95 |
4 files changed, 0 insertions, 374 deletions
diff --git a/devel/seed/files/Seed.js b/devel/seed/files/Seed.js deleted file mode 100644 index 9edb12c87..000000000 --- a/devel/seed/files/Seed.js +++ /dev/null @@ -1,203 +0,0 @@ -GLib = imports.gi.GLib; - -Seed.sprintf = function () -{ - if (typeof arguments == "undefined") { return null; } - if (arguments.length < 1) { return null; } - if (typeof arguments[0] != "string") { return null; } - if (typeof RegExp == "undefined") { return null; } - - var string = arguments[0]; - var exp = new RegExp(/(%([%]|(\-)?(\+|\x20)?(0)?(\d+)?(\.(\d)?)?([bcdfosxX])))/g); - var matches = new Array(); - var strings = new Array(); - var convCount = 0; - var stringPosStart = 0; - var stringPosEnd = 0; - var matchPosEnd = 0; - var newString = ''; - var match = null; - - while (match = exp.exec(string)) { - if (match[9]) { convCount += 1; } - - stringPosStart = matchPosEnd; - stringPosEnd = exp.lastIndex - match[0].length; - strings[strings.length] = string.substring(stringPosStart, stringPosEnd); - - matchPosEnd = exp.lastIndex; - matches[matches.length] = { - match: match[0], - left: match[3] ? true : false, - sign: match[4] || '', - pad: match[5] || ' ', - min: match[6] || 0, - precision: match[8], - code: match[9] || '%', - negative: parseInt(arguments[convCount]) < 0 ? true : false, - argument: String(arguments[convCount]) - }; - } - strings[strings.length] = string.substring(matchPosEnd); - - if (matches.length == 0) { return string; } - if ((arguments.length - 1) < convCount) { return null; } - - var code = null; - var match = null; - var i = null; - - for (i=0; i<matches.length; i++) { - - if (matches[i].code == '%') { substitution = '%' } - else if (matches[i].code == 'b') { - matches[i].argument = String(Math.abs(parseInt(matches[i].argument)).toString(2)); - substitution = Seed.sprintf.convert(matches[i], true); - } - else if (matches[i].code == 'c') { - matches[i].argument = String(String.fromCharCode(parseInt(Math.abs(parseInt(matches[i].argument))))); - substitution = Seed.sprintf.convert(matches[i], true); - } - else if (matches[i].code == 'd') { - matches[i].argument = String(Math.abs(parseInt(matches[i].argument))); - substitution = Seed.sprintf.convert(matches[i]); - } - else if (matches[i].code == 'f') { - matches[i].argument = String(Math.abs(parseFloat(matches[i].argument)).toFixed(matches[i].precision ? matches[i].precision : 6)); - substitution = Seed.sprintf.convert(matches[i]); - } - else if (matches[i].code == 'o') { - matches[i].argument = String(Math.abs(parseInt(matches[i].argument)).toString(8)); - substitution = Seed.sprintf.convert(matches[i]); - } - else if (matches[i].code == 's') { - matches[i].argument = matches[i].argument.substring(0, matches[i].precision ? matches[i].precision : matches[i].argument.length) - substitution = Seed.sprintf.convert(matches[i], true); - } - else if (matches[i].code == 'x') { - matches[i].argument = String(Math.abs(parseInt(matches[i].argument)).toString(16)); - substitution = Seed.sprintf.convert(matches[i]); - } - else if (matches[i].code == 'X') { - matches[i].argument = String(Math.abs(parseInt(matches[i].argument)).toString(16)); - substitution = Seed.sprintf.convert(matches[i]).toUpperCase(); - } - else { - substitution = matches[i].match; - } - - newString += strings[i]; - newString += substitution; - - } - newString += strings[i]; - - return newString; - -}; - -Seed.sprintf.convert = function(match, nosign) -{ - if (nosign) { - match.sign = ''; - } else { - match.sign = match.negative ? '-' : match.sign; - } - var l = match.min - match.argument.length + 1 - match.sign.length; - var pad = new Array(l < 0 ? 0 : l).join(match.pad); - if (!match.left) { - if (match.pad == "0" || nosign) { - return match.sign + pad + match.argument; - } else { - return pad + match.sign + match.argument; - } - } else { - if (match.pad == "0" || nosign) { - return match.sign + match.argument + pad.replace(/0/g, ' '); - } else { - return match.sign + match.argument + pad; - } - } -}; - - -Seed.repl = function() -{ - try - { - if(readline) - { - // readline is loaded - } - } - catch (e) - { - try - { - readline = imports.readline; - } - catch (e) - { - print(e.name + " " + e.message); - return true; - } - } - - try - { - item = readline.readline("> "); - if (item == "continue") - return false; - print(eval(item)); - } - catch (e) - { - print(e.name + " " + e.message); - } - return true; -} - - -Seed.glib_repl = function() -{ - GLib.idle_add(Seed.repl, null); -} - -Seed.thread_repl = function() -{ - GLib.thread_create_full(function() { while(Seed.repl()){} }, - null, 0, true); -} - -Seed.printf = function () { print(Seed.sprintf.apply(this, arguments)) }; - -if(!imports.searchPath || (imports.searchPath.length == 0)) -{ - imports.searchPath = [ ".", - ".." ]; - - if(Seed.argv.length > 1) - { - __script_path__ = GLib.path_get_dirname(Seed.argv[1]); - - try - { - if(!GLib.path_is_absolute(__script_path__)) - { - __script_path__ = GLib.build_filenamev([GLib.get_current_dir(), - __script_path__]); - } - - __script_path__ = imports.os.realpath(__script_path__); - - if(__script_path__ && __script_path__ != "") - imports.searchPath.push(__script_path__); - } - catch(e) - { - print(imports.JSON.stringify(e)); - } - } - - imports.searchPath.push("."); -} diff --git a/devel/seed/files/patch-libseed_seed-importer.c b/devel/seed/files/patch-libseed_seed-importer.c deleted file mode 100644 index ffce27254..000000000 --- a/devel/seed/files/patch-libseed_seed-importer.c +++ /dev/null @@ -1,49 +0,0 @@ ---- libseed/seed-importer.c.orig 2009-12-31 11:42:51.000000000 +0100 -+++ libseed/seed-importer.c 2010-01-02 02:12:09.000000000 +0100 -@@ -19,6 +19,8 @@ - - #include <gio/gio.h> - #include <string.h> -+#include <stdlib.h> -+#include <unistd.h> - - #include "seed-private.h" - -@@ -636,8 +638,9 @@ seed_importer_handle_file (JSContextRef - 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); -@@ -691,15 +694,24 @@ seed_importer_handle_file (JSContextRef - 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); - diff --git a/devel/seed/files/patch-modules_gettext_seed-gettext.c b/devel/seed/files/patch-modules_gettext_seed-gettext.c deleted file mode 100644 index 71aa3b224..000000000 --- a/devel/seed/files/patch-modules_gettext_seed-gettext.c +++ /dev/null @@ -1,27 +0,0 @@ ---- modules/gettext/seed-gettext.c.orig 2009-12-31 05:42:51.000000000 -0500 -+++ modules/gettext/seed-gettext.c 2010-01-07 19:07:10.000000000 -0500 -@@ -312,12 +313,24 @@ seed_module_init(SeedEngine *local_eng) - DEFINE_ENUM_MEMBER(ns_ref, LC_MONETARY); - DEFINE_ENUM_MEMBER(ns_ref, LC_MESSAGES); - DEFINE_ENUM_MEMBER(ns_ref, LC_ALL); -+#ifdef LC_PAPER - DEFINE_ENUM_MEMBER(ns_ref, LC_PAPER); -+#endif -+#ifdef LC_NAME - DEFINE_ENUM_MEMBER(ns_ref, LC_NAME); -+#endif -+#ifdef LC_ADDRESS - DEFINE_ENUM_MEMBER(ns_ref, LC_ADDRESS); -+#endif -+#ifdef LC_TELEPHONE - DEFINE_ENUM_MEMBER(ns_ref, LC_TELEPHONE); -+#endif -+#ifdef LC_MEASUREMENT - DEFINE_ENUM_MEMBER(ns_ref, LC_MEASUREMENT); -+#endif -+#ifdef LC_IDENTIFICATION - DEFINE_ENUM_MEMBER(ns_ref, LC_IDENTIFICATION); -+#endif - DEFINE_ENUM_MEMBER(ns_ref, LC_CTYPE); - - return ns_ref; diff --git a/devel/seed/files/patch-modules_os_seed-os.c b/devel/seed/files/patch-modules_os_seed-os.c deleted file mode 100644 index 6d96d1478..000000000 --- a/devel/seed/files/patch-modules_os_seed-os.c +++ /dev/null @@ -1,95 +0,0 @@ ---- modules/os/seed-os.c.orig 2009-12-31 05:44:49.000000000 -0500 -+++ modules/os/seed-os.c 2010-01-07 19:01:05.000000000 -0500 -@@ -29,8 +29,15 @@ - - #include <sys/stat.h> - #include <sys/utsname.h> -+#if defined(__FreeBSD__) -+#include <sys/param.h> -+#endif - - #include <sys/types.h> -+#include <sys/ioctl.h> -+#include <termios.h> -+#include <libutil.h> -+#include <unistd.h> - - #include <fcntl.h> - -@@ -54,18 +61,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 +580,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 +728,7 @@ seed_os_fdatasync (SeedContext ctx, - const SeedValue arguments[], - SeedException * exception) - { -+#if !defined(__FreeBSD__) - gint fd; - - if (argument_count != 1) -@@ -711,6 +738,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 -@@ -1112,7 +1144,9 @@ seed_module_init(SeedEngine * eng) - #if defined (O_DIRECT) - OS_DEFINE_QUICK_ENUM (O_DIRECT); - #endif -+#if defined (O_DIRECTORY) - OS_DEFINE_QUICK_ENUM (O_DIRECTORY); -+#endif - OS_DEFINE_QUICK_ENUM (O_NOFOLLOW); - #if defined (O_NOATIME) - OS_DEFINE_QUICK_ENUM (O_NOATIME); |