mirror of
https://github.com/archlinuxarm/PKGBUILDs.git
synced 2024-11-08 22:45:43 +00:00
44 lines
1.6 KiB
Diff
44 lines
1.6 KiB
Diff
diff -up tigervnc-1.4.2/unix/xserver/hw/vnc/xorg-version.h.xserver117 tigervnc-1.4.2/unix/xserver/hw/vnc/xorg-version.h
|
|
--- tigervnc-1.4.2/unix/xserver/hw/vnc/xorg-version.h.xserver117 2015-01-23 23:37:23.000000000 +0000
|
|
+++ tigervnc-1.4.2/unix/xserver/hw/vnc/xorg-version.h 2015-02-13 17:35:29.847294663 +0000
|
|
@@ -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
|
|
diff -up tigervnc-1.4.2/unix/xserver/hw/vnc/xvnc.cc.xserver117 tigervnc-1.4.2/unix/xserver/hw/vnc/xvnc.cc
|
|
--- tigervnc-1.4.2/unix/xserver/hw/vnc/xvnc.cc.xserver117 2015-01-23 23:37:23.000000000 +0000
|
|
+++ tigervnc-1.4.2/unix/xserver/hw/vnc/xvnc.cc 2015-02-13 17:35:27.963265774 +0000
|
|
@@ -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);
|
|
}
|
|
}
|
|
|