From 25736b05e809da2494f52b0cd92f6b498d0dd8b3 Mon Sep 17 00:00:00 2001 From: ayhanyalcinsoy Date: Fri, 19 Jun 2015 13:39:55 +0300 Subject: [PATCH] moved into main repo for pisi 2.0 --- system/base/component.xml | 3 + system/base/gperf/actions.py | 26 ++++ system/base/gperf/pspec.xml | 61 +++++++++ system/base/gperf/translations.xml | 9 ++ 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 | 128 ++++++++++++++++++ system/base/libX11/translations.xml | 19 +++ system/base/libxcb/actions.py | 30 ++++ .../files/libxcb-1.1-no-pthread-stubs.patch | 11 ++ system/base/libxcb/files/pthread-stubs.pc | 8 ++ system/base/libxcb/pspec.xml | 125 +++++++++++++++++ system/base/libxcb/translations.xml | 17 +++ system/component.xml | 3 + 16 files changed, 555 insertions(+) create mode 100644 system/base/component.xml create mode 100644 system/base/gperf/actions.py create mode 100644 system/base/gperf/pspec.xml create mode 100644 system/base/gperf/translations.xml 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 create mode 100644 system/base/libxcb/actions.py create mode 100644 system/base/libxcb/files/libxcb-1.1-no-pthread-stubs.patch create mode 100644 system/base/libxcb/files/pthread-stubs.pc create mode 100644 system/base/libxcb/pspec.xml create mode 100644 system/base/libxcb/translations.xml create mode 100644 system/component.xml diff --git a/system/base/component.xml b/system/base/component.xml new file mode 100644 index 0000000000..4b3b583dbf --- /dev/null +++ b/system/base/component.xml @@ -0,0 +1,3 @@ + + system + diff --git a/system/base/gperf/actions.py b/system/base/gperf/actions.py new file mode 100644 index 0000000000..44bf0507c7 --- /dev/null +++ b/system/base/gperf/actions.py @@ -0,0 +1,26 @@ +#!/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 autotools +from pisi.actionsapi import pisitools + +def setup(): + autotools.configure() + +def build(): + autotools.make() + +def check(): + autotools.make("check -j1") + +def install(): + autotools.install() + + pisitools.dohtml("doc/*.html") + + pisitools.remove("/usr/share/doc/gperf.html") + + pisitools.dodoc("AUTHORS", "COPYING", "NEWS", "README") diff --git a/system/base/gperf/pspec.xml b/system/base/gperf/pspec.xml new file mode 100644 index 0000000000..bed477ce21 --- /dev/null +++ b/system/base/gperf/pspec.xml @@ -0,0 +1,61 @@ + + + + + gperf + http://www.gnu.org/software/gperf/gperf.html + + PisiLinux Community + admins@pisilinux.org + + GPLv2 + app:console + A perfect hash function generator + gperf is a perfect hash function generator. For a given list of strings, it produces a hash function and hash table, in form of C or C++ code, for looking up a value depending on the input string. The hash function is perfect, which means that the hash table has no collisions, and the hash table lookup needs a single string comparison only. + mirrors://gnu/gperf/gperf-3.0.4.tar.gz + + + + gperf + + libgcc + + + /usr/bin + /usr/share/doc + /usr/share/info + /usr/share/man + + + + + + 2014-05-11 + 3.0.4 + Release bump. + Marcin Bojara + marcin@pisilinux.org + + + 2013-10-24 + 3.0.4 + Rebuild. + Ertuğrul Erata + ertugrulerata@gmail.com + + + 2013-07-26 + 3.0.4 + Fix dep,release bump. + PisiLinux Community + admins@pisilinux.org + + + 2012-08-23 + 3.0.4 + First release + PisiLinux Community + admins@pisilinux.org + + + diff --git a/system/base/gperf/translations.xml b/system/base/gperf/translations.xml new file mode 100644 index 0000000000..245bf2bd32 --- /dev/null +++ b/system/base/gperf/translations.xml @@ -0,0 +1,9 @@ + + + + gperf + Mükemmel hash üreticisi + gperf mükemmel hash fonksiyonu üretecidir. Verilen bir katar listesi için C ve C++ kodu biçiminde bir hash fonksiyonu ve hash tablosu üretir. + GNU gperf es un generador de perfect hash. Produce una función hash y una tabla hash a base de una lista de cadenas, en forma de código C o C++ , para revisar valores dependiendo de una cadena de entrada. La función de hash es perfecta, lo que quiere decir que no hay colisiones en la tabla de hash, y para la búsqueda en la tabla hash se necesita solamente una comparación. + + diff --git a/system/base/libX11/actions.py b/system/base/libX11/actions.py new file mode 100644 index 0000000000..4d41b1e29c --- /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,--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 0000000000..8b37f365b5 --- /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 0000000000..a38c0ce2a2 --- /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 0000000000..a55a940744 --- /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 0000000000..562ee95894 --- /dev/null +++ b/system/base/libX11/pspec.xml @@ -0,0 +1,128 @@ + + + + + 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.3.tar.bz2 + + libxcb-devel + xorg-proto + util-macros + xtrans + + + + + + + + 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 + glibc-32bit + + + libX11 + libxcb-32bit + glibc-32bit + + + /usr/lib32 + + + + + + 2015-05-22 + 1.6.3 + Version bump. + Ertuğrul Erata + ertugrulerata@gmail.com + + + 2014-05-11 + 1.6.2 + Release bump. + Marcin Bojara + marcin@pisilinux.org + + + 2013-10-07 + 1.6.2 + Rebuild. + Serdar Soytetir + kaptan@pisilinux.org + + + 2013-09-12 + 1.6.2 + Version bump. + Marcin Bojara + marcin@pisilinux.org + + + 2013-07-30 + 1.6.1 + Version bump. + Marcin Bojara + marcin@pisilinux.org + + + 2013-06-21 + 1.6.0 + Version bump. + Marcin Bojara + marcin@pisilinux.org + + + 2012-11-24 + 1.5.0 + First release + Serdar Soytetir + kaptan@pisilinux.org + + + diff --git a/system/base/libX11/translations.xml b/system/base/libX11/translations.xml new file mode 100644 index 0000000000..f7b669ffdf --- /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 + + diff --git a/system/base/libxcb/actions.py b/system/base/libxcb/actions.py new file mode 100644 index 0000000000..bfab6647d2 --- /dev/null +++ b/system/base/libxcb/actions.py @@ -0,0 +1,30 @@ +# -*- 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("-vif") + autotools.configure("--disable-static \ + --enable-xevie \ + --enable-xprint \ + --enable-xinput \ + --enable-xkb \ + --without-launchd \ + --without-doxygen") + + pisitools.dosed("libtool"," -shared ", " -Wl,--as-needed -shared ") + +def build(): + autotools.make() + +def install(): + autotools.rawInstall("-j1 DESTDIR=%s" % get.installDIR()) + + pisitools.dodoc("COPYING", "NEWS", "README") diff --git a/system/base/libxcb/files/libxcb-1.1-no-pthread-stubs.patch b/system/base/libxcb/files/libxcb-1.1-no-pthread-stubs.patch new file mode 100644 index 0000000000..84c7f8e2fb --- /dev/null +++ b/system/base/libxcb/files/libxcb-1.1-no-pthread-stubs.patch @@ -0,0 +1,11 @@ +--- 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.11) +-NEEDED="pthread-stubs xau >= 0.99.2" ++NEEDED="xau >= 0.99.2" + PKG_CHECK_MODULES(NEEDED, $NEEDED) + + have_xdmcp="no" diff --git a/system/base/libxcb/files/pthread-stubs.pc b/system/base/libxcb/files/pthread-stubs.pc new file mode 100644 index 0000000000..ad7b91b632 --- /dev/null +++ b/system/base/libxcb/files/pthread-stubs.pc @@ -0,0 +1,8 @@ +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/system/base/libxcb/pspec.xml b/system/base/libxcb/pspec.xml new file mode 100644 index 0000000000..48357b1ebd --- /dev/null +++ b/system/base/libxcb/pspec.xml @@ -0,0 +1,125 @@ + + + + + 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. + http://xcb.freedesktop.org/dist/libxcb-1.11.tar.bz2 + + libXau-devel + libXdmcp-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 + glibc-32bit + + + libxcb + libXau-32bit + libXdmcp-32bit + glibc-32bit + + + /usr/lib32 + + + + + + 2015-05-22 + 1.11 + Version bump. + Marcin Bojara + marcin@pisilinux.org + + + 2014-05-11 + 1.10 + Release bump. + Marcin Bojara + marcin@pisilinux.org + + + 2014-03-07 + 1.10 + Version bump. + Yusuf Aydemir + yusuf.aydemir@pisilinux.org + + + 2013-10-08 + 1.9.1 + Rebuild. + Serdar Soytetir + kaptan@pisilinux.org + + + 2013-07-28 + 1.9.1 + Version bump. + Marcin Bojara + marcin@pisilinux.org + + + 2012-11-18 + 1.9 + First release + Erdinç Gültekin + admins@pisilinux.org + + + diff --git a/system/base/libxcb/translations.xml b/system/base/libxcb/translations.xml new file mode 100644 index 0000000000..d1bf19d273 --- /dev/null +++ b/system/base/libxcb/translations.xml @@ -0,0 +1,17 @@ + + + + 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 + + diff --git a/system/component.xml b/system/component.xml new file mode 100644 index 0000000000..4b3b583dbf --- /dev/null +++ b/system/component.xml @@ -0,0 +1,3 @@ + + system +