Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=ba786c586d316589fbd458010e1d5b4ec26135e9
commit ba786c586d316589fbd458010e1d5b4ec26135e9 Author: Slown <[email protected]> Date: Sun Jun 15 21:30:38 2014 +0100 webkit2pdf-0.3-1-i686 * version bump * remove patch diff --git a/source/xapps-extra/webkit2pdf/FrugalBuild b/source/xapps-extra/webkit2pdf/FrugalBuild index f93c950..95f8fc3 100644 --- a/source/xapps-extra/webkit2pdf/FrugalBuild +++ b/source/xapps-extra/webkit2pdf/FrugalBuild @@ -2,17 +2,15 @@ # Maintainer: Slown <[email protected]> pkgname=webkit2pdf -pkgver=0.2 -pkgrel=3 +pkgver=0.3 +pkgrel=1 pkgdesc="A little tool designed to fetch wep pages and export them to numbered PDF files" depends=('webkit-gtk2' 'poppler-glib>=0.20.3') makedepends=('intltool') groups=('xapps-extra') archs=('i686' 'x86_64') Finclude sourceforge -source=($source poppler-0.18.patch) -sha1sums=('bd4ecc533817f8e6ec2805fa659f0f206e586f7a' \ - 'c958f8dc846712122451fddd3450b836ff393ae4') +sha1sums=('7433e1c666b7c224f09b818137261a06d5e4dc87') build() { export LDFLAGS="-lgthread-2.0" diff --git a/source/xapps-extra/webkit2pdf/poppler-0.18.patch b/source/xapps-extra/webkit2pdf/poppler-0.18.patch deleted file mode 100644 index dfb3f76..0000000 --- a/source/xapps-extra/webkit2pdf/poppler-0.18.patch +++ /dev/null @@ -1,150 +0,0 @@ -Description: If building with a poppler >= 0.17, provide our own poppler_page_render_to_pixbuf() function. -Author: Martin Pitt <[email protected]> -Bug: http://sourceforge.net/tracker/?func=detail&aid=3306044&group_id=264450&atid=1127720 - -Index: webkit2pdf/src/main.c -=================================================================== ---- webkit2pdf.orig/src/main.c 2011-12-12 16:42:39.662892000 +0100 -+++ webkit2pdf/src/main.c 2011-12-12 17:29:41.403366937 +0100 -@@ -53,6 +53,141 @@ - gboolean enable_scripts = TRUE; - gboolean print_backgrounds = FALSE; - -+#ifndef POPPLER_WITH_GDK -+#include <goo/gtypes.h> -+ -+static void -+copy_cairo_surface_to_pixbuf (cairo_surface_t *surface, -+ GdkPixbuf *pixbuf) -+{ -+ int cairo_width, cairo_height, cairo_rowstride; -+ unsigned char *pixbuf_data, *dst, *cairo_data; -+ int pixbuf_rowstride, pixbuf_n_channels; -+ unsigned int *src; -+ int x, y; -+ -+ cairo_width = cairo_image_surface_get_width (surface); -+ cairo_height = cairo_image_surface_get_height (surface); -+ cairo_rowstride = cairo_image_surface_get_stride (surface); -+ cairo_data = cairo_image_surface_get_data (surface); -+ -+ pixbuf_data = gdk_pixbuf_get_pixels (pixbuf); -+ pixbuf_rowstride = gdk_pixbuf_get_rowstride (pixbuf); -+ pixbuf_n_channels = gdk_pixbuf_get_n_channels (pixbuf); -+ -+ if (cairo_width > gdk_pixbuf_get_width (pixbuf)) -+ cairo_width = gdk_pixbuf_get_width (pixbuf); -+ if (cairo_height > gdk_pixbuf_get_height (pixbuf)) -+ cairo_height = gdk_pixbuf_get_height (pixbuf); -+ for (y = 0; y < cairo_height; y++) -+ { -+ src = (unsigned int *) (cairo_data + y * cairo_rowstride); -+ dst = pixbuf_data + y * pixbuf_rowstride; -+ for (x = 0; x < cairo_width; x++) -+ { -+ dst[0] = (*src >> 16) & 0xff; -+ dst[1] = (*src >> 8) & 0xff; -+ dst[2] = (*src >> 0) & 0xff; -+ if (pixbuf_n_channels == 4) -+ dst[3] = (*src >> 24) & 0xff; -+ dst += pixbuf_n_channels; -+ src++; -+ } -+ } -+} -+ -+static void -+_poppler_page_render_to_pixbuf (PopplerPage *page, -+ int src_x, int src_y, -+ int src_width, int src_height, -+ double scale, -+ int rotation, -+ GBool printing, -+ GdkPixbuf *pixbuf) -+{ -+ cairo_t *cr; -+ cairo_surface_t *surface; -+ -+ surface = cairo_image_surface_create (CAIRO_FORMAT_ARGB32, -+ src_width, src_height); -+ cr = cairo_create (surface); -+ cairo_save (cr); -+ switch (rotation) { -+ case 90: -+ cairo_translate (cr, src_x + src_width, -src_y); -+ break; -+ case 180: -+ cairo_translate (cr, src_x + src_width, src_y + src_height); -+ break; -+ case 270: -+ cairo_translate (cr, -src_x, src_y + src_height); -+ break; -+ default: -+ cairo_translate (cr, -src_x, -src_y); -+ } -+ -+ if (scale != 1.0) -+ cairo_scale (cr, scale, scale); -+ -+ if (rotation != 0) -+ cairo_rotate (cr, rotation * G_PI / 180.0); -+ -+ if (printing) -+ poppler_page_render_for_printing (page, cr); -+ else -+ poppler_page_render (page, cr); -+ cairo_restore (cr); -+ -+ cairo_set_operator (cr, CAIRO_OPERATOR_DEST_OVER); -+ cairo_set_source_rgb (cr, 1., 1., 1.); -+ cairo_paint (cr); -+ -+ cairo_destroy (cr); -+ -+ copy_cairo_surface_to_pixbuf (surface, pixbuf); -+ cairo_surface_destroy (surface); -+} -+ -+/** -+ * poppler_page_render_to_pixbuf: -+ * @page: the page to render from -+ * @src_x: x coordinate of upper left corner -+ * @src_y: y coordinate of upper left corner -+ * @src_width: width of rectangle to render -+ * @src_height: height of rectangle to render -+ * @scale: scale specified as pixels per point -+ * @rotation: rotate the document by the specified degree -+ * @pixbuf: pixbuf to render into -+ * -+ * First scale the document to match the specified pixels per point, -+ * then render the rectangle given by the upper left corner at -+ * (src_x, src_y) and src_width and src_height. -+ * This function is for rendering a page that will be displayed. -+ * If you want to render a page that will be printed use -+ * poppler_page_render_to_pixbuf_for_printing() instead -+ * -+ * Deprecated: 0.16 -+ **/ -+void -+poppler_page_render_to_pixbuf (PopplerPage *page, -+ int src_x, int src_y, -+ int src_width, int src_height, -+ double scale, -+ int rotation, -+ GdkPixbuf *pixbuf) -+{ -+ g_return_if_fail (POPPLER_IS_PAGE (page)); -+ g_return_if_fail (scale > 0.0); -+ g_return_if_fail (pixbuf != NULL); -+ -+ _poppler_page_render_to_pixbuf (page, src_x, src_y, -+ src_width, src_height, -+ scale, rotation, -+ gFalse, -+ pixbuf); -+} -+#endif -+ - static WebKitNavigationResponse navigation_requested(WebKitWebView *view, - WebKitWebFrame *frame, - WebKitNetworkRequest *netreq, _______________________________________________ Frugalware-git mailing list [email protected] http://frugalware.org/mailman/listinfo/frugalware-git
