rpms/ruby-gnome2/devel ruby-gnome2-all-0.16.0-newpoppler.patch, 1.2, 1.3 ruby-gnome2.spec, 1.24, 1.25

Mamoru Tasaka (mtasaka) fedora-extras-commits at redhat.com
Thu Mar 20 06:12:59 UTC 2008


Author: mtasaka

Update of /cvs/extras/rpms/ruby-gnome2/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29124

Modified Files:
	ruby-gnome2-all-0.16.0-newpoppler.patch ruby-gnome2.spec 
Log Message:
* Thu Mar 20 2008 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 0.16.0-28
- Workarround for poppler 0.7.2


ruby-gnome2-all-0.16.0-newpoppler.patch:

Index: ruby-gnome2-all-0.16.0-newpoppler.patch
===================================================================
RCS file: /cvs/extras/rpms/ruby-gnome2/devel/ruby-gnome2-all-0.16.0-newpoppler.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- ruby-gnome2-all-0.16.0-newpoppler.patch	13 Sep 2007 13:43:15 -0000	1.2
+++ ruby-gnome2-all-0.16.0-newpoppler.patch	20 Mar 2008 06:12:49 -0000	1.3
@@ -1,7 +1,6 @@
-diff -up ruby-gnome2-all-0.16.0/poppler/src/rbpoppler.h.newpoppler ruby-gnome2-all-0.16.0/poppler/src/rbpoppler.h
---- ruby-gnome2-all-0.16.0/poppler/src/rbpoppler.h.newpoppler	2007-09-13 09:19:35.000000000 -0300
-+++ ruby-gnome2-all-0.16.0/poppler/src/rbpoppler.h	2007-09-13 09:21:32.000000000 -0300
-@@ -38,16 +38,27 @@ extern GType poppler_dest_get_type (void
+--- ruby-gnome2-all-0.16.0/poppler/src/rbpoppler.h.newpoppler	2006-12-29 22:17:28.000000000 +0900
++++ ruby-gnome2-all-0.16.0/poppler/src/rbpoppler.h	2008-03-20 13:37:29.000000000 +0900
+@@ -38,16 +38,27 @@
  #define REGION2RVAL(obj) (BOXED2RVAL(obj, GDK_TYPE_REGION))
  #define RVAL2DEST(obj) ((PopplerDest *)RVAL2BOXED(obj, POPPLER_TYPE_DEST))
  #define DEST2RVAL(obj) (BOXED2RVAL(obj, POPPLER_TYPE_DEST))
@@ -29,9 +28,8 @@
  
  
  extern void Init_poppler_document(VALUE mPoppler);
-diff -up ruby-gnome2-all-0.16.0/poppler/src/rbpoppler-page.c.newpoppler ruby-gnome2-all-0.16.0/poppler/src/rbpoppler-page.c
---- ruby-gnome2-all-0.16.0/poppler/src/rbpoppler-page.c.newpoppler	2007-09-13 09:19:47.000000000 -0300
-+++ ruby-gnome2-all-0.16.0/poppler/src/rbpoppler-page.c	2007-09-13 09:21:06.000000000 -0300
+--- ruby-gnome2-all-0.16.0/poppler/src/rbpoppler-page.c.newpoppler	2006-12-29 22:17:28.000000000 +0900
++++ ruby-gnome2-all-0.16.0/poppler/src/rbpoppler-page.c	2008-03-20 14:32:40.000000000 +0900
 @@ -4,7 +4,7 @@
    rbpoppler-page.c -
  
@@ -83,7 +81,7 @@
                                    NUM2INT(src_y), NUM2INT(src_width),
                                    NUM2INT(src_height), NUM2DBL(scale),
                                    NUM2INT(rotation), RVAL2GOBJ(pixbuf));
