Mailinglist Archive: opensuse-commit (1857 mails)

[root@xxxxxxxxxxxxxxx (h_root)]

Hello community,

here is the log from the commit of package pypoppler for openSUSE:Factory
checked in at Tue Sep 20 12:58:59 CEST 2011.



--------
--- pypoppler/pypoppler.changes 2011-04-29 00:12:03.000000000 +0200
+++ /mounts/work_src_done/STABLE/pypoppler/pypoppler.changes    2011-09-20 
11:06:29.000000000 +0200
@@ -1,0 +2,7 @@
+Tue Sep 20 09:05:24 UTC 2011 - vuntz@xxxxxxxxxxxx
+
+- Add pypoppler-0.12.1-poppler-0.18.0.patch: fix build with poppler
+  0.18. Only apply it on 12.1 and later since that's where we have
+  this version of poppler.
+
+-------------------------------------------------------------------

calling whatdependson for head-i586


New:
----
  pypoppler-0.12.1-poppler-0.18.0.patch

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ pypoppler.spec ++++++
--- /var/tmp/diff_new_pack.oDvZCl/_old  2011-09-20 12:58:54.000000000 +0200
+++ /var/tmp/diff_new_pack.oDvZCl/_new  2011-09-20 12:58:54.000000000 +0200
@@ -27,6 +27,8 @@
 Source:         pypoppler-%{version}.tar.bz2
 # PATCH-FIX-UPSTREAM pypoppler-0.12.1-poppler-0.16.0.patch lp#696025 
coolo@xxxxxxxxxx -- Fix build with poppler 0.16.0, based on patch from launchpad
 Patch0:         pypoppler-0.12.1-poppler-0.16.0.patch
+# PATCH-FIX-UPSTREAM pypoppler-0.12.1-poppler-0.18.0.patch lp#776234 
vuntz@xxxxxxxxxxxx -- Fix build with poppler 0.18
+Patch1:         pypoppler-0.12.1-poppler-0.18.0.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 BuildRequires:  pkgconfig(atk)
 BuildRequires:  pkgconfig(poppler-glib)
@@ -55,9 +57,11 @@
 %prep
 %setup -q
 %patch0
+%if 0%{?suse_version} > 1140
+%patch1 -p1
+%endif
 
 %build
-
 %configure
 %__make %{?_smp_mflags}
 

++++++ pypoppler-0.12.1-poppler-0.18.0.patch ++++++
Index: pypoppler-0.12.1/poppler.defs
===================================================================
--- pypoppler-0.12.1.orig/poppler.defs
+++ pypoppler-0.12.1/poppler.defs
@@ -1646,58 +1646,6 @@
   (return-type "GType")
 )
 
-(define-method render_to_pixbuf
-  (of-object "PopplerPage")
-  (c-name "poppler_page_render_to_pixbuf")
-  (return-type "none")
-  (parameters
-    '("int" "src_x")
-    '("int" "src_y")
-    '("int" "src_width")
-    '("int" "src_height")
-    '("double" "scale")
-    '("int" "rotation")
-    '("GdkPixbuf*" "pixbuf")
-  )
-)
-
-(define-method render_to_pixbuf_for_printing
-  (of-object "PopplerPage")
-  (c-name "poppler_page_render_to_pixbuf_for_printing")
-  (return-type "none")
-  (parameters
-    '("int" "src_x")
-    '("int" "src_y")
-    '("int" "src_width")
-    '("int" "src_height")
-    '("double" "scale")
-    '("int" "rotation")
-    '("GdkPixbuf*" "pixbuf")
-  )
-)
-
-(define-method get_thumbnail_pixbuf
-  (of-object "PopplerPage")
-  (c-name "poppler_page_get_thumbnail_pixbuf")
-  (return-type "GdkPixbuf*")
-)
-
-(define-method render_selection_to_pixbuf
-  (of-object "PopplerPage")
-  (c-name "poppler_page_render_selection_to_pixbuf")
-  (return-type "none")
-  (parameters
-    '("gdouble" "scale")
-    '("int" "rotation")
-    '("GdkPixbuf*" "pixbuf")
-    '("PopplerRectangle*" "selection")
-    '("PopplerRectangle*" "old_selection")
-    '("PopplerSelectionStyle" "style")
-    '("GdkColor*" "glyph_color")
-    '("GdkColor*" "background_color")
-  )
-)
-
 (define-method render
   (of-object "PopplerPage")
   (c-name "poppler_page_render")

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++



Remember to have fun...

-- 
To unsubscribe, e-mail: opensuse-commit+unsubscribe@xxxxxxxxxxxx
For additional commands, e-mail: opensuse-commit+help@xxxxxxxxxxxx