Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Florian Franzmann (ae0b008849a14bab2d26476d795a624df6114606)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Florian Franzmann <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Florian Franzmann (ae0b008849a14bab2d26476d795a624df6114606)
  • Date: Mon, 11 Oct 2010 08:25:39 -0500

GIT changes to master grimoire by Florian Franzmann
<siflfran AT hawo.stw.uni-erlangen.de>:

ChangeLog | 3
devel/swiprolog/DETAILS | 4 -
e/imlib/DEPENDS | 1
e/imlib/DETAILS | 2
http/firefox/BUILD | 2
http/xulrunner/BUILD | 2
x11-toolkits/qt4/DETAILS | 4 -
x11-toolkits/qt4/HISTORY | 4 +
x11-toolkits/qt4/PRE_BUILD | 10 ---
x11-toolkits/qtada/BUILD | 2
x11-toolkits/qtada/DEPENDS | 5 +
x11-toolkits/qtada/DETAILS | 35 ++++++++++
x11-toolkits/qtada/HISTORY | 4 +
x11-toolkits/qtada/PRE_BUILD | 12 +++
x11-toolkits/qtada/autoconf-2.67.patch | 21 ++++++
x11-toolkits/qtada/no-examples.patch | 50
+++++++++++++++
x11-toolkits/qtada/qt4-sql_records-sql_indices.ads.patch | 16 ++++
17 files changed, 164 insertions(+), 13 deletions(-)

New commits:
commit 953ca60746206b7711bec1fe59d57809fbab40e4
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>

x11-toolkits/qtada: new spell, ada bindings for qt4

commit e4a954979dc3ca8f38ca1f9ecf602c50d8772492
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>

x11-toolkits/qt4: version 4.7.0

diff --git a/ChangeLog b/ChangeLog
index bc1e8a7..70114a8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,6 @@
+2010-10-11 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * x11-toolkits/qtada: new spell, ada bindings for qt4
+
2010-10-11 Bor Kraljič <pyrobor AT ver.si>
* *.gpg: minimized keyrings

diff --git a/devel/swiprolog/DETAILS b/devel/swiprolog/DETAILS
index 16ee272..a7d0b75 100755
--- a/devel/swiprolog/DETAILS
+++ b/devel/swiprolog/DETAILS
@@ -1,9 +1,9 @@
SPELL=swiprolog
- VERSION=5.10.0
+ VERSION=5.10.1
SOURCE=pl-$VERSION.tar.gz
SOURCE_DIRECTORY=$BUILD_DIRECTORY/pl-$VERSION
SOURCE_URL[0]=http://www.swi-prolog.org/download/stable/src/${SOURCE}
-
SOURCE_HASH=sha512:b466ebe1796051c33bfd378de35ca14c0692cb4e337fd9decf52e1a2dda2fbc7f06d1898d5be4901583910d9e25e60b8823f75a5dad8a212e004d6944830daa0
+
SOURCE_HASH=sha512:5ed01534629aa2f7e05b1d51fc5423f29304173eab749357140a8e3023a8c0edf4baf918732af795d15f3889e4b5d31679092548cda032f4c08c2ad91f0bf638
WEB_SITE=http://www.swi-prolog.org
ENTERED=20020601
LICENSE[0]=GPL
diff --git a/e/imlib/DEPENDS b/e/imlib/DEPENDS
index 488f7a4..5db78d7 100755
--- a/e/imlib/DEPENDS
+++ b/e/imlib/DEPENDS
@@ -2,5 +2,4 @@ depends tiff &&
depends libpng &&
depends zlib &&
depends jpeg &&
-depends giflib &&
depends gtk+
diff --git a/e/imlib/DETAILS b/e/imlib/DETAILS
index ca416d6..c8e1405 100755
--- a/e/imlib/DETAILS
+++ b/e/imlib/DETAILS
@@ -5,7 +5,7 @@
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
SOURCE_URL[0]=$GNOME_URL/sources/imlib/$BRANCH/$SOURCE

SOURCE_HASH=sha512:f83129468aee68d9bc5376f43613c5982da89cf010695ea7b25520c77be7d51cc408aa608bbfe8cdd3f1fc0af7891a982d45a62ea7f78770e15c1542217b1948
- WEB_SITE=http://enlightenment.org/Libraries/Imlib/
+ WEB_SITE=http://freshmeat.net/projects/imlib/
ENTERED=20010922
UPDATED=20030721
LICENSE[0]=GPL
diff --git a/http/firefox/BUILD b/http/firefox/BUILD
index 498a968..84edab7 100755
--- a/http/firefox/BUILD
+++ b/http/firefox/BUILD
@@ -24,6 +24,8 @@ CXXFLAGS="${CXXFLAGS//-O3/-O2}" &&
CFLAGS="${CFLAGS//-ffast-math/}" &&
CXXFLAGS="${CXXFLAGS//-ffast-math/}" &&

