--- ruby-gnome2-0.16.0.orig/debian/libpanel-applet2-ruby.examples +++ ruby-gnome2-0.16.0/debian/libpanel-applet2-ruby.examples @@ -0,0 +1 @@ +panel-applet/sample/* --- ruby-gnome2-0.16.0.orig/debian/control +++ ruby-gnome2-0.16.0/debian/control @@ -0,0 +1,460 @@ +Source: ruby-gnome2 +Section: libs +Priority: optional +Maintainer: Arnaud Cornet +Uploaders: Debian Ruby Extras Maintainers , Paul van Tilburg +Build-Depends: ruby-pkg-tools (>= 0.8), cdbs, debhelper (>= 4), ruby, ruby1.8, ruby1.8-dev, libgnomeui-dev, libglade2-dev, libgtkhtml2-dev, libpng12-dev, libgtkglext1-dev, libxmu-dev, libgtksourceview-dev, libpanel-applet2-dev, libgnomeprint2.2-dev (>= 2.8.0), libgnomeprintui2.2-dev (>= 2.6.0), librsvg2-dev (>= 2.8.0), libcairo-ruby, libxul-dev, libvte-dev (>= 0.12.1), libpoppler-glib-dev (>= 0.5.2), pkg-config, quilt +Standards-Version: 3.7.2 +Homepage: http://ruby-gnome2.sourceforge.jp/ + +Package: libglib2-ruby +Architecture: all +Depends: libglib2-ruby1.8 +Description: Glib 2 bindings for the Ruby language + Glib is a useful general-purpose C library, notably used by GTK+ and GNOME. + This package contains libraries for using Glib with the Ruby programming + language. It is most likely useful in conjunction with Ruby bindings for + other libraries such as GTK+. + . + This is a dummy package depending on the library for the current default + version of Ruby. + +Package: libglib2-ruby1.8 +Architecture: any +Depends: ${shlibs:Depends} +Replaces: libglib2-ruby (<< 0.16.0) +Conflicts: libglib2-ruby (<< 0.16.0) +Description: Glib 2 bindings for the Ruby language + Glib is a useful general-purpose C library, notably used by GTK+ and GNOME. + This package contains libraries for using Glib with the Ruby programming + language. It is most likely useful in conjunction with Ruby bindings for + other libraries such as GTK+. + +Package: libatk1-ruby +Architecture: all +Depends: libatk1-ruby1.8 +Description: ATK bindings for the Ruby language + ATK is a toolkit providing accessibility interfaces for applications or other + toolkits. By implementing these interfaces, those other toolkits or + applications can be used with tools such as screen readers, magnifiers, and + other alternative input devices. This package contains libraries for using + ATK with the Ruby programming language. + . + This is a dummy package depending on the library for the current default + version of Ruby. + +Package: libatk1-ruby1.8 +Architecture: any +Depends: ${shlibs:Depends}, libglib2-ruby1.8 (= ${binary:Version}) +Replaces: libatk1-ruby (<< 0.16.0) +Conflicts: libatk1-ruby (<< 0.16.0) +Description: ATK bindings for the Ruby language + ATK is a toolkit providing accessibility interfaces for applications or other + toolkits. By implementing these interfaces, those other toolkits or + applications can be used with tools such as screen readers, magnifiers, and + other alternative input devices. This package contains libraries for using + ATK with the Ruby programming language. + +Package: libpango1-ruby +Architecture: all +Depends: libpango1-ruby1.8 +Description: Pango bindings for the Ruby language + Pango is a library for layout and rendering of text, with an emphasis on + internationalization. This package contains libraries for using Pango with + the Ruby programming language. + . + This is a dummy package depending on the library for the current default + version of Ruby. + +Package: libpango1-ruby1.8 +Architecture: any +Depends: ${shlibs:Depends}, libglib2-ruby1.8 (= ${binary:Version}), libcairo-ruby1.8 +Replaces: libpango1-ruby (<< 0.16.0) +Conflicts: libpango1-ruby (<< 0.16.0) +Description: Pango bindings for the Ruby language + Pango is a library for layout and rendering of text, with an emphasis on + internationalization. This package contains libraries for using Pango with + the Ruby programming language. + +Package: libgdk-pixbuf2-ruby +Architecture: all +Depends: libgdk-pixbuf2-ruby1.8 +Description: Gdk-Pixbuf 2 bindings for the Ruby language + Gdk-Pixbuf is a library for loading and rendering images. This package + contains libraries for using Gdk-Pixbuf with the Ruby programming language. + . + This is a dummy package depending on the library for the current default + version of Ruby. + +Package: libgdk-pixbuf2-ruby1.8 +Architecture: any +Depends: ${shlibs:Depends}, libglib2-ruby1.8 (= ${binary:Version}) +Replaces: libgdk-pixbuf2-ruby (<< 0.16.0) +Conflicts: libgdk-pixbuf2-ruby (<< 0.16.0) +Description: Gdk-Pixbuf 2 bindings for the Ruby language + Gdk-Pixbuf is a library for loading and rendering images. This package + contains libraries for using Gdk-Pixbuf with the Ruby programming language. + +Package: libgtk2-ruby +Architecture: all +Depends: libgtk2-ruby1.8 +Replaces: libgtk-trayicon-ruby +Conflicts: libgtk-trayicon-ruby +Description: GTK+ bindings for the Ruby language + GTK+ is a library for creating graphical user interfaces. This package + contains libraries for using GTK+ with the Ruby programming language. + . + This is a dummy package depending on the library for the current default + version of Ruby. + +Package: libgtk2-ruby1.8 +Architecture: any +Depends: ${shlibs:Depends}, libatk1-ruby1.8 (= ${binary:Version}), libpango1-ruby1.8 (= ${binary:Version}), libgdk-pixbuf2-ruby1.8 (= ${binary:Version}) +Replaces: libgtk2-ruby (<< 0.16.0), libgtk-trayicon-ruby1.8 +Conflicts: libgtk2-ruby (<< 0.16.0), libgtk-trayicon-ruby1.8 +Description: GTK+ bindings for the Ruby language + GTK+ is a library for creating graphical user interfaces. This package + contains libraries for using GTK+ with the Ruby programming language. + +Package: libart2-ruby +Architecture: all +Depends: libart2-ruby1.8 +Description: Libart 2 bindings for the Ruby language + Libart is a library for 2D graphics. This package contains libraries for + using Libart with the Ruby programming language. + . + This is a dummy package depending on the library for the current default + version of Ruby. + +Package: libart2-ruby1.8 +Architecture: any +Depends: ${shlibs:Depends} +Replaces: libart2-ruby (<< 0.16.0) +Conflicts: libart2-ruby (<< 0.16.0) +Description: Libart 2 bindings for the Ruby language + Libart is a library for 2D graphics. This package contains libraries for + using Libart with the Ruby programming language. + +Package: libgnomecanvas2-ruby +Architecture: all +Depends: libgnomecanvas2-ruby1.8 +Description: GNOME Canvas 2 bindings for the Ruby language + The GNOME canvas is powerful and extensible object-oriented display engine, + which allows graphics manipulation in terms of structured items as opposed to + pixels. This package contains libraries for using the GNOME canvas with the + Ruby programming language. + . + This is a dummy package depending on the library for the current default + version of Ruby. + +Package: libgnomecanvas2-ruby1.8 +Architecture: any +Depends: ${shlibs:Depends}, libgtk2-ruby1.8 (= ${binary:Version}), libart2-ruby1.8 (= ${binary:Version}) +Replaces: libgnomecanvas2-ruby (<< 0.16.0) +Conflicts: libgnomecanvas2-ruby (<< 0.16.0) +Description: GNOME Canvas 2 bindings for the Ruby language + The GNOME canvas is powerful and extensible object-oriented display engine, + which allows graphics manipulation in terms of structured items as opposed to + pixels. This package contains libraries for using the GNOME canvas with the + Ruby programming language. + +Package: libgnome2-ruby +Architecture: all +Depends: libgnome2-ruby1.8 +Description: GNOME 2 bindings for the Ruby language + The GNOME user interface libraries provide shared user interface + functionality for GNOME and GNOME-based programs. This package contains + libraries for using the GNOME libraries with the Ruby programming language. + . + This is a dummy package depending on the library for the current default + version of Ruby. + +Package: libgnome2-ruby1.8 +Architecture: any +Depends: ${shlibs:Depends}, libgnomecanvas2-ruby1.8 (= ${binary:Version}) +Replaces: libgnome2-ruby (<< 0.16.0) +Conflicts: libgnom2-ruby (<< 0.16.0) +Description: GNOME 2 bindings for the Ruby language + The GNOME user interface libraries provide shared user interface + functionality for GNOME and GNOME-based programs. This package contains + libraries for using the GNOME libraries with the Ruby programming language. + +Package: libgconf2-ruby +Architecture: all +Depends: libgconf2-ruby1.8 +Description: GConf 2 bindings for the Ruby language + GConf is a configuration database system. This package contains libraries for + using GConf with the Ruby programming language. + . + This is a dummy package depending on the library for the current default + version of Ruby. + +Package: libgconf2-ruby1.8 +Architecture: any +Depends: ${shlibs:Depends}, libglib2-ruby1.8 (= ${binary:Version}) +Replaces: libgconf2-ruby (<< 0.16.0) +Conflicts: libgconf2-ruby (<< 0.16.0) +Description: GConf 2 bindings for the Ruby language + GConf is a configuration database system. This package contains libraries for + using GConf with the Ruby programming language. + +Package: libglade2-ruby +Architecture: all +Depends: libglade2-ruby1.8 +Suggests: libgnome2-ruby +Description: Libglade 2 bindings for the Ruby language + Libglade allows programs to load externally-stored user interfaces, + permitting the modification of the interface without the modification of the + program. This package contains libraries for using Libglade with the Ruby + programming language. + . + This is a dummy package depending on the library for the current default + version of Ruby. + +Package: libglade2-ruby1.8 +Architecture: any +Depends: ${shlibs:Depends}, ruby, libgtk2-ruby1.8 (= ${binary:Version}) +Replaces: libglade2-ruby (<< 0.16.0) +Conflicts: libglade2-ruby (<< 0.16.0) +Description: Libglade 2 bindings for the Ruby language + Libglade allows programs to load externally-stored user interfaces, + permitting the modification of the interface without the modification of the + program. This package contains libraries for using Libglade with the Ruby + programming language. + +Package: libgtkhtml2-ruby +Architecture: all +Depends: libgtkhtml2-ruby1.8 +Description: GtkHTML bindings for the Ruby language + GtkHTML is a lightweight HTML rendering/printing/editing engine. This package + contains libraries for using GtkHTML with the Ruby programming language. + . + This is a dummy package depending on the library for the current default + version of Ruby. + +Package: libgtkhtml2-ruby1.8 +Architecture: any +Depends: ${shlibs:Depends}, libgtk2-ruby1.8 (= ${binary:Version}) +Replaces: libgtkhtml2-ruby (<< 0.16.0) +Conflicts: libgtkhtml2-ruby (<< 0.16.0) +Description: GtkHTML bindings for the Ruby language + GtkHTML is a lightweight HTML rendering/printing/editing engine. This package + contains libraries for using GtkHTML with the Ruby programming language. + +Package: libgtkglext1-ruby +Architecture: all +Depends: libgtkglext1-ruby1.8 +Description: GTK+ GL extension bindings for the Ruby language + GtkGLExt provides the GDK objects to support OpenGL rendering in GTK, + and GtkWidget API add-ons to make GTK+ widgets OpenGL-capable. This package + contains libraries for using GtkGLExt with the Ruby programming language. + . + This is a dummy package depending on the library for the current default + version of Ruby. + +Package: libgtkglext1-ruby1.8 +Architecture: any +Depends: ${shlibs:Depends}, libopengl-ruby, libglib2-ruby1.8 (= ${binary:Version}) +Replaces: libgtkglext1-ruby (<< 0.16.0) +Conflicts: libgtkglext1-ruby (<< 0.16.0) +Description: GTK+ GL extension bindings for the Ruby language + GtkGLExt provides the GDK objects to support OpenGL rendering in GTK, + and GtkWidget API add-ons to make GTK+ widgets OpenGL-capable. This package + contains libraries for using GtkGLExt with the Ruby programming language. + +Package: libgnomevfs2-ruby +Architecture: all +Depends: libgnomevfs2-ruby1.8 +Description: GNOME VFS 2 bindings for the Ruby language + GNOME VFS is the GNOME virtual file system. It provides a modular + architecture and ships with several modules that implement support for file + systems, http, ftp and others. It provides a URI-based API, a backend + supporting asynchronous file operations, a MIME type manipulation library and + other features. This package contains libraries for using GNOME-VFS with the + Ruby programming language. + . + This is a dummy package depending on the library for the current default + version of Ruby. + +Package: libgnomevfs2-ruby1.8 +Architecture: any +Depends: ${shlibs:Depends}, libglib2-ruby1.8 (= ${binary:Version}) +Replaces: libgnomevfs2-ruby (<< 0.16.0) +Conflicts: libgnomevfs2-ruby (<< 0.16.0) +Description: GNOME VFS 2 bindings for the Ruby language + GNOME VFS is the GNOME virtual file system. It provides a modular + architecture and ships with several modules that implement support for file + systems, http, ftp and others. It provides a URI-based API, a backend + supporting asynchronous file operations, a MIME type manipulation library and + other features. This package contains libraries for using GNOME-VFS with the + Ruby programming language. + +Package: libgtksourceview1-ruby +Architecture: all +Depends: libgtksourceview1-ruby1.8 +Description: GtkSourceView bindings for the Ruby language + GtkSourceView is a text widget that extends the standard GTK+ text widget. + This package contains libraries for using the GtkSourceView text widget + with syntax highlighting and other features typical of a source code + editor in the Ruby programming language. + . + This is a dummy package depending on the library for the current default + version of Ruby. + +Package: libgtksourceview1-ruby1.8 +Architecture: any +Depends: ${shlibs:Depends}, libgtk2-ruby1.8 (= ${binary:Version}) +Replaces: libgtksourceview1-ruby (<< 0.16.0) +Conflicts: libgtksourceview1-ruby (<< 0.16.0) +Description: GtkSourceView bindings for the Ruby language + GTKSourceView is a text widget that extends the standard GTK+ text widget. + This package contains libraries for using the GtkSourceView text widget + with syntax highlighting and other features typical of a source code + editor in the Ruby programming language. + +Package: libpanel-applet2-ruby +Architecture: all +Depends: libpanel-applet2-ruby1.8 +Description: GNOME 2 panel applet library bindings for the Ruby language + The GNOME panel applet library is used by applets which sit on the GNOME + Panel. This package contains libraries for using the panel applet library + with the Ruby programming language. + . + This is a dummy package depending on the library for the current default + version of Ruby. + +Package: libpanel-applet2-ruby1.8 +Architecture: any +Depends: ${shlibs:Depends}, libgtk2-ruby1.8 (= ${binary:Version}) +Replaces: libpanel-applet2-ruby (<< 0.16.0) +Conflicts: libpanel-applet2-ruby (<< 0.16.0) +Description: GNOME 2 panel applet library bindings for the Ruby language + The GNOME panel applet library is used by applets which sit on the GNOME + Panel. This package contains libraries for using the panel applet library + with the Ruby programming language. + +Package: libgnomeprint2-ruby +Architecture: all +Depends: libgnomeprint2-ruby1.8 +Description: GNOME print bindings for the Ruby language + The GNOME print architecture is a set of libraries for printing documents + from GNOME applications. This package contains libraries for using the + architecture with the Ruby programming language. + . + This is a dummy package depending on the library for the current default + version of Ruby. + +Package: libgnomeprint2-ruby1.8 +Architecture: any +Depends: ${shlibs:Depends}, libglib2-ruby1.8 (= ${binary:Version}) +Replaces: libgnomeprint2-ruby (<< 0.16.0) +Conflicts: libgnomeprint2-ruby (<< 0.16.0) +Description: GNOME print bindings for the Ruby language + The GNOME print architecture is a set of libraries for printing documents + from GNOME applications. This package contains libraries for using the + architecture with the Ruby programming language. + +Package: libgnomeprintui2-ruby +Architecture: all +Depends: libgnomeprintui2-ruby1.8 +Description: GNOME print user interface bindings for the Ruby language + The GNOME print architecture is a set of libraries for printing documents + from GNOME applications. This package contains libraries for using the using + the user interface aspects of the architecture with the Ruby programming + language. + . + This is a dummy package depending on the library for the current default + version of Ruby. + +Package: libgnomeprintui2-ruby1.8 +Architecture: any +Depends: ${shlibs:Depends}, libgtk2-ruby1.8 (= ${binary:Version}), libgnomeprint2-ruby1.8 (= ${binary:Version}) +Replaces: libgnomeprintui2-ruby (<< 0.16.0) +Conflicts: libgnomeprintui2-ruby (<< 0.16.0) +Description: GNOME print user interface bindings for the Ruby language + The GNOME print architecture is a set of libraries for printing documents + from GNOME applications. This package contains libraries for using the using + the user interface aspects of the architecture with the Ruby programming + language. + +Package: librsvg2-ruby +Architecture: all +Depends: librsvg2-ruby1.8 +Description: RSVG renderer bindings for the Ruby language + RSVG is a renderer for Scalable Vector Graphics image files. This package + contains libraries for using RSVG with the Ruby programming language. + . + This is a dummy package depending on the library for the current default + version of Ruby. + +Package: librsvg2-ruby1.8 +Architecture: any +Depends: ${shlibs:Depends}, libglib2-ruby1.8 (= ${binary:Version}) +Replaces: librsvg2-ruby (<< 0.16.0) +Conflicts: librsvg2-ruby (<< 0.16.0) +Description: RSVG renderer bindings for the Ruby language + RSVG is a renderer for Scalable Vector Graphics image files. This package + contains libraries for using RSVG with the Ruby programming language. + +Package: libgtk-mozembed-ruby +Architecture: all +Depends: libgtk-mozembed-ruby1.8, libgtk2-ruby +Description: ruby binding of GtkMozEmbed, gecko renderer + GtkMozEmbed is a Ruby binding of GtkMozEmbed, a widget embedding a + Mozilla Gecko renderer. + . + This is a dummy package depending on the library for the current default + version of Ruby. + +Package: libgtk-mozembed-ruby1.8 +Architecture: any +Depends: ${shlibs:Depends}, libgtk2-ruby1.8 +Replaces: libgtk-mozembed-ruby (<< 0.16.0) +Conflicts: libgtk-mozembed-ruby (<< 0.16.0) +Description: ruby binding of GtkMozEmbed, gecko renderer + GtkMozEmbed is a Ruby binding of GtkMozEmbed, a widget embedding a + Mozilla Gecko renderer. + +Package: libvte-ruby +Architecture: all +Depends: libvte-ruby1.8 +Description: VTE widget bindings for the Ruby language + VTE is a Ruby binding for the VTE terminal emulator widget for GTK+. + . + This is a dummy package depending on the library for the current default + version of Ruby. + +Package: libvte-ruby1.8 +Architecture: any +Depends: ${shlibs:Depends} +Replaces: libvte-ruby (<< 0.16.0) +Conflicts: libvte-ruby (<< 0.16.0) +Description: VTE widget bindings for the Ruby language + VTE is a Ruby binding for the VTE terminal emulator widget for GTK+. + +Package: libpoppler-glib-ruby +Architecture: all +Depends: libpoppler-glib-ruby1.8 +Description: Ruby bindinds for the libpoppler-glib library + Poppler is a PDF rendering library based on xpdf PDF viewer. This package + contains ruby bindings for Poppler. + . + This is a dummy package depending on the library for the current default + version of Ruby. + +Package: libpoppler-glib-ruby1.8 +Architecture: any +Depends: ${shlibs:Depends} +Description: Ruby bindinds for the libpoppler-glib library + Poppler is a PDF rendering library based on xpdf PDF viewer. This package + contains ruby bindings for Poppler. + +Package: ruby-gnome2 +Architecture: all +Depends: libgnome2-ruby, libgconf2-ruby, libglade2-ruby, libgtkhtml2-ruby, libgtkglext1-ruby, libgnomevfs2-ruby, libgtksourceview1-ruby, libpanel-applet2-ruby, libgnomeprint2-ruby, libgnomeprintui2-ruby, librsvg2-ruby, libgtk-mozembed-ruby, libvte-ruby, libart2-ruby, libatk1-ruby, libgdk-pixbuf2-ruby, libgnomecanvas2-ruby, libpango1-ruby +Description: GNOME-related bindings for the Ruby language + These bindings allow use of the GNOME developer platform using the Ruby + programming language. + . + This is an empty package that depends on the various packages that provide + the individual bindings. --- ruby-gnome2-0.16.0.orig/debian/librsvg2-ruby1.8.install +++ ruby-gnome2-0.16.0/debian/librsvg2-ruby1.8.install @@ -0,0 +1,2 @@ +usr/lib/ruby/1.8/*/rsvg2.so +usr/lib/ruby/1.8/rsvg2.rb --- ruby-gnome2-0.16.0.orig/debian/libglade2-ruby.examples +++ ruby-gnome2-0.16.0/debian/libglade2-ruby.examples @@ -0,0 +1 @@ +libglade/sample/* --- ruby-gnome2-0.16.0.orig/debian/copyright +++ ruby-gnome2-0.16.0/debian/copyright @@ -0,0 +1,15 @@ + +This package originally Debianised by Dafydd Harries , +on 13th November 2003. + +Originally obtained from . + + Copyright (c) 2002-2006 The Ruby-GNOME2 Project Team + + This program is free software. + You can distribute/modify this program under the terms of + the GNU LESSER GENERAL PUBLIC LICENSE Version 2.1. + +On Debian systems, you can find the full text of this licence in the file +/usr/share/common-licenses/LGPL-2.1. + --- ruby-gnome2-0.16.0.orig/debian/libgtk2-ruby1.8.install +++ ruby-gnome2-0.16.0/debian/libgtk2-ruby1.8.install @@ -0,0 +1,4 @@ +usr/lib/ruby/1.8/*/gtk2.so +usr/lib/ruby/1.8/*/rbgtk.h +usr/lib/ruby/1.8/gtk2/base.rb +usr/lib/ruby/1.8/gtk2.rb --- ruby-gnome2-0.16.0.orig/debian/libpanel-applet2-ruby1.8.install +++ ruby-gnome2-0.16.0/debian/libpanel-applet2-ruby1.8.install @@ -0,0 +1,2 @@ +usr/lib/ruby/1.8/*/panelapplet2.so +usr/lib/ruby/1.8/panelapplet2.rb --- ruby-gnome2-0.16.0.orig/debian/libvte-ruby1.8.install +++ ruby-gnome2-0.16.0/debian/libvte-ruby1.8.install @@ -0,0 +1,2 @@ +usr/lib/ruby/1.8/*/vte.so +usr/lib/ruby/1.8/vte.rb --- ruby-gnome2-0.16.0.orig/debian/watch +++ ruby-gnome2-0.16.0/debian/watch @@ -0,0 +1,5 @@ +version=3 +http://heanet.dl.sourceforge.net/sourceforge/ruby-gnome2/ \ + ruby-gnome2-all-(.*)\.tar\.gz \ + debian \ + uupdate --- ruby-gnome2-0.16.0.orig/debian/libgconf2-ruby1.8.install +++ ruby-gnome2-0.16.0/debian/libgconf2-ruby1.8.install @@ -0,0 +1,2 @@ +usr/lib/ruby/1.8/*/gconf2.so +usr/lib/ruby/1.8/gconf2.rb --- ruby-gnome2-0.16.0.orig/debian/libpango1-ruby.examples +++ ruby-gnome2-0.16.0/debian/libpango1-ruby.examples @@ -0,0 +1 @@ +pango/sample/* --- ruby-gnome2-0.16.0.orig/debian/libgtkhtml2-ruby.examples +++ ruby-gnome2-0.16.0/debian/libgtkhtml2-ruby.examples @@ -0,0 +1 @@ +gtkhtml2/sample/* --- ruby-gnome2-0.16.0.orig/debian/libgtk2-ruby.examples +++ ruby-gnome2-0.16.0/debian/libgtk2-ruby.examples @@ -0,0 +1 @@ +gtk/sample/* --- ruby-gnome2-0.16.0.orig/debian/libgtkglext1-ruby.examples +++ ruby-gnome2-0.16.0/debian/libgtkglext1-ruby.examples @@ -0,0 +1 @@ +gtkglext/sample/* --- ruby-gnome2-0.16.0.orig/debian/libgtkglext1-ruby1.8.install +++ ruby-gnome2-0.16.0/debian/libgtkglext1-ruby1.8.install @@ -0,0 +1,2 @@ +usr/lib/ruby/1.8/*/gtkglext.so +usr/lib/ruby/1.8/gtkglext.rb --- ruby-gnome2-0.16.0.orig/debian/libgnomeprint2-ruby1.8.install +++ ruby-gnome2-0.16.0/debian/libgnomeprint2-ruby1.8.install @@ -0,0 +1,2 @@ +usr/lib/ruby/1.8/*/gnomeprint2.so +usr/lib/ruby/1.8/gnomeprint2.rb --- ruby-gnome2-0.16.0.orig/debian/libpango1-ruby1.8.install +++ ruby-gnome2-0.16.0/debian/libpango1-ruby1.8.install @@ -0,0 +1,4 @@ +usr/lib/ruby/1.8/*/rbpangoversion.h +usr/lib/ruby/1.8/*/pango.so +usr/lib/ruby/1.8/*/rbpango.h +usr/lib/ruby/1.8/pango.rb --- ruby-gnome2-0.16.0.orig/debian/libgdk-pixbuf2-ruby1.8.install +++ ruby-gnome2-0.16.0/debian/libgdk-pixbuf2-ruby1.8.install @@ -0,0 +1,2 @@ +usr/lib/ruby/1.8/*/gdk_pixbuf2.so +usr/lib/ruby/1.8/gdk_pixbuf2.rb --- ruby-gnome2-0.16.0.orig/debian/libvte-ruby.examples +++ ruby-gnome2-0.16.0/debian/libvte-ruby.examples @@ -0,0 +1 @@ +vte/sample/* --- ruby-gnome2-0.16.0.orig/debian/libgnomecanvas2-ruby1.8.install +++ ruby-gnome2-0.16.0/debian/libgnomecanvas2-ruby1.8.install @@ -0,0 +1,2 @@ +usr/lib/ruby/1.8/*/gnomecanvas2.so +usr/lib/ruby/1.8/gnomecanvas2.rb --- ruby-gnome2-0.16.0.orig/debian/libgtkhtml2-ruby1.8.install +++ ruby-gnome2-0.16.0/debian/libgtkhtml2-ruby1.8.install @@ -0,0 +1,2 @@ +usr/lib/ruby/1.8/gtkhtml2.rb +usr/lib/ruby/1.8/*/gtkhtml2.so --- ruby-gnome2-0.16.0.orig/debian/libgnomeprint2-ruby.examples +++ ruby-gnome2-0.16.0/debian/libgnomeprint2-ruby.examples @@ -0,0 +1 @@ +gnomeprint/sample/* --- ruby-gnome2-0.16.0.orig/debian/changelog +++ ruby-gnome2-0.16.0/debian/changelog @@ -0,0 +1,436 @@ +ruby-gnome2 (0.16.0-10) unstable; urgency=high + + * Use new Homepage dpkg-tag. + * Included CVE-2007-6183.patch to fix format string vulnerability + in rbgtkmessagedialog.c which might lead to arbitrary code + execution (Closes: #453689). Thanks to Nico Golde for the fix. + + -- Arnaud Cornet Fri, 30 Nov 2007 08:57:32 +0100 + +ruby-gnome2 (0.16.0-9) unstable; urgency=low + + * Add debian/patches/poppler-0.6.patch that basically sync poppler/ with + ruby-gnome2 svn HEAD so that newer poppler are supported + (Closes: #453169). + * Actually ship libpoppler-glib-ruby packages. + + -- Arnaud Cornet Fri, 30 Nov 2007 00:28:59 +0100 + +ruby-gnome2 (0.16.0-8) unstable; urgency=low + + * Add window-warning.patch (Closes: #446602). + * Rebuild will change depend from libvte4 to libvte9 + (Closes: #444679). + + -- Arnaud Cornet Mon, 22 Oct 2007 21:33:23 +0200 + +ruby-gnome2 (0.16.0-7) unstable; urgency=low + + * Update glib2.14.patch to prevent ftbs on some 32bits archs. + + -- Arnaud Cornet Mon, 27 Aug 2007 13:36:38 +0200 + +ruby-gnome2 (0.16.0-6) unstable; urgency=low + + * Add glib22.14.patch to build against recent glibs (Closes: #439455). + * Add buildsys-abort-on-error.patch to stop building as soon as the + build of one package fails. + + -- Arnaud Cornet Sat, 25 Aug 2007 12:43:14 +0200 + +ruby-gnome2 (0.16.0-5) unstable; urgency=low + + * Pass along LDFLAGS and CFLAGS (Closes: #434451, #434501). + * Update my mail adress. + + -- Arnaud Cornet Mon, 20 Aug 2007 14:34:21 +0200 + +ruby-gnome2 (0.16.0-4) unstable; urgency=low + + * Add libglade2-nil-source.patch (Closes: #428680). + + -- Arnaud Cornet Mon, 09 Jul 2007 10:33:40 +0200 + +ruby-gnome2 (0.16.0-3) unstable; urgency=low + + * Move mkmf-gnome2.rb back in libglib2-ruby1.8, add pkg-config.rb in + libglib2-ruby1.8 (Closes: #427992). + + -- Arnaud Cornet Wed, 06 Jun 2007 11:46:52 +0200 + +ruby-gnome2 (0.16.0-2) unstable; urgency=low + + [ Paul van Tilburg ] + * Changed all packages to priority 'optional'. Never knew why + it was 'extra', really. + + [ Arnaud Cornet ] + * Add some conflicts/depends to allow proper replacement of older + ruby-gnome2. (Closes: #426497, #426498, #426499, #426500). + * Indent "Homepage" line properly in control file. + + [ Paul van Tilburg ] + * Added more conflicts/depends, one for every lib-ruby package that + existed before 0.16.0 and is now replaced by a lib-ruby1.8 package. + * Remove suggest on libgnome2-ruby for libglade2-ruby1.8, only the + dummy packages should do this. + * Removed the unnecessary build-depend on libgstreamer-plugins0.8-dev. + * Added missing depend on libgtk2-ruby, required by libgtk-mozembed-ruby. + (Closes: #407374.) + * Added patch data-from-selection by Philipp Kern to enable reading + the data out of the selection. (Closes: #383309.) + + -- Paul van Tilburg Wed, 30 May 2007 22:09:15 +0200 + +ruby-gnome2 (0.16.0-1) unstable; urgency=low + + [ Arnaud Cornet ] + * New upstream release (Closes: #405434). + * CDBSize. Use team class. + * Have -ruby1.8 packages. + * Remove patches/references-fixes.patch which is merged upstream. + * Remove gtkmozembed-extconf.patch, xulrunner is supported upstream. + * Remove command-line-args.patch now upstream. + * Refreshed other patches that applied without modification. + * Set paul and me as maintainers. + * Format the Homepage entry correctly. + * Removed ruby-gstreamer0.8 (Closes: #422850). + * Remove libgda2-ruby* packages. + * Drop README.Debian now that we don't compress .rb files. + * Do not use the uploaders rules anymore. + * Stricter vte build-dep (Closes: #384992). + + [ Paul van Tilburg ] + * Added build-depends on cdbs and ruby-pkg-tools. + * Added replace and conflicts for libgtk-trayicon-ruby{,1.8} + now implemented by libgtk-ruby{,1.8}. + * Added a README.Debian file for libgtk2-ruby, explaining the + transition from libgtk-trayicon-ruby. + * Moved the examples from the -ruby1.8 to the -ruby packages. + * This release, actually several upstream releases before this + one, closes: #338869, #338871. + * Use the build-depend on libpng12-dev instead of libpng-dev. + + [ Arnaud Cornet ] + * Create a shebang patch to shut lintian up. + * Add gtkmozembed-rpath patch, fix rpath in libgtk-mozembed shared + object. + + [ Paul van Tilburg ] + * Made myself a co-maintainer (added myself to Uploaders). + + -- Paul van Tilburg Thu, 24 May 2007 23:09:52 +0200 + +ruby-gnome2 (0.15.0-1.1) unstable; urgency=medium + + * Non-maintainer upload to fix backwards compatibility problem. + * Added debian/patches/command-line-args.patch, taken from upstream's CVS, + as suggested by Markus Koller. (Closes: #384756). + + -- Margarita Manterola Sat, 9 Sep 2006 18:04:44 -0300 + +ruby-gnome2 (0.15.0-1) unstable; urgency=low + + [Dafydd Harries] + + * New upstream release. + - Adds bindings for poppler, vte, and gtkmozembed. + * Update standards version. + * Add libvte-ruby, libgtk-mozembed-ruby. Leave libpoppler out for now as it + requires newer version of libpoppler than is in unstable. + * The GtkMozEmbed binding was previously in a separate package; add + corresponding provides/conflicts lines. Closes: #368742, #368744. + * Add build-deps: pkg-config, libxul-dev, libvte-dev, quilt. + * Pass --strict to extconf.rb. + * Patch extconf.rb to exit(1) if child extconf.rb call fails in strict + mode. + * Add patch from Philipp Kern to enable tree view drag+drop. Closes: #383309. + + [Sjoerd Simons] + + * Use quilt as patch system. + * debian/patches/gtkmozembed-extconf.patch: + - Added. Don't use strange linker and compiler flags, they aren't needed + for xulrunner. + * debian/patches/references_fixes.patch + - Added. Fix references from container to child widgets in several places. + Fixes issue where a closure is called after it was destroyed (From + upstream CVS) + * Update the years in the Copyright file. + * Don't copy COPYING file with examples. + + -- Dafydd Harries Sun, 20 Aug 2006 15:22:05 +0100 + +ruby-gnome2 (0.14.1-1.1) unstable; urgency=low + + * NMU for enabling Cairo support now that it is possible (temporarily + taking care of this package). + * Added build-depends and depends on libcairo-ruby. + + -- Paul van Tilburg Thu, 2 Feb 2006 22:45:58 +0000 + +ruby-gnome2 (0.14.1-1) unstable; urgency=low + + * New upstream release. + * Fixes a bug where Gdk::Display#close causes a segfault. Closes: #323622. + * Use --strict argument to exec_make.rb when installing in addition to when + building, in order that installation errors be propagated. + * Adjust paths passed to make invocation to cope with what seems to be a + change in mkmf behaviour. + * Apply a workaround for a crash that occurs due to duplicate type + registration if the GnomeCanvas binding is built against a canvas earlier + than 2.12 but runs with a canvas later than 2.12. + * If the (currently unpackaged) gtkmozembed's binding's extconf.rb doesn't + find the stuff it wants to build, it won't generate a Makefile that will + clean up gtkmozembed/. Hence, clean up gtkmozembed/mkmf.log manually. + + -- Dafydd Harries Fri, 18 Nov 2005 15:38:29 +0000 + +ruby-gnome2 (0.13.0-2) unstable; urgency=low + + * Change libgstreamer0.8-dev build dependency to libgstreamer-plugins0.8-dev + in order to enable full GStreamer support. Closes: #322681. + + -- Dafydd Harries Fri, 12 Aug 2005 10:30:50 +0100 + +ruby-gnome2 (0.13.0-1) unstable; urgency=low + + * New upstream release. + + -- Dafydd Harries Sun, 31 Jul 2005 16:05:36 +0100 + +ruby-gnome2 (0.12.0-2) unstable; urgency=low + + * Rebuild in order to update the libgda shared library dependency. Update + the versioned build dependency on libgda-dev accordingly. + + -- Dafydd Harries Sun, 10 Apr 2005 01:51:36 +0100 + +ruby-gnome2 (0.12.0-1) unstable; urgency=low + + * New upstream release. Closes: #298395. + * This release should fix the problems with entry completion. + Closes: #293425. + + -- Dafydd Harries Wed, 9 Mar 2005 00:59:16 +0000 + +ruby-gnome2 (0.11.0-3) unstable; urgency=low + + * Apply Andreas Jochens' patch to fix a compilation problem with GCC 4.0. + Closes: #289710. + * Apply upstream fix from CVS for problems loading files with non-Unicode + encodings. Closes: #290445. + * Make libglade2-ruby depend on REXML, because ruby-glade-create-template + needs it. Closes: #291915. + + -- Dafydd Harries Sun, 23 Jan 2005 23:08:50 +0000 + +ruby-gnome2 (0.11.0-2) unstable; urgency=low + + * Make the ruby-gnome2 package depend on the panel applet and GtkSourceView + bindings. + * Use the --strict argument to exec_make.rb. + + -- Dafydd Harries Sun, 2 Jan 2005 17:25:48 +0000 + +ruby-gnome2 (0.11.0-1) unstable; urgency=low + + * New upstream release. + * New bindings: GnomePrint, GnomePrintUI, RSVG. + + -- Dafydd Harries Wed, 17 Nov 2004 00:42:17 -0500 + +ruby-gnome2 (0.10.1-1) unstable; urgency=low + + * New upstream release. Closes: #271794. + * New GtkSourceView and GNOME panel applet bindings: + - Add build dependencies on libgtksourceview-dev and libpanel-applet2-dev. + * GStreamer binding is now for 0.8: + - Remove libgstreamer0.6-ruby package. + - Add libstreamer0.8-ruby package, which conflicts with the old one. + - Update GStreamer build-dependency. + * Call ruby1.8 rather than ruby in debian/rules and add a build-dependency + on ruby1.8. + * Add a watch file. + + -- Dafydd Harries Mon, 20 Sep 2004 23:45:49 +0100 + +ruby-gnome2 (0.9.1-2) unstable; urgency=low + + * Change package section to "libs", which seems more appropriate. + * Add build-dependency on libxmu-dev, which appears to be necessary for + building the gtkglext binding if certain set of alternative dependencies + are installed. Fixes a FTBFS. Closes: #249103. + + -- Dafydd Harries Tue, 18 May 2004 12:49:12 +0100 + +ruby-gnome2 (0.9.1-1) unstable; urgency=low + + * New upstream release. + * Gda::Provider#model is now commented out in upstream. + - Patching libgda/src/rbgdaprovider.c is no longer necessary. + - Update README.Debian to reflect this. + * Patch for exec_make.rb to give appropriate return value on error has been + integrated upstream. + * debian/rules: Various files are now cleaned by upstream makefiles. + - Cleaning them here is no longer necessary. + - Use "distclean" rather than "clean". + + -- Dafydd Harries Sun, 14 Mar 2004 20:55:21 +0000 + +ruby-gnome2 (0.9.0-4) unstable; urgency=low + + * debian/rules: Remove redundant cleaning, clean atk/src/rbatkinits.c + + -- Dafydd Harries Sat, 13 Mar 2004 02:42:15 +0000 + +ruby-gnome2 (0.9.0-3) unstable; urgency=low + + * debian/control: Add missing '}'. Whoops. + + -- Dafydd Harries Tue, 9 Mar 2004 08:01:35 +0000 + +ruby-gnome2 (0.9.0-2) unstable; urgency=low + + * I forgot to actually add a build-dependency on libatk1.0-dev. But that's + all right, because libgnomeui-dev depends on it (indirectly) anyhow. + * debian/control: Make ruby-gnome2 depend on libgtkglext1, and tidy up the + description. + + -- Dafydd Harries Mon, 8 Mar 2004 14:30:18 +0000 + +ruby-gnome2 (0.9.0-1) unstable; urgency=low + + * New upstream release. + * New binding for atk: + - debian/rules: Add rule generation for atk. + - debian/control: + - Add build-depends on libatk1.0-dev. + - Add stanza for libatk1-ruby. + - libgtk2-ruby: Add dependency on libatk1-ruby. + * libgda/src/rbgdaquarklist.c: Uncomment Gda::QuarkList#clear, since it + seems that gda_quark_list_clear() has appeared in a libgda release. + gda_config_get_provider_model() is not yet available though, so + Gda::Provider#model is still commented out. + * Add new debian/README.Debian: + - Note that Gda::Provider#model is disabled. + - Explain that the examples are compressed, and give an example of how + they might be decompressed. + - debian/rules: Install README.Debian in each package. + * Remove .cvsignore from upstream tarball. + * Make examples in upstream tarball non-executable. + + -- Dafydd Harries Mon, 8 Mar 2004 13:51:55 +0000 + +ruby-gnome2 (0.8.1-9) unstable; urgency=low + + * rbogl has been packaged (as libopengl-ruby), so enable the gtkglext + binding: + - extconf.rb: Re-enable gtkglext configration. + - debian/rules: Uncomment rule generation and cleaning for gtkglext. + - debian/control: New binary package libgtkglext1-ruby. + + -- Dafydd Harries Fri, 5 Mar 2004 22:54:50 +0000 + +ruby-gnome2 (0.8.1-8) unstable; urgency=low + + * debian/rules, debian/control: Rename libpango-ruby to libpango1-ruby to + match the other packages. + + -- Dafydd Harries Tue, 10 Feb 2004 15:10:47 +0000 + +ruby-gnome2 (0.8.1-7) unstable; urgency=low + + * debian/rules: Seems the example tarball wasn't such a great idea. Return + to dh_installexamples and request forgiveness. + * Moltes gràcies once again to Jordi Mallach. + + -- Dafydd Harries Tue, 10 Feb 2004 00:18:47 +0000 + +ruby-gnome2 (0.8.1-6) unstable; urgency=low + + * debian/rules: clean: Run dh_testroot. + * debian/rules: clean: Call rm -f *-stamp early, as dictated by policy. + * debian/rules: Automatically generate dependencies for build, install and + binary-arch. + * debian/rules: Add some more comments. + * debian/rules: binary-*: Build tarballs of examples. Example files + generally depend on each other, so it doesn't make sense to have them + individually compressed. + * debian/rules: clean: Remove example tarballs. + * debian/control: Make the build dependency on libgda2-dev require >= 1.0.2. + * debian/rules: clean: Automatically generate the list of directories to + clean. + * extconf.rb: Don't try and configure gtkglext. + * debian/rules: clean: Don't try and clean gtkglext. + * debian/rules: binary-*: Fix usage of dh_installchangelogs; install NEWS + via dh_installdocs. + * debian/rules: Put dependency on libpng-dev back in. (Necessity indicated + by use of pbuilder.) + + -- Dafydd Harries Sun, 8 Feb 2004 05:12:05 +0000 + +ruby-gnome2 (0.8.1-5) unstable; urgency=low + + * debian/rules: Use dh_fixperms. + * debian/rules: dh_fixperms doesn't touch examples, so manually change + permissions of example files to 644. + * Thanks again to Jordi Mallach. + + -- Dafydd Harries Wed, 28 Jan 2004 20:20:19 +0000 + +ruby-gnome2 (0.8.1-4) unstable; urgency=low + + * debian/control: Simplify Build-Depends. + * Many thanks to Jordi Mallach. + + -- Dafydd Harries Mon, 26 Jan 2004 16:10:50 +0000 + +ruby-gnome2 (0.8.1-3) unstable; urgency=low + + * debian/control: Make libgtk2-ruby depend on libgdk-pixbuf2-ruby. + * debian/rules: Redesign. Now smaller and tidier, and allows building + individual packages easily. + + -- Dafydd Harries Sun, 18 Jan 2004 17:06:29 +0000 + +ruby-gnome2 (0.8.1-2) unstable; urgency=low + + * Remove "1.8" suffixes. I don't think they're necessary. + * Don't try to build gtkglext. + * Problems discovered while pbuilding: + - Build-Depend on ruby (>> 1.8) rather than ruby1.8 + - Build-Depend on libpng-dev + + -- Dafydd Harries Tue, 13 Jan 2004 19:01:37 +0000 + +ruby-gnome2 (0.8.1-1) unstable; urgency=low + + * New upstream version. + * New email address. + * Use shlib:Depends. + * Enable building libgda binding, as there's a new version of libgda2 which + the binding now workds with. + * Change the libglade binding's dependency on ruby1.8 to ruby (>> 1.8) in + order to keep lintian happy. + * Add ruby-gnome2 metapackage. + * Use debian/compat instead of DH_COMPAT. + * Comment out Gda::QuarkList#clear and Gda::Provider#model -- they're not + defined in stable libgda yet. + + -- Dafydd Harries Thu, 8 Jan 2004 14:30:42 +0000 + +ruby-gnome2 (0.8.0-1) unstable; urgency=low + + * New upstream version. + * The new libgda binding is disabled: it needs some code from CVS to build. + * The gtkglext binding is disabled: rbogl has not been packaged yet. + + -- Dafydd Harries Mon, 17 Nov 2003 05:08:51 +0000 + +ruby-gnome2 (0.7.0-0.1) unstable; urgency=low + + * Initial Debianification. + + -- Dafydd Harries Thu, 13 Nov 2003 18:12:40 +0000 + --- ruby-gnome2-0.16.0.orig/debian/libpoppler-glib-ruby1.8.install +++ ruby-gnome2-0.16.0/debian/libpoppler-glib-ruby1.8.install @@ -0,0 +1,2 @@ +usr/lib/ruby/1.8/*/poppler.so +usr/lib/ruby/1.8/poppler.rb --- ruby-gnome2-0.16.0.orig/debian/libart2-ruby1.8.install +++ ruby-gnome2-0.16.0/debian/libart2-ruby1.8.install @@ -0,0 +1,2 @@ +usr/lib/ruby/1.8/*/libart2.so +usr/lib/ruby/1.8/*/rbart.h --- ruby-gnome2-0.16.0.orig/debian/libart2-ruby.examples +++ ruby-gnome2-0.16.0/debian/libart2-ruby.examples @@ -0,0 +1 @@ +libart/sample/* --- ruby-gnome2-0.16.0.orig/debian/libglib2-ruby1.8.install +++ ruby-gnome2-0.16.0/debian/libglib2-ruby1.8.install @@ -0,0 +1,8 @@ +usr/lib/ruby/1.8/*/glib2.so +usr/lib/ruby/1.8/*/rbgutil.h +usr/lib/ruby/1.8/*/rbglib.h +usr/lib/ruby/1.8/*/rbgobject.h +usr/lib/ruby/1.8/glib2.rb +usr/lib/ruby/1.8/glib-mkenums.rb +usr/lib/ruby/1.8/mkmf-gnome2.rb +usr/lib/ruby/1.8/pkg-config.rb --- ruby-gnome2-0.16.0.orig/debian/libgnome2-ruby1.8.install +++ ruby-gnome2-0.16.0/debian/libgnome2-ruby1.8.install @@ -0,0 +1,2 @@ +usr/lib/ruby/1.8/*/gnome2.so +usr/lib/ruby/1.8/gnome2.rb --- ruby-gnome2-0.16.0.orig/debian/libatk1-ruby1.8.install +++ ruby-gnome2-0.16.0/debian/libatk1-ruby1.8.install @@ -0,0 +1,4 @@ +usr/lib/ruby/1.8/*/atk.so +usr/lib/ruby/1.8/*/rbatk.h +usr/lib/ruby/1.8/*/rbatkversion.h +usr/lib/ruby/1.8/atk.rb --- ruby-gnome2-0.16.0.orig/debian/libgnomeprintui2-ruby.examples +++ ruby-gnome2-0.16.0/debian/libgnomeprintui2-ruby.examples @@ -0,0 +1 @@ +gnomeprintui/sample/* --- ruby-gnome2-0.16.0.orig/debian/compat +++ ruby-gnome2-0.16.0/debian/compat @@ -0,0 +1 @@ +4 --- ruby-gnome2-0.16.0.orig/debian/libgnomevfs2-ruby1.8.install +++ ruby-gnome2-0.16.0/debian/libgnomevfs2-ruby1.8.install @@ -0,0 +1,2 @@ +usr/lib/ruby/1.8/*/gnomevfs.so +usr/lib/ruby/1.8/gnomevfs.rb --- ruby-gnome2-0.16.0.orig/debian/ruby-glade-create-template.1 +++ ruby-gnome2-0.16.0/debian/ruby-glade-create-template.1 @@ -0,0 +1,35 @@ +.\" First parameter, NAME, should be all caps +.\" Second parameter, SECTION, should be 1-8, maybe w/ subsection +.\" other parameters are allowed: see man(7), man(1) +.TH RUBY-GLADE-CREATE-TEMPLATE 1 "November 18, 2003" +.\" Please adjust this date whenever revising the manpage. +.\" +.\" Some roff macros, for reference: +.\" .nh disable hyphenation +.\" .hy enable hyphenation +.\" .ad l left justify +.\" .ad b justify to both left and right margins +.\" .nf disable filling +.\" .fi enable filling +.\" .br insert line break +.\" .sp insert n+1 empty lines +.\" for manpage-specific macros, see man(7) +.SH NAME +ruby-glade-create-template \- generate template ruby code from a glade file +.SH SYNOPSIS +.B ruby-glade-create-template +.RI file.glade +.br +.SH DESCRIPTION +This manual page documents briefly the ruby-glade-create-template command. +.PP +The manual page was written for the Debian distribution because the original +program does not have a manual page. +.PP +ruby-glade-create template is a simple program for converting a Glade user +interface description file into a corresponding Ruby code template. The glade +file is given as an argument, and the Ruby code is printed on the standard +output. +.SH AUTHOR +This manual page was written by Dafydd Harries , +for the Debian project (but may be used by others). --- ruby-gnome2-0.16.0.orig/debian/libgtk-mozembed-ruby.examples +++ ruby-gnome2-0.16.0/debian/libgtk-mozembed-ruby.examples @@ -0,0 +1,2 @@ +gtkmozembed/sample/*.rb +gtkmozembed/sample/README --- ruby-gnome2-0.16.0.orig/debian/libgdk-pixbuf2-ruby.examples +++ ruby-gnome2-0.16.0/debian/libgdk-pixbuf2-ruby.examples @@ -0,0 +1 @@ +gdkpixbuf/sample/* --- ruby-gnome2-0.16.0.orig/debian/libgnomeprintui2-ruby1.8.install +++ ruby-gnome2-0.16.0/debian/libgnomeprintui2-ruby1.8.install @@ -0,0 +1,2 @@ +usr/lib/ruby/1.8/*/gnomeprintui2.so +usr/lib/ruby/1.8/gnomeprintui2.rb --- ruby-gnome2-0.16.0.orig/debian/libgnome2-ruby.examples +++ ruby-gnome2-0.16.0/debian/libgnome2-ruby.examples @@ -0,0 +1 @@ +gnome/sample --- ruby-gnome2-0.16.0.orig/debian/libglib2-ruby.examples +++ ruby-gnome2-0.16.0/debian/libglib2-ruby.examples @@ -0,0 +1 @@ +glib/sample/* --- ruby-gnome2-0.16.0.orig/debian/libgtk-mozembed-ruby1.8.install +++ ruby-gnome2-0.16.0/debian/libgtk-mozembed-ruby1.8.install @@ -0,0 +1,2 @@ +usr/lib/ruby/1.8/*/gtkmozembed.so +usr/lib/ruby/1.8/gtkmozembed.rb --- ruby-gnome2-0.16.0.orig/debian/libglade2-ruby1.8.install +++ ruby-gnome2-0.16.0/debian/libglade2-ruby1.8.install @@ -0,0 +1,3 @@ +usr/lib/ruby/1.8/libglade2.rb +usr/bin/ruby-glade-create-template +usr/lib/ruby/1.8/*/libglade2.so --- ruby-gnome2-0.16.0.orig/debian/libgconf2-ruby.examples +++ ruby-gnome2-0.16.0/debian/libgconf2-ruby.examples @@ -0,0 +1 @@ +gconf/sample/* --- ruby-gnome2-0.16.0.orig/debian/libpoppler-glib-ruby.examples +++ ruby-gnome2-0.16.0/debian/libpoppler-glib-ruby.examples @@ -0,0 +1 @@ +poppler/sample/* --- ruby-gnome2-0.16.0.orig/debian/patches/poppler-0.6.patch +++ ruby-gnome2-0.16.0/debian/patches/poppler-0.6.patch @@ -0,0 +1,1592 @@ +Index: ruby-gnome2/poppler/sample/pdf2svg.rb +=================================================================== +--- ruby-gnome2/poppler/sample/pdf2svg.rb (révision 0) ++++ ruby-gnome2/poppler/sample/pdf2svg.rb (révision 2723) +@@ -0,0 +1,26 @@ ++#!/usr/bin/env ruby ++ ++require "poppler" ++ ++if ARGV.size < 1 ++ puts "usage: #{$0} input.pdf" ++ exit(-1) ++end ++ ++input, = ARGV ++ ++output = input.sub(/\..+$/, ".svg") ++output = "#{output}.svg" if input == output ++ ++doc = Poppler::Document.new(input) ++ ++width, height = doc.pages[0].size ++Cairo::SVGSurface.new(output, width, height) do |surface| ++ surface.restrict_to_version("1_2") ++ ++ context = Cairo::Context.new(surface) ++ doc.each do |page| ++ page.render(context) ++ context.show_page ++ end ++end + +Modification de propriétés sur ruby-gnome2/poppler/sample/pdf2svg.rb +___________________________________________________________________ +Nom : svn:executable + + * + +Index: ruby-gnome2/poppler/sample/pdf2text.rb +=================================================================== +--- ruby-gnome2/poppler/sample/pdf2text.rb (révision 2347) ++++ ruby-gnome2/poppler/sample/pdf2text.rb (copie de travail) +@@ -12,7 +12,5 @@ + + doc = Poppler::Document.new(input_uri) + doc.each do |page| +- width, height = page.size +- rectangle = Poppler::Rectangle.new(0, 0, width, height) +- puts page.get_text(rectangle) ++ puts page.get_text + end +Index: ruby-gnome2/poppler/sample/pdf2.rb +=================================================================== +--- ruby-gnome2/poppler/sample/pdf2.rb (révision 2347) ++++ ruby-gnome2/poppler/sample/pdf2.rb (copie de travail) +@@ -9,7 +9,6 @@ + end + + input, output, scale, rotate = ARGV +-input_uri = "file://#{File.expand_path(input)}" + scale = (scale || 1.0).to_f + rotate = (rotate || 0).to_i % 360 + +@@ -95,9 +94,9 @@ + + if Poppler.cairo_available? + puts "using cairo..." +- pixbuf = to_pixbuf_with_cairo(input_uri, scale, rotate) ++ pixbuf = to_pixbuf_with_cairo(input, scale, rotate) + else +- pixbuf = to_pixbuf(input_uri, scale, rotate) ++ pixbuf = to_pixbuf(input, scale, rotate) + end + + if pixbuf.nil? +Index: ruby-gnome2/poppler/ChangeLog +=================================================================== +--- ruby-gnome2/poppler/ChangeLog (révision 2347) ++++ ruby-gnome2/poppler/ChangeLog (copie de travail) +@@ -1,3 +1,95 @@ ++2007-11-11 Kouhei Sutou ++ ++ * README: updated supported poppler-glib version: 0.5.2 - 0.6.2. ++ ++2007-10-20 Kouhei Sutou ++ ++ * sample/pdf2.rb: removed needless filename -> URI conversion. ++ ++ * sample/pdf2svg.rb: added a new example that convert PDF to SVG. ++ ++2007-10-13 Kouhei Sutou ++ ++ * src/: used POPPLER_CHECK_VERSION(0, 6, 0) not ++ POPPLER_CHECK_VERSION(0, 5, 9). ++ ++ * README: updated supported poppler-glib version: 0.5.2 - 0.6.1. ++ ++ * src/rbpoppler-document.c: ++ - used RVAL2DOC() not RVAL2GOBJ(). ++ - supported 0.6.0. ++ ++ * src/rbpoppler-attachment.c: supported 0.6.0. ++ ++2007-09-09 Kouhei Sutou ++ ++ * src/rbpoppler-page.c: supported 0.6.0. Bug 1790607. ++ ++2007-07-27 Kouhei Sutou ++ ++ * src/rbpoppler.h, src/rbpoppler-page.c: worked with poppler < ++ 0.5.9 again. ++ ++ * src/rbpoppler-document.c: used POPPLER_CHECK_VERSION(0, 5, 9) ++ instead of HAVE_POPPLER_FONT_INFO because my patch is accepted by ++ upstream. ++ ++ * src/rbpoppler.c, src/rbpoppler-page.c: don't show ++ poppler_form_field_get_field_type(). ++ ++ * src/lib/poppler.rb, src/rbpoppler.h, src/rbpoppler-page.c: ++ followed the recent poppler form API changes but not tested ++ because I don't have a PDF with form... ++ ++2007-07-13 Guillaume Cottenceau ++ ++ * src/rbpoppler-document.c, src/rbpoppler-page.c: replace RTEST ++ uses by RVAL2CBOOL ++ ++2007-07-13 Guillaume Cottenceau ++ ++ * src/rbpoppler-document.c: "? Qtrue : QFalse" => CBOOL2RVAL ++ cleanup ++ ++2007-06-23 Kouhei Sutou ++ ++ * src/rbpoppler.h, src/rbpoppler-page.c: followed new functions ++ and types in poppler-page.h. But this is not enough. We need more ++ works. ++ ++ * src/rbpoppler-document.c, src/lib/poppler.rb: supported ++ Poppler::Document.new(pdf_data). ++ ++ * src/rbpoppler.h (SELSTYLE2RVAL, RVAL2SELSTYLE): added. ++ ++ * src/rbpoppler-page.c: followed API changes of ++ poppler_page_render_selection() family at 0.5.9. ++ ++ * src/rbpoppler.c: added enum types appeared at 0.5.9. ++ ++ * src/rbpoppler-action.c, src/rbpoppler-document.c: removed ++ needless variables. ++ ++2007-04-07 Kouhei Sutou ++ ++ * src/rbpoppler-document.c (Poppler::Document#size): added a ++ convenient alias of Poppler::Document#n_pages. ++ ++ * src/rbpoppler-document.c (doc_initialize): accepted not only URI ++ but also file name. ++ ++ * src/lib/poppler.rb (Poppler::Document#ensure_uri): added. ++ ++2007-03-29 Kouhei Sutou ++ ++ * src/rbpoppler-document.c: added a convenient alias: ++ Poppler::Document#pages. ++ ++ * sample/pdf2text.rb: used default value. ++ ++ * src/rbpoppler-page.c (page_get_text): used page size rectangle ++ as default value. ++ + 2006-09-06 Kouhei Sutou + + * src/rbpoppler-action.c: +Index: ruby-gnome2/poppler/src/rbpoppler-page.c +=================================================================== +--- ruby-gnome2/poppler/src/rbpoppler-page.c (révision 2347) ++++ ruby-gnome2/poppler/src/rbpoppler-page.c (copie de travail) +@@ -4,7 +4,7 @@ + rbpoppler-page.c - + + $Author: ktou $ +- $Date: 2006/09/06 02:25:35 $ ++ $Date: 2007/10/13 05:56:39 $ + + Copyright (C) 2006 Ruby-GNOME2 Project Team + +@@ -12,16 +12,39 @@ + + #include "rbpoppler.h" + ++#define SELF(self) (POPPLER_PAGE(RVAL2GOBJ(self))) + #define RVAL2LM(obj) ((PopplerLinkMapping *)RVAL2BOXED(obj, POPPLER_TYPE_LINK_MAPPING)) ++#define RVAL2IM(obj) ((PopplerImageMapping *)RVAL2BOXED(obj, POPPLER_TYPE_IMAGE_MAPPING)) ++#define RVAL2FFM(obj) ((PopplerFormFieldMapping *)RVAL2BOXED(obj, POPPLER_TYPE_FORM_FIELD_MAPPING)) ++#define RVAL2FF(obj) (POPPLER_FORM_FIELD(RVAL2GOBJ(obj))) ++#define RVAL2TF(obj) RVAL2FF(obj) ++#define RVAL2BF(obj) RVAL2FF(obj) ++#define RVAL2CF(obj) RVAL2FF(obj) + +-static VALUE cPSFile; ++#define TT2RVAL(obj) (GENUM2RVAL(obj, POPPLER_TYPE_PAGE_TRANSITION_TYPE)) ++#define RVAL2TT(obj) (RVAL2GENUM(obj, POPPLER_TYPE_PAGE_TRANSITION_TYPE)) ++#define TA2RVAL(obj) (GENUM2RVAL(obj, POPPLER_TYPE_PAGE_TRANSITION_ALIGNMENT)) ++#define RVAL2TA(obj) (RVAL2GENUM(obj, POPPLER_TYPE_PAGE_TRANSITION_ALIGNMENT)) ++#define TD2RVAL(obj) (GENUM2RVAL(obj, POPPLER_TYPE_PAGE_TRANSITION_DIRECTION)) ++#define RVAL2TD(obj) (RVAL2GENUM(obj, POPPLER_TYPE_PAGE_TRANSITION_DIRECTION)) ++#define FFT2RVAL(obj) (GENUM2RVAL(obj, POPPLER_TYPE_FORM_FIELD_TYPE)) ++#define RVAL2FFT(obj) (RVAL2GENUM(obj, POPPLER_TYPE_FORM_FIELD_TYPE)) ++#define FBT2RVAL(obj) (GENUM2RVAL(obj, POPPLER_TYPE_FORM_BUTTON_TYPE)) ++#define FTT2RVAL(obj) (GENUM2RVAL(obj, POPPLER_TYPE_FORM_TEXT_TYPE)) ++#define FCT2RVAL(obj) (GENUM2RVAL(obj, POPPLER_TYPE_FORM_CHOICE_TYPE)) + ++static VALUE cPSFile, cRectangle; ++ ++#if POPPLER_CHECK_VERSION(0, 6, 0) ++VALUE cUnknownField, cTextField, cButtonField, cChoiceField, cSignatureField; ++#endif ++ + static VALUE + page_render_to_pixbuf(VALUE self, VALUE src_x, VALUE src_y, VALUE src_width, + VALUE src_height, VALUE scale, VALUE rotation, + VALUE pixbuf) + { +- poppler_page_render_to_pixbuf(RVAL2GOBJ(self), NUM2INT(src_x), ++ poppler_page_render_to_pixbuf(SELF(self), NUM2INT(src_x), + NUM2INT(src_y), NUM2INT(src_width), + NUM2INT(src_height), NUM2DBL(scale), + NUM2INT(rotation), RVAL2GOBJ(pixbuf)); +@@ -32,7 +55,7 @@ + static VALUE + page_render(VALUE self, VALUE cairo) + { +- poppler_page_render(RVAL2GOBJ(self), RVAL2CRCONTEXT(cairo)); ++ poppler_page_render(SELF(self), RVAL2CRCONTEXT(cairo)); + return Qnil; + } + #endif +@@ -40,7 +63,7 @@ + static VALUE + page_render_to_ps(VALUE self, VALUE ps_file) + { +- poppler_page_render_to_ps(RVAL2GOBJ(self), RVAL2GOBJ(ps_file)); ++ poppler_page_render_to_ps(SELF(self), RVAL2GOBJ(ps_file)); + return Qnil; + } + +@@ -48,7 +71,7 @@ + page_render_generic(int argc, VALUE *argv, VALUE self) + { + if (argc == 1) { +- if (RTEST(rb_obj_is_kind_of(argv[0], cPSFile))) { ++ if (RVAL2CBOOL(rb_obj_is_kind_of(argv[0], cPSFile))) { + return page_render_to_ps(self, argv[0]); + } else { + #ifdef RB_POPPLER_CAIRO_AVAILABLE +@@ -70,20 +93,34 @@ + page_get_size(VALUE self) + { + double width, height; +- poppler_page_get_size(RVAL2GOBJ(self), &width, &height); ++ poppler_page_get_size(SELF(self), &width, &height); + return rb_ary_new3(2, rb_float_new(width), rb_float_new(height)); + } + + static VALUE + page_get_index(VALUE self) + { +- return INT2NUM(poppler_page_get_index(RVAL2GOBJ(self))); ++ return INT2NUM(poppler_page_get_index(SELF(self))); + } + ++#if POPPLER_CHECK_VERSION(0, 6, 0) + static VALUE ++page_get_duration(VALUE self) ++{ ++ return rb_float_new(poppler_page_get_duration(SELF(self))); ++} ++ ++static VALUE ++page_get_transition(VALUE self) ++{ ++ return TRANS2RVAL(poppler_page_get_transition(SELF(self))); ++} ++#endif ++ ++static VALUE + page_get_thumbnail(VALUE self) + { +- return GOBJ2RVAL(poppler_page_get_thumbnail(RVAL2GOBJ(self))); ++ return GOBJ2RVAL(poppler_page_get_thumbnail(SELF(self))); + } + + static VALUE +@@ -91,7 +128,7 @@ + { + int width, height; + +- if (poppler_page_get_thumbnail_size(RVAL2GOBJ(self), &width, &height)) ++ if (poppler_page_get_thumbnail_size(SELF(self), &width, &height)) + return rb_ary_new3(2, INT2NUM(width), INT2NUM(height)); + else + return Qnil; +@@ -100,17 +137,60 @@ + static VALUE + page_find_text(VALUE self, VALUE text) + { +- return GLIST2ARY2F(poppler_page_find_text(RVAL2GOBJ(self), RVAL2CSTR(text)), ++ return GLIST2ARY2F(poppler_page_find_text(SELF(self), RVAL2CSTR(text)), + POPPLER_TYPE_RECTANGLE); + } + + static VALUE +-page_get_text(VALUE self, VALUE rect) ++page_get_text(int argc, VALUE *argv, VALUE self) + { + gchar *text; +- VALUE rb_text; ++#if POPPLER_CHECK_VERSION(0, 6, 0) ++ PopplerSelectionStyle style = POPPLER_SELECTION_GLYPH; ++#endif ++ VALUE rb_text, arg1, arg2, rb_rect; ++ PopplerPage *page; + +- text = poppler_page_get_text(RVAL2GOBJ(self), RVAL2RECT(rect)); ++ rb_scan_args(argc, argv, "02", &arg1, &arg2); ++ ++ page = SELF(self); ++ if (NIL_P(arg1)) { ++ rb_rect = arg2; ++ } else { ++ if (RTEST(rb_obj_is_kind_of(arg2, cRectangle))) { ++ rb_rect = arg2; ++ } else { ++ rb_rect = Qnil; ++#if POPPLER_CHECK_VERSION(0, 6, 0) ++ if (!NIL_P(arg2)) { ++ style = RVAL2SELSTYLE(arg2); ++ } ++#endif ++ } ++ } ++ ++ if (NIL_P(rb_rect)) { ++ PopplerRectangle rect; ++ double width, height; ++ ++ rect.x1 = 0; ++ rect.y1 = 0; ++ poppler_page_get_size(page, &width, &height); ++ rect.x2 = width; ++ rect.y2 = height; ++ text = poppler_page_get_text(page, ++#if POPPLER_CHECK_VERSION(0, 6, 0) ++ style, ++#endif ++ &rect); ++ } else { ++ text = poppler_page_get_text(page, ++#if POPPLER_CHECK_VERSION(0, 6, 0) ++ style, ++#endif ++ RVAL2RECT(rb_rect)); ++ } ++ + rb_text = CSTR2RVAL(text); + g_free(text); + return rb_text; +@@ -119,15 +199,50 @@ + static VALUE + page_get_link_mapping(VALUE self) + { +- return GLIST2ARY2F(poppler_page_get_link_mapping(RVAL2GOBJ(self)), ++ return GLIST2ARY2F(poppler_page_get_link_mapping(SELF(self)), + POPPLER_TYPE_LINK_MAPPING); + } + ++#if POPPLER_CHECK_VERSION(0, 6, 0) + static VALUE +-page_get_selection_region(VALUE self, VALUE scale, VALUE selection) ++page_get_image_mapping(VALUE self) + { +- return REGION2RVAL(poppler_page_get_selection_region(RVAL2GOBJ(self), ++ return GLIST2ARY2F(poppler_page_get_image_mapping(SELF(self)), ++ POPPLER_TYPE_IMAGE_MAPPING); ++} ++ ++static VALUE ++page_get_form_field_mapping(VALUE self) ++{ ++ return GLIST2ARY2F(poppler_page_get_form_field_mapping(SELF(self)), ++ POPPLER_TYPE_FORM_FIELD_MAPPING); ++} ++#endif ++ ++static VALUE ++page_get_selection_region(int argc, VALUE *argv, VALUE self) ++{ ++#if POPPLER_CHECK_VERSION(0, 6, 0) ++ PopplerSelectionStyle style = POPPLER_SELECTION_GLYPH; ++#endif ++ VALUE arg2, arg3, scale, selection; ++ ++ rb_scan_args(argc, argv, "21", &scale, &arg2, &arg3); ++ ++ if (NIL_P(arg3)) { ++ selection = arg2; ++ } else { ++#if POPPLER_CHECK_VERSION(0, 6, 0) ++ style = RVAL2SELSTYLE(arg2); ++#endif ++ selection = arg3; ++ } ++ ++ return REGION2RVAL(poppler_page_get_selection_region(SELF(self), + NUM2DBL(scale), ++#if POPPLER_CHECK_VERSION(0, 6, 0) ++ style, ++#endif + RVAL2RECT(selection))); + } + +@@ -136,15 +251,16 @@ + static VALUE + page_render_selection(VALUE self, VALUE cairo, + VALUE selection, VALUE rb_old_selection, +- VALUE glyph_color, VALUE background_color) ++ VALUE style, VALUE glyph_color, VALUE background_color) + { + PopplerRectangle *old_selection = NULL; + + if (!NIL_P(rb_old_selection)) + old_selection = RVAL2RECT(rb_old_selection); +- poppler_page_render_selection(RVAL2GOBJ(self), RVAL2CRCONTEXT(cairo), ++ poppler_page_render_selection(SELF(self), RVAL2CRCONTEXT(cairo), + RVAL2RECT(selection), + old_selection, ++ RVAL2SELSTYLE(style), + RVAL2COLOR(glyph_color), + RVAL2COLOR(background_color)); + return Qnil; +@@ -159,17 +275,24 @@ + page_render_selection_to_pixbuf(VALUE self, VALUE scale, VALUE rotation, + VALUE pixbuf, VALUE selection, + VALUE rb_old_selection, ++#ifdef HAVE_POPPLER_PAGE_RENDER_SELECTION_TO_PIXBUF ++ VALUE style, ++#endif + VALUE glyph_color, VALUE background_color) + { + PopplerRectangle *old_selection = NULL; + + if (!NIL_P(rb_old_selection)) + old_selection = RVAL2RECT(rb_old_selection); +- poppler_page_render_selection_to_pixbuf(RVAL2GOBJ(self), NUM2DBL(scale), ++ poppler_page_render_selection_to_pixbuf(SELF(self), ++ NUM2DBL(scale), + NUM2INT(rotation), + RVAL2GOBJ(pixbuf), + RVAL2RECT(selection), + old_selection, ++#ifdef HAVE_POPPLER_PAGE_RENDER_SELECTION_TO_PIXBUF ++ RVAL2SELSTYLE(style), ++#endif + RVAL2COLOR(glyph_color), + RVAL2COLOR(background_color)); + return Qnil; +@@ -178,26 +301,88 @@ + static VALUE + page_render_selection_generic(int argc, VALUE *argv, VALUE self) + { +- if (argc == 5) { ++ if (argc == 6) { + #if defined(RB_POPPLER_CAIRO_AVAILABLE) && \ + defined(HAVE_POPPLER_PAGE_RENDER_SELECTION_TO_PIXBUF) + return page_render_selection(self, argv[0], argv[1], argv[2], +- argv[3], argv[4]); ++ argv[3], argv[4], argv[5]); + #else + rb_raise(rb_eArgError, "cairo is not available"); + #endif ++#ifdef HAVE_POPPLER_PAGE_RENDER_SELECTION_TO_PIXBUF ++ } else if (argc == 8) { ++ return page_render_selection_to_pixbuf(self, argv[0], argv[1], ++ argv[2], argv[3], argv[4], ++ argv[5], argv[6], argv[7]); ++#else + } else if (argc == 7) { + return page_render_selection_to_pixbuf(self, argv[0], argv[1], + argv[2], argv[3], argv[4], + argv[5], argv[6]); ++#endif + } else { + rb_raise(rb_eArgError, +- "wrong number of arguments (%d for 5 or 7)", argc); ++ "wrong number of arguments (%d for 5 or %d)", argc, ++#ifdef HAVE_POPPLER_PAGE_RENDER_SELECTION_TO_PIXBUF ++ 8 ++#else ++ 7 ++#endif ++ ); + } + } + ++#if POPPLER_CHECK_VERSION(0, 6, 0) ++static VALUE ++page_get_crop_box(VALUE self) ++{ ++ PopplerRectangle rect; + ++ poppler_page_get_crop_box(SELF(self), &rect); ++ return RECT2RVAL(&rect); ++} ++#endif ++ + ++#define DEF_READER(prefix, name, member, self_to_c, member_to_rb) \ ++static VALUE \ ++prefix ## _get_ ## name(VALUE self) \ ++{ \ ++ return member_to_rb((self_to_c(self))->member); \ ++} ++ ++#define DEF_WRITER(prefix, name, member, self_to_c, value_to_c) \ ++static VALUE \ ++prefix ## _set_ ## name(VALUE self, VALUE value) \ ++{ \ ++ (self_to_c(self))->member = value_to_c(value); \ ++ return Qnil; \ ++} ++ ++#define DEF_WRITER_WITH_SETTER(prefix, name, member, \ ++ self_to_c, value_setter) \ ++static VALUE \ ++prefix ## _set_ ## name(VALUE self, VALUE value) \ ++{ \ ++ value_setter((self_to_c(self))->member, value); \ ++ return Qnil; \ ++} ++ ++#define DEF_ACCESSOR(prefix, member, self_to_c, member_to_rb, value_to_c) \ ++ DEF_READER(prefix, member, member, self_to_c, member_to_rb) \ ++ DEF_WRITER(prefix, member, member, self_to_c, value_to_c) \ ++ ++#define DEF_ACCESSOR_WITH_SETTER(prefix, member, self_to_c, \ ++ member_to_rb, value_setter) \ ++ DEF_READER(prefix, member, member, self_to_c, member_to_rb) \ ++ DEF_WRITER_WITH_SETTER(prefix, member, member, self_to_c, value_setter) ++ ++#define DEF_ACCESSOR_WITH_NAME(prefix, name, member, self_to_c, \ ++ member_to_rb, value_to_c) \ ++ DEF_READER(prefix, name, member, self_to_c, member_to_rb) \ ++ DEF_WRITER(prefix, name, member, self_to_c, value_to_c) ++ ++ + /* A rectangle on a page, with coordinates in PDF points. */ + static VALUE + rectangle_initialize(VALUE self, VALUE x1, VALUE y1, VALUE x2, VALUE y2) +@@ -213,107 +398,320 @@ + return Qnil; + } + ++DEF_ACCESSOR(rectangle, x1, RVAL2RECT, rb_float_new, NUM2DBL) ++DEF_ACCESSOR(rectangle, y1, RVAL2RECT, rb_float_new, NUM2DBL) ++DEF_ACCESSOR(rectangle, x2, RVAL2RECT, rb_float_new, NUM2DBL) ++DEF_ACCESSOR(rectangle, y2, RVAL2RECT, rb_float_new, NUM2DBL) ++ + static VALUE +-rectangle_get_x1(VALUE self) ++rectangle_to_a(VALUE self) + { +- return rb_float_new(RVAL2RECT(self)->x1); ++ PopplerRectangle *rectangle = RVAL2RECT(self); ++ return rb_ary_new3(4, ++ rb_float_new(rectangle->x1), ++ rb_float_new(rectangle->y1), ++ rb_float_new(rectangle->x2), ++ rb_float_new(rectangle->y2)); + } + +-static VALUE +-rectangle_get_y1(VALUE self) ++ ++/* Mapping between areas on the current page and PopplerActions */ ++#define RECT_ENTITY2RVAL(rect) RECT2RVAL(&(rect)) ++#define RECT_ENTITY_SET(rect, rb_rect) rectangle_set(&(rect), rb_rect) ++static void ++rectangle_set(PopplerRectangle *rect, VALUE rb_rect) + { +- return rb_float_new(RVAL2RECT(self)->y1); ++ *rect = *(RVAL2RECT(rb_rect)); + } + +-static VALUE +-rectangle_get_x2(VALUE self) ++DEF_ACCESSOR_WITH_SETTER(link_mapping, area, ++ RVAL2LM, RECT_ENTITY2RVAL, RECT_ENTITY_SET) ++DEF_ACCESSOR(link_mapping, action, RVAL2LM, ACTION2RVAL, RVAL2ACTION) ++ ++#if POPPLER_CHECK_VERSION(0, 6, 0) ++ ++/* Page Transition */ ++DEF_ACCESSOR(page_trans, type, RVAL2TRANS, RVAL2TT, TT2RVAL) ++DEF_ACCESSOR(page_trans, alignment, RVAL2TRANS, RVAL2TA, TA2RVAL) ++DEF_ACCESSOR(page_trans, direction, RVAL2TRANS, RVAL2TD, TD2RVAL) ++DEF_ACCESSOR(page_trans, duration, RVAL2TRANS, NUM2INT, INT2NUM) ++DEF_ACCESSOR(page_trans, angle, RVAL2TRANS, NUM2INT, INT2NUM) ++DEF_ACCESSOR(page_trans, scale, RVAL2TRANS, NUM2DBL, rb_float_new) ++DEF_ACCESSOR(page_trans, rectangular, RVAL2TRANS, RVAL2CBOOL, CBOOL2RVAL) ++ ++ ++/* Mapping between areas on the current page and images */ ++DEF_ACCESSOR_WITH_SETTER(image_mapping, area, ++ RVAL2IM, RECT_ENTITY2RVAL, RECT_ENTITY_SET) ++DEF_ACCESSOR(image_mapping, image, RVAL2IM, GOBJ2RVAL, RVAL2GDK_PIXBUF) ++ ++ ++/* Mapping between areas on the current page and form fields */ ++VALUE ++rb_poppler_ruby_object_from_form_field(PopplerFormField *field) + { +- return rb_float_new(RVAL2RECT(self)->x2); ++ VALUE obj; ++ ++ obj = rbgobj_ruby_object_from_instance2(field, FALSE); ++ if (NIL_P(obj)) { ++ switch (poppler_form_field_get_field_type(field)) { ++ case POPPLER_FORM_FIELD_UNKNOWN: ++ obj = rbgobj_create_object(cUnknownField); ++ break; ++ case POPPLER_FORM_FIELD_BUTTON: ++ obj = rbgobj_create_object(cButtonField); ++ break; ++ case POPPLER_FORM_FIELD_TEXT: ++ obj = rbgobj_create_object(cTextField); ++ break; ++ case POPPLER_FORM_FIELD_CHOICE: ++ obj = rbgobj_create_object(cChoiceField); ++ break; ++ case POPPLER_FORM_FIELD_SIGNATURE: ++ obj = rbgobj_create_object(cSignatureField); ++ break; ++ } ++ g_object_ref(field); ++ G_INITIALIZE(obj, (gpointer)field); ++ } ++ ++ return obj; + } + +-static VALUE +-rectangle_get_y2(VALUE self) ++DEF_ACCESSOR_WITH_SETTER(form_field_mapping, area, ++ RVAL2FFM, RECT_ENTITY2RVAL, RECT_ENTITY_SET) ++DEF_ACCESSOR(form_field_mapping, field, RVAL2FFM, FF2RVAL, RVAL2FF) ++ ++/* FormField */ ++VALUE ++form_field_get_id(VALUE self) + { +- return rb_float_new(RVAL2RECT(self)->y2); ++ return INT2NUM(poppler_form_field_get_id(RVAL2FF(self))); + } + ++VALUE ++form_field_get_font_size(VALUE self) ++{ ++ return rb_float_new(poppler_form_field_get_font_size(RVAL2FF(self))); ++} + +-static VALUE +-rectangle_set_x1(VALUE self, VALUE x1) ++VALUE ++form_field_is_read_only(VALUE self) + { +- RVAL2RECT(self)->x1 = NUM2DBL(x1); ++ return CBOOL2RVAL(poppler_form_field_is_read_only(RVAL2FF(self))); ++} ++ ++/* Button Field */ ++VALUE ++button_field_get_button_type(VALUE self) ++{ ++ 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))); ++} ++ ++VALUE ++button_field_set_state(VALUE self, VALUE state) ++{ ++ poppler_form_field_button_set_state(RVAL2BF(self), RVAL2CBOOL(state)); + return Qnil; + } + +-static VALUE +-rectangle_set_y1(VALUE self, VALUE y1) ++/* Text Field */ ++VALUE ++text_field_get_text_type(VALUE self) + { +- RVAL2RECT(self)->y1 = NUM2DBL(y1); ++ return FTT2RVAL(poppler_form_field_text_get_text_type(RVAL2TF(self))); ++} ++ ++VALUE ++text_field_get_text(VALUE self) ++{ ++ return CSTR2RVAL(poppler_form_field_text_get_text(RVAL2TF(self))); ++} ++ ++VALUE ++text_field_set_text(VALUE self, VALUE text) ++{ ++ poppler_form_field_text_set_text(RVAL2TF(self), RVAL2CSTR2(text)); + return Qnil; + } + +-static VALUE +-rectangle_set_x2(VALUE self, VALUE x2) ++VALUE ++text_field_get_max_length(VALUE self) + { +- RVAL2RECT(self)->x2 = NUM2DBL(x2); ++ return INT2NUM(poppler_form_field_text_get_max_len(RVAL2TF(self))); ++} ++ ++VALUE ++text_field_do_spell_check(VALUE self) ++{ ++ return CBOOL2RVAL(poppler_form_field_text_do_spell_check(RVAL2TF(self))); ++} ++ ++VALUE ++text_field_do_scroll(VALUE self) ++{ ++ return CBOOL2RVAL(poppler_form_field_text_do_scroll(RVAL2TF(self))); ++} ++ ++VALUE ++text_field_is_rich_text(VALUE self) ++{ ++ return CBOOL2RVAL(poppler_form_field_text_is_rich_text(RVAL2TF(self))); ++} ++ ++VALUE ++text_field_is_password(VALUE self) ++{ ++ return CBOOL2RVAL(poppler_form_field_text_is_password(RVAL2TF(self))); ++} ++ ++ ++/* Choice Field */ ++VALUE ++choice_field_get_choice_type(VALUE self) ++{ ++ return FCT2RVAL(poppler_form_field_choice_get_choice_type(RVAL2CF(self))); ++} ++ ++VALUE ++choice_field_is_editable(VALUE self) ++{ ++ return CBOOL2RVAL(poppler_form_field_choice_is_editable(RVAL2CF(self))); ++} ++ ++VALUE ++choice_field_can_select_multiple(VALUE self) ++{ ++ return CBOOL2RVAL(poppler_form_field_choice_can_select_multiple(RVAL2CF(self))); ++} ++ ++VALUE ++choice_field_do_spell_check(VALUE self) ++{ ++ return CBOOL2RVAL(poppler_form_field_choice_do_spell_check(RVAL2CF(self))); ++} ++ ++VALUE ++choice_field_commit_on_change(VALUE self) ++{ ++ return CBOOL2RVAL(poppler_form_field_choice_commit_on_change(RVAL2CF(self))); ++} ++ ++VALUE ++choice_field_get_n_items(VALUE self) ++{ ++ return INT2NUM(poppler_form_field_choice_get_n_items(RVAL2CF(self))); ++} ++ ++VALUE ++choice_field_get_item(VALUE self, VALUE index) ++{ ++ return CSTR2RVAL(poppler_form_field_choice_get_item(RVAL2CF(self), ++ NUM2INT(index))); ++} ++ ++VALUE ++choice_field_is_item_selected(VALUE self, VALUE index) ++{ ++ return CBOOL2RVAL(poppler_form_field_choice_is_item_selected(RVAL2CF(self), ++ NUM2INT(index))); ++} ++ ++VALUE ++choice_field_select_item(VALUE self, VALUE index) ++{ ++ poppler_form_field_choice_select_item(RVAL2CF(self), NUM2INT(index)); + return Qnil; + } + +-static VALUE +-rectangle_set_y2(VALUE self, VALUE y2) ++VALUE ++choice_field_unselect_all(VALUE self) + { +- RVAL2RECT(self)->y2 = NUM2DBL(y2); ++ poppler_form_field_choice_unselect_all(RVAL2CF(self)); + return Qnil; + } + +-static VALUE +-rectangle_to_a(VALUE self) ++VALUE ++choice_field_toggle_item(VALUE self, VALUE index) + { +- PopplerRectangle *rectangle = RVAL2RECT(self); +- return rb_ary_new3(4, +- rb_float_new(rectangle->x1), +- rb_float_new(rectangle->y1), +- rb_float_new(rectangle->x2), +- rb_float_new(rectangle->y2)); ++ poppler_form_field_choice_toggle_item(RVAL2CF(self), NUM2INT(index)); ++ return Qnil; + } + +- +-/* Mapping between areas on the current page and PopplerActions */ +-static VALUE +-link_mapping_get_area(VALUE self) ++VALUE ++choice_field_set_text(VALUE self, VALUE text) + { +- return RECT2RVAL(&(RVAL2LM(self)->area)); ++ poppler_form_field_choice_set_text(RVAL2CF(self), RVAL2CSTR2(text)); ++ return Qnil; + } + +-static VALUE +-link_mapping_get_action(VALUE self) ++VALUE ++choice_field_get_text(VALUE self) + { +- return ACTION2RVAL(RVAL2LM(self)->action); ++ return CSTR2RVAL(poppler_form_field_choice_get_text(RVAL2CF(self))); + } ++#endif + + void + Init_poppler_page(VALUE mPoppler) + { +- VALUE cPage, cRectangle, cLinkMapping; ++ VALUE cPage, cLinkMapping; ++#if POPPLER_CHECK_VERSION(0, 6, 0) ++ VALUE cPageTransition, cImageMapping, cFormFieldMapping, cFormField; ++#endif + + cPage = G_DEF_CLASS(POPPLER_TYPE_PAGE, "Page", mPoppler); + cRectangle = G_DEF_CLASS(POPPLER_TYPE_RECTANGLE, "Rectangle", mPoppler); + cLinkMapping = G_DEF_CLASS(POPPLER_TYPE_LINK_MAPPING, "LinkMapping", + mPoppler); ++#if POPPLER_CHECK_VERSION(0, 6, 0) ++ cPageTransition = G_DEF_CLASS(POPPLER_TYPE_PAGE_TRANSITION, ++ "PageTransition", mPoppler); ++ cImageMapping = G_DEF_CLASS(POPPLER_TYPE_IMAGE_MAPPING, ++ "ImageMapping", mPoppler); ++ cFormFieldMapping = G_DEF_CLASS(POPPLER_TYPE_FORM_FIELD_MAPPING, ++ "FormFieldMapping", mPoppler); ++ ++ cFormField = G_DEF_CLASS(POPPLER_TYPE_FORM_FIELD, "FormField", mPoppler); ++ cUnknownField = rb_define_class_under(mPoppler, "UnknownField", cFormField); ++ cTextField = rb_define_class_under(mPoppler, "TextField", cFormField); ++ cButtonField = rb_define_class_under(mPoppler, "ButtonField", cFormField); ++ cChoiceField = rb_define_class_under(mPoppler, "ChoiceField", cFormField); ++ cSignatureField = rb_define_class_under(mPoppler, "SignatureField", ++ cFormField); ++#endif + cPSFile = rb_const_get(mPoppler, rb_intern("PSFile")); + + rb_define_method(cPage, "render", page_render_generic, -1); + rb_define_method(cPage, "size", page_get_size, 0); + rb_define_method(cPage, "index", page_get_index, 0); ++#if POPPLER_CHECK_VERSION(0, 6, 0) ++ rb_define_method(cPage, "duration", page_get_duration, 0); ++ rb_define_method(cPage, "transition", page_get_transition, 0); ++#endif + rb_define_method(cPage, "thumbnail", page_get_thumbnail, 0); + rb_define_method(cPage, "thumbnail_size", page_get_thumbnail_size, 0); + rb_define_method(cPage, "find_text", page_find_text, 1); +- rb_define_method(cPage, "get_text", page_get_text, 1); ++ rb_define_method(cPage, "get_text", page_get_text, -1); + rb_define_method(cPage, "link_mapping", page_get_link_mapping, 0); ++#if POPPLER_CHECK_VERSION(0, 6, 0) ++ rb_define_method(cPage, "image_mapping", page_get_image_mapping, 0); ++ rb_define_method(cPage, "form_field_mapping", ++ page_get_form_field_mapping, 0); ++#endif + rb_define_method(cPage, "get_selection_region", +- page_get_selection_region, 2); ++ page_get_selection_region, -1); + rb_define_method(cPage, "render_selection", + page_render_selection_generic, -1); ++#if POPPLER_CHECK_VERSION(0, 6, 0) ++ rb_define_method(cPage, "crop_box", page_get_crop_box, 0); ++#endif + + G_DEF_SETTERS(cPage); + +@@ -335,5 +733,102 @@ + rb_define_method(cLinkMapping, "area", link_mapping_get_area, 0); + rb_define_method(cLinkMapping, "action", link_mapping_get_action, 0); + ++ rb_define_method(cLinkMapping, "set_area", link_mapping_set_area, 1); ++ rb_define_method(cLinkMapping, "set_action", link_mapping_set_action, 1); ++ + G_DEF_SETTERS(cLinkMapping); ++ ++#if POPPLER_CHECK_VERSION(0, 6, 0) ++/* Page Transition */ ++ rb_define_method(cPageTransition, "type", page_trans_get_type, 0); ++ rb_define_method(cPageTransition, "alignment", page_trans_get_alignment, 0); ++ rb_define_method(cPageTransition, "direction", page_trans_get_direction, 0); ++ rb_define_method(cPageTransition, "duration", page_trans_get_duration, 0); ++ rb_define_method(cPageTransition, "angle", page_trans_get_angle, 0); ++ rb_define_method(cPageTransition, "scale", page_trans_get_scale, 0); ++ rb_define_method(cPageTransition, "rectangular", ++ page_trans_get_rectangular, 0); ++ ++ rb_define_method(cPageTransition, "set_type", page_trans_set_type, 1); ++ rb_define_method(cPageTransition, "set_alignment", ++ page_trans_set_alignment, 1); ++ rb_define_method(cPageTransition, "set_direction", ++ page_trans_set_direction, 1); ++ rb_define_method(cPageTransition, "set_duration", ++ page_trans_set_duration, 1); ++ rb_define_method(cPageTransition, "set_angle", page_trans_set_angle, 1); ++ rb_define_method(cPageTransition, "set_scale", page_trans_set_scale, 1); ++ rb_define_method(cPageTransition, "set_rectangular", ++ page_trans_set_rectangular, 1); ++ ++ G_DEF_SETTERS(cPageTransition); ++ ++ ++/* Mapping between areas on the current page and images */ ++ rb_define_method(cImageMapping, "area", image_mapping_get_area, 0); ++ rb_define_method(cImageMapping, "image", image_mapping_get_image, 0); ++ ++ rb_define_method(cImageMapping, "set_area", image_mapping_set_area, 1); ++ rb_define_method(cImageMapping, "set_image", image_mapping_set_image, 1); ++ ++ G_DEF_SETTERS(cImageMapping); ++ ++ ++/* Mapping between areas on the current page and form fields */ ++ rb_define_method(cFormFieldMapping, "area", form_field_mapping_get_area, 0); ++ rb_define_method(cFormFieldMapping, "field", form_field_mapping_get_field, ++ 0); ++ ++ rb_define_method(cFormFieldMapping, "set_area", ++ form_field_mapping_set_area, 1); ++ rb_define_method(cFormFieldMapping, "set_field", ++ form_field_mapping_set_field, 1); ++ ++ G_DEF_SETTERS(cFormFieldMapping); ++ ++/* FormField */ ++ rb_define_method(cFormField, "id", form_field_get_id, 0); ++ rb_define_method(cFormField, "font_size", form_field_get_font_size, 0); ++ rb_define_method(cFormField, "read_only?", form_field_is_read_only, 0); ++ ++ G_DEF_SETTERS(cFormField); ++ ++ ++ rb_define_method(cButtonField, "active?", button_field_get_state, 0); ++ rb_define_method(cButtonField, "set_active", button_field_set_state, 1); ++ ++ G_DEF_SETTERS(cButtonField); ++ ++ ++ rb_define_method(cTextField, "type", text_field_get_text_type, 0); ++ rb_define_method(cTextField, "text", text_field_get_text, 0); ++ rb_define_method(cTextField, "set_text", text_field_set_text, 1); ++ rb_define_method(cTextField, "max_length", text_field_get_max_length, 0); ++ rb_define_method(cTextField, "spell_check?", text_field_do_spell_check, 0); ++ rb_define_method(cTextField, "scroll?", text_field_do_scroll, 0); ++ rb_define_method(cTextField, "rich_text?", text_field_is_rich_text, 0); ++ rb_define_method(cTextField, "password?", text_field_is_password, 0); ++ ++ G_DEF_SETTERS(cTextField); ++ ++ ++ rb_define_method(cChoiceField, "type", choice_field_get_choice_type, 0); ++ rb_define_method(cChoiceField, "editable?", choice_field_is_editable, 0); ++ rb_define_method(cChoiceField, "select_multiple?", ++ choice_field_can_select_multiple, 0); ++ rb_define_method(cChoiceField, "spell_check?", ++ choice_field_do_spell_check, 0); ++ rb_define_method(cChoiceField, "commit_on_change?", ++ choice_field_commit_on_change, 0); ++ rb_define_method(cChoiceField, "n_items", choice_field_get_n_items, 0); ++ rb_define_method(cChoiceField, "[]", choice_field_get_item, 1); ++ rb_define_method(cChoiceField, "selected?", ++ choice_field_is_item_selected, 1); ++ rb_define_method(cChoiceField, "select", choice_field_select_item, 1); ++ rb_define_method(cChoiceField, "unselect_all", choice_field_unselect_all, 0); ++ rb_define_method(cChoiceField, "text", choice_field_get_text, 0); ++ rb_define_method(cChoiceField, "set_text", choice_field_set_text, 1); ++ ++ G_DEF_SETTERS(cChoiceField); ++#endif + } +Index: ruby-gnome2/poppler/src/rbpoppler-action.c +=================================================================== +--- ruby-gnome2/poppler/src/rbpoppler-action.c (révision 2347) ++++ ruby-gnome2/poppler/src/rbpoppler-action.c (copie de travail) +@@ -4,7 +4,7 @@ + rbpoppler-action.c - + + $Author: ktou $ +- $Date: 2006/09/06 13:42:01 $ ++ $Date: 2007/06/23 02:43:53 $ + + Copyright (C) 2006 Ruby-GNOME2 Project Team + +@@ -151,8 +151,7 @@ + void + Init_poppler_action(VALUE mPoppler) + { +- VALUE cActionType, cDestType, cDest; +- VALUE cAction, cActionAny, cActionGotoDest, cActionGotoRemote; ++ VALUE cDest, cAction, cActionAny, cActionGotoDest, cActionGotoRemote; + VALUE cActionLaunch, cActionUri, cActionNamed, cActionMovie; + + cAction = G_DEF_CLASS(POPPLER_TYPE_ACTION, "Action", mPoppler); +@@ -199,8 +198,8 @@ + G_DEF_SETTERS(cActionNamed); + G_DEF_SETTERS(cActionMovie); + +- cActionType = G_DEF_CLASS(POPPLER_TYPE_ACTION_TYPE, "ActionType", mPoppler); +- cDestType = G_DEF_CLASS(POPPLER_TYPE_DEST_TYPE, "DestType", mPoppler); ++ G_DEF_CLASS(POPPLER_TYPE_ACTION_TYPE, "ActionType", mPoppler); ++ G_DEF_CLASS(POPPLER_TYPE_DEST_TYPE, "DestType", mPoppler); + + cDest = G_DEF_CLASS(POPPLER_TYPE_DEST, "Dest", mPoppler); + +Index: ruby-gnome2/poppler/src/rbpoppler-document.c +=================================================================== +--- ruby-gnome2/poppler/src/rbpoppler-document.c (révision 2347) ++++ ruby-gnome2/poppler/src/rbpoppler-document.c (copie de travail) +@@ -4,7 +4,7 @@ + rbpoppler-document.c - + + $Author: ktou $ +- $Date: 2006/06/17 14:34:54 $ ++ $Date: 2007/10/13 05:56:39 $ + + Copyright (C) 2006 Ruby-GNOME2 Project Team + +@@ -12,18 +12,16 @@ + + #include "rbpoppler.h" + ++#define RVAL2DOC(obj) (POPPLER_DOCUMENT(RVAL2GOBJ(obj))) ++ + #define IITER2RVAL(obj) (BOXED2RVAL(obj, POPPLER_TYPE_INDEX_ITER)) + #define RVAL2IITER(obj) (RVAL2BOXED(obj, POPPLER_TYPE_INDEX_ITER)) + #define FITER2RVAL(obj) (BOXED2RVAL(obj, POPPLER_TYPE_FONTS_ITER)) + #define RVAL2FITER(obj) (RVAL2BOXED(obj, POPPLER_TYPE_FONTS_ITER)) + +-#ifdef POPPLER_TYPE_FONT_INFO +-# define HAVE_POPPLER_FONT_INFO 1 +-#endif +- +-static ID id_new, id_valid; ++static ID id_new, id_valid, id_pdf_data_p, id_ensure_uri; + static VALUE cIndexIter; +-#ifdef HAVE_POPPLER_FONT_INFO ++#if POPPLER_CHECK_VERSION(0, 6, 0) + static VALUE cFontInfo; + #endif + +@@ -31,16 +29,29 @@ + static VALUE + doc_initialize(int argc, VALUE *argv, VALUE self) + { +- PopplerDocument *document; ++ PopplerDocument *document = NULL; + GError *error = NULL; +- VALUE uri, rb_password; ++ VALUE uri_or_data, rb_password; + const char *password; + +- rb_scan_args(argc, argv, "11", &uri, &rb_password); ++ rb_scan_args(argc, argv, "11", &uri_or_data, &rb_password); + + password = NIL_P(rb_password) ? NULL : RVAL2CSTR(rb_password); +- document = poppler_document_new_from_file(RVAL2CSTR(uri), password, &error); + ++#if POPPLER_CHECK_VERSION(0, 6, 0) ++ if (RVAL2CBOOL(rb_funcall(self, id_pdf_data_p, 1, uri_or_data))) { ++ document = poppler_document_new_from_data(RSTRING_PTR(uri_or_data), ++ RSTRING_LEN(uri_or_data), ++ password, &error); ++ } ++#endif ++ ++ if (!document && !error) { ++ uri_or_data = rb_funcall(self, id_ensure_uri, 1, uri_or_data); ++ document = poppler_document_new_from_file(RVAL2CSTR(uri_or_data), ++ password, &error); ++ } ++ + if (error) + RAISE_GERROR(error); + +@@ -54,7 +65,7 @@ + gboolean result; + GError *error = NULL; + +- result = poppler_document_save(RVAL2GOBJ(self), RVAL2CSTR(uri), &error); ++ result = poppler_document_save(RVAL2DOC(self), RVAL2CSTR(uri), &error); + + if (error) + RAISE_GERROR(error); +@@ -65,7 +76,7 @@ + static VALUE + doc_get_n_pages(VALUE self) + { +- return INT2NUM(poppler_document_get_n_pages(RVAL2GOBJ(self))); ++ return INT2NUM(poppler_document_get_n_pages(RVAL2DOC(self))); + } + + static VALUE +@@ -74,11 +85,11 @@ + VALUE rb_page; + PopplerPage *page; + +- if (RTEST(rb_obj_is_kind_of(index_or_label, rb_cInteger))) { +- page = poppler_document_get_page(RVAL2GOBJ(self), ++ if (RVAL2CBOOL(rb_obj_is_kind_of(index_or_label, rb_cInteger))) { ++ page = poppler_document_get_page(RVAL2DOC(self), + NUM2INT(index_or_label)); +- } else if (RTEST(rb_obj_is_kind_of(index_or_label, rb_cString))) { +- page = poppler_document_get_page_by_label(RVAL2GOBJ(self), ++ } else if (RVAL2CBOOL(rb_obj_is_kind_of(index_or_label, rb_cString))) { ++ page = poppler_document_get_page_by_label(RVAL2DOC(self), + RVAL2CSTR(index_or_label)); + } else { + VALUE inspect; +@@ -96,29 +107,38 @@ + static VALUE + doc_has_attachments(VALUE self) + { +- return CBOOL2RVAL(poppler_document_has_attachments(RVAL2GOBJ(self))); ++ return CBOOL2RVAL(poppler_document_has_attachments(RVAL2DOC(self))); + } + + static VALUE + doc_get_attachments(VALUE self) + { +- return GLIST2ARYF(poppler_document_get_attachments(RVAL2GOBJ(self))); ++ return GLIST2ARYF(poppler_document_get_attachments(RVAL2DOC(self))); + } + + static VALUE + doc_find_dest(VALUE self, VALUE link_name) + { +- return GOBJ2RVAL(poppler_document_find_dest(RVAL2GOBJ(self), ++ return GOBJ2RVAL(poppler_document_find_dest(RVAL2DOC(self), + RVAL2CSTR(link_name))); + } + ++#if POPPLER_CHECK_VERSION(0, 6, 0) + static VALUE ++doc_get_form_field(VALUE self, VALUE id) ++{ ++ return GOBJ2RVAL(poppler_document_get_form_field(RVAL2DOC(self), ++ NUM2INT(id))); ++} ++#endif ++ ++static VALUE + doc_each(VALUE self) + { + PopplerDocument *document; + int i, n_pages; + +- document = RVAL2GOBJ(self); ++ document = RVAL2DOC(self); + n_pages = poppler_document_get_n_pages(document); + for (i = 0; i < n_pages; i++) { + PopplerPage *page; +@@ -139,7 +159,7 @@ + return rb_funcall(cIndexIter, id_new, 1, self); + } + +-#ifdef HAVE_POPPLER_FONT_INFO ++#if POPPLER_CHECK_VERSION(0, 6, 0) + static VALUE + doc_get_font_info(VALUE self) + { +@@ -151,7 +171,7 @@ + + /* Interface for getting the Index of a poppler_document */ + #define CHECK_IITER_IS_VALID(iter) do { \ +- if (!RTEST(index_iter_valid_p(iter))) \ ++ if (!RVAL2CBOOL(index_iter_valid_p(iter))) \ + return Qnil; \ + } while (0) + +@@ -168,7 +188,7 @@ + iter = poppler_index_iter_new(RVAL2GOBJ(document)); + G_INITIALIZE(self, iter); + poppler_index_iter_free(iter); +- rb_ivar_set(self, id_valid, iter ? Qtrue : Qfalse); ++ rb_ivar_set(self, id_valid, CBOOL2RVAL(iter)); + return Qnil; + } + +@@ -228,7 +248,7 @@ + } + + +-#ifdef HAVE_POPPLER_FONT_INFO ++#if POPPLER_CHECK_VERSION(0, 6, 0) + + static VALUE + font_info_initialize(VALUE self, VALUE document) +@@ -254,7 +274,7 @@ + + + #define CHECK_FITER_IS_VALID(iter) do { \ +- if (!RTEST(fonts_iter_valid_p(iter))) \ ++ if (!RVAL2CBOOL(fonts_iter_valid_p(iter))) \ + return Qnil; \ + } while (0) + +@@ -278,7 +298,16 @@ + return CSTR2RVAL(poppler_fonts_iter_get_full_name(RVAL2FITER(self))); + } + ++#if POPPLER_CHECK_VERSION(0, 6, 0) + static VALUE ++fonts_iter_get_file_name(VALUE self) ++{ ++ CHECK_FITER_IS_VALID(self); ++ return CSTR2RVAL(poppler_fonts_iter_get_file_name(RVAL2FITER(self))); ++} ++#endif ++ ++static VALUE + fonts_iter_get_font_type(VALUE self) + { + CHECK_FITER_IS_VALID(self); +@@ -363,44 +392,49 @@ + Init_poppler_document(VALUE mPoppler) + { + VALUE cDocument, cFontsIter, cPSFile; +- VALUE cPageLayout, cPageMode, cFontType; +- VALUE cViewerPreferences, cPermissions; + + id_new = rb_intern("new"); + id_valid = rb_intern("valid?"); ++ id_pdf_data_p = rb_intern("pdf_data?"); ++ id_ensure_uri = rb_intern("ensure_uri"); + + cDocument = G_DEF_CLASS(POPPLER_TYPE_DOCUMENT, "Document", mPoppler); + cIndexIter = G_DEF_CLASS(POPPLER_TYPE_INDEX_ITER, "IndexIter", mPoppler); +-#ifdef HAVE_POPPLER_FONT_INFO ++#if POPPLER_CHECK_VERSION(0, 6, 0) + cFontInfo = G_DEF_CLASS(POPPLER_TYPE_FONT_INFO, "FontInfo", mPoppler); + #endif + cFontsIter = G_DEF_CLASS(POPPLER_TYPE_FONTS_ITER, "FontsIter", mPoppler); + cPSFile = G_DEF_CLASS(POPPLER_TYPE_PS_FILE, "PSFile", mPoppler); + +- cPageLayout = G_DEF_CLASS(POPPLER_TYPE_PAGE_LAYOUT, "PageLayout", mPoppler); +- cPageMode = G_DEF_CLASS(POPPLER_TYPE_PAGE_MODE, "PageMode", mPoppler); +- cFontType = G_DEF_CLASS(POPPLER_TYPE_FONT_TYPE, "FontType", mPoppler); +- cViewerPreferences = G_DEF_CLASS(POPPLER_TYPE_VIEWER_PREFERENCES, +- "ViewerPreferences", mPoppler); +- cPermissions = G_DEF_CLASS(POPPLER_TYPE_PERMISSIONS, "Permissions", +- mPoppler); ++ G_DEF_CLASS(POPPLER_TYPE_PAGE_LAYOUT, "PageLayout", mPoppler); ++ G_DEF_CLASS(POPPLER_TYPE_PAGE_MODE, "PageMode", mPoppler); ++ G_DEF_CLASS(POPPLER_TYPE_FONT_TYPE, "FontType", mPoppler); ++ G_DEF_CLASS(POPPLER_TYPE_VIEWER_PREFERENCES, "ViewerPreferences", mPoppler); ++ G_DEF_CLASS(POPPLER_TYPE_PERMISSIONS, "Permissions", mPoppler); + + rb_include_module(cDocument, rb_mEnumerable); + + rb_define_method(cDocument, "initialize", doc_initialize, -1); + rb_define_method(cDocument, "save", doc_save, 1); + rb_define_method(cDocument, "n_pages", doc_get_n_pages, 0); ++ rb_define_alias(cDocument, "size", "n_pages"); + rb_define_method(cDocument, "get_page", doc_get_page, 1); + rb_define_alias(cDocument, "[]", "get_page"); + rb_define_method(cDocument, "has_attachments?", doc_has_attachments, 0); + rb_define_alias(cDocument, "have_attachments?", "has_attachments?"); + rb_define_method(cDocument, "attachments", doc_get_attachments, 0); + rb_define_method(cDocument, "find_dest", doc_find_dest, 1); ++ rb_define_alias(cDocument, "get_destination", "find_dest"); + ++#if POPPLER_CHECK_VERSION(0, 6, 0) ++ rb_define_method(cDocument, "get_form_field", doc_get_form_field, 1); ++#endif ++ + rb_define_method(cDocument, "each", doc_each, 0); ++ rb_define_alias(cDocument, "pages", "to_a"); + + rb_define_method(cDocument, "index_iter", doc_get_index_iter, 0); +-#ifdef HAVE_POPPLER_FONT_INFO ++#if POPPLER_CHECK_VERSION(0, 6, 0) + rb_define_method(cDocument, "font_info", doc_get_font_info, 0); + #endif + +@@ -424,7 +458,7 @@ + G_DEF_SETTERS(cIndexIter); + + +-#ifdef HAVE_POPPLER_FONT_INFO ++#if POPPLER_CHECK_VERSION(0, 6, 0) + rb_define_method(cFontInfo, "initialize", font_info_initialize, 1); + rb_define_method(cFontInfo, "scan", font_info_scan, 1); + G_DEF_SETTERS(cFontInfo); +@@ -434,6 +468,9 @@ + + rb_define_method(cFontsIter, "name", fonts_iter_get_name, 0); + rb_define_method(cFontsIter, "full_name", fonts_iter_get_full_name, 0); ++#if POPPLER_CHECK_VERSION(0, 6, 0) ++ rb_define_method(cFontsIter, "file_name", fonts_iter_get_file_name, 0); ++#endif + rb_define_method(cFontsIter, "font_type", fonts_iter_get_font_type, 0); + rb_define_method(cFontsIter, "embedded?", fonts_iter_is_embedded, 0); + rb_define_method(cFontsIter, "subset?", fonts_iter_is_subset, 0); +Index: ruby-gnome2/poppler/src/lib/poppler.rb +=================================================================== +--- ruby-gnome2/poppler/src/lib/poppler.rb (révision 2347) ++++ ruby-gnome2/poppler/src/lib/poppler.rb (copie de travail) +@@ -1,3 +1,4 @@ ++require "tempfile" + require "glib2" + require "gdk_pixbuf2" + begin +@@ -14,6 +15,59 @@ + LOG_DOMAIN = "Poppler" + + VERSION = version.split(".").collect {|x| x.to_i} ++ ++ class Document ++ private ++ def pdf_data?(data) ++ /\A%PDF-1\.\d/ =~ data ++ end ++ ++ def ensure_uri(uri) ++ if pdf_data?(uri) ++ @pdf = Tempfile.new("ruby-poppler-pdf") ++ @pdf.binmode ++ @pdf.print(uri) ++ @pdf.close ++ uri = @pdf.path ++ end ++ ++ if GLib.path_is_absolute?(uri) ++ GLib.filename_to_uri(uri) ++ elsif /\A[a-zA-Z][a-zA-Z\d\-+.]*:/.match(uri) ++ uri ++ else ++ GLib.filename_to_uri(File.expand_path(uri)) ++ end ++ end ++ end ++ ++ if defined?(TextField) ++ class TextField ++ def multiline? ++ type == FormTextType::MULTILINE ++ end ++ ++ def file_select? ++ type == FormTextType::FILE_SELECT ++ end ++ ++ def normal? ++ type == FormTextType::NORMAL ++ end ++ end ++ end ++ ++ if defined?(ChoiceField) ++ class ChoiceField ++ def combo? ++ type == FormChioceType::COMBO ++ end ++ ++ def list? ++ type == FormChoiceType::LIST ++ end ++ end ++ end + end + + if Poppler.cairo_available? +Index: ruby-gnome2/poppler/src/rbpoppler.c +=================================================================== +--- ruby-gnome2/poppler/src/rbpoppler.c (révision 2347) ++++ ruby-gnome2/poppler/src/rbpoppler.c (copie de travail) +@@ -4,7 +4,7 @@ + rbpoppler.c - + + $Author: ktou $ +- $Date: 2006/05/18 02:26:58 $ ++ $Date: 2007/10/13 05:56:39 $ + + Copyright (C) 2006 Ruby-GNOME2 Project Team + +@@ -38,7 +38,7 @@ + void + Init_poppler(void) + { +- VALUE mPoppler, cError, cOrientation, cBackend; ++ VALUE mPoppler; + + mPoppler = rb_define_module("Poppler"); + +@@ -48,11 +48,23 @@ + INT2FIX(POPPLER_MINOR_VERSION), + INT2FIX(POPPLER_MICRO_VERSION))); + +- cError = G_DEF_CLASS(POPPLER_TYPE_ERROR, "Error", mPoppler); +- cOrientation = G_DEF_CLASS(POPPLER_TYPE_ORIENTATION, "Orientation", +- mPoppler); +- cBackend = G_DEF_CLASS(POPPLER_TYPE_BACKEND, "Backend", mPoppler); ++ G_DEF_CLASS(POPPLER_TYPE_ERROR, "Error", mPoppler); ++ G_DEF_CLASS(POPPLER_TYPE_ORIENTATION, "Orientation", mPoppler); ++#if POPPLER_CHECK_VERSION(0, 6, 0) ++ G_DEF_CLASS(POPPLER_TYPE_PAGE_TRANSITION_TYPE, ++ "PageTransitionType", mPoppler); ++ G_DEF_CLASS(POPPLER_TYPE_PAGE_TRANSITION_ALIGNMENT, ++ "PageTransitionAlignment", mPoppler); ++ G_DEF_CLASS(POPPLER_TYPE_PAGE_TRANSITION_DIRECTION, ++ "PageTransitionDirection", mPoppler); ++ G_DEF_CLASS(POPPLER_TYPE_SELECTION_STYLE, "SelectionStyle", mPoppler); ++ G_DEF_CLASS(POPPLER_TYPE_FORM_BUTTON_TYPE, "FormButtonType", mPoppler); ++ G_DEF_CLASS(POPPLER_TYPE_FORM_TEXT_TYPE, "FormTextType", mPoppler); ++ G_DEF_CLASS(POPPLER_TYPE_FORM_CHOICE_TYPE, "FormChoiceType", mPoppler); + ++#endif ++ G_DEF_CLASS(POPPLER_TYPE_BACKEND, "Backend", mPoppler); ++ + rb_define_module_function(mPoppler, "backend", get_backend, 0); + rb_define_module_function(mPoppler, "version", get_version, 0); + rb_define_module_function(mPoppler, "cairo_available?", cairo_available, 0); +Index: ruby-gnome2/poppler/src/rbpoppler.h +=================================================================== +--- ruby-gnome2/poppler/src/rbpoppler.h (révision 2347) ++++ ruby-gnome2/poppler/src/rbpoppler.h (copie de travail) +@@ -38,18 +38,29 @@ + #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)) ++#define TRANS2RVAL(obj) (BOXED2RVAL(obj, POPPLER_TYPE_PAGE_TRANSITION)) ++#define RVAL2TRANS(obj) ((PopplerPageTransition *)RVAL2BOXED(obj, POPPLER_TYPE_PAGE_TRANSITION)) ++ + #define DESTTYPE2RVAL(obj) (GENUM2RVAL(obj, POPPLER_TYPE_DEST_TYPE)) + #define ACTIONTYPE2RVAL(obj) (GENUM2RVAL(obj, POPPLER_TYPE_ACTION_TYPE)) + #define RVAL2ACTIONTYPE(obj) (RVAL2GENUM(obj, POPPLER_TYPE_ACTION_TYPE)) ++#define SELSTYLE2RVAL(obj) (GENUM2RVAL(obj, POPPLER_TYPE_SELECTION_STYLE)) ++#define RVAL2SELSTYLE(obj) (RVAL2GENUM(obj, POPPLER_TYPE_SELECTION_STYLE)) + #define RVAL2COLOR(obj) ((GdkColor *)RVAL2BOXED(obj, GDK_TYPE_COLOR)) + + #define ACTION2RVAL(obj) (rb_poppler_ruby_object_from_action(obj)) + #define RVAL2ACTION(obj) (rb_poppler_action_from_ruby_object(obj)) ++#define FF2RVAL(obj) (rb_poppler_ruby_object_from_form_field(obj)) + + extern VALUE rb_poppler_ruby_object_from_action(PopplerAction *action); + extern PopplerAction *rb_poppler_action_from_ruby_object(VALUE action); ++#if POPPLER_CHECK_VERSION(0, 6, 0) ++extern VALUE rb_poppler_ruby_object_from_form_field(PopplerFormField *field); ++#endif + ++#define RVAL2GDK_PIXBUF(pixbuf) (GDK_PIXBUF(RVAL2GOBJ(pixbuf))) + ++ + extern void Init_poppler_document(VALUE mPoppler); + extern void Init_poppler_page(VALUE mPoppler); + extern void Init_poppler_attachment(VALUE mPoppler); +Index: ruby-gnome2/poppler/src/rbpoppler-attachment.c +=================================================================== +--- ruby-gnome2/poppler/src/rbpoppler-attachment.c (révision 2347) ++++ ruby-gnome2/poppler/src/rbpoppler-attachment.c (copie de travail) +@@ -4,7 +4,7 @@ + rbpoppler-attachment.c - + + $Author: ktou $ +- $Date: 2006/05/17 12:51:19 $ ++ $Date: 2007/10/13 05:53:10 $ + + Copyright (C) 2006 Ruby-GNOME2 Project Team + +@@ -69,7 +69,15 @@ + return CSTR2RVAL(SELF(self)->description); + } + ++#if POPPLER_CHECK_VERSION(0, 6, 0) + static VALUE ++attachment_get_size(VALUE self) ++{ ++ return INT2NUM(SELF(self)->size); ++} ++#endif ++ ++static VALUE + attachment_get_mtime(VALUE self) + { + return rb_time_new(SELF(self)->mtime, 0); +@@ -81,6 +89,16 @@ + return rb_time_new(SELF(self)->ctime, 0); + } + ++#if POPPLER_CHECK_VERSION(0, 6, 0) ++static VALUE ++attachment_get_checksum(VALUE self) ++{ ++ GString *checksum; ++ checksum = SELF(self)->checksum; ++ return rb_str_new(checksum->str, checksum->len); ++} ++#endif ++ + void + Init_poppler_attachment(VALUE mPoppler) + { +@@ -93,8 +111,14 @@ + rb_define_method(cAttachment, "save", attachment_save, -1); + rb_define_method(cAttachment, "name", attachment_get_name, 0); + rb_define_method(cAttachment, "description", attachment_get_description, 0); ++#if POPPLER_CHECK_VERSION(0, 6, 0) ++ rb_define_method(cAttachment, "size", attachment_get_size, 0); ++#endif + rb_define_method(cAttachment, "mtime", attachment_get_mtime, 0); + rb_define_method(cAttachment, "ctime", attachment_get_ctime, 0); ++#if POPPLER_CHECK_VERSION(0, 6, 0) ++ rb_define_method(cAttachment, "checksum", attachment_get_checksum, 0); ++#endif + + G_DEF_SETTERS(cAttachment); + } + +Modification de propriétés sur ruby-gnome2/poppler/src +___________________________________________________________________ +Nom : svn:ignore + + Makefile +poppler.so +rbpopplerversion.h + + +Index: ruby-gnome2/poppler/README +=================================================================== +--- ruby-gnome2/poppler/README (révision 2347) ++++ ruby-gnome2/poppler/README (copie de travail) +@@ -12,7 +12,7 @@ + Ruby/GdkPixbuf2: http://ruby-gnome2.sourceforge.net/ + cairo/rcairo: http://cairographics.org/ (optional) + +- [*]: 0.5.2 or later is requried. ++ [*]: 0.5.2 - 0.6.2 is requried. + + Install + ------- + +Modification de propriétés sur poppler +___________________________________________________________________ +Nom : svn:ignore + + Makefile +mkmf.log + + --- ruby-gnome2-0.16.0.orig/debian/patches/gtkmozembed-rpath.patch +++ ruby-gnome2-0.16.0/debian/patches/gtkmozembed-rpath.patch @@ -0,0 +1,12 @@ +Index: ruby-gnome2-0.16.0/gtkmozembed/extconf.rb +=================================================================== +--- ruby-gnome2-0.16.0.orig/gtkmozembed/extconf.rb 2007-05-24 21:31:10.000000000 +0200 ++++ ruby-gnome2-0.16.0/gtkmozembed/extconf.rb 2007-05-24 21:31:12.000000000 +0200 +@@ -46,7 +46,6 @@ + if mozpath + # please comment the CFLAGS line if you don't want a default comp_path + $CFLAGS << " -DDEFAULT_MOZILLA_FIVE_HOME='\"" << mozpath << "\"' " +- $LDFLAGS << " -Wl,-rpath " << mozpath + else + $stderr.puts "${package_id}.pc cannot be found." + exit 1 --- ruby-gnome2-0.16.0.orig/debian/patches/data-from-selection.patch +++ ruby-gnome2-0.16.0/debian/patches/data-from-selection.patch @@ -0,0 +1,94 @@ +diff -Naur ruby-gnome2-all-0.14.1/gtk/src/rbgtktreedrag.c ruby-gnome2-0.14.1-new/gtk/src/rbgtktreedrag.c +--- ruby-gnome2-all-0.14.1/gtk/src/rbgtktreedrag.c 2006-08-16 18:48:48.000000000 +0200 ++++ ruby-gnome2-0.14.1-new/gtk/src/rbgtktreedrag.c 2006-08-16 18:47:45.000000000 +0200 +@@ -54,24 +54,25 @@ + } + + static void +-_rb_marshal_BOOLEAN__BOXED_BOXED(GClosure *closure, +- GValue *return_value, +- guint n_param_values, +- const GValue *param_values, +- gpointer invocation_hint, +- gpointer marshal_data) +-{ +- typedef gboolean (*GMarshalFunc_BOOLEAN__BOXED_BOXED) (gpointer data1, +- gpointer arg_1, +- gpointer arg_2, +- gpointer data2); +- register GMarshalFunc_BOOLEAN__BOXED_BOXED callback; ++_rb_marshal_BOOLEAN__BOXED_OBJECT_BOXED(GClosure *closure, ++ GValue *return_value, ++ guint n_param_values, ++ const GValue *param_values, ++ gpointer invocation_hint, ++ gpointer marshal_data) ++{ ++ typedef gboolean (*GMarshalFunc_BOOLEAN__BOXED_OBJECT_BOXED) (gpointer data1, ++ gpointer arg_1, ++ gpointer arg_2, ++ gpointer arg_3, ++ gpointer data2); ++ register GMarshalFunc_BOOLEAN__BOXED_OBJECT_BOXED callback; + register GCClosure *cc = (GCClosure*) closure; + register gpointer data1, data2; + gboolean v_return; + + g_return_if_fail (return_value != NULL); +- g_return_if_fail (n_param_values == 3); ++ g_return_if_fail (n_param_values == 4); + + if (G_CCLOSURE_SWAP_DATA (closure)) + { +@@ -83,11 +84,12 @@ + data1 = g_value_peek_pointer (param_values + 0); + data2 = closure->data; + } +- callback = (GMarshalFunc_BOOLEAN__BOXED_BOXED) (marshal_data ? marshal_data : cc->callback); ++ callback = (GMarshalFunc_BOOLEAN__BOXED_OBJECT_BOXED) (marshal_data ? marshal_data : cc->callback); + + v_return = callback (data1, + g_marshal_value_peek_boxed (param_values + 1), +- g_marshal_value_peek_boxed (param_values + 2), ++ g_marshal_value_peek_object (param_values + 2), ++ g_marshal_value_peek_boxed (param_values + 3), + data2); + + g_value_set_boolean (return_value, v_return); +@@ -110,10 +112,11 @@ + G_SIGNAL_RUN_LAST, + 0, + NULL, NULL, +- _rb_marshal_BOOLEAN__BOXED_BOXED, +- G_TYPE_BOOLEAN, 2, ++ _rb_marshal_BOOLEAN__BOXED_OBJECT_BOXED, ++ G_TYPE_BOOLEAN, 3, + GTK_TYPE_TREE_PATH, +- GTK_TYPE_SELECTION_DATA); ++ GTK_TYPE_TREE_MODEL, ++ GTK_TYPE_TREE_PATH); + } + + static gboolean +@@ -146,11 +149,20 @@ + + guint signal_id = g_signal_lookup("row-drop-possible", G_TYPE_FROM_INSTANCE(drag_dest)); + ++ GtkTreeModel* source_model = NULL; ++ GtkTreePath* source_path = NULL; ++ /* The selection_data must be of type GTK_TREE_MODEL_ROW, otherwise ++ the get function returns false and the out values are hopefully left ++ as-is. */ ++ gtk_tree_get_row_drag_data(selection_data, &source_model, &source_path); ++ + if(g_signal_has_handler_pending(drag_dest, signal_id, 0, FALSE)) +- g_signal_emit(drag_dest, signal_id, 0, dest_path, selection_data, &retval); ++ g_signal_emit(drag_dest, signal_id, 0, dest_path, source_model, source_path, &retval); + else + retval = TRUE; /* default value */ + ++ if(source_path) ++ gtk_tree_path_free(source_path); + return retval; + } + --- ruby-gnome2-0.16.0.orig/debian/patches/shebangs.patch +++ ruby-gnome2-0.16.0/debian/patches/shebangs.patch @@ -0,0 +1,54 @@ +Index: ruby-gnome2-0.16.0/glib/sample/type-register.rb +=================================================================== +--- ruby-gnome2-0.16.0.orig/glib/sample/type-register.rb 2007-05-24 21:09:36.000000000 +0200 ++++ ruby-gnome2-0.16.0/glib/sample/type-register.rb 2007-05-24 21:09:42.000000000 +0200 +@@ -1,3 +1,4 @@ ++#!/usr/bin/ruby + =begin + type-register.rb - Sample for GLib::Object + +Index: ruby-gnome2-0.16.0/glib/sample/type-register2.rb +=================================================================== +--- ruby-gnome2-0.16.0.orig/glib/sample/type-register2.rb 2007-05-24 21:09:27.000000000 +0200 ++++ ruby-gnome2-0.16.0/glib/sample/type-register2.rb 2007-05-24 21:09:33.000000000 +0200 +@@ -1,3 +1,4 @@ ++#!/usr/bin/ruby + =begin + type-register2.rb - Sample for GLib::Object + +Index: ruby-gnome2-0.16.0/gtk/sample/misc/properties.rb +=================================================================== +--- ruby-gnome2-0.16.0.orig/gtk/sample/misc/properties.rb 2007-05-24 21:08:52.000000000 +0200 ++++ ruby-gnome2-0.16.0/gtk/sample/misc/properties.rb 2007-05-24 21:08:58.000000000 +0200 +@@ -1,3 +1,4 @@ ++#!/usr/bin/ruby + =begin + properties.rb - + +Index: ruby-gnome2-0.16.0/gtk/src/lib/gtk2.rb +=================================================================== +--- ruby-gnome2-0.16.0.orig/gtk/src/lib/gtk2.rb 2007-05-24 21:08:25.000000000 +0200 ++++ ruby-gnome2-0.16.0/gtk/src/lib/gtk2.rb 2007-05-24 21:08:28.000000000 +0200 +@@ -1,4 +1,3 @@ +-#! /usr/bin/env ruby + =begin + gtk2.rb + +Index: ruby-gnome2-0.16.0/gtk/src/lib/gtk2/base.rb +=================================================================== +--- ruby-gnome2-0.16.0.orig/gtk/src/lib/gtk2/base.rb 2007-05-24 21:08:32.000000000 +0200 ++++ ruby-gnome2-0.16.0/gtk/src/lib/gtk2/base.rb 2007-05-24 21:08:34.000000000 +0200 +@@ -1,4 +1,3 @@ +-#! /usr/bin/env ruby + =begin + gtk2/base.rb + +Index: ruby-gnome2-0.16.0/libglade/lib/libglade2.rb +=================================================================== +--- ruby-gnome2-0.16.0.orig/libglade/lib/libglade2.rb 2007-05-24 21:10:05.000000000 +0200 ++++ ruby-gnome2-0.16.0/libglade/lib/libglade2.rb 2007-05-24 21:10:09.000000000 +0200 +@@ -1,4 +1,3 @@ +-#!/usr/bin/env ruby + =begin + libglade2.rb + --- ruby-gnome2-0.16.0.orig/debian/patches/series +++ ruby-gnome2-0.16.0/debian/patches/series @@ -0,0 +1,11 @@ +drag-signals.patch +data-from-selection.patch +extconf-strict.patch +shebangs.patch +gtkmozembed-rpath.patch +libglade2-nil-source.patch +buildsys-abort-on-error.patch +glib2.14.patch +window-warning.patch +poppler-0.6.patch +CVE-2007-6183.patch --- ruby-gnome2-0.16.0.orig/debian/patches/libglade2-nil-source.patch +++ ruby-gnome2-0.16.0/debian/patches/libglade2-nil-source.patch @@ -0,0 +1,12 @@ +Index: ruby-gnome2-0.16.0/libglade/lib/libglade2.rb +=================================================================== +--- ruby-gnome2-0.16.0.orig/libglade/lib/libglade2.rb 2007-07-09 10:32:08.000000000 +0200 ++++ ruby-gnome2-0.16.0/libglade/lib/libglade2.rb 2007-07-09 10:32:24.000000000 +0200 +@@ -99,6 +99,7 @@ + end + + def guard_source_from_gc(source) ++ return if source.nil? + @sources ||= {} + @sources[source.object_id] = source + source.signal_connect("destroy") do |object| --- ruby-gnome2-0.16.0.orig/debian/patches/window-warning.patch +++ ruby-gnome2-0.16.0/debian/patches/window-warning.patch @@ -0,0 +1,22 @@ +Index: ruby-gnome2-0.16.0/gtk/src/rbgtk.c +=================================================================== +--- ruby-gnome2-0.16.0.orig/gtk/src/rbgtk.c 2007-10-22 21:07:14.000000000 +0200 ++++ ruby-gnome2-0.16.0/gtk/src/rbgtk.c 2007-10-22 21:07:19.000000000 +0200 +@@ -4,7 +4,7 @@ + rbgtk.c - + + $Author: mutoh $ +- $Date: 2006/11/17 18:12:41 $ ++ $Date: 2006/12/30 12:51:33 $ + + Copyright (C) 2002-2006 Ruby-GNOME2 Project Team + Copyright (C) 1998-2001 Yukihiro Matsumoto, +@@ -44,7 +44,7 @@ + if (GTK_IS_WINDOW(gtkobj) || GTK_IS_MENU_SHELL(gtkobj)) { + VALUE klass; + klass = rb_obj_class(obj); +- if (NIL_P(rb_ivar_get(klass, id__windows__))) { ++ if (rb_ivar_defined(klass, id__windows__) == Qfalse) { + rb_ivar_set(klass, id__windows__, rb_hash_new()); + } + rb_hash_aset(rb_ivar_get(klass, id__windows__), obj, Qnil); --- ruby-gnome2-0.16.0.orig/debian/patches/glib2.14.patch +++ ruby-gnome2-0.16.0/debian/patches/glib2.14.patch @@ -0,0 +1,54 @@ +Index: ruby-gnome2-0.16.0/glib/src/rbglib_maincontext.c +=================================================================== +--- ruby-gnome2-0.16.0.orig/glib/src/rbglib_maincontext.c 2007-08-27 12:36:14.000000000 +0200 ++++ ruby-gnome2-0.16.0/glib/src/rbglib_maincontext.c 2007-08-27 12:48:34.000000000 +0200 +@@ -341,7 +341,8 @@ + + info = ALLOC(callback_info_t); + info->callback = func; +- id = g_timeout_add_seconds(NUM2UINT(interval), ++ id = g_timeout_add_seconds_full(G_PRIORITY_DEFAULT, ++ NUM2UINT(interval), + (GSourceFunc)invoke_source_func, + (gpointer)info, g_free); + info->id = id; +Index: ruby-gnome2-0.16.0/glib/src/rbglib_unicode.c +=================================================================== +--- ruby-gnome2-0.16.0.orig/glib/src/rbglib_unicode.c 2007-08-27 12:36:14.000000000 +0200 ++++ ruby-gnome2-0.16.0/glib/src/rbglib_unicode.c 2007-08-27 12:48:34.000000000 +0200 +@@ -140,7 +140,7 @@ + rbglib_m_unichar_get_script(VALUE self, VALUE unichar) + { + return GENUM2RVAL(g_unichar_get_script(NUM2UINT(unichar)), +- G_TYPE_UNICODE_SCRIPT_TYPE); ++ G_TYPE_UNICODE_SCRIPT); + } + #endif + +Index: ruby-gnome2-0.16.0/glib/src/rbgobj_boxed.c +=================================================================== +--- ruby-gnome2-0.16.0.orig/glib/src/rbgobj_boxed.c 2007-08-27 12:36:14.000000000 +0200 ++++ ruby-gnome2-0.16.0/glib/src/rbgobj_boxed.c 2007-08-27 12:48:34.000000000 +0200 +@@ -145,7 +145,8 @@ + + gpointer + rbgobj_boxed_get(obj, gtype) +- VALUE obj, gtype; ++ VALUE obj; ++ GType gtype; + { + boxed_holder* holder; + Data_Get_Struct(obj, boxed_holder, holder); +Index: ruby-gnome2-0.16.0/gtk/src/rbgtk.h +=================================================================== +--- ruby-gnome2-0.16.0.orig/gtk/src/rbgtk.h 2007-08-27 12:59:05.000000000 +0200 ++++ ruby-gnome2-0.16.0/gtk/src/rbgtk.h 2007-08-27 12:59:19.000000000 +0200 +@@ -115,7 +115,7 @@ + */ + typedef void (*rbgtkiter_set_value_func)(void *model, GtkTreeIter *iter, + gint column, GValue *value); +-extern void rbgtk_register_treeiter_set_value_func(VALUE klass, rbgtkiter_set_value_func); ++extern void rbgtk_register_treeiter_set_value_func(GType klass, rbgtkiter_set_value_func); + + /* + * Gtk::SelectionData --- ruby-gnome2-0.16.0.orig/debian/patches/extconf-strict.patch +++ ruby-gnome2-0.16.0/debian/patches/extconf-strict.patch @@ -0,0 +1,15 @@ +Index: ruby-gnome2-0.16.0/extconf.rb +=================================================================== +--- ruby-gnome2-0.16.0.orig/extconf.rb 2007-04-06 23:16:37.000000000 +0200 ++++ ruby-gnome2-0.16.0/extconf.rb 2007-04-06 23:16:47.000000000 +0200 +@@ -63,6 +63,10 @@ + if ret + targets << subdir + else ++ if $strict ++ exit(1) ++ end ++ + ignore << subdir + end + end --- ruby-gnome2-0.16.0.orig/debian/patches/drag-signals.patch +++ ruby-gnome2-0.16.0/debian/patches/drag-signals.patch @@ -0,0 +1,315 @@ +Index: ruby-gnome2-0.16.0/gtk/src/rbgtkliststore.c +=================================================================== +--- ruby-gnome2-0.16.0.orig/gtk/src/rbgtkliststore.c 2007-04-06 23:14:06.000000000 +0200 ++++ ruby-gnome2-0.16.0/gtk/src/rbgtkliststore.c 2007-04-06 23:14:10.000000000 +0200 +@@ -11,6 +11,8 @@ + + #include "global.h" + ++#include "rbgtktreedrag.h" ++ + #define _SELF(s) (GTK_LIST_STORE(RVAL2GOBJ(s))) + #define ITR2RVAL(i) (BOXED2RVAL(i, GTK_TYPE_TREE_ITER)) + #define RVAL2ITR(i) ((GtkTreeIter*)RVAL2BOXED(i, GTK_TYPE_TREE_ITER)) +@@ -34,7 +36,8 @@ + buf[cnt] = CLASS2GTYPE(argv[cnt]); + } + +- store = gtk_list_store_newv(argc, buf); ++ store = GTK_LIST_STORE(g_object_new(RB_TYPE_DND_LIST_STORE, NULL)); ++ gtk_list_store_set_column_types(store, argc, buf); + + G_INITIALIZE(self, store); + +@@ -284,11 +287,11 @@ + void + Init_gtk_list_store() + { +- VALUE ls = G_DEF_CLASS(GTK_TYPE_LIST_STORE, "ListStore", mGtk); ++ VALUE ls = G_DEF_CLASS(RB_TYPE_DND_LIST_STORE, "ListStore", mGtk); + + id_to_a = rb_intern("to_a"); + +- rbgtk_register_treeiter_set_value_func(GTK_TYPE_LIST_STORE, ++ rbgtk_register_treeiter_set_value_func(RB_TYPE_DND_LIST_STORE, + (rbgtkiter_set_value_func)>k_list_store_set_value); + rb_define_method(ls, "initialize", lstore_initialize, -1); + rb_define_method(ls, "set_column_types", lstore_set_column_types, -1); +Index: ruby-gnome2-0.16.0/gtk/src/rbgtktreedrag.c +=================================================================== +--- /dev/null 1970-01-01 00:00:00.000000000 +0000 ++++ ruby-gnome2-0.16.0/gtk/src/rbgtktreedrag.c 2007-04-06 23:14:10.000000000 +0200 +@@ -0,0 +1,184 @@ ++/* -*- c-file-style: "ruby"; indent-tabs-mode: nil -*- */ ++/************************************************ ++ ++ rbgtktreedrag.c - ++ ++ $Author: ck $ ++ $Date: 2006/08/16 02:06:00 $ ++ ++ Copyright (C) 2006 Armin Burgmeier ++************************************************/ ++ ++#include "global.h" ++#include "rbgtktreedrag.h" ++ ++#define g_marshal_value_peek_boxed(v) g_value_get_boxed(v) ++#define g_marshal_value_peek_object(v) g_value_get_object(v) ++ ++static void ++_rb_marshal_BOOLEAN__BOXED(GClosure *closure, ++ GValue *return_value, ++ guint n_param_values, ++ const GValue *param_values, ++ gpointer invocation_hint, ++ gpointer marshal_data) ++{ ++ typedef gboolean (*GMarshalFunc_BOOLEAN__BOXED) (gpointer data1, ++ gpointer arg_1, ++ gpointer data2); ++ register GMarshalFunc_BOOLEAN__BOXED callback; ++ register GCClosure *cc = (GCClosure*) closure; ++ register gpointer data1, data2; ++ gboolean v_return; ++ ++ g_return_if_fail (return_value != NULL); ++ g_return_if_fail (n_param_values == 2); ++ ++ if (G_CCLOSURE_SWAP_DATA (closure)) ++ { ++ data1 = closure->data; ++ data2 = g_value_peek_pointer (param_values + 0); ++ } ++ else ++ { ++ data1 = g_value_peek_pointer (param_values + 0); ++ data2 = closure->data; ++ } ++ callback = (GMarshalFunc_BOOLEAN__BOXED) (marshal_data ? marshal_data : cc->callback); ++ ++ v_return = callback (data1, ++ g_marshal_value_peek_boxed (param_values + 1), ++ data2); ++ ++ g_value_set_boolean (return_value, v_return); ++} ++ ++static void ++_rb_marshal_BOOLEAN__BOXED_BOXED(GClosure *closure, ++ GValue *return_value, ++ guint n_param_values, ++ const GValue *param_values, ++ gpointer invocation_hint, ++ gpointer marshal_data) ++{ ++ typedef gboolean (*GMarshalFunc_BOOLEAN__BOXED_BOXED) (gpointer data1, ++ gpointer arg_1, ++ gpointer arg_2, ++ gpointer data2); ++ register GMarshalFunc_BOOLEAN__BOXED_BOXED callback; ++ register GCClosure *cc = (GCClosure*) closure; ++ register gpointer data1, data2; ++ gboolean v_return; ++ ++ g_return_if_fail (return_value != NULL); ++ g_return_if_fail (n_param_values == 3); ++ ++ if (G_CCLOSURE_SWAP_DATA (closure)) ++ { ++ data1 = closure->data; ++ data2 = g_value_peek_pointer (param_values + 0); ++ } ++ else ++ { ++ data1 = g_value_peek_pointer (param_values + 0); ++ data2 = closure->data; ++ } ++ callback = (GMarshalFunc_BOOLEAN__BOXED_BOXED) (marshal_data ? marshal_data : cc->callback); ++ ++ v_return = callback (data1, ++ g_marshal_value_peek_boxed (param_values + 1), ++ g_marshal_value_peek_boxed (param_values + 2), ++ data2); ++ ++ g_value_set_boolean (return_value, v_return); ++} ++ ++static void ++rb_dnd_tree_drag_class_init(GType type) ++{ ++ g_signal_new("row-draggable", ++ type, ++ G_SIGNAL_RUN_LAST, ++ 0, ++ NULL, NULL, ++ _rb_marshal_BOOLEAN__BOXED, ++ G_TYPE_BOOLEAN, 1, ++ GTK_TYPE_TREE_PATH); ++ ++ g_signal_new("row-drop-possible", ++ type, ++ G_SIGNAL_RUN_LAST, ++ 0, ++ NULL, NULL, ++ _rb_marshal_BOOLEAN__BOXED_BOXED, ++ G_TYPE_BOOLEAN, 2, ++ GTK_TYPE_TREE_PATH, ++ GTK_TYPE_SELECTION_DATA); ++} ++ ++static gboolean ++rb_dnd_tree_drag_row_draggable(GtkTreeDragSource *drag_source, ++ GtkTreePath *path) ++{ ++ gboolean retval; ++ g_assert(G_TYPE_FROM_INSTANCE(drag_source) == RB_TYPE_DND_TREE_STORE || ++ G_TYPE_FROM_INSTANCE(drag_source) == RB_TYPE_DND_LIST_STORE); ++ ++ guint signal_id = g_signal_lookup("row-draggable", G_TYPE_FROM_INSTANCE(drag_source)); ++ ++ if(g_signal_has_handler_pending(drag_source, signal_id, 0, FALSE)) ++ g_signal_emit(drag_source, signal_id, 0, path, &retval); ++ else ++ retval = TRUE; /* default value */ ++ ++ return retval; ++} ++ ++static gboolean ++rb_dnd_tree_drag_row_drop_possible(GtkTreeDragDest* drag_dest, ++ GtkTreePath* dest_path, ++ GtkSelectionData* selection_data) ++{ ++ gboolean retval; ++ ++ g_assert(G_TYPE_FROM_INSTANCE(drag_dest) == RB_TYPE_DND_TREE_STORE || ++ G_TYPE_FROM_INSTANCE(drag_dest) == RB_TYPE_DND_LIST_STORE); ++ ++ guint signal_id = g_signal_lookup("row-drop-possible", G_TYPE_FROM_INSTANCE(drag_dest)); ++ ++ if(g_signal_has_handler_pending(drag_dest, signal_id, 0, FALSE)) ++ g_signal_emit(drag_dest, signal_id, 0, dest_path, selection_data, &retval); ++ else ++ retval = TRUE; /* default value */ ++ ++ return retval; ++} ++ ++static void ++rb_dnd_tree_store_init(RbDndTreeStore* store) ++{ ++ GTK_TREE_DRAG_SOURCE_GET_IFACE(store)->row_draggable = rb_dnd_tree_drag_row_draggable; ++ GTK_TREE_DRAG_DEST_GET_IFACE(store)->row_drop_possible = rb_dnd_tree_drag_row_drop_possible; ++} ++ ++static void ++rb_dnd_list_store_init(RbDndListStore* store) ++{ ++ GTK_TREE_DRAG_SOURCE_GET_IFACE(store)->row_draggable = rb_dnd_tree_drag_row_draggable; ++ GTK_TREE_DRAG_DEST_GET_IFACE(store)->row_drop_possible = rb_dnd_tree_drag_row_drop_possible; ++} ++ ++static void ++rb_dnd_tree_store_class_init(RbDndTreeStoreClass* klass) ++{ ++ rb_dnd_tree_drag_class_init(G_TYPE_FROM_CLASS(klass)); ++} ++ ++static void ++rb_dnd_list_store_class_init(RbDndListStoreClass* klass) ++{ ++ rb_dnd_tree_drag_class_init(G_TYPE_FROM_CLASS(klass)); ++} ++ ++G_DEFINE_TYPE(RbDndTreeStore, rb_dnd_tree_store, GTK_TYPE_TREE_STORE) ++G_DEFINE_TYPE(RbDndListStore, rb_dnd_list_store, GTK_TYPE_LIST_STORE) +Index: ruby-gnome2-0.16.0/gtk/src/rbgtktreedrag.h +=================================================================== +--- /dev/null 1970-01-01 00:00:00.000000000 +0000 ++++ ruby-gnome2-0.16.0/gtk/src/rbgtktreedrag.h 2007-04-06 23:14:10.000000000 +0200 +@@ -0,0 +1,49 @@ ++/* -*- c-file-style: "ruby"; indent-tabs-mode: nil -*- */ ++/************************************************ ++ ++ rbgtktreedrag.h - ++ ++ $Author: ck $ ++ $Date: 2006/08/16 02:24:00 $ ++ ++ Copyright (C) 2006 Armin Burgmeier ++************************************************/ ++ ++#ifndef __RBGTKTREEDRAG_H__ ++#define __RBGTKTREEDRAG_H__ ++ ++#include ++#include ++ ++#define RB_TYPE_DND_TREE_STORE (rb_dnd_tree_store_get_type()) ++#define RB_TYPE_DND_LIST_STORE (rb_dnd_list_store_get_type()) ++ ++typedef struct _RbDndTreeStore RbDndTreeStore; ++typedef struct _RbDndListStore RbDndListStore; ++ ++typedef struct _RbDndTreeStoreClass RbDndTreeStoreClass; ++typedef struct _RbDndListStoreClass RbDndListStoreClass; ++ ++struct _RbDndTreeStore { ++ GtkTreeStore parent; ++}; ++ ++struct _RbDndTreeStoreClass { ++ GtkTreeStoreClass parent_class; ++}; ++ ++struct _RbDndListStore { ++ GtkListStore parent; ++}; ++ ++struct _RbDndListStoreClass { ++ GtkListStoreClass parent_class; ++}; ++ ++GType ++rb_dnd_tree_store_get_type(void) G_GNUC_CONST; ++ ++GType ++rb_dnd_list_store_get_type(void) G_GNUC_CONST; ++ ++#endif /* __RBGTKTREEDRAG_H__ */ +Index: ruby-gnome2-0.16.0/gtk/src/rbgtktreestore.c +=================================================================== +--- ruby-gnome2-0.16.0.orig/gtk/src/rbgtktreestore.c 2007-04-06 23:14:06.000000000 +0200 ++++ ruby-gnome2-0.16.0/gtk/src/rbgtktreestore.c 2007-04-06 23:14:10.000000000 +0200 +@@ -11,6 +11,8 @@ + + #include "global.h" + ++#include "rbgtktreedrag.h" ++ + #define _SELF(s) (GTK_TREE_STORE(RVAL2GOBJ(s))) + #define ITR2RVAL(i) (BOXED2RVAL(i, GTK_TYPE_TREE_ITER)) + #define RVAL2ITR(i) ((GtkTreeIter*)RVAL2BOXED(i, GTK_TYPE_TREE_ITER)) +@@ -32,7 +34,8 @@ + buf[cnt] = CLASS2GTYPE(argv[cnt]); + } + +- store = gtk_tree_store_newv(argc, buf); ++ store = GTK_TREE_STORE(g_object_new(RB_TYPE_DND_TREE_STORE, NULL)); ++ gtk_tree_store_set_column_types(store, argc, buf); + + G_INITIALIZE(self, store); + +@@ -351,9 +354,9 @@ + void + Init_gtk_tree_store() + { +- VALUE ts = G_DEF_CLASS(GTK_TYPE_TREE_STORE, "TreeStore", mGtk); ++ VALUE ts = G_DEF_CLASS(RB_TYPE_DND_TREE_STORE, "TreeStore", mGtk); + +- rbgtk_register_treeiter_set_value_func(GTK_TYPE_TREE_STORE, ++ rbgtk_register_treeiter_set_value_func(RB_TYPE_DND_TREE_STORE, + (rbgtkiter_set_value_func)>k_tree_store_set_value); + + rb_define_method(ts, "initialize", tstore_initialize, -1); --- ruby-gnome2-0.16.0.orig/debian/patches/CVE-2007-6183.patch +++ ruby-gnome2-0.16.0/debian/patches/CVE-2007-6183.patch @@ -0,0 +1,12 @@ +--- ruby-gnome2/gtk/src/rbgtkmessagedialog.c 2006/10/21 16:58:00 2275 ++++ ruby-gnome2/gtk/src/rbgtkmessagedialog.c 2007/11/27 11:40:12 2720 +@@ -28,7 +28,8 @@ + RVAL2GFLAGS(flags, GTK_TYPE_DIALOG_FLAGS), + RVAL2GENUM(type, GTK_TYPE_MESSAGE_TYPE), + RVAL2GENUM(buttons, GTK_TYPE_BUTTONS_TYPE), +- (const gchar*)(NIL_P(message) ? "": RVAL2CSTR(message))); ++ "%s", ++ NIL_P(message) ? "": RVAL2CSTR(message)); + RBGTK_INITIALIZE(self, w); + return Qnil; + } --- ruby-gnome2-0.16.0.orig/debian/patches/buildsys-abort-on-error.patch +++ ruby-gnome2-0.16.0/debian/patches/buildsys-abort-on-error.patch @@ -0,0 +1,14 @@ +Index: ruby-gnome2-0.16.0/exec_make.rb +=================================================================== +--- ruby-gnome2-0.16.0.orig/exec_make.rb 2007-08-25 12:05:43.000000000 +0200 ++++ ruby-gnome2-0.16.0/exec_make.rb 2007-08-25 12:06:18.000000000 +0200 +@@ -29,7 +29,8 @@ + if ret + success << subdir + else +- failure << subdir ++ puts "Building of #{subdir} failed." ++ exit(1) + end + end + --- ruby-gnome2-0.16.0.orig/debian/libgtksourceview1-ruby1.8.install +++ ruby-gnome2-0.16.0/debian/libgtksourceview1-ruby1.8.install @@ -0,0 +1,2 @@ +usr/lib/ruby/1.8/*/gtksourceview.so +usr/lib/ruby/1.8/gtksourceview.rb --- ruby-gnome2-0.16.0.orig/debian/libgtksourceview1-ruby.examples +++ ruby-gnome2-0.16.0/debian/libgtksourceview1-ruby.examples @@ -0,0 +1 @@ +gtksourceview/sample/* --- ruby-gnome2-0.16.0.orig/debian/libglade2-ruby1.8.manpages +++ ruby-gnome2-0.16.0/debian/libglade2-ruby1.8.manpages @@ -0,0 +1 @@ +./debian/ruby-glade-create-template.1 --- ruby-gnome2-0.16.0.orig/debian/libgnomecanvas2-ruby.examples +++ ruby-gnome2-0.16.0/debian/libgnomecanvas2-ruby.examples @@ -0,0 +1 @@ +gnomecanvas/sample/* --- ruby-gnome2-0.16.0.orig/debian/librsvg2-ruby.examples +++ ruby-gnome2-0.16.0/debian/librsvg2-ruby.examples @@ -0,0 +1 @@ +rsvg/sample/* --- ruby-gnome2-0.16.0.orig/debian/rules +++ ruby-gnome2-0.16.0/debian/rules @@ -0,0 +1,32 @@ +#!/usr/bin/make -f + +include /usr/share/cdbs/1/rules/debhelper.mk +include /usr/share/cdbs/1/rules/patchsys-quilt.mk +include /usr/share/ruby-pkg-tools/1/class/ruby-common.mk + +# We might need that +DEB_DH_INSTALL_SOURCEDIR := debian/tmp + +DEB_RUBY_SETUP_CMD = extconf.rb +cdbs_pkgdir = $(CURDIR)/debian/tmp +cdbs_ruby_libdir_ver = $(cdbs_pkgdir)$(DEB_RUBY_LIBDIR)/$(cdbs_ruby_ver) +cdbs_ruby_archdir_ver = $(cdbs_pkgdir)$(DEB_RUBY_ARCHDIR) +DEB_RUBY_INSTALL_ARGS = DESTDIR=$(cdbs_pkgdir) \ + sitelibdir=$(cdbs_ruby_libdir_ver) \ + sitearchdir=$(cdbs_ruby_archdir_ver) + +DEB_RUBY_SETUP_ARGS = --with-cflags="$(CFLAGS)" --with-ldflags="$(LDFLAGS)" + +common-configure-arch:: + /usr/bin/ruby$(cdbs_ruby_ver) $(DEB_RUBY_SETUP_RUBY_ARGS) \ + $(DEB_RUBY_SETUP_CMD) $(DEB_RUBY_SETUP_ARGS) + +common-build-arch:: + $(MAKE) + +common-install-arch:: + $(MAKE) install $(DEB_RUBY_INSTALL_ARGS) + +clean:: + -$(MAKE) distclean + --- ruby-gnome2-0.16.0.orig/debian/libgtk2-ruby.README.Debian +++ ruby-gnome2-0.16.0/debian/libgtk2-ruby.README.Debian @@ -0,0 +1,13 @@ +Implementing Gtk Tray Icons +--------------------------- + +As of Ruby-GNOME2 0.16.0, actualy as of Gtk 2.10.0, the (Ruby) Gtk2 library +implements the tray icon with Gtk::StatusIcon. This officially deprecates +usage of the Gtk::TrayIcon and the gtktrayicon library contained in the +libgtk-trayicon-ruby and libgtk-trayicon-ruby1.8 packages. + +For Lenny, the next Debian release, this package will replace and conflict +libgtk-trayicon-ruby, which will be removed from the suite. Please +update your programs to use Gtk::StatusIcon instead of Gtk::TrayIcon! + +-- Paul van Tilburg , Thu, 24 Mar 2007 08:28:24 +0200