Re: [RFU] SQlite3

2012-06-05 Thread Achim Gratz
Warren Young writes:
> Thanks, Achim.  See my RFU message on the -apps list if you want to
> try the packages in advance of them hitting the mirrors.

I tried them and they are OK.  :-)

> I changed your .cygport file considerably.  Partly that's just style
> issues, but it also has to do with my build procedure.

It goes without saying that I have no objections.

>  You might be interested: the attached cygport-new script makes
> creating a new version pretty easy:
>
> 1. Put my sqlite3.cygport file and src.patch in a work directory.
>
> 2. Run 'cygport-new 3.7.12.1'.  It assumes -1 if you don't give a
> package revision number.
>
> 3. If nothing changed incompatibly, you're done; upload and send RFU
> message.  Else, fix the problem and goto 2.

Thanks for sharing this.

> Then for each new release you want to package, you try starting with
> step 2, passing the new version number.  If that fails, you usually
> have to go back to step 1 and edit the .cygport or .patch file.
>
> You're welcome to take these tools and maintainership of the
> package. The only reason I maintain it is that its previous maintainer
> went MIA and it was going to be dropped from the distro; I rescued it
> purely because I knew what sqlite was and had some idea how to build
> and test it.  I don't actually use it on Cygwin like you do[*], so I'm
> not well motivated to keep it up to date.  I mainly react to bug
> reports like yours.  And as you see, not always promptly. :)

I really appreciate what you're doing and I won't complain about any
reponse times.

> [*] I mainly use sqlite3 on other platforms, and then via other
> software that happens to use it.  Firefox, lots of stuff on OS X,
> Adobe Flex and Lightroom...

I'm in the same shoes currently, trying to get together a new Cygwin
install at our company.  Currently I can't take over anything, but I'm
sitting on 225 CPAN distribution packages.  If maybe I should end up
maintaining some or all of them, adding sqlite3 to that stack would be
possible.  I'll keep it in mind...


Regards,
Achim.
-- 
+<[Q+ Matrix-12 WAVE#46+305 Neuron microQkb Andromeda XTk Blofeld]>+

Samples for the Waldorf Blofeld:
http://Synth.Stromeko.net/Downloads.html#BlofeldSamplesExtra


--
Problem reports:   http://cygwin.com/problems.html
FAQ:   http://cygwin.com/faq/
Documentation: http://cygwin.com/docs.html
Unsubscribe info:  http://cygwin.com/ml/#unsubscribe-simple



Re: [RFU] SQlite3

2012-06-04 Thread Warren Young

On 6/4/2012 2:11 AM, Achim Gratz wrote:


There's a new version for SQlite3 released.  I've put the fix in the source
patch now and removed the define from the CPPFLAGS, also ignoring sqlite3.pc for
the diff.


Thanks, Achim.  See my RFU message on the -apps list if you want to try 
the packages in advance of them hitting the mirrors.


I changed your .cygport file considerably.  Partly that's just style 
issues, but it also has to do with my build procedure.  You might be 
interested: the attached cygport-new script makes creating a new version 
pretty easy:


1. Put my sqlite3.cygport file and src.patch in a work directory.

2. Run 'cygport-new 3.7.12.1'.  It assumes -1 if you don't give a 
package revision number.


3. If nothing changed incompatibly, you're done; upload and send RFU 
message.  Else, fix the problem and goto 2.


Then for each new release you want to package, you try starting with 
step 2, passing the new version number.  If that fails, you usually have 
to go back to step 1 and edit the .cygport or .patch file.


You're welcome to take these tools and maintainership of the package. 
The only reason I maintain it is that its previous maintainer went MIA 
and it was going to be dropped from the distro; I rescued it purely 
because I knew what sqlite was and had some idea how to build and test 
it.  I don't actually use it on Cygwin like you do[*], so I'm not well 
motivated to keep it up to date.  I mainly react to bug reports like 
yours.  And as you see, not always promptly. :)


[*] I mainly use sqlite3 on other platforms, and then via other software 
that happens to use it.  Firefox, lots of stuff on OS X, Adobe Flex and 
Lightroom...
#!/bin/bash
if [ -n "$1" ]
then
if [ `echo $1 | tr -d -` = "$1" ]
then
version="$1-1"
echo Assuming you meant version $version
else
version="$1"
fi

cwd=`pwd`
pkgname=`basename $cwd`
base=$pkgname-$version