+unset CFLAGS CXXFLAGS &&
+
if [[ "$FIREFOX_CVS" == "y" ]]; then
autoconf-2.13 &&

diff --git a/http/xulrunner/BUILD b/http/xulrunner/BUILD
index bf87044..57f6aeb 100755
--- a/http/xulrunner/BUILD
+++ b/http/xulrunner/BUILD
@@ -24,6 +24,8 @@ CXXFLAGS="${CXXFLAGS//-O3/-O2}" &&
CFLAGS="${CFLAGS//-ffast-math/}" &&
CXXFLAGS="${CXXFLAGS//-ffast-math/}" &&

+unset CFLAGS CXXFLAGS &&
+
OPTS="${OPTS} --enable-optimize=-O2" &&

./configure --prefix=$INSTALL_ROOT/usr \
diff --git a/x11-toolkits/qt4/DETAILS b/x11-toolkits/qt4/DETAILS
index c4b5fa8..138004d 100755
--- a/x11-toolkits/qt4/DETAILS
+++ b/x11-toolkits/qt4/DETAILS
@@ -4,8 +4,8 @@ if [[ $QT_TMPFS == n ]]; then
TMPFS=off
fi
SPELLX=qt-everywhere-opensource-src
- VERSION=4.6.3
-
SOURCE_HASH=sha512:1a9af3697a42d9f3da7f8ea538d9a4b66327b3ba3b6796ff099e076d5873d04ddef6c722609a6eb18444d38e97ed0b79f0bf6c20963bc2395a2541c7884cecf9
+ VERSION=4.7.0
+
SOURCE_HASH=sha512:3875eff09241ed613afe46ab0e5ff313cbd5dfab7ca22ab5d87d10974c1305f88c989608eea9e155c1f8969afaa64742c05987f66c65702310109b5588837fd3
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 4670495..ad80382 100644
--- a/x11-toolkits/qt4/HISTORY
+++ b/x11-toolkits/qt4/HISTORY
@@ -1,3 +1,7 @@
+2010-10-11 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * DETAILS: version 4.7.0
+ * PRE_BUILD: fixed .pro sediting
+
2010-10-05 Eric Sandall <sandalle AT sourcemage.org>
* CONFIGURE: Buiild -> Build

