[paketler-commits] r71352 - in 2009/stable/desktop/toolkit/qt/qt: . files files/fedora files/git-patches
paketler-commits at pardus.org.tr
paketler-commits at pardus.org.tr
30 Haz 2009 Sal 15:10:08 EEST
Author: gokcen.eraslan
Date: Tue Jun 30 15:10:08 2009
New Revision: 71352
Added:
2009/stable/desktop/toolkit/qt/qt/files/0285-qgv-dontshowchildren.diff
- copied unchanged from r71344, 2009/devel/desktop/toolkit/qt/qt/files/0285-qgv-dontshowchildren.diff
2009/stable/desktop/toolkit/qt/qt/files/fedora/qt-x11-opensource-src-4.5.0-fix-qatomic-inline-asm.patch
- copied unchanged from r71344, 2009/devel/desktop/toolkit/qt/qt/files/fedora/qt-x11-opensource-src-4.5.0-fix-qatomic-inline-asm.patch
2009/stable/desktop/toolkit/qt/qt/files/fedora/qt-x11-opensource-src-4.5.1-mysql_config.patch
- copied unchanged from r71344, 2009/devel/desktop/toolkit/qt/qt/files/fedora/qt-x11-opensource-src-4.5.1-mysql_config.patch
2009/stable/desktop/toolkit/qt/qt/files/fedora/qt-x11-opensource-src-4.5.1-phonon.patch
- copied unchanged from r71344, 2009/devel/desktop/toolkit/qt/qt/files/fedora/qt-x11-opensource-src-4.5.1-phonon.patch
2009/stable/desktop/toolkit/qt/qt/files/hi128-app-qt4-logo.png
- copied unchanged from r71344, 2009/devel/desktop/toolkit/qt/qt/files/hi128-app-qt4-logo.png
2009/stable/desktop/toolkit/qt/qt/files/hi48-app-qt4-logo.png
- copied unchanged from r71344, 2009/devel/desktop/toolkit/qt/qt/files/hi48-app-qt4-logo.png
2009/stable/desktop/toolkit/qt/qt/files/phonon-gstreamer.svg
- copied unchanged from r71344, 2009/devel/desktop/toolkit/qt/qt/files/phonon-gstreamer.svg
2009/stable/desktop/toolkit/qt/qt/files/qtdemo.desktop
- copied unchanged from r71344, 2009/devel/desktop/toolkit/qt/qt/files/qtdemo.desktop
Removed:
2009/stable/desktop/toolkit/qt/qt/files/0234-fix-mysql-threaded.diff
2009/stable/desktop/toolkit/qt/qt/files/0273-odbc-64bit-compile.diff
2009/stable/desktop/toolkit/qt/qt/files/0279-svg-rendering-regression.diff
2009/stable/desktop/toolkit/qt/qt/files/0281-syncqt-create-phonon-global.diff
2009/stable/desktop/toolkit/qt/qt/files/0282-fix-qpixmapcache-leak.diff
2009/stable/desktop/toolkit/qt/qt/files/git-patches/327d94ce8054718d0ce157604594e470e90d6cb4.patch
2009/stable/desktop/toolkit/qt/qt/files/git-patches/5c5d5cf6f70155d0920d8727696785d8348d65fb.patch
Modified:
2009/stable/desktop/toolkit/qt/qt/ (props changed)
2009/stable/desktop/toolkit/qt/qt/actions.py
2009/stable/desktop/toolkit/qt/qt/files/0274-shm-native-image-fix.diff
2009/stable/desktop/toolkit/qt/qt/files/fedora/qt-x11-opensource-src-4.5.0-qdoc3.patch
2009/stable/desktop/toolkit/qt/qt/pspec.xml
Log:
Bump to latest bugfix release of Qt, change -g3 flag to -g to avoid WebKit crashes in various applications.
Modified: 2009/stable/desktop/toolkit/qt/qt/actions.py
=================================================================
--- 2009/stable/desktop/toolkit/qt/qt/actions.py (original)
+++ 2009/stable/desktop/toolkit/qt/qt/actions.py Tue Jun 30 15:10:08 2009
@@ -17,7 +17,7 @@
def setup():
vars = {"PARDUS_CC" : get.CC(),
"PARDUS_CXX": get.CXX(),
- "PARDUS_CFLAGS": get.CFLAGS(),
+ "PARDUS_CFLAGS": get.CFLAGS().replace("-g3", "-g"),
"PARDUS_LDFLAGS": get.LDFLAGS()}
for k, v in vars.items():
@@ -63,8 +63,8 @@
#Remove phonon, we use KDE's phonon but we have to build Qt with Phonon support for webkit and some other stuff
pisitools.remove("/usr/qt/4/lib/libphonon*")
- pisitools.remove("/usr/qt/4/lib/pkgconfig/phonon*")
pisitools.removeDir("/usr/qt/4/include/phonon")
+ pisitools.remove("/usr/qt/4/lib/pkgconfig/phonon*")
for app in ["qmake", "designer", "assistant", "linguist", "qtconfig", "uic", "rcc", "moc", "lrelease", "lupdate"]:
pisitools.dosym("/usr/qt/4/bin/%s" % app, "/usr/bin/%s-qt4" % app)
Modified: 2009/stable/desktop/toolkit/qt/qt/files/0274-shm-native-image-fix.diff
=================================================================
--- 2009/stable/desktop/toolkit/qt/qt/files/0274-shm-native-image-fix.diff (original)
+++ 2009/stable/desktop/toolkit/qt/qt/files/0274-shm-native-image-fix.diff Tue Jun 30 15:10:08 2009
@@ -15,15 +15,19 @@
===================================================================
--- src/gui/kernel/qapplication_x11.cpp (revision 934506)
+++ src/gui/kernel/qapplication_x11.cpp (working copy)
-@@ -1943,7 +1943,7 @@ void qt_init(QApplicationPrivate *priv,
- // to determine whether the display is local or not (not 100 % accurate)
+@@ -1955,9 +1955,9 @@
bool local = displayName.isEmpty() || displayName.lastIndexOf(QLatin1Char(':')) == 0;
- if (local && (qgetenv("QT_X11_NO_MITSHM").toInt() == 0))
-- X11->use_mitshm = mitshm_pixmaps;
-+ X11->use_mitshm = true;
+ if (local && (qgetenv("QT_X11_NO_MITSHM").toInt() == 0)) {
+ Visual *defaultVisual = DefaultVisual(X11->display, DefaultScreen(X11->display));
+- X11->use_mitshm = mitshm_pixmaps && (defaultVisual->red_mask == 0xff0000
+- && defaultVisual->green_mask == 0xff00
+- && defaultVisual->blue_mask == 0xff);
++ X11->use_mitshm = defaultVisual->red_mask == 0xff0000
++ && defaultVisual->green_mask == 0xff00
++ && defaultVisual->blue_mask == 0xff;
+ }
}
#endif // QT_NO_MITSHM
-
Index: src/gui/image/qnativeimage_p.h
===================================================================
--- src/gui/image/qnativeimage_p.h (revision 930645)
Modified: 2009/stable/desktop/toolkit/qt/qt/files/fedora/qt-x11-opensource-src-4.5.0-qdoc3.patch
=================================================================
--- 2009/stable/desktop/toolkit/qt/qt/files/fedora/qt-x11-opensource-src-4.5.0-qdoc3.patch (original)
+++ 2009/stable/desktop/toolkit/qt/qt/files/fedora/qt-x11-opensource-src-4.5.0-qdoc3.patch Tue Jun 30 15:10:08 2009
@@ -1,22 +1,21 @@
-diff -up qt-x11-opensource-src-4.5.0/tools/qdoc3/qdoc3.pro.qdoc3 qt-x11-opensource-src-4.5.0/tools/qdoc3/qdoc3.pro
---- qt-x11-opensource-src-4.5.0/tools/qdoc3/qdoc3.pro.qdoc3 2009-02-25 15:09:26.000000000 -0600
-+++ qt-x11-opensource-src-4.5.0/tools/qdoc3/qdoc3.pro 2009-03-04 09:30:05.000000000 -0600
-@@ -106,3 +106,7 @@ win32 {
- QT_WINCONFIG = debug
- }
- }
-+
+diff -ur qt-orig/tools/qdoc3/qdoc3.pro qt-4.5.2/tools/qdoc3/qdoc3.pro
+--- qt-orig/tools/qdoc3/qdoc3.pro 2009-06-20 06:57:59.000000000 +0200
++++ qt-4.5.2/tools/qdoc3/qdoc3.pro 2009-06-25 20:00:12.000000000 +0200
+@@ -99,3 +99,6 @@
+ webxmlgenerator.cpp \
+ yyindent.cpp
+
+TARGET= qdoc3
+target.path = $$[QT_INSTALL_BINS]
+INSTALLS += target
-diff -up qt-x11-opensource-src-4.5.0/tools/tools.pro.qdoc3 qt-x11-opensource-src-4.5.0/tools/tools.pro
---- qt-x11-opensource-src-4.5.0/tools/tools.pro.qdoc3 2009-02-25 15:09:27.000000000 -0600
-+++ qt-x11-opensource-src-4.5.0/tools/tools.pro 2009-03-04 09:44:18.000000000 -0600
-@@ -13,6 +13,7 @@ no-png {
+diff -ur qt-orig/tools/tools.pro qt-4.5.2/tools/tools.pro
+--- qt-orig/tools/tools.pro 2009-06-20 06:57:59.000000000 +0200
++++ qt-4.5.2/tools/tools.pro 2009-06-25 19:59:19.000000000 +0200
+@@ -13,6 +13,7 @@
SUBDIRS += designer
}
SUBDIRS += linguist
+ SUBDIRS += qdoc3
wince*: SUBDIRS = qtestlib designer
unix:!mac:!embedded:contains(QT_CONFIG, qt3support):SUBDIRS += qtconfig
- win32:!wince*:!contains(QT_EDITION, OpenSource|Console):SUBDIRS += activeqt
+ win32:!wince*:SUBDIRS += activeqt
Modified: 2009/stable/desktop/toolkit/qt/qt/pspec.xml
=================================================================
--- 2009/stable/desktop/toolkit/qt/qt/pspec.xml (original)
+++ 2009/stable/desktop/toolkit/qt/qt/pspec.xml Tue Jun 30 15:10:08 2009
@@ -13,9 +13,8 @@
<IsA>library</IsA>
<Summary>Qt toolkit version 4</Summary>
<Description>Qt is a cross platform GUI toolkit.</Description>
- <Archive sha1sum="8b045aac55c18ba95de7acf31171ab732aef856d" type="targz">ftp://ftp.trolltech.com/qt/source/qt-x11-opensource-src-4.5.1.tar.gz</Archive>
+ <Archive sha1sum="54b94d41adcabcedc7653de78657bcdd3cc0898c" type="targz">ftp://ftp.trolltech.com/qt/source/qt-x11-opensource-src-4.5.2.tar.gz</Archive>
<BuildDependencies>
- <Dependency>libmng</Dependency>
<Dependency>cups</Dependency>
<Dependency>mysql-lib</Dependency>
<Dependency>postgresql-server</Dependency>
@@ -23,12 +22,17 @@
<Dependency>firebird-superserver</Dependency>
<Dependency versionFrom="3.4.1">sqlite</Dependency>
<Dependency>unixODBC</Dependency>
- <Dependency>tiff</Dependency>
<Dependency>fontconfig</Dependency>
<Dependency>libXext</Dependency>
<Dependency>libXrandr</Dependency>
<Dependency>libXrender</Dependency>
<Dependency>mesa</Dependency>
+ <!-- Phonon build deps -->
+ <Dependency>gstreamer</Dependency>
+ <Dependency>gst-plugins-base</Dependency>
+ <Dependency>alsa-lib</Dependency>
+ <Dependency>automoc4</Dependency>
+ <Dependency>xine-lib</Dependency>
</BuildDependencies>
<Patches>
<!-- KDE qt-copy patches -->
@@ -38,30 +42,30 @@
<Patch>0214-fix-qgraphicsproxywidget-tab-crash.diff</Patch>
<Patch>0216-allow-isystem-for-headers.diff</Patch>
<Patch>0225-invalidate-tabbar-geometry-on-refresh.patch</Patch>
- <Patch>0234-fix-mysql-threaded.diff</Patch>
<Patch>0253-qmake_correct_path_separators.diff</Patch>
<Patch>0255-qtreeview-selection-columns-hidden.diff</Patch>
<Patch>0258-windowsxpstyle-qbrush.diff</Patch>
- <Patch>0273-odbc-64bit-compile.diff</Patch>
<Patch>0274-shm-native-image-fix.diff</Patch>
- <Patch>0279-svg-rendering-regression.diff</Patch>
<Patch>0280-deserialization-custom-dbus-properties.diff</Patch>
- <Patch>0281-syncqt-create-phonon-global.diff</Patch>
- <Patch>0282-fix-qpixmapcache-leak.diff</Patch>
<Patch>0283-do-not-deduce-scrollbar-extent-twice.diff</Patch>
+ <Patch>0285-qgv-dontshowchildren.diff</Patch>
<Patch level="1">uitools-sharedlib.patch</Patch>
<Patch level="1">no-hardcoded-font-aliases.patch</Patch>
<!-- Turkish Translations -->
<Patch compressionType="bz2">turkish.patch.bz2</Patch>
+
+ <!-- Fedora Patches -->
<Patch level="1">fedora/qt-x11-opensource-src-4.5.0-qdoc3.patch</Patch>
<Patch level="1">fedora/qt-x11-opensource-src-4.5.1-enable_ft_lcdfilter.patch</Patch>
+ <!-- install gstreamer backend to KDE dir -->
+ <Patch level="1">fedora/qt-x11-opensource-src-4.5.1-phonon.patch</Patch>
+ <Patch level="1">fedora/qt-x11-opensource-src-4.5.0-fix-qatomic-inline-asm.patch</Patch>
+ <!-- https://bugzilla.redhat.com/show_bug.cgi?id=440673 -->
+ <Patch level="1">fedora/qt-x11-opensource-src-4.5.1-mysql_config.patch</Patch>
<!-- Patches from git -->
- <!-- this one fixes a very painful crash when GTK+ style is selected as Widget style in systemsettings -->
- <Patch level="1">git-patches/327d94ce8054718d0ce157604594e470e90d6cb4.patch</Patch>
- <Patch level="1">git-patches/5c5d5cf6f70155d0920d8727696785d8348d65fb.patch</Patch>
<Patch level="1">git-patches/fa80385e0082fa9012ec08134a381e29b020c48f.patch</Patch>
<Patch level="1">mkspecs.patch</Patch>
@@ -71,9 +75,7 @@
<Package>
<Name>qt</Name>
<RuntimeDependencies>
- <Dependency>libmng</Dependency>
<Dependency>cups</Dependency>
- <Dependency>tiff</Dependency>
<Dependency>fontconfig</Dependency>
<Dependency>libXext</Dependency>
<Dependency>libXrandr</Dependency>
@@ -154,11 +156,16 @@
<Path fileType="executable">/usr/bin/qtdemo</Path>
<Path fileType="executable">/usr/qt/4/bin/qtdemo</Path>
<Path fileType="data">/usr/share/applications/assistant-qt4.desktop</Path>
+ <Path fileType="data">/usr/share/applications/qtdemo.desktop</Path>
<Path fileType="data">/usr/share/pixmaps/assistant-qt4.png</Path>
+ <Path fileType="data">/usr/share/icons</Path>
</Files>
<AdditionalFiles>
<AdditionalFile owner="root" permission="0644" target="/usr/share/applications/assistant-qt4.desktop">assistant.desktop</AdditionalFile>
<AdditionalFile owner="root" permission="0644" target="/usr/share/pixmaps/assistant-qt4.png">assistant.png</AdditionalFile>
+ <AdditionalFile owner="root" permission="0644" target="/usr/share/icons/hicolor/128x128/apps/qt4-logo.png">hi128-app-qt4-logo.png</AdditionalFile>
+ <AdditionalFile owner="root" permission="0644" target="/usr/share/icons/hicolor/48x48/apps/qt4-logo.png">hi48-app-qt4-logo.png</AdditionalFile>
+ <AdditionalFile owner="root" permission="0644" target="/usr/share/applications/qtdemo.desktop">qtdemo.desktop</AdditionalFile>
</AdditionalFiles>
</Package>
@@ -218,7 +225,51 @@
</Files>
</Package>
+ <!--
+ <Package>
+ <Name>phonon</Name>
+ <RuntimeDependencies>
+ <Dependency>qt</Dependency>
+ <Dependency>alsa-lib</Dependency>
+ </RuntimeDependencies>
+ <Files>
+ <Path fileType="data">/usr/share/dbus-1/interfaces/org.kde.Phonon.AudioOutput.xml</Path>
+ <Path fileType="data">/usr/lib/pkgconfig/phonon*</Path>
+ <Path fileType="data">/usr/qt/4/lib/pkgconfig/phonon*</Path>
+ <Path fileType="header">/usr/qt/4/include/Qt/phonon*</Path>
+ <Path fileType="header">/usr/qt/4/include/phonon</Path>
+ <Path fileType="library">/usr/qt/4/lib/libphonon*</Path>
+ </Files>
+ </Package>
+
+ <Package>
+ <Name>phonon-gstreamer</Name>
+ <RuntimeDependencies>
+ <Dependency>phonon</Dependency>
+ <Dependency>gstreamer</Dependency>
+ <Dependency>gst-plugins-base</Dependency>
+ <Dependency>gst-plugins-good</Dependency>
+ <Dependency>gst-ffmpeg</Dependency>
+ </RuntimeDependencies>
+ <Files>
+ <Path fileType="data">/usr/kde/4/share/kde4/services/phononbackends</Path>
+ <Path fileType="library">/usr/qt/4/plugins/phonon_backend</Path>
+ <Path fileType="data">/usr/share/icons/hicolor/*/*/*gstreamer*</Path>
+ </Files>
+ <AdditionalFiles>
+ <AdditionalFile owner="root" permission="0644" target="/usr/share/icons/hicolor/scalable/apps/phonon-gstreamer.svg">phonon-gstreamer.svg</AdditionalFile>
+ </AdditionalFiles>
+ </Package>
+ -->
+
<History>
+ <Update release="62">
+ <Date>2009-06-26</Date>
+ <Version>4.5.2</Version>
+ <Comment>Stable update</Comment>
+ <Name>Gökmen GÖKSEL</Name>
+ <Email>gokmen at pardus.org.tr</Email>
+ </Update>
<Update release="61">
<Date>2009-06-04</Date>
<Version>4.5.1</Version>
Paketler-commits mesaj listesiyle ilgili
daha fazla bilgi