diff options
Diffstat (limited to 'devel/gnome-build')
-rw-r--r-- | devel/gnome-build/Makefile | 13 | ||||
-rw-r--r-- | devel/gnome-build/PLIST | 23 | ||||
-rw-r--r-- | devel/gnome-build/distinfo | 11 | ||||
-rw-r--r-- | devel/gnome-build/patches/patch-aa | 196 | ||||
-rw-r--r-- | devel/gnome-build/patches/patch-ab | 191 | ||||
-rw-r--r-- | devel/gnome-build/patches/patch-ac | 26 |
6 files changed, 31 insertions, 429 deletions
diff --git a/devel/gnome-build/Makefile b/devel/gnome-build/Makefile index 0dc1e728dea..a4ea3806d50 100644 --- a/devel/gnome-build/Makefile +++ b/devel/gnome-build/Makefile @@ -1,15 +1,16 @@ -# $NetBSD: Makefile,v 1.12 2008/06/20 01:09:12 joerg Exp $ +# $NetBSD: Makefile,v 1.13 2008/10/28 11:28:31 wiz Exp $ # -DISTNAME= gnome-build-0.2.0 -PKGREVISION= 1 +DISTNAME= gnome-build-2.24.1 CATEGORIES= devel gnome -MASTER_SITES= ${MASTER_SITE_GNOME:=sources/gnome-build/0.2/} +MASTER_SITES= ${MASTER_SITE_GNOME:=sources/gnome-build/2.24/} EXTRACT_SUFX= .tar.bz2 MAINTAINER= pkgsrc-users@NetBSD.org -HOMEPAGE= http://www.gnome.org/projects/devtools/ -COMMENT= Project management components for GNOME development +HOMEPAGE= http://www.anjuta.org/ +COMMENT= GNOME build tools + +DEPENDS+= p5-gettext-[0-9]*:../../misc/p5-gettext PKG_DESTDIR_SUPPORT= user-destdir diff --git a/devel/gnome-build/PLIST b/devel/gnome-build/PLIST index 1648977bab9..163ece64922 100644 --- a/devel/gnome-build/PLIST +++ b/devel/gnome-build/PLIST @@ -1,8 +1,7 @@ -@comment $NetBSD: PLIST,v 1.2 2007/12/16 14:19:01 drochner Exp $ +@comment $NetBSD: PLIST,v 1.3 2008/10/28 11:28:31 wiz Exp $ bin/gbf-am-parse bin/gbf-mkfile-parse include/gnome-build-1.0/gbf/gbf-backend.h -include/gnome-build-1.0/gbf/gbf-build-info.h include/gnome-build-1.0/gbf/gbf-project-model.h include/gnome-build-1.0/gbf/gbf-project-util.h include/gnome-build-1.0/gbf/gbf-project-view.h @@ -26,42 +25,60 @@ share/locale/am/LC_MESSAGES/gbf-1.mo share/locale/ar/LC_MESSAGES/gbf-1.mo share/locale/az/LC_MESSAGES/gbf-1.mo share/locale/be/LC_MESSAGES/gbf-1.mo +share/locale/bg/LC_MESSAGES/gbf-1.mo share/locale/ca/LC_MESSAGES/gbf-1.mo share/locale/cs/LC_MESSAGES/gbf-1.mo +share/locale/da/LC_MESSAGES/gbf-1.mo share/locale/de/LC_MESSAGES/gbf-1.mo share/locale/dz/LC_MESSAGES/gbf-1.mo share/locale/el/LC_MESSAGES/gbf-1.mo share/locale/en_CA/LC_MESSAGES/gbf-1.mo share/locale/en_GB/LC_MESSAGES/gbf-1.mo share/locale/es/LC_MESSAGES/gbf-1.mo +share/locale/et/LC_MESSAGES/gbf-1.mo +share/locale/eu/LC_MESSAGES/gbf-1.mo share/locale/fi/LC_MESSAGES/gbf-1.mo share/locale/fr/LC_MESSAGES/gbf-1.mo share/locale/gl/LC_MESSAGES/gbf-1.mo +share/locale/gu/LC_MESSAGES/gbf-1.mo +share/locale/he/LC_MESSAGES/gbf-1.mo +share/locale/hi/LC_MESSAGES/gbf-1.mo share/locale/hr/LC_MESSAGES/gbf-1.mo share/locale/hu/LC_MESSAGES/gbf-1.mo share/locale/it/LC_MESSAGES/gbf-1.mo share/locale/ja/LC_MESSAGES/gbf-1.mo +share/locale/ko/LC_MESSAGES/gbf-1.mo +share/locale/lt/LC_MESSAGES/gbf-1.mo share/locale/lv/LC_MESSAGES/gbf-1.mo share/locale/mk/LC_MESSAGES/gbf-1.mo share/locale/ml/LC_MESSAGES/gbf-1.mo +share/locale/mr/LC_MESSAGES/gbf-1.mo share/locale/ms/LC_MESSAGES/gbf-1.mo share/locale/nb/LC_MESSAGES/gbf-1.mo share/locale/ne/LC_MESSAGES/gbf-1.mo share/locale/nl/LC_MESSAGES/gbf-1.mo +share/locale/nn/LC_MESSAGES/gbf-1.mo +share/locale/oc/LC_MESSAGES/gbf-1.mo share/locale/pa/LC_MESSAGES/gbf-1.mo share/locale/pl/LC_MESSAGES/gbf-1.mo share/locale/pt/LC_MESSAGES/gbf-1.mo share/locale/pt_BR/LC_MESSAGES/gbf-1.mo share/locale/ru/LC_MESSAGES/gbf-1.mo share/locale/rw/LC_MESSAGES/gbf-1.mo +share/locale/si/LC_MESSAGES/gbf-1.mo share/locale/sk/LC_MESSAGES/gbf-1.mo +share/locale/sl/LC_MESSAGES/gbf-1.mo share/locale/sq/LC_MESSAGES/gbf-1.mo share/locale/sr/LC_MESSAGES/gbf-1.mo -share/locale/sr@Latn/LC_MESSAGES/gbf-1.mo +share/locale/sr@latin/LC_MESSAGES/gbf-1.mo share/locale/sv/LC_MESSAGES/gbf-1.mo +share/locale/th/LC_MESSAGES/gbf-1.mo +share/locale/tr/LC_MESSAGES/gbf-1.mo share/locale/uk/LC_MESSAGES/gbf-1.mo share/locale/vi/LC_MESSAGES/gbf-1.mo share/locale/zh_CN/LC_MESSAGES/gbf-1.mo +share/locale/zh_HK/LC_MESSAGES/gbf-1.mo +share/locale/zh_TW/LC_MESSAGES/gbf-1.mo share/pixmaps/gbf-build.png share/pixmaps/gbf-install.png @dirrm share/gnome-build/glade diff --git a/devel/gnome-build/distinfo b/devel/gnome-build/distinfo index 58a706153eb..d7202f339e0 100644 --- a/devel/gnome-build/distinfo +++ b/devel/gnome-build/distinfo @@ -1,8 +1,5 @@ -$NetBSD: distinfo,v 1.2 2007/12/16 14:19:01 drochner Exp $ +$NetBSD: distinfo,v 1.3 2008/10/28 11:28:31 wiz Exp $ -SHA1 (gnome-build-0.2.0.tar.bz2) = 3c5674151ce9614663cae5073c1ac510e1060886 -RMD160 (gnome-build-0.2.0.tar.bz2) = 5782e3cdc57950ece829c5fc6217489bb1ab763b -Size (gnome-build-0.2.0.tar.bz2) = 476382 bytes -SHA1 (patch-aa) = e4f1d3b55db03b0e6db86158b2b16bd4ba594037 -SHA1 (patch-ab) = a85e1668824b9f62e2e413861c010ade19824918 -SHA1 (patch-ac) = 5a7ca1a63080d145e5b8263656d2fbe2be639d1f +SHA1 (gnome-build-2.24.1.tar.bz2) = 7940940855cafce4b9048d0be8d29fbb219371c3 +RMD160 (gnome-build-2.24.1.tar.bz2) = e426802401d63aea3c31d5137161036957c41128 +Size (gnome-build-2.24.1.tar.bz2) = 517031 bytes diff --git a/devel/gnome-build/patches/patch-aa b/devel/gnome-build/patches/patch-aa deleted file mode 100644 index 4a11a5901f4..00000000000 --- a/devel/gnome-build/patches/patch-aa +++ /dev/null @@ -1,196 +0,0 @@ -$NetBSD: patch-aa,v 1.1.1.1 2007/01/04 02:51:02 rillig Exp $ - -Replaced the GNU regular expressions with POSIX regular expressions, -since the latter are more portable. - ---- src/backends/libgbf_am/gbf-am-build.c.orig 2004-01-17 22:34:56.000000000 +0100 -+++ src/backends/libgbf_am/gbf-am-build.c 2007-01-04 03:16:49.000000000 +0100 -@@ -38,10 +38,11 @@ typedef struct { - GList *callbacks; - - /* Regex structures. */ -- struct re_pattern_buffer dir_buf; -- struct re_pattern_buffer warn_buf; -- struct re_pattern_buffer err_buf; -- struct re_registers reg; -+ regex_t dir_buf; -+ regex_t warn_buf; -+ regex_t err_buf; -+#define N_GROUPS 5 /* 1 + maximum number of groups + 1 */ -+ regmatch_t reg[N_GROUPS]; - - /* Build info. */ - char *build_dir; -@@ -55,12 +56,9 @@ build_info_free (BuildInfo *info) - - if (info->build_dir) - g_free (info->build_dir); -- if (info->dir_buf.fastmap) -- g_free (info->dir_buf.fastmap); -- if (info->warn_buf.fastmap) -- g_free (info->warn_buf.fastmap); -- if (info->err_buf.fastmap) -- g_free (info->err_buf.fastmap); -+ regfree (&info->dir_buf); -+ regfree (&info->warn_buf); -+ regfree (&info->err_buf); - g_free (info); - } - -@@ -79,33 +77,36 @@ build_msg (BuildInfo *info, - } - } - -+/* Returns a copy of the ''n''th captured group. */ -+#define GBF_GETGROUP(n) \ -+ g_strndup (line + info->reg[n].rm_so, \ -+ info->reg[n].rm_eo - info->reg[n].rm_so) -+ - static void - parse_output (BuildInfo *info, - const char *line) - { -- int line_length = strlen (line); -+ size_t line_length = strlen (line); -+ int n; - - /* Check for directory changes. */ -- if (re_search (&info->dir_buf, line, line_length, 0, -- line_length, &info->reg) != -1) { -- if (info->reg.num_regs >= 2) { -- if (info->build_dir) -- g_free (info->build_dir); -- info->build_dir = g_strndup (line + info->reg.start[1], -- info->reg.end[1] - info->reg.start[1]); -- } -+ if (regexec (&info->dir_buf, line, N_GROUPS, info->reg, 0) == 0) { -+ g_assert (info->reg[1].rm_so != -1 && info->reg[2].rm_so == -1); -+ if (info->build_dir) -+ g_free (info->build_dir); -+ info->build_dir = GBF_GETGROUP(1); - } - - /* Check for warnings & errors. */ -- if (re_search (&info->warn_buf, line, line_length, 0, -- line_length, &info->reg) != -1) { -+ if (regexec (&info->warn_buf, line, N_GROUPS, info->reg, 0) == 0) { - GbfBuildWarning *warn; - char *text; - -+ g_assert (info->reg[3].rm_so != -1 && info->reg[4].rm_so == -1); -+ - /* Create new warning. */ - warn = g_new0 (GbfBuildWarning, 1); -- text = g_strndup (line + info->reg.start[1], -- info->reg.end[1] - info->reg.start[1]); -+ text = GBF_GETGROUP(1); - if (text[0] != '/') { /* only prepend build_dir if path not absolute */ - warn->filename = g_strconcat (info->build_dir, "/", text, NULL); - g_free (text); -@@ -113,25 +114,21 @@ parse_output (BuildInfo *info, - warn->filename = text; - } - -- text = g_strndup (line + info->reg.start[2], -- info->reg.end[2] - info->reg.start[2]); -+ text = GBF_GETGROUP(2); - warn->line = atoi (text); - g_free (text); -- warn->warning = g_strndup (line + info->reg.start[3], -- info->reg.end[3] - info->reg.start[3]); -+ warn->warning = GBF_GETGROUP(3); - warn->output = g_strdup (line); - - build_msg (info, GBF_BUILD_WARNING, warn); - /* FIXME: We should free warn here, and make copy in gbf-build-info.c. */ -- } else if (re_search (&info->err_buf, line, line_length, 0, -- line_length, &info->reg) != -1) { -+ } else if (regexec (&info->err_buf, line, N_GROUPS, info->reg, 0) == 0) { - GbfBuildError *err; - char *text; - - /* Create new error. */ - err = g_new0 (GbfBuildError, 1); -- text = g_strndup (line + info->reg.start[1], -- info->reg.end[1] - info->reg.start[1]); -+ text = GBF_GETGROUP(1); - if (text[0] != '/') { /* only prepend build_dir if path not absolute */ - err->filename = g_strconcat (info->build_dir, "/", text, NULL); - g_free (text); -@@ -139,12 +136,10 @@ parse_output (BuildInfo *info, - err->filename = text; - } - -- text = g_strndup (line + info->reg.start[2], -- info->reg.end[2] - info->reg.start[2]); -+ text = GBF_GETGROUP(2); - err->line = atoi (text); - g_free (text); -- err->error = g_strndup (line + info->reg.start[3], -- info->reg.end[3] - info->reg.start[3]); -+ err->error = GBF_GETGROUP(3); - err->output = g_strdup (line); - - build_msg (info, GBF_BUILD_ERROR, err); -@@ -153,6 +148,7 @@ parse_output (BuildInfo *info, - build_msg (info, GBF_BUILD_OUTPUT, (gpointer)line); - } - } -+#undef GBF_GETGROUP(n) - - static gboolean - build_output_cb (GIOChannel *chan, -@@ -192,24 +188,10 @@ build_output_cb (GIOChannel *chan, - } - - static gboolean --compile_pattern (struct re_pattern_buffer *buf, -+compile_pattern (regex_t *buf, - const char *pattern) - { -- memset (buf, 0, sizeof (struct re_pattern_buffer)); -- buf->translate = NULL; -- buf->fastmap = g_malloc (256); -- buf->allocated = 0; -- buf->buffer = NULL; -- buf->can_be_null = 0; -- buf->no_sub = 0; -- -- if (!re_compile_pattern (pattern, strlen (pattern), buf)) { -- if (re_compile_fastmap (buf) != 0) { -- g_warning ("IMPORTANT REGEX FAILED TO CREASTE FASTMAP"); -- g_free (buf->fastmap); -- buf->fastmap = NULL; -- } -- } else { -+ if (regcomp(buf, pattern, REG_EXTENDED) != 0) { - g_warning ("IMPORTANT REGEX FAILED TO COMPILE"); - return FALSE; - } -@@ -234,7 +216,6 @@ gbf_build_run (GbfAmProject *project, - char *tmp, *msg; - int output, err, pid; - GIOChannel *out_channel, *err_channel; -- reg_syntax_t old_options; - GError *error = NULL; - const char *charset; - GNode *g_node; -@@ -347,9 +328,6 @@ gbf_build_run (GbfAmProject *project, - info->build_dir = NULL; - - /* Intialize regexs. */ -- old_options = re_syntax_options; -- re_syntax_options = RE_SYNTAX_EGREP; -- - if (!compile_pattern (&info->dir_buf, dir_regex) || - !compile_pattern (&info->warn_buf, warn_regex) || - !compile_pattern (&info->err_buf, err_regex)) { -@@ -360,8 +338,6 @@ gbf_build_run (GbfAmProject *project, - return -1; - } - -- re_syntax_options = old_options; -- - g_signal_emit_by_name (G_OBJECT (project), "build_start"); - - tmp = g_strjoinv (" ", (char **) argv); diff --git a/devel/gnome-build/patches/patch-ab b/devel/gnome-build/patches/patch-ab deleted file mode 100644 index d935ef68aee..00000000000 --- a/devel/gnome-build/patches/patch-ab +++ /dev/null @@ -1,191 +0,0 @@ -$NetBSD: patch-ab,v 1.1.1.1 2007/01/04 02:51:02 rillig Exp $ - -Replaced the GNU regular expressions with POSIX regular expressions, -since the latter are more portable. - ---- src/backends/libgbf_mkfile/gbf-mkfile-build.c.orig 2005-09-22 13:18:46.000000000 +0200 -+++ src/backends/libgbf_mkfile/gbf-mkfile-build.c 2007-01-04 03:28:10.000000000 +0100 -@@ -43,10 +43,11 @@ typedef struct { - GList *callbacks; - - /* Regex structures. */ -- struct re_pattern_buffer dir_buf; -- struct re_pattern_buffer warn_buf; -- struct re_pattern_buffer err_buf; -- struct re_registers reg; -+ regex_t dir_buf; -+ regex_t warn_buf; -+ regex_t err_buf; -+#define N_GROUPS 5 /* 1 + maximum number of groups + 1 */ -+ regmatch_t reg[N_GROUPS]; - - /* Build info. */ - char *build_dir; -@@ -60,12 +61,9 @@ build_info_free (BuildInfo *info) - - if (info->build_dir) - g_free (info->build_dir); -- if (info->dir_buf.fastmap) -- g_free (info->dir_buf.fastmap); -- if (info->warn_buf.fastmap) -- g_free (info->warn_buf.fastmap); -- if (info->err_buf.fastmap) -- g_free (info->err_buf.fastmap); -+ regfree (&info->dir_buf); -+ regfree (&info->warn_buf); -+ regfree (&info->err_buf); - g_free (info); - } - -@@ -84,6 +82,11 @@ build_msg (BuildInfo *info, - } - } - -+/* Returns a copy of the ''n''th captured group. */ -+#define GBF_GETGROUP(n) \ -+ g_strndup (line + info->reg[n].rm_so, \ -+ info->reg[n].rm_eo - info->reg[n].rm_so) -+ - static void - parse_output (BuildInfo *info, - const char *line) -@@ -91,26 +94,20 @@ parse_output (BuildInfo *info, - int line_length = strlen (line); - - /* Check for directory changes. */ -- if (re_search (&info->dir_buf, line, line_length, 0, -- line_length, &info->reg) != -1) { -- if (info->reg.num_regs >= 2) { -- if (info->build_dir) -- g_free (info->build_dir); -- info->build_dir = g_strndup (line + info->reg.start[1], -- info->reg.end[1] - info->reg.start[1]); -- } -+ if (regexec (&info->dir_buf, line, N_GROUPS, info->reg, 0) == 0) { -+ g_assert(info->reg[1].rm_so != -1); -+ g_free (info->build_dir); -+ info->build_dir = GBF_GETGROUP(1); - } - - /* Check for warnings & errors. */ -- if (re_search (&info->warn_buf, line, line_length, 0, -- line_length, &info->reg) != -1) { -+ if (regexec (&info->warn_buf, line, N_GROUPS, info->reg, 0) == 0) { - GbfBuildWarning *warn; - char *text; - - /* Create new warning. */ - warn = g_new0 (GbfBuildWarning, 1); -- text = g_strndup (line + info->reg.start[1], -- info->reg.end[1] - info->reg.start[1]); -+ text = GBF_GETGROUP(1); - if (text[0] != '/') { /* only prepend build_dir if path not absolute */ - warn->filename = g_strconcat (info->build_dir, "/", text, NULL); - g_free (text); -@@ -118,25 +115,21 @@ parse_output (BuildInfo *info, - warn->filename = text; - } - -- text = g_strndup (line + info->reg.start[2], -- info->reg.end[2] - info->reg.start[2]); -+ text = GBF_GETGROUP(2); - warn->line = atoi (text); - g_free (text); -- warn->warning = g_strndup (line + info->reg.start[3], -- info->reg.end[3] - info->reg.start[3]); -+ warn->warning = GBF_GETGROUP(3); - warn->output = g_strdup (line); - - build_msg (info, GBF_BUILD_WARNING, warn); - /* FIXME: We should free warn here, and make copy in gbf-build-info.c. */ -- } else if (re_search (&info->err_buf, line, line_length, 0, -- line_length, &info->reg) != -1) { -+ } else if (regexec(&info->err_buf, line, N_GROUPS, info->reg, 0) == 0) { - GbfBuildError *err; - char *text; - - /* Create new error. */ - err = g_new0 (GbfBuildError, 1); -- text = g_strndup (line + info->reg.start[1], -- info->reg.end[1] - info->reg.start[1]); -+ text = GBF_GETGROUP(1); - if (text[0] != '/') { /* only prepend build_dir if path not absolute */ - err->filename = g_strconcat (info->build_dir, "/", text, NULL); - g_free (text); -@@ -144,12 +137,10 @@ parse_output (BuildInfo *info, - err->filename = text; - } - -- text = g_strndup (line + info->reg.start[2], -- info->reg.end[2] - info->reg.start[2]); -+ text = GBF_GETGROUP(2); - err->line = atoi (text); - g_free (text); -- err->error = g_strndup (line + info->reg.start[3], -- info->reg.end[3] - info->reg.start[3]); -+ err->error = GBF_GETGROUP(3); - err->output = g_strdup (line); - - build_msg (info, GBF_BUILD_ERROR, err); -@@ -158,6 +149,7 @@ parse_output (BuildInfo *info, - build_msg (info, GBF_BUILD_OUTPUT, (gpointer)line); - } - } -+#undef GBF_GETGROUP - - static gboolean - build_output_cb (GIOChannel *chan, -@@ -197,24 +189,10 @@ build_output_cb (GIOChannel *chan, - } - - static gboolean --compile_pattern (struct re_pattern_buffer *buf, -+compile_pattern (regex_t *buf, - const char *pattern) - { -- memset (buf, 0, sizeof (struct re_pattern_buffer)); -- buf->translate = NULL; -- buf->fastmap = g_malloc (256); -- buf->allocated = 0; -- buf->buffer = NULL; -- buf->can_be_null = 0; -- buf->no_sub = 0; -- -- if (!re_compile_pattern (pattern, strlen (pattern), buf)) { -- if (re_compile_fastmap (buf) != 0) { -- g_warning ("IMPORTANT REGEX FAILED TO CREASTE FASTMAP"); -- g_free (buf->fastmap); -- buf->fastmap = NULL; -- } -- } else { -+ if (regcomp(buf, pattern, REG_EXTENDED) != 0) { - g_warning ("IMPORTANT REGEX FAILED TO COMPILE"); - return FALSE; - } -@@ -239,7 +217,6 @@ gbf_build_run (GbfMkfileProject *proj - char *tmp, *msg; - int output, err, pid; - GIOChannel *out_channel, *err_channel; -- reg_syntax_t old_options; - GError *error = NULL; - const char *charset; - GNode *g_node; -@@ -342,9 +319,6 @@ gbf_build_run (GbfMkfileProject *proj - info->build_dir = NULL; - - /* Intialize regexs. */ -- old_options = re_syntax_options; -- re_syntax_options = RE_SYNTAX_EGREP; -- - if (!compile_pattern (&info->dir_buf, dir_regex) || - !compile_pattern (&info->warn_buf, warn_regex) || - !compile_pattern (&info->err_buf, err_regex)) { -@@ -355,8 +329,6 @@ gbf_build_run (GbfMkfileProject *proj - return -1; - } - -- re_syntax_options = old_options; -- - g_signal_emit_by_name (G_OBJECT (project), "build_start"); - - tmp = g_strjoinv (" ", (char **) argv); diff --git a/devel/gnome-build/patches/patch-ac b/devel/gnome-build/patches/patch-ac deleted file mode 100644 index 69b49d3f3d6..00000000000 --- a/devel/gnome-build/patches/patch-ac +++ /dev/null @@ -1,26 +0,0 @@ -$NetBSD: patch-ac,v 1.1.1.1 2007/01/04 02:51:02 rillig Exp $ - -Tags: for-upstream - -Did you know that gcc has a -Wformat=2 option? - ---- src/backends/libgbf_mkfile/gbf-mkfile-properties.c.orig 2005-09-22 13:18:46.000000000 +0200 -+++ src/backends/libgbf_mkfile/gbf-mkfile-properties.c 2007-01-04 03:29:10.000000000 +0100 -@@ -197,7 +197,7 @@ on_group_widget_destroy (GtkWidget *wid, - gbf_mkfile_project_set_group_config (project, group_id, new_config, &err); - if (err) - { -- g_warning (err->message); -+ g_warning ("%s", err->message); - g_error_free (err); - } - g_object_unref (table); -@@ -290,7 +290,7 @@ on_target_widget_destroy (GtkWidget *wid - gbf_mkfile_project_set_target_config (project, target_id, new_config, &err); - if (err) - { -- g_warning (err->message); -+ g_warning ("%s", err->message); - g_error_free (err); - } - g_object_unref (table); |