diff --git a/x11-toolkits/qt4/PRE_BUILD b/x11-toolkits/qt4/PRE_BUILD
index be45191..92fff5e 100755
--- a/x11-toolkits/qt4/PRE_BUILD
+++ b/x11-toolkits/qt4/PRE_BUILD
@@ -1,13 +1,9 @@
default_pre_build &&
cd $SOURCE_DIRECTORY &&
# fix bad .pro file for 4.6.0-beta1
-sed -i '/CONFIG +=/ a\
-LIBS += -lQtCLucene
-' tools/assistant/tools/qhelpgenerator/*.pro \
- tools/assistant/tools/qcollectiongenerator/*.pro \
- tools/assistant/tools/qhelpconverter/*.pro \
- tools/assistant/tools/assistant/*.pro &&
-
+for file in
tools/assistant/tools/{qhelpgenerator,qcollectiongenerator,qhelpconverter,assistant}/*.pro;
do
+echo "LIBS += -lQtCLucene" >> $file || return 1
+done &&

# add better optimisation flags
sed -i "s|-O2||" mkspecs/common/g++.conf \
diff --git a/x11-toolkits/qtada/BUILD b/x11-toolkits/qtada/BUILD
new file mode 100755
index 0000000..5e9b132
--- /dev/null
+++ b/x11-toolkits/qtada/BUILD
@@ -0,0 +1,2 @@
+OPTS="$OPTS --with-gela" &&
+default_build
diff --git a/x11-toolkits/qtada/DEPENDS b/x11-toolkits/qtada/DEPENDS
new file mode 100755
index 0000000..d1aec99
--- /dev/null
+++ b/x11-toolkits/qtada/DEPENDS
@@ -0,0 +1,5 @@
+depends -sub ACCESS qt4 &&
+depends gprbuild &&
+depends asis &&
+optional_depends gtkada "--with-gtkada" "" "enable gtk bindings?" &&
+depends ada
diff --git a/x11-toolkits/qtada/DETAILS b/x11-toolkits/qtada/DETAILS
new file mode 100755
index 0000000..2771550
--- /dev/null
+++ b/x11-toolkits/qtada/DETAILS
@@ -0,0 +1,35 @@
+ SPELL=qtada
+ VERSION=3.1.0
+ SOURCE="${SPELL}-gpl-${VERSION}.tar.gz"
+ SOURCE_URL[0]=http://download.${SPELL}.com/${SOURCE}
+
SOURCE_HASH=sha512:1a4f854897a375506ea967e1ac7bb77d72a174184950fa0ec0cd3e38a775e35226a20ec5a6c06cc7b8d1ccc6dd8b0b77184eb2d85c09a4f272ecb6fc492abc15
+SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELL}-gpl-${VERSION}"
+ WEB_SITE="http://www.qtada.com/en/index.html";
+ LICENSE[0]=GPL
+ ENTERED=20101011
+ SHORT="an Ada2005 language bindings to the Qt libraries"
+cat << EOF
+QtAda is an Ada2005 language bindings to the Qt libraries and a set of
+useful tools. Qt is a cross-platform C++ development framework developed
+and supported by Nokia. QtAda supports Qt version 4.5 and later.
+
+QtAda allows easly to create cross-platform powerful graphical user interface
+completely on Ada 2005. QtAda applications will work on most popular
platforms
+Microsoft Windows, Mac OS X, Linux/Unix without any changes and
+platform specific code. QtAda applications use native look and feel (and
+even use user's Control Panel setting) on every supported platforms.
+
+QtAda allows to use all power of visual GUI development with Qt Designer on
+all software lifecycle stages from prototyping and up to maintanace.
+
+QtAda is not just a bindings to the existent Qt widgets, it also allows to
+develop your own widgets and integrates it into the Qt Designer for high
+speed visual GUI development.
+
+QtAda uses native thread safe signal/slot mechanism and provides full
+transparent integration with Ada tasks.
+
+QtAda provides excellent support for application
+localization/internationalization, including message translations, locale
+specific character and string processing, date/time and numerics formatting.
+EOF
diff --git a/x11-toolkits/qtada/HISTORY b/x11-toolkits/qtada/HISTORY
new file mode 100644
index 0000000..6c9c9f2
--- /dev/null
+++ b/x11-toolkits/qtada/HISTORY
@@ -0,0 +1,4 @@
+2010-10-11 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * BUILD, DEPENDS, DETAILS, no-examples.patch, PRE_BUILD,
+ qt4-sql_records-sql_indices.ads.patch: spell created
+
diff --git a/x11-toolkits/qtada/PRE_BUILD b/x11-toolkits/qtada/PRE_BUILD
new file mode 100755
index 0000000..050676d
--- /dev/null
+++ b/x11-toolkits/qtada/PRE_BUILD
@@ -0,0 +1,12 @@
+default_pre_build &&
+cd ${SOURCE_DIRECTORY} &&
+find . -name "*.gpr" \
+ -or -name "*.gpr.in" \
+ -exec sed -i -e 's/library project/project/' {} \; &&
+find . -name "*.gpr" \
+ -or -name "*.gpr.in" \
+ -exec sed -i -e 's/abstract project/project/' {} \; &&
+patch -p0 < ${SCRIPT_DIRECTORY}/qt4-sql_records-sql_indices.ads.patch &&
+patch -p0 < ${SCRIPT_DIRECTORY}/no-examples.patch &&
+sedit 's:)dnl:)[]dnl:' aclocal.m4 &&
+autoreconf --force
diff --git a/x11-toolkits/qtada/autoconf-2.67.patch
b/x11-toolkits/qtada/autoconf-2.67.patch
new file mode 100644
index 0000000..abe952d
--- /dev/null
+++ b/x11-toolkits/qtada/autoconf-2.67.patch
@@ -0,0 +1,21 @@
+--- qtada-gpl-3.1.0-20100503-3734/aclocal.m4.orig 2010-09-12
11:59:25.000000000 +0200
++++ qtada-gpl-3.1.0-20100503-3734/aclocal.m4 2010-09-12 11:59:02.000000000
+0200
+@@ -332,6 +332,7 @@
+ dnl Autoconf wants to disallow AM_ names. We explicitly allow
+ dnl the ones we care about.
+ m4_pattern_allow([^AM_[A-Z]+FLAGS$])dnl
++m4_pattern_allow(AS_MESSAGE_LOG_FD)dnl
+ AC_REQUIRE([AM_SET_CURRENT_AUTOMAKE_VERSION])dnl
+ AC_REQUIRE([AC_PROG_INSTALL])dnl
+ if test "`cd $srcdir && pwd`" != "`pwd`"; then
+--- qtada-gpl-3.1.0-20100503-3734/configure.ac.orig 2010-09-12
12:11:12.000000000 +0200
++++ qtada-gpl-3.1.0-20100503-3734/configure.ac 2010-09-12 12:11:56.000000000
+0200
+@@ -22,6 +22,8 @@
+
+ AM_CONDITIONAL(GNU_LD, [test "$with_gnu_ld" = yes])
+
++m4_pattern_allow(AS_MESSAGE_LOG_FD)
++
+ # Формирование ключей компилятора и редактора связей для сборки с Qt в
+ # различных операционных системах.
+
diff --git a/x11-toolkits/qtada/no-examples.patch
b/x11-toolkits/qtada/no-examples.patch
new file mode 100644
index 0000000..fea815b
--- /dev/null
+++ b/x11-toolkits/qtada/no-examples.patch
@@ -0,0 +1,50 @@
+--- Makefile.am.orig 2010-08-29 21:31:07.000000000 +0200
++++ Makefile.am 2010-08-29 21:31:30.000000000 +0200
+@@ -28,8 +28,8 @@
+ # We build source code distribution on the Linux, so we enable GtkAda
+ # Integration Kit to allow AutoTools to do additional checks.
+
+-SUBDIRS = . tools source examples documentation $(subdirs)
+-DIST_SUBDIRS = . tools source examples documentation
++SUBDIRS = . tools source documentation $(subdirs)
++DIST_SUBDIRS = . tools source documentation
+ # $(subdirs) may include optional directory of the in-place testsuite which
is
+ # never included in the source code distribution.
+
+--- Makefile.am.orig 2010-08-29 22:37:46.000000000 +0200
++++ Makefile.am 2010-08-29 22:37:54.000000000 +0200
+@@ -102,6 +102,5 @@
+ dist-hook:
+ rm -f gnat/config.cgpr
+ if MAINTAINER_MODE
+- rm -rf $(top_distdir)/tools/generator
+ rm -rf $(top_distdir)/testsuite
+ endif
+--- configure.ac.orig 2010-08-29 22:39:44.000000000 +0200
++++ configure.ac 2010-08-29 22:39:52.000000000 +0200
+@@ -467,13 +467,6 @@
+ AC_CONFIG_FILES([
+ documentation/qtada.qhcp
+ documentation/qtada_ugr/qtada_ugr.qhp
+- tools/generator/Makefile
+- tools/generator/testsuite/Makefile
+- tools/generator/testsuite/00-000-0000/Makefile
+- tools/generator/testsuite/00-000-0001/Makefile
+- tools/generator/testsuite/00-000-0002/Makefile
+- tools/generator/testsuite/00-000-0003/Makefile
+- tools/generator/testsuite/00-000-0004/Makefile
+ ])
+ fi
+
+--- tools/Makefile.am.orig 2010-08-29 22:43:22.000000000 +0200
++++ tools/Makefile.am 2010-08-29 22:43:27.000000000 +0200
+@@ -22,9 +22,5 @@
+
##----------------------------------------------------------------------------
+ include $(top_srcdir)/Makefile.common
+
+-if MAINTAINER_MODE
+- MAINTAINER_TOOLS_DIRS = generator
+-endif
+-
+ SUBDIRS = . gen_sizes gen_pvd $(MAINTAINER_TOOLS_DIRS)
+ DIST_SUBDIRS = . gen_sizes gen_pvd $(MAINTAINER_TOOLS_DIRS)
diff --git a/x11-toolkits/qtada/qt4-sql_records-sql_indices.ads.patch
b/x11-toolkits/qtada/qt4-sql_records-sql_indices.ads.patch
new file mode 100644
index 0000000..b2e314c
--- /dev/null
+++ b/x11-toolkits/qtada/qt4-sql_records-sql_indices.ads.patch
@@ -0,0 +1,16 @@
+--- source/sql/qt4-sql_records-sql_indices.ads.orig 2010-08-27
14:25:24.000000000 +0200
++++ source/sql/qt4-sql_records-sql_indices.ads 2010-08-27 14:25:41.000000000
+0200
+@@ -87,13 +87,10 @@
+
+ type Q_Sql_Index is new Qt4.Sql_Records.Q_Sql_Record with null record;
+
+- overriding
+ procedure Adjust (Self : in out Q_Sql_Index);
+
+- overriding
+ procedure Finalize (Self : in out Q_Sql_Index);
+
+- overriding
+ procedure Initialize (Self : in out Q_Sql_Index);
+
+ end Qt4.Sql_Records.Sql_Indices;




Archive powered by MHonArc 2.6.24.

Top of Page