[DRE-commits] [ruby-exif] 06/11: added patch from debian diff file with DEP3 header

Jonas Genannt jonas at brachium-system.net
Thu Dec 19 16:39:34 UTC 2013


This is an automated email from the git hooks/post-receive script.

hggh-guest pushed a commit to branch master
in repository ruby-exif.

commit d702fb0773ef812b722fa07f4bf9e36dfe627d40
Author: Jonas Genannt <jonas at brachium-system.net>
Date:   Wed Dec 18 22:05:47 2013 +0100

    added patch from debian diff file with DEP3 header
---
 debian/patches/ruby_191.patch | 159 ++++++++++++++++++++++++++++++++++++++++++
 debian/patches/series         |   1 +
 2 files changed, 160 insertions(+)

diff --git a/debian/patches/ruby_191.patch b/debian/patches/ruby_191.patch
new file mode 100644
index 0000000..d08cfd4
--- /dev/null
+++ b/debian/patches/ruby_191.patch
@@ -0,0 +1,159 @@
+Description: Ruby1.9.1 support
+Author: Taku YASUI <tach at debian.or.jp>
+
+diff --git a/extconf.rb b/extconf.rb
+index 9269679..437f85d 100644
+--- a/extconf.rb
++++ b/extconf.rb
+@@ -5,7 +5,7 @@ dir_config("exif", "/usr/local/include", "/usr/local/lib")
+ def have_libexif_header
+   have_header('libexif/exif-ifd.h') and
+   have_header('libexif/exif-data.h') and
+-  have_header('libexif/exif-note.h') and
++#  have_header('libexif/exif-note.h') and
+   have_header('libexif/exif-utils.h') and
+   have_header('libexif/exif-tag.h') 
+ end
+diff --git a/exif.c b/exif.c
+index af4d82d..b1f5a71 100644
+--- a/exif.c
++++ b/exif.c
+@@ -7,10 +7,10 @@ vim:sts=4:ts=4:sw=4
+ 
+ 
+ *******************************************************************************/
+-#include "ruby.h"
++#include <ruby.h>
+ #include <libexif/exif-ifd.h>
+ #include <libexif/exif-data.h>
+-#include <libexif/exif-note.h>
++/* #include <libexif/exif-note.h> */
+ #include <libexif/exif-utils.h>
+ #include <libexif/exif-tag.h>
+ 
+@@ -62,16 +62,16 @@ rb_exif_data_new_from_file(VALUE fpath)
+ {
+ 	ExifData *data;
+ 	Check_Type(fpath, T_STRING);
+-	data = exif_data_new_from_file(RSTRING(fpath)->ptr);
++	data = exif_data_new_from_file(RSTRING_PTR(fpath));
+ 	if (!data){
+ 		FILE *f;
+-		f = fopen(RSTRING(fpath)->ptr,"rb");
++		f = fopen(RSTRING_PTR(fpath),"rb");
+ 		if (!f)
+ 			rb_raise(rb_eArgError, "unable to open file - '%s'",
+-			         RSTRING(fpath)->ptr);
++			         RSTRING_PTR(fpath));
+ 		fclose(f);
+ 		rb_raise(eExifInvalidFormat, 
+-		         "'%s' does not contain EXIF data", RSTRING(fpath)->ptr);
++		         "'%s' does not contain EXIF data", RSTRING_PTR(fpath));
+ 	}
+ 	return data;
+ }
+@@ -100,7 +100,7 @@ rb_exif_data_new_from_data(ExifData *ed, VALUE str)
+ 		exif_data_free(ed);
+ 		ed = NULL;
+ 	}
+-	ed = exif_data_new_from_data((unsigned char *)RSTRING(str)->ptr, RSTRING(str)->len);
++	ed = exif_data_new_from_data((unsigned char *)RSTRING_PTR(str), RSTRING_LEN(str));
+ }
+ 
+ static VALUE
+@@ -134,11 +134,12 @@ rb_exif_yield_tag_value(ExifEntry *entry, void *data)
+ {
+ 	VALUE k, v;
+ 	char buf[7];
++	char value[1024];
+ 	unsigned char *ids = data;
+ 	memset(buf, 0, sizeof(buf));
+ 	sprintf(buf, "0x%04x", entry->tag);
+ 	k = *ids ? rb_str_new2(buf) : rb_str_new2(exif_tag_get_title(entry->tag));
+-	v = rb_str_new2(exif_entry_get_value(entry));
++	v = rb_str_new2(exif_entry_get_value(entry, value, sizeof(value)));
+ 	rb_yield(rb_assoc_new(k, v));
+ }
+ 
+@@ -179,9 +180,9 @@ rb_exif_set_ifd(VALUE obj, VALUE ifd)
+ 		}
+ 		break;
+ 	  case T_STRING:
+-		i = exif_ifd_from_string(RSTRING(ifd)->ptr);
++		i = exif_ifd_from_string(RSTRING_PTR(ifd));
+ 		if (i == -1){
+-			rb_raise(rb_eRuntimeError, "unknown IFD: '%s'", RSTRING(ifd)->ptr);
++			rb_raise(rb_eRuntimeError, "unknown IFD: '%s'", RSTRING_PTR(ifd));
+ 		}
+ 		break;
+ 	  default:
+@@ -215,13 +216,14 @@ rb_exif_get_tag(VALUE obj, VALUE tagid)
+ 	ExifEntry *e;
+ 	const char *found;
+ 	int i;
++	char value[1024];
+ 
+ 	Get_Exif(obj, exif);
+ 	switch (TYPE(tagid)) {
+ 	  case T_STRING:
+-		tag = exif_tag_from_string(RSTRING(tagid)->ptr);
++		tag = exif_tag_from_string(RSTRING_PTR(tagid));
+ 		if (!tag){
+-			rb_raise(eExifError, "invalid tag: '%s'", RSTRING(tagid)->ptr);
++			rb_raise(eExifError, "invalid tag: '%s'", RSTRING_PTR(tagid));
+ 		}
+ 		break;
+ 	  case T_FIXNUM:
+@@ -241,14 +243,14 @@ rb_exif_get_tag(VALUE obj, VALUE tagid)
+ 			"IFD '%s' does not contain tag '%s'(0x%04x)",
+ 			exif_ifd_get_name(exif->ifd), exif_tag_get_title(tag), tag);
+ 		}
+-		return rb_str_new2(exif_entry_get_value(e));
++		return rb_str_new2(exif_entry_get_value(e, value, sizeof(value)));
+ 	}
+ 	for (i = 0; i < EXIF_IFD_COUNT; i++){
+ 		e = exif_content_get_entry(exif->ed->ifd[i], tag);
+ 		if (e)
+ 			break;
+ 	}
+-	found = exif_entry_get_value(e);
++	found = exif_entry_get_value(e, value, sizeof(value));
+ 	return found ? rb_str_new2(found) : Qnil;
+ }
+ 
+@@ -272,9 +274,9 @@ rb_exif_set_tag(VALUE obj, VALUE tagid, VALUE val)
+ 	Check_Type(tagid, T_STRING);
+ 	Check_Type(val, T_STRING);
+ 	Get_Exif(obj, exif);
+-	tag = exif_tag_from_string(RSTRING(tagid)->ptr);
++	tag = exif_tag_from_string(RSTRING_PTR(tagid));
+ 	if (!tag || !exif_tag_get_name(tag)){
+-		rb_raise(eExifError, "invalid tag: '%s'", RSTRING(tagid)->ptr);
++		rb_raise(eExifError, "invalid tag: '%s'", RSTRING_PTR(tagid));
+ 	}
+ 	e = exif_content_get_entry(exif->ed->ifd[exif->ifd], tag);
+ 	if (!e){
+@@ -326,9 +328,9 @@ rb_exif_s_get_tag_description(VALUE klass, VALUE tagid)
+ 			         FIX2INT(tagid), FIX2INT(tagid));
+ 		break;
+ 	  case T_STRING:
+-	    tag = exif_tag_from_string(RSTRING(tagid)->ptr);
++	    tag = exif_tag_from_string(RSTRING_PTR(tagid));
+ 		if (!tag || !exif_tag_get_name(tag)) {
+-			rb_raise(eExifError, "invalid tag: '%s'", RSTRING(tagid)->ptr);
++			rb_raise(eExifError, "invalid tag: '%s'", RSTRING_PTR(tagid));
+ 		}
+ 		break;
+ 	  default:
+@@ -366,9 +368,9 @@ rb_exif_set_thumbnail(VALUE obj, VALUE src)
+ 		exif->ed->size = 0;
+ 	}
+ 	Check_Type(src, T_STRING);
+-	exif->ed->size = RSTRING(src)->len;
++	exif->ed->size = RSTRING_LEN(src);
+ 	exif->ed->data = xmalloc(sizeof(char)*exif->ed->size);
+-	MEMMOVE(exif->ed->data, RSTRING(src)->ptr, char, exif->ed->size);
++	MEMMOVE(exif->ed->data, RSTRING_PTR(src), char, exif->ed->size);
+ 	return obj;
+ }
+ 
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..203dbc3
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+ruby_191.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ruby-extras/ruby-exif.git



More information about the Pkg-ruby-extras-commits mailing list