set -x
if [ -e src.patch ] ; then cp -f src.patch $base.src.patch ; fi
cp -f $pkgname.cygport $base.cygport
cygport $base.cygport download
cygport $base.cygport prep
cp README *.hint $base/CYGWIN-PATCHES
cygport $base.cygport compile &&
cygport $base.cygport install &&
cygport $base.cygport package &&
tar xjf $base-src.tar.bz2
else
echo usage: $0 version-number
echo
echo "Wraps up the steps involved in starting a new version of a"
echo "cygport effort.  Does the prep through package steps, stopping"
echo "at the first error.  This will probably be in 'compile', for"
echo "the first run-through."
echo
exit 1
fi

--
Problem reports:   http://cygwin.com/problems.html
FAQ:   http://cygwin.com/faq/
Documentation: http://cygwin.com/docs.html
Unsubscribe info:  http://cygwin.com/ml/#unsubscribe-simple

Re: [RFU] SQlite3 (was: Something fishy going on with sqlite3...)

2012-06-04 Thread Achim Gratz
Hi Warren,

There's a new version for SQlite3 released.  I've put the fix in the source
patch now and removed the define from the CPPFLAGS, also ignoring sqlite3.pc for
the diff.

(watch for the linewraps)

---8<>8---
--- origsrc/sqlite-autoconf-3071201/sqlite3.c   2012-05-22 13:03:53 +0200
+++ src/sqlite-autoconf-3071201/sqlite3.c   2012-06-04 10:05:17 +0200
@@ -9263,7 +9263,7 @@ SQLITE_PRIVATE void sqlite3PCacheSetDefa
 #if !defined(SQLITE_OS_UNIX) && !defined(SQLITE_OS_OTHER)
 # define SQLITE_OS_OTHER 0
 # ifndef SQLITE_OS_WIN
-#   if defined(_WIN32) || defined(WIN32) || defined(__CYGWIN__) ||\
 defined(__MINGW32__) || defined(__BORLANDC__)
+#   if defined(_WIN32) || defined(WIN32) || defined(__MINGW32__) ||\
 defined(__BORLANDC__)
 # define SQLITE_OS_WIN 1
 # define SQLITE_OS_UNIX 0
 # define SQLITE_OS_OS2 0
@@ -35626,8 +35626,7 @@ static int winFullPathname(

 #if defined(__CYGWIN__)
   SimulateIOError( return SQLITE_ERROR );
-  UNUSED_PARAMETER(nFull);
-  cygwin_conv_to_full_win32_path(zRelative, zFull);
+  cygwin_conv_path(CCP_POSIX_TO_WIN_A, zRelative, zFull, nFull);
   return SQLITE_OK;
 #endif

---8<>8---

---8<>8---
ORIG_PN="sqlite"
ORIG_PV=`echo $PV|tr . " " |\
 awk -e '{printf "%1d%02d%02d%02d", $1, $2, $3, $4;}'`
DESCRIPTION="SQLite database library"
HOMEPAGE="http://www.sqlite.org/";
SRC_URI="http://www.sqlite.org/${ORIG_PN}-autoconf-${ORIG_PV}.tar.gz";
SRC_DIR="${ORIG_PN}-autoconf-${ORIG_PV}"

PKG_NAMES="${PN} lib${PN}_0 lib${PN}-devel"
PKG_HINTS='setup lib devel'
PKG_CONTENTS[0]='usr/bin/*.exe usr/share/'
PKG_CONTENTS[1]='usr/bin/*.dll'
PKG_CONTENTS[2]='usr/include/ usr/lib/'

DIFF_EXCLUDES=sqlite3.pc

CYGCONF_ARGS="CC=gcc-4 CXX=g++-4"
# define -DSQLITE_OS_UNIX to avoid Cygwin being recognized as "Windows"
CPPFLAGS="-DSQLITE_ENABLE_COLUMN_METADATA -DSQLITE_ENABLE_FTS3\
 $CPPFLAGS -DSQLITE_ENABLE_FTS_PARENTHESIS -DSQLITE_ENABLE_FTS4"
---8<>8---

Regards,
Achim.



--
Problem reports:   http://cygwin.com/problems.html
FAQ:   http://cygwin.com/faq/
Documentation: http://cygwin.com/docs.html
Unsubscribe info:  http://cygwin.com/ml/#unsubscribe-simple