From 9e1d7642610ff91b58e63631b51224d19f8afe3f Mon Sep 17 00:00:00 2001 From: idriskalp Date: Thu, 26 Dec 2019 15:22:38 +0300 Subject: [PATCH] libX11 libXau libXdmcp libxcb move to core --- x11/library/libX11/actions.py | 26 --- .../libX11/files/fix-null-pointer.patch | 12 -- x11/library/libX11/files/fix-segfault.diff | 50 ------ x11/library/libX11/files/fix_typo.diff | 27 ---- x11/library/libX11/pspec.xml | 150 ------------------ x11/library/libX11/translations.xml | 19 --- x11/library/libXau/actions.py | 22 --- x11/library/libXau/files/visibility.patch | 22 --- x11/library/libXau/pspec.xml | 106 ------------- x11/library/libXau/translations.xml | 20 --- x11/library/libXdmcp/actions.py | 22 --- x11/library/libXdmcp/pspec.xml | 111 ------------- x11/library/libXdmcp/translations.xml | 20 --- x11/library/libxcb/actions.py | 38 ----- .../files/libxcb-1.1-no-pthread-stubs.patch | 11 -- x11/library/libxcb/files/pthread-stubs.pc | 8 - x11/library/libxcb/pspec.xml | 140 ---------------- x11/library/libxcb/translations.xml | 17 -- 18 files changed, 821 deletions(-) delete mode 100644 x11/library/libX11/actions.py delete mode 100644 x11/library/libX11/files/fix-null-pointer.patch delete mode 100644 x11/library/libX11/files/fix-segfault.diff delete mode 100644 x11/library/libX11/files/fix_typo.diff delete mode 100644 x11/library/libX11/pspec.xml delete mode 100644 x11/library/libX11/translations.xml delete mode 100644 x11/library/libXau/actions.py delete mode 100644 x11/library/libXau/files/visibility.patch delete mode 100644 x11/library/libXau/pspec.xml delete mode 100644 x11/library/libXau/translations.xml delete mode 100644 x11/library/libXdmcp/actions.py delete mode 100644 x11/library/libXdmcp/pspec.xml delete mode 100644 x11/library/libXdmcp/translations.xml delete mode 100644 x11/library/libxcb/actions.py delete mode 100644 x11/library/libxcb/files/libxcb-1.1-no-pthread-stubs.patch delete mode 100644 x11/library/libxcb/files/pthread-stubs.pc delete mode 100644 x11/library/libxcb/pspec.xml delete mode 100644 x11/library/libxcb/translations.xml diff --git a/x11/library/libX11/actions.py b/x11/library/libX11/actions.py deleted file mode 100644 index ba705cdeb0..0000000000 --- a/x11/library/libX11/actions.py +++ /dev/null @@ -1,26 +0,0 @@ -# -*- 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/x11/library/libX11/files/fix-null-pointer.patch b/x11/library/libX11/files/fix-null-pointer.patch deleted file mode 100644 index 8b37f365b5..0000000000 --- a/x11/library/libX11/files/fix-null-pointer.patch +++ /dev/null @@ -1,12 +0,0 @@ -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/x11/library/libX11/files/fix-segfault.diff b/x11/library/libX11/files/fix-segfault.diff deleted file mode 100644 index a38c0ce2a2..0000000000 --- a/x11/library/libX11/files/fix-segfault.diff +++ /dev/null @@ -1,50 +0,0 @@ -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/x11/library/libX11/files/fix_typo.diff b/x11/library/libX11/files/fix_typo.diff deleted file mode 100644 index a55a940744..0000000000 --- a/x11/library/libX11/files/fix_typo.diff +++ /dev/null @@ -1,27 +0,0 @@ -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/x11/library/libX11/pspec.xml b/x11/library/libX11/pspec.xml deleted file mode 100644 index 55ab7738e2..0000000000 --- a/x11/library/libX11/pspec.xml +++ /dev/null @@ -1,150 +0,0 @@ - - - - - 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-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/x11/library/libX11/translations.xml b/x11/library/libX11/translations.xml deleted file mode 100644 index f7b669ffdf..0000000000 --- a/x11/library/libX11/translations.xml +++ /dev/null @@ -1,19 +0,0 @@ - - - - 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 - - diff --git a/x11/library/libXau/actions.py b/x11/library/libXau/actions.py deleted file mode 100644 index eef0c2ec25..0000000000 --- a/x11/library/libXau/actions.py +++ /dev/null @@ -1,22 +0,0 @@ -#!/usr/bin/python -# -*- 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 shelltools - -Libdir = "/usr/lib32" if get.buildTYPE() == "emul32" else "/usr/lib" - -def setup(): - autotools.autoreconf("-vif") - autotools.configure("--disable-static") - -def build(): - autotools.make() - -def install(): - autotools.rawInstall("DESTDIR=%s" % get.installDIR()) - diff --git a/x11/library/libXau/files/visibility.patch b/x11/library/libXau/files/visibility.patch deleted file mode 100644 index 5a338a167f..0000000000 --- a/x11/library/libXau/files/visibility.patch +++ /dev/null @@ -1,22 +0,0 @@ ---- libXau-1.0.3/AuDispose.c.orig 2007-11-23 17:51:27.000000000 -0200 -+++ libXau-1.0.3/AuDispose.c 2007-11-23 17:51:34.000000000 -0200 -@@ -33,7 +33,7 @@ in this Software without prior written a - #include - #include - --void -+_X_EXPORT void - XauDisposeAuth (Xauth *auth) - { - if (auth) { ---- libXau-1.0.3/AuRead.c.orig 2007-11-23 17:52:14.000000000 -0200 -+++ libXau-1.0.3/AuRead.c 2007-11-23 17:52:21.000000000 -0200 -@@ -69,7 +69,7 @@ read_counted_string (unsigned short *cou - return 1; - } - --Xauth * -+_X_EXPORT Xauth * - XauReadAuth (FILE *auth_file) - { - Xauth local; diff --git a/x11/library/libXau/pspec.xml b/x11/library/libXau/pspec.xml deleted file mode 100644 index 85f87d6b51..0000000000 --- a/x11/library/libXau/pspec.xml +++ /dev/null @@ -1,106 +0,0 @@ - - - - - libXau - http://www.x.org/ - - PisiLinux Community - admins@pisilinux.org - - MIT - library - X.Org Au library - libXau provides functions to manage X authorization files - http://xorg.freedesktop.org/archive/individual/lib/libXau-1.0.9.tar.gz - - visibility.patch - - - util-macros - xorg-proto - - - - - libXau - - /usr/lib - - - - - libXau-devel - Development files for libXau - - libXau - - - /usr/include/X11 - /usr/lib/pkgconfig - /usr/lib32/pkgconfig - /usr/share/man - - - - - libXau-32bit - emul32 - 32-bit shared libraries for libXau - emul32 - - - - - - - - /usr/lib32 - - - - - - 2019-10-20 - 1.0.9 - Version bump. - Mustafa Cinasal - muscnsl@gmail.com - - - 2019-01-07 - 1.0.8 - Rebuild. - Mustafa Cinasal - muscnsl@gmail.com - - - 2018-07-23 - 1.0.8 - Rebuild - PisiLinux Community - admin@pisilinux.org - - - 2017-01-27 - 1.0.8 - Rebuild - PisiLinux Community - admin@pisilinux.org - - - 2016-04-30 - 1.0.8 - Release bump - PisiLinux Community - admin@pisilinux.org - - - 2014-06-01 - 1.0.8 - First release - Marcin Bojara - marcin@pisilinux.org - - - diff --git a/x11/library/libXau/translations.xml b/x11/library/libXau/translations.xml deleted file mode 100644 index a48e44827f..0000000000 --- a/x11/library/libXau/translations.xml +++ /dev/null @@ -1,20 +0,0 @@ - - - - libXau - X.Org Au kitaplığı. - Librairie Au de X.Org. - X.Org Au Bibliothek - libXau, X yetkilendirme dosyalarını yönetmek için işlevler sağlar. - - - - libXau-devel - libXau için geliştirme dosyaları - - - - libXau-32bit - libXau için 32-bit paylaşımlı kitaplıklar - - diff --git a/x11/library/libXdmcp/actions.py b/x11/library/libXdmcp/actions.py deleted file mode 100644 index 2fbb68da10..0000000000 --- a/x11/library/libXdmcp/actions.py +++ /dev/null @@ -1,22 +0,0 @@ -# -*- 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 autotools -from pisi.actionsapi import pisitools -from pisi.actionsapi import get - -def setup(): - autotools.autoreconf("-fi") - - autotools.configure("--disable-static \ - --without-xmlto") - -def build(): - autotools.make() - -def install(): - autotools.rawInstall("DESTDIR=%s" % get.installDIR()) - - pisitools.dodoc("AUTHORS", "ChangeLog", "COPYING", "README*") diff --git a/x11/library/libXdmcp/pspec.xml b/x11/library/libXdmcp/pspec.xml deleted file mode 100644 index 00612166f7..0000000000 --- a/x11/library/libXdmcp/pspec.xml +++ /dev/null @@ -1,111 +0,0 @@ - - - - - libXdmcp - http://x.org/ - - PisiLinux Community - admins@pisilinux.org - - MIT - library - X.Org Xdmcp library - LibXdmcp is the X Display Manager Control Protocol library. - http://xorg.freedesktop.org/archive/individual/lib/libXdmcp-1.1.3.tar.bz2 - - libxslt - util-macros - xorg-proto - libbsd-devel - - - - - libXdmcp - - libbsd - - - /usr/lib - /usr/share/doc - - - - - libXdmcp-devel - Development files for libXdmcp - - xorg-proto - libXdmcp - - - /usr/include/X11 - /usr/lib/pkgconfig - /usr/lib32/pkgconfig - /usr/share/doc/*/*.xml - - - - - libXdmcp-32bit - emul32 - 32-bit shared libraries for libXdmcp - emul32 - - - - - libXdmcp - - - - /usr/lib32 - - - - - - 2019-10-20 - 1.1.3 - Version bump. - Mustafa Cinasal - muscnsl@gmail.com - - - 2019-01-07 - 1.1.2 - Rebuild. - Mustafa Cinasal - muscnsl@gmail.com - - - 2018-07-23 - 1.1.2 - Rebuild - PisiLinux Community - admin@pisilinux.org - - - 2017-01-27 - 1.1.2 - Rebuild - PisiLinux Community - admin@pisilinux.org - - - 2016-04-30 - 1.1.2 - Release bump - PisiLinux Community - admin@pisilinux.org - - - 2015-06-06 - 1.1.2 - First release - Osman Erkan - osman.erkan@yandex.com - - - diff --git a/x11/library/libXdmcp/translations.xml b/x11/library/libXdmcp/translations.xml deleted file mode 100644 index 7eb6f7572d..0000000000 --- a/x11/library/libXdmcp/translations.xml +++ /dev/null @@ -1,20 +0,0 @@ - - - - libXdmcp - X.Org Xdmcp kitaplığı. - Librairie Xdmcp de X.Org. - X.Org Xdmcp Bibliothek - LibXdmcp, X Ekran Yöneticisi Denetim Protokolü kitaplığıdır. - - - - libXdmcp-devel - libXdmcp için geliştirme dosyaları - - - - libXdmcp-32bit - libXdmcp için 32-bit paylaşımlı kitaplıklar - - diff --git a/x11/library/libxcb/actions.py b/x11/library/libxcb/actions.py deleted file mode 100644 index 7831f8cdc9..0000000000 --- a/x11/library/libxcb/actions.py +++ /dev/null @@ -1,38 +0,0 @@ -# -*- 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 autotools -from pisi.actionsapi import pisitools -from pisi.actionsapi import get - -def setup(): - pisitools.flags.add("-DNDEBUG") - - autotools.autoreconf("-vfi") - options = " --disable-static \ - --enable-xevie \ - --enable-xprint \ - --enable-xinput \ - --enable-xkb \ - --without-launchd \ - --without-doxygen" - - if get.buildTYPE() == "emul32": - options += " --libdir=/usr/lib32" - - autotools.configure(options) - - pisitools.dosed("libtool", " -shared ", " -Wl,-O1,--as-needed -shared ") - -def build(): - autotools.make("-j1") - -def install(): - autotools.rawInstall("-j1 DESTDIR=%s" % get.installDIR()) - - if get.buildTYPE() == "emul32": - return - - pisitools.dodoc("COPYING", "NEWS", "README") diff --git a/x11/library/libxcb/files/libxcb-1.1-no-pthread-stubs.patch b/x11/library/libxcb/files/libxcb-1.1-no-pthread-stubs.patch deleted file mode 100644 index 7f9a975260..0000000000 --- a/x11/library/libxcb/files/libxcb-1.1-no-pthread-stubs.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- libxcb-1.8.1/configure.ac 2012-03-09 15:38:38.000000000 +0100 -+++ libxcb-1.8.1/configure.ac.new 2012-03-09 16:50:40.107109896 +0100 -@@ -43,7 +43,7 @@ - - # Checks for pkg-config packages - PKG_CHECK_MODULES(XCBPROTO, xcb-proto >= 1.13) --NEEDED="pthread-stubs xau >= 0.99.2" -+NEEDED="xau >= 0.99.2" - PKG_CHECK_MODULES(NEEDED, $NEEDED) - - have_xdmcp="no" diff --git a/x11/library/libxcb/files/pthread-stubs.pc b/x11/library/libxcb/files/pthread-stubs.pc deleted file mode 100644 index ad7b91b632..0000000000 --- a/x11/library/libxcb/files/pthread-stubs.pc +++ /dev/null @@ -1,8 +0,0 @@ -prefix=/usr -exec_prefix=${prefix} -libdir=${exec_prefix}/lib - -Name: pthread stubs -Description: Stubs missing from libc for standard pthread functions -Version: 0.3 -Libs: diff --git a/x11/library/libxcb/pspec.xml b/x11/library/libxcb/pspec.xml deleted file mode 100644 index d37f39ddef..0000000000 --- a/x11/library/libxcb/pspec.xml +++ /dev/null @@ -1,140 +0,0 @@ - - - - - libxcb - http://xcb.freedesktop.org/ - - PisiLinux Community - admins@pisilinux.org - - MIT - library - The X protocol C-language Binding (XCB) - The X protocol C-language Binding (XCB) is a replacement for Xlib featuring a small footprint, latency hiding, direct access to the protocol, improved threading support, and extensibility. - https://xcb.freedesktop.org/dist/libxcb-1.13.1.tar.bz2 - - libXau-devel - libXdmcp-devel - python-devel - libxslt - util-macros - xcb-proto - - - libxcb-1.1-no-pthread-stubs.patch - - - - - libxcb - - libXau - libXdmcp - glibc - - - /usr/lib - /usr/share/man - /usr/share/doc - - - - - libxcb-devel - Development files for libxcb - - libxcb - libXau-devel - libXdmcp-devel - - - /usr/include/xcb - /usr/lib/pkgconfig - /usr/lib32/pkgconfig - - - pthread-stubs.pc - - - - - libxcb-32bit - emul32 - 32-bit shared libraries for libxcb - emul32 - - libXau-32bit - libXdmcp-32bit - - - - libxcb - libXau-32bit - libXdmcp-32bit - - - - /usr/lib32 - - - - - - 2019-10-23 - 1.13.1 - Rebuild. - PisiLinux Community - admin@pisilinux.org - - - 2019-02-20 - 1.13.1 - Rebuild. - PisiLinux Community - admin@pisilinux.org - - - 2019-01-16 - 1.13.1 - Version Bump - PisiLinux Community - admin@pisilinux.org - - - 2018-11-05 - 1.13 - Version Bump - PisiLinux Community - admin@pisilinux.org - - - 2018-09-16 - 1.12 - Rebuild. - PisiLinux Community - admin@pisilinux.org - - - 2017-01-29 - 1.12 - Version bump - PisiLinux Community - admin@pisilinux.org - - - 2016-04-30 - 1.11.1 - Release bump - PisiLinux Community - admin@pisilinux.org - - - 2016-03-08 - 1.11.1 - First release - Alihan Öztürk - alihan@pisilinux.org - - - diff --git a/x11/library/libxcb/translations.xml b/x11/library/libxcb/translations.xml deleted file mode 100644 index d1bf19d273..0000000000 --- a/x11/library/libxcb/translations.xml +++ /dev/null @@ -1,17 +0,0 @@ - - - - libxcb - X protokolü için C dili bağlayıcısı (XCB) - - - - libxcb-devel - libxcb için geliştirme dosyaları - - - - libxcb-32bit - libxcb için 32-bit paylaşımlı kitaplıklar - -