Git-Url:
http://git.frugalware.org/gitweb/gitweb.cgi?p=kdetesting.git;a=commitdiff;h=4dc4b83c604399a29365b018a6fdfe470d0aa04d
commit 4dc4b83c604399a29365b018a6fdfe470d0aa04d
Author: crazy <cr...@frugalware.org>
Date: Wed Feb 10 12:34:07 2010 +0100
qt4-4.6.1-6-x86_64
* added some patches to fix isues I notice with kde4.4
* I still have 2 here but I need to test some more
diff --git a/source/xlib-extra/qt4/0188-fix-moc-parser-same-name-header.diff
b/source/xlib-extra/qt4/0188-fix-moc-parser-same-name-header.diff
new file mode 100644
index 0000000..03544db
--- /dev/null
+++ b/source/xlib-extra/qt4/0188-fix-moc-parser-same-name-header.diff
@@ -0,0 +1,22 @@
+Index: src/tools/moc/preprocessor.cpp
+===================================================================
+--- src/tools/moc/preprocessor.cpp.orig
++++ src/tools/moc/preprocessor.cpp
+@@ -799,7 +799,7 @@ void Preprocessor::preprocess(const QByt
+ QFileInfo fi;
+ if (local)
+ fi.setFile(QFileInfo(QString::fromLocal8Bit(filename)).dir(),
QString::fromLocal8Bit(include));
+- for (int j = 0; j < Preprocessor::includes.size() &&
!fi.exists(); ++j) {
++ for (int j = 0; j < Preprocessor::includes.size() && (
!fi.exists() || fi.isDir() ); ++j) {
+ const IncludePath &p = Preprocessor::includes.at(j);
+ if (p.isFrameworkPath) {
+ const int slashPos = include.indexOf('/');
+@@ -819,7 +819,7 @@ void Preprocessor::preprocess(const QByt
+ }
+ }
+
+- if (!fi.exists() || fi.isDir())
++ if ( !fi.exists() )
+ continue;
+ include = fi.canonicalFilePath().toLocal8Bit();
+
diff --git a/source/xlib-extra/qt4/0191-listview-alternate-row-colors.diff
b/source/xlib-extra/qt4/0191-listview-alternate-row-colors.diff
new file mode 100644
index 0000000..5ca59f3
--- /dev/null
+++ b/source/xlib-extra/qt4/0191-listview-alternate-row-colors.diff
@@ -0,0 +1,24 @@
+qt-bugs@ issue : 178507
+Trolltech task ID : 179170
+applied: no
+author: Matthew Woehlke <mw_tr...@users.sourceforge.net>
+
+This patch fixes incorrect setting of the palette color group in
+QListView that resulted in alternate rows being drawn with the Active
+AlternateBase color even for inactive widgets (while the rest of the
+widget is drawn correctly). Please let me know if QListView is not
+the only culprit. (QTreeView was fixed by TT already.)
+
+Index: src/gui/itemviews/qlistview.cpp
+===================================================================
+--- src/gui/itemviews/qlistview.cpp.orig
++++ src/gui/itemviews/qlistview.cpp
+@@ -989,7 +989,7 @@ void QListView::paintEvent(QPaintEvent *
+ option.state &= ~QStyle::State_Enabled;
+ cg = QPalette::Disabled;
+ } else {
+- cg = QPalette::Normal;
++ cg = window()->isActiveWindow() ? QPalette::Active :
QPalette::Inactive;
+ }
+ option.palette.setCurrentColorGroup(cg);
+ }
diff --git a/source/xlib-extra/qt4/FrugalBuild
b/source/xlib-extra/qt4/FrugalBuild
index 40f87af..7b02aa3 100644
--- a/source/xlib-extra/qt4/FrugalBuild
+++ b/source/xlib-extra/qt4/FrugalBuild
@@ -6,7 +6,7 @@ USE_DEMOS=${USE_DEMOS:-"n"}
pkgname=qt4
_F_archive_name=qt-everywhere-opensource-src
pkgver=4.6.1
-pkgrel=5
+pkgrel=6
pkgdesc="The QT4 GUI toolkit."
url="http://qt.nokia.com/products/";
depends=()
@@ -20,10 +20,18 @@ options=('scriptlet' 'nodocs')
up2date="Flasttar ftp://ftp.qt.nokia.com/qt/source/";
source=(ftp://ftp.qt.nokia.com/qt/source/$_F_archive_name-$pkgver.tar.gz \
frugalware.patch \
- fix-config.tests.patch)
+ fix-config.tests.patch \
+ qfatal-noreturn.diff \
+ qt-never-strip.diff \
+ 0188-fix-moc-parser-same-name-header.diff \
+ 0191-listview-alternate-row-colors.diff)
sha1sums=('d3b44ae6d9bc9c44fc57f32e545b92daf0b54775' \
'49521d8fa88b725708073caad4f861c10edd4c6d' \
- 'a1165099df3d282a4c19c1ec30a4def39e8d46c6')
+ 'a1165099df3d282a4c19c1ec30a4def39e8d46c6' \
+ '49f24c3fc72656f8e001cbcee6632364e77510f8' \
+ '7768b4a444977c6da13bb6ad32afa709df3923b7' \
+ '51f638c8b40b84b85aa8785b114b3db852e9e5c1' \
+ '681acac1aa9dffd26691dd5bdcb10b6ffd7a5e0f')
export LD_LIBRARY_PATH=$Fsrcdir/$_F_archive_name-$pkgver/lib:${LD_LIBRARY_PATH}
export YACC='yacc -d'
diff --git a/source/xlib-extra/qt4/qfatal-noreturn.diff
b/source/xlib-extra/qt4/qfatal-noreturn.diff
new file mode 100644
index 0000000..d52d439
--- /dev/null
+++ b/source/xlib-extra/qt4/qfatal-noreturn.diff
@@ -0,0 +1,10 @@
+--- src/corelib/global/qglobal.h
++++ src/corelib/global/qglobal.h
+@@ -1384,6 +1384,7 @@ Q_CORE_EXPORT void qCritical(const char
+ Q_CORE_EXPORT void qFatal(const char *, ...) /* print fatal message and exit
*/
+ #if defined(Q_CC_GNU) && !defined(__INSURE__)
+ __attribute__ ((format (printf, 1, 2)))
++ __attribute__ ((noreturn))
+ #endif
+ ;
+
diff --git a/source/xlib-extra/qt4/qt-never-strip.diff
b/source/xlib-extra/qt4/qt-never-strip.diff
new file mode 100644
index 0000000..9d1de41
--- /dev/null
+++ b/source/xlib-extra/qt4/qt-never-strip.diff
@@ -0,0 +1,30 @@
+Index: configure
+===================================================================
+--- configure.orig
++++ configure
+@@ -65,7 +65,6 @@ OPT_CMDLINE=`echo $@ | sed "s,-v ,,g; s,
+
+ # initialize global variables
+ QMAKE_SWITCHES=
+-QMAKE_VARS=
+ QMAKE_CONFIG=
+ QTCONFIG_CONFIG=
+ QT_CONFIG=
+@@ -1324,7 +1323,7 @@ while [ "$#" -gt 0 ]; do
+ QMakeVar add QMAKE_CFLAGS -pg
+ QMakeVar add QMAKE_CXXFLAGS -pg
+ QMakeVar add QMAKE_LFLAGS -pg
+- QMAKE_VARS="$QMAKE_VARS CONFIG+=nostrip"
++ QMakeVar add CONFIG nostrip
+ else
+ UNKNOWN_OPT=yes
+ fi
+@@ -2823,6 +2822,8 @@ if [ "$OPT_VERBOSE" = "yes" ]; then
+ fi
+ fi
+
++QMakeVar add CONFIG nostrip
++
+
#-------------------------------------------------------------------------------
+ # tests that don't need qmake (must be run before displaying help)
+
#-------------------------------------------------------------------------------
_______________________________________________
Frugalware-git mailing list
Frugalware-git@frugalware.org
http://frugalware.org/mailman/listinfo/frugalware-git
