Skip to content

Commit

Permalink
add ABI fix for Fedora 25: ChangeWindowProperty is now dixChangeWindo…
Browse files Browse the repository at this point in the history
…wProperty

git-svn-id: https://xpra.org/svn/Xpra/trunk@14291 3bb7dfac-3a0b-4e04-842a-767bc560f471
  • Loading branch information
totaam committed Oct 26, 2016
1 parent 1c369cd commit c4e65dd
Show file tree
Hide file tree
Showing 2 changed files with 20 additions and 1 deletion.
14 changes: 14 additions & 0 deletions rpmbuild/0008-change-window-property.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
--- a/src/dummy_driver.c 2016-10-26 15:31:33.745940560 +0700
+++ b/src/dummy_driver.c 2016-10-26 15:31:05.313666076 +0700
@@ -842,8 +842,9 @@
if (! ValidAtom(VFB_PROP))
VFB_PROP = MakeAtom(VFB_PROP_NAME, strlen(VFB_PROP_NAME), 1);

- ret = ChangeWindowProperty(pWinRoot, VFB_PROP, XA_STRING,
- 8, PropModeReplace, (int)4, (pointer)"TRUE", FALSE);
+ ret = dixChangeWindowProperty(serverClient, pWinRoot, VFB_PROP,
+ XA_STRING, 8, PropModeReplace,
+ (int)4, (pointer)"TRUE", FALSE);
if( ret != Success)
ErrorF("Could not set VFB root window property");
dPtr->prop = TRUE;
7 changes: 6 additions & 1 deletion rpmbuild/xorg-x11-drv-dummy.fc25.spec
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
Summary: Xorg X11 dummy video driver
Name: xorg-x11-drv-dummy
Version: 0.3.6
Release: 26.xpra1%{?dist}
Release: 26.xpra2%{?dist}
URL: http://www.x.org
License: MIT
Group: User Interface/X Hardware Support
Expand All @@ -19,6 +19,7 @@ Patch2: 0003-fix-pointer-limits.patch
Patch3: 0004-honour-dac.patch
Patch4: 0005-support-for-30-bit-depth-in-dummy-driver.patch
Patch5: 0006-remove-dead-code-in-dummy-driver.patch
Patch8: 0008-change-window-property.patch

ExcludeArch: s390 s390x

Expand All @@ -39,6 +40,7 @@ X.Org X11 dummy video driver.
%patch3 -p1
%patch4 -p1
%patch5 -p1
%patch8 -p1

%build
autoreconf -vif
Expand All @@ -62,6 +64,9 @@ rm -rf $RPM_BUILD_ROOT
%{driverdir}/dummy_drv.so

%changelog
* Wed Oct 26 2016 Antoine Martin <antoine@nagafix.co.uk> - 0.3.6-26.xpra2
- fix change-window-property API call

* Fri Oct 21 2016 Antoine Martin <antoine@nagafix.co.uk> - 0.3.6-26.xpra1
- rebuild for Fedora 25

Expand Down

0 comments on commit c4e65dd

Please sign in to comment.