r24165 - in /packages/unstable/gegl/debian: changelog control control.in patches/ patches/01_gegl_PATH_MAX.patch patches/series source/ source/format
pochu at users.alioth.debian.org
pochu at users.alioth.debian.org
Sun May 2 08:53:49 UTC 2010
Author: pochu
Date: Sun May 2 08:53:48 2010
New Revision: 24165
URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=24165
Log:
* debian/patches/01_gegl_PATH_MAX.patch:
- Use dynamic allocation rather than PATH_MAX for string buffers.
Fixes FTBFS on Hurd.
* debian/source/format:
- Switch to source format 3.0 (quilt).
* debian/control.in:
- Standards-Version is 3.8.4, no changes needed.
- Let libgegl-0.0-dev and libgegl-0.0-doc depend on ${misc:Depends}.
Added:
packages/unstable/gegl/debian/patches/
packages/unstable/gegl/debian/patches/01_gegl_PATH_MAX.patch
packages/unstable/gegl/debian/patches/series
packages/unstable/gegl/debian/source/
packages/unstable/gegl/debian/source/format
Modified:
packages/unstable/gegl/debian/changelog
packages/unstable/gegl/debian/control
packages/unstable/gegl/debian/control.in
Modified: packages/unstable/gegl/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/gegl/debian/changelog?rev=24165&op=diff
==============================================================================
--- packages/unstable/gegl/debian/changelog [utf-8] (original)
+++ packages/unstable/gegl/debian/changelog [utf-8] Sun May 2 08:53:48 2010
@@ -1,3 +1,16 @@
+gegl (0.0.22-2) unstable; urgency=low
+
+ * debian/patches/01_gegl_PATH_MAX.patch:
+ - Use dynamic allocation rather than PATH_MAX for string buffers.
+ Fixes FTBFS on Hurd.
+ * debian/source/format:
+ - Switch to source format 3.0 (quilt).
+ * debian/control.in:
+ - Standards-Version is 3.8.4, no changes needed.
+ - Let libgegl-0.0-dev and libgegl-0.0-doc depend on ${misc:Depends}.
+
+ -- Emilio Pozuelo Monfort <pochu at debian.org> Sun, 02 May 2010 10:52:51 +0200
+
gegl (0.0.22-1) unstable; urgency=low
* Put the package under team maintenance.
Modified: packages/unstable/gegl/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/gegl/debian/control?rev=24165&op=diff
==============================================================================
--- packages/unstable/gegl/debian/control [utf-8] (original)
+++ packages/unstable/gegl/debian/control [utf-8] Sun May 2 08:53:48 2010
@@ -7,11 +7,12 @@
Section: libs
Priority: optional
Maintainer: Ross Burton <ross at debian.org>
-Uploaders: Debian GNOME Maintainers <pkg-gnome-maintainers at lists.alioth.debian.org>, Josselin Mouette <joss at debian.org>, Rob Bradford <robster at debian.org>
+Uploaders: Debian GNOME Maintainers <pkg-gnome-maintainers at lists.alioth.debian.org>, Emilio Pozuelo Monfort <pochu at debian.org>, Josselin Mouette <joss at debian.org>, Rob Bradford <robster at debian.org>
Build-Depends: debhelper (>= 5),
cdbs,
autotools-dev,
pkg-config,
+ gnome-pkg-tools,
libbabl-0.0-0-dev (>= 0.0.22),
libglib2.0-dev (>= 2.16.1),
libgtk2.0-dev (>= 2.8.6),
@@ -25,7 +26,7 @@
gtk-doc-tools (>= 1.0),
libjpeg62-dev,
libspiro-dev
-Standards-Version: 3.7.3
+Standards-Version: 3.8.4
Package: gegl
Architecture: any
@@ -54,7 +55,8 @@
Package: libgegl-0.0-dev
Section: libdevel
Architecture: any
-Depends: libgegl-0.0-0 (= ${binary:Version}),
+Depends: ${misc:Depends},
+ libgegl-0.0-0 (= ${binary:Version}),
libbabl-0.0-0-dev (>= 0.0.22),
libglib2.0-dev (>= 2.16.1)
Description: Generic Graphics Library (development files)
@@ -70,6 +72,7 @@
Package: libgegl-0.0-doc
Section: doc
Architecture: all
+Depends: ${misc:Depends}
Description: Generic Graphics Library (documentation)
GEGL (Generic Graphics Library) is a graph based image processing
framework.
Modified: packages/unstable/gegl/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/gegl/debian/control.in?rev=24165&op=diff
==============================================================================
--- packages/unstable/gegl/debian/control.in [utf-8] (original)
+++ packages/unstable/gegl/debian/control.in [utf-8] Sun May 2 08:53:48 2010
@@ -21,7 +21,7 @@
gtk-doc-tools (>= 1.0),
libjpeg62-dev,
libspiro-dev
-Standards-Version: 3.7.3
+Standards-Version: 3.8.4
Package: gegl
Architecture: any
@@ -50,7 +50,8 @@
Package: libgegl-0.0-dev
Section: libdevel
Architecture: any
-Depends: libgegl-0.0-0 (= ${binary:Version}),
+Depends: ${misc:Depends},
+ libgegl-0.0-0 (= ${binary:Version}),
libbabl-0.0-0-dev (>= 0.0.22),
libglib2.0-dev (>= 2.16.1)
Description: Generic Graphics Library (development files)
@@ -66,6 +67,7 @@
Package: libgegl-0.0-doc
Section: doc
Architecture: all
+Depends: ${misc:Depends}
Description: Generic Graphics Library (documentation)
GEGL (Generic Graphics Library) is a graph based image processing
framework.
Added: packages/unstable/gegl/debian/patches/01_gegl_PATH_MAX.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/gegl/debian/patches/01_gegl_PATH_MAX.patch?rev=24165&op=file
==============================================================================
--- packages/unstable/gegl/debian/patches/01_gegl_PATH_MAX.patch (added)
+++ packages/unstable/gegl/debian/patches/01_gegl_PATH_MAX.patch [utf-8] Sun May 2 08:53:48 2010
@@ -1,0 +1,144 @@
+Bug: https://bugzilla.gnome.org/show_bug.cgi?id=617416
+Author: Emilio Pozuelo Monfort <pochu at debian.org>
+
+Don't use PATH_MAX for portability reasons.
+
+Use dynamic allocation instead. Fixes FTBFS on GNU/Hurd.
+
+--- a/bin/editor.c
++++ b/bin/editor.c
+@@ -47,9 +47,6 @@
+ #include "editor.h"
+
+ #ifdef G_OS_WIN32
+-#ifndef PATH_MAX
+-#define PATH_MAX _MAX_PATH
+-#endif
+ #define realpath(a,b) _fullpath(b,a,_MAX_PATH)
+ #endif
+
+@@ -2947,9 +2944,10 @@
+ "/home/pippin/media/video/", NULL);
+
+ {
+- gchar absolute_path[PATH_MAX];
+- realpath (editor.options->file, absolute_path);
++ gchar* absolute_path;
++ absolute_path = realpath (editor.options->file, NULL);
+ gtk_file_chooser_set_filename (GTK_FILE_CHOOSER (dialog), absolute_path);
++ free (absolute_path);
+ }
+
+ gtk_dialog_set_default_response (GTK_DIALOG (dialog), GTK_RESPONSE_ACCEPT);
+@@ -2961,7 +2959,7 @@
+ if (filename)
+ {
+ gchar *full_filename;
+- gchar abs_filepath[PATH_MAX];
++ gchar *abs_filepath;
+ gchar *abs_path;
+ gchar *xml;
+
+@@ -2982,8 +2980,9 @@
+ editor.options->file = g_strdup (full_filename);
+ */
+
+- realpath (full_filename, abs_filepath);
++ abs_filepath = realpath (full_filename, NULL);
+ abs_path = g_strdup (g_path_get_dirname (abs_filepath));
++ free (abs_filepath);
+ xml = gegl_node_to_xml (editor.gegl, abs_path); /*oxide_xml (editor->oxide, abs_path);*/
+
+ g_file_set_contents (full_filename, xml, -1, NULL);
+--- a/bin/gegl.c
++++ b/bin/gegl.c
+@@ -36,9 +36,6 @@
+ #ifdef G_OS_WIN32
+ #include <direct.h>
+ #define getcwd(b,n) _getcwd(b,n)
+-#ifndef PATH_MAX
+-#define PATH_MAX _MAX_PATH
+-#endif
+ #define realpath(a,b) _fullpath(b,a,_MAX_PATH)
+ #endif
+
+@@ -105,24 +102,21 @@
+
+ if (o->xml)
+ {
+- gchar *tmp = g_malloc(PATH_MAX);
+- tmp = getcwd (tmp, PATH_MAX);
+- path_root = tmp;
++ path_root = g_get_current_dir ();
+ }
+ else if (o->file)
+ {
+ if (!strcmp (o->file, "-")) /* read XML from stdin */
+ {
+- gchar *tmp = g_malloc(PATH_MAX);
+- tmp = getcwd (tmp, PATH_MAX);
+- path_root = tmp;
++ path_root = g_get_current_dir ();
+ }
+ else
+ {
+- gchar real_path[PATH_MAX];
++ gchar *tmp;
+ gchar *temp1 = g_strdup (o->file);
+ gchar *temp2 = g_path_get_dirname (temp1);
+- path_root = g_strdup (realpath (temp2, real_path));
++ path_root = g_strdup (tmp = realpath (temp2, NULL));
++ free (tmp);
+ g_free (temp1);
+ g_free (temp2);
+ }
+--- a/gegl/gegl-xml.c
++++ b/gegl/gegl-xml.c
+@@ -37,9 +37,6 @@
+ #include "gegl-xml.h"
+
+ #ifdef G_OS_WIN32
+-#ifndef PATH_MAX
+-#define PATH_MAX _MAX_PATH
+-#endif
+ #define realpath(a, b) _fullpath (b, a, _MAX_PATH)
+ #endif
+
+@@ -121,7 +118,7 @@
+ else if (g_type_is_a (G_PARAM_SPEC_TYPE (paramspec),
+ GEGL_TYPE_PARAM_FILE_PATH))
+ {
+- gchar buf[PATH_MAX];
++ gchar *buf;
+
+ if (g_path_is_absolute (param_value))
+ {
+@@ -129,18 +126,21 @@
+ }
+ else if (pd->path_root)
+ {
+- gchar absolute_path[PATH_MAX];
+- g_snprintf (buf, sizeof (buf),
+- "%s/%s", pd->path_root, param_value);
+- realpath (buf, absolute_path);
++ gchar *absolute_path;
++ buf = g_strdup_printf ("%s/%s", pd->path_root, param_value);
++ absolute_path = realpath (buf, NULL);
++ g_free (buf);
+ gegl_node_set (new, param_name, absolute_path, NULL);
++ free (absolute_path);
+ }
+ else
+ {
+- gchar absolute_path[PATH_MAX];
+- g_snprintf (buf, sizeof (buf), "./%s", param_value);
+- realpath (buf, absolute_path);
++ gchar *absolute_path;
++ buf = g_strdup_printf ("./%s", param_value);
++ absolute_path = realpath (buf, NULL);
++ g_free (buf);
+ gegl_node_set (new, param_name, absolute_path, NULL);
++ free (absolute_path);
+ }
+ }
+ else if (paramspec->value_type == G_TYPE_INT)
Added: packages/unstable/gegl/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/gegl/debian/patches/series?rev=24165&op=file
==============================================================================
--- packages/unstable/gegl/debian/patches/series (added)
+++ packages/unstable/gegl/debian/patches/series [utf-8] Sun May 2 08:53:48 2010
@@ -1,0 +1,1 @@
+01_gegl_PATH_MAX.patch
Added: packages/unstable/gegl/debian/source/format
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/gegl/debian/source/format?rev=24165&op=file
==============================================================================
--- packages/unstable/gegl/debian/source/format (added)
+++ packages/unstable/gegl/debian/source/format [utf-8] Sun May 2 08:53:48 2010
@@ -1,0 +1,1 @@
+3.0 (quilt)
More information about the pkg-gnome-commits
mailing list