-@@ -32,7 +55,7 @@ page_render_to_pixbuf(VALUE self, VALUE 
+@@ -32,7 +55,7 @@
  static VALUE
  page_render(VALUE self, VALUE cairo)
  {
@@ -92,7 +90,7 @@
      return Qnil;
  }
  #endif
-@@ -40,7 +63,7 @@ page_render(VALUE self, VALUE cairo)
+@@ -40,7 +63,7 @@
  static VALUE
  page_render_to_ps(VALUE self, VALUE ps_file)
  {
@@ -101,7 +99,7 @@
      return Qnil;
  }
  
-@@ -48,7 +71,7 @@ static VALUE
+@@ -48,7 +71,7 @@
  page_render_generic(int argc, VALUE *argv, VALUE self)
  {
      if (argc == 1) {
@@ -110,7 +108,7 @@
              return page_render_to_ps(self, argv[0]);
          } else {
  #ifdef RB_POPPLER_CAIRO_AVAILABLE
-@@ -70,20 +93,34 @@ static VALUE
+@@ -70,20 +93,34 @@
  page_get_size(VALUE self)
  {
      double width, height;
@@ -148,7 +146,7 @@
  }
  
  static VALUE
-@@ -91,7 +128,7 @@ page_get_thumbnail_size(VALUE self)
+@@ -91,7 +128,7 @@
  {
      int width, height;
  
@@ -157,7 +155,7 @@
          return rb_ary_new3(2, INT2NUM(width), INT2NUM(height));
      else
          return Qnil;
-@@ -100,17 +137,60 @@ page_get_thumbnail_size(VALUE self)
+@@ -100,17 +137,60 @@
  static VALUE
  page_find_text(VALUE self, VALUE text)
  {
@@ -222,7 +220,7 @@
      rb_text = CSTR2RVAL(text);
      g_free(text);
      return rb_text;
-@@ -119,15 +199,50 @@ page_get_text(VALUE self, VALUE rect)
+@@ -119,15 +199,50 @@
  static VALUE
  page_get_link_mapping(VALUE self)
  {
@@ -276,7 +274,7 @@
                                                           RVAL2RECT(selection)));
  }
  
-@@ -136,15 +251,16 @@ page_get_selection_region(VALUE self, VA
+@@ -136,15 +251,16 @@
  static VALUE
  page_render_selection(VALUE self, VALUE cairo,
                        VALUE selection, VALUE rb_old_selection,
@@ -295,7 +293,7 @@
                                    RVAL2COLOR(glyph_color),
                                    RVAL2COLOR(background_color));
      return Qnil;
-@@ -159,17 +275,24 @@ static VALUE
+@@ -159,17 +275,24 @@
  page_render_selection_to_pixbuf(VALUE self, VALUE scale, VALUE rotation,
                                  VALUE pixbuf, VALUE selection,
                                  VALUE rb_old_selection,
@@ -321,7 +319,7 @@
                                              RVAL2COLOR(glyph_color),
                                              RVAL2COLOR(background_color));
      return Qnil;
-@@ -178,24 +301,86 @@ page_render_selection_to_pixbuf(VALUE se
+@@ -178,24 +301,86 @@
  static VALUE
  page_render_selection_generic(int argc, VALUE *argv, VALUE self)
  {
@@ -411,7 +409,7 @@
  
  
  /* A rectangle on a page, with coordinates in PDF points. */
-@@ -213,107 +398,320 @@ rectangle_initialize(VALUE self, VALUE x
+@@ -213,107 +398,324 @@
      return Qnil;
  }
  
@@ -467,7 +465,11 @@
 +/* Mapping between areas on the current page and images */
 +DEF_ACCESSOR_WITH_SETTER(image_mapping, area,
 +                         RVAL2IM, RECT_ENTITY2RVAL, RECT_ENTITY_SET)
++#if POPPLER_CHECK_VERSION(0, 7, 2)
++DEF_ACCESSOR(image_mapping, image_id, RVAL2IM, NUM2INT, INT2NUM)
++#else
 +DEF_ACCESSOR(image_mapping, image, RVAL2IM, GOBJ2RVAL, RVAL2GDK_PIXBUF)
++#endif
 +
 +
 +/* Mapping between areas on the current page and form fields */
@@ -518,30 +520,30 @@
 -rectangle_get_y2(VALUE self)
 +VALUE
 +form_field_get_font_size(VALUE self)
-+{
-+    return rb_float_new(poppler_form_field_get_font_size(RVAL2FF(self)));
-+}
-+
-+VALUE
-+form_field_is_read_only(VALUE self)
  {
 -    return rb_float_new(RVAL2RECT(self)->y2);
-+    return CBOOL2RVAL(poppler_form_field_is_read_only(RVAL2FF(self)));
++    return rb_float_new(poppler_form_field_get_font_size(RVAL2FF(self)));
  }
  
-+/* Button Field */
 +VALUE
-+button_field_get_button_type(VALUE self)
++form_field_is_read_only(VALUE self)
 +{
-+    return FBT2RVAL(poppler_form_field_button_get_button_type(RVAL2FF(self)));
++    return CBOOL2RVAL(poppler_form_field_is_read_only(RVAL2FF(self)));
 +}
  
 -static VALUE
 -rectangle_set_x1(VALUE self, VALUE x1)
++/* Button Field */
 +VALUE
-+button_field_get_state(VALUE self)
++button_field_get_button_type(VALUE self)
  {
 -    RVAL2RECT(self)->x1 = NUM2DBL(x1);
++    return FBT2RVAL(poppler_form_field_button_get_button_type(RVAL2FF(self)));
++}
++
++VALUE
++button_field_get_state(VALUE self)
++{
 +    return CBOOL2RVAL(poppler_form_field_button_get_state(RVAL2BF(self)));
 +}
 +
@@ -629,8 +631,7 @@
 +
 +VALUE
 +choice_field_do_spell_check(VALUE self)
- {
--    RVAL2RECT(self)->x2 = NUM2DBL(x2);
++{
 +    return CBOOL2RVAL(poppler_form_field_choice_do_spell_check(RVAL2CF(self)));
 +}
 +
@@ -662,7 +663,8 @@
 +
 +VALUE
 +choice_field_select_item(VALUE self, VALUE index)
-+{
+ {
+-    RVAL2RECT(self)->x2 = NUM2DBL(x2);
 +    poppler_form_field_choice_select_item(RVAL2CF(self), NUM2INT(index));
      return Qnil;
  }
@@ -774,7 +776,7 @@
  
      G_DEF_SETTERS(cPage);
  
-@@ -335,5 +733,102 @@ Init_poppler_page(VALUE mPoppler)
+@@ -335,5 +737,110 @@
      rb_define_method(cLinkMapping, "area", link_mapping_get_area, 0);
      rb_define_method(cLinkMapping, "action", link_mapping_get_action, 0);
  
@@ -811,10 +813,18 @@
 +
 +/* Mapping between areas on the current page and images */
 +    rb_define_method(cImageMapping, "area", image_mapping_get_area, 0);
++#if POPPLER_CHECK_VERSION(0, 7, 2)
++    rb_define_method(cImageMapping, "image_id", image_mapping_get_image_id, 0);
++#else
 +    rb_define_method(cImageMapping, "image", image_mapping_get_image, 0);
++#endif
 +
 +    rb_define_method(cImageMapping, "set_area", image_mapping_set_area, 1);
++#if POPPLER_CHECK_VERSION(0, 7, 2)
++    rb_define_method(cImageMapping, "set_image_id", image_mapping_set_image_id, 1);
++#else
 +    rb_define_method(cImageMapping, "set_image", image_mapping_set_image, 1);
++#endif
 +
 +    G_DEF_SETTERS(cImageMapping);
 +


Index: ruby-gnome2.spec
===================================================================
RCS file: /cvs/extras/rpms/ruby-gnome2/devel/ruby-gnome2.spec,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- ruby-gnome2.spec	18 Feb 2008 19:18:09 -0000	1.24
+++ ruby-gnome2.spec	20 Mar 2008 06:12:49 -0000	1.25
@@ -5,7 +5,7 @@
 
 Name:           ruby-gnome2
 Version:        0.16.0
-Release:        27%{?dist}
+Release:        28%{?dist}
 Summary:        Ruby binding of libgnome/libgnomeui-2.x
 
 Group:          System Environment/Libraries
@@ -250,13 +250,13 @@
 %endif
 
 %if "%fedora" == "8"
-BuildRequires:  gecko-devel = 1.8.1.10
-Requires:       gecko-libs = 1.8.1.10
+BuildRequires:  gecko-devel = 1.8.1.12
+Requires:       gecko-libs = 1.8.1.12
 %endif
 
 %if "%fedora" == "7"
-BuildRequires:  gecko-devel = 1.8.1.10
-Requires:       gecko-libs = 1.8.1.10
+BuildRequires:  gecko-devel = 1.8.1.12
+Requires:       gecko-libs = 1.8.1.12
 %endif
 
 %if "%fedora" == "6"
@@ -652,6 +652,9 @@
 
 
 %changelog
+* Thu Mar 20 2008 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 0.16.0-28
+- Workarround for poppler 0.7.2
+
 * Mon Feb 18 2008 Fedora Release Engineering <rel-eng at fedoraproject.org> - 0.16.0-27
 - Autorebuild for GCC 4.3
 




More information about the fedora-extras-commits mailing list