From 463754f5ab3e849c2121a110d10fcab5b51b2da0 Mon Sep 17 00:00:00 2001 From: Mike Staszel Date: Sun, 11 Oct 2009 13:11:41 -0500 Subject: [PATCH] More preparation for mt-daapd --- extra/inputproto/PKGBUILD | 4 +- extra/libxau/PKGBUILD | 4 +- extra/libxcb/PKGBUILD | 6 +- extra/libxcb/libxcb-1.1-sloppy-lock.patch | 12 -- extra/libxdmcp/PKGBUILD | 5 +- extra/libxft/PKGBUILD | 5 +- extra/libxml2/PKGBUILD | 3 +- extra/libxml2/largefile64.patch | 12 -- .../libxml2/libxml2-2.7.3-ficora-parse.patch | 159 ------------------ extra/libxss/PKGBUILD | 4 +- extra/python/ChangeLog | 19 --- extra/python/PKGBUILD | 15 +- extra/scrnsaverproto/PKGBUILD | 5 +- extra/tk/ChangeLog | 26 --- extra/tk/PKGBUILD | 3 +- extra/xcb-proto/PKGBUILD | 3 +- extra/xextproto/PKGBUILD | 6 +- extra/xf86bigfontproto/PKGBUILD | 4 +- extra/xorg-util-macros/PKGBUILD | 5 +- 19 files changed, 30 insertions(+), 270 deletions(-) delete mode 100644 extra/libxcb/libxcb-1.1-sloppy-lock.patch delete mode 100644 extra/libxml2/largefile64.patch delete mode 100644 extra/libxml2/libxml2-2.7.3-ficora-parse.patch delete mode 100644 extra/python/ChangeLog delete mode 100644 extra/tk/ChangeLog diff --git a/extra/inputproto/PKGBUILD b/extra/inputproto/PKGBUILD index 9e169e30a..a348a3554 100644 --- a/extra/inputproto/PKGBUILD +++ b/extra/inputproto/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 26583 2009-02-09 21:13:40Z jgc $ # Maintainer: Alexander Baldeck # Contributor: Jan de Groot + pkgname=inputproto pkgver=1.5.0 pkgrel=1 pkgdesc="X11 Input extension wire protocol" -arch=(arm) +arch=('arm') license=('custom') url="http://xorg.freedesktop.org/" source=(${url}/releases/individual/proto/${pkgname}-${pkgver}.tar.bz2) diff --git a/extra/libxau/PKGBUILD b/extra/libxau/PKGBUILD index f5f3a914f..ef902fad8 100644 --- a/extra/libxau/PKGBUILD +++ b/extra/libxau/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 10838 2008-08-31 13:22:37Z jgc $ # Maintainer: Alexander Baldeck # Contributor: Jan de Groot + pkgname=libxau pkgver=1.0.4 pkgrel=1 pkgdesc="X11 authorisation library" -arch=(arm) +arch=('arm') url="http://xorg.freedesktop.org/" depends=('glibc') makedepends=('pkgconfig' 'xproto') diff --git a/extra/libxcb/PKGBUILD b/extra/libxcb/PKGBUILD index 40cd96189..47b73c88b 100644 --- a/extra/libxcb/PKGBUILD +++ b/extra/libxcb/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 27498 2009-02-22 09:23:59Z andyrtr $ # Maintainer: Alexander Baldeck # Contributor: Jan de Groot + pkgname=libxcb pkgver=1.2 pkgrel=1 pkgdesc="X11 client-side library" -arch=(arm) +arch=('arm') url="http://xcb.freedesktop.org/" depends=('xcb-proto>=1.4' 'libxdmcp' 'libxau') makedepends=('pkgconfig' 'libxslt' 'python') @@ -13,7 +13,7 @@ conflicts=('libx11<1.1.99.2') options=('!libtool') license=('custom') source=(${url}/dist/${pkgname}-${pkgver}.tar.bz2 - libxcb-1.1-no-pthread-stubs.patch) + libxcb-1.1-no-pthread-stubs.patch) md5sums=('ae32b7846a7d83f5ec542a5431117564' 'a53f09ab3ec5cbfc1b0848bd137c535a') diff --git a/extra/libxcb/libxcb-1.1-sloppy-lock.patch b/extra/libxcb/libxcb-1.1-sloppy-lock.patch deleted file mode 100644 index 130890e28..000000000 --- a/extra/libxcb/libxcb-1.1-sloppy-lock.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -up libxcb-1.1/src/xcb_conn.c.jx libxcb-1.1/src/xcb_conn.c ---- libxcb-1.1/src/xcb_conn.c.jx 2007-10-28 16:11:18.000000000 -0400 -+++ libxcb-1.1/src/xcb_conn.c 2008-04-22 11:58:05.000000000 -0400 -@@ -63,7 +63,7 @@ static int _xcb_xlib_init(_xcb_xlib *xli - { - xlib->lock = 0; - #ifndef NDEBUG -- xlib->sloppy_lock = (getenv("LIBXCB_ALLOW_SLOPPY_LOCK") != 0); -+ xlib->sloppy_lock = 1; - #endif - pthread_cond_init(&xlib->cond, 0); - return 1; diff --git a/extra/libxdmcp/PKGBUILD b/extra/libxdmcp/PKGBUILD index 1fa3b2516..992849b04 100644 --- a/extra/libxdmcp/PKGBUILD +++ b/extra/libxdmcp/PKGBUILD @@ -1,11 +1,10 @@ -# $Id: PKGBUILD 35595 2009-04-14 06:09:57Z eric $ -#Maintainer: Jan de Groot +# Maintainer: Jan de Groot pkgname=libxdmcp pkgver=1.0.2 pkgrel=2 pkgdesc="X11 Display Manager Control Protocol library" -arch=(arm) +arch=('arm') url="http://xorg.freedesktop.org/" license=('custom') depends=('xproto' 'glibc') diff --git a/extra/libxft/PKGBUILD b/extra/libxft/PKGBUILD index 0713f34df..707244830 100644 --- a/extra/libxft/PKGBUILD +++ b/extra/libxft/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 4363 2008-07-06 19:22:55Z jgc $ # Maintainer: Alexander Baldeck # Contributor: Jan de Groot + pkgname=libxft pkgver=2.1.13 pkgrel=1 pkgdesc="FreeType-based font drawing library for X" -arch=(arm) +arch=('arm') license=('custom') url="http://xorg.freedesktop.org/" depends=('fontconfig>=2.6.0' 'libxrender') @@ -21,5 +21,4 @@ build() { make DESTDIR=${startdir}/pkg install || return 1 install -d -m755 ${pkgdir}/usr/share/licenses/${pkgname} install -m644 COPYING ${pkgdir}/usr/share/licenses/${pkgname}/ || return 1 - } diff --git a/extra/libxml2/PKGBUILD b/extra/libxml2/PKGBUILD index 17b4c1c9c..e95597c86 100644 --- a/extra/libxml2/PKGBUILD +++ b/extra/libxml2/PKGBUILD @@ -1,4 +1,3 @@ -# $Id: PKGBUILD 26966 2009-02-14 23:57:37Z jgc $ # Maintainer: Jan de Groot # Contributor: John Proctor @@ -6,7 +5,7 @@ pkgname=libxml2 pkgver=2.7.3 pkgrel=1 pkgdesc="XML parsing library, version 2" -arch=(arm) +arch=('arm') license=('custom') depends=('zlib>=1.2.3.3' 'readline>=5.2.013' 'ncurses>=5.7') makedepends=('python') diff --git a/extra/libxml2/largefile64.patch b/extra/libxml2/largefile64.patch deleted file mode 100644 index 29be82760..000000000 --- a/extra/libxml2/largefile64.patch +++ /dev/null @@ -1,12 +0,0 @@ ---- libxml2-2.6.32.dfsg.orig/libxml.h -+++ libxml2-2.6.32.dfsg/libxml.h -@@ -13,6 +13,9 @@ - #ifndef _LARGEFILE_SOURCE - #define _LARGEFILE_SOURCE - #endif -+#ifndef _LARGEFILE64_SOURCE -+#define _LARGEFILE64_SOURCE -+#endif - #ifndef _FILE_OFFSET_BITS - #define _FILE_OFFSET_BITS 64 - #endif diff --git a/extra/libxml2/libxml2-2.7.3-ficora-parse.patch b/extra/libxml2/libxml2-2.7.3-ficora-parse.patch deleted file mode 100644 index e239b217d..000000000 --- a/extra/libxml2/libxml2-2.7.3-ficora-parse.patch +++ /dev/null @@ -1,159 +0,0 @@ -diff --git a/parser.c b/parser.c -index a476060..b404722 100644 ---- a/parser.c -+++ b/parser.c -@@ -5323,7 +5323,8 @@ xmlParseNotationType(xmlParserCtxtPtr ctxt) { - if (name == NULL) { - xmlFatalErrMsg(ctxt, XML_ERR_NAME_REQUIRED, - "Name expected in NOTATION declaration\n"); -- return(ret); -+ xmlFreeEnumeration(ret); -+ return(NULL); - } - tmp = ret; - while (tmp != NULL) { -@@ -5339,7 +5340,10 @@ xmlParseNotationType(xmlParserCtxtPtr ctxt) { - } - if (tmp == NULL) { - cur = xmlCreateEnumeration(name); -- if (cur == NULL) return(ret); -+ if (cur == NULL) { -+ xmlFreeEnumeration(ret); -+ return(NULL); -+ } - if (last == NULL) ret = last = cur; - else { - last->next = cur; -@@ -5350,9 +5354,8 @@ xmlParseNotationType(xmlParserCtxtPtr ctxt) { - } while (RAW == '|'); - if (RAW != ')') { - xmlFatalErr(ctxt, XML_ERR_NOTATION_NOT_FINISHED, NULL); -- if ((last != NULL) && (last != ret)) -- xmlFreeEnumeration(last); -- return(ret); -+ xmlFreeEnumeration(ret); -+ return(NULL); - } - NEXT; - return(ret); -@@ -5407,7 +5410,10 @@ xmlParseEnumerationType(xmlParserCtxtPtr ctxt) { - cur = xmlCreateEnumeration(name); - if (!xmlDictOwns(ctxt->dict, name)) - xmlFree(name); -- if (cur == NULL) return(ret); -+ if (cur == NULL) { -+ xmlFreeEnumeration(ret); -+ return(NULL); -+ } - if (last == NULL) ret = last = cur; - else { - last->next = cur; -@@ -5775,9 +5781,10 @@ xmlParseElementMixedContentDecl(xmlParserCtxtPtr ctxt, int inputchk) { - } - - /** -- * xmlParseElementChildrenContentDecl: -+ * xmlParseElementChildrenContentDeclPriv: - * @ctxt: an XML parser context - * @inputchk: the input used for the current entity, needed for boundary checks -+ * @depth: the level of recursion - * - * parse the declaration for a Mixed Element content - * The leading '(' and spaces have been skipped in xmlParseElementContentDecl -@@ -5805,12 +5812,20 @@ xmlParseElementMixedContentDecl(xmlParserCtxtPtr ctxt, int inputchk) { - * Returns the tree of xmlElementContentPtr describing the element - * hierarchy. - */ --xmlElementContentPtr --xmlParseElementChildrenContentDecl (xmlParserCtxtPtr ctxt, int inputchk) { -+static xmlElementContentPtr -+xmlParseElementChildrenContentDeclPriv(xmlParserCtxtPtr ctxt, int inputchk, -+ int depth) { - xmlElementContentPtr ret = NULL, cur = NULL, last = NULL, op = NULL; - const xmlChar *elem; - xmlChar type = 0; - -+ if (((depth > 128) && ((ctxt->options & XML_PARSE_HUGE) == 0)) || -+ (depth > 2048)) { -+ xmlFatalErrMsgInt(ctxt, XML_ERR_ELEMCONTENT_NOT_FINISHED, -+"xmlParseElementChildrenContentDecl : depth %d too deep, use XML_PARSE_HUGE\n", -+ depth); -+ return(NULL); -+ } - SKIP_BLANKS; - GROW; - if (RAW == '(') { -@@ -5819,7 +5834,8 @@ xmlParseElementChildrenContentDecl (xmlParserCtxtPtr ctxt, int inputchk) { - /* Recurse on first child */ - NEXT; - SKIP_BLANKS; -- cur = ret = xmlParseElementChildrenContentDecl(ctxt, inputid); -+ cur = ret = xmlParseElementChildrenContentDeclPriv(ctxt, inputid, -+ depth + 1); - SKIP_BLANKS; - GROW; - } else { -@@ -5951,7 +5967,8 @@ xmlParseElementChildrenContentDecl (xmlParserCtxtPtr ctxt, int inputchk) { - /* Recurse on second child */ - NEXT; - SKIP_BLANKS; -- last = xmlParseElementChildrenContentDecl(ctxt, inputid); -+ last = xmlParseElementChildrenContentDeclPriv(ctxt, inputid, -+ depth + 1); - SKIP_BLANKS; - } else { - elem = xmlParseName(ctxt); -@@ -6062,6 +6079,44 @@ xmlParseElementChildrenContentDecl (xmlParserCtxtPtr ctxt, int inputchk) { - } - - /** -+ * -+ * xmlParseElementChildrenContentDecl: -+ * @ctxt: an XML parser context -+ * @inputchk: the input used for the current entity, needed for boundary checks -+ * @depth: the level of recursion -+ * -+ * parse the declaration for a Mixed Element content -+ * The leading '(' and spaces have been skipped in xmlParseElementContentDecl -+ * -+ * [47] children ::= (choice | seq) ('?' | '*' | '+')? -+ * -+ * [48] cp ::= (Name | choice | seq) ('?' | '*' | '+')? -+ * -+ * [49] choice ::= '(' S? cp ( S? '|' S? cp )* S? ')' -+ * -+ * [50] seq ::= '(' S? cp ( S? ',' S? cp )* S? ')' -+ * -+ * [ VC: Proper Group/PE Nesting ] applies to [49] and [50] -+ * TODO Parameter-entity replacement text must be properly nested -+ * with parenthesized groups. That is to say, if either of the -+ * opening or closing parentheses in a choice, seq, or Mixed -+ * construct is contained in the replacement text for a parameter -+ * entity, both must be contained in the same replacement text. For -+ * interoperability, if a parameter-entity reference appears in a -+ * choice, seq, or Mixed construct, its replacement text should not -+ * be empty, and neither the first nor last non-blank character of -+ * the replacement text should be a connector (| or ,). -+ * -+ * Returns the tree of xmlElementContentPtr describing the element -+ * hierarchy. -+ */ -+xmlElementContentPtr -+xmlParseElementChildrenContentDecl(xmlParserCtxtPtr ctxt, int inputchk) { -+ /* stub left for API/ABI compat */ -+ return(xmlParseElementChildrenContentDeclPriv(ctxt, inputchk, 1)); -+} -+ -+/** - * xmlParseElementContentDecl: - * @ctxt: an XML parser context - * @name: the name of the element being defined. -@@ -6097,7 +6152,7 @@ xmlParseElementContentDecl(xmlParserCtxtPtr ctxt, const xmlChar *name, - tree = xmlParseElementMixedContentDecl(ctxt, inputid); - res = XML_ELEMENT_TYPE_MIXED; - } else { -- tree = xmlParseElementChildrenContentDecl(ctxt, inputid); -+ tree = xmlParseElementChildrenContentDeclPriv(ctxt, inputid, 1); - res = XML_ELEMENT_TYPE_ELEMENT; - } - SKIP_BLANKS; diff --git a/extra/libxss/PKGBUILD b/extra/libxss/PKGBUILD index e88973efc..bdcdb385b 100644 --- a/extra/libxss/PKGBUILD +++ b/extra/libxss/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 1905 2008-05-22 18:21:37Z jgc $ # Maintainer: Alexander Baldeck # Contributor: Jan de Groot + pkgname=libxss pkgver=1.1.3 pkgrel=1 pkgdesc="X11 Screen Saver extension library" -arch=(arm) +arch=('arm') license=('custom:XFREE86') url="http://xorg.freedesktop.org/" depends=('libxext' 'scrnsaverproto') diff --git a/extra/python/ChangeLog b/extra/python/ChangeLog deleted file mode 100644 index 72950e763..000000000 --- a/extra/python/ChangeLog +++ /dev/null @@ -1,19 +0,0 @@ -2009-06-06 Allan McRae - * python 2.6.2-2 - * add fix for smtplib (FS#14915) - -2009-04-17 Allan McRae - * python 2.6.2-1 - * upstream update - * add expat and sqlite3 dependencies - * remove python-2.5 compatibility site path - -2008-12-07 Allan McRae - * python 2.6.1-1 - * upstream update - * fix gdbm related build error - * fix modulator/pynche launchers - -2008-10-27 Allan McRae - * python 2.6-2 - * patched to use internal expat diff --git a/extra/python/PKGBUILD b/extra/python/PKGBUILD index 2d04ad66e..b62d32b43 100644 --- a/extra/python/PKGBUILD +++ b/extra/python/PKGBUILD @@ -1,4 +1,3 @@ -# $Id: PKGBUILD 46742 2009-07-20 02:28:20Z allan $ # Maintainer: Allan McRae # Contributer: Jason Chu @@ -7,7 +6,7 @@ pkgver=2.6.2 pkgrel=3 _pybasever=2.6 pkgdesc="A high-level scripting language" -arch=('i686' 'x86_64') +arch=('arm') license=('custom') url="http://www.python.org" depends=('db' 'bzip2' 'gdbm' 'openssl>=0.9.8d' 'zlib' 'expat' 'sqlite3>=3.6.15-2') @@ -16,12 +15,12 @@ optdepends=('tk: for IDLE, pynche and modulator') provides=('python-elementtree' 'python-ctypes') replaces=('python-elementtree' 'python-ctypes') source=(http://www.python.org/ftp/python/${pkgver}/Python-${pkgver}.tar.bz2 - python-2.6-internal-expat.patch - python-2.6-gdbm.patch - python-2.6-smtplib.patch - python-2.6-readline.patch - modulator-launcher - pynche-launcher) + python-2.6-internal-expat.patch + python-2.6-gdbm.patch + python-2.6-smtplib.patch + python-2.6-readline.patch + modulator-launcher + pynche-launcher) md5sums=('245db9f1e0f09ab7e0faaa0cf7301011' '993800dbcc0c4f199c1ceee998a06e71' '13fab4bb2cacbc433e62d7191a17f71e' diff --git a/extra/scrnsaverproto/PKGBUILD b/extra/scrnsaverproto/PKGBUILD index 76046058d..180270ea5 100644 --- a/extra/scrnsaverproto/PKGBUILD +++ b/extra/scrnsaverproto/PKGBUILD @@ -1,11 +1,10 @@ -# $Id: PKGBUILD 5568 2008-07-18 20:51:46Z jgc $ -#Maintainer: Jan de Groot +# Maintainer: Jan de Groot pkgname=scrnsaverproto pkgver=1.1.0 pkgrel=2 pkgdesc="X11 Screen Saver extension wire protocol" -arch=(arm) +arch=('arm') license=('custom') url="http://xorg.freedesktop.org/" source=(${url}/releases/individual/proto/${pkgname}-${pkgver}.tar.bz2) diff --git a/extra/tk/ChangeLog b/extra/tk/ChangeLog deleted file mode 100644 index 6efdc04b0..000000000 --- a/extra/tk/ChangeLog +++ /dev/null @@ -1,26 +0,0 @@ -2000-04-28 Allan McRae - * 8.5.7-1 : - new upstream release - include private headers (FS#14388) - -2008-12-24 Allan McRae - * 8.5.6-1 : - new upstream release - -2008-10-16 Allan McRae - * 8.5.5-1 : - new upstream release - -2008-08-20 Allan McRae - * 8.5.4-2 : - Remove xproto compatibility patch as no longer needed - -2008-08-16 Allan McRae - * 8.5.4-1 : - new upstream release - FHS man pages - -2008-07-01 Allan McRae - * 8.5.3-1 : - new upstream release - added patch for xproto-7.0.13 compatibility diff --git a/extra/tk/PKGBUILD b/extra/tk/PKGBUILD index aa008d6a2..6c3e3a3f8 100644 --- a/extra/tk/PKGBUILD +++ b/extra/tk/PKGBUILD @@ -1,4 +1,3 @@ -# $Id: PKGBUILD 36913 2009-04-28 13:33:52Z allan $ # Maintainer: Allan McRae # Contributor: Judd Vinet @@ -6,7 +5,7 @@ pkgname=tk pkgver=8.5.7 pkgrel=1 pkgdesc="A windowing toolkit for use with tcl" -arch=(arm) +arch=('arm') url="http://tcl.sourceforge.net/" license=('custom') depends=("tcl=${pkgver}" 'libxss' 'libxft') diff --git a/extra/xcb-proto/PKGBUILD b/extra/xcb-proto/PKGBUILD index 8ff2de435..4983d297d 100644 --- a/extra/xcb-proto/PKGBUILD +++ b/extra/xcb-proto/PKGBUILD @@ -1,4 +1,3 @@ -# $Id: PKGBUILD 27497 2009-02-22 09:20:47Z andyrtr $ # Maintainer: Alexander Baldeck # Contributor: Jan de Groot @@ -6,7 +5,7 @@ pkgname=xcb-proto pkgver=1.4 pkgrel=1 pkgdesc="XML-XCB protocol descriptions" -arch=(arm) +arch=('arm') url="http://xcb.freedesktop.org/" license=('custom') makedepends=('python' 'libxml2') diff --git a/extra/xextproto/PKGBUILD b/extra/xextproto/PKGBUILD index 0f0d95ca5..22aa837bd 100644 --- a/extra/xextproto/PKGBUILD +++ b/extra/xextproto/PKGBUILD @@ -1,17 +1,15 @@ -# $Id: PKGBUILD 26846 2009-02-13 15:23:45Z andyrtr $ -#Maintainer: Jan de Groot +# Maintainer: Jan de Groot pkgname=xextproto pkgver=7.0.5 pkgrel=1 pkgdesc="X11 various extension wire protocol" -arch=(arm) +arch=('arm') license=('custom') depends=('inputproto>=1.5') url="http://xorg.freedesktop.org/" source=(${url}/releases/individual/proto/${pkgname}-${pkgver}.tar.bz2) md5sums=('e6841018a7c64983b0954aa2c564d115') -sha1sums=('d62e704039e7c647da66c9a6531ebdede37dace8') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/extra/xf86bigfontproto/PKGBUILD b/extra/xf86bigfontproto/PKGBUILD index e2882d2fe..3a403ed76 100644 --- a/extra/xf86bigfontproto/PKGBUILD +++ b/extra/xf86bigfontproto/PKGBUILD @@ -1,5 +1,4 @@ -# $Id: PKGBUILD 36402 2009-04-22 02:26:18Z eric $ -#Maintainer: Jan de Groot +# Maintainer: Jan de Groot pkgname=xf86bigfontproto pkgver=1.1.2 @@ -10,7 +9,6 @@ url="http://xorg.freedesktop.org/" license=('custom') source=(${url}/releases/individual/proto/${pkgname}-${pkgver}.tar.bz2) md5sums=('a318c1e86123832d7b0c95fc7d47ef35') -sha1sums=('4a2e84b3f529e4747dbc07bf4496bfe01f40aa85') build() { cd ${srcdir}/${pkgname}-${pkgver} diff --git a/extra/xorg-util-macros/PKGBUILD b/extra/xorg-util-macros/PKGBUILD index 8b247dfdb..d1e055ab5 100644 --- a/extra/xorg-util-macros/PKGBUILD +++ b/extra/xorg-util-macros/PKGBUILD @@ -1,11 +1,10 @@ -# $Id: PKGBUILD 21902 2008-12-17 20:27:32Z jgc $ -#Maintainer: Jan de Groot +# Maintainer: Jan de Groot pkgname=xorg-util-macros pkgver=1.2.1 pkgrel=1 pkgdesc="X.Org Autotools macros" -arch=(arm) +arch=('arm') license=('custom') url="http://xorg.freedesktop.org/" source=(${url}/releases/individual/util/util-macros-${pkgver}.tar.bz2)