[arch-commits] Commit in sqlite/trunk (PKGBUILD xbmc.patch)
Andreas Radke
andyrtr at nymeria.archlinux.org
Sun Dec 8 09:43:28 UTC 2013
Date: Sunday, December 8, 2013 @ 10:43:28
Author: andyrtr
Revision: 201300
upgpkg: sqlite 3.8.2-1
upstream update 3.8.2
Modified:
sqlite/trunk/PKGBUILD
Deleted:
sqlite/trunk/xbmc.patch
------------+
PKGBUILD | 16 +++++-----------
xbmc.patch | 22 ----------------------
2 files changed, 5 insertions(+), 33 deletions(-)
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2013-12-08 09:23:13 UTC (rev 201299)
+++ PKGBUILD 2013-12-08 09:43:28 UTC (rev 201300)
@@ -4,11 +4,11 @@
pkgbase="sqlite"
pkgname=('sqlite' 'sqlite-tcl' 'sqlite-doc')
-_amalgamationver=3080100
+_amalgamationver=3080200
_docver=${_amalgamationver}
#_docver=3080001
-pkgver=3.8.1
-pkgrel=2
+pkgver=3.8.2
+pkgrel=1
pkgdesc="A C library that implements an SQL database engine"
arch=('i686' 'x86_64')
license=('custom:Public Domain')
@@ -17,12 +17,10 @@
source=( # tarball containing the amalgamation for SQLite >= 3.7.5 together with a configure script and makefile for building it; includes now also the Tcl Extension Architecture (TEA)
http://www.sqlite.org/2013/sqlite-autoconf-$_amalgamationver.tar.gz
http://www.sqlite.org/2013/sqlite-doc-${_docver}.zip
- xbmc.patch
license.txt)
options=('!emptydirs')
-sha1sums=('42464b07df2d6f8aa28f73ce4cc6d48b47be810e'
- 'd7cb698f32318fbf5dce9f10c9cd7b84c3d70105'
- '01bcbffc422b354a4ad6737e472f06b321ce52ef'
+sha1sums=('6033ef603ce221d367c665477514d972ef1dc90e'
+ 'b9cbd42d08b8c1ce96656a6b111e918bb515b605'
'f34f6daa4ab3073d74e774aad21d66878cf26853')
build() {
@@ -31,10 +29,6 @@
# build sqlite
cd "$srcdir"/sqlite-autoconf-$_amalgamationver
- # fix http://www.sqlite.org/src/info/9aac4e588c?sbs=0
- # https://bugs.archlinux.org/task/37417
- patch -Np1 -i $srcdir/xbmc.patch
-
./configure --prefix=/usr \
--disable-static
make
Deleted: xbmc.patch
===================================================================
--- xbmc.patch 2013-12-08 09:23:13 UTC (rev 201299)
+++ xbmc.patch 2013-12-08 09:43:28 UTC (rev 201300)
@@ -1,22 +0,0 @@
-Index: src/where.c
-==================================================================
---- src/sqlite3.c
-+++ src/sqlite3.c
-@@ -876,11 +876,14 @@
- while( pScan->iEquiv<=pScan->nEquiv ){
- iCur = pScan->aEquiv[pScan->iEquiv-2];
- iColumn = pScan->aEquiv[pScan->iEquiv-1];
- while( (pWC = pScan->pWC)!=0 ){
- for(pTerm=pWC->a+k; k<pWC->nTerm; k++, pTerm++){
-- if( pTerm->leftCursor==iCur && pTerm->u.leftColumn==iColumn ){
-+ if( pTerm->leftCursor==iCur
-+ && pTerm->u.leftColumn==iColumn
-+ && (pScan->iEquiv<=2 || !ExprHasProperty(pTerm->pExpr, EP_FromJoin))
-+ ){
- if( (pTerm->eOperator & WO_EQUIV)!=0
- && pScan->nEquiv<ArraySize(pScan->aEquiv)
- ){
- int j;
- pX = sqlite3ExprSkipCollate(pTerm->pExpr->pRight);
-
-
More information about the arch-commits
mailing list