mutter: update to 3.32.1.

This commit is contained in:
maxice8 2019-04-17 21:30:48 -03:00 committed by maxice8
parent b5cdfadf9b
commit a90523378d
2 changed files with 4 additions and 94 deletions

View File

@ -1,91 +0,0 @@
https://github.com/mesonbuild/meson/issues/5050
--- clutter/clutter/meson.build
+++ clutter/clutter/meson.build
@@ -577,16 +577,16 @@ if have_introspection
endif
install_headers(clutter_headers,
- subdir: clutter_clutter_includedir)
+ install_dir: clutter_clutter_includedir)
install_headers(cally_headers,
- subdir: join_paths(clutter_includedir, 'cally'))
+ install_dir: join_paths(clutter_includedir, 'cally'))
install_headers(clutter_deprecated_headers,
- subdir: join_paths(clutter_clutter_includedir, 'deprecated'))
+ install_dir: join_paths(clutter_clutter_includedir, 'deprecated'))
install_headers(clutter_x11_headers,
- subdir: join_paths(clutter_clutter_includedir, 'x11'))
+ install_dir: join_paths(clutter_clutter_includedir, 'x11'))
pkg.generate(libmutter_clutter,
name: 'Mutters Clutter',
--- cogl/cogl-gles2/meson.build
+++ cogl/cogl-gles2/meson.build
@@ -29,7 +29,7 @@ libmutter_cogl_gles2 = shared_library('mutter-cogl-gles2-' + libmutter_api_versi
cogl_gles2_includedir = join_paths(cogl_includedir, 'cogl-gles2/GLES2')
install_headers(cogl_gles2_public_headers,
- subdir: cogl_gles2_includedir)
+ install_dir: cogl_gles2_includedir)
pkg.generate(libmutter_cogl_gles2,
name: 'CoglGles2',
--- cogl/cogl-pango/meson.build
+++ cogl/cogl-pango/meson.build
@@ -71,7 +71,7 @@ if have_introspection
endif
cogl_pango_includedir = join_paths(cogl_includedir, 'cogl-pango')
-install_headers(cogl_pango_public_headers, subdir: cogl_pango_includedir)
+install_headers(cogl_pango_public_headers, install_dir: cogl_pango_includedir)
pkg.generate(libmutter_cogl_pango,
name: 'CoglPango',
--- cogl/cogl-path/meson.build
+++ cogl/cogl-path/meson.build
@@ -76,7 +76,7 @@ libmutter_cogl_path_dep = declare_dependency(
)
install_headers(cogl_path_public_headers,
- subdir: cogl_path_includedir)
+ install_dir: cogl_path_includedir)
pkg.generate(libmutter_cogl_path,
name: 'CoglPath',
--- cogl/cogl/meson.build
+++ cogl/cogl/meson.build
@@ -514,16 +514,16 @@ install_headers([
cogl_headers,
cogl_nonintrospected_headers,
],
- subdir: cogl_cogl_includedir)
+ install_dir: cogl_cogl_includedir)
install_headers([
cogl_deprecated_headers,
cogl_deprecated_nonintrospected_headers,
],
- subdir: join_paths(cogl_cogl_includedir, 'deprecated'))
+ install_dir: join_paths(cogl_cogl_includedir, 'deprecated'))
install_headers(cogl_gl_prototype_headers,
- subdir: join_paths(cogl_cogl_includedir, 'gl-prototypes'))
+ install_dir: join_paths(cogl_cogl_includedir, 'gl-prototypes'))
pkg.generate(libmutter_cogl,
name: 'Cogl',
--- src/meta/meson.build
+++ src/meta/meson.build
@@ -48,7 +48,7 @@ if have_x11
endif
install_headers(mutter_public_headers,
- subdir: mutter_includedir
+ install_dir: mutter_includedir
)
mutter_public_header_files = files(mutter_public_headers)

View File

@ -1,6 +1,6 @@
# Template file for 'mutter'
pkgname=mutter
version=3.32.0
version=3.32.1
revision=1
build_helper="gir"
build_style=meson
@ -17,8 +17,9 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
license="GPL-2.0-or-later"
homepage="https://wiki.gnome.org/Projects/Mutter/"
distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
checksum=7668a2208cb40f0f0c3a90dd72c3ea83993dbdfc24f517c6fa95abc04a8e1f19
shlib_provides="libmutter-clutter-4.so libmutter-cogl-4.so libmutter-cogl-gles2-4.so libmutter-cogl-pango-4.so libmutter-cogl-path-4.so"
checksum=520082efae0f60f252eed2d0e45e174524f7d7ee1e6bbdbaf5c06f0456a6e4e0
shlib_provides="libmutter-clutter-4.so libmutter-cogl-4.so
libmutter-cogl-gles2-4.so libmutter-cogl-pango-4.so libmutter-cogl-path-4.so"
case "$XBPS_TARGET_MACHINE" in
i686-musl|x86_64-musl) ;;