[SM-Commit] GIT changes to master grimoire by Treeve Jelbert (e4b86ea14ff8b5f3e7c8b095fbba55714fe1a625)

Treeve Jelbert scm at sourcemage.org
Thu Jun 25 10:23:19 EDT 2009


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

 x11-toolkits/qt4/0279-svg-rendering-regression.diff |   10 ---
 x11-toolkits/qt4/DETAILS                            |    8 ---
 x11-toolkits/qt4/HISTORY                            |    6 ++
 x11-toolkits/qt4/PRE_BUILD                          |    4 -
 x11-toolkits/qt4/REPAIR^all^PRE_SUB_DEPENDS         |   15 -----
 x11-toolkits/qt4/REPAIR^all^SUB_DEPENDS             |   52 --------------------
 x11-toolkits/qt4/odbc.patch                         |   18 ------
 7 files changed, 8 insertions(+), 105 deletions(-)

New commits:
commit 844ac0478aed1475de3b9417218a28430276561d
Author: Treeve Jelbert <treeve at sourcemage.org>
Commit: Treeve Jelbert <treeve at sourcemage.org>

    qt4: => 4.5.2

diff --git a/x11-toolkits/qt4/0279-svg-rendering-regression.diff b/x11-toolkits/qt4/0279-svg-rendering-regression.diff
deleted file mode 100644
index d0f8582..0000000
--- a/x11-toolkits/qt4/0279-svg-rendering-regression.diff
+++ /dev/null
@@ -1,10 +0,0 @@
---- src/svg/qsvgstyle.cpp	(revision 958572)
-+++ src/svg/qsvgstyle.cpp	(working copy)
-@@ -808,6 +808,7 @@
-                     static_cast<QSvgGradientStyle*>(prop);
-                 st->resolveStops();
-                 m_gradient->setStops(st->qgradient()->stops());
-+	        m_gradientStopsSet = st->gradientStopsSet();
-             }
-         }
-         m_link = QString();
diff --git a/x11-toolkits/qt4/DETAILS b/x11-toolkits/qt4/DETAILS
index 5f0a2a6..b0d1e94 100755
--- a/x11-toolkits/qt4/DETAILS
+++ b/x11-toolkits/qt4/DETAILS
@@ -18,18 +18,14 @@ persistent_remove QT_VER
 #SOURCE_DIRECTORY=$BUILD_DIRECTORY/${SPELLX}-$VERSION
 #     ;;
 #  *) #stable
-         VERSION=4.5.1
-      PATCHLEVEL=1
-     SOURCE_HASH=sha512:0ccdcb4b4daa7cf671f4da8850750411090a1616d0f6766d311515706672e0cd120510e55590b5386015f9300086b3456d691835f96df0fd442d6dd3f6d3522c
+         VERSION=4.5.2
+     SOURCE_HASH=sha512:385f4a30959a67864f05e6192fbd05755a12319dfbf30507d8757b9cf515cb70eba063e0eb356c583bbd90538434c41ab08336daf10b3ce43016b85f1e462735
           SOURCE=$SPELLX-$VERSION.tar.bz2
              URI=qt/source/$SOURCE
   SECURITY_PATCH=2
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELLX-$VERSION
 #esac
    SOURCE_URL[0]=http://download.qtsoftware.com/$URI
-#   SOURCE_URL[1]=ftp://ftp.silug.org/pub/$URI
-#   SOURCE_URL[2]=ftp://ftp.planetmirror.com.au/pub/trolltech/$URI
-#http://ftp.heanet.ie/mirrors/
         WEB_SITE=http://www.qtsoftware.com//products
          ENTERED=20020410
       LICENSE[0]=LGPL
diff --git a/x11-toolkits/qt4/HISTORY b/x11-toolkits/qt4/HISTORY
index 266ea47..9b67c39 100644
--- a/x11-toolkits/qt4/HISTORY
+++ b/x11-toolkits/qt4/HISTORY
@@ -1,3 +1,9 @@
+2009-06-25 Treeve Jelbert <treeve at sourcemage.org>
+	* DETAILS: version 4.5.2 (prerelease & stable)
+	* 0279-svg-rendering-regression.diff, odbc.patch: deleted
+	* PRE_BUILD: don;t apply patches
+	* REPAIR^all^*: deleted
+
 2009-05-04 Treeve Jelbert <treeve at sourcemage.org>
 	* PRE_BUILD: force use of libiodbc
 	* DEPENDS: unixodbc -> ODBC-MGR
diff --git a/x11-toolkits/qt4/PRE_BUILD b/x11-toolkits/qt4/PRE_BUILD
index f4d38f7..27d53a0 100755
--- a/x11-toolkits/qt4/PRE_BUILD
+++ b/x11-toolkits/qt4/PRE_BUILD
@@ -1,9 +1,5 @@
 default_pre_build          &&
 cd $SOURCE_DIRECTORY 	   &&
-#apply upstream patch
-patch -p0 < $SPELL_DIRECTORY/0279-svg-rendering-regression.diff &&
-
-patch -p0 < $SPELL_DIRECTORY/odbc.patch &&
 
 # add better optimisation flags
 sed -i   "s|-O2||" mkspecs/common/g++.conf      \
