Skip to Content.
Sympa Menu

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

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Treeve Jelbert <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Treeve Jelbert (72254f4cde0dc21d551504c8a9b4e88579ff0cef)
  • Date: Fri, 16 Oct 2009 15:21:53 -0500

GIT changes to master grimoire by Treeve Jelbert <treeve AT sourcemage.org>:

libs/redland/DETAILS | 2
libs/redland/HISTORY | 6
libs/redland/PRE_BUILD | 3
libs/redland/redland-1.0.9-librdf_storage_register_factory.patch | 127
++++++++++
x11-toolkits/qt4/DETAILS | 1
x11-toolkits/qt4/HISTORY | 6
x11-toolkits/qt4/INSTALL | 5
x11-toolkits/qt4/POST_INSTALL | 4
8 files changed, 149 insertions(+), 5 deletions(-)

New commits:
commit b5d4d0dc76bbecd65613345adbfb1c2a902d067b
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

redland: => 1.0.9

commit e886ae7c4b9da1cfcaa22324178072964d816ad4
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

qt4 -fix pkgconfig bug

diff --git a/libs/redland/DETAILS b/libs/redland/DETAILS
index 66e3156..d9f9c4f 100755
--- a/libs/redland/DETAILS
+++ b/libs/redland/DETAILS
@@ -1,5 +1,5 @@
SPELL=redland
- VERSION=1.0.8
+ VERSION=1.0.9
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE2=$SOURCE.asc
SOURCE_URL[0]=$SOURCEFORGE_URL/librdf/$SOURCE
diff --git a/libs/redland/HISTORY b/libs/redland/HISTORY
index ed9871a..a8fe407 100644
--- a/libs/redland/HISTORY
+++ b/libs/redland/HISTORY
@@ -1,3 +1,9 @@
+2009-10-16 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 1.0.9
+ second attempt, soprano now seems happy
+ * PRE_BUILD, redland-1.0.9-librdf_storage_register_factory.patch:
added
+ upstream patch
+
2009-08-05 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 1.0.8
1.0.9 breaks soprano
diff --git a/libs/redland/PRE_BUILD b/libs/redland/PRE_BUILD
new file mode 100755
index 0000000..9e5c69b
--- /dev/null
+++ b/libs/redland/PRE_BUILD
@@ -0,0 +1,3 @@
+default_pre_build &&
+cd $SOURCE_DIRECTORY &&
+patch -p1 <
$SPELL_DIRECTORY/redland-1.0.9-librdf_storage_register_factory.patch
diff --git a/libs/redland/redland-1.0.9-librdf_storage_register_factory.patch
b/libs/redland/redland-1.0.9-librdf_storage_register_factory.patch
new file mode 100644
index 0000000..60a851e
--- /dev/null
+++ b/libs/redland/redland-1.0.9-librdf_storage_register_factory.patch
@@ -0,0 +1,127 @@
+diff -ur redland-1.0.9.orig/src/Makefile.am redland-1.0.9/src/Makefile.am
+--- redland-1.0.9.orig/src/Makefile.am 2009-04-13 04:01:30.000000000 +0300
++++ redland-1.0.9/src/Makefile.am 2009-08-18 17:13:24.000000000 +0300
+@@ -119,7 +119,7 @@
+ plugin_LTLIBRARIES += librdf_storage_tstore.la
+ librdf_storage_tstore_la_SOURCES = rdf_storage_tstore.c
+ librdf_storage_tstore_la_CPPFLAGS = @TSTORE_CPPFLAGS@
+-librdf_storage_tstore_la_LIBADD = @TSTORE_LIBS@
++librdf_storage_tstore_la_LIBADD = @TSTORE_LIBS@ librdf.la
+ librdf_storage_tstore_la_LDFLAGS = -module -avoid-version
+ endif
+
+@@ -127,7 +127,7 @@
+ plugin_LTLIBRARIES += librdf_storage_mysql.la
+ librdf_storage_mysql_la_SOURCES = rdf_storage_mysql.c
+ librdf_storage_mysql_la_CPPFLAGS = @MYSQL_CPPFLAGS@
+-librdf_storage_mysql_la_LIBADD = @MYSQL_LIBS@
++librdf_storage_mysql_la_LIBADD = @MYSQL_LIBS@ librdf.la
+ librdf_storage_mysql_la_LDFLAGS = -module -avoid-version
+ endif
+
+@@ -135,7 +135,7 @@
+ plugin_LTLIBRARIES += librdf_storage_sqlite.la
+ librdf_storage_sqlite_la_SOURCES = rdf_storage_sqlite.c
+ librdf_storage_sqlite_la_CPPFLAGS = @SQLITE_CPPFLAGS@
+-librdf_storage_sqlite_la_LIBADD = @SQLITE_LIBS@
++librdf_storage_sqlite_la_LIBADD = @SQLITE_LIBS@ librdf.la
+ librdf_storage_sqlite_la_LDFLAGS = -module -avoid-version
+ endif
+
+@@ -143,7 +143,7 @@
+ plugin_LTLIBRARIES += librdf_storage_postgresql.la
+ librdf_storage_postgresql_la_SOURCES = rdf_storage_postgresql.c
+ librdf_storage_postgresql_la_CPPFLAGS = @POSTGRESQL_CPPFLAGS@
+-librdf_storage_postgresql_la_LIBADD = @POSTGRESQL_LIBS@
++librdf_storage_postgresql_la_LIBADD = @POSTGRESQL_LIBS@ librdf.la
+ librdf_storage_postgresql_la_LDFLAGS = -module -avoid-version
+ endif
+
+@@ -202,7 +202,8 @@
+ rdf_query_test rdf_serializer_test rdf_stream_test rdf_iterator_test \
+ rdf_init_test rdf_cache_test
+
+-TESTS_ENVIRONMENT=REDLAND_MODULE_PATH=
++# Set the place to find storage modules for testing
++TESTS_ENVIRONMENT=REDLAND_MODULE_PATH=$(abs_builddir)/.libs
+
+ CLEANFILES=$(TESTS) $(local_tests) test test*.db test.rdf
+
+diff -ur redland-1.0.9.orig/src/Makefile.in redland-1.0.9/src/Makefile.in
+--- redland-1.0.9.orig/src/Makefile.in 2009-04-13 04:04:20.000000000 +0300
++++ redland-1.0.9/src/Makefile.in 2009-08-18 17:13:24.000000000 +0300
+@@ -141,7 +141,8 @@
+ librdf_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
+ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+ $(librdf_la_LDFLAGS) $(LDFLAGS) -o $@
+-librdf_storage_mysql_la_DEPENDENCIES =
++@MODULAR_LIBRDF_TRUE@@STORAGE_MYSQL_TRUE@librdf_storage_mysql_la_DEPENDENCIES
= \
++@MODULAR_LIBRDF_TRUE@@STORAGE_MYSQL_TRUE@ librdf.la
+ am__librdf_storage_mysql_la_SOURCES_DIST = rdf_storage_mysql.c
+ @MODULAR_LIBRDF_TRUE@@STORAGE_MYSQL_TRUE@am_librdf_storage_mysql_la_OBJECTS
= librdf_storage_mysql_la-rdf_storage_mysql.lo
+ librdf_storage_mysql_la_OBJECTS = \
+@@ -151,7 +152,8 @@
+ $(librdf_storage_mysql_la_LDFLAGS) $(LDFLAGS) -o $@
+ @MODULAR_LIBRDF_TRUE@@STORAGE_MYSQL_TRUE@am_librdf_storage_mysql_la_rpath =
\
+ @MODULAR_LIBRDF_TRUE@@STORAGE_MYSQL_TRUE@ -rpath $(plugindir)
+-librdf_storage_postgresql_la_DEPENDENCIES =
++@MODULAR_LIBRDF_TRUE@@STORAGE_POSTGRESQL_TRUE@librdf_storage_postgresql_la_DEPENDENCIES
= \
++@MODULAR_LIBRDF_TRUE@@STORAGE_POSTGRESQL_TRUE@ librdf.la
+ am__librdf_storage_postgresql_la_SOURCES_DIST = \
+ rdf_storage_postgresql.c
+
@MODULAR_LIBRDF_TRUE@@STORAGE_POSTGRESQL_TRUE@am_librdf_storage_postgresql_la_OBJECTS
= librdf_storage_postgresql_la-rdf_storage_postgresql.lo
+@@ -164,7 +166,8 @@
+
@MODULAR_LIBRDF_TRUE@@STORAGE_POSTGRESQL_TRUE@am_librdf_storage_postgresql_la_rpath
= \
+ @MODULAR_LIBRDF_TRUE@@STORAGE_POSTGRESQL_TRUE@ -rpath \
+ @MODULAR_LIBRDF_TRUE@@STORAGE_POSTGRESQL_TRUE@ $(plugindir)
+-librdf_storage_sqlite_la_DEPENDENCIES =
++@MODULAR_LIBRDF_TRUE@@STORAGE_SQLITE_TRUE@librdf_storage_sqlite_la_DEPENDENCIES
= \
++@MODULAR_LIBRDF_TRUE@@STORAGE_SQLITE_TRUE@ librdf.la
+ am__librdf_storage_sqlite_la_SOURCES_DIST = rdf_storage_sqlite.c
+
@MODULAR_LIBRDF_TRUE@@STORAGE_SQLITE_TRUE@am_librdf_storage_sqlite_la_OBJECTS
= librdf_storage_sqlite_la-rdf_storage_sqlite.lo
+ librdf_storage_sqlite_la_OBJECTS = \
+@@ -174,7 +177,8 @@
+ $(librdf_storage_sqlite_la_LDFLAGS) $(LDFLAGS) -o $@
+ @MODULAR_LIBRDF_TRUE@@STORAGE_SQLITE_TRUE@am_librdf_storage_sqlite_la_rpath
= \
+ @MODULAR_LIBRDF_TRUE@@STORAGE_SQLITE_TRUE@ -rpath $(plugindir)
+-librdf_storage_tstore_la_DEPENDENCIES =
++@MODULAR_LIBRDF_TRUE@@STORAGE_TSTORE_TRUE@librdf_storage_tstore_la_DEPENDENCIES
= \
++@MODULAR_LIBRDF_TRUE@@STORAGE_TSTORE_TRUE@ librdf.la
+ am__librdf_storage_tstore_la_SOURCES_DIST = rdf_storage_tstore.c
+
@MODULAR_LIBRDF_TRUE@@STORAGE_TSTORE_TRUE@am_librdf_storage_tstore_la_OBJECTS
= librdf_storage_tstore_la-rdf_storage_tstore.lo
+ librdf_storage_tstore_la_OBJECTS = \
+@@ -463,19 +467,19 @@
+ @MODULAR_LIBRDF_TRUE@ $(am__append_6)
+ @MODULAR_LIBRDF_TRUE@@STORAGE_TSTORE_TRUE@librdf_storage_tstore_la_SOURCES
= rdf_storage_tstore.c
+ @MODULAR_LIBRDF_TRUE@@STORAGE_TSTORE_TRUE@librdf_storage_tstore_la_CPPFLAGS
= @TSTORE_CPPFLAGS@
+-@MODULAR_LIBRDF_TRUE@@STORAGE_TSTORE_TRUE@librdf_storage_tstore_la_LIBADD =
@TSTORE_LIBS@
++@MODULAR_LIBRDF_TRUE@@STORAGE_TSTORE_TRUE@librdf_storage_tstore_la_LIBADD =
@TSTORE_LIBS@ librdf.la
+ @MODULAR_LIBRDF_TRUE@@STORAGE_TSTORE_TRUE@librdf_storage_tstore_la_LDFLAGS
= -module -avoid-version
+ @MODULAR_LIBRDF_TRUE@@STORAGE_MYSQL_TRUE@librdf_storage_mysql_la_SOURCES =
rdf_storage_mysql.c
+ @MODULAR_LIBRDF_TRUE@@STORAGE_MYSQL_TRUE@librdf_storage_mysql_la_CPPFLAGS =
@MYSQL_CPPFLAGS@
+-@MODULAR_LIBRDF_TRUE@@STORAGE_MYSQL_TRUE@librdf_storage_mysql_la_LIBADD =
@MYSQL_LIBS@
++@MODULAR_LIBRDF_TRUE@@STORAGE_MYSQL_TRUE@librdf_storage_mysql_la_LIBADD =
@MYSQL_LIBS@ librdf.la
+ @MODULAR_LIBRDF_TRUE@@STORAGE_MYSQL_TRUE@librdf_storage_mysql_la_LDFLAGS =
-module -avoid-version
+ @MODULAR_LIBRDF_TRUE@@STORAGE_SQLITE_TRUE@librdf_storage_sqlite_la_SOURCES
= rdf_storage_sqlite.c
+ @MODULAR_LIBRDF_TRUE@@STORAGE_SQLITE_TRUE@librdf_storage_sqlite_la_CPPFLAGS
= @SQLITE_CPPFLAGS@
+-@MODULAR_LIBRDF_TRUE@@STORAGE_SQLITE_TRUE@librdf_storage_sqlite_la_LIBADD =
@SQLITE_LIBS@
++@MODULAR_LIBRDF_TRUE@@STORAGE_SQLITE_TRUE@librdf_storage_sqlite_la_LIBADD =
@SQLITE_LIBS@ librdf.la
+ @MODULAR_LIBRDF_TRUE@@STORAGE_SQLITE_TRUE@librdf_storage_sqlite_la_LDFLAGS
= -module -avoid-version
+
@MODULAR_LIBRDF_TRUE@@STORAGE_POSTGRESQL_TRUE@librdf_storage_postgresql_la_SOURCES
= rdf_storage_postgresql.c
+
@MODULAR_LIBRDF_TRUE@@STORAGE_POSTGRESQL_TRUE@librdf_storage_postgresql_la_CPPFLAGS
= @POSTGRESQL_CPPFLAGS@
+-@MODULAR_LIBRDF_TRUE@@STORAGE_POSTGRESQL_TRUE@librdf_storage_postgresql_la_LIBADD
= @POSTGRESQL_LIBS@
++@MODULAR_LIBRDF_TRUE@@STORAGE_POSTGRESQL_TRUE@librdf_storage_postgresql_la_LIBADD
= @POSTGRESQL_LIBS@ librdf.la
+
@MODULAR_LIBRDF_TRUE@@STORAGE_POSTGRESQL_TRUE@librdf_storage_postgresql_la_LDFLAGS
= -module -avoid-version
+ librdf_la_LIBADD = \
+ @LTLIBOBJS@ @DIGEST_OBJS@ @HASH_OBJS@ \
+@@ -502,7 +506,9 @@
+ rdf_query_test rdf_serializer_test rdf_stream_test rdf_iterator_test \
+ rdf_init_test rdf_cache_test
+
+-TESTS_ENVIRONMENT = REDLAND_MODULE_PATH=
++
++# Set the place to find storage modules for testing
++TESTS_ENVIRONMENT = REDLAND_MODULE_PATH=$(abs_builddir)/.libs
+ CLEANFILES = $(TESTS) $(local_tests) test test*.db test.rdf
+ AM_CPPFLAGS = @LIBRDF_INTERNAL_CPPFLAGS@ @LIBRDF_CPPFLAGS@ \
+ @LIBRDF_EXTERNAL_CPPFLAGS@ -DPKGDATADIR="\"$(pkgdatadir)\""
diff --git a/x11-toolkits/qt4/DETAILS b/x11-toolkits/qt4/DETAILS
index fe3a6a7..bed45d3 100755
--- a/x11-toolkits/qt4/DETAILS
+++ b/x11-toolkits/qt4/DETAILS
@@ -6,6 +6,7 @@ fi
SPELLX=qt-x11-opensource-src
VERSION=4.5.3

