Problems patching XFCE with qubes-desktop-linux-xfce4

[nicklaus...@gmail.com]

I cloned the qubes-desktop-linux xfce4, installed the needed dependencies, and moved the xfmw4-4.10.1.tar.bz2 source into the xfwm4 folder. However, when I run make rpms in the root directory of the project, I get the following error:
xfwm4-settings.c:1972:22: error: too few arguments to function 'xfce_shortcut_conflict_dialog'
           response = xfce_shortcut_conflict_dialog (xfce_shortcuts_provider_get_name (settings->priv->provider),
                      ^
In file included from /usr/include/xfce4/libxfce4kbd-private-2/libxfce4kbd-private/xfce-shortcut-dialog.h:26:0,
                 from xfwm4-settings.c:44:
/usr/include/xfce4/libxfce4kbd-private-2/libxfce4kbd-private/xfce-shortcuts.h:29:10: note: declared here
 gboolean xfce_shortcut_conflict_dialog (GtkWindow   *parent,

It looks like an error in the code, but I'm not sure. Anyone have any insight to how I could proceed to fix this? I'm building with gcc, if that changes anything.

[Marek Marczykowski-Górecki]

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA256

It looks you're trying to build it with newer Xfce version than 4.10.
The master branch still have 4.10 (as in Fedora 20). But there is
updated version here:
https://github.com/QubesOS/qubes-desktop-linux-xfce4/pull/1

- --
Best Regards,
Marek Marczykowski-Górecki
Invisible Things Lab
A: Because it messes up the order in which people normally read text.
Q: Why is top-posting such a bad thing?
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2

iQEcBAEBCAAGBQJXFJj1AAoJENuP0xzK19csk88IAJsnAMUWhfbUKBn1wKTsnTVj
Qs4OicGcAr1zPP2tyz/1OsZJrgBJ4MTgmtzxg+tH08RhY1M9t/2oJSx9TWsAo8/W
HL0RzLe8YDYjmfIy9aOlMKYRtcdfYFh4gZy0N7g+7joSN9IM2kujeIfATvXhT0WY
j51nLb7U1wTfCJpZFCSS52SWqgHH2ILON45jKHXlUJeqzMBwpagHQiyQ4NypQMLm
ziXQhidHu9QiajGh9xX3gV+1FUQ6tA80nhdmjIpC6YNvRI/JJnJFqzgl+d/329qv
z4GqrVXCYVDyB+y7jGiDbEXi+VwN1ByxKgGoerSFmZF1htOeppziuvT2Vgy5vXA=
=3yD1
-----END PGP SIGNATURE-----