diff --git a/x11-toolkits/qt4/REPAIR^all^PRE_SUB_DEPENDS b/x11-toolkits/qt4/REPAIR^all^PRE_SUB_DEPENDS
deleted file mode 100755
index bde8deb..0000000
--- a/x11-toolkits/qt4/REPAIR^all^PRE_SUB_DEPENDS
+++ /dev/null
@@ -1,15 +0,0 @@
-case $THIS_SUB_DEPENDS in
-  DBUS) is_depends_enabled $SPELL dbus   && return 0;;
-  OPENGL)  is_depends_enabled $SPELL $(get_spell_provider $SPELL OPENGL) && return 0;;
-  FIREBIRD)  is_depends_enabled $SPELL firebird && return 0;;
-  MYSQL)  is_depends_enabled $SPELL mysql && return 0;;
-  POSTGRESQL)  is_depends_enabled $SPELL postgresql && return 0;;
-  SQLITE)  is_depends_enabled $SPELL sqlite && return 0;;
-  SSL)  is_depends_enabled $SPELL openssl && return 0;;
-  TOOLS) [[ $QT_TOOLS == "-make" ]] && return 0;;
-  STL)   [[ $QT_STL == "-stl" ]] && return 0;;
-  QT3)   [[ $QT_QT3 == "-qt3support" ]] && return 0;;
-  WEBKIT) [[ $QT_WEBKIT == "-webkit" ]] && return 0;;
-  *) echo "Eek, unknown subdependency requested!"; return 1;;
-esac
-return 1
diff --git a/x11-toolkits/qt4/REPAIR^all^SUB_DEPENDS b/x11-toolkits/qt4/REPAIR^all^SUB_DEPENDS
deleted file mode 100755
index 81a17ec..0000000
--- a/x11-toolkits/qt4/REPAIR^all^SUB_DEPENDS
+++ /dev/null
@@ -1,52 +0,0 @@
-case $THIS_SUB_DEPENDS in
-DBUS) echo "DBUS support requested, forcing dbus dependency." &&
-     depends dbus
-     ;;
-#GIF) echo "GIF support requested, forcing giflib dependency." &&
-#     depends giflib
-#     ;;
-OPENGL) echo "OPENGL support requested, forcing OPENGL dependency." &&
-     depends OPENGL
-     ;;
-FIREBIRD) echo "Firebird support requested, forcing firebird dependency." &&
-     depends firebird \
-             "-plugin-sql-ibase  -I$INSTALL_ROOT/opt/firebird/include  \
-             -L$INSTALL_ROOT/opt/firebird/lib"
-     ;;
-POSTGRESQL) echo "Postresql support requested, forcing  postgresql dependency." &&
-     depends postgresql \
-             "-plugin-sql-psql  -I$INSTALL_ROOT/src/include/postgresql       \
-              -I$INSTALL_ROOT/usr/include/server/libpq  -L$INSTALL_ROOT/usr/lib  -lpq"
-     ;;
-SQLITE) echo "Sqlite support requested, forcing sqlite dependency." &&
-     depends sqlite
-      ;;
-SSL) echo "SSL support requested, forcing openssl dependency." &&
-     depends openssl
-      ;;
-TOOLS) if [[ $QT_TOOLS == "-nomake" ]]; then
-         echo "Tools requested, forcing build." &&
-         QT_TOOLS="-make"
-       fi
-       ;;
-STL) if [[  $QT_STL == "-no-stl" ]]; then
-       echo "STL support requested, forcing build."  &&
-       QT_STL="-stl"
-     fi
-     ;;
-QT3) if [[  $QT_QT3 == "-no-qt3support" ]]; then
-       echo "Qt3 support requested, forcing build."  &&
-       QT_QT3="-qt3support"
-     fi
-     ;;
-WEBKIT) if [[  $QT_WEBKIT == "-no-webkit" ]]; then
-          echo "WebKit module requested, forcing build."  &&
-          QT_WEBKIT="-webkit"
-        fi
-        ;;
-MYSQL) echo "MySQL support requested, forcing mysql dependency." &&
-       depends mysql "-plugin-sql-mysql  -I$INSTALL_ROOT/usr/include/mysql  \
-                   -L$INSTALL_ROOT/usr/lib  -lmysqlclient"
-       ;;
-*) echo unknown sub-depends!!! ; return 1 ;;
-esac
diff --git a/x11-toolkits/qt4/odbc.patch b/x11-toolkits/qt4/odbc.patch
deleted file mode 100644
index a22ce7f..0000000
--- a/x11-toolkits/qt4/odbc.patch
+++ /dev/null
@@ -1,18 +0,0 @@
---- src/sql/drivers/odbc/qsql_odbc.cpp.orig	2009-05-03 10:13:19.000000000 -0500
-+++ src/sql/drivers/odbc/qsql_odbc.cpp	2009-05-03 10:13:58.000000000 -0500
-@@ -69,13 +69,13 @@
- #endif
- 
- // newer platform SDKs use SQLLEN instead of SQLINTEGER
--#if defined(SQLLEN) || defined(Q_OS_WIN64)
-+#if defined(SQLLEN) || defined(Q_OS_WIN64) || defined(Q_OS_UNIX)
- # define QSQLLEN SQLLEN
- #else
- # define QSQLLEN SQLINTEGER
- #endif
- 
--#if defined(SQLULEN) || defined(Q_OS_WIN64)
-+#if defined(SQLULEN) || defined(Q_OS_WIN64) || defined(Q_OS_UNIX)
- # define QSQLULEN SQLULEN
- #else
- # define QSQLULEN SQLUINTEGER



More information about the SM-Commit mailing list