Package: poppler-sharp
Version: 0.0.2-1
Tags: patch
User: ubuntu-de...@lists.ubuntu.com
Usertags: origin-ubuntu ubuntu-patch precise

Hello,

In http://bugs.debian.org/644447 there is some discussion about
updating poppler to 0.18 in Debian. This will cause some FTBFS. We are
doing the transition in Ubuntu now and want to forward patches so that
they are readily available in Debian once 0.18 lands there.

Debdiff attached. I also sent the patch to upstream at
https://github.com/jacintos/poppler-sharp/issues/5

Thanks,

Martin

-- 
Martin Pitt                        | http://www.piware.de
Ubuntu Developer (www.ubuntu.com)  | Debian Developer  (www.debian.org)
diff -Nru poppler-sharp-0.0.2/debian/changelog 
poppler-sharp-0.0.2/debian/changelog
--- poppler-sharp-0.0.2/debian/changelog        2011-07-10 14:08:08.000000000 
+0200
+++ poppler-sharp-0.0.2/debian/changelog        2011-12-07 07:41:54.000000000 
+0100
@@ -1,3 +1,10 @@
+poppler-sharp (0.0.2-1ubuntu1) precise; urgency=low
+
+  * Add poppler-0.18.patch: Drop API which got dropped from poppler 0.18 and
+    bump SONAME. Build against current libpoppler-glib8.
+
+ -- Martin Pitt <martin.p...@ubuntu.com>  Wed, 07 Dec 2011 07:41:23 +0100
+
 poppler-sharp (0.0.2-1) unstable; urgency=low
 
   * debian/copyright:
diff -Nru poppler-sharp-0.0.2/debian/control poppler-sharp-0.0.2/debian/control
--- poppler-sharp-0.0.2/debian/control  2011-07-10 13:59:20.000000000 +0200
+++ poppler-sharp-0.0.2/debian/control  2011-12-07 07:41:56.000000000 +0100
@@ -1,6 +1,7 @@
 Source: poppler-sharp
 Priority: optional
-Maintainer: Debian CLI Libraries Team 
<pkg-cli-libs-t...@lists.alioth.debian.org>
+Maintainer: Ubuntu Developers <ubuntu-devel-disc...@lists.ubuntu.com>
+XSBC-Original-Maintainer: Debian CLI Libraries Team 
<pkg-cli-libs-t...@lists.alioth.debian.org>
 Uploaders: Chow Loong Jin <hyper...@ubuntu.com>
 Build-Depends: debhelper (>= 7.0.50),
                mono-devel (>= 2.4.3),
diff -Nru poppler-sharp-0.0.2/debian/patches/poppler-0.18.patch 
poppler-sharp-0.0.2/debian/patches/poppler-0.18.patch
--- poppler-sharp-0.0.2/debian/patches/poppler-0.18.patch       1970-01-01 
01:00:00.000000000 +0100
+++ poppler-sharp-0.0.2/debian/patches/poppler-0.18.patch       2011-12-07 
07:41:17.000000000 +0100
@@ -0,0 +1,71 @@
+Description: Drop API which got dropped from poppler 0.18 and bump SONAME.
+Author: Martin Pitt <martin.p...@ubuntu.com>
+Bug: https://github.com/jacintos/poppler-sharp/issues/5
+
+Index: poppler-sharp-0.0.2/poppler-sharp/poppler-api.raw
+===================================================================
+--- poppler-sharp-0.0.2.orig/poppler-sharp/poppler-api.raw     2011-07-06 
14:53:20.000000000 +0200
++++ poppler-sharp-0.0.2/poppler-sharp/poppler-api.raw  2011-12-07 
07:38:35.323570430 +0100
+@@ -825,9 +825,6 @@
+       <method name="GetThumbnail" cname="poppler_page_get_thumbnail">
+         <return-type type="cairo_surface_t*" />
+       </method>
+-      <method name="GetThumbnailPixbuf" 
cname="poppler_page_get_thumbnail_pixbuf">
+-        <return-type type="GdkPixbuf*" />
+-      </method>
+       <method name="GetThumbnailSize" cname="poppler_page_get_thumbnail_size">
+         <return-type type="gboolean" />
+         <parameters>
+@@ -871,43 +868,6 @@
+           <parameter type="PopplerColor*" name="background_color" />
+         </parameters>
+       </method>
+-      <method name="RenderSelectionToPixbuf" 
cname="poppler_page_render_selection_to_pixbuf">
+-        <return-type type="void" />
+-        <parameters>
+-          <parameter type="gdouble" name="scale" />
+-          <parameter type="int" name="rotation" />
+-          <parameter type="GdkPixbuf*" name="pixbuf" />
+-          <parameter type="PopplerRectangle*" name="selection" />
+-          <parameter type="PopplerRectangle*" name="old_selection" />
+-          <parameter type="PopplerSelectionStyle" name="style" />
+-          <parameter type="GdkColor*" name="glyph_color" />
+-          <parameter type="GdkColor*" name="background_color" />
+-        </parameters>
+-      </method>
+-      <method name="RenderToPixbuf" cname="poppler_page_render_to_pixbuf">
+-        <return-type type="void" />
+-        <parameters>
+-          <parameter type="int" name="src_x" />
+-          <parameter type="int" name="src_y" />
+-          <parameter type="int" name="src_width" />
+-          <parameter type="int" name="src_height" />
+-          <parameter type="double" name="scale" />
+-          <parameter type="int" name="rotation" />
+-          <parameter type="GdkPixbuf*" name="pixbuf" />
+-        </parameters>
+-      </method>
+-      <method name="RenderToPixbufForPrinting" 
cname="poppler_page_render_to_pixbuf_for_printing">
+-        <return-type type="void" />
+-        <parameters>
+-          <parameter type="int" name="src_x" />
+-          <parameter type="int" name="src_y" />
+-          <parameter type="int" name="src_width" />
+-          <parameter type="int" name="src_height" />
+-          <parameter type="double" name="scale" />
+-          <parameter type="int" name="rotation" />
+-          <parameter type="GdkPixbuf*" name="pixbuf" />
+-        </parameters>
+-      </method>
+       <method name="RenderToPs" cname="poppler_page_render_to_ps">
+         <return-type type="void" />
+         <parameters>
+Index: poppler-sharp-0.0.2/sources/poppler-sharp.dll.config
+===================================================================
+--- poppler-sharp-0.0.2.orig/sources/poppler-sharp.dll.config  2011-07-06 
14:53:20.000000000 +0200
++++ poppler-sharp-0.0.2/sources/poppler-sharp.dll.config       2011-12-07 
07:36:14.639569457 +0100
+@@ -1,3 +1,3 @@
+ <configuration>
+-    <dllmap dll="poppler-glib" target="libpoppler-glib.so.6"/>
++    <dllmap dll="poppler-glib" target="libpoppler-glib.so.8"/>
+ </configuration>
diff -Nru poppler-sharp-0.0.2/debian/patches/series 
poppler-sharp-0.0.2/debian/patches/series
--- poppler-sharp-0.0.2/debian/patches/series   1970-01-01 01:00:00.000000000 
+0100
+++ poppler-sharp-0.0.2/debian/patches/series   2011-12-07 07:35:42.000000000 
+0100
@@ -0,0 +1 @@
+poppler-0.18.patch

Attachment: signature.asc
Description: Digital signature

Reply via email to