r23692 - in /packages/unstable/anjuta-extras/debian: changelog control.in patches/20_pathmax-hurd.patch patches/series rules source/ source/format
lethalman-guest at users.alioth.debian.org
lethalman-guest at users.alioth.debian.org
Sat Apr 10 15:06:53 UTC 2010
Author: lethalman-guest
Date: Sat Apr 10 15:06:48 2010
New Revision: 23692
URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=23692
Log:
* debian/patches/20_pathmax-hurd.patch:
- Added, use either our my_getline or glibc getline.
* Switch to source format 3.0 (quilt).
- Add debian/source/format.
- Drop quilt from Build-Depends.
- Remove /usr/share/cdbs/1/rules/simple-patchsys.mk include.
Added:
packages/unstable/anjuta-extras/debian/patches/20_pathmax-hurd.patch
packages/unstable/anjuta-extras/debian/source/
packages/unstable/anjuta-extras/debian/source/format
Modified:
packages/unstable/anjuta-extras/debian/changelog
packages/unstable/anjuta-extras/debian/control.in
packages/unstable/anjuta-extras/debian/patches/series
packages/unstable/anjuta-extras/debian/rules
Modified: packages/unstable/anjuta-extras/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/anjuta-extras/debian/changelog?rev=23692&op=diff
==============================================================================
--- packages/unstable/anjuta-extras/debian/changelog [utf-8] (original)
+++ packages/unstable/anjuta-extras/debian/changelog [utf-8] Sat Apr 10 15:06:48 2010
@@ -11,6 +11,12 @@
* debian/patches/01_libtool_avoid_version.patch,
debian/patches/90_relibtoolize.patch:
- Removed, applied upstream.
+ * debian/patches/20_pathmax-hurd.patch:
+ - Added, use either our my_getline or glibc getline.
+ * Switch to source format 3.0 (quilt).
+ - Add debian/source/format.
+ - Drop quilt from Build-Depends.
+ - Remove /usr/share/cdbs/1/rules/simple-patchsys.mk include.
-- Luca Bruno <lethalman88 at gmail.com> Thu, 01 Apr 2010 15:12:58 +0200
Modified: packages/unstable/anjuta-extras/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/anjuta-extras/debian/control.in?rev=23692&op=diff
==============================================================================
--- packages/unstable/anjuta-extras/debian/control.in [utf-8] (original)
+++ packages/unstable/anjuta-extras/debian/control.in [utf-8] Sat Apr 10 15:06:48 2010
@@ -6,7 +6,6 @@
Build-Depends: cdbs,
gnome-pkg-tools (>= 0.11),
debhelper (>= 5),
- quilt,
binutils-dev (>= 2.15.92),
intltool (>= 0.35.0),
libanjuta-dev (>= 2.30.0),
Added: packages/unstable/anjuta-extras/debian/patches/20_pathmax-hurd.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/anjuta-extras/debian/patches/20_pathmax-hurd.patch?rev=23692&op=file
==============================================================================
--- packages/unstable/anjuta-extras/debian/patches/20_pathmax-hurd.patch (added)
+++ packages/unstable/anjuta-extras/debian/patches/20_pathmax-hurd.patch [utf-8] Sat Apr 10 15:06:48 2010
@@ -1,0 +1,216 @@
+--- a/plugins/profiler/gprof-flat-profile.c
++++ b/plugins/profiler/gprof-flat-profile.c
+@@ -21,6 +21,8 @@
+ * Boston, MA 02110-1301, USA.
+ */
+
++#define _GNU_SOURCE
++#include <stdlib.h>
+ #include "gprof-flat-profile.h"
+
+ struct _GProfFlatProfilePriv
+@@ -145,36 +147,75 @@
+ return obj_type;
+ }
+
++/*
++ * GLibc provides getline, which allocate automatically the right
++ * amount for the line, read by *stream. If not available, use
++ * ours.
++
++ * Reference: http://www.mail-archive.com/debian-bugs-dist@lists.debian.org/msg162692.html
++ * Modified version with no errno, uses g_new, more checks.
++ */
++#ifdef __GLIBC__
++# define my_getline getline
++#else
++# define GETLINE_CHUNK_SIZE 4096
++
++static ssize_t my_getline(char **lineptr, size_t *n, FILE *stream)
++{
++ char *ret;
++
++ if (lineptr == NULL || n == NULL || stream == NULL)
++ return -1;
++
++ if (*lineptr == NULL || *n == 0) {
++ *lineptr = g_new (char, GETLINE_CHUNK_SIZE);
++ *n = GETLINE_CHUNK_SIZE;
++ }
++
++ ret = fgets (*lineptr, *n, stream);
++ while (ret != NULL && (*lineptr)[strlen (*lineptr) - 1] != '\n') {
++ *n += GETLINE_CHUNK_SIZE;
++ *lineptr = g_renew (char, *lineptr, *n);
++
++ ret = fgets (*lineptr + strlen (*lineptr), GETLINE_CHUNK_SIZE, stream);
++ }
++
++ return (ret ? strlen (*lineptr) : -1);
++}
++#endif /* !__GLIBC__ */
++
+ GProfFlatProfile *
+ gprof_flat_profile_new (FILE *stream)
+ {
+- gchar buffer[PATH_MAX];
+- size_t length;
++ gchar *buffer;
++ ssize_t length;
++ size_t n;
+ gchar **fields;
+ GProfFlatProfile *flat_profile;
+
+ flat_profile = g_object_new (GPROF_FLAT_PROFILE_TYPE, NULL);
++ buffer = NULL;
++ n = 0;
+
+ /* Read to beginning of flat profile data */
+ do
+ {
+ /* Don't loop infinitely if we don't have any data */
+- if (!fgets (buffer, PATH_MAX, stream))
+- return flat_profile;
+-
++ if (my_getline (&buffer, &n, stream) < 0)
++ goto out;
++
+ } while (!strchr (buffer, '%'));
+
+ /* Skip the second line of the column header */
+- fgets (buffer, PATH_MAX, stream);
+-
+- while (fgets (buffer, PATH_MAX, stream))
++ my_getline (&buffer, &n, stream);
++
++ while ((length = my_getline (&buffer, &n, stream)) >= 0)
+ {
+ /* If the first character is 12, that's the end of the flat profile. */
+ if (buffer[0] == 12)
+ break;
+
+ /* Remove the newline from the buffer */
+- length = strlen (buffer);
+ buffer[length - 1] = 0;
+
+ fields = get_flat_profile_fields (buffer);
+@@ -187,6 +228,9 @@
+ g_strfreev (fields);
+ }
+ }
++
++ out:
++ g_free (buffer);
+
+ return flat_profile;
+ }
+--- a/plugins/profiler/gprof-call-graph.c
++++ b/plugins/profiler/gprof-call-graph.c
+@@ -21,6 +21,8 @@
+ * Boston, MA 02110-1301, USA.
+ */
+
++#define _GNU_SOURCE
++#include <stdlib.h>
+ #include "gprof-call-graph.h"
+
+ #define BLOCK_SEPARATOR "-----------------------------------------------"
+@@ -227,12 +229,50 @@
+ return obj_type;
+ }
+
++/*
++ * GLibc provides getline, which allocate automatically the right
++ * amount for the line, read by *stream. If not available, use
++ * ours.
++
++ * Reference: http://www.mail-archive.com/debian-bugs-dist@lists.debian.org/msg162692.html
++ * Modified version with no errno, uses g_new, more checks.
++ */
++#ifdef __GLIBC__
++# define my_getline getline
++#else
++# define GETLINE_CHUNK_SIZE 4096
++
++static ssize_t my_getline(char **lineptr, size_t *n, FILE *stream)
++{
++ char *ret;
++
++ if (lineptr == NULL || n == NULL || stream == NULL)
++ return -1;
++
++ if (*lineptr == NULL || *n == 0) {
++ *lineptr = g_new (char, GETLINE_CHUNK_SIZE);
++ *n = GETLINE_CHUNK_SIZE;
++ }
++
++ ret = fgets (*lineptr, *n, stream);
++ while (ret != NULL && (*lineptr)[strlen (*lineptr) - 1] != '\n') {
++ *n += GETLINE_CHUNK_SIZE;
++ *lineptr = g_renew (char, *lineptr, *n);
++
++ ret = fgets (*lineptr + strlen (*lineptr), GETLINE_CHUNK_SIZE, stream);
++ }
++
++ return (ret ? strlen (*lineptr) : -1);
++}
++#endif /* !__GLIBC__ */
++
+ GProfCallGraph *
+ gprof_call_graph_new (FILE *stream, GProfFlatProfile *flat_profile)
+ {
+- gchar buffer[PATH_MAX];
++ gchar *buffer;
+ gchar **fields;
+- size_t length;
++ ssize_t length;
++ size_t n;
+ GProfCallGraphBlock *block;
+ GProfCallGraphBlockEntry *entry;
+ gchar *entry_name;
+@@ -240,20 +280,22 @@
+ gboolean found_primary = FALSE;
+
+ call_graph = g_object_new (GPROF_CALL_GRAPH_TYPE, NULL);
++ buffer = NULL;
++ n = 0;
+
+ /* Find the beginning of the call graph. The call graph begins with
+ * "index" */
+ do
+ {
+ /* Don't loop infinitely if we don't have any data */
+- if (!fgets (buffer, PATH_MAX, stream))
+- return call_graph;
++ if (my_getline (&buffer, &n, stream) < 0)
++ goto out;
+
+ } while (strncmp ("index", buffer, 5) != 0);
+
+ block = NULL;
+
+- while (fgets (buffer, PATH_MAX, stream))
++ while ((length = my_getline (&buffer, &n, stream)) >= 0)
+ {
+ /* If the first character of the line is 12, that's the end of the call
+ * graph. */
+@@ -267,7 +309,6 @@
+ }
+
+ /* Remove the newline from the buffer */
+- length = strlen (buffer);
+ buffer[length - 1] = 0;
+
+ /* If we encounter the block separator, add the block to the graph */
+@@ -317,7 +358,10 @@
+ }
+ }
+ }
+-
++
++ out:
++ g_free (buffer);
++
+ return call_graph;
+ }
+
Modified: packages/unstable/anjuta-extras/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/anjuta-extras/debian/patches/series?rev=23692&op=diff
==============================================================================
--- packages/unstable/anjuta-extras/debian/patches/series [utf-8] (original)
+++ packages/unstable/anjuta-extras/debian/patches/series [utf-8] Sat Apr 10 15:06:48 2010
@@ -1,4 +1,3 @@
-01_libtool_avoid_version.patch
10_scratchbox_config.patch
-90_relibtoolize.patch
+20_pathmax-hurd.patch
99_ltmain_as-needed.patch
Modified: packages/unstable/anjuta-extras/debian/rules
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/anjuta-extras/debian/rules?rev=23692&op=diff
==============================================================================
--- packages/unstable/anjuta-extras/debian/rules [utf-8] (original)
+++ packages/unstable/anjuta-extras/debian/rules [utf-8] Sat Apr 10 15:06:48 2010
@@ -1,10 +1,8 @@
#!/usr/bin/make -f
DISABLE_UPDATE_UPLOADERS := 1
-include /usr/share/quilt/quilt.make
include /usr/share/cdbs/1/rules/debhelper.mk
include /usr/share/cdbs/1/class/gnome.mk
-include /usr/share/cdbs/1/rules/simple-patchsys.mk
include /usr/share/cdbs/1/rules/utils.mk
include /usr/share/gnome-pkg-tools/1/rules/uploaders.mk
-include /usr/share/gnome-pkg-tools/1/rules/gnome-get-source.mk
Added: packages/unstable/anjuta-extras/debian/source/format
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/anjuta-extras/debian/source/format?rev=23692&op=file
==============================================================================
--- packages/unstable/anjuta-extras/debian/source/format (added)
+++ packages/unstable/anjuta-extras/debian/source/format [utf-8] Sat Apr 10 15:06:48 2010
@@ -1,0 +1,1 @@
+3.0 (quilt)
More information about the pkg-gnome-commits
mailing list