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/actions.py
+26
View File
@@ -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*")
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
system/base/libX11/pspec.xml
+157
View File
@@ -0,0 +1,157 @@
<?xml version="1.0" ?>
<!DOCTYPE PISI SYSTEM "http://www.pisilinux.org/projeler/pisi/pisi-spec.dtd">
<PISI>
<Source>
<Name>libX11</Name>
<Homepage>http://www.x.org/</Homepage>
<Packager>
<Name>PisiLinux Community</Name>
<Email>admins@pisilinux.org</Email>
</Packager>
<License>MIT</License>
<IsA>library</IsA>
<Summary>X.Org X11 library</Summary>
<Description>Core X11 protocol client library.</Description>
<Archive sha1sum="62456536411f2540fbd4a3f59ed8af94967124c2" type="tarbz2">mirrors://xorg/individual/lib/libX11-1.6.9.tar.bz2</Archive>
<BuildDependencies>
<Dependency>libxcb-devel</Dependency>
<Dependency>xorg-proto</Dependency>
<Dependency>util-macros</Dependency>
<Dependency>libxslt-devel</Dependency>
<Dependency>xtrans</Dependency>
<Dependency>xmlto</Dependency>
</BuildDependencies>
<Patches>
<!--<Patch level="1">fix_typo.diff</Patch>
<Patch level="1">fix-segfault.diff</Patch>
<Patch level="1">fix-null-pointer.patch</Patch>-->
</Patches>
</Source>
<Package>
<Name>libX11</Name>
<RuntimeDependencies>
<Dependency>libxcb</Dependency>
</RuntimeDependencies>
<Files>
<Path fileType="library">/usr/lib/libX11*</Path>
<Path fileType="data">/usr/lib/X11</Path>
<Path fileType="data">/usr/share/X11</Path>
<Path fileType="doc">/usr/share/doc/libX11</Path>
</Files>
</Package>
<Package>
<Name>libX11-devel</Name>
<Summary>Development files for X11 library</Summary>
<RuntimeDependencies>
<Dependency release="current">libX11</Dependency>
<Dependency>libxcb-devel</Dependency>
<Dependency>xorg-proto</Dependency>
</RuntimeDependencies>
<Files>
<Path fileType="header">/usr/include/X11</Path>
<Path fileType="data">/usr/lib/pkgconfig</Path>
<Path fileType="data">/usr/lib32/pkgconfig</Path>
<Path fileType="man">/usr/share/man</Path>
</Files>
</Package>
<Package>
<Name>libX11-32bit</Name>
<PartOf>emul32</PartOf>
<Summary>32-bit shared libraries for libX11</Summary>
<BuildType>emul32</BuildType>
<BuildDependencies>
<Dependency>libxcb-32bit</Dependency>
<Dependency>libxslt-32bit</Dependency>
</BuildDependencies>
<RuntimeDependencies>
<Dependency release="current">libX11</Dependency>
<Dependency>libxcb-32bit</Dependency>
</RuntimeDependencies>
<Files>
<Path fileType="library">/usr/lib32</Path>
</Files>
</Package>
<History>
<Update release="11">
<Date>2019-12-26</Date>
<Version>1.6.9</Version>
<Comment>Rebuild</Comment>
<Name>Idris Kalp</Name>
<Email>idriskalp@gmail.com</Email>
</Update>
<Update release="10">
<Date>2019-10-20</Date>
<Version>1.6.9</Version>
<Comment>Version bump.</Comment>
<Name>Mustafa Cinasal</Name>
<Email>muscnsl@gmail.com</Email>
</Update>
<Update release="9">
<Date>2019-01-06</Date>
<Version>1.6.7</Version>
<Comment>Rebuild</Comment>
<Name>Mustafa Cinasal</Name>
<Email>muscnsl@gmail.com</Email>
</Update>
<Update release="8">
<Date>2018-11-05</Date>
<Version>1.6.5</Version>
<Comment>Rebuild</Comment>
<Name>Mustafa Cinasal</Name>
<Email>muscnsl@gmail.com</Email>
</Update>
<Update release="7">
<Date>2018-10-30</Date>
<Version>1.6.5</Version>
<Comment>Rebuild</Comment>
<Name>Mustafa Cinasal</Name>
<Email>muscnsl@gmail.com</Email>
</Update>
<Update release="6">
<Date>2018-09-16</Date>
<Version>1.6.5</Version>
<Comment>Rebuild</Comment>
<Name>Mustafa Cinasal</Name>
<Email>muscnsl@gmail.com</Email>
</Update>
<Update release="5">
<Date>2018-02-16</Date>
<Version>1.6.5</Version>
<Comment>Version bump</Comment>
<Name>Mustafa Cinasal</Name>
<Email>muscnsl@gmail.com</Email>
</Update>
<Update release="4">
<Date>2017-01-27</Date>
<Version>1.6.4</Version>
<Comment>Rebuild.</Comment>
<Name>Stefan Gronewold(groni)</Name>
<Email>groni@pisilinux.org</Email>
</Update>
<Update release="3">
<Date>2016-11-02</Date>
<Version>1.6.4</Version>
<Comment>Version bump.</Comment>
<Name>Stefan Gronewold(groni)</Name>
<Email>groni@pisilinux.org</Email>
</Update>
<Update release="2">
<Date>2016-04-30</Date>
<Version>1.6.3</Version>
<Comment>Release bump</Comment>
<Name>PisiLinux Community</Name>
<Email>admin@pisilinux.org</Email>
</Update>
<Update release="1">
<Date>2016-03-08</Date>
<Version>1.6.3</Version>
<Comment>First release</Comment>
<Name>Alihan Öztürk</Name>
<Email>alihan@pisilinux.org</Email>
</Update>
</History>
</PISI>
system/base/libX11/translations.xml
+19
View File
@@ -0,0 +1,19 @@
<?xml version="1.0" ?>
<PISI>
<Source>
<Name>libX11</Name>
<Summary xml:lang="tr">X.Org X11 kitaplığı</Summary>
<Summary xml:lang="fr">Librairie X11 de X.Org.</Summary>
<Summary xml:lang="de">X.Org X11 Bibliothek</Summary>
</Source>
<Package>
<Name>libX11-devel</Name>
<Summary xml:lang="tr">libX11 için geliştirme dosyaları</Summary>
</Package>
<Package>
<Name>libX11-32bit</Name>
<Summary xml:lang="tr">libX11 için 32-bit paylaşımlı kitaplıklar</Summary>
</Package>
</PISI>