diff options
author | Parabola <dev@list.parabolagnulinux.org> | 2011-05-02 00:29:16 +0000 |
---|---|---|
committer | Parabola <dev@list.parabolagnulinux.org> | 2011-05-02 00:29:16 +0000 |
commit | 3be02a9acbeb006d9a9e6136c54d91064cc7d80e (patch) | |
tree | ade247e1b6c47fbd7362273f59d3ae4f955587a7 /community | |
parent | 40f0b1c7106cc1fed13f14e80f083ecd69c416f5 (diff) |
Mon May 2 00:29:22 UTC 2011
Diffstat (limited to 'community')
-rw-r--r-- | community/cherrypy/837.2049.patch | 554 | ||||
-rw-r--r-- | community/cherrypy/ChangeLog | 26 | ||||
-rw-r--r-- | community/cherrypy/PKGBUILD | 23 | ||||
-rw-r--r-- | community/cherrypy/license | 25 | ||||
-rw-r--r-- | community/gecko-mediaplayer/gecko-mediaplayer-xulrunner2.0.patch | 12 | ||||
-rw-r--r-- | community/gnote/gtk2.20.patch | 40 | ||||
-rw-r--r-- | community/llvm/PKGBUILD | 225 | ||||
-rw-r--r-- | community/llvm/cindexer-clang-path.patch | 10 | ||||
-rw-r--r-- | community/llvm/clang-plugin-loader-registry.patch | 11 | ||||
-rw-r--r-- | community/llvm/clang-pure64.patch | 38 | ||||
-rw-r--r-- | community/llvm/clang-toolchains-gcc-versions.patch | 12 | ||||
-rw-r--r-- | community/llvm/enable-lto.patch | 36 | ||||
-rw-r--r-- | community/xonotic/PKGBUILD | 53 | ||||
-rw-r--r-- | community/xonotic/xonotic-dedicated.sh | 3 | ||||
-rw-r--r-- | community/xonotic/xonotic-glx.desktop | 11 | ||||
-rw-r--r-- | community/xonotic/xonotic-glx.sh | 3 | ||||
-rw-r--r-- | community/xonotic/xonotic-sdl.desktop | 11 | ||||
-rw-r--r-- | community/xonotic/xonotic-sdl.sh | 3 | ||||
-rw-r--r-- | community/yajl/handle-null-case.patch | 78 |
19 files changed, 0 insertions, 1174 deletions
diff --git a/community/cherrypy/837.2049.patch b/community/cherrypy/837.2049.patch deleted file mode 100644 index 20cc0dd36..000000000 --- a/community/cherrypy/837.2049.patch +++ /dev/null @@ -1,554 +0,0 @@ -Index: cherrypy/test/test_tools.py -=================================================================== ---- cherrypy/test/test_tools.py (revision 2049) -+++ cherrypy/test/test_tools.py (working copy) -@@ -3,6 +3,7 @@ - import gzip - import StringIO - import sys -+from httplib import IncompleteRead - import time - timeout = 0.2 - -@@ -272,8 +273,12 @@ - # Because this error is raised after the response body has - # started, and because it's chunked output, an error is raised by - # the HTTP client when it encounters incomplete output. -- self.assertRaises(ValueError, self.getPage, -- "/demo/errinstream?id=5") -+ if sys.version_info[:2] >= (2, 6): -+ self.assertRaises(IncompleteRead, self.getPage, -+ "/demo/errinstream?id=5") -+ else: -+ self.assertRaises(ValueError, self.getPage, -+ "/demo/errinstream?id=5") - # If this fails, then on_end_request isn't being called at all. - time.sleep(0.1) - self.getPage("/demo/ended/5") -Index: cherrypy/test/webtest.py -=================================================================== ---- cherrypy/test/webtest.py (revision 2049) -+++ cherrypy/test/webtest.py (working copy) -@@ -491,7 +491,7 @@ - # IN6ADDR_ANY, which should respond on localhost. - host = "::1" - conn = http_conn(host, port) -- -+ - conn._http_vsn_str = protocol - conn._http_vsn = int("".join([x for x in protocol if x.isdigit()])) - -Index: cherrypy/test/test_encoding.py -=================================================================== ---- cherrypy/test/test_encoding.py (revision 2049) -+++ cherrypy/test/test_encoding.py (working copy) -@@ -1,7 +1,9 @@ - from cherrypy.test import test - test.prefer_parent_path() - -+import sys - import gzip, StringIO -+from httplib import IncompleteRead - import cherrypy - europoundUnicode = u'\x80\xa3' - europoundUtf8 = u'\x80\xa3'.encode('utf-8') -@@ -160,10 +162,13 @@ - else: - # The wsgiserver will simply stop sending data, and the HTTP client - # will error due to an incomplete chunk-encoded stream. -- self.assertRaises(ValueError, self.getPage, '/gzip/noshow_stream', -- headers=[("Accept-Encoding", "gzip")]) -+ if sys.version_info[:2] >= (2, 6): -+ self.assertRaises(IncompleteRead, self.getPage, '/gzip/noshow_stream', -+ headers=[("Accept-Encoding", "gzip")]) -+ else: -+ self.assertRaises(ValueError, self.getPage, '/gzip/noshow_stream', -+ headers=[("Accept-Encoding", "gzip")]) - -- - if __name__ == "__main__": - setup_server() - helper.testmain() -Index: cherrypy/test/test_core.py -=================================================================== ---- cherrypy/test/test_core.py (revision 2049) -+++ cherrypy/test/test_core.py (working copy) -@@ -7,6 +7,7 @@ - localDir = os.path.dirname(__file__) - import sys - import types -+from httplib import IncompleteRead - - import cherrypy - from cherrypy import _cptools, tools -@@ -760,8 +761,12 @@ - else: - # Under HTTP/1.1, the chunked transfer-coding is used. - # The HTTP client will choke when the output is incomplete. -- self.assertRaises(ValueError, self.getPage, -- "/error/page_streamed") -+ if sys.version_info[:2] >= (2, 6): -+ self.assertRaises(IncompleteRead, self.getPage, -+ "/error/page_streamed") -+ else: -+ self.assertRaises(ValueError, self.getPage, -+ "/error/page_streamed") - - # No traceback should be present - self.getPage("/error/cause_err_in_finalize") -Index: cherrypy/wsgiserver/__init__.py -=================================================================== ---- cherrypy/wsgiserver/__init__.py (revision 2049) -+++ cherrypy/wsgiserver/__init__.py (working copy) -@@ -713,148 +713,325 @@ - """Exception raised when the SSL implementation signals a fatal alert.""" - pass - -+if sys.version_info[:2] >= (2, 6) or sys.version_info[:3] >= (2, 5, 2): -+ class CP_fileobject(socket._fileobject): -+ """Faux file object attached to a socket object.""" - --class CP_fileobject(socket._fileobject): -- """Faux file object attached to a socket object.""" -- -- def sendall(self, data): -- """Sendall for non-blocking sockets.""" -- while data: -- try: -- bytes_sent = self.send(data) -- data = data[bytes_sent:] -- except socket.error, e: -- if e.args[0] not in socket_errors_nonblocking: -- raise -- -- def send(self, data): -- return self._sock.send(data) -- -- def flush(self): -- if self._wbuf: -- buffer = "".join(self._wbuf) -- self._wbuf = [] -- self.sendall(buffer) -- -- def recv(self, size): -- while True: -- try: -- return self._sock.recv(size) -- except socket.error, e: -- if e.args[0] not in socket_errors_nonblocking: -- raise -- -- def read(self, size=-1): -- if size < 0: -- # Read until EOF -- buffers = [self._rbuf] -- self._rbuf = "" -- if self._rbufsize <= 1: -- recv_size = self.default_bufsize -+ def sendall(self, data): -+ """Sendall for non-blocking sockets.""" -+ while data: -+ try: -+ bytes_sent = self.send(data) -+ data = data[bytes_sent:] -+ except socket.error, e: -+ if e.args[0] not in socket_errors_nonblocking: -+ raise -+ -+ def send(self, data): -+ return self._sock.send(data) -+ -+ def flush(self): -+ if self._wbuf: -+ buffer = "".join(self._wbuf) -+ self._wbuf = [] -+ self.sendall(buffer) -+ -+ def recv(self, size): -+ while True: -+ try: -+ return self._sock.recv(size) -+ except socket.error, e: -+ if e.args[0] not in socket_errors_nonblocking: -+ raise -+ -+ def read(self, size=-1): -+ # Use max, disallow tiny reads in a loop as they are very inefficient. -+ # We never leave read() with any leftover data from a new recv() call -+ # in our internal buffer. -+ rbufsize = max(self._rbufsize, self.default_bufsize) -+ # Our use of StringIO rather than lists of string objects returned by -+ # recv() minimizes memory usage and fragmentation that occurs when -+ # rbufsize is large compared to the typical return value of recv(). -+ buf = self._rbuf -+ buf.seek(0, 2) # seek end -+ if size < 0: -+ # Read until EOF -+ self._rbuf = StringIO.StringIO() # reset _rbuf. we consume it via buf. -+ while True: -+ data = self.recv(rbufsize) -+ if not data: -+ break -+ buf.write(data) -+ return buf.getvalue() - else: -- recv_size = self._rbufsize -- -+ # Read until size bytes or EOF seen, whichever comes first -+ buf_len = buf.tell() -+ if buf_len >= size: -+ # Already have size bytes in our buffer? Extract and return. -+ buf.seek(0) -+ rv = buf.read(size) -+ self._rbuf = StringIO.StringIO() -+ self._rbuf.write(buf.read()) -+ return rv -+ -+ self._rbuf = StringIO.StringIO() # reset _rbuf. we consume it via buf. -+ while True: -+ left = size - buf_len -+ # recv() will malloc the amount of memory given as its -+ # parameter even though it often returns much less data -+ # than that. The returned data string is short lived -+ # as we copy it into a StringIO and free it. This avoids -+ # fragmentation issues on many platforms. -+ data = self.recv(left) -+ if not data: -+ break -+ n = len(data) -+ if n == size and not buf_len: -+ # Shortcut. Avoid buffer data copies when: -+ # - We have no data in our buffer. -+ # AND -+ # - Our call to recv returned exactly the -+ # number of bytes we were asked to read. -+ return data -+ if n == left: -+ buf.write(data) -+ del data # explicit free -+ break -+ assert n <= left, "recv(%d) returned %d bytes" % (left, n) -+ buf.write(data) -+ buf_len += n -+ del data # explicit free -+ #assert buf_len == buf.tell() -+ return buf.getvalue() -+ -+ def readline(self, size=-1): -+ buf = self._rbuf -+ buf.seek(0, 2) # seek end -+ if buf.tell() > 0: -+ # check if we already have it in our buffer -+ buf.seek(0) -+ bline = buf.readline(size) -+ if bline.endswith('\n') or len(bline) == size: -+ self._rbuf = StringIO.StringIO() -+ self._rbuf.write(buf.read()) -+ return bline -+ del bline -+ if size < 0: -+ # Read until \n or EOF, whichever comes first -+ if self._rbufsize <= 1: -+ # Speed up unbuffered case -+ buf.seek(0) -+ buffers = [buf.read()] -+ self._rbuf = StringIO.StringIO() # reset _rbuf. we consume it via buf. -+ data = None -+ recv = self.recv -+ while data != "\n": -+ data = recv(1) -+ if not data: -+ break -+ buffers.append(data) -+ return "".join(buffers) -+ -+ buf.seek(0, 2) # seek end -+ self._rbuf = StringIO.StringIO() # reset _rbuf. we consume it via buf. -+ while True: -+ data = self.recv(self._rbufsize) -+ if not data: -+ break -+ nl = data.find('\n') -+ if nl >= 0: -+ nl += 1 -+ buf.write(data[:nl]) -+ self._rbuf.write(data[nl:]) -+ del data -+ break -+ buf.write(data) -+ return buf.getvalue() -+ else: -+ # Read until size bytes or \n or EOF seen, whichever comes first -+ buf.seek(0, 2) # seek end -+ buf_len = buf.tell() -+ if buf_len >= size: -+ buf.seek(0) -+ rv = buf.read(size) -+ self._rbuf = StringIO.StringIO() -+ self._rbuf.write(buf.read()) -+ return rv -+ self._rbuf = StringIO.StringIO() # reset _rbuf. we consume it via buf. -+ while True: -+ data = self.recv(self._rbufsize) -+ if not data: -+ break -+ left = size - buf_len -+ # did we just receive a newline? -+ nl = data.find('\n', 0, left) -+ if nl >= 0: -+ nl += 1 -+ # save the excess data to _rbuf -+ self._rbuf.write(data[nl:]) -+ if buf_len: -+ buf.write(data[:nl]) -+ break -+ else: -+ # Shortcut. Avoid data copy through buf when returning -+ # a substring of our first recv(). -+ return data[:nl] -+ n = len(data) -+ if n == size and not buf_len: -+ # Shortcut. Avoid data copy through buf when -+ # returning exactly all of our first recv(). -+ return data -+ if n >= left: -+ buf.write(data[:left]) -+ self._rbuf.write(data[left:]) -+ break -+ buf.write(data) -+ buf_len += n -+ #assert buf_len == buf.tell() -+ return buf.getvalue() -+ -+else: -+ class CP_fileobject(socket._fileobject): -+ """Faux file object attached to a socket object.""" -+ -+ def sendall(self, data): -+ """Sendall for non-blocking sockets.""" -+ while data: -+ try: -+ bytes_sent = self.send(data) -+ data = data[bytes_sent:] -+ except socket.error, e: -+ if e.args[0] not in socket_errors_nonblocking: -+ raise -+ -+ def send(self, data): -+ return self._sock.send(data) -+ -+ def flush(self): -+ if self._wbuf: -+ buffer = "".join(self._wbuf) -+ self._wbuf = [] -+ self.sendall(buffer) -+ -+ def recv(self, size): - while True: -- data = self.recv(recv_size) -- if not data: -- break -- buffers.append(data) -- return "".join(buffers) -- else: -- # Read until size bytes or EOF seen, whichever comes first -- data = self._rbuf -- buf_len = len(data) -- if buf_len >= size: -- self._rbuf = data[size:] -- return data[:size] -- buffers = [] -- if data: -- buffers.append(data) -- self._rbuf = "" -- while True: -- left = size - buf_len -- recv_size = max(self._rbufsize, left) -- data = self.recv(recv_size) -- if not data: -- break -- buffers.append(data) -- n = len(data) -- if n >= left: -- self._rbuf = data[left:] -- buffers[-1] = data[:left] -- break -- buf_len += n -- return "".join(buffers) -+ try: -+ return self._sock.recv(size) -+ except socket.error, e: -+ if e.args[0] not in socket_errors_nonblocking: -+ raise - -- def readline(self, size=-1): -- data = self._rbuf -- if size < 0: -- # Read until \n or EOF, whichever comes first -- if self._rbufsize <= 1: -- # Speed up unbuffered case -- assert data == "" -+ def read(self, size=-1): -+ if size < 0: -+ # Read until EOF -+ buffers = [self._rbuf] -+ self._rbuf = "" -+ if self._rbufsize <= 1: -+ recv_size = self.default_bufsize -+ else: -+ recv_size = self._rbufsize -+ -+ while True: -+ data = self.recv(recv_size) -+ if not data: -+ break -+ buffers.append(data) -+ return "".join(buffers) -+ else: -+ # Read until size bytes or EOF seen, whichever comes first -+ data = self._rbuf -+ buf_len = len(data) -+ if buf_len >= size: -+ self._rbuf = data[size:] -+ return data[:size] - buffers = [] -- while data != "\n": -- data = self.recv(1) -+ if data: -+ buffers.append(data) -+ self._rbuf = "" -+ while True: -+ left = size - buf_len -+ recv_size = max(self._rbufsize, left) -+ data = self.recv(recv_size) - if not data: - break - buffers.append(data) -+ n = len(data) -+ if n >= left: -+ self._rbuf = data[left:] -+ buffers[-1] = data[:left] -+ break -+ buf_len += n - return "".join(buffers) -- nl = data.find('\n') -- if nl >= 0: -- nl += 1 -- self._rbuf = data[nl:] -- return data[:nl] -- buffers = [] -- if data: -- buffers.append(data) -- self._rbuf = "" -- while True: -- data = self.recv(self._rbufsize) -- if not data: -- break -- buffers.append(data) -+ -+ def readline(self, size=-1): -+ data = self._rbuf -+ if size < 0: -+ # Read until \n or EOF, whichever comes first -+ if self._rbufsize <= 1: -+ # Speed up unbuffered case -+ assert data == "" -+ buffers = [] -+ while data != "\n": -+ data = self.recv(1) -+ if not data: -+ break -+ buffers.append(data) -+ return "".join(buffers) - nl = data.find('\n') - if nl >= 0: - nl += 1 - self._rbuf = data[nl:] -- buffers[-1] = data[:nl] -- break -- return "".join(buffers) -- else: -- # Read until size bytes or \n or EOF seen, whichever comes first -- nl = data.find('\n', 0, size) -- if nl >= 0: -- nl += 1 -- self._rbuf = data[nl:] -- return data[:nl] -- buf_len = len(data) -- if buf_len >= size: -- self._rbuf = data[size:] -- return data[:size] -- buffers = [] -- if data: -- buffers.append(data) -- self._rbuf = "" -- while True: -- data = self.recv(self._rbufsize) -- if not data: -- break -- buffers.append(data) -- left = size - buf_len -- nl = data.find('\n', 0, left) -+ return data[:nl] -+ buffers = [] -+ if data: -+ buffers.append(data) -+ self._rbuf = "" -+ while True: -+ data = self.recv(self._rbufsize) -+ if not data: -+ break -+ buffers.append(data) -+ nl = data.find('\n') -+ if nl >= 0: -+ nl += 1 -+ self._rbuf = data[nl:] -+ buffers[-1] = data[:nl] -+ break -+ return "".join(buffers) -+ else: -+ # Read until size bytes or \n or EOF seen, whichever comes first -+ nl = data.find('\n', 0, size) - if nl >= 0: - nl += 1 - self._rbuf = data[nl:] -- buffers[-1] = data[:nl] -- break -- n = len(data) -- if n >= left: -- self._rbuf = data[left:] -- buffers[-1] = data[:left] -- break -- buf_len += n -- return "".join(buffers) -+ return data[:nl] -+ buf_len = len(data) -+ if buf_len >= size: -+ self._rbuf = data[size:] -+ return data[:size] -+ buffers = [] -+ if data: -+ buffers.append(data) -+ self._rbuf = "" -+ while True: -+ data = self.recv(self._rbufsize) -+ if not data: -+ break -+ buffers.append(data) -+ left = size - buf_len -+ nl = data.find('\n', 0, left) -+ if nl >= 0: -+ nl += 1 -+ self._rbuf = data[nl:] -+ buffers[-1] = data[:nl] -+ break -+ n = len(data) -+ if n >= left: -+ self._rbuf = data[left:] -+ buffers[-1] = data[:left] -+ break -+ buf_len += n -+ return "".join(buffers) - - - class SSL_fileobject(CP_fileobject): diff --git a/community/cherrypy/ChangeLog b/community/cherrypy/ChangeLog deleted file mode 100644 index 90276417c..000000000 --- a/community/cherrypy/ChangeLog +++ /dev/null @@ -1,26 +0,0 @@ - -2009-04-15 Douglas Soares de Andrade <douglas@archlinux.org> - - * Updated for i686: 3.1.2 - -2008-12-14 Douglas Soares de Andrade <douglas@archlinux.org> - - * Updated for i686: 3.1.1 - -2008-11-04 Douglas Soares de Andrade <douglas@archlinux.org> - - * Updated for python 2.6 - * Thanks to David Moore - -2008-07-09 Mateusz Herych <heniekk@gmail.com> - - * Updating for x86_64: 3.1.0 - -2008-07-09 Douglas Soares de Andrade <douglas@archlinux.org> - - * Updating for i686: 3.1.0 - -2008-02-28 Douglas Soares de Andrade <dsa@aur.archlinux.org> - - * Updating in i686: 3.0.3 - diff --git a/community/cherrypy/PKGBUILD b/community/cherrypy/PKGBUILD deleted file mode 100644 index b352f6296..000000000 --- a/community/cherrypy/PKGBUILD +++ /dev/null @@ -1,23 +0,0 @@ -$Id: PKGBUILD 40928 2011-03-01 19:03:36Z angvp $ -# Maintainer: Angel Velasquez <angvp@archlinux.org> -# Contributor: Douglas Soares de Andrade <dsa@aur.archlinux.org> -# Contributor: Armando M. Baratti <amblistas@ajato.com.br> -# Contributor: Florian Richter <Florian_Richter@gmx.de> -pkgname=cherrypy -pkgver=3.2.0 -pkgrel=1 -pkgdesc="A pythonic, object-oriented web development framework" -arch=('i686' 'x86_64') -url="http://www.cherrypy.org" -license=('BSD') -depends=('python2') -source=(http://download.cherrypy.org/cherrypy/$pkgver/CherryPy-$pkgver.tar.gz - license) -md5sums=('e5c1322bf5ce962c16283ab7a6dcca3f' - '22365dc6b0e6835b53da009aa36af017') - -build() { - cd $srcdir/CherryPy-$pkgver - python2 ./setup.py install --root=$pkgdir - install -D -m644 $srcdir/license $pkgdir/usr/share/licenses/$pkgname/license -} diff --git a/community/cherrypy/license b/community/cherrypy/license deleted file mode 100644 index 32e9cf6bd..000000000 --- a/community/cherrypy/license +++ /dev/null @@ -1,25 +0,0 @@ -Copyright (c) 2004, CherryPy Team (team@cherrypy.org) -All rights reserved. - -Redistribution and use in source and binary forms, with or without modification, -are permitted provided that the following conditions are met: - - * Redistributions of source code must retain the above copyright notice, - this list of conditions and the following disclaimer. - * Redistributions in binary form must reproduce the above copyright notice, - this list of conditions and the following disclaimer in the documentation - and/or other materials provided with the distribution. - * Neither the name of the CherryPy Team nor the names of its contributors - may be used to endorse or promote products derived from this software - without specific prior written permission. - -THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND -ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED -WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE -DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE -FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL -DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR -SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER -CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, -OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. diff --git a/community/gecko-mediaplayer/gecko-mediaplayer-xulrunner2.0.patch b/community/gecko-mediaplayer/gecko-mediaplayer-xulrunner2.0.patch deleted file mode 100644 index 59d934c89..000000000 --- a/community/gecko-mediaplayer/gecko-mediaplayer-xulrunner2.0.patch +++ /dev/null @@ -1,12 +0,0 @@ -Index: src/np_entry.cpp -=================================================================== ---- src/np_entry.cpp.orig -+++ src/np_entry.cpp -@@ -175,7 +175,6 @@ NPError OSCALL NP_Initialize(NPNetscapeF - pluginFuncs->javaClass = NPP_GetJavaClass(); - #endif - -- NPP_Initialize(); - #endif - - return NPERR_NO_ERROR; diff --git a/community/gnote/gtk2.20.patch b/community/gnote/gtk2.20.patch deleted file mode 100644 index 13b3ee1a9..000000000 --- a/community/gnote/gtk2.20.patch +++ /dev/null @@ -1,40 +0,0 @@ -From b2e62adb1ed94f9a3f681bd6d0b8117b2ec3c1f9 Mon Sep 17 00:00:00 2001 -From: Debarshi Ray <debarshir@src.gnome.org> -Date: Sun, 14 Mar 2010 21:24:21 +0000 -Subject: Replaced deprecated macros -- GTK_WIDGET_REALIZED & GTK_WIDGET_VISIBLE - -These macros have been deprecated since Gtk+ 2.20, and their -replacements were introduced in Gtk+ 2.18. Thus, the minimum Gtk+ -version has been bumped accordingly. ---- -diff --git a/configure.ac b/configure.ac -index 564c0b0..0189b88 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -23,7 +23,7 @@ AC_SUBST(GNOTE_VERSION) - dnl all the library version. - dnl if one is harcoded elsewhere, it is a bug - --GTK_VERSION=2.12 -+GTK_VERSION=2.18 - LIBGLIBMM_VERSION=2.0 - LIBGTKMM_VERSION=2.12.0 - LIBGCONF_VERSION=2.0.0 -diff --git a/libtomboy/tomboyutil.c b/libtomboy/tomboyutil.c -index 162e4a2..9de7e62 100644 ---- a/libtomboy/tomboyutil.c -+++ b/libtomboy/tomboyutil.c -@@ -153,9 +153,9 @@ tomboy_window_override_user_time (GtkWindow *window) - void - tomboy_window_present_hardcore (GtkWindow *window) - { -- if (!GTK_WIDGET_REALIZED (window)) -+ if (!gtk_widget_get_realized (GTK_WIDGET (window))) - gtk_widget_realize (GTK_WIDGET (window)); -- else if (GTK_WIDGET_VISIBLE (window)) -+ else if (gtk_widget_get_visible (GTK_WIDGET (window))) - tomboy_window_move_to_current_workspace (window); - - tomboy_window_override_user_time (window); --- -cgit v0.8.3.1 diff --git a/community/llvm/PKGBUILD b/community/llvm/PKGBUILD deleted file mode 100644 index 99ea6e4a7..000000000 --- a/community/llvm/PKGBUILD +++ /dev/null @@ -1,225 +0,0 @@ -# $Id: PKGBUILD 44752 2011-04-11 14:36:48Z foutrelis $ -# Maintainer: Evangelos Foutras <foutrelis@gmail.com> -# Contributor: Jan "heftig" Steffens <jan.steffens@gmail.com> -# Contributor: Sebastian Nowicki <sebnow@gmail.com> -# Contributor: Devin Cofer <ranguvar{AT]archlinux[DOT}us> -# Contributor: Tobias Kieslich <tobias@justdreams.de> -# Contributor: Geoffroy Carrier <geoffroy.carrier@aur.archlinux.org> -# Contributor: Tomas Lindquist Olsen <tomas@famolsen.dk> -# Contributor: Roberto Alsina <ralsina@kde.org> -# Contributor: Gerardo Exequiel Pozzi <vmlinuz386@yahoo.com.ar> - -pkgname=('llvm' 'llvm-ocaml' 'clang' 'clang-analyzer') -pkgver=2.9 -_gcc_ver=4.6.0 -pkgrel=4 -arch=('i686' 'x86_64') -url="http://llvm.org/" -license=('custom:University of Illinois/NCSA Open Source License') -makedepends=('gcc-libs' 'libffi' 'python2' 'ocaml' "gcc=$_gcc_ver") -source=(http://llvm.org/releases/$pkgver/$pkgname-$pkgver.tgz - http://llvm.org/releases/$pkgver/clang-$pkgver.tgz - ftp://ftp.archlinux.org/other/community/clang/gcc-headers-4.5.2.tar.xz - clang-plugin-loader-registry.patch - cindexer-clang-path.patch - clang-toolchains-gcc-versions.patch - clang-pure64.patch - enable-lto.patch) -md5sums=('793138412d2af2c7c7f54615f8943771' - '634de18d04b7a4ded19ec4c17d23cfca' - '70e23a3dc2b38ecb2bb4d2c48f47295d' - '02c23b4aaca3445b8bf39fddb2f9906e' - '87a7162dbe99e9ffce6c40bd09f5f4f0' - '8da236120a9a287a977b575b8b905c93' - '225ee6b531f8327f34f344a18cb4ec81' - '8f7582d7440e4a8342c3aea9ec714fb4') - -build() { - cd "$srcdir/$pkgname-$pkgver" - - # At the present, clang must reside inside the LLVM source code tree to build - # See http://llvm.org/bugs/show_bug.cgi?id=4840 - rm -rf tools/clang - cp -r "$srcdir/clang-$pkgver" tools/clang - - # Fix symbolic links from OCaml bindings to LLVM libraries - sed -i 's:\$(PROJ_libdir):/usr/lib/llvm:' bindings/ocaml/Makefile.ocaml - - # Fix installation directories, ./configure doesn't seem to set them right - sed -i -e 's:\$(PROJ_prefix)/etc/llvm:/etc/llvm:' \ - -e 's:\$(PROJ_prefix)/lib:$(PROJ_prefix)/lib/llvm:' \ - -e 's:\$(PROJ_prefix)/docs/llvm:$(PROJ_prefix)/share/doc/llvm:' \ - Makefile.config.in - - # Fix insecure rpath (http://bugs.archlinux.org/task/14017) - sed -i 's:$(RPATH) -Wl,$(\(ToolDir\|LibDir\|ExmplDir\))::g' Makefile.rules - - # Get the correct list of symbols to export - # See http://lists.cs.uiuc.edu/pipermail/cfe-dev/2010-April/008559.html - patch -Np1 -i "$srcdir/clang-plugin-loader-registry.patch" - - # Fix clang path in CIndexer.cpp (https://bugs.archlinux.org/task/22799) - patch -d tools/clang -Np0 -i "$srcdir/cindexer-clang-path.patch" - - # Add GCC 4.6.0 to GccVersions (FS#23631) - patch -d tools/clang -Np1 -i "$srcdir/clang-toolchains-gcc-versions.patch" - - if [[ $CARCH == x86_64 ]]; then - # Adjust lib paths - patch -d tools/clang -Np0 -i "$srcdir/clang-pure64.patch" - fi - - # Make -flto work - # Use gold instead of default linker, and always use the plugin - patch -d tools/clang -Np0 -i "$srcdir/enable-lto.patch" - - # Apply strip option to configure - _optimized_switch="enable" - [[ $(check_option strip) == n ]] && _optimized_switch="disable" - - # Include location of libffi headers in CPPFLAGS - export CPPFLAGS="$CPPFLAGS $(pkg-config --cflags libffi)" - - # TODO: Uncomment when clang works with GCC 4.6+ - #_cxx_headers="/usr/include/c++/$_gcc_ver" - #if [[ ! -d $_cxx_headers ]]; then - # error "Couldn't find the C++ headers, PKGBUILD needs fixing!" - # return 1 - #fi - _cxx_headers="/usr/include/c++/clang-$pkgver" - - _32bit_headers="" - if [[ $CARCH == x86_64 ]]; then - # Important for multilib - _32bit_headers="32" - fi - - ./configure \ - --prefix=/usr \ - --libdir=/usr/lib/llvm \ - --sysconfdir=/etc \ - --enable-shared \ - --enable-libffi \ - --enable-targets=all \ - --disable-expensive-checks \ - --disable-debug-runtime \ - --disable-assertions \ - --with-binutils-include=/usr/include \ - --with-cxx-include-root=$_cxx_headers \ - --with-cxx-include-arch=$CHOST \ - --with-cxx-include-32bit-dir=$_32bit_headers \ - --$_optimized_switch-optimized - - make REQUIRES_RTTI=1 -} - -package_llvm() { - pkgdesc="Low Level Virtual Machine" - depends=('perl' 'libffi') - - cd "$srcdir/$pkgname-$pkgver" - - # We move the clang directory out of the tree so it won't get installed and - # then we bring it back in for the clang package - mv tools/clang "$srcdir" - # -j1 is due to race conditions during the installation of the OCaml bindings - make -j1 DESTDIR="$pkgdir" install - mv "$srcdir/clang" tools - - # OCaml bindings go to a separate package - rm -rf "$srcdir"/{ocaml,ocamldoc} - mv "$pkgdir"/usr/{lib/ocaml,share/doc/llvm/ocamldoc} "$srcdir" - - # Remove duplicate files installed by the OCaml bindings - rm "$pkgdir"/usr/{lib/llvm/libllvm*,share/doc/llvm/ocamldoc.tar.gz} - - # Fix permissions of static libs - chmod -x "$pkgdir"/usr/lib/llvm/*.a - - # Fix libdir in llvm-config (http://bugs.archlinux.org/task/14487) - sed -i 's:\(ABS_RUN_DIR/lib\):\1/llvm:' "$pkgdir/usr/bin/llvm-config" - - # Get rid of example Hello transformation - rm "$pkgdir"/usr/lib/llvm/*LLVMHello.* - - # Symlink the gold plugin where clang expects it - ln -s llvm/LLVMgold.so "$pkgdir/usr/lib/LLVMgold.so" - - # Add ld.so.conf.d entry - install -d "$pkgdir/etc/ld.so.conf.d" - echo /usr/lib/llvm >"$pkgdir/etc/ld.so.conf.d/llvm.conf" - - install -Dm644 LICENSE.TXT "$pkgdir/usr/share/licenses/$pkgname/LICENSE" -} - -package_llvm-ocaml() { - pkgdesc="OCaml bindings for LLVM" - depends=("llvm=$pkgver-$pkgrel" 'ocaml') - - cd "$srcdir/llvm-$pkgver" - - install -d "$pkgdir"/{usr/lib,usr/share/doc/llvm} - cp -r "$srcdir/ocaml" "$pkgdir/usr/lib" - cp -r "$srcdir/ocamldoc" "$pkgdir/usr/share/doc/llvm" - - # Remove execute bit from static libraries - chmod -x "$pkgdir"/usr/lib/ocaml/libllvm*.a - - install -Dm644 LICENSE.TXT "$pkgdir/usr/share/licenses/llvm-ocaml/LICENSE" -} - -package_clang() { - pkgdesc="C language family frontend for LLVM" - url="http://clang.llvm.org/" - # It looks like clang still needs GCC to assemble and link object files - # See http://old.nabble.com/%22clang--v%22-shows-a-GCC-call-td28378453.html - depends=("llvm=$pkgver-$pkgrel" "gcc=$_gcc_ver") - - # Fix installation path for clang docs - sed -i 's:$(PROJ_prefix)/share/doc/llvm:$(PROJ_prefix)/share/doc/clang:' \ - "$srcdir/llvm-$pkgver/Makefile.config" - - cd "$srcdir/llvm-$pkgver/tools/clang" - make DESTDIR="$pkgdir" install - - # Fix permissions of static libs - chmod -x "$pkgdir"/usr/lib/llvm/*.a - - # Revert the path change in case we want to do a repackage later - sed -i 's:$(PROJ_prefix)/share/doc/clang:$(PROJ_prefix)/share/doc/llvm:' \ - "$srcdir/llvm-$pkgver/Makefile.config" - - # Install old libstdc++ headers. Contains combined headers from - # gcc 4.5.2-6-i686 and gcc-multilib-4.5.2-6-x86_64 - install -d "$pkgdir/usr/include/c++" - cp -rd "$srcdir/gcc-headers-4.5.2" "$pkgdir/usr/include/c++/clang-$pkgver" - - install -Dm644 LICENSE.TXT "$pkgdir/usr/share/licenses/clang/LICENSE" -} - -package_clang-analyzer() { - pkgdesc="A source code analysis framework" - url="http://clang-analyzer.llvm.org/" - depends=("clang=$pkgver-$pkgrel" 'python2') - - cd "$srcdir/llvm-$pkgver/tools/clang" - - install -d "$pkgdir"/usr/{bin,lib/clang-analyzer} - for _tool in scan-{build,view}; do - cp -r tools/$_tool "$pkgdir/usr/lib/clang-analyzer/" - ln -s /usr/lib/clang-analyzer/$_tool/$_tool "$pkgdir/usr/bin/" - done - - # Use Python 2 - sed -i 's/env python$/\02/' \ - "$pkgdir/usr/lib/clang-analyzer/scan-view/scan-view" \ - "$pkgdir/usr/lib/clang-analyzer/scan-build/set-xcode-analyzer" - - # Compile Python scripts - python2 -m compileall "$pkgdir/usr/lib/clang-analyzer" - python2 -O -m compileall "$pkgdir/usr/lib/clang-analyzer" - - install -Dm644 LICENSE.TXT "$pkgdir/usr/share/licenses/clang-analyzer/LICENSE" -} - -# vim:set ts=2 sw=2 et: diff --git a/community/llvm/cindexer-clang-path.patch b/community/llvm/cindexer-clang-path.patch deleted file mode 100644 index ddaab690e..000000000 --- a/community/llvm/cindexer-clang-path.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- tools/libclang/CIndexer.cpp.orig 2011-04-07 13:08:24.000000000 +0300 -+++ tools/libclang/CIndexer.cpp 2011-04-07 13:11:52.224884642 +0300 -@@ -80,6 +80,7 @@ std::string CIndexer::getClangResourcesP - - // We now have the CIndex directory, locate clang relative to it. - LibClangPath.eraseComponent(); -+ LibClangPath.eraseComponent(); - #endif - - LibClangPath.appendComponent("clang"); diff --git a/community/llvm/clang-plugin-loader-registry.patch b/community/llvm/clang-plugin-loader-registry.patch deleted file mode 100644 index f46eb9fce..000000000 --- a/community/llvm/clang-plugin-loader-registry.patch +++ /dev/null @@ -1,11 +0,0 @@ -diff -upr llvm-2.7.orig/autoconf/ExportMap.map llvm-2.7/autoconf/ExportMap.map ---- llvm-2.7.orig/autoconf/ExportMap.map 2010-02-25 00:33:41.000000000 +0200 -+++ llvm-2.7/autoconf/ExportMap.map 2010-05-10 14:14:22.000000000 +0300 -@@ -2,6 +2,7 @@ - global: main; - __progname; - environ; -+ _ZN4llvm8RegistryIN5clang14FrontendActionENS_14RegistryTraitsIS2_EEE4HeadE; - - local: *; - }; diff --git a/community/llvm/clang-pure64.patch b/community/llvm/clang-pure64.patch deleted file mode 100644 index da6178519..000000000 --- a/community/llvm/clang-pure64.patch +++ /dev/null @@ -1,38 +0,0 @@ -Index: lib/Driver/Tools.cpp -=================================================================== ---- lib/Driver/Tools.cpp (revision 123373) -+++ lib/Driver/Tools.cpp (working copy) -@@ -3306,7 +3306,7 @@ - else if (ToolChain.getArch() == llvm::Triple::arm) - CmdArgs.push_back("/lib/ld-linux.so.3"); - else -- CmdArgs.push_back("/lib64/ld-linux-x86-64.so.2"); -+ CmdArgs.push_back("/lib/ld-linux-x86-64.so.2"); - } - - CmdArgs.push_back("-o"); -Index: lib/Driver/ToolChains.cpp -=================================================================== ---- lib/Driver/ToolChains.cpp (revision 123373) -+++ lib/Driver/ToolChains.cpp (working copy) -@@ -1317,18 +1317,10 @@ - if (Arch == llvm::Triple::x86) - Suffix64 = "/64"; - -- std::string Lib32 = "lib"; -- -- bool Exists; -- if (!llvm::sys::fs::exists("/lib32", Exists) && Exists) -- Lib32 = "lib32"; -- -+ std::string Lib32 = "lib32"; - std::string Lib64 = "lib"; -- bool Symlink; -- if (!llvm::sys::fs::exists("/lib64", Exists) && Exists && -- (llvm::sys::fs::is_symlink("/lib64", Symlink) || !Symlink)) -- Lib64 = "lib64"; - -+ bool Exists; - std::string GccTriple = ""; - if (Arch == llvm::Triple::arm) { - if (!llvm::sys::fs::exists("/usr/lib/gcc/arm-linux-gnueabi", Exists) && diff --git a/community/llvm/clang-toolchains-gcc-versions.patch b/community/llvm/clang-toolchains-gcc-versions.patch deleted file mode 100644 index 2e527300d..000000000 --- a/community/llvm/clang-toolchains-gcc-versions.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -upr clang-2.9.orig/lib/Driver/ToolChains.cpp clang-2.9/lib/Driver/ToolChains.cpp ---- clang-2.9.orig/lib/Driver/ToolChains.cpp 2011-03-21 23:29:27.000000000 +0200 -+++ clang-2.9/lib/Driver/ToolChains.cpp 2011-04-08 00:03:34.000000000 +0300 -@@ -1449,7 +1449,7 @@ Linux::Linux(const HostInfo &Host, const - GccTriple = "i586-suse-linux"; - } - -- const char* GccVersions[] = {"4.5.2", "4.5.1", "4.5", "4.4.5", "4.4.4", -+ const char* GccVersions[] = {"4.6.0", "4.5.2", "4.5.1", "4.5", "4.4.5", "4.4.4", - "4.4.3", "4.4", "4.3.4", "4.3.3", "4.3.2", - "4.3", "4.2.4", "4.2.3", "4.2.2", "4.2.1", - "4.2"}; diff --git a/community/llvm/enable-lto.patch b/community/llvm/enable-lto.patch deleted file mode 100644 index 40d93104a..000000000 --- a/community/llvm/enable-lto.patch +++ /dev/null @@ -1,36 +0,0 @@ -Index: lib/Driver/ToolChains.cpp -=================================================================== ---- lib/Driver/ToolChains.cpp (revision 123373) -+++ lib/Driver/ToolChains.cpp (working copy) -@@ -1398,11 +1398,11 @@ - Lib = Lib64; - } - -- llvm::sys::Path LinkerPath(Base + "/../../../../" + GccTriple + "/bin/ld"); -+ llvm::sys::Path LinkerPath(Base + "/../../../../" + GccTriple + "/bin/ld.gold"); - if (!llvm::sys::fs::exists(LinkerPath.str(), Exists) && Exists) - Linker = LinkerPath.str(); - else -- Linker = GetProgramPath("ld"); -+ Linker = GetProgramPath("ld.gold"); - - LinuxDistro Distro = DetectLinuxDistro(Arch); - -Index: lib/Driver/Tools.cpp -=================================================================== ---- lib/Driver/Tools.cpp (revision 123373) -+++ lib/Driver/Tools.cpp (working copy) -@@ -3412,11 +3412,11 @@ - } - } - -- if (Args.hasArg(options::OPT_use_gold_plugin)) { -+ // if (Args.hasArg(options::OPT_use_gold_plugin)) { - CmdArgs.push_back("-plugin"); - std::string Plugin = ToolChain.getDriver().Dir + "/../lib/LLVMgold.so"; - CmdArgs.push_back(Args.MakeArgString(Plugin)); -- } -+ // } - - C.addCommand(new Command(JA, *this, ToolChain.Linker.c_str(), CmdArgs)); - } diff --git a/community/xonotic/PKGBUILD b/community/xonotic/PKGBUILD deleted file mode 100644 index 676240162..000000000 --- a/community/xonotic/PKGBUILD +++ /dev/null @@ -1,53 +0,0 @@ -# $Id$ -# Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com> -# Contributor: Alexander Suhoverhov <cy at ngs dot ru> -pkgname=xonotic -pkgver=0.1.0 -pkgrel=2 -pkgdesc="A free, fast-paced crossplatform first-person shooter" -arch=('i686' 'x86_64') -url="http://xonotic.org" -license=('GPL') -depends=('alsa-lib' 'curl' 'libjpeg>=8' 'libmodplug' 'libvorbis' 'libxpm' 'libxxf86dga' 'libxxf86vm' 'sdl' 'libpng>=1.4.0' 'xonotic-data') -makedepends=('unzip' 'mesa') -source=('http://dl.xonotic.org/xonotic-0.1.0preview.zip' - 'xonotic-dedicated.sh' - 'xonotic-glx.sh' - 'xonotic-sdl.sh' - 'xonotic-glx.desktop' - 'xonotic-sdl.desktop') -md5sums=('aafb43893aa66e01488c817e3a60d96d' - '2c0aef8104fa34aef58d368d994abca3' - 'd2f357eab92db585448476470bbf9c1c' - 'fdb9b96cd2b700ea9e8a7d6a1ab3505e' - '914c7b9163e92b35f0ab57fdb1653ac5' - 'da7d812ff231c9332cd694b39757adda') - -build() { - # le compiling - cd $srcdir/Xonotic/source/darkplaces - - # build the binaries separately instead to avoid truncated files - make CPUOPTIMIZATIONS="${CFLAGS}" DP_LINK_TO_LIBJPEG=1 cl-nexuiz - make CPUOPTIMIZATIONS="${CFLAGS}" DP_LINK_TO_LIBJPEG=1 sdl-nexuiz - make CPUOPTIMIZATIONS="${CFLAGS}" DP_LINK_TO_LIBJPEG=1 sv-nexuiz -} - -package() { - cd $srcdir/Xonotic - - # binaries - install -Dm755 source/darkplaces/nexuiz-dedicated $pkgdir/opt/xonotic/xonotic-dedicated - install -Dm755 source/darkplaces/nexuiz-glx $pkgdir/opt/xonotic/xonotic-glx - install -Dm755 source/darkplaces/nexuiz-sdl $pkgdir/opt/xonotic/xonotic-sdl - - # convenience files - mkdir -p $pkgdir/usr/share/applications - install -Dm644 $srcdir/*.desktop -t $pkgdir/usr/share/applications - install -Dm755 $srcdir/xonotic-dedicated.sh $pkgdir/usr/bin/xonotic-dedicated - install -Dm755 $srcdir/xonotic-glx.sh $pkgdir/usr/bin/xonotic-glx - install -Dm755 $srcdir/xonotic-sdl.sh $pkgdir/usr/bin/xonotic-sdl - install -Dm644 $srcdir/Xonotic/misc/logos/icons_png/xonotic_512.png $pkgdir/usr/share/pixmaps/xonotic.png -} - -# vim: ts=2:sw=2 et: diff --git a/community/xonotic/xonotic-dedicated.sh b/community/xonotic/xonotic-dedicated.sh deleted file mode 100644 index b9998ca3c..000000000 --- a/community/xonotic/xonotic-dedicated.sh +++ /dev/null @@ -1,3 +0,0 @@ -#!/bin/sh -cd /opt/xonotic -./xonotic-dedicated $@ diff --git a/community/xonotic/xonotic-glx.desktop b/community/xonotic/xonotic-glx.desktop deleted file mode 100644 index 9f9e78cc1..000000000 --- a/community/xonotic/xonotic-glx.desktop +++ /dev/null @@ -1,11 +0,0 @@ -[Desktop Entry] -Type=Application -Version=2.5 -Encoding=UTF-8 -Name=Xonotic (GLX) -Comment=a free open-source first person shooter -Icon=/usr/share/pixmaps/xonotic.png -Exec=/usr/bin/xonotic-glx -Terminal=false -StartupNotify=false -Categories=Game; diff --git a/community/xonotic/xonotic-glx.sh b/community/xonotic/xonotic-glx.sh deleted file mode 100644 index e52a99c9f..000000000 --- a/community/xonotic/xonotic-glx.sh +++ /dev/null @@ -1,3 +0,0 @@ -#!/bin/sh -cd /opt/xonotic -./xonotic-glx $@ diff --git a/community/xonotic/xonotic-sdl.desktop b/community/xonotic/xonotic-sdl.desktop deleted file mode 100644 index 32b37f2c5..000000000 --- a/community/xonotic/xonotic-sdl.desktop +++ /dev/null @@ -1,11 +0,0 @@ -[Desktop Entry] -Type=Application -Version=2.5 -Encoding=UTF-8 -Name=Xonotic (SDL) -Comment=a free open-source first person shooter -Icon=/usr/share/pixmaps/xonotic.png -Exec=/usr/bin/xonotic-sdl -Terminal=false -StartupNotify=false -Categories=Game; diff --git a/community/xonotic/xonotic-sdl.sh b/community/xonotic/xonotic-sdl.sh deleted file mode 100644 index 976d3ccf5..000000000 --- a/community/xonotic/xonotic-sdl.sh +++ /dev/null @@ -1,3 +0,0 @@ -#!/bin/sh -cd /opt/xonotic -./xonotic-sdl $@ diff --git a/community/yajl/handle-null-case.patch b/community/yajl/handle-null-case.patch deleted file mode 100644 index 923e23961..000000000 --- a/community/yajl/handle-null-case.patch +++ /dev/null @@ -1,78 +0,0 @@ -From 615924b7bf68791c166149a9f76bec740dacefd6 Mon Sep 17 00:00:00 2001 -From: Lloyd Hilaiel <lloyd@hilaiel.com> -Date: Tue, 26 Apr 2011 09:47:13 -0600 -Subject: [PATCH] crash fix, handle the case where yajl_alloc() is followed by - yajl_complete_parse() without a call to yajl_parse() in the - middle. closes #27. - ---- - src/yajl.c | 18 +++++++++++++++--- - src/yajl_parser.c | 2 +- - 2 files changed, 16 insertions(+), 4 deletions(-) - -diff --git a/src/yajl.c b/src/yajl.c -index 793eea3..293e545 100644 ---- a/src/yajl.c -+++ b/src/yajl.c -@@ -49,7 +49,7 @@ yajl_alloc(const yajl_callbacks * callbacks, - { - yajl_handle hand = NULL; - yajl_alloc_funcs afsBuffer; -- -+ - /* first order of business is to set up memory allocation routines */ - if (afs != NULL) { - if (afs->malloc == NULL || afs->realloc == NULL || afs->free == NULL) -@@ -73,7 +73,7 @@ yajl_alloc(const yajl_callbacks * callbacks, - hand->decodeBuf = yajl_buf_alloc(&(hand->alloc)); - hand->flags = 0; - yajl_bs_init(hand->stateStack, &(hand->alloc)); -- yajl_bs_push(hand->stateStack, yajl_state_start); -+ yajl_bs_push(hand->stateStack, yajl_state_start); - - return hand; - } -@@ -120,7 +120,7 @@ yajl_parse(yajl_handle hand, const unsigned char * jsonText, - { - yajl_status status; - -- // lazy allocate the lexer -+ /* lazy allocation of the lexer */ - if (hand->lexer == NULL) { - hand->lexer = yajl_lex_alloc(&(hand->alloc), - hand->flags & yajl_allow_comments, -@@ -135,6 +135,18 @@ yajl_parse(yajl_handle hand, const unsigned char * jsonText, - yajl_status - yajl_complete_parse(yajl_handle hand) - { -+ /* The lexer is lazy allocated in the first call to parse. if parse is -+ * never called, then no data was provided to parse at all. This is a -+ * "premature EOF" error unless yajl_allow_partial_values is specified. -+ * allocating the lexer now is the simplest possible way to handle this -+ * case while preserving all the other semantics of the parser -+ * (multiple values, partial values, etc). */ -+ if (hand->lexer == NULL) { -+ hand->lexer = yajl_lex_alloc(&(hand->alloc), -+ hand->flags & yajl_allow_comments, -+ !(hand->flags & yajl_dont_validate_strings)); -+ } -+ - return yajl_do_finish(hand); - } - -diff --git a/src/yajl_parser.c b/src/yajl_parser.c -index 20d73bf..3903b38 100644 ---- a/src/yajl_parser.c -+++ b/src/yajl_parser.c -@@ -155,7 +155,7 @@ yajl_status - yajl_do_finish(yajl_handle hand) - { - yajl_status stat; -- stat = yajl_do_parse(hand,(const unsigned char *)" ",1); -+ stat = yajl_do_parse(hand,(const unsigned char *) " ",1); - - if (stat != yajl_status_ok) return stat; - --- -1.7.4.4 - |