From: inv <inv@opencascade.com>
Date: Wed, 4 Apr 2012 13:58:52 +0000 (+0000)
Subject: SALOME 6.5.0 preparation: update QScintilla script for version 2.6.1 (currect version... 
X-Git-Tag: V6_5_0b1~28
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=d75f2f70def8f54b5de21df5e2ad7128059f6b9d;p=tools%2Finstall.git

SALOME 6.5.0 preparation: update QScintilla script for version 2.6.1 (currect version is still 2.4.3)
---

diff --git a/config_files/patches/QScintilla-2.6.1.patch b/config_files/patches/QScintilla-2.6.1.patch
new file mode 100644
index 0000000..1465a49
--- /dev/null
+++ b/config_files/patches/QScintilla-2.6.1.patch
@@ -0,0 +1,14 @@
+diff -Naur --exclude=CVS QScintilla-2.6.1_SRC_orig/Qt4/ListBoxQt.cpp QScintilla-2.6.1_SRC/Qt4/ListBoxQt.cpp
+--- QScintilla-2.6.1_SRC_orig/Qt4/ListBoxQt.cpp	2012-02-10 13:59:50.000000000 +0400
++++ QScintilla-2.6.1_SRC/Qt4/ListBoxQt.cpp	2012-04-04 17:44:23.000000000 +0400
+@@ -245,9 +245,7 @@
+ void QsciListBoxQt::RegisterRGBAImage(int type, int, int,
+         const unsigned char *pixelsImage)
+ {
+-    QPixmap pm;
+-
+-    pm.convertFromImage(*reinterpret_cast<const QImage *>(pixelsImage));
++    QPixmap pm = QPixmap::fromImage(*reinterpret_cast<const QImage *>(pixelsImage));
+     xset.insert(type, pm);
+ }
+ 
diff --git a/config_files/qscintilla.sh b/config_files/qscintilla.sh
index a30311d..b118e5f 100755
--- a/config_files/qscintilla.sh
+++ b/config_files/qscintilla.sh
@@ -64,6 +64,9 @@ source ${INSTALL_WORK}/$SHRC
 
 check_jb tar xfz ${SOURCE_DIR}/${PRODUCT}.tar.gz -C ${INST_ROOT}
 
+# apply patch (if there's any)
+( test -f patches/${PRODUCT}.patch && cp patches/${PRODUCT}.patch ${PRODUCT_SRC_DIR} && cd ${PRODUCT_SRC_DIR} && patch -p1 < ${PRODUCT}.patch )
+
 # to generate environment scripts
 try_preinstalled
 }