I have made the following changes intended for : CE:MW:Shared / xserver-policy-enforcement
Please review and accept or decline. BOSS has already run some checks on this request. See the "Messages from BOSS" section below. https://build.pub.meego.com//request/show/7011 Thank You, Marko Saukko [This message was auto-generated] --- Request # 7011: Messages from BOSS: State: review at 2012-10-15T10:41:27 by bossbot Reviews: accepted by bossbot : Prechecks succeeded. new for CE-maintainers : Please replace this text with a review and approve/reject the review (not the SR). BOSS will take care of the rest Changes: submit: home:sage:branches:Mer:fake:Core-next:i586 / xserver-policy-enforcement -> CE:MW:Shared / xserver-policy-enforcement changes files: -------------- --- xserver-policy-enforcement.changes +++ xserver-policy-enforcement.changes @@ -0,0 +1,5 @@ +* Wed Oct 03 2012 Marko Saukko <[email protected]> - 0.0.2 +- Apply following patches for newer xorg compatibility. + - 0001-Remove-usage-of-client-states-that-have-been-dropped.patch + - 0002-swaps-and-swapl-take-only-one-argument-anymore.patch + new: ---- 0001-Remove-usage-of-client-states-that-have-been-dropped.patch 0002-swaps-and-swapl-take-only-one-argument-anymore.patch spec files: ----------- --- xserver-policy-enforcement.spec +++ xserver-policy-enforcement.spec @@ -1,6 +1,6 @@ # # Do NOT Edit the Auto-generated Part! -# Generated by: spectacle version 0.24.1 +# Generated by: spectacle version 0.25 # Name: xserver-policy-enforcement @@ -18,6 +18,8 @@ Source100: xserver-policy-enforcement.yaml Patch0: noauth-for-root.patch Patch1: make-the-verbosity-level-of-trace-messages-higher.patch +Patch2: 0001-Remove-usage-of-client-states-that-have-been-dropped.patch +Patch3: 0002-swaps-and-swapl-take-only-one-argument-anymore.patch BuildRequires: pkgconfig(x11) BuildRequires: pkgconfig(xorg-server) @@ -40,6 +42,10 @@ %patch0 -p1 # make-the-verbosity-level-of-trace-messages-higher.patch %patch1 -p1 +# 0001-Remove-usage-of-client-states-that-have-been-dropped.patch +%patch2 -p1 +# 0002-swaps-and-swapl-take-only-one-argument-anymore.patch +%patch3 -p1 # >> setup # << setup @@ -47,8 +53,7 @@ # >> build pre # << build pre -%autogen --disable-static -%configure --disable-static +%reconfigure --disable-static make %{?jobs:-j%jobs} # >> build post @@ -67,14 +72,15 @@ %files %defattr(-,root,root,-) # >> files -%{_bindir}/* -%{_sysconfdir}/* -%{_libdir}/xorg/* +%{_bindir}/videoipc-client +%config %{_sysconfdir}/X11/xorg.conf.d/policy.conf +%{_sysconfdir}/xdg/autostart/xserver-policy-enforcement.desktop +%{_libdir}/xorg/modules/extensions/libpolicy.so # << files %files devel %defattr(-,root,root,-) # >> files devel %{_includedir}/policy -%{_libdir}/pkgconfig/* +%{_libdir}/pkgconfig/*.pc # << files devel other changes: -------------- ++++++ 0001-Remove-usage-of-client-states-that-have-been-dropped.patch (new) --- 0001-Remove-usage-of-client-states-that-have-been-dropped.patch +++ 0001-Remove-usage-of-client-states-that-have-been-dropped.patch @@ -0,0 +1,43 @@ +From d77ad95ca44762e19b7f5e2cd5055ae969aaf08e Mon Sep 17 00:00:00 2001 +From: Marko Saukko <[email protected]> +Date: Wed, 3 Oct 2012 07:38:27 +0000 +Subject: [PATCH 1/2] Remove usage of client states that have been dropped + from the upstream. + +Signed-off-by: Marko Saukko <[email protected]> +--- + src/client.c | 6 +++++- + 1 file changed, 5 insertions(+), 1 deletion(-) + +diff --git a/src/client.c b/src/client.c +index 43eb709..7083f44 100644 +--- a/src/client.c ++++ b/src/client.c +@@ -21,6 +21,8 @@ + #include <unistd.h> + #include <errno.h> + ++#include <xorg/xorgVersion.h> ++ + #define ClientPrivateKey (&ClientPrivateKeyRec) + + static DevPrivateKeyRec ClientPrivateKeyRec; +@@ -246,12 +248,14 @@ ClientStateName(ClientState state) + { + switch (state) { + case ClientStateInitial: return "initial"; +- case ClientStateAuthenticating: return "authenticating"; + case ClientStateRunning: return "running"; + case ClientStateRetained: return "retained"; + case ClientStateGone: return "gone"; ++#if XORG_VERSION_CURRENT < XORG_VERSION_NUMERIC(1,13,0,0,0) ++ case ClientStateAuthenticating: return "authenticating"; + case ClientStateCheckingSecurity: return "checking security"; + case ClientStateCheckedSecurity: return "checked security"; ++#endif + } + + return "<unknown>"; +-- +1.7.10.3 + ++++++ 0002-swaps-and-swapl-take-only-one-argument-anymore.patch (new) --- 0002-swaps-and-swapl-take-only-one-argument-anymore.patch +++ 0002-swaps-and-swapl-take-only-one-argument-anymore.patch @@ -0,0 +1,55 @@ +From 4f04c405e5a1ccbc9594e4fc8a9ccc6334cacc8c Mon Sep 17 00:00:00 2001 +From: Marko Saukko <[email protected]> +Date: Wed, 3 Oct 2012 07:47:11 +0000 +Subject: [PATCH 2/2] swaps and swapl take only one argument anymore. + +Signed-off-by: Marko Saukko <[email protected]> +--- + src/xvideo.c | 16 +++++++++++++--- + 1 file changed, 13 insertions(+), 3 deletions(-) + +diff --git a/src/xvideo.c b/src/xvideo.c +index 189d24d..3350f2d 100644 +--- a/src/xvideo.c ++++ b/src/xvideo.c +@@ -21,6 +21,8 @@ + #include <stdio.h> + #include <string.h> + ++#include <xorg/xorgVersion.h> ++ + #ifdef XREGISTRY + #define RESOURCE_NAME(r) LookupResourceName(r) + #else +@@ -387,7 +389,9 @@ ProcGetPortAttribute(ClientPtr client, AttrAccessPtr acc) + xvGetPortAttributeReq *req = (xvGetPortAttributeReq*)client->requestBuffer; + #endif + xvGetPortAttributeReply rep; ++#if XORG_VERSION_CURRENT < XORG_VERSION_NUMERIC(1,13,0,0,0) + char n; ++#endif + int result; + + if (acc->fail) { +@@ -406,9 +410,15 @@ ProcGetPortAttribute(ClientPtr client, AttrAccessPtr acc) + rep.value = acc->value; + + if (client->swapped) { +- swaps(&rep.sequenceNumber, n); +- swapl(&rep.length, n); +- swapl(&rep.value, n); ++#if XORG_VERSION_CURRENT < XORG_VERSION_NUMERIC(1,13,0,0,0) ++ swaps(&rep.sequenceNumber,n); ++ swapl(&rep.length,n); ++ swapl(&rep.value,n); ++#else ++ swaps(&rep.sequenceNumber); ++ swapl(&rep.length); ++ swapl(&rep.value); ++#endif + } + + WriteToClient(client, sz_xvGrabPortReply, &rep); +-- +1.7.10.3 + ++++++ xserver-policy-enforcement.yaml --- xserver-policy-enforcement.yaml +++ xserver-policy-enforcement.yaml @@ -13,9 +13,11 @@ Patches: - noauth-for-root.patch - make-the-verbosity-level-of-trace-messages-higher.patch + - 0001-Remove-usage-of-client-states-that-have-been-dropped.patch + - 0002-swaps-and-swapl-take-only-one-argument-anymore.patch PkgConfigBR: - x11 - xorg-server -Configure: autogen +Configure: reconfigure AutoSubPackages: - devel
