Hello community, here is the log from the commit of package evince checked in at Wed Aug 15 20:23:01 CEST 2007. -------- --- GNOME/evince/evince.changes 2007-08-07 22:53:54.000000000 +0200 +++ /mounts/work_src_done/STABLE/evince/evince.changes 2007-08-14 14:29:29.933742000 +0200 @@ -1,0 +2,6 @@ +Tue Aug 14 14:28:16 CEST 2007 - jpr@suse.de + +- Build evince with PDF support and poppler 0.5.4 (#293561) +- Build evince with dejavu support (#288641) + +------------------------------------------------------------------- Old: ---- evince-desktop.patch New: ---- evince-poppler-0.5.4.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ evince.spec ++++++ --- /var/tmp/diff_new_pack.oM3815/_old 2007-08-15 20:22:53.000000000 +0200 +++ /var/tmp/diff_new_pack.oM3815/_new 2007-08-15 20:22:53.000000000 +0200 @@ -11,18 +11,18 @@ # norootforbuild Name: evince -BuildRequires: djvulibre docbook_4 fdupes gcc-c++ ghostscript-fonts-std ghostscript-x11 gnome-doc-utils-devel libglade2-devel libgnomeprintui-devel libgnomeui-devel libstdc++ libtiff-devel nautilus-devel perl-XML-Parser poppler-devel poppler-glib scrollkeeper t1lib-devel texlive-devel update-desktop-files +BuildRequires: docbook_4 fdupes gcc-c++ ghostscript-fonts-std ghostscript-x11 gnome-doc-utils-devel intltool libdjvulibre-devel libglade2-devel libgnomeprintui-devel libgnomeui-devel libstdc++ libtiff-devel nautilus-devel perl-XML-Parser poppler-devel poppler-glib scrollkeeper t1lib-devel texlive-bin-devel texlive-devel update-desktop-files # Only for directory ownership: BuildRequires: gtk-doc Version: 0.9.3 -Release: 5 +Release: 9 URL: http://www.gnome.org/projects/evince/ Group: System/GUI/GNOME License: GPL v2 or later Summary: GNOME Document Viewer Source: ftp://ftp.gnome.org/pub/GNOME/sources/%{name}/0.4/%{name}-%{version}.tar.bz2 -Patch0: evince-desktop.patch Patch1: abuild.patch +Patch2: evince-poppler-0.5.4.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build Autoreqprov: on Requires: %{name}-lang = %{version} @@ -67,10 +67,11 @@ %lang_package %prep %setup -q -%patch0 %patch1 -p1 +%patch2 %build +autoreconf -f -i # needed for evince-0.6.1: export CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing" %configure\ @@ -89,7 +90,7 @@ %find_lang %{name} %find_gconf_schemas cat %{name}.schemas_list >%{name}.lst -%suse_update_desktop_file -N Evince evince +%suse_update_desktop_file -r -N Evince evince GNOME GTK Graphics Office Viewer rm $RPM_BUILD_ROOT%{_libdir}/*/*/*.*a %fdupes $RPM_BUILD_ROOT @@ -121,6 +122,9 @@ %{_datadir}/gtk-doc/html/evince %changelog +* Tue Aug 14 2007 - jpr@suse.de +- Build evince with PDF support and poppler 0.5.4 (#293561) +- Build evince with dejavu support (#288641) * Tue Aug 07 2007 - maw@suse.de - Use %%fdupes - Split off a -lang subpackage. ++++++ evince-poppler-0.5.4.patch ++++++ Index: backend/pdf/ev-poppler.cc ================================================================================ --- backend/pdf/ev-poppler.cc +++ backend/pdf/ev-poppler.cc @@ -1192,6 +1192,7 @@ gint page) { GList *retval = NULL; +#ifdef HAVE_POPPLER_PAGE_GET_IMAGE_MAPPING PdfDocument *pdf_document; PopplerPage *poppler_page; GList *mapping_list; @@ -1220,7 +1221,7 @@ poppler_page_free_image_mapping (mapping_list); g_object_unref (poppler_page); - +#endif /* HAVE_POPPLER_PAGE_GET_IMAGE_MAPPING */ return retval; } @@ -1771,13 +1772,22 @@ TRUE, 8, width, height); - poppler_page_render_selection_to_pixbuf (POPPLER_PAGE (rc->data), - rc->scale, rc->rotation, pixbuf, - (PopplerRectangle *)points, - (PopplerRectangle *)old_points, - POPPLER_SELECTION_NORMAL, /* SelectionStyle */ - text, - base); +#ifdef HAVE_POPPLER_PAGE_RENDER_SELECTION_TO_PIXBUF + poppler_page_render_selection_to_pixbuf (POPPLER_PAGE (rc->data), + rc->scale, rc->rotation, pixbuf, + (PopplerRectangle *)points, + (PopplerRectangle *)old_points, + text, + base); +#else + poppler_page_render_selection (POPPLER_PAGE (rc->data), + rc->scale, rc->rotation, pixbuf, + (PopplerRectangle *)points, + (PopplerRectangle *)old_points, + text, + base); +#endif /* HAVE_POPPLER_PAGE_RENDER_SELECTION_TO_PIXBUF */ + if (*surface) cairo_surface_destroy (*surface); *surface = ev_document_misc_surface_from_pixbuf (pixbuf); @@ -1839,6 +1849,7 @@ pdf_document_get_page_duration (EvDocumentTransition *trans, gint page) { +#ifdef HAVE_POPPLER_PAGE_GET_DURATION PdfDocument *pdf_document; PopplerPage *poppler_page; gdouble duration = -1; @@ -1852,6 +1863,9 @@ g_object_unref (poppler_page); return duration; +#else + return -1; +#endif /* HAVE_POPPLER_PAGE_GET_DURATION */ } static void @@ -1866,6 +1880,7 @@ return PDF_DOCUMENT (g_object_new (PDF_TYPE_DOCUMENT, NULL)); } +#ifdef HAVE_FORMS /* Forms */ static void pdf_document_get_crop_box (EvDocument *document, @@ -1885,7 +1900,6 @@ rect->y2 = poppler_rect.y2; } -#ifdef HAVE_FORMS static EvFormField * ev_form_field_from_poppler_field (PopplerFormField *poppler_field) { --- configure.ac +++ configure.ac @@ -235,7 +235,7 @@ [AC_HELP_STRING([--enable-pdf], [Compile with pdf support])],enable_pdf="$enableval",enable_pdf=yes) if test "x$enable_pdf" = "xyes"; then - POPPLER_REQUIRED=0.5.9 + POPPLER_REQUIRED=0.5.4 PKG_CHECK_MODULES(POPPLER, poppler-glib >= $POPPLER_REQUIRED,enable_pdf=yes,enable_pdf=no) if test "x$enable_pdf" = "xyes"; then @@ -246,12 +246,15 @@ evince_save_LIBS=$LIBS LIBS="$LIBS $FRONTEND_LIBS" - AC_CHECK_FUNCS(poppler_page_render) + dnl AC_CHECK_FUNCS(poppler_page_render) dnl we need latest poppler cvs head, dnl this function was the last to be added AC_CHECK_FUNCS(poppler_form_field_button_get_button_type) AC_CHECK_FUNCS(poppler_form_field_text_get_max_len) AC_CHECK_FUNCS(poppler_form_field_text_is_password) + AC_CHECK_FUNCS(poppler_page_get_duration) + AC_CHECK_FUNCS(poppler_page_get_image_mapping) + AC_CHECK_FUNCS(poppler_page_render_selection_to_pixbuf) LIBS=$evince_save_LIBS PKG_CHECK_MODULES(CAIRO_PDF, cairo-pdf, enable_cairo_pdf=yes, enable_cairo_pdf=no) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org