forked from pool/tigervnc
d0f8bb8c88
- Fix build against X server 1.17.x. * u_tigervnc-build-with-xserver-1.17.patch - Use xserver sources from xorg-x11-server-source. - Drop no longer needed patches: * N_xorg-server-xdmcp.patch * n_tigervnc-dont-build-gtf.patch OBS-URL: https://build.opensuse.org/request/show/287517 OBS-URL: https://build.opensuse.org/package/show/X11:XOrg/tigervnc?expand=0&rev=49
53 lines
1.6 KiB
Diff
53 lines
1.6 KiB
Diff
Author: Michal Srb <msrb@suse.com>
|
|
Subject: Build with xserver 1.17.x.
|
|
|
|
Do not use removed xalloc&xfree.
|
|
Add 1.17.x to supported list.
|
|
|
|
Index: tigervnc-1.4.1/unix/xserver/hw/vnc/xorg-version.h
|
|
===================================================================
|
|
--- tigervnc-1.4.1.orig/unix/xserver/hw/vnc/xorg-version.h
|
|
+++ tigervnc-1.4.1/unix/xserver/hw/vnc/xorg-version.h
|
|
@@ -48,8 +48,10 @@
|
|
#define XORG 115
|
|
#elif XORG_VERSION_CURRENT < ((1 * 10000000) + (16 * 100000) + (99 * 1000))
|
|
#define XORG 116
|
|
+#elif XORG_VERSION_CURRENT < ((1 * 10000000) + (17 * 100000) + (99 * 1000))
|
|
+#define XORG 117
|
|
#else
|
|
-#error "X.Org newer than 1.16 is not supported"
|
|
+#error "X.Org newer than 1.17 is not supported"
|
|
#endif
|
|
|
|
#endif
|
|
Index: tigervnc-1.4.1/unix/xserver/hw/vnc/xvnc.cc
|
|
===================================================================
|
|
--- tigervnc-1.4.1.orig/unix/xserver/hw/vnc/xvnc.cc
|
|
+++ tigervnc-1.4.1/unix/xserver/hw/vnc/xvnc.cc
|
|
@@ -717,9 +717,9 @@ vfbInstallColormap(ColormapPtr pmap)
|
|
entries = pmap->pVisual->ColormapEntries;
|
|
pVisual = pmap->pVisual;
|
|
|
|
- ppix = (Pixel *)xalloc(entries * sizeof(Pixel));
|
|
- prgb = (xrgb *)xalloc(entries * sizeof(xrgb));
|
|
- defs = (xColorItem *)xalloc(entries * sizeof(xColorItem));
|
|
+ ppix = (Pixel *)malloc(entries * sizeof(Pixel));
|
|
+ prgb = (xrgb *)malloc(entries * sizeof(xrgb));
|
|
+ defs = (xColorItem *)malloc(entries * sizeof(xColorItem));
|
|
|
|
for (i = 0; i < entries; i++) ppix[i] = i;
|
|
/* XXX truecolor */
|
|
@@ -738,9 +738,9 @@ vfbInstallColormap(ColormapPtr pmap)
|
|
}
|
|
(*pmap->pScreen->StoreColors)(pmap, entries, defs);
|
|
|
|
- xfree(ppix);
|
|
- xfree(prgb);
|
|
- xfree(defs);
|
|
+ free(ppix);
|
|
+ free(prgb);
|
|
+ free(defs);
|
|
}
|
|
}
|
|
|