From 40b7e7cb395198ddecbe8992127177380a88ecb22172be76521e5759bb4f4e8e Mon Sep 17 00:00:00 2001 From: OBS User unknown Date: Sat, 2 Aug 2008 03:26:20 +0000 Subject: [PATCH] OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/xorg-x11-server?expand=0&rev=88 --- xorg-server-xf4vnc-abi-version.diff | 28 ++++++++++++++++++++++++++++ xorg-x11-server.changes | 6 ++++++ xorg-x11-server.spec | 7 ++++++- 3 files changed, 40 insertions(+), 1 deletion(-) create mode 100644 xorg-server-xf4vnc-abi-version.diff diff --git a/xorg-server-xf4vnc-abi-version.diff b/xorg-server-xf4vnc-abi-version.diff new file mode 100644 index 0000000..116fef4 --- /dev/null +++ b/xorg-server-xf4vnc-abi-version.diff @@ -0,0 +1,28 @@ +diff -u -r ../xorg-server-1.4.99.906.orig//hw/xfree86/vnc/vncInit.c ./hw/xfree86/vnc/vncInit.c +--- ../xorg-server-1.4.99.906.orig//hw/xfree86/vnc/vncInit.c 2008-08-01 22:02:51.000000000 +0000 ++++ ./hw/xfree86/vnc/vncInit.c 2008-08-01 22:07:32.000000000 +0000 +@@ -573,8 +573,8 @@ + #if 0 + ABI_EXTENSION_VERSION, + #else +- /* Hack to allow module to work with more servers (vs. 0.3 above) */ +- SET_ABI_VERSION(0, 2), ++ /* Hack to allow module to work with more servers */ ++ SET_ABI_VERSION(1, 0), + #endif + MOD_CLASS_EXTENSION, + {0,0,0,0} +diff -u -r ../xorg-server-1.4.99.906.orig//xcliplist/cliplistmod.c ./xcliplist/cliplistmod.c +--- ../xorg-server-1.4.99.906.orig//xcliplist/cliplistmod.c 2008-08-01 22:02:51.000000000 +0000 ++++ ./xcliplist/cliplistmod.c 2008-08-01 22:07:05.000000000 +0000 +@@ -26,8 +26,8 @@ + #if 0 + ABI_EXTENSION_VERSION, + #else +- /* Hack to allow module to work with more servers (vs. 0.3 above) */ +- SET_ABI_VERSION(0, 2), ++ /* Hack to allow module to work with more servers */ ++ SET_ABI_VERSION(1, 0), + #endif + MOD_CLASS_EXTENSION, + {0,0,0,0} diff --git a/xorg-x11-server.changes b/xorg-x11-server.changes index d4f6f0b..9fc11ea 100644 --- a/xorg-x11-server.changes +++ b/xorg-x11-server.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Sat Aug 2 00:11:12 CEST 2008 - sndirsch@suse.de + +- xorg-server-xf4vnc-abi-version.diff + * raised ABI version for xorg-server 1.5(-pre) + ------------------------------------------------------------------- Thu Jul 24 12:45:16 CEST 2008 - sndirsch@suse.de diff --git a/xorg-x11-server.spec b/xorg-x11-server.spec index 3a4d5a2..ea6e126 100644 --- a/xorg-x11-server.spec +++ b/xorg-x11-server.spec @@ -22,7 +22,7 @@ BuildRequires: libjpeg-devel Url: http://xorg.freedesktop.org/ %define EXPERIMENTAL 0 Version: 7.3 -Release: 127 +Release: 132 License: X11/MIT BuildRoot: %{_tmppath}/%{name}-%{version}-build Group: System/X11/Servers/XF86_4 @@ -68,6 +68,7 @@ Patch36: libdrm.diff Patch39: xorg-server-xf4vnc.patch Patch40: xorg-server-xf4vnc-disable-dmxvnc.diff Patch42: xorg-server-xf4vnc-TranslateNone.diff +Patch43: xorg-server-xf4vnc-abi-version.diff %endif Patch41: loadmod-bug197195.diff Patch45: bug-197858_dpms.diff @@ -179,6 +180,7 @@ popd %patch39 -p1 %patch40 -p0 %patch42 -p1 +%patch43 -p0 chmod 755 hw/vnc/symlink-vnc.sh %endif %patch41 -p1 @@ -522,6 +524,9 @@ exit 0 %endif %changelog +* Sat Aug 02 2008 sndirsch@suse.de +- xorg-server-xf4vnc-abi-version.diff + * raised ABI version for xorg-server 1.5(-pre) * Thu Jul 24 2008 sndirsch@suse.de - xorg-server 1.4.99.906 - obsoletes commit-a18551c.diff