SOURCE_HASH=sha512:aa1051f3a5cab0ffe225eb03cd50b8bf34bcc28f89dd4bda6b80c9769395dbaec31b8d3b365e1a8aa0407be5e4cdd51c788706daebdfab8420e8f2853d8226a2
+ PATCHLEVEL=1
SOURCE=$SPELLX-$VERSION.tar.gz
URI=qt/source/$SOURCE
SECURITY_PATCH=3
diff --git a/x11-toolkits/qt4/HISTORY b/x11-toolkits/qt4/HISTORY
index 1819071..9cccb00 100644
--- a/x11-toolkits/qt4/HISTORY
+++ b/x11-toolkits/qt4/HISTORY
@@ -1,6 +1,12 @@
2009-10-10 Eric Sandall <sandalle AT sourcemage.org>
* CONFLICTS: No longer seems to need a self-conflict during upgrades

+2009-10-06 Treeve Jelbert <treeve AT sourcemage.org>
+ * POST_INSTALL: deleted
+ * INSTALL: added fix bad pkgconfig files
+ * DETAILS: PATCHLEVEL=1
+ fixes bug #15296, 15387,again?
+
2009-10-01 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 4.5.3
new url
diff --git a/x11-toolkits/qt4/INSTALL b/x11-toolkits/qt4/INSTALL
new file mode 100755
index 0000000..53ac93d
--- /dev/null
+++ b/x11-toolkits/qt4/INSTALL
@@ -0,0 +1,5 @@
+default_install &&
+message fix moc paths &&
+for FF in `ls ${INSTALL_ROOT}/usr/lib/pkgconfig/Qt*.pc`;do
+ sed -i "/location/s|/src/$SPELLX-${VERSION}/bin|/bin/qt4|" $FF
+done
diff --git a/x11-toolkits/qt4/POST_INSTALL b/x11-toolkits/qt4/POST_INSTALL
deleted file mode 100755
index 28fcc69..0000000
--- a/x11-toolkits/qt4/POST_INSTALL
+++ /dev/null
@@ -1,4 +0,0 @@
-message fix moc paths
-for FF in `ls ${INSTALL_ROOT}/usr/lib/pkgconfig/Qt*.pc`;do
- sed -i "/location/s|/src/$SPELLX-${VERSION}/bin|/bin/qt4|" $FF
-done



  • [SM-Commit] GIT changes to master grimoire by Treeve Jelbert (72254f4cde0dc21d551504c8a9b4e88579ff0cef), Treeve Jelbert, 10/16/2009

Archive powered by MHonArc 2.6.24.

Top of Page