From 119b1790c97147db243e27df0e19886e6499839c Mon Sep 17 00:00:00 2001 From: idriskalp Date: Thu, 26 Dec 2019 15:52:35 +0300 Subject: [PATCH] libX11 rebuild and move to core --- system/base/libX11/actions.py | 26 +++ .../base/libX11/files/fix-null-pointer.patch | 12 ++ system/base/libX11/files/fix-segfault.diff | 50 ++++++ system/base/libX11/files/fix_typo.diff | 27 +++ system/base/libX11/pspec.xml | 157 ++++++++++++++++++ system/base/libX11/translations.xml | 19 +++ 6 files changed, 291 insertions(+) create mode 100644 system/base/libX11/actions.py create mode 100644 system/base/libX11/files/fix-null-pointer.patch create mode 100644 system/base/libX11/files/fix-segfault.diff create mode 100644 system/base/libX11/files/fix_typo.diff create mode 100644 system/base/libX11/pspec.xml create mode 100644 system/base/libX11/translations.xml diff --git a/system/base/libX11/actions.py b/system/base/libX11/actions.py new file mode 100644 index 00000000..ba705cde --- /dev/null +++ b/system/base/libX11/actions.py @@ -0,0 +1,26 @@ +# -*- coding: utf-8 -*- +# +# Licensed under the GNU General Public License, version 3. +# See the file http://www.gnu.org/licenses/gpl.txt + +from pisi.actionsapi import get +from pisi.actionsapi import autotools +from pisi.actionsapi import pisitools +from pisi.actionsapi import shelltools + +def setup(): + autotools.autoreconf("-vif") + autotools.configure("--disable-static") + + pisitools.dosed("libtool", "^(hardcode_libdir_flag_spec=).*", '\\1""') + pisitools.dosed("libtool", "^(runpath_var=)LD_RUN_PATH", "\\1DIE_RPATH_DIE") + pisitools.dosed("libtool", " -shared ", " -Wl,-O1,--as-needed -shared ") + +def build(): + autotools.make() + +def install(): + autotools.rawInstall("DESTDIR=%s" % get.installDIR()) + if get.buildTYPE() == "emul32": return + + pisitools.dodoc("AUTHORS", "COPYING", "NEWS", "README*") diff --git a/system/base/libX11/files/fix-null-pointer.patch b/system/base/libX11/files/fix-null-pointer.patch new file mode 100644 index 00000000..8b37f365 --- /dev/null +++ b/system/base/libX11/files/fix-null-pointer.patch @@ -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; + + /* diff --git a/system/base/libX11/files/fix-segfault.diff b/system/base/libX11/files/fix-segfault.diff new file mode 100644 index 00000000..a38c0ce2 --- /dev/null +++ b/system/base/libX11/files/fix-segfault.diff @@ -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; diff --git a/system/base/libX11/files/fix_typo.diff b/system/base/libX11/files/fix_typo.diff new file mode 100644 index 00000000..a55a9407 --- /dev/null +++ b/system/base/libX11/files/fix_typo.diff @@ -0,0 +1,27 @@ +From 5dcb40f28d59587597d2ff6e6ac64c71cfe6ff7b Mon Sep 17 00:00:00 2001 +From: James Cloos +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 +--- +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 + : "ï" idiaeresis # LATIN SMALL LETTER I WITH DIAERESIS + : "ï" idiaeresis # LATIN SMALL LETTER I WITH DIAERESIS + : "ï" idiaeresis # LATIN SMALL LETTER I WITH DIAERESIS +- : "j́" # LATIN SMALL LETTER J U006A with COMBINING ACUTE ACCENT U0301 ++ : "j́" # LATIN SMALL LETTER J U006A with COMBINING ACUTE ACCENT U0301 + : "j́" # LATIN SMALL LETTER J U006A with COMBINING ACUTE ACCENT U0301 + : "j́" # LATIN SMALL LETTER J U006A with COMBINING ACUTE ACCENT U0301 + : "j́" # LATIN SMALL LETTER J U006A with COMBINING ACUTE ACCENT U0301 +-- +cgit v0.9.0.2-2-gbebe + diff --git a/system/base/libX11/pspec.xml b/system/base/libX11/pspec.xml new file mode 100644 index 00000000..c0632479 --- /dev/null +++ b/system/base/libX11/pspec.xml @@ -0,0 +1,157 @@ + + + + + libX11 + http://www.x.org/ + + PisiLinux Community + admins@pisilinux.org + + MIT + library + X.Org X11 library + Core X11 protocol client library. + mirrors://xorg/individual/lib/libX11-1.6.9.tar.bz2 + + libxcb-devel + xorg-proto + util-macros + libxslt-devel + xtrans + xmlto + + + + + + + + libX11 + + libxcb + + + /usr/lib/libX11* + /usr/lib/X11 + /usr/share/X11 + /usr/share/doc/libX11 + + + + + libX11-devel + Development files for X11 library + + libX11 + libxcb-devel + xorg-proto + + + /usr/include/X11 + /usr/lib/pkgconfig + /usr/lib32/pkgconfig + /usr/share/man + + + + + libX11-32bit + emul32 + 32-bit shared libraries for libX11 + emul32 + + libxcb-32bit + libxslt-32bit + + + libX11 + libxcb-32bit + + + /usr/lib32 + + + + + + 2019-12-26 + 1.6.9 + Rebuild + Idris Kalp + idriskalp@gmail.com + + + 2019-10-20 + 1.6.9 + Version bump. + Mustafa Cinasal + muscnsl@gmail.com + + + 2019-01-06 + 1.6.7 + Rebuild + Mustafa Cinasal + muscnsl@gmail.com + + + 2018-11-05 + 1.6.5 + Rebuild + Mustafa Cinasal + muscnsl@gmail.com + + + 2018-10-30 + 1.6.5 + Rebuild + Mustafa Cinasal + muscnsl@gmail.com + + + 2018-09-16 + 1.6.5 + Rebuild + Mustafa Cinasal + muscnsl@gmail.com + + + 2018-02-16 + 1.6.5 + Version bump + Mustafa Cinasal + muscnsl@gmail.com + + + 2017-01-27 + 1.6.4 + Rebuild. + Stefan Gronewold(groni) + groni@pisilinux.org + + + 2016-11-02 + 1.6.4 + Version bump. + Stefan Gronewold(groni) + groni@pisilinux.org + + + 2016-04-30 + 1.6.3 + Release bump + PisiLinux Community + admin@pisilinux.org + + + 2016-03-08 + 1.6.3 + First release + Alihan Öztürk + alihan@pisilinux.org + + + diff --git a/system/base/libX11/translations.xml b/system/base/libX11/translations.xml new file mode 100644 index 00000000..f7b669ff --- /dev/null +++ b/system/base/libX11/translations.xml @@ -0,0 +1,19 @@ + + + + libX11 + X.Org X11 kitaplığı + Librairie X11 de X.Org. + X.Org X11 Bibliothek + + + + libX11-devel + libX11 için geliştirme dosyaları + + + + libX11-32bit + libX11 için 32-bit paylaşımlı kitaplıklar + +