Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Treeve Jelbert (ba159276495becbb10007f0937130ec3f85f60ba)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Treeve Jelbert <scm AT mail.sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Treeve Jelbert (ba159276495becbb10007f0937130ec3f85f60ba)
  • Date: Mon, 26 Jun 2006 14:27:45 -0500

GIT changes to master grimoire by Treeve Jelbert <treeve AT scarlet.be>:

graphics-libs/libpng/DETAILS | 10 ++---
graphics-libs/libpng/HISTORY | 4 ++
odbc-drivers/odbcjdbc/BUILD | 6 ++-
odbc-drivers/odbcjdbc/HISTORY | 6 +++
odbc-drivers/odbcjdbc/PRE_BUILD | 8 +---
odbc-drivers/odbcjdbc/fix.diff | 74
++++++++++++++++++++++++++++++++++++++++
6 files changed, 96 insertions(+), 12 deletions(-)

New commits:
commit ba159276495becbb10007f0937130ec3f85f60ba
Author: Treeve Jelbert <treeve AT scarlet.be>
Commit: Treeve Jelbert <treeve AT scarlet.be>

libpng-1.2.11

commit 50c0fc66013dc0e75d762680eb201b59091c54b7
Merge: 76a6dccfcf5cb2542a462c9af433aa70d14430b9
b88005597e631d3b26fe6a0c905f442c6bb9ae99
Author: Treeve Jelbert <treeve AT scarlet.be>
Commit: Treeve Jelbert <treeve AT scarlet.be>

Merge branch 'master' of ssh://scm.sourcemage.org/smgl/grimoire

commit 76a6dccfcf5cb2542a462c9af433aa70d14430b9
Author: Treeve Jelbert <treeve AT scarlet.be>
Commit: Treeve Jelbert <treeve AT scarlet.be>

odbcjdbc - fixes for libiodbc

diff --git a/graphics-libs/libpng/DETAILS b/graphics-libs/libpng/DETAILS
index 12f4756..d74dd88 100755
--- a/graphics-libs/libpng/DETAILS
+++ b/graphics-libs/libpng/DETAILS
@@ -1,13 +1,13 @@
SPELL=libpng
- VERSION=1.2.8
-
SOURCE_HASH=sha512:32912b4c1840c3d5564d99a53d2b04bdf88fddef1e9d35ed05ae0179a85df81b412e211598a92aa1227b53700c883a3690851b01a9bd2ced998777e7d814cd4f
- SOURCE=$SPELL-$VERSION-config.tar.gz
-SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION-config
+ VERSION=1.2.11
+
SOURCE_HASH=sha512:6981ebf9bde4050988e6a57bc41b787b6b40e1246f858eb4cf5bcbe2fa3388be42eeb6c3eb287719b052a70c30ff6da1a09196195b94fa8b55174305c260c11e
+ SOURCE=$SPELL-$VERSION.tar.bz2
+SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
SOURCE_URL[0]=$SOURCEFORGE_URL/$SPELL/$SOURCE
+ SOURCE_URL[1]=ftp://ftp.simplesystems.org/pub/libpng/png/src/$SOURCE
LICENSE[0]=ZLIB
WEB_SITE=http://www.libpng.org/pub/png/libpng.html
ENTERED=20010922
- UPDATED=20051124
KEYWORDS="graphics libs"
SHORT="libpng is a library that supports the PNG graphics format."
cat << EOF
diff --git a/graphics-libs/libpng/HISTORY b/graphics-libs/libpng/HISTORY
index a5f4af4..2187fb1 100644
--- a/graphics-libs/libpng/HISTORY
+++ b/graphics-libs/libpng/HISTORY
@@ -1,3 +1,7 @@
+2006-06-26 Treeve Jelbert <treeve01 AT pi.be>
+ * DETAILS: version 1.2.11
+ additional SOURCE_URL
+
2006-04-22 George Sherwood <george AT beernabeer.com>
* DETAILS: Downgraded to version 1.2.8. Breaks at least gimp.
Bug reported to gimp upstream author. Bug #339402.
diff --git a/odbc-drivers/odbcjdbc/BUILD b/odbc-drivers/odbcjdbc/BUILD
index 95791ec..3a6e206 100755
--- a/odbc-drivers/odbcjdbc/BUILD
+++ b/odbc-drivers/odbcjdbc/BUILD
@@ -1,3 +1,7 @@

