diff options
| author | William Pitcock <nenolod@dereferenced.org> | 2017-06-05 22:34:19 +0000 |
|---|---|---|
| committer | William Pitcock <nenolod@dereferenced.org> | 2017-06-05 22:34:19 +0000 |
| commit | d99c6b4f765411358c7728e8da6c59f4eb524ce5 (patch) | |
| tree | 8e13e8c145a7bba7e3f3e5dd8dfc61116969d860 /testing | |
| parent | fd97e9bf82007ed1b8388ec02587207c5e752390 (diff) | |
| download | aports-d99c6b4f765411358c7728e8da6c59f4eb524ce5.tar.bz2 aports-d99c6b4f765411358c7728e8da6c59f4eb524ce5.tar.xz | |
testing/mutter: add fix-format-error.patch
Diffstat (limited to 'testing')
| -rw-r--r-- | testing/mutter/APKBUILD | 8 | ||||
| -rw-r--r-- | testing/mutter/fix-format-error.patch | 25 |
2 files changed, 30 insertions, 3 deletions
diff --git a/testing/mutter/APKBUILD b/testing/mutter/APKBUILD index 5eadd0b1e1..b60f6ccadb 100644 --- a/testing/mutter/APKBUILD +++ b/testing/mutter/APKBUILD @@ -11,12 +11,13 @@ depends_dev="gnome-desktop-dev libcanberra-dev upower-dev json-glib-dev libxkbco makedepends="$depends_dev gnome-common itstool libxml2-utils" install="" subpackages="$pkgname-dev $pkgname-doc $pkgname-lang" -source="http://ftp.gnome.org/pub/GNOME/sources/mutter/3.24/mutter-$pkgver.tar.xz" +source="http://ftp.gnome.org/pub/GNOME/sources/mutter/3.24/mutter-$pkgver.tar.xz + fix-format-error.patch" builddir="$srcdir/mutter-$pkgver" build() { cd "$builddir" - CFLAGS="$CFLAGS -Wno-error" ./configure \ + ./configure \ --build=$CBUILD \ --host=$CHOST \ --prefix=/usr \ @@ -32,4 +33,5 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="6b999a39637a8eacba5c04f07bfc64b42f4a6a8c36613c43d67a5b1a29c71deed65a77f8d09b4919577848abc7613ac5c0bc12341d5fcec48c6af104ad39f361 mutter-3.24.2.tar.xz" +sha512sums="6b999a39637a8eacba5c04f07bfc64b42f4a6a8c36613c43d67a5b1a29c71deed65a77f8d09b4919577848abc7613ac5c0bc12341d5fcec48c6af104ad39f361 mutter-3.24.2.tar.xz +7e40b42ee2e6e1a02ea616b27b7ce30f9ab9a249e1597738534aa83756adc7c8546009a5d31af4ea51d53d11695dd6d2c979d82e1fd3e4e52688964c68cfc33c fix-format-error.patch" diff --git a/testing/mutter/fix-format-error.patch b/testing/mutter/fix-format-error.patch new file mode 100644 index 0000000000..bb498b295e --- /dev/null +++ b/testing/mutter/fix-format-error.patch @@ -0,0 +1,25 @@ +From 028157081c0428bac1269078dd7f3360e3810824 Mon Sep 17 00:00:00 2001 +From: Olav Vitters <olav@vitters.nl> +Date: Thu, 22 Sep 2016 21:00:29 +0200 +Subject: [PATCH] Fix string format build error + +backends/meta-input-settings.c:1245:27: error: format '%lx' expects +argument of type 'long unsigned int', but argument 3 has type 'guint64 +{aka long long unsigned int}' [-Werror=format=] +--- + src/backends/meta-input-settings.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/backends/meta-input-settings.c b/src/backends/meta-input-settings.c +index ae17f7baa..74cf30afd 100644 +--- a/src/backends/meta-input-settings.c ++++ b/src/backends/meta-input-settings.c +@@ -1242,7 +1242,7 @@ lookup_tool_settings (ClutterInputDeviceTool *tool, + + tool_id = clutter_input_device_tool_get_id (tool); + device_id = get_tablet_settings_id (device, lookup_mapping_info (device)); +- path = g_strdup_printf ("/org/gnome/settings-daemon/peripherals/wacom/%s/%lx/", ++ path = g_strdup_printf ("/org/gnome/settings-daemon/peripherals/wacom/%s/%" G_GUINT64_FORMAT "/", + device_id, tool_id); + tool_settings = tool_settings_new (tool, path); + g_object_set_qdata_full (G_OBJECT (tool), quark_tool_settings, tool_settings, |