Date: Sunday, August 20, 2017 @ 18:48:58 Author: heftig Revision: 302935
2.36.9-1 Modified: gdk-pixbuf2/trunk/PKGBUILD Deleted: gdk-pixbuf2/trunk/0001-gdk-pixbuf-xlib-Mark-public-funcs-_GDK_PIXBUF_EXTERN.patch gdk-pixbuf2/trunk/0001-meson-Use-configure_file-to-copy-typesfile.patch gdk-pixbuf2/trunk/0002-meson-Use-include_directories-references-throughout.patch gdk-pixbuf2/trunk/0003-meson-Use-the-right-dependency-for-gtkdoc.patch -----------------------------------------------------------------+ 0001-gdk-pixbuf-xlib-Mark-public-funcs-_GDK_PIXBUF_EXTERN.patch | 247 ---------- 0001-meson-Use-configure_file-to-copy-typesfile.patch | 41 - 0002-meson-Use-include_directories-references-throughout.patch | 114 ---- 0003-meson-Use-the-right-dependency-for-gtkdoc.patch | 32 - PKGBUILD | 22 5 files changed, 3 insertions(+), 453 deletions(-) Deleted: 0001-gdk-pixbuf-xlib-Mark-public-funcs-_GDK_PIXBUF_EXTERN.patch =================================================================== --- 0001-gdk-pixbuf-xlib-Mark-public-funcs-_GDK_PIXBUF_EXTERN.patch 2017-08-20 18:45:16 UTC (rev 302934) +++ 0001-gdk-pixbuf-xlib-Mark-public-funcs-_GDK_PIXBUF_EXTERN.patch 2017-08-20 18:48:58 UTC (rev 302935) @@ -1,247 +0,0 @@ -From d2b3d6667f1f767d96e084a8babef16d87dddf02 Mon Sep 17 00:00:00 2001 -Message-Id: <d2b3d6667f1f767d96e084a8babef16d87dddf02.1502618072.git.jan.steff...@gmail.com> -From: "Jan Alexander Steffens (heftig)" <jan.steff...@gmail.com> -Date: Sun, 13 Aug 2017 11:36:15 +0200 -Subject: [PATCH] gdk-pixbuf-xlib: Mark public funcs _GDK_PIXBUF_EXTERN - -Without this, the meson-built libgdk_pixbuf_xlib has no exports at all. ---- - contrib/gdk-pixbuf-xlib/gdk-pixbuf-xlib.h | 7 +++++++ - contrib/gdk-pixbuf-xlib/gdk-pixbuf-xlibrgb.h | 24 +++++++++++++++++++++++- - 2 files changed, 30 insertions(+), 1 deletion(-) - -diff --git a/contrib/gdk-pixbuf-xlib/gdk-pixbuf-xlib.h b/contrib/gdk-pixbuf-xlib/gdk-pixbuf-xlib.h -index c755546818b2e127..d81db1b36dc82a73 100644 ---- a/contrib/gdk-pixbuf-xlib/gdk-pixbuf-xlib.h -+++ b/contrib/gdk-pixbuf-xlib/gdk-pixbuf-xlib.h -@@ -30,49 +30,56 @@ G_BEGIN_DECLS - - /* init */ - -+_GDK_PIXBUF_EXTERN - void gdk_pixbuf_xlib_init (Display *display, int screen_num); - -+_GDK_PIXBUF_EXTERN - void gdk_pixbuf_xlib_init_with_depth (Display *display, int screen_num, - int prefDepth); - - - - /* render */ - -+_GDK_PIXBUF_EXTERN - void gdk_pixbuf_xlib_render_threshold_alpha (GdkPixbuf *pixbuf, Pixmap bitmap, - int src_x, int src_y, - int dest_x, int dest_y, - int width, int height, - int alpha_threshold); - -+_GDK_PIXBUF_EXTERN - void gdk_pixbuf_xlib_render_to_drawable (GdkPixbuf *pixbuf, - Drawable drawable, GC gc, - int src_x, int src_y, - int dest_x, int dest_y, - int width, int height, - XlibRgbDither dither, - int x_dither, int y_dither); - - -+_GDK_PIXBUF_EXTERN - void gdk_pixbuf_xlib_render_to_drawable_alpha (GdkPixbuf *pixbuf, - Drawable drawable, - int src_x, int src_y, - int dest_x, int dest_y, - int width, int height, - GdkPixbufAlphaMode alpha_mode, - int alpha_threshold, - XlibRgbDither dither, - int x_dither, int y_dither); - -+_GDK_PIXBUF_EXTERN - void gdk_pixbuf_xlib_render_pixmap_and_mask (GdkPixbuf *pixbuf, - Pixmap *pixmap_return, - Pixmap *mask_return, - int alpha_threshold); - - - - /* drawable */ - -+_GDK_PIXBUF_EXTERN - GdkPixbuf *gdk_pixbuf_xlib_get_from_drawable (GdkPixbuf *dest, - Drawable src, - Colormap cmap, Visual *visual, -diff --git a/contrib/gdk-pixbuf-xlib/gdk-pixbuf-xlibrgb.h b/contrib/gdk-pixbuf-xlib/gdk-pixbuf-xlibrgb.h -index f838ea8079d43cc1..689d4f75fd131fce 100644 ---- a/contrib/gdk-pixbuf-xlib/gdk-pixbuf-xlibrgb.h -+++ b/contrib/gdk-pixbuf-xlib/gdk-pixbuf-xlibrgb.h -@@ -51,37 +51,42 @@ - #ifndef __XLIB_RGB_H__ - #define __XLIB_RGB_H__ - --#include <glib.h> -+#include <gdk-pixbuf/gdk-pixbuf.h> - - G_BEGIN_DECLS - - #include <X11/Xlib.h> - #include <X11/Xutil.h> - - /** - * XlibRgbCmap: - * @colors: FIXME. - * @lut: FIXME. - * - * FIXME: Describe this. - */ - typedef struct _XlibRgbCmap XlibRgbCmap; - struct _XlibRgbCmap { - unsigned int colors[256]; - unsigned char lut[256]; /* for 8-bit modes */ - }; - -+_GDK_PIXBUF_EXTERN - void - xlib_rgb_init (Display *display, Screen *screen); -+_GDK_PIXBUF_EXTERN - void - xlib_rgb_init_with_depth (Display *display, Screen *screen, int prefDepth); - -+_GDK_PIXBUF_EXTERN - unsigned long - xlib_rgb_xpixel_from_rgb (guint32 rgb); - -+_GDK_PIXBUF_EXTERN - void - xlib_rgb_gc_set_foreground (GC gc, guint32 rgb); - -+_GDK_PIXBUF_EXTERN - void - xlib_rgb_gc_set_background (GC gc, guint32 rgb); - -@@ -109,100 +114,117 @@ typedef enum - XLIB_RGB_DITHER_MAX - } XlibRgbDither; - -+_GDK_PIXBUF_EXTERN - void - xlib_draw_rgb_image (Drawable drawable, - GC gc, - int x, - int y, - int width, - int height, - XlibRgbDither dith, - unsigned char *rgb_buf, - int rowstride); - -+_GDK_PIXBUF_EXTERN - void - xlib_draw_rgb_image_dithalign (Drawable drawable, - GC gc, - int x, - int y, - int width, - int height, - XlibRgbDither dith, - unsigned char *rgb_buf, - int rowstride, - int xdith, - int ydith); - -+_GDK_PIXBUF_EXTERN - void - xlib_draw_rgb_32_image (Drawable drawable, - GC gc, - int x, - int y, - int width, - int height, - XlibRgbDither dith, - unsigned char *buf, - int rowstride); - -+_GDK_PIXBUF_EXTERN - void - xlib_draw_gray_image (Drawable drawable, - GC gc, - int x, - int y, - int width, - int height, - XlibRgbDither dith, - unsigned char *buf, - int rowstride); - -+_GDK_PIXBUF_EXTERN - XlibRgbCmap * - xlib_rgb_cmap_new (guint32 *colors, int n_colors); - -+_GDK_PIXBUF_EXTERN - void - xlib_rgb_cmap_free (XlibRgbCmap *cmap); - -+_GDK_PIXBUF_EXTERN - void - xlib_draw_indexed_image (Drawable drawable, - GC gc, - int x, - int y, - int width, - int height, - XlibRgbDither dith, - unsigned char *buf, - int rowstride, - XlibRgbCmap *cmap); - - /* Below are some functions which are primarily useful for debugging - and experimentation. */ -+_GDK_PIXBUF_EXTERN - Bool - xlib_rgb_ditherable (void); - -+_GDK_PIXBUF_EXTERN - void - xlib_rgb_set_verbose (Bool verbose); - - /* experimental colormap stuff */ -+_GDK_PIXBUF_EXTERN - void - xlib_rgb_set_install (Bool install); - -+_GDK_PIXBUF_EXTERN - void - xlib_rgb_set_min_colors (int min_colors); - -+_GDK_PIXBUF_EXTERN - Colormap - xlib_rgb_get_cmap (void); - -+_GDK_PIXBUF_EXTERN - Visual * - xlib_rgb_get_visual (void); - -+_GDK_PIXBUF_EXTERN - XVisualInfo * - xlib_rgb_get_visual_info (void); - -+_GDK_PIXBUF_EXTERN - int - xlib_rgb_get_depth (void); - -+_GDK_PIXBUF_EXTERN - Display * - xlib_rgb_get_display (void); - -+_GDK_PIXBUF_EXTERN - Screen * - xlib_rgb_get_screen (void); - - -base-commit: 43655b14b176f3cf027e313aed7835d89d077e1d -prerequisite-patch-id: 86cfadc78ae46f013949400be50c6ee5dbf7b45e -prerequisite-patch-id: 0eed2942b2e2937daf34f30aac3d21ec5581e0a5 -prerequisite-patch-id: 41089e023cf12231a08bd99d3b61050d40b12324 --- -2.14.1 - Deleted: 0001-meson-Use-configure_file-to-copy-typesfile.patch =================================================================== --- 0001-meson-Use-configure_file-to-copy-typesfile.patch 2017-08-20 18:45:16 UTC (rev 302934) +++ 0001-meson-Use-configure_file-to-copy-typesfile.patch 2017-08-20 18:48:58 UTC (rev 302935) @@ -1,41 +0,0 @@ -From 266ddc3e38107862811927371cbf4b88fdfe4872 Mon Sep 17 00:00:00 2001 -Message-Id: <266ddc3e38107862811927371cbf4b88fdfe4872.1502135873.git.jan.steff...@gmail.com> -From: "Jan Alexander Steffens (heftig)" <jan.steff...@gmail.com> -Date: Mon, 7 Aug 2017 20:55:35 +0200 -Subject: [PATCH 1/3] meson: Use configure_file() to copy typesfile - -The working directory is the builddir and gnome.gtkdoc is not smart -enough to figure out whether the filename(s) passed are found in the -builddir or srcdir. Using files() doesn't help, either, since it always -generates paths to the builddir. - -Other projects (GStreamer, Grilo) seem to use configure_file to copy the -typesfile to the builddir. Follow this. - -This fixes the following error: - - Cannot open gdk-pixbuf.types: No such file or directory ---- - docs/reference/gdk-pixbuf/meson.build | 4 ++++ - 1 file changed, 4 insertions(+) - -diff --git a/docs/reference/gdk-pixbuf/meson.build b/docs/reference/gdk-pixbuf/meson.build -index 47f241094b4bf16c..6762d8da44f5c57c 100644 ---- a/docs/reference/gdk-pixbuf/meson.build -+++ b/docs/reference/gdk-pixbuf/meson.build -@@ -21,6 +21,10 @@ private_headers = [ - ] - - if get_option('with_docs') -+ configure_file(input: 'gdk-pixbuf.types', -+ output: 'gdk-pixbuf.types', -+ configuration: configuration_data()) -+ - gnome.gtkdoc('gdk-pixbuf', - main_xml: 'gdk-pixbuf.xml', - src_dir: [ - -base-commit: 31c0a1f43aaeddef706057065e38bbfc205dbbe0 --- -2.13.2 - Deleted: 0002-meson-Use-include_directories-references-throughout.patch =================================================================== --- 0002-meson-Use-include_directories-references-throughout.patch 2017-08-20 18:45:16 UTC (rev 302934) +++ 0002-meson-Use-include_directories-references-throughout.patch 2017-08-20 18:48:58 UTC (rev 302935) @@ -1,114 +0,0 @@ -From d1611a8125525f621fc5113a88604146c1ad049c Mon Sep 17 00:00:00 2001 -Message-Id: <d1611a8125525f621fc5113a88604146c1ad049c.1502135873.git.jan.steff...@gmail.com> -In-Reply-To: <266ddc3e38107862811927371cbf4b88fdfe4872.1502135873.git.jan.steff...@gmail.com> -References: <266ddc3e38107862811927371cbf4b88fdfe4872.1502135873.git.jan.steff...@gmail.com> -From: "Jan Alexander Steffens (heftig)" <jan.steff...@gmail.com> -Date: Mon, 7 Aug 2017 20:55:35 +0200 -Subject: [PATCH 2/3] meson: Use include_directories references throughout - ---- - contrib/gdk-pixbuf-xlib/meson.build | 2 ++ - docs/reference/gdk-pixbuf/meson.build | 5 ++--- - gdk-pixbuf/meson.build | 8 +++++--- - tests/meson.build | 2 +- - 4 files changed, 10 insertions(+), 7 deletions(-) - -diff --git a/contrib/gdk-pixbuf-xlib/meson.build b/contrib/gdk-pixbuf-xlib/meson.build -index 71b50be3f8567c57..34f945b79ed599a6 100644 ---- a/contrib/gdk-pixbuf-xlib/meson.build -+++ b/contrib/gdk-pixbuf-xlib/meson.build -@@ -10,6 +10,8 @@ gdkpixbuf_xlib_headers = [ - 'gdk-pixbuf-xlibrgb.h', - ] - -+gdkpixbuf_xlib_inc = include_directories('.') -+ - gdkpixbuf_xlib_api_path = join_paths('gdk-pixbuf-@0@'.format(gdk_pixbuf_api_version), 'gdk-pixbuf-xlib') - - install_headers(gdkpixbuf_xlib_headers, subdir: gdkpixbuf_xlib_api_path) -diff --git a/docs/reference/gdk-pixbuf/meson.build b/docs/reference/gdk-pixbuf/meson.build -index 6762d8da44f5c57c..5d7c9b6c1cc26579 100644 ---- a/docs/reference/gdk-pixbuf/meson.build -+++ b/docs/reference/gdk-pixbuf/meson.build -@@ -28,9 +28,8 @@ if get_option('with_docs') - gnome.gtkdoc('gdk-pixbuf', - main_xml: 'gdk-pixbuf.xml', - src_dir: [ -- join_paths(meson.source_root(), 'gdk-pixbuf'), -- join_paths(meson.build_root(), 'gdk-pixbuf'), -- join_paths(meson.source_root(), 'contrib', 'gdk-pixbuf-xlib'), -+ gdk_pixbuf_inc, -+ gdkpixbuf_xlib_inc, - ], - dependencies: gdk_pixbuf_deps, - gobject_typesfile: 'gdk-pixbuf.types', -diff --git a/gdk-pixbuf/meson.build b/gdk-pixbuf/meson.build -index c52728220b9fc68a..bc4ef4ff26b772e6 100644 ---- a/gdk-pixbuf/meson.build -+++ b/gdk-pixbuf/meson.build -@@ -21,6 +21,8 @@ loaders = [ - [ 'qtif', [ 'io-qtif.c' ] ] - ] - -+gdk_pixbuf_inc = include_directories('.') -+ - gdk_pixbuf_cflags = [ - '-DG_LOG_STRUCTURED=1', - '-DG_LOG_DOMAIN="GdkPixbuf"', -@@ -102,7 +104,7 @@ foreach l: loaders - mod = static_library('staticpixbufloader-@0@'.format(name), - sources, - dependencies: loaders_deps + gdk_pixbuf_deps, -- include_directories: [ root_inc, include_directories('.') ], -+ include_directories: [ root_inc, gdk_pixbuf_inc ], - c_args: common_cflags + gdk_pixbuf_cflags) - - included_loaders_deps += declare_dependency(link_with: mod) -@@ -138,29 +140,29 @@ foreach l: loaders - mod = shared_module('pixbufloader-@0@'.format(name), - sources, - dependencies: loaders_deps + gdk_pixbuf_deps + [ gdkpixbuf_dep ], -- include_directories: [ root_inc, include_directories('.') ], -+ include_directories: [ root_inc, gdk_pixbuf_inc ], - c_args: common_cflags + gdk_pixbuf_cflags, - install: true, - install_dir: gdk_pixbuf_loaderdir) - - # We need the path to build loaders.cache for tests - dynamic_loaders += mod.full_path() - endif - endforeach - - gdkpixbuf_bin = [ - [ 'gdk-pixbuf-csource' ], - [ 'gdk-pixbuf-pixdata' ], - [ 'gdk-pixbuf-query-loaders', [ 'queryloaders.c' ] ], - ] - - foreach bin: gdkpixbuf_bin - bin_name = bin[0] - bin_source = bin.get(1, bin_name + '.c') - - bin = executable(bin_name, bin_source, - dependencies: gdk_pixbuf_deps + [ gdkpixbuf_dep ], -- include_directories: [ root_inc, include_directories('.') ], -+ include_directories: [ root_inc, gdk_pixbuf_inc ], - c_args: common_cflags + gdk_pixbuf_cflags, - install: true) - -diff --git a/tests/meson.build b/tests/meson.build -index a40ea94135316003..33694e5383bc6c43 100644 ---- a/tests/meson.build -+++ b/tests/meson.build -@@ -112,7 +112,7 @@ foreach t: installed_tests - dependencies: test_deps, - include_directories: [ - root_inc, -- include_directories('../gdk-pixbuf') -+ gdk_pixbuf_inc, - ], - c_args: common_cflags) - --- -2.13.2 - Deleted: 0003-meson-Use-the-right-dependency-for-gtkdoc.patch =================================================================== --- 0003-meson-Use-the-right-dependency-for-gtkdoc.patch 2017-08-20 18:45:16 UTC (rev 302934) +++ 0003-meson-Use-the-right-dependency-for-gtkdoc.patch 2017-08-20 18:48:58 UTC (rev 302935) @@ -1,32 +0,0 @@ -From 5d0f8b175f98dc1d622f000442316c7a4aa727e0 Mon Sep 17 00:00:00 2001 -Message-Id: <5d0f8b175f98dc1d622f000442316c7a4aa727e0.1502135873.git.jan.steff...@gmail.com> -In-Reply-To: <266ddc3e38107862811927371cbf4b88fdfe4872.1502135873.git.jan.steff...@gmail.com> -References: <266ddc3e38107862811927371cbf4b88fdfe4872.1502135873.git.jan.steff...@gmail.com> -From: "Jan Alexander Steffens (heftig)" <jan.steff...@gmail.com> -Date: Mon, 7 Aug 2017 21:39:49 +0200 -Subject: [PATCH 3/3] meson: Use the right dependency for gtkdoc - -The gdkpixbuf_dep pulls in the right include dir. This fixes the -following error: - - gdk-pixbuf-scan.c:7:10: fatal error: gdk-pixbuf/gdk-pixbuf.h: No such file or directory ---- - docs/reference/gdk-pixbuf/meson.build | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/docs/reference/gdk-pixbuf/meson.build b/docs/reference/gdk-pixbuf/meson.build -index 5d7c9b6c1cc26579..5d4bae492fb5d037 100644 ---- a/docs/reference/gdk-pixbuf/meson.build -+++ b/docs/reference/gdk-pixbuf/meson.build -@@ -31,7 +31,7 @@ if get_option('with_docs') - gdk_pixbuf_inc, - gdkpixbuf_xlib_inc, - ], -- dependencies: gdk_pixbuf_deps, -+ dependencies: gdkpixbuf_dep, - gobject_typesfile: 'gdk-pixbuf.types', - scan_args: [ - '--deprecated-guards="GDK_PIXBUF_ENABLE_BROKEN|GDK_PIXBUF_DISABLE_DEPRECATED"', --- -2.13.2 - Modified: PKGBUILD =================================================================== --- PKGBUILD 2017-08-20 18:45:16 UTC (rev 302934) +++ PKGBUILD 2017-08-20 18:48:58 UTC (rev 302935) @@ -2,8 +2,8 @@ # Contributor: Ionut Biru <ib...@archlinux.org> pkgname=gdk-pixbuf2 -pkgver=2.36.8 -pkgrel=2 +pkgver=2.36.9 +pkgrel=1 pkgdesc="An image loading library" arch=(i686 x86_64) url="https://wiki.gnome.org/Projects/GdkPixbuf" @@ -11,18 +11,10 @@ depends=(glib2 libpng libtiff libjpeg libx11 jasper shared-mime-info) makedepends=(gtk-doc gobject-introspection git docbook-xsl meson) install=gdk-pixbuf2.install -_commit=31c0a1f43aaeddef706057065e38bbfc205dbbe0 # tags/2.36.8^0 +_commit=9cc9f903b4680d76cb0b6cdbf730f13bd440472a # tags/2.36.9^0 source=("git+https://git.gnome.org/browse/gdk-pixbuf#commit=$_commit" - 0001-meson-Use-configure_file-to-copy-typesfile.patch - 0002-meson-Use-include_directories-references-throughout.patch - 0003-meson-Use-the-right-dependency-for-gtkdoc.patch - 0001-gdk-pixbuf-xlib-Mark-public-funcs-_GDK_PIXBUF_EXTERN.patch gdk-pixbuf-query-loaders.hook) sha256sums=('SKIP' - 'b0a5ea767ecf78f346ed89be715a71c5bcc9c107eb697f7f018699ba4ddc3481' - '9ba1eb2df860157a93cda5968a3bb1d04650a82287fee6d97654956f7f1a613c' - 'c0b7b99efc08a3488f939b108dd33c6569d4cf73c3aa5a13a79a54c3d52459d3' - 'eed1f90e27b78af65363bc65600bf0f8d79ab3ce60768f749dfaafdc8122ccdb' '963afcfacde9fd36031d93c8aa4c94a669ab1dbe9ba0d2cf17599b7d358e54c2') pkgver() { @@ -33,14 +25,6 @@ prepare() { mkdir build cd gdk-pixbuf - - # Fix docs build - patch -Np1 -i ../0001-meson-Use-configure_file-to-copy-typesfile.patch - patch -Np1 -i ../0002-meson-Use-include_directories-references-throughout.patch - patch -Np1 -i ../0003-meson-Use-the-right-dependency-for-gtkdoc.patch - - # Fix exports - patch -Np1 -i ../0001-gdk-pixbuf-xlib-Mark-public-funcs-_GDK_PIXBUF_EXTERN.patch } build() {