cd $SOURCE_DIRECTORY/OdbcJdbc/Builds/Gcc.lin &&
-make -f makefile.linux
+if spell_ok unixodbc;then
+ make -f makefile.linux ODBCMANAGER=unixODBC
+else
+ make -f makefile.linux ODBCMANAGER=iODBC
+fi
diff --git a/odbc-drivers/odbcjdbc/HISTORY b/odbc-drivers/odbcjdbc/HISTORY
index a4f8bba..e238c82 100644
--- a/odbc-drivers/odbcjdbc/HISTORY
+++ b/odbc-drivers/odbcjdbc/HISTORY
@@ -1,3 +1,9 @@
+2006-06-26 Treeve Jelbert <treeve01 AT pi.be>
+ * PRE_BUILD: apply patches, removed sedit
+ * BUILD: make compatible with libiodbc
+ * fix.diff: add
+ integrates previous sedits and temporary patches
+
2006-06-22 Treeve Jelbert <treeve01 AT pi.be>
* DETAILS: version 2.0.0136
* FINAL, POST_RESURRECT: move to section level
diff --git a/odbc-drivers/odbcjdbc/PRE_BUILD b/odbc-drivers/odbcjdbc/PRE_BUILD
index 7e8a059..27a04a8 100755
--- a/odbc-drivers/odbcjdbc/PRE_BUILD
+++ b/odbc-drivers/odbcjdbc/PRE_BUILD
@@ -1,7 +1,3 @@
default_pre_build &&
- cd $SOURCE_DIRECTORY/OdbcJdbc &&
-sedit "s|d:/Firebird|/usr/firebird|" Builds/makefile.environ &&
- cd Builds/Gcc.lin &&
-# can't use patch because file in msdos format
- sed -i "s|-g |-DPIC -fPIC $CFLAGS |;s|/opt|/usr|;s|/odbc||;s|-sh|$LDFLAGS
-sh|" \
- makefile.linux
+ cd $SOURCE_DIRECTORY &&
+ patch -p1 <$SPELL_DIRECTORY/fix.diff
diff --git a/odbc-drivers/odbcjdbc/fix.diff b/odbc-drivers/odbcjdbc/fix.diff
new file mode 100644
index 0000000..946910c
--- /dev/null
+++ b/odbc-drivers/odbcjdbc/fix.diff
@@ -0,0 +1,74 @@
+diff -uNr ODBC_V2-0-BETA/OdbcJdbc/Builds/Gcc.lin/makefile.linux
ODBC_V2-0-BETA.cp/OdbcJdbc/Builds/Gcc.lin/makefile.linux
+--- ODBC_V2-0-BETA/OdbcJdbc/Builds/Gcc.lin/makefile.linux 2004-12-21
19:39:24.000000000 +0100
++++ ODBC_V2-0-BETA.cp/OdbcJdbc/Builds/Gcc.lin/makefile.linux 2006-06-26
15:39:04.000000000 +0200
+@@ -52,11 +52,11 @@
+ endif
+
+ ifdef INTERBASE
+-INCLUDEDIR := -I/opt/interbase/include -I/usr/include/odbc
$(INCLUDEDIR)
+-EXTLIBDIR := -L/opt/interbase/lib -L/usr/lib/unixODBC $(EXTLIBDIR)
++INCLUDEDIR := -I/usr/interbase/include -I/usr/include $(INCLUDEDIR)
++EXTLIBDIR := -L/usr/interbase/lib -L/usr/lib/unixODBC $(EXTLIBDIR)
+ else
+-INCLUDEDIR = -I/opt/firebird/include -I/usr/include/odbc
+-EXTLIBDIR := -L/opt/firebird/lib -L/usr/lib/unixODBC $(EXTLIBDIR)
++INCLUDEDIR = -I/usr/firebird/include -I/usr/include
++EXTLIBDIR := -L/usr/firebird/lib -L/usr/lib/unixODBC $(EXTLIBDIR)
+ endif
+ #
+
+@@ -75,10 +75,10 @@
+ LIST_ODBCJDBCSETUPSRC = $(addprefix $(ODBCJDBCDIR)/,
$(ODBCJDBCSETUPSRC_LINUX))
+ LIST_ODBCJDBCSETUPOBJ = $(addprefix $(BUILDDIR)/,
$(ODBCJDBCSETUPSRC_LINUX:.cpp=.o))
+ #
+-COMPFLAGS = -g -w -D_REENTRANT -D_PTHREADS -DEXTERNAL $(INCLUDEDIR)
-I$(FBINCDIR)
++COMPFLAGS = -DPIC -fPIC $(CFLAGS) -w -D_REENTRANT -D_PTHREADS
-DEXTERNAL $(INCLUDEDIR) -I$(FBINCDIR)
+ #
+-#LINKFLAGS = -rdynamic -export-dynamic -shared
+-LINKFLAGS = -shared
++#LINKFLAGS = -rdynamic -export-dynamic -shared
++LINKFLAGS = -shared
+ EXTLIBS = $(EXTLIBDIR) -lcrypt -ldl
+ #
+ ISCDBC = libIscDbc.so
+diff -uNr ODBC_V2-0-BETA/OdbcJdbc/Builds/makefile.environ
ODBC_V2-0-BETA.cp/OdbcJdbc/Builds/makefile.environ
+--- ODBC_V2-0-BETA/OdbcJdbc/Builds/makefile.environ 2003-12-13
19:27:26.000000000 +0100
++++ ODBC_V2-0-BETA.cp/OdbcJdbc/Builds/makefile.environ 2006-06-26
13:37:51.000000000 +0200
+@@ -3,8 +3,8 @@
+ #FBINCDIR = /mnt/third_party/interbase/sun5-2003-3-10/include
+ #FBLIBDIR = /mnt/third_party/interbase/sun5-2003-3-10/lib
+ #
+-FBINCDIR = d:/Firebird/include
+-FBLIBDIR = d:/Firebird/lib
++FBINCDIR = /usr/irebird/include
++FBLIBDIR = /usr/firebird/lib
+ #
+ ISCDBCDIR = ../../IscDbc
+ ODBCJDBCDIR = ../..
+diff -uNr ODBC_V2-0-BETA/OdbcJdbc/OdbcConnection.cpp
ODBC_V2-0-BETA.cp/OdbcJdbc/OdbcConnection.cpp
+--- ODBC_V2-0-BETA/OdbcJdbc/OdbcConnection.cpp 2006-06-21 16:52:14.000000000
+0200
++++ ODBC_V2-0-BETA.cp/OdbcJdbc/OdbcConnection.cpp 2006-06-26
12:36:02.000000000 +0200
+@@ -1026,7 +1026,7 @@
+
+ void OdbcConnection::writeAttributeFileDSN(const char * attribute, const
char * value)
+ {
+- SQLWriteFileDSN (savedsn, "ODBC", attribute, value);
++ SQLWriteFileDSN (savedsn, "ODBC", attribute, (char*)value);
+ }
+
+ SQLRETURN OdbcConnection::sqlGetFunctions(SQLUSMALLINT functionId,
SQLUSMALLINT * supportedPtr)
+diff -uNr ODBC_V2-0-BETA/OdbcJdbc/OdbcJdbc.h
ODBC_V2-0-BETA.cp/OdbcJdbc/OdbcJdbc.h
+--- ODBC_V2-0-BETA/OdbcJdbc/OdbcJdbc.h 2005-06-02 14:54:48.000000000 +0200
++++ ODBC_V2-0-BETA.cp/OdbcJdbc/OdbcJdbc.h 2006-06-23 19:13:10.000000000
+0200
+@@ -137,3 +137,11 @@
+
+ #endif
+
++#ifndef UINT
++#define UINT SQLUINTEGER
++#endif
++
++#ifndef DWORD
++#define DWORD SQLUINTEGER
++#endif
++




Archive powered by MHonArc 2.6.24.

Top of Page