Pisilinux/core
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

libX11 rebuild and move to core

Browse Source
This commit is contained in:
idriskalp
2019-12-26 15:52:35 +03:00
parent c183fb3aa6
commit 119b1790c9
6 changed files with 291 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
system/base/libX11/files/fix-null-pointer.patch
+12
View File
@@ -0,0 +1,12 @@
diff -Naur libX11-1.3.5//src/xlibi18n/ICWrap.c libX11-1.3.5.tpg//src/xlibi18n/ICWrap.c
--- libX11-1.3.5//src/xlibi18n/ICWrap.c 2010-08-10 04:59:44.000000000 +0000
+++ libX11-1.3.5.tpg//src/xlibi18n/ICWrap.c 2010-09-17 17:11:21.000000000 +0000
@@ -283,7 +283,7 @@
XIMArg *args;
char *ret;
- if (!ic->core.im)
+ if (!ic || !ic->core.im)
return (char *) NULL;
/*
system/base/libX11/files/fix-segfault.diff
+50
View File
@@ -0,0 +1,50 @@
Index: libX11-1.4.99.1/src/Xrm.c
===================================================================
--- libX11-1.4.99.1.orig/src/Xrm.c
+++ libX11-1.4.99.1/src/Xrm.c
@@ -2540,30 +2540,40 @@ Bool XrmQGetResource(
VClosureRec closure;
if (db && *names) {
- _XLockMutex(&db->linfo);
+ if ((_XLockMutex_fn) && db->linfo.lock ) {
+ _XLockMutex(&db->linfo);
+ }
closure.type = pType;
closure.value = pValue;
table = db->table;
if (names[1]) {
if (table && !table->leaf) {
if (GetNEntry(table, names, classes, &closure)) {
- _XUnlockMutex(&db->linfo);
+ if ((_XUnlockMutex_fn) && db->linfo.lock ) {
+ _XUnlockMutex(&db->linfo);
+ }
return True;
}
} else if (table && table->hasloose &&
GetLooseVEntry((LTable)table, names, classes, &closure)) {
- _XUnlockMutex (&db->linfo);
+ if ((_XUnlockMutex_fn) && db->linfo.lock ) {
+ _XUnlockMutex (&db->linfo);
+ }
return True;
}
} else {
if (table && !table->leaf)
table = table->next;
if (table && GetVEntry((LTable)table, names, classes, &closure)) {
- _XUnlockMutex(&db->linfo);
+ if ((_XUnlockMutex_fn) && db->linfo.lock ) {
+ _XUnlockMutex(&db->linfo);
+ }
return True;
}
}
- _XUnlockMutex(&db->linfo);
+ if ((_XUnlockMutex_fn) && db->linfo.lock ) {
+ _XUnlockMutex(&db->linfo);
+ }
}
*pType = NULLQUARK;
pValue->addr = (XPointer)NULL;
system/base/libX11/files/fix_typo.diff
+27
View File
@@ -0,0 +1,27 @@
From 5dcb40f28d59587597d2ff6e6ac64c71cfe6ff7b Mon Sep 17 00:00:00 2001
From: James Cloos <cloos@jhcloos.com>
Date: Tue, 17 Sep 2013 16:50:42 +0000
Subject: nls/en_US.UTF-8/Compose.pre: Fix typo.
Fix typo added in 215ce6a67863, s/actute/acute/.
Fixes bug #69476. Reported by Jean Krohn.
Signed-off-by: James Cloos <cloos@jhcloos.com>
---
diff --git a/nls/en_US.UTF-8/Compose.pre b/nls/en_US.UTF-8/Compose.pre
index a741332..7314d7f 100644
--- a/nls/en_US.UTF-8/Compose.pre
+++ b/nls/en_US.UTF-8/Compose.pre
@@ -743,7 +743,7 @@ XCOMM Part 3
<Multi_key> <i> <quotedbl> : "ï" idiaeresis # LATIN SMALL LETTER I WITH DIAERESIS
<Multi_key> <diaeresis> <i> : "ï" idiaeresis # LATIN SMALL LETTER I WITH DIAERESIS
<Multi_key> <i> <diaeresis> : "ï" idiaeresis # LATIN SMALL LETTER I WITH DIAERESIS
-<dead_actute> <j> : "j́" # LATIN SMALL LETTER J U006A with COMBINING ACUTE ACCENT U0301
+<dead_acute> <j> : "j́" # LATIN SMALL LETTER J U006A with COMBINING ACUTE ACCENT U0301
<Multi_key> <apostrophe> <j> : "j́" # LATIN SMALL LETTER J U006A with COMBINING ACUTE ACCENT U0301
<Multi_key> <j> <apostrophe> : "j́" # LATIN SMALL LETTER J U006A with COMBINING ACUTE ACCENT U0301
<Multi_key> <acute> <j> : "j́" # LATIN SMALL LETTER J U006A with COMBINING ACUTE ACCENT U0301
--
cgit v0.9.0.2-2-gbebe