rev 7346 - in trunk/packages/qt4-x11/debian: . desktop patches
Fathi Boudra
fboudra-guest at alioth.debian.org
Sat Oct 6 16:10:35 UTC 2007
Author: fboudra-guest
Date: 2007-10-06 16:10:34 +0000 (Sat, 06 Oct 2007)
New Revision: 7346
Added:
trunk/packages/qt4-x11/debian/desktop/assistant.png
trunk/packages/qt4-x11/debian/desktop/designer.png
trunk/packages/qt4-x11/debian/desktop/linguist.png
trunk/packages/qt4-x11/debian/desktop/qtconfig.png
trunk/packages/qt4-x11/debian/patches/0188-fix-moc-parser-same-name-header.diff
trunk/packages/qt4-x11/debian/patches/0189-fix-q3toolbar-qcombobox-signal-slot.diff
trunk/packages/qt4-x11/debian/patches/0191-listview-alternate-row-colors.diff
trunk/packages/qt4-x11/debian/patches/0192-itemdelegate-palette-state.diff
trunk/packages/qt4-x11/debian/patches/0193-qtreeview-division-by-zero.diff
trunk/packages/qt4-x11/debian/patches/0194-fix-moveonly-dnd-in-itemviews.diff
trunk/packages/qt4-x11/debian/patches/0195-compositing-properties.diff
trunk/packages/qt4-x11/debian/patches/90_qmake_cxxflags_fpermissive.diff
Removed:
trunk/packages/qt4-x11/debian/patches/0172-prefer-xrandr-over-xinerama.diff
trunk/packages/qt4-x11/debian/patches/0181-qdnd-x11-fix.diff
trunk/packages/qt4-x11/debian/patches/0182-argb-visuals-default.diff
trunk/packages/qt4-x11/debian/patches/0186-fix-component-alpha-text.diff
Modified:
trunk/packages/qt4-x11/debian/changelog
trunk/packages/qt4-x11/debian/control
trunk/packages/qt4-x11/debian/copyright
trunk/packages/qt4-x11/debian/desktop/assistant-qt4.desktop
trunk/packages/qt4-x11/debian/desktop/designer-qt4.desktop
trunk/packages/qt4-x11/debian/desktop/linguist-qt4.desktop
trunk/packages/qt4-x11/debian/desktop/qt4config.desktop
trunk/packages/qt4-x11/debian/patches/0163-fix-gcc43-support.diff
trunk/packages/qt4-x11/debian/patches/0167-fix-group-reading.diff
trunk/packages/qt4-x11/debian/patches/0175-fix-s390-qatomic.diff
trunk/packages/qt4-x11/debian/patches/0176-coverity-fixes.diff
trunk/packages/qt4-x11/debian/patches/0178-transparency-window-types.diff
trunk/packages/qt4-x11/debian/patches/0179-transient-hack.diff
trunk/packages/qt4-x11/debian/patches/0180-window-role.diff
trunk/packages/qt4-x11/debian/patches/0185-fix-format-strings.diff
trunk/packages/qt4-x11/debian/patches/0187-fix-font-fixed-pitch.diff
trunk/packages/qt4-x11/debian/patches/01_qmake_for_debian.diff
trunk/packages/qt4-x11/debian/patches/02_launch_assistant-qt4.diff
trunk/packages/qt4-x11/debian/patches/03_launch_moc-qt4.diff
trunk/packages/qt4-x11/debian/patches/04_launch_uic-qt4.diff
trunk/packages/qt4-x11/debian/patches/05_append_qt4_target.diff
trunk/packages/qt4-x11/debian/patches/06_qtdemo_destdir.diff
trunk/packages/qt4-x11/debian/patches/20_mips_atomic_ops.diff
trunk/packages/qt4-x11/debian/patches/30_arm_ftbfs_fixes.diff
trunk/packages/qt4-x11/debian/patches/31_arm_eabi_fix.diff
trunk/packages/qt4-x11/debian/patches/40_alpha_ice.diff
trunk/packages/qt4-x11/debian/patches/41_disable_opengl_visibility.diff
trunk/packages/qt4-x11/debian/patches/50_kfreebsd_build_fix.diff
trunk/packages/qt4-x11/debian/patches/60_m68k_inotify_fix.diff
trunk/packages/qt4-x11/debian/patches/70_hppa_ldcw_fix.diff
trunk/packages/qt4-x11/debian/patches/80_hurd_max_path.diff
trunk/packages/qt4-x11/debian/patches/series
trunk/packages/qt4-x11/debian/qt4-qtconfig.menu
trunk/packages/qt4-x11/debian/rules
Log:
* Update desktop files categories.
* Add desktop files icons. (Closes: #433581)
* Update patches to Qt4.3.2.
* Add 90_qmake_cxxflags_fpermissive patch.
* Remove 0186-fix-component-alpha-text patch. Merged upstream.
* Add qt-copy patches:
* 0188-fix-moc-parser-same-name-header
* 0189-fix-q3toolbar-qcombobox-signal-slot
* 0191-listview-alternate-row-colors
* 0192-itemdelegate-palette-state
* 0193-qtreeview-division-by-zero
* 0194-fix-moveonly-dnd-in-itemviews
* 0195-compositing-properties
* Update qt4-dev-tools long description.
* Update copyright:
* Update Trolltech GPL exception to v1.1.
* Add Trolltech GPL exception addenum.
* Update rules:
* Build with -fpermissive.
* Introduce QTVERSION.
* Fix qt4-config menu section. (Closes: 444896)
Modified: trunk/packages/qt4-x11/debian/changelog
===================================================================
--- trunk/packages/qt4-x11/debian/changelog 2007-10-05 11:29:07 UTC (rev 7345)
+++ trunk/packages/qt4-x11/debian/changelog 2007-10-06 16:10:34 UTC (rev 7346)
@@ -1,3 +1,32 @@
+qt4-x11 (4.3.2-1) unstable; urgency=low
+
+ * New upstream release.
+
+ [Fathi Boudra]
+ * Update desktop files categories.
+ * Add desktop files icons. (Closes: #433581)
+ * Update patches to Qt4.3.2.
+ * Add 90_qmake_cxxflags_fpermissive patch.
+ * Remove 0186-fix-component-alpha-text patch. Merged upstream.
+ * Add qt-copy patches:
+ * 0188-fix-moc-parser-same-name-header
+ * 0189-fix-q3toolbar-qcombobox-signal-slot
+ * 0191-listview-alternate-row-colors
+ * 0192-itemdelegate-palette-state
+ * 0193-qtreeview-division-by-zero
+ * 0194-fix-moveonly-dnd-in-itemviews
+ * 0195-compositing-properties
+ * Update qt4-dev-tools long description.
+ * Update copyright:
+ * Update Trolltech GPL exception to v1.1.
+ * Add Trolltech GPL exception addenum.
+ * Update rules:
+ * Build with -fpermissive.
+ * Introduce QTVERSION.
+ * Fix qt4-config menu section. (Closes: 444896)
+
+ -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org> Sat, 06 Oct 2007 07:00:54 +0200
+
qt4-x11 (4.3.1-2) unstable; urgency=low
* There is a large difference between 8 spaces and a tab.
Modified: trunk/packages/qt4-x11/debian/control
===================================================================
--- trunk/packages/qt4-x11/debian/control 2007-10-05 11:29:07 UTC (rev 7345)
+++ trunk/packages/qt4-x11/debian/control 2007-10-06 16:10:34 UTC (rev 7346)
@@ -119,7 +119,7 @@
is its rich set of widgets that provide standard GUI functionality.
.
This packages contains tools used to assist in Qt 4 development,
- including the Qt Assistant and Linguist applications.
+ including the Qt Assistant, Linguist, DBus Viewer and Pixel Tool applications.
.
Homepage: http://www.trolltech.com
Modified: trunk/packages/qt4-x11/debian/copyright
===================================================================
--- trunk/packages/qt4-x11/debian/copyright 2007-10-05 11:29:07 UTC (rev 7345)
+++ trunk/packages/qt4-x11/debian/copyright 2007-10-06 16:10:34 UTC (rev 7346)
@@ -3,10 +3,16 @@
It was downloaded from ftp://ftp.trolltech.com/qt/source
-Upstream Author: Trolltech AS
+Upstream Author:
-Copyright (C) 1994-2004 Trolltech AS.
+ Trolltech AS
+Copyright:
+
+ (C) 1994-2007 Trolltech AS.
+
+License:
+
This package is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License version 2 as
published by the Free Software Foundation.
@@ -24,92 +30,343 @@
On Debian systems, the complete text of the GNU General Public License
can be found in `/usr/share/common-licenses/GPL'.
-Since Qt4.3.1, a Trolltech GPL exception was added:
+Since Qt4.3.1, a Trolltech GPL exception was added to allow linking
+against non-GPL libraries and applications:
- Trolltech GPL Exception version 1.0
- ===================================
+Trolltech GPL Exception version 1.1
+===================================
- Additional rights granted beyond the GPL (the "Exception").
+Additional rights granted beyond the GPL (the "Exception").
- As a special exception to the terms and conditions of version 2.0 of the
-GPL, Trolltech hereby grants you the rights described below, provided you agree
-to the terms and conditions in this Exception, including its obligations and
+As a special exception to the terms and conditions of version 2.0 of the GPL,
+Trolltech hereby grants you the rights described below, provided you agree to
+the terms and conditions in this Exception, including its obligations and
restrictions on use.
- Nothing in this Exception gives you or anyone else the right to change
-the licensing terms of the Qt Open Source Edition.
+Nothing in this Exception gives you or anyone else the right to change the
+licensing terms of the Qt Open Source Edition.
- Below, "Licensed Software" shall refer to the software licensed under
-the GPL and this exception.
+Below, "Licensed Software" shall refer to the software licensed under the GPL
+and this exception.
- 1) The right to use Open Source Licenses not compatible with the GNU
- General Public License: You may link software (hereafter referred to as
-"Your Software") against the Licensed Software and/or distribute binaries of
-Your Software linked against the Licensed Software, provided that:
+1) The right to use Open Source Licenses not compatible with the GNU
+General Public License: You may link software (hereafter referred to as "Your
+Software") against the Licensed Software and/or distribute binaries of Your
+Software linked against the Licensed Software, provided that:
- A) Your Software is licensed under one of the following licenses:
+A) Your Software is licensed under one of the following licenses:
- License name Version(s)/Copyright Date
- Academic Free License 2.0 or 2.1
- Apache Software License 1.0 or 1.1
- Apache License 2.0
- Apple Public Source License 2.0
- Artistic license From Perl 5.8.0
- BSD license "July 22 1999"
- Common Public License 1.0
- GNU Library or "Lesser"
- General Public License (LGPL) 2.0 or 2.1
- Jabber Open Source License 1.0
- MIT License (as set forth in the addendum file)
- Mozilla Public License (MPL) 1.0 or 1.1
- Open Software License 2.0
- OpenSSL license (with original
- SSLeay license) "2003" ("1998")
- PHP License 3.0
- Python license (CNRI Python License) (as set forth in the addendum file)
- Python Software Foundation License 2.1.1
- Q Public License v1.0
- Sleepycat License "1999"
- W3C License "2001"
- X11 License X11R6.6
- Zlib/libpng License (as set forth in the addendum file)
- Zope Public License 2.0
+License name Version(s)/Copyright Date
+Academic Free License 2.0, 2.1, 3.0
+Apache Software License 1.0 or 1.1
+Apache License 2.0
+Apple Public Source License 2.0
+Artistic license From Perl 5.8.0
+BSD license "July 22 1999"
+Common Public License 1.0
+Eclipse Public License 1.0
+GNU Library or "Lesser"
+General Public License (LGPL) 2.0 or 2.1
+Jabber Open Source License 1.0
+MIT License (as set forth in the addendum file)
+Mozilla Public License (MPL) 1.0 or 1.1
+Open Software License 2.0, 3.0
+OpenSSL license (with original
+SSLeay license) "2003" ("1998")
+PHP License 3.0
+Python license (CNRI Python License) (as set forth in the addendum file)
+Python Software Foundation License 2.1.1
+Q Public License v1.0
+Sleepycat License "1999"
+W3C License "2001"
+X11 License X11R6.6
+Zlib/libpng License (as set forth in the addendum file)
+Zope Public License 2.0, 2.1
- (Licenses without a specific version number or date are reproduced
- in the file GPL_EXCEPTION_ADDENDUM.TXT in your source package).
+(Licenses without a specific version number or date are reproduced
+in the file GPL_Exception_Addendum.txt in your source package).
- and
+and
- B) You must, on request, make a complete package including
- the complete source code of Your Software (as defined
- in the GNU General Public License version 2, section 3,
- but excluding anything excluded by the special
- exception in the same section) available to Trolltech
- under the same license as that granted to other
- recipients of the source code of Your Software.
+B) You must, on request, make a complete package including
+ the complete source code of Your Software (as defined
+ in the GNU General Public License version 2, section 3,
+ but excluding anything excluded by the special
+ exception in the same section) available to Trolltech
+ under the same license as that granted to other
+ recipients of the source code of Your Software.
- and
+and
- C) Your or any other contributor's rights to:
+C) Your or any other contributor's rights to:
- i) distribute the source code of Your Software to anyone for
- any purpose;
+ i) distribute the source code of Your Software to anyone for
+ any purpose;
- and
+ and
- ii) publicly discuss the development project for Your
- Software and its goals in any form and in any forum
+ ii) publicly discuss the development project for Your
+ Software and its goals in any form and in any forum
- are not prohibited by any legal instrument, including but not limited to
+are not prohibited by any legal instrument, including but not limited to
contracts, non-disclosure agreements, and employee contracts.
- 2) The right to link non-Open Source applications with pre-installed
-versions of the Licensed Software: You may link applications with binary
-pre-installed versions of the Licensed Software, provided that such applications
-have been developed and are deployed in ac cordance with the terms and
-conditions of the Qt Commercial License Agreement.
+2) The right to link non-Open Source applications with pre-installed versions of
+the Licensed Software: You may link applications with binary pre-installed
+versions of the Licensed Software, provided that such applications have been
+developed and are deployed in ac cordance with the terms and conditions of the
+Qt Commercial License Agreement.
+Addendum to the Trolltech GPL Exception version 1.0
+===================================================
+
+
+--------------------------------------------------------------------------
+
+ The "Artistic License"
+
+ Preamble
+
+The intent of this document is to state the conditions under which a
+Package may be copied, such that the Copyright Holder maintains some
+semblance of artistic control over the development of the package,
+while giving the users of the package the right to use and distribute
+the Package in a more-or-less customary fashion, plus the right to make
+reasonable modifications.
+
+Definitions:
+
+ "Package" refers to the collection of files distributed by the
+ Copyright Holder, and derivatives of that collection of files
+ created through textual modification.
+
+ "Standard Version" refers to such a Package if it has not been
+ modified, or has been modified in accordance with the wishes
+ of the Copyright Holder as specified below.
+
+ "Copyright Holder" is whoever is named in the copyright or
+ copyrights for the package.
+
+ "You" is you, if you're thinking about copying or distributing
+ this Package.
+
+ "Reasonable copying fee" is whatever you can justify on the
+ basis of media cost, duplication charges, time of people involved,
+ and so on. (You will not be required to justify it to the
+ Copyright Holder, but only to the computing community at large
+ as a market that must bear the fee.)
+
+ "Freely Available" means that no fee is charged for the item
+ itself, though there may be fees involved in handling the item.
+ It also means that recipients of the item may redistribute it
+ under the same conditions they received it.
+
+1. You may make and give away verbatim copies of the source form of the
+Standard Version of this Package without restriction, provided that you
+duplicate all of the original copyright notices and associated disclaimers.
+
+2. You may apply bug fixes, portability fixes and other modifications
+derived from the Public Domain or from the Copyright Holder. A Package
+modified in such a way shall still be considered the Standard Version.
+
+3. You may otherwise modify your copy of this Package in any way, provided
+that you insert a prominent notice in each changed file stating how and
+when you changed that file, and provided that you do at least ONE of the
+following:
+
+a) place your modifications in the Public Domain or otherwise make them
+Freely Available, such as by posting said modifications to Usenet or
+an equivalent medium, or placing the modifications on a major archive
+site such as uunet.uu.net, or by allowing the Copyright Holder to include
+your modifications in the Standard Version of the Package.
+
+b) use the modified Package only within your corporation or organization.
+
+c) rename any non-standard executables so the names do not conflict
+with standard executables, which must also be provided, and provide
+a separate manual page for each non-standard executable that clearly
+documents how it differs from the Standard Version.
+
+d) make other distribution arrangements with the Copyright Holder.
+
+4. You may distribute the programs of this Package in object code or
+executable form, provided that you do at least ONE of the following:
+
+a) distribute a Standard Version of the executables and library files,
+together with instructions (in the manual page or equivalent) on where
+to get the Standard Version.
+
+b) accompany the distribution with the machine-readable source of
+the Package with your modifications.
+
+c) give non-standard executables non-standard names, and clearly
+document the differences in manual pages (or equivalent), together
+with instructions on where to get the Standard Version.
+
+d) make other distribution arrangements with the Copyright Holder.
+
+5. You may charge a reasonable copying fee for any distribution of this
+Package. You may charge any fee you choose for support of this
+Package. You may not charge a fee for this Package itself. However,
+you may distribute this Package in aggregate with other (possibly
+commercial) programs as part of a larger (possibly commercial) software
+distribution provided that you do not advertise this Package as a
+product of your own. You may embed this Package's interpreter within
+an executable of yours (by linking); this shall be construed as a mere
+form of aggregation, provided that the complete Standard Version of the
+interpreter is so embedded.
+
+6. The scripts and library files supplied as input to or produced as
+output from the programs of this Package do not automatically fall
+under the copyright of this Package, but belong to whoever generated
+them, and may be sold commercially, and may be aggregated with this
+Package. If such scripts or library files are aggregated with this
+Package via the so-called "undump" or "unexec" methods of producing a
+binary executable image, then distribution of such an image shall
+neither be construed as a distribution of this Package nor shall it
+fall under the restrictions of Paragraphs 3 and 4, provided that you do
+not represent such an executable image as a Standard Version of this
+Package.
+
+7. C subroutines (or comparably compiled subroutines in other
+languages) supplied by you and linked into this Package in order to
+emulate subroutines and variables of the language defined by this
+Package shall not be considered part of this Package, but are the
+equivalent of input as in Paragraph 6, provided these subroutines do
+not change the language in any way that would cause it to fail the
+regression tests for the language.
+
+8. Aggregation of this Package with a commercial distribution is always
+permitted provided that the use of this Package is embedded; that is,
+when no overt attempt is made to make this Package's interfaces visible
+to the end user of the commercial distribution. Such use shall not be
+construed as a distribution of this Package.
+
+9. The name of the Copyright Holder may not be used to endorse or promote
+products derived from this software without specific prior written permission.
+
+10. THIS PACKAGE IS PROVIDED "AS IS" AND WITHOUT ANY EXPRESS OR
+IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
+WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
+
+ The End
+
+--------------------------------------------------------------------------
+
+MIT License
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of
+this software and associated documentation files (the "Software"), to deal in
+the Software without restriction, including without limitation the rights to
+use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
+the Software, and to permit persons to whom the Software is furnished to do so,
+subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
+FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
+COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
+IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+--------------------------------------------------------------------------
+
+Python License (CNRI Python License)
+
+CNRI OPEN SOURCE LICENSE AGREEMENT
+
+IMPORTANT: PLEASE READ THE FOLLOWING AGREEMENT CAREFULLY.
+
+BY CLICKING ON "ACCEPT" WHERE INDICATED BELOW, OR BY COPYING, INSTALLING OR
+OTHERWISE USING PYTHON 1.6, beta 1 SOFTWARE, YOU ARE DEEMED TO HAVE AGREED TO
+THE TERMS AND CONDITIONS OF THIS LICENSE AGREEMENT.
+
+1. This LICENSE AGREEMENT is between the Corporation for National Research
+Initiatives, having an office at 1895 Preston White Drive, Reston, VA 20191
+("CNRI"), and the Individual or Organization ("Licensee") accessing and
+otherwise using Python 1.6, beta 1 software in source or binary form and its
+associated documentation, as released at the www.python.org Internet site on
+August 4, 2000 ("Python 1.6b1").
+
+2. Subject to the terms and conditions of this License Agreement, CNRI hereby
+grants Licensee a non-exclusive, royalty-free, world-wide license to reproduce,
+analyze, test, perform and/or display publicly, prepare derivative works,
+distribute, and otherwise use Python 1.6b1 alone or in any derivative version,
+provided, however, that CNRIs License Agreement is retained in Python 1.6b1,
+alone or in any derivative version prepared by Licensee.
+
+Alternately, in lieu of CNRIs License Agreement, Licensee may substitute the
+following text (omitting the quotes): "Python 1.6, beta 1, is made available
+subject to the terms and conditions in CNRIs License Agreement. This Agreement
+may be located on the Internet using the following unique, persistent identifier
+(known as a handle): 1895.22/1011. This Agreement may also be obtained from a
+proxy server on the Internet using the URL:http://hdl.handle.net/1895.22/1011".
+
+3. In the event Licensee prepares a derivative work that is based on or
+incorporates Python 1.6b1or any part thereof, and wants to make the derivative
+work available to the public as provided herein, then Licensee hereby agrees to
+indicate in any such work the nature of the modifications made to Python 1.6b1.
+
+4. CNRI is making Python 1.6b1 available to Licensee on an "AS IS" basis. CNRI
+MAKES NO REPRESENTATIONS OR WARRANTIES, EXPRESS OR IMPLIED. BY WAY OF EXAMPLE,
+BUT NOT LIMITATION, CNRI MAKES NO AND DISCLAIMS ANY REPRESENTATION OR WARRANTY
+OF MERCHANTABILITY OR FITNESS FOR ANY PARTICULAR PURPOSE OR THAT THE USE OF
+PYTHON 1.6b1WILL NOT INFRINGE ANY THIRD PARTY RIGHTS.
+
+5. CNRI SHALL NOT BE LIABLE TO LICENSEE OR ANY OTHER USERS OF THE SOFTWARE FOR
+ANY INCIDENTAL, SPECIAL, OR CONSEQUENTIAL DAMAGES OR LOSS AS A RESULT OF USING,
+MODIFYING OR DISTRIBUTING PYTHON 1.6b1, OR ANY DERIVATIVE THEREOF, EVEN IF
+ADVISED OF THE POSSIBILITY THEREOF.
+
+6. This License Agreement will automatically terminate upon a material breach of
+its terms and conditions.
+
+7. This License Agreement shall be governed by and interpreted in all respects
+by the law of the State of Virginia, excluding conflict of law provisions.
+Nothing in this License Agreement shall be deemed to create any relationship of
+agency, partnership, or joint venture between CNRI and Licensee. This License
+Agreement does not grant permission to use CNRI trademarks or trade name in a
+trademark sense to endorse or promote products or services of Licensee, or any
+third party.
+
+8. By clicking on the "ACCEPT" button where indicated, or by copying, installing
+or otherwise using Python 1.6b1, Licensee agrees to be bound by the terms and
+conditions of this License Agreement.
+
+
+
+ACCEPT
+
+--------------------------------------------------------------------------
+
+The zlib/libpng License
+
+Copyright (c) <year> <copyright holders>
+
+This software is provided 'as-is', without any express or implied warranty. In
+no event will the authors be held liable for any damages arising from the use of
+this software.
+
+Permission is granted to anyone to use this software for any purpose, including
+commercial applications, and to alter it and redistribute it freely, subject to
+the following restrictions:
+
+1. The origin of this software must not be misrepresented; you must not claim
+that you wrote the original software. If you use this software in a product, an
+acknowledgment in the product documentation would be appreciated but is not
+required.
+
+2. Altered source versions must be plainly marked as such, and must not be
+misrepresented as being the original software.
+
+3. This notice may not be removed or altered from any source distribution.
+
+--------------------------------------------------------------------------
+
Modified: trunk/packages/qt4-x11/debian/desktop/assistant-qt4.desktop
===================================================================
--- trunk/packages/qt4-x11/debian/desktop/assistant-qt4.desktop 2007-10-05 11:29:07 UTC (rev 7345)
+++ trunk/packages/qt4-x11/debian/desktop/assistant-qt4.desktop 2007-10-06 16:10:34 UTC (rev 7346)
@@ -1,5 +1,5 @@
[Desktop Entry]
-Categories=Qt;Development;Documentation;Qt;
+Categories=Qt;Development;Documentation;
Encoding=UTF-8
Exec=/usr/bin/assistant-qt4
Name=Qt 4 Assistant
Added: trunk/packages/qt4-x11/debian/desktop/assistant.png
===================================================================
(Binary files differ)
Property changes on: trunk/packages/qt4-x11/debian/desktop/assistant.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Modified: trunk/packages/qt4-x11/debian/desktop/designer-qt4.desktop
===================================================================
--- trunk/packages/qt4-x11/debian/desktop/designer-qt4.desktop 2007-10-05 11:29:07 UTC (rev 7345)
+++ trunk/packages/qt4-x11/debian/desktop/designer-qt4.desktop 2007-10-06 16:10:34 UTC (rev 7346)
@@ -1,5 +1,5 @@
[Desktop Entry]
-Categories=Qt;Development;GUIDesigner;Qt;
+Categories=Qt;Development;GUIDesigner;
Encoding=UTF-8
Exec=/usr/bin/designer-qt4
Name=Qt 4 Designer
Added: trunk/packages/qt4-x11/debian/desktop/designer.png
===================================================================
(Binary files differ)
Property changes on: trunk/packages/qt4-x11/debian/desktop/designer.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Modified: trunk/packages/qt4-x11/debian/desktop/linguist-qt4.desktop
===================================================================
--- trunk/packages/qt4-x11/debian/desktop/linguist-qt4.desktop 2007-10-05 11:29:07 UTC (rev 7345)
+++ trunk/packages/qt4-x11/debian/desktop/linguist-qt4.desktop 2007-10-06 16:10:34 UTC (rev 7346)
@@ -1,5 +1,5 @@
[Desktop Entry]
-Categories=Qt;Development;Translation;Qt;
+Categories=Qt;Development;Translation;
Encoding=UTF-8
Exec=/usr/bin/linguist-qt4
Name=Qt 4 Linguist
Added: trunk/packages/qt4-x11/debian/desktop/linguist.png
===================================================================
(Binary files differ)
Property changes on: trunk/packages/qt4-x11/debian/desktop/linguist.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Modified: trunk/packages/qt4-x11/debian/desktop/qt4config.desktop
===================================================================
--- trunk/packages/qt4-x11/debian/desktop/qt4config.desktop 2007-10-05 11:29:07 UTC (rev 7345)
+++ trunk/packages/qt4-x11/debian/desktop/qt4config.desktop 2007-10-06 16:10:34 UTC (rev 7346)
@@ -1,10 +1,10 @@
[Desktop Entry]
-Categories=Qt;Settings;Qt;Utility;DesktopSettings;
+Categories=Qt;Settings;
Encoding=UTF-8
Exec=/usr/bin/qtconfig-qt4
Name=Qt 4 Settings
X-KDE-StartupNotify=true
-Icon=designer
+Icon=qtconfig
Terminal=false
Type=Application
Added: trunk/packages/qt4-x11/debian/desktop/qtconfig.png
===================================================================
(Binary files differ)
Property changes on: trunk/packages/qt4-x11/debian/desktop/qtconfig.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Modified: trunk/packages/qt4-x11/debian/patches/0163-fix-gcc43-support.diff
===================================================================
--- trunk/packages/qt4-x11/debian/patches/0163-fix-gcc43-support.diff 2007-10-05 11:29:07 UTC (rev 7345)
+++ trunk/packages/qt4-x11/debian/patches/0163-fix-gcc43-support.diff 2007-10-06 16:10:34 UTC (rev 7346)
@@ -1,13 +1,13 @@
-qt-bugs@ issue : none
-Trolltech task ID : N154723
+qt-bugs@ issue : N154723
+Trolltech task ID : none
bugs.kde.org number : None
applied: no
author: Dirk Mueller <mueller at kde.org>
various fixes to get Qt 4.3 without hundreds of warnings compiling
---- qt4-x11-4.3.1.orig/config.tests/unix/endian.test
-+++ qt4-x11-4.3.1/config.tests/unix/endian.test
+--- qt4-x11-4.3.2.orig/config.tests/unix/endian.test
++++ qt4-x11-4.3.2/config.tests/unix/endian.test
@@ -30,6 +30,7 @@
[ "$VERBOSE" = "yes" ] && echo " Found 'MostSignificantByteFirst' in binary"
ENDIAN="BIG"
@@ -16,8 +16,8 @@
# done
if [ "$ENDIAN" = "LITTLE" ]; then
---- qt4-x11-4.3.1.orig/config.tests/x11/glib/glib.cpp
-+++ qt4-x11-4.3.1/config.tests/x11/glib/glib.cpp
+--- qt4-x11-4.3.2.orig/config.tests/unix/glib/glib.cpp
++++ qt4-x11-4.3.2/config.tests/unix/glib/glib.cpp
@@ -6,7 +6,7 @@
{
GMainContext *context;
@@ -27,8 +27,8 @@
if (!g_thread_supported())
g_thread_init(NULL);
context = g_main_context_default();
---- qt4-x11-4.3.1.orig/src/corelib/codecs/qtextcodec.cpp
-+++ qt4-x11-4.3.1/src/corelib/codecs/qtextcodec.cpp
+--- qt4-x11-4.3.2.orig/src/corelib/codecs/qtextcodec.cpp
++++ qt4-x11-4.3.2/src/corelib/codecs/qtextcodec.cpp
@@ -432,7 +432,7 @@
localeMapper = checkForCodec(lang);
@@ -38,9 +38,9 @@
localeMapper = checkForCodec("ISO 8859-15");
// 6. guess locale from ctype unless ctype is "C"
---- qt4-x11-4.3.1.orig/src/corelib/io/qtextstream.cpp
-+++ qt4-x11-4.3.1/src/corelib/io/qtextstream.cpp
-@@ -556,8 +556,8 @@
+--- qt4-x11-4.3.2.orig/src/corelib/io/qtextstream.cpp
++++ qt4-x11-4.3.2/src/corelib/io/qtextstream.cpp
+@@ -553,8 +553,8 @@
if (!codec || autoDetectUnicode) {
autoDetectUnicode = false;
@@ -51,9 +51,9 @@
codec = QTextCodec::codecForName("UTF-16");
} else if (!codec) {
codec = QTextCodec::codecForLocale();
---- qt4-x11-4.3.1.orig/src/corelib/io/qurl.cpp
-+++ qt4-x11-4.3.1/src/corelib/io/qurl.cpp
-@@ -4740,9 +4740,9 @@
+--- qt4-x11-4.3.2.orig/src/corelib/io/qurl.cpp
++++ qt4-x11-4.3.2/src/corelib/io/qurl.cpp
+@@ -4741,9 +4741,9 @@
if (include.isEmpty()) {
for (int i = 0; i < len; ++i) {
unsigned char c = *inputData++;
@@ -66,7 +66,7 @@
|| c == 0x2D // -
|| c == 0x2E // .
|| c == 0x5F // _
-@@ -4759,9 +4759,9 @@
+@@ -4760,9 +4760,9 @@
const char * alsoEncode = include.constData();
for (int i = 0; i < len; ++i) {
unsigned char c = *inputData++;
@@ -79,8 +79,8 @@
|| c == 0x2D // -
|| c == 0x2E // .
|| c == 0x5F // _
---- qt4-x11-4.3.1.orig/src/corelib/tools/qlocale.cpp
-+++ qt4-x11-4.3.1/src/corelib/tools/qlocale.cpp
+--- qt4-x11-4.3.2.orig/src/corelib/tools/qlocale.cpp
++++ qt4-x11-4.3.2/src/corelib/tools/qlocale.cpp
@@ -2609,8 +2609,8 @@
QChar c1 = format.at(i);
@@ -92,8 +92,8 @@
return true;
++i;
---- qt4-x11-4.3.1.orig/src/gui/kernel/qapplication.cpp
-+++ qt4-x11-4.3.1/src/gui/kernel/qapplication.cpp
+--- qt4-x11-4.3.2.orig/src/gui/kernel/qapplication.cpp
++++ qt4-x11-4.3.2/src/gui/kernel/qapplication.cpp
@@ -2036,11 +2036,11 @@
#ifndef QT_NO_TRANSLATION
static bool qt_detectRTLLanguage()
@@ -108,8 +108,8 @@
}
#endif
---- qt4-x11-4.3.1.orig/src/gui/kernel/qkeymapper_x11.cpp
-+++ qt4-x11-4.3.1/src/gui/kernel/qkeymapper_x11.cpp
+--- qt4-x11-4.3.2.orig/src/gui/kernel/qkeymapper_x11.cpp
++++ qt4-x11-4.3.2/src/gui/kernel/qkeymapper_x11.cpp
@@ -1330,8 +1330,8 @@
}
@@ -121,9 +121,9 @@
directionKeyEvent = Qt::Key_Direction_L;
} else if (keysym == XK_Shift_R && directionKeyEvent == XK_Control_R ||
keysym == XK_Control_R && directionKeyEvent == XK_Shift_R) {
---- qt4-x11-4.3.1.orig/src/gui/kernel/qwidget.cpp
-+++ qt4-x11-4.3.1/src/gui/kernel/qwidget.cpp
-@@ -1830,7 +1830,7 @@
+--- qt4-x11-4.3.2.orig/src/gui/kernel/qwidget.cpp
++++ qt4-x11-4.3.2/src/gui/kernel/qwidget.cpp
+@@ -1872,7 +1872,7 @@
for (int i = 0; i < pd->children.size(); ++i) {
QWidget *w = qobject_cast<QWidget *>(pd->children.at(i));
@@ -132,7 +132,7 @@
if (w!=q) {
w->create();
} else {
-@@ -1840,6 +1840,7 @@
+@@ -1882,6 +1882,7 @@
if (winid)
w->raise();
}
@@ -140,8 +140,8 @@
}
} else {
q->create();
---- qt4-x11-4.3.1.orig/src/gui/painting/qregion_unix.cpp
-+++ qt4-x11-4.3.1/src/gui/painting/qregion_unix.cpp
+--- qt4-x11-4.3.2.orig/src/gui/painting/qregion_unix.cpp
++++ qt4-x11-4.3.2/src/gui/painting/qregion_unix.cpp
@@ -1944,7 +1944,7 @@
else
--isInside;
@@ -151,8 +151,8 @@
pWETE->nextWETE = AET;
pWETE = AET;
inside = !inside;
---- qt4-x11-4.3.1.orig/src/tools/uic/driver.cpp
-+++ qt4-x11-4.3.1/src/tools/uic/driver.cpp
+--- qt4-x11-4.3.2.orig/src/tools/uic/driver.cpp
++++ qt4-x11-4.3.2/src/tools/uic/driver.cpp
@@ -175,7 +175,7 @@
static bool isAnsiCCharacter(const QChar& c)
Modified: trunk/packages/qt4-x11/debian/patches/0167-fix-group-reading.diff
===================================================================
--- trunk/packages/qt4-x11/debian/patches/0167-fix-group-reading.diff 2007-10-05 11:29:07 UTC (rev 7345)
+++ trunk/packages/qt4-x11/debian/patches/0167-fix-group-reading.diff 2007-10-06 16:10:34 UTC (rev 7346)
@@ -7,8 +7,8 @@
in big user environments, getgrgid_r() needs more memory than sysconf() returns.
Try a bit harder.
---- qt4-x11-4.3.1.orig/src/corelib/io/qfsfileengine_unix.cpp
-+++ qt4-x11-4.3.1/src/corelib/io/qfsfileengine_unix.cpp
+--- qt4-x11-4.3.2.orig/src/corelib/io/qfsfileengine_unix.cpp
++++ qt4-x11-4.3.2/src/corelib/io/qfsfileengine_unix.cpp
@@ -845,9 +845,16 @@
} else if (own == OwnerGroup) {
struct group *gr = 0;
Deleted: trunk/packages/qt4-x11/debian/patches/0172-prefer-xrandr-over-xinerama.diff
Modified: trunk/packages/qt4-x11/debian/patches/0175-fix-s390-qatomic.diff
===================================================================
--- trunk/packages/qt4-x11/debian/patches/0175-fix-s390-qatomic.diff 2007-10-05 11:29:07 UTC (rev 7345)
+++ trunk/packages/qt4-x11/debian/patches/0175-fix-s390-qatomic.diff 2007-10-06 16:10:34 UTC (rev 7346)
@@ -6,8 +6,8 @@
fix s390(x) build
---- qt4-x11-4.3.1.orig/src/corelib/arch/qatomic_s390.h
-+++ qt4-x11-4.3.1/src/corelib/arch/qatomic_s390.h
+--- qt4-x11-4.3.2.orig/src/corelib/arch/qatomic_s390.h
++++ qt4-x11-4.3.2/src/corelib/arch/qatomic_s390.h
@@ -197,10 +197,20 @@
#endif
}
Modified: trunk/packages/qt4-x11/debian/patches/0176-coverity-fixes.diff
===================================================================
--- trunk/packages/qt4-x11/debian/patches/0176-coverity-fixes.diff 2007-10-05 11:29:07 UTC (rev 7345)
+++ trunk/packages/qt4-x11/debian/patches/0176-coverity-fixes.diff 2007-10-06 16:10:34 UTC (rev 7346)
@@ -6,8 +6,8 @@
fix various obvious memory leaks etc
---- qt4-x11-4.3.1.orig/src/gui/painting/qimagescale.cpp
-+++ qt4-x11-4.3.1/src/gui/painting/qimagescale.cpp
+--- qt4-x11-4.3.2.orig/src/gui/painting/qimagescale.cpp
++++ qt4-x11-4.3.2/src/gui/painting/qimagescale.cpp
@@ -1020,6 +1020,7 @@
buffer = QImage(dw, dh, src.format());
if (buffer.isNull()) {
@@ -16,9 +16,9 @@
return QImage();
}
---- qt4-x11-4.3.1.orig/src/svg/qsvghandler.cpp
-+++ qt4-x11-4.3.1/src/svg/qsvghandler.cpp
-@@ -1136,15 +1136,9 @@
+--- qt4-x11-4.3.2.orig/src/svg/qsvghandler.cpp
++++ qt4-x11-4.3.2/src/svg/qsvghandler.cpp
+@@ -1144,15 +1144,9 @@
if (!size.isEmpty()) {
QSvgHandler::LengthType type;
qreal len = parseLength(size, type, handler);
Modified: trunk/packages/qt4-x11/debian/patches/0178-transparency-window-types.diff
===================================================================
--- trunk/packages/qt4-x11/debian/patches/0178-transparency-window-types.diff 2007-10-05 11:29:07 UTC (rev 7345)
+++ trunk/packages/qt4-x11/debian/patches/0178-transparency-window-types.diff 2007-10-06 16:10:34 UTC (rev 7346)
@@ -6,8 +6,8 @@
This patch adds Qt support for new window types used for compositing.
---- qt4-x11-4.3.1.orig/src/gui/kernel/qapplication_x11.cpp
-+++ qt4-x11-4.3.1/src/gui/kernel/qapplication_x11.cpp
+--- qt4-x11-4.3.2.orig/src/gui/kernel/qapplication_x11.cpp
++++ qt4-x11-4.3.2/src/gui/kernel/qapplication_x11.cpp
@@ -214,6 +214,11 @@
"_NET_WM_WINDOW_TYPE_SPLASH\0"
"_NET_WM_WINDOW_TYPE_TOOLBAR\0"
@@ -20,8 +20,8 @@
"_KDE_NET_WM_FRAME_STRUT\0"
---- qt4-x11-4.3.1.orig/src/gui/kernel/qdnd_x11.cpp
-+++ qt4-x11-4.3.1/src/gui/kernel/qdnd_x11.cpp
+--- qt4-x11-4.3.2.orig/src/gui/kernel/qdnd_x11.cpp
++++ qt4-x11-4.3.2/src/gui/kernel/qdnd_x11.cpp
@@ -270,6 +270,7 @@
QWidget(QApplication::desktop()->screen(screen),
Qt::Tool | Qt::FramelessWindowHint | Qt::X11BypassWindowManagerHint)
@@ -46,8 +46,8 @@
willDrop = false;
---- qt4-x11-4.3.1.orig/src/gui/kernel/qt_x11_p.h
-+++ qt4-x11-4.3.1/src/gui/kernel/qt_x11_p.h
+--- qt4-x11-4.3.2.orig/src/gui/kernel/qt_x11_p.h
++++ qt4-x11-4.3.2/src/gui/kernel/qt_x11_p.h
@@ -530,6 +530,11 @@
_NET_WM_WINDOW_TYPE_SPLASH,
_NET_WM_WINDOW_TYPE_TOOLBAR,
@@ -60,8 +60,8 @@
_KDE_NET_WM_FRAME_STRUT,
---- qt4-x11-4.3.1.orig/src/gui/kernel/qtooltip.cpp
-+++ qt4-x11-4.3.1/src/gui/kernel/qtooltip.cpp
+--- qt4-x11-4.3.2.orig/src/gui/kernel/qtooltip.cpp
++++ qt4-x11-4.3.2/src/gui/kernel/qtooltip.cpp
@@ -149,6 +149,9 @@
setMouseTracking(true);
fadingOut = false;
@@ -94,8 +94,8 @@
QTipLabel::instance->setTipRect(w, rect);
QTipLabel::instance->placeTip(pos, w);
QTipLabel::instance->setObjectName(QLatin1String("qtooltip_label"));
---- qt4-x11-4.3.1.orig/src/gui/kernel/qwidget.h
-+++ qt4-x11-4.3.1/src/gui/kernel/qwidget.h
+--- qt4-x11-4.3.2.orig/src/gui/kernel/qwidget.h
++++ qt4-x11-4.3.2/src/gui/kernel/qwidget.h
@@ -354,6 +354,19 @@
void setWindowOpacity(qreal level);
@@ -116,8 +116,8 @@
bool isWindowModified() const;
#ifndef QT_NO_TOOLTIP
---- qt4-x11-4.3.1.orig/src/gui/kernel/qwidget_x11.cpp
-+++ qt4-x11-4.3.1/src/gui/kernel/qwidget_x11.cpp
+--- qt4-x11-4.3.2.orig/src/gui/kernel/qwidget_x11.cpp
++++ qt4-x11-4.3.2/src/gui/kernel/qwidget_x11.cpp
@@ -562,10 +562,6 @@
}
#endif // QT_NO_XRENDER
@@ -255,8 +255,8 @@
/*!
Frees up window system resources. Destroys the widget window if \a
destroyWindow is true.
---- qt4-x11-4.3.1.orig/src/gui/widgets/qcombobox.cpp
-+++ qt4-x11-4.3.1/src/gui/widgets/qcombobox.cpp
+--- qt4-x11-4.3.2.orig/src/gui/widgets/qcombobox.cpp
++++ qt4-x11-4.3.2/src/gui/widgets/qcombobox.cpp
@@ -333,6 +333,10 @@
combo->update();
}
@@ -268,8 +268,8 @@
}
void QComboBoxPrivateContainer::leaveEvent(QEvent *)
---- qt4-x11-4.3.1.orig/src/gui/widgets/qmenu.cpp
-+++ qt4-x11-4.3.1/src/gui/widgets/qmenu.cpp
+--- qt4-x11-4.3.2.orig/src/gui/widgets/qmenu.cpp
++++ qt4-x11-4.3.2/src/gui/widgets/qmenu.cpp
@@ -99,6 +99,9 @@
QTornOffMenu(QMenu *p) : QMenu(*(new QTornOffMenuPrivate(p)))
{
@@ -290,7 +290,7 @@
}
//Windows and KDE allows menus to cover the taskbar, while GNOME and Mac don't
-@@ -1669,6 +1675,32 @@
+@@ -1682,6 +1688,32 @@
}
setGeometry(QRect(pos, size));
@@ -323,7 +323,7 @@
#ifndef QT_NO_EFFECTS
int hGuess = qApp->layoutDirection() == Qt::RightToLeft ? QEffects::LeftScroll : QEffects::RightScroll;
int vGuess = QEffects::DownScroll;
-@@ -1865,6 +1897,9 @@
+@@ -1878,6 +1910,9 @@
if (QMenuBar *mb = qobject_cast<QMenuBar*>(d->causedPopup.widget))
mb->d_func()->setCurrentAction(0);
#endif
Modified: trunk/packages/qt4-x11/debian/patches/0179-transient-hack.diff
===================================================================
--- trunk/packages/qt4-x11/debian/patches/0179-transient-hack.diff 2007-10-05 11:29:07 UTC (rev 7345)
+++ trunk/packages/qt4-x11/debian/patches/0179-transient-hack.diff 2007-10-06 16:10:34 UTC (rev 7346)
@@ -8,8 +8,8 @@
work with some window types (needed basically by the #0178 qt-copy patch).
It is not a proper solution, waiting for TT to come up with something.
---- qt4-x11-4.3.1.orig/src/gui/kernel/qwidget_x11.cpp
-+++ qt4-x11-4.3.1/src/gui/kernel/qwidget_x11.cpp
+--- qt4-x11-4.3.2.orig/src/gui/kernel/qwidget_x11.cpp
++++ qt4-x11-4.3.2/src/gui/kernel/qwidget_x11.cpp
@@ -1650,7 +1650,7 @@
do_size_hints(q, extra);
Modified: trunk/packages/qt4-x11/debian/patches/0180-window-role.diff
===================================================================
--- trunk/packages/qt4-x11/debian/patches/0180-window-role.diff 2007-10-05 11:29:07 UTC (rev 7345)
+++ trunk/packages/qt4-x11/debian/patches/0180-window-role.diff 2007-10-06 16:10:34 UTC (rev 7346)
@@ -34,8 +34,8 @@
QObjectPrivate already has a virtual dtor I think adding another virtual for
handling the QWidget-related functionality from QtCore is fine.
---- qt4-x11-4.3.1.orig/src/corelib/kernel/qobject.cpp
-+++ qt4-x11-4.3.1/src/corelib/kernel/qobject.cpp
+--- qt4-x11-4.3.2.orig/src/corelib/kernel/qobject.cpp
++++ qt4-x11-4.3.2/src/corelib/kernel/qobject.cpp
@@ -1008,9 +1008,18 @@
{
Q_D(QObject);
@@ -55,8 +55,8 @@
#ifdef QT3_SUPPORT
/*! \internal
QObject::child is compat but needs to call itself recursively,
---- qt4-x11-4.3.1.orig/src/corelib/kernel/qobject_p.h
-+++ qt4-x11-4.3.1/src/corelib/kernel/qobject_p.h
+--- qt4-x11-4.3.2.orig/src/corelib/kernel/qobject_p.h
++++ qt4-x11-4.3.2/src/corelib/kernel/qobject_p.h
@@ -139,6 +139,9 @@
mutable quint32 connectedSignals;
@@ -67,9 +67,9 @@
};
class QSemaphore;
---- qt4-x11-4.3.1.orig/src/gui/kernel/qwidget_p.h
-+++ qt4-x11-4.3.1/src/gui/kernel/qwidget_p.h
-@@ -305,6 +305,7 @@
+--- qt4-x11-4.3.2.orig/src/gui/kernel/qwidget_p.h
++++ qt4-x11-4.3.2/src/gui/kernel/qwidget_p.h
+@@ -309,6 +309,7 @@
#if defined(Q_WS_X11)
void setWindowRole(const char *role);
@@ -77,8 +77,8 @@
void sendStartupMessage(const char *message) const;
#endif
---- qt4-x11-4.3.1.orig/src/gui/kernel/qwidget_x11.cpp
-+++ qt4-x11-4.3.1/src/gui/kernel/qwidget_x11.cpp
+--- qt4-x11-4.3.2.orig/src/gui/kernel/qwidget_x11.cpp
++++ qt4-x11-4.3.2/src/gui/kernel/qwidget_x11.cpp
@@ -671,11 +671,8 @@
// when we create a toplevel widget, the frame strut should be dirty
data.fstrut_dirty = 1;
@@ -93,7 +93,7 @@
// set client leader property
XChangeProperty(dpy, id, ATOM(WM_CLIENT_LEADER),
-@@ -2669,12 +2666,20 @@
+@@ -2671,12 +2668,20 @@
void QWidgetPrivate::setWindowRole(const char *role)
{
Q_Q(QWidget);
Deleted: trunk/packages/qt4-x11/debian/patches/0181-qdnd-x11-fix.diff
Deleted: trunk/packages/qt4-x11/debian/patches/0182-argb-visuals-default.diff
Modified: trunk/packages/qt4-x11/debian/patches/0185-fix-format-strings.diff
===================================================================
--- trunk/packages/qt4-x11/debian/patches/0185-fix-format-strings.diff 2007-10-05 11:29:07 UTC (rev 7345)
+++ trunk/packages/qt4-x11/debian/patches/0185-fix-format-strings.diff 2007-10-06 16:10:34 UTC (rev 7346)
@@ -1,5 +1,5 @@
qt-bugs@ issue : N171087
-Trolltech task ID :
+Trolltech task ID : 173777
bugs.kde.org number :
applied: no
author: Dirk Mueller <mueller at kde.org>
@@ -8,8 +8,8 @@
None of them seem to be exceptionally bad, but its better safe
than sorry.
---- qt4-x11-4.3.1.orig/src/corelib/global/qglobal.h
-+++ qt4-x11-4.3.1/src/corelib/global/qglobal.h
+--- qt4-x11-4.3.2.orig/src/corelib/global/qglobal.h
++++ qt4-x11-4.3.2/src/corelib/global/qglobal.h
@@ -1276,8 +1276,16 @@
#ifdef QT3_SUPPORT
Q_CORE_EXPORT QT3_SUPPORT void qSystemWarning(const char *msg, int code = -1);
@@ -29,8 +29,8 @@
#if (defined(QT_NO_DEBUG_OUTPUT) || defined(QT_NO_TEXTSTREAM)) && !defined(QT_NO_DEBUG_STREAM)
#define QT_NO_DEBUG_STREAM
---- qt4-x11-4.3.1.orig/src/corelib/tools/qbytearray.h
-+++ qt4-x11-4.3.1/src/corelib/tools/qbytearray.h
+--- qt4-x11-4.3.2.orig/src/corelib/tools/qbytearray.h
++++ qt4-x11-4.3.2/src/corelib/tools/qbytearray.h
@@ -86,8 +86,16 @@
Q_CORE_EXPORT int qstrnicmp(const char *, const char *, uint len);
@@ -50,22 +50,8 @@
#ifdef QT3_SUPPORT
inline QT3_SUPPORT void *qmemmove(void *dst, const void *src, uint len)
---- qt4-x11-4.3.1.orig/src/gui/painting/qprintengine_pdf.cpp
-+++ qt4-x11-4.3.1/src/gui/painting/qprintengine_pdf.cpp
-@@ -401,9 +401,8 @@
- object = addXrefEntry(-1);
- QByteArray alphaDef;
- QPdf::ByteStream s(&alphaDef);
-- s << "<< /ca " << (alpha/qreal(255.)) << ">>\n";
-- xprintf(alphaDef.constData());
-- xprintf("endobj\n");
-+ s << "<< /ca " << (alpha/qreal(255.)) << ">>";
-+ xprintf("%s\nendobj\n", alphaDef.constData());
- }
- currentPage->graphicStates.append(object);
- return object;
---- qt4-x11-4.3.1.orig/src/gui/painting/qprintengine_pdf_p.h
-+++ qt4-x11-4.3.1/src/gui/painting/qprintengine_pdf_p.h
+--- qt4-x11-4.3.2.orig/src/gui/painting/qprintengine_pdf_p.h
++++ qt4-x11-4.3.2/src/gui/painting/qprintengine_pdf_p.h
@@ -163,7 +163,11 @@
void writePage();
@@ -79,8 +65,8 @@
inline void write(const QByteArray &data) {
stream->writeRawData(data.constData(), data.size());
streampos += data.size();
---- qt4-x11-4.3.1.orig/src/qt3support/tools/q3cstring.h
-+++ qt4-x11-4.3.1/src/qt3support/tools/q3cstring.h
+--- qt4-x11-4.3.2.orig/src/qt3support/tools/q3cstring.h
++++ qt4-x11-4.3.2/src/qt3support/tools/q3cstring.h
@@ -72,7 +72,11 @@
}
@@ -94,143 +80,8 @@
Q3CString left(uint len) const { return QByteArray::left(len); }
Q3CString right(uint len) const { return QByteArray::right(len); }
---- qt4-x11-4.3.1.orig/src/qt3support/tools/q3gcache.cpp
-+++ qt4-x11-4.3.1/src/qt3support/tools/q3gcache.cpp
-@@ -637,7 +637,7 @@
- #if defined(QT_DEBUG)
- QString line;
- line.fill(QLatin1Char('*'), 80);
-- qDebug(line.ascii());
-+ qDebug("%s", line.ascii());
- qDebug("CACHE STATISTICS:");
- qDebug("cache contains %d item%s, with a total cost of %d",
- count(), count() != 1 ? "s" : "", tCost);
-@@ -658,7 +658,7 @@
- lruList->dumps != 1 ? "have" : "has", lruList->dumpCosts);
- qDebug("Statistics from internal dictionary class:");
- dict->statistics();
-- qDebug(line.ascii());
-+ qDebug("%s", line.ascii());
- #endif
- }
-
---- qt4-x11-4.3.1.orig/src/qt3support/tools/q3gdict.cpp
-+++ qt4-x11-4.3.1/src/qt3support/tools/q3gdict.cpp
-@@ -843,11 +843,11 @@
- QString line;
- line.fill(QLatin1Char('-'), 60);
- double real, ideal;
-- qDebug(line.ascii());
-+ qDebug("%s", line.ascii());
- qDebug("DICTIONARY STATISTICS:");
- if (count() == 0) {
- qDebug("Empty!");
-- qDebug(line.ascii());
-+ qDebug("%s", line.ascii());
- return;
- }
- real = 0.0;
-@@ -868,7 +868,7 @@
- while (b--)
- *pbuf++ = '*';
- *pbuf = '\0';
-- qDebug(buf);
-+ qDebug("%s", buf);
- i++;
- }
- qDebug("Array size = %d", size());
-@@ -876,7 +876,7 @@
- qDebug("Real dist = %g", real);
- qDebug("Rand dist = %g", ideal);
- qDebug("Real/Rand = %g", real/ideal);
-- qDebug(line.ascii());
-+ qDebug("%s", line.ascii());
- #endif // QT_DEBUG
- }
-
---- qt4-x11-4.3.1.orig/tools/assistant/config.cpp
-+++ qt4-x11-4.3.1/tools/assistant/config.cpp
-@@ -88,12 +88,12 @@
-
- QFile file(profileFileName);
- if (!file.exists()) {
-- qWarning( (QLatin1String("File does not exist: ") + profileFileName).toAscii().constData() );
-+ qWarning( "File does not exist: %s", qPrintable(profileFileName) );
- return 0;
- }
- DocuParser *parser = DocuParser::createParser( profileFileName );
- if (!parser) {
-- qWarning( (QLatin1String("Failed to create parser for file: ") + profileFileName).toAscii().constData() );
-+ qWarning( "Failed to create parser for file: %s", qPrintable(profileFileName) );
- return 0;
- }
- if (parser->parserVersion() < DocuParser::Qt320) {
-@@ -104,7 +104,7 @@
- parser->parse(&file);
- config->profil = profileParser->profile();
- if (!config->profil) {
-- qWarning( (QLatin1String("Config::loadConfig(), no profile in: ") + profileFileName).toAscii().constData() );
-+ qWarning( "Config::loadConfig(), no profile in: %s", qPrintable(profileFileName) );
- return 0;
- }
- config->profil->setProfileType(Profile::UserProfile);
---- qt4-x11-4.3.1.orig/tools/assistant/index.cpp
-+++ qt4-x11-4.3.1/tools/assistant/index.cpp
-@@ -195,7 +195,7 @@
- {
- QFile file( filename );
- if ( !file.open(QFile::ReadOnly) ) {
-- qWarning( (QLatin1String("can not open file ") + filename).toAscii().constData() );
-+ qWarning( "can not open file %s", qPrintable(filename) );
- return;
- }
-
-@@ -367,7 +367,7 @@
-
- QFile file( fileName );
- if ( !file.open( QFile::ReadOnly ) ) {
-- qWarning( (QLatin1String("cannot open file ") + fileName).toAscii().constData() );
-+ qWarning( "cannot open file %s", qPrintable(fileName) );
- return fileName;
- }
- QTextStream s( &file );
-@@ -489,7 +489,7 @@
- QString fName = url.toLocalFile();
- QFile file( fName );
- if ( !file.open( QFile::ReadOnly ) ) {
-- qWarning( (QLatin1String("cannot open file ") + fName).toAscii().constData() );
-+ qWarning( "cannot open file %s", qPrintable(fName) );
- return false;
- }
-
---- qt4-x11-4.3.1.orig/tools/designer/src/lib/shared/qdesigner_utils.cpp
-+++ qt4-x11-4.3.1/tools/designer/src/lib/shared/qdesigner_utils.cpp
-@@ -55,9 +55,7 @@
- {
- QDESIGNER_SHARED_EXPORT void designerWarning(const QString &message)
- {
-- QString prefixedMessage = QLatin1String("Designer: ");
-- prefixedMessage += message;
-- qWarning(prefixedMessage.toUtf8().constData());
-+ qWarning("Designer: %s", qPrintable(message));
- }
-
- QString EnumType::id() const
---- qt4-x11-4.3.1.orig/tools/designer/src/lib/uilib/formbuilderextra.cpp
-+++ qt4-x11-4.3.1/tools/designer/src/lib/uilib/formbuilderextra.cpp
-@@ -48,9 +48,7 @@
- #endif
-
- void uiLibWarning(const QString &message) {
-- QString prefixedMessage = QLatin1String("Designer: ");
-- prefixedMessage += message;
-- qWarning(prefixedMessage.toUtf8().constData());
-+ qWarning("Designer: %s", qPrintable(message));
- }
-
- QFormBuilderExtra::QFormBuilderExtra() :
---- qt4-x11-4.3.1.orig/tools/linguist/shared/profileevaluator.h
-+++ qt4-x11-4.3.1/tools/linguist/shared/profileevaluator.h
+--- qt4-x11-4.3.2.orig/tools/linguist/shared/profileevaluator.h
++++ qt4-x11-4.3.2/tools/linguist/shared/profileevaluator.h
@@ -103,7 +103,11 @@
private:
@@ -244,8 +95,8 @@
QString expandVariableReferences(const QString &value);
QString evaluateExpandFunction(const QByteArray &func, const QString &arguments);
---- qt4-x11-4.3.1.orig/tools/qtestlib/src/qtest_global.h
-+++ qt4-x11-4.3.1/tools/qtestlib/src/qtest_global.h
+--- qt4-x11-4.3.2.orig/tools/qtestlib/src/qtest_global.h
++++ qt4-x11-4.3.2/tools/qtestlib/src/qtest_global.h
@@ -74,7 +74,11 @@
enum SkipMode { SkipSingle = 1, SkipAll = 2 };
enum TestFailMode { Abort = 1, Continue = 2 };
Deleted: trunk/packages/qt4-x11/debian/patches/0186-fix-component-alpha-text.diff
Modified: trunk/packages/qt4-x11/debian/patches/0187-fix-font-fixed-pitch.diff
===================================================================
--- trunk/packages/qt4-x11/debian/patches/0187-fix-font-fixed-pitch.diff 2007-10-05 11:29:07 UTC (rev 7345)
+++ trunk/packages/qt4-x11/debian/patches/0187-fix-font-fixed-pitch.diff 2007-10-06 16:10:34 UTC (rev 7346)
@@ -1,5 +1,5 @@
-qt-bugs@ issue :
-Trolltech task ID :
+qt-bugs@ issue : 173297
+Trolltech task ID : 175024
applied: no
author: Matthew Woehlke <mw_triad at users.sourceforge.net>
@@ -8,8 +8,15 @@
property of both ignoring (bad) and not relying on (good) any information
that might be provided by the OS's font facility.
---- qt4-x11-4.3.1.orig/src/gui/text/qfont.cpp
-+++ qt4-x11-4.3.1/src/gui/text/qfont.cpp
+On further conversation with TT (at which point they were finally able
+to reproduce the problem), it seems fixedPitch() only breaks if one has
+called setFixedPitch(true) on the QFont, and the selected font is not
+fixed pitch.
+
+This patch should be considered temporary until TT has a better fix.
+
+--- qt4-x11-4.3.2.orig/src/gui/text/qfont.cpp
++++ qt4-x11-4.3.2/src/gui/text/qfont.cpp
@@ -2093,7 +2093,6 @@
{
QFontEngine *engine = d->engineForScript(QUnicodeTables::Common);
@@ -26,8 +33,8 @@
return engine->fontDef.fixedPitch;
}
---- qt4-x11-4.3.1.orig/src/gui/text/qfont_p.h
-+++ qt4-x11-4.3.1/src/gui/text/qfont_p.h
+--- qt4-x11-4.3.2.orig/src/gui/text/qfont_p.h
++++ qt4-x11-4.3.2/src/gui/text/qfont_p.h
@@ -66,9 +66,7 @@
styleStrategy(QFont::PreferDefault), styleHint(QFont::AnyStyle),
weight(50), fixedPitch(false), style(QFont::StyleNormal), stretch(100),
Added: trunk/packages/qt4-x11/debian/patches/0188-fix-moc-parser-same-name-header.diff
===================================================================
--- trunk/packages/qt4-x11/debian/patches/0188-fix-moc-parser-same-name-header.diff (rev 0)
+++ trunk/packages/qt4-x11/debian/patches/0188-fix-moc-parser-same-name-header.diff 2007-10-06 16:10:34 UTC (rev 7346)
@@ -0,0 +1,35 @@
+qt-bugs@ issue : none
+Trolltech task ID : none
+applied: yes
+author: Helio Chissini de Castro <helio at kde.org>
+os: unix
+
+In situations where included header have same name as their parent dir, i.e.
+include/QtMyModule/QtMyModule and #include <QtMyModule> on code. moc will fail if parent dir was
+added in front of includepath.
+moc -Iinclude -Iinclude/QtMyModule fails
+moc -Iinclude/QtMyModule works
+This patch move dir test to proper place, as entry is validated only if is a real file, not a dir.
+Detected by qca2 plugins code that uses QtCrypto/QtCrypto
+Thanks to Thiago to find proper syntax
+
+--- qt4-x11-4.3.2.orig/src/tools/moc/preprocessor.cpp
++++ qt4-x11-4.3.2/src/tools/moc/preprocessor.cpp
+@@ -768,7 +768,7 @@
+ 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('/');
+@@ -782,7 +782,7 @@
+ }
+ }
+
+- if (!fi.exists() || fi.isDir())
++ if ( !fi.exists() )
+ continue;
+ include = fi.filePath().toLocal8Bit();
+
Added: trunk/packages/qt4-x11/debian/patches/0189-fix-q3toolbar-qcombobox-signal-slot.diff
===================================================================
--- trunk/packages/qt4-x11/debian/patches/0189-fix-q3toolbar-qcombobox-signal-slot.diff (rev 0)
+++ trunk/packages/qt4-x11/debian/patches/0189-fix-q3toolbar-qcombobox-signal-slot.diff 2007-10-06 16:10:34 UTC (rev 7346)
@@ -0,0 +1,31 @@
+qt-bugs@ issue : none
+Trolltech task ID : 171843
+bugs.kde.org number : none
+applied: yes
+author: Laurent Montel <montel at kde.org>
+
+This patch changed un-existing slot in qcombobox by existing slot.
+(internalActivate is defined by q3combobox)
+When qcombobox was transform to popupmenu when toolbar with combobox is too small
+we used this slot to update combobox. (now it's updated)
+
+--- qt4-x11-4.3.2.orig/src/qt3support/widgets/q3toolbar.cpp
++++ qt4-x11-4.3.2/src/qt3support/widgets/q3toolbar.cpp
+@@ -667,7 +667,7 @@
+ Q3PopupMenu *cp = new Q3PopupMenu(d->extensionPopup);
+ cp->setEnabled(c->isEnabled());
+ d->extensionPopup->insertItem(s, cp);
+- connect(cp, SIGNAL(activated(int)), c, SLOT(internalActivate(int)));
++ connect(cp, SIGNAL(activated(int)), c, SLOT(setCurrentIndex(int)));
+ for (int i = 0; i < c->count(); ++i) {
+ QString tmp = c->text(i);
+ cp->insertItem(tmp, i);
+@@ -682,7 +682,7 @@
+ Q3PopupMenu* sp = new Q3PopupMenu(d->extensionPopup);
+ cp->insertItem(tr("More..."), sp);
+ cp = sp;
+- connect(cp, SIGNAL(activated(int)), c, SLOT(internalActivate(int)));
++ connect(cp, SIGNAL(activated(int)), c, SLOT(setCurrentIndex(int)));
+ }
+ }
+ }
Added: trunk/packages/qt4-x11/debian/patches/0191-listview-alternate-row-colors.diff
===================================================================
--- trunk/packages/qt4-x11/debian/patches/0191-listview-alternate-row-colors.diff (rev 0)
+++ trunk/packages/qt4-x11/debian/patches/0191-listview-alternate-row-colors.diff 2007-10-06 16:10:34 UTC (rev 7346)
@@ -0,0 +1,22 @@
+qt-bugs@ issue : 178507
+Trolltech task ID : 179170
+applied: no
+author: Matthew Woehlke <mw_triad at 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.)
+
+--- qt4-x11-4.3.2.orig/src/gui/itemviews/qlistview.cpp
++++ qt4-x11-4.3.2/src/gui/itemviews/qlistview.cpp
+@@ -1071,7 +1071,7 @@
+ option.state &= ~QStyle::State_Enabled;
+ cg = QPalette::Disabled;
+ } else {
+- cg = QPalette::Normal;
++ cg = window()->isActiveWindow() ? QPalette::Active : QPalette::Inactive;
+ }
+ option.palette.setCurrentColorGroup(cg);
+ }
Added: trunk/packages/qt4-x11/debian/patches/0192-itemdelegate-palette-state.diff
===================================================================
--- trunk/packages/qt4-x11/debian/patches/0192-itemdelegate-palette-state.diff (rev 0)
+++ trunk/packages/qt4-x11/debian/patches/0192-itemdelegate-palette-state.diff 2007-10-06 16:10:34 UTC (rev 7346)
@@ -0,0 +1,25 @@
+qt-bugs@ issue : 178507
+Trolltech task ID : 179170
+applied: no
+author: Matthew Woehlke <mw_triad at users.sourceforge.net>
+
+This patch fixes incorrect setting of the palette color group in
+QItemDelegate that resulted in inactive colors being used for widgets
+in active windows.
+
+--- qt4-x11-4.3.2.orig/src/gui/itemviews/qitemdelegate.cpp
++++ qt4-x11-4.3.2/src/gui/itemviews/qitemdelegate.cpp
+@@ -635,10 +635,10 @@
+
+ QPen pen = painter->pen();
+ QPalette::ColorGroup cg = option.state & QStyle::State_Enabled
+- ? QPalette::Normal : QPalette::Disabled;
+- if (cg == QPalette::Normal && !(option.state & QStyle::State_Active))
+- cg = QPalette::Inactive;
++ ? option.palette.currentColorGroup() : QPalette::Disabled;
+ if (option.state & QStyle::State_Selected) {
++ if (cg == QPalette::Normal && !(option.state & QStyle::State_Active))
++ cg = QPalette::Inactive;
+ painter->fillRect(rect, option.palette.brush(cg, QPalette::Highlight));
+ painter->setPen(option.palette.color(cg, QPalette::HighlightedText));
+ } else {
Added: trunk/packages/qt4-x11/debian/patches/0193-qtreeview-division-by-zero.diff
===================================================================
--- trunk/packages/qt4-x11/debian/patches/0193-qtreeview-division-by-zero.diff (rev 0)
+++ trunk/packages/qt4-x11/debian/patches/0193-qtreeview-division-by-zero.diff 2007-10-06 16:10:34 UTC (rev 7346)
@@ -0,0 +1,21 @@
+qt-bugs@ issue : N180629
+Trolltech task ID : none
+bugs.kde.org number : None
+applied: yes
+author: Rafael Fernández López <ereslibre at kde.org>
+
+This patch fixes a division by zero that happens on the QTreeView widget
+if the ScrollPerPixel scroll mode is set.
+
+--- qt4-x11-4.3.2.orig/src/gui/itemviews/qtreeview.cpp
++++ qt4-x11-4.3.2/src/gui/itemviews/qtreeview.cpp
+@@ -2983,6 +2983,9 @@
+ }
+ // ScrollMode == ScrollPerPixel
+ if (uniformRowHeights) {
++ if (!defaultItemHeight)
++ return -1;
++
+ if (offset)
+ *offset = -(value % defaultItemHeight);
+ return value / defaultItemHeight;
Added: trunk/packages/qt4-x11/debian/patches/0194-fix-moveonly-dnd-in-itemviews.diff
===================================================================
--- trunk/packages/qt4-x11/debian/patches/0194-fix-moveonly-dnd-in-itemviews.diff (rev 0)
+++ trunk/packages/qt4-x11/debian/patches/0194-fix-moveonly-dnd-in-itemviews.diff 2007-10-06 16:10:34 UTC (rev 7346)
@@ -0,0 +1,38 @@
+qt-bugs@ issue : 181399
+Trolltech task ID : 181413
+applied: no
+author: Matthias Kretz <kretz at kde.org>
+
+Allows drag and drop to work without pressing the shift key for itemviews that use InternalMove.
+
+--- qt4-x11-4.3.2.orig/src/gui/itemviews/qabstractitemview.cpp
++++ qt4-x11-4.3.2/src/gui/itemviews/qabstractitemview.cpp
+@@ -2968,7 +2968,7 @@
+
+ #ifndef QT_NO_DRAGANDDROP
+ /*!
+- Starts a drag by calling drag->start() using the given \a supportedActions.
++ Starts a drag by calling drag->exec() using the given \a supportedActions.
+ */
+ void QAbstractItemView::startDrag(Qt::DropActions supportedActions)
+ {
+@@ -2985,7 +2985,7 @@
+ drag->setPixmap(pixmap);
+ drag->setMimeData(data);
+ drag->setHotSpot(d->pressedPosition - rect.topLeft());
+- if (drag->start(supportedActions) == Qt::MoveAction)
++ if (drag->exec(supportedActions) == Qt::MoveAction)
+ d->clearOrRemove();
+ }
+ }
+--- qt4-x11-4.3.2.orig/src/gui/itemviews/qlistview.cpp
++++ qt4-x11-4.3.2/src/gui/itemviews/qlistview.cpp
+@@ -992,7 +992,7 @@
+ d->dynamicListView->draggedItems.push_back(*it);
+ QDrag *drag = new QDrag(this);
+ drag->setMimeData(d->model->mimeData(indexes));
+- Qt::DropAction action = drag->start(supportedActions);
++ Qt::DropAction action = drag->exec(supportedActions);
+ d->dynamicListView->draggedItems.clear();
+ if (action == Qt::MoveAction)
+ d->clearOrRemove();
Added: trunk/packages/qt4-x11/debian/patches/0195-compositing-properties.diff
===================================================================
--- trunk/packages/qt4-x11/debian/patches/0195-compositing-properties.diff (rev 0)
+++ trunk/packages/qt4-x11/debian/patches/0195-compositing-properties.diff 2007-10-06 16:10:34 UTC (rev 7346)
@@ -0,0 +1,73 @@
+qt-bugs@ issue : none
+bugs.kde.org number : none
+applied: no
+author: Lubos Lunak <l.lunak at kde.org>
+
+This patch makes override-redirect windows (popup menu, dropdown menu,
+tooltip, combobox, etc.) also have more window properties like WM_CLASS,
+so they can be used when compositing.
+
+--- qt4-x11-4.3.2.orig/src/gui/kernel/qwidget_x11.cpp
++++ qt4-x11-4.3.2/src/gui/kernel/qwidget_x11.cpp
+@@ -616,7 +616,11 @@
+ wsa.save_under = True;
+ XChangeWindowAttributes(dpy, id, CWOverrideRedirect | CWSaveUnder,
+ &wsa);
+- q->x11SetWindowType();
++ XClassHint class_hint;
++ QByteArray appName = qAppName().toLatin1();
++ class_hint.res_name = appName.data(); // application name
++ class_hint.res_class = const_cast<char *>(QX11Info::appClass()); // application class
++ XSetClassHint(dpy, id, &class_hint);
+ } else if (topLevel && !desktop) { // top-level widget
+ if (!X11->wm_client_leader)
+ create_wm_client_leader();
+@@ -661,29 +665,34 @@
+ // set mwm hints
+ SetMWMHints(dpy, id, mwmhints);
+
+- q->x11SetWindowType(); // set _NET_WM_WINDOW_TYPE
+-
+- // set _NET_WM_PID
+- long curr_pid = getpid();
+- XChangeProperty(dpy, id, ATOM(_NET_WM_PID), XA_CARDINAL, 32, PropModeReplace,
+- (unsigned char *) &curr_pid, 1);
+-
+ // when we create a toplevel widget, the frame strut should be dirty
+ data.fstrut_dirty = 1;
+
+- // declare the widget's object name as window role if not set
+- setWindowRole( !q->windowRole().isEmpty() ? q->windowRole().toUtf8() : q->objectName().toUtf8());
+-
+- // set client leader property
+- XChangeProperty(dpy, id, ATOM(WM_CLIENT_LEADER),
+- XA_WINDOW, 32, PropModeReplace,
+- (unsigned char *)&X11->wm_client_leader, 1);
+ } else {
+ // non-toplevel widgets don't have a frame, so no need to
+ // update the strut
+ data.fstrut_dirty = 0;
+ }
+
++ if (initializeWindow && (popup || (topLevel && !desktop))) { // properties set on all toplevel windows
++ q->x11SetWindowType(); // set _NET_WM_WINDOW_TYPE
++
++ // set _NET_WM_PID
++ long curr_pid = getpid();
++ XChangeProperty(dpy, id, ATOM(_NET_WM_PID), XA_CARDINAL, 32, PropModeReplace,
++ (unsigned char *) &curr_pid, 1);
++
++ // declare the widget's object name as window role if not set
++ setWindowRole( !q->windowRole().isEmpty() ? q->windowRole().toUtf8() : q->objectName().toUtf8());
++
++ // set client leader property
++ if (!X11->wm_client_leader)
++ create_wm_client_leader();
++ XChangeProperty(dpy, id, ATOM(WM_CLIENT_LEADER),
++ XA_WINDOW, 32, PropModeReplace,
++ (unsigned char *)&X11->wm_client_leader, 1);
++ }
++
+ if (initializeWindow) {
+ // don't erase when resizing
+ wsa.bit_gravity = QApplication::isRightToLeft() ? NorthEastGravity : NorthWestGravity;
Modified: trunk/packages/qt4-x11/debian/patches/01_qmake_for_debian.diff
===================================================================
--- trunk/packages/qt4-x11/debian/patches/01_qmake_for_debian.diff 2007-10-05 11:29:07 UTC (rev 7345)
+++ trunk/packages/qt4-x11/debian/patches/01_qmake_for_debian.diff 2007-10-06 16:10:34 UTC (rev 7346)
@@ -3,8 +3,8 @@
Ensures qmake generates Makefiles that use the -qt4 tools and that use
recursively link against all indirectly-used libraries.
---- qt4-x11-4.3.1.orig/mkspecs/common/linux.conf
-+++ qt4-x11-4.3.1/mkspecs/common/linux.conf
+--- qt4-x11-4.3.2.orig/mkspecs/common/linux.conf
++++ qt4-x11-4.3.2/mkspecs/common/linux.conf
@@ -23,8 +23,8 @@
QMAKE_LIBS_OPENGL_QT = -lGL
QMAKE_LIBS_THREAD = -lpthread
@@ -16,8 +16,8 @@
QMAKE_AR = ar cqs
QMAKE_RANLIB =
---- qt4-x11-4.3.1.orig/mkspecs/linux-g++/qmake.conf
-+++ qt4-x11-4.3.1/mkspecs/linux-g++/qmake.conf
+--- qt4-x11-4.3.2.orig/mkspecs/linux-g++/qmake.conf
++++ qt4-x11-4.3.2/mkspecs/linux-g++/qmake.conf
@@ -4,8 +4,9 @@
MAKEFILE_GENERATOR = UNIX
Modified: trunk/packages/qt4-x11/debian/patches/02_launch_assistant-qt4.diff
===================================================================
--- trunk/packages/qt4-x11/debian/patches/02_launch_assistant-qt4.diff 2007-10-05 11:29:07 UTC (rev 7345)
+++ trunk/packages/qt4-x11/debian/patches/02_launch_assistant-qt4.diff 2007-10-06 16:10:34 UTC (rev 7346)
@@ -1,7 +1,7 @@
author: Brian Nelson <pyro at debian.org>
---- qt4-x11-4.3.1.orig/tools/assistant/lib/qassistantclient.cpp
-+++ qt4-x11-4.3.1/tools/assistant/lib/qassistantclient.cpp
+--- qt4-x11-4.3.2.orig/tools/assistant/lib/qassistantclient.cpp
++++ qt4-x11-4.3.2/tools/assistant/lib/qassistantclient.cpp
@@ -187,11 +187,11 @@
: QObject( parent ), host ( QLatin1String("localhost") )
{
Modified: trunk/packages/qt4-x11/debian/patches/03_launch_moc-qt4.diff
===================================================================
--- trunk/packages/qt4-x11/debian/patches/03_launch_moc-qt4.diff 2007-10-05 11:29:07 UTC (rev 7345)
+++ trunk/packages/qt4-x11/debian/patches/03_launch_moc-qt4.diff 2007-10-06 16:10:34 UTC (rev 7346)
@@ -2,8 +2,8 @@
Ensure the Qt4 version of moc is launched.
---- qt4-x11-4.3.1.orig/tools/qdbus/tools/qdbuscpp2xml/qdbuscpp2xml.cpp
-+++ qt4-x11-4.3.1/tools/qdbus/tools/qdbuscpp2xml/qdbuscpp2xml.cpp
+--- qt4-x11-4.3.2.orig/tools/qdbus/tools/qdbuscpp2xml/qdbuscpp2xml.cpp
++++ qt4-x11-4.3.2/tools/qdbus/tools/qdbuscpp2xml/qdbuscpp2xml.cpp
@@ -391,7 +391,7 @@
else {
// run moc on this file
Modified: trunk/packages/qt4-x11/debian/patches/04_launch_uic-qt4.diff
===================================================================
--- trunk/packages/qt4-x11/debian/patches/04_launch_uic-qt4.diff 2007-10-05 11:29:07 UTC (rev 7345)
+++ trunk/packages/qt4-x11/debian/patches/04_launch_uic-qt4.diff 2007-10-06 16:10:34 UTC (rev 7346)
@@ -1,7 +1,7 @@
author: Fathi Boudra <fboudra at free.fr>
---- qt4-x11-4.3.1.orig/tools/designer/src/lib/shared/qdesigner_utils.cpp
-+++ qt4-x11-4.3.1/tools/designer/src/lib/shared/qdesigner_utils.cpp
+--- qt4-x11-4.3.2.orig/tools/designer/src/lib/shared/qdesigner_utils.cpp
++++ qt4-x11-4.3.2/tools/designer/src/lib/shared/qdesigner_utils.cpp
@@ -133,7 +133,7 @@
binary += QDir::separator();
switch (mode) {
Modified: trunk/packages/qt4-x11/debian/patches/05_append_qt4_target.diff
===================================================================
--- trunk/packages/qt4-x11/debian/patches/05_append_qt4_target.diff 2007-10-05 11:29:07 UTC (rev 7345)
+++ trunk/packages/qt4-x11/debian/patches/05_append_qt4_target.diff 2007-10-06 16:10:34 UTC (rev 7346)
@@ -1,7 +1,7 @@
author: Fathi Boudra <fboudra at free.fr>
---- qt4-x11-4.3.1.orig/config.tests/unix/compile.test
-+++ qt4-x11-4.3.1/config.tests/unix/compile.test
+--- qt4-x11-4.3.2.orig/config.tests/unix/compile.test
++++ qt4-x11-4.3.2/config.tests/unix/compile.test
@@ -51,7 +51,7 @@
cd "$OUTDIR/$TEST"
@@ -11,8 +11,8 @@
if [ "$VERBOSE" = "yes" ]; then
make
---- qt4-x11-4.3.1.orig/config.tests/unix/doubleformat.test
-+++ qt4-x11-4.3.1/config.tests/unix/doubleformat.test
+--- qt4-x11-4.3.2.orig/config.tests/unix/doubleformat.test
++++ qt4-x11-4.3.2/config.tests/unix/doubleformat.test
@@ -10,7 +10,7 @@
# build and run a test program
@@ -22,8 +22,8 @@
cd "$OUTDIR/config.tests/unix/doubleformat"
DOUBLEFORMAT="UNKNOWN"
---- qt4-x11-4.3.1.orig/config.tests/unix/endian.test
-+++ qt4-x11-4.3.1/config.tests/unix/endian.test
+--- qt4-x11-4.3.2.orig/config.tests/unix/endian.test
++++ qt4-x11-4.3.2/config.tests/unix/endian.test
@@ -10,7 +10,7 @@
# build and run a test program
@@ -33,8 +33,8 @@
cd "$OUTDIR/config.tests/unix/endian"
ENDIAN="UNKNOWN"
---- qt4-x11-4.3.1.orig/config.tests/unix/ptrsize.test
-+++ qt4-x11-4.3.1/config.tests/unix/ptrsize.test
+--- qt4-x11-4.3.2.orig/config.tests/unix/ptrsize.test
++++ qt4-x11-4.3.2/config.tests/unix/ptrsize.test
@@ -10,7 +10,7 @@
# build and run a test program
@@ -44,8 +44,8 @@
cd "$OUTDIR/config.tests/unix/ptrsize"
if [ "$VERBOSE" = "yes" ]; then
---- qt4-x11-4.3.1.orig/config.tests/x11/notype.test
-+++ qt4-x11-4.3.1/config.tests/x11/notype.test
+--- qt4-x11-4.3.2.orig/config.tests/x11/notype.test
++++ qt4-x11-4.3.2/config.tests/x11/notype.test
@@ -27,7 +27,7 @@
NOTYPE=yes
@@ -55,9 +55,9 @@
cd "$OUTDIR/config.tests/x11/notype"
if [ "$VERBOSE" = "yes" ]; then
---- qt4-x11-4.3.1.orig/configure
-+++ qt4-x11-4.3.1/configure
-@@ -3412,7 +3412,7 @@
+--- qt4-x11-4.3.2.orig/configure
++++ qt4-x11-4.3.2/configure
+@@ -3517,7 +3517,7 @@
}
# build qmake
@@ -66,7 +66,7 @@
echo "Creating qmake. Please wait..."
OLD_QCONFIG_H=
-@@ -5328,8 +5328,8 @@
+@@ -5438,8 +5438,8 @@
QMAKE_MOC_SRC = \$\$QT_BUILD_TREE/src/moc
#local paths that cannot be queried from the QT_INSTALL_* properties while building QTDIR
@@ -77,7 +77,7 @@
QMAKE_UIC3 = \$\$QT_BUILD_TREE/bin/uic3
QMAKE_RCC = \$\$QT_BUILD_TREE/bin/rcc
QMAKE_QDBUSXML2CPP = \$\$QT_BUILD_TREE/bin/qdbusxml2cpp
-@@ -5593,11 +5593,11 @@
+@@ -5703,11 +5703,11 @@
#-------------------------------------------------------------------------------
echo "Finding project files. Please wait..."
@@ -91,7 +91,7 @@
fi
# .projects -> projects to process
-@@ -5770,7 +5770,7 @@
+@@ -5880,7 +5880,7 @@
echo " for $a\c"
fi
@@ -100,9 +100,9 @@
QMAKE_ARGS="$QMAKE_SWITCHES $QMAKE_SPEC_ARGS"
if [ "$file" = ".projects.3" ]; then
if echo '\c' | grep '\c' >/dev/null; then
---- qt4-x11-4.3.1.orig/projects.pro
-+++ qt4-x11-4.3.1/projects.pro
-@@ -115,7 +115,7 @@
+--- qt4-x11-4.3.2.orig/projects.pro
++++ qt4-x11-4.3.2/projects.pro
+@@ -118,7 +118,7 @@
win32 {
qmake.files=$$QT_BUILD_TREE/bin/qmake.exe
} else {
@@ -111,9 +111,9 @@
}
INSTALLS += qmake
---- qt4-x11-4.3.1.orig/qmake/Makefile.unix
-+++ qt4-x11-4.3.1/qmake/Makefile.unix
-@@ -89,17 +89,17 @@
+--- qt4-x11-4.3.2.orig/qmake/Makefile.unix
++++ qt4-x11-4.3.2/qmake/Makefile.unix
+@@ -90,17 +90,17 @@
CXXFLAGS = @QMAKE_CXXFLAGS@ $(CPPFLAGS)
@@ -135,8 +135,8 @@
depend:
makedepend -D__MAKEDEPEND__ $(CPPFLAGS) $(DEPEND_SRC)
---- qt4-x11-4.3.1.orig/src/tools/moc/moc.pro
-+++ qt4-x11-4.3.1/src/tools/moc/moc.pro
+--- qt4-x11-4.3.2.orig/src/tools/moc/moc.pro
++++ qt4-x11-4.3.2/src/tools/moc/moc.pro
@@ -1,5 +1,5 @@
TEMPLATE = app
-TARGET = moc
@@ -144,8 +144,8 @@
CONFIG += console qtinc
CONFIG -= qt
---- qt4-x11-4.3.1.orig/src/tools/uic/uic.pro
-+++ qt4-x11-4.3.1/src/tools/uic/uic.pro
+--- qt4-x11-4.3.2.orig/src/tools/uic/uic.pro
++++ qt4-x11-4.3.2/src/tools/uic/uic.pro
@@ -9,7 +9,7 @@
unix:!contains(QT_CONFIG, zlib):LIBS += -lz
@@ -155,8 +155,8 @@
DESTDIR = ../../../bin
DEFINES += QT_BOOTSTRAPPED QT_UIC QT_LITE_UNICODE QT_NO_DATASTREAM \
---- qt4-x11-4.3.1.orig/tools/assistant/assistant.pro
-+++ qt4-x11-4.3.1/tools/assistant/assistant.pro
+--- qt4-x11-4.3.2.orig/tools/assistant/assistant.pro
++++ qt4-x11-4.3.2/tools/assistant/assistant.pro
@@ -2,7 +2,7 @@
TEMPLATE = app
@@ -166,8 +166,8 @@
CONFIG += qt warn_on
---- qt4-x11-4.3.1.orig/tools/designer/src/designer/designer.pro
-+++ qt4-x11-4.3.1/tools/designer/src/designer/designer.pro
+--- qt4-x11-4.3.2.orig/tools/designer/src/designer/designer.pro
++++ qt4-x11-4.3.2/tools/designer/src/designer/designer.pro
@@ -25,7 +25,7 @@
DEFINES += QT_DESIGNER_STATIC
}
@@ -177,8 +177,8 @@
include($$QT_SOURCE_TREE/tools/shared/fontpanel/fontpanel.pri)
---- qt4-x11-4.3.1.orig/tools/linguist/linguist/linguist.pro
-+++ qt4-x11-4.3.1/tools/linguist/linguist/linguist.pro
+--- qt4-x11-4.3.2.orig/tools/linguist/linguist/linguist.pro
++++ qt4-x11-4.3.2/tools/linguist/linguist/linguist.pro
@@ -50,7 +50,7 @@
DEFINES += QT_KEYWORDS
@@ -188,8 +188,8 @@
win32:RC_FILE = linguist.rc
---- qt4-x11-4.3.1.orig/tools/linguist/lrelease/lrelease.pro
-+++ qt4-x11-4.3.1/tools/linguist/lrelease/lrelease.pro
+--- qt4-x11-4.3.2.orig/tools/linguist/lrelease/lrelease.pro
++++ qt4-x11-4.3.2/tools/linguist/lrelease/lrelease.pro
@@ -29,7 +29,7 @@
SOURCES += $$PROPARSERPATH/proitems.cpp \
$$PROPARSERPATH/proreader.cpp
@@ -199,8 +199,8 @@
INCLUDEPATH += ../shared
DESTDIR = ../../../bin
---- qt4-x11-4.3.1.orig/tools/linguist/lupdate/lupdate.pro
-+++ qt4-x11-4.3.1/tools/linguist/lupdate/lupdate.pro
+--- qt4-x11-4.3.2.orig/tools/linguist/lupdate/lupdate.pro
++++ qt4-x11-4.3.2/tools/linguist/lupdate/lupdate.pro
@@ -39,7 +39,7 @@
$$PROPARSERPATH/proreader.cpp
@@ -210,8 +210,8 @@
INCLUDEPATH += ../shared
DESTDIR = ../../../bin
---- qt4-x11-4.3.1.orig/tools/qtconfig/qtconfig.pro
-+++ qt4-x11-4.3.1/tools/qtconfig/qtconfig.pro
+--- qt4-x11-4.3.2.orig/tools/qtconfig/qtconfig.pro
++++ qt4-x11-4.3.2/tools/qtconfig/qtconfig.pro
@@ -16,7 +16,7 @@
RESOURCES = qtconfig.qrc
Modified: trunk/packages/qt4-x11/debian/patches/06_qtdemo_destdir.diff
===================================================================
--- trunk/packages/qt4-x11/debian/patches/06_qtdemo_destdir.diff 2007-10-05 11:29:07 UTC (rev 7345)
+++ trunk/packages/qt4-x11/debian/patches/06_qtdemo_destdir.diff 2007-10-06 16:10:34 UTC (rev 7346)
@@ -2,8 +2,8 @@
Fix qtdemo destdir.
---- qt4-x11-4.3.1.orig/demos/arthurplugin/arthurplugin.pro
-+++ qt4-x11-4.3.1/demos/arthurplugin/arthurplugin.pro
+--- qt4-x11-4.3.2.orig/demos/arthurplugin/arthurplugin.pro
++++ qt4-x11-4.3.2/demos/arthurplugin/arthurplugin.pro
@@ -3,7 +3,7 @@
CONFIG += designer plugin debug_and_release
@@ -13,8 +13,8 @@
contains(QT_CONFIG, opengl) {
DEFINES += QT_OPENGL_SUPPORT
---- qt4-x11-4.3.1.orig/demos/qtdemo/qtdemo.pro
-+++ qt4-x11-4.3.1/demos/qtdemo/qtdemo.pro
+--- qt4-x11-4.3.2.orig/demos/qtdemo/qtdemo.pro
++++ qt4-x11-4.3.2/demos/qtdemo/qtdemo.pro
@@ -1,6 +1,6 @@
CONFIG += assistant x11inc
TARGET = qtdemo
Modified: trunk/packages/qt4-x11/debian/patches/20_mips_atomic_ops.diff
===================================================================
--- trunk/packages/qt4-x11/debian/patches/20_mips_atomic_ops.diff 2007-10-05 11:29:07 UTC (rev 7345)
+++ trunk/packages/qt4-x11/debian/patches/20_mips_atomic_ops.diff 2007-10-06 16:10:34 UTC (rev 7346)
@@ -2,8 +2,8 @@
Fix compilation for Linux MIPS-I code.
---- qt4-x11-4.3.1.orig/src/corelib/arch/mips/qatomic32.s
-+++ qt4-x11-4.3.1/src/corelib/arch/mips/qatomic32.s
+--- qt4-x11-4.3.2.orig/src/corelib/arch/mips/qatomic32.s
++++ qt4-x11-4.3.2/src/corelib/arch/mips/qatomic32.s
@@ -6,10 +6,12 @@
.globl q_atomic_test_and_set_int
.ent q_atomic_test_and_set_int
Modified: trunk/packages/qt4-x11/debian/patches/30_arm_ftbfs_fixes.diff
===================================================================
--- trunk/packages/qt4-x11/debian/patches/30_arm_ftbfs_fixes.diff 2007-10-05 11:29:07 UTC (rev 7345)
+++ trunk/packages/qt4-x11/debian/patches/30_arm_ftbfs_fixes.diff 2007-10-06 16:10:34 UTC (rev 7346)
@@ -2,8 +2,8 @@
Fix arm FTBFS.
---- qt4-x11-4.3.1.orig/tools/qtestlib/src/qtestcase.h
-+++ qt4-x11-4.3.1/tools/qtestlib/src/qtestcase.h
+--- qt4-x11-4.3.2.orig/tools/qtestlib/src/qtestcase.h
++++ qt4-x11-4.3.2/tools/qtestlib/src/qtestcase.h
@@ -210,7 +210,7 @@
template <typename T1, typename T2>
bool qCompare(T1 const &, T2 const &, const char *, const char *, const char *, int);
Modified: trunk/packages/qt4-x11/debian/patches/31_arm_eabi_fix.diff
===================================================================
--- trunk/packages/qt4-x11/debian/patches/31_arm_eabi_fix.diff 2007-10-05 11:29:07 UTC (rev 7345)
+++ trunk/packages/qt4-x11/debian/patches/31_arm_eabi_fix.diff 2007-10-06 16:10:34 UTC (rev 7346)
@@ -2,8 +2,8 @@
Add support for EABI ARM platforms to Qt.
---- qt4-x11-4.3.1.orig/src/corelib/global/qglobal.h
-+++ qt4-x11-4.3.1/src/corelib/global/qglobal.h
+--- qt4-x11-4.3.2.orig/src/corelib/global/qglobal.h
++++ qt4-x11-4.3.2/src/corelib/global/qglobal.h
@@ -331,7 +331,7 @@
# if defined(Q_OS_DARWIN) && __GNUC__ == 3 && (__GNUC_MINOR__ >= 1 && __GNUC_MINOR__ < 3)
# define Q_BROKEN_DEBUG_STREAM
Modified: trunk/packages/qt4-x11/debian/patches/40_alpha_ice.diff
===================================================================
--- trunk/packages/qt4-x11/debian/patches/40_alpha_ice.diff 2007-10-05 11:29:07 UTC (rev 7345)
+++ trunk/packages/qt4-x11/debian/patches/40_alpha_ice.diff 2007-10-06 16:10:34 UTC (rev 7346)
@@ -1,5 +1,5 @@
---- qt4-x11-4.3.1.orig/src/corelib/global/qlibraryinfo.cpp
-+++ qt4-x11-4.3.1/src/corelib/global/qlibraryinfo.cpp
+--- qt4-x11-4.3.2.orig/src/corelib/global/qlibraryinfo.cpp
++++ qt4-x11-4.3.2/src/corelib/global/qlibraryinfo.cpp
@@ -69,14 +69,7 @@
{
public:
@@ -32,8 +32,8 @@
QLibrarySettings::QLibrarySettings()
{
settings = QLibraryInfoPrivate::findConfiguration();
---- qt4-x11-4.3.1.orig/src/corelib/tools/qhash.h
-+++ qt4-x11-4.3.1/src/corelib/tools/qhash.h
+--- qt4-x11-4.3.2.orig/src/corelib/tools/qhash.h
++++ qt4-x11-4.3.2/src/corelib/tools/qhash.h
@@ -479,7 +479,7 @@
}
Modified: trunk/packages/qt4-x11/debian/patches/41_disable_opengl_visibility.diff
===================================================================
--- trunk/packages/qt4-x11/debian/patches/41_disable_opengl_visibility.diff 2007-10-05 11:29:07 UTC (rev 7345)
+++ trunk/packages/qt4-x11/debian/patches/41_disable_opengl_visibility.diff 2007-10-06 16:10:34 UTC (rev 7346)
@@ -1,7 +1,7 @@
temporary fix because of alpha, has to be dropped as soon as gcc's bug is fixed.
---- qt4-x11-4.3.1.orig/src/opengl/opengl.pro
-+++ qt4-x11-4.3.1/src/opengl/opengl.pro
+--- qt4-x11-4.3.2.orig/src/opengl/opengl.pro
++++ qt4-x11-4.3.2/src/opengl/opengl.pro
@@ -5,6 +5,7 @@
win32-msvc*|win32-icc:QMAKE_LFLAGS += /BASE:0x63000000
solaris-cc*:QMAKE_CXXFLAGS_RELEASE -= -O2
Modified: trunk/packages/qt4-x11/debian/patches/50_kfreebsd_build_fix.diff
===================================================================
--- trunk/packages/qt4-x11/debian/patches/50_kfreebsd_build_fix.diff 2007-10-05 11:29:07 UTC (rev 7345)
+++ trunk/packages/qt4-x11/debian/patches/50_kfreebsd_build_fix.diff 2007-10-06 16:10:34 UTC (rev 7346)
@@ -2,8 +2,8 @@
Fixes FTBFS on GNU/kFreeBSD by creating new Q_OS_GLIBC.
---- qt4-x11-4.3.1.orig/src/corelib/global/qglobal.h
-+++ qt4-x11-4.3.1/src/corelib/global/qglobal.h
+--- qt4-x11-4.3.2.orig/src/corelib/global/qglobal.h
++++ qt4-x11-4.3.2/src/corelib/global/qglobal.h
@@ -125,6 +125,12 @@
# define Q_OS_RELIANT
#elif defined(__linux__) || defined(__linux)
@@ -26,8 +26,8 @@
#elif defined(__DGUX__)
# define Q_OS_DGUX
#elif defined(__QNXNTO__)
---- qt4-x11-4.3.1.orig/src/corelib/plugin/qlibrary.cpp
-+++ qt4-x11-4.3.1/src/corelib/plugin/qlibrary.cpp
+--- qt4-x11-4.3.2.orig/src/corelib/plugin/qlibrary.cpp
++++ qt4-x11-4.3.2/src/corelib/plugin/qlibrary.cpp
@@ -293,11 +293,11 @@
#if defined(Q_OS_UNIX) && !defined(Q_OS_MAC)
@@ -42,8 +42,8 @@
static long qt_find_pattern(const char *s, ulong s_len,
const char *pattern, ulong p_len)
---- qt4-x11-4.3.1.orig/src/corelib/tools/qlocale.cpp
-+++ qt4-x11-4.3.1/src/corelib/tools/qlocale.cpp
+--- qt4-x11-4.3.2.orig/src/corelib/tools/qlocale.cpp
++++ qt4-x11-4.3.2/src/corelib/tools/qlocale.cpp
@@ -63,7 +63,7 @@
#include <qdebug.h>
#include <time.h>
Modified: trunk/packages/qt4-x11/debian/patches/60_m68k_inotify_fix.diff
===================================================================
--- trunk/packages/qt4-x11/debian/patches/60_m68k_inotify_fix.diff 2007-10-05 11:29:07 UTC (rev 7345)
+++ trunk/packages/qt4-x11/debian/patches/60_m68k_inotify_fix.diff 2007-10-06 16:10:34 UTC (rev 7346)
@@ -3,8 +3,8 @@
From Roman Zippel <zippel at linux-m68k.org>: These defines are taken from the
m68k tree, they should appear like this soon also in the upstream source.
---- qt4-x11-4.3.1.orig/src/corelib/io/qfilesystemwatcher_inotify.cpp
-+++ qt4-x11-4.3.1/src/corelib/io/qfilesystemwatcher_inotify.cpp
+--- qt4-x11-4.3.2.orig/src/corelib/io/qfilesystemwatcher_inotify.cpp
++++ qt4-x11-4.3.2/src/corelib/io/qfilesystemwatcher_inotify.cpp
@@ -103,6 +103,10 @@
# define __NR_inotify_init 269
# define __NR_inotify_add_watch 270
Modified: trunk/packages/qt4-x11/debian/patches/70_hppa_ldcw_fix.diff
===================================================================
--- trunk/packages/qt4-x11/debian/patches/70_hppa_ldcw_fix.diff 2007-10-05 11:29:07 UTC (rev 7345)
+++ trunk/packages/qt4-x11/debian/patches/70_hppa_ldcw_fix.diff 2007-10-06 16:10:34 UTC (rev 7346)
@@ -2,8 +2,8 @@
patch from Ubuntu to properly support hppa.
---- qt4-x11-4.3.1.orig/src/corelib/arch/parisc/q_ldcw.s
-+++ qt4-x11-4.3.1/src/corelib/arch/parisc/q_ldcw.s
+--- qt4-x11-4.3.2.orig/src/corelib/arch/parisc/q_ldcw.s
++++ qt4-x11-4.3.2/src/corelib/arch/parisc/q_ldcw.s
@@ -1,17 +1,7 @@
- .SPACE $PRIVATE$
- .SUBSPA $DATA$,QUAD=1,ALIGN=8,ACCESS=31
Modified: trunk/packages/qt4-x11/debian/patches/80_hurd_max_path.diff
===================================================================
--- trunk/packages/qt4-x11/debian/patches/80_hurd_max_path.diff 2007-10-05 11:29:07 UTC (rev 7345)
+++ trunk/packages/qt4-x11/debian/patches/80_hurd_max_path.diff 2007-10-06 16:10:34 UTC (rev 7346)
@@ -1,7 +1,7 @@
author: Brian Nelson <pyro at debian.org>
---- qt4-x11-4.3.1.orig/src/corelib/io/qfsfileengine_unix.cpp
-+++ qt4-x11-4.3.1/src/corelib/io/qfsfileengine_unix.cpp
+--- qt4-x11-4.3.2.orig/src/corelib/io/qfsfileengine_unix.cpp
++++ qt4-x11-4.3.2/src/corelib/io/qfsfileengine_unix.cpp
@@ -55,6 +55,10 @@
# include <private/qcore_mac_p.h>
#endif
Added: trunk/packages/qt4-x11/debian/patches/90_qmake_cxxflags_fpermissive.diff
===================================================================
--- trunk/packages/qt4-x11/debian/patches/90_qmake_cxxflags_fpermissive.diff (rev 0)
+++ trunk/packages/qt4-x11/debian/patches/90_qmake_cxxflags_fpermissive.diff 2007-10-06 16:10:34 UTC (rev 7346)
@@ -0,0 +1,13 @@
+author: Matthias Klose <doko at debian.org>
+
+--- qt4-x11-4.3.2.orig/mkspecs/common/g++.conf
++++ qt4-x11-4.3.2/mkspecs/common/g++.conf
+@@ -17,7 +17,7 @@
+ QMAKE_CFLAGS_USE_PRECOMPILE += -include ${QMAKE_PCH_OUTPUT_BASE}
+
+ QMAKE_CXX = g++
+-QMAKE_CXXFLAGS += $$QMAKE_CFLAGS
++QMAKE_CXXFLAGS += $$QMAKE_CFLAGS -fpermissive
+ QMAKE_CXXFLAGS_DEPS += $$QMAKE_CFLAGS_DEPS
+ QMAKE_CXXFLAGS_WARN_ON += $$QMAKE_CFLAGS_WARN_ON
+ QMAKE_CXXFLAGS_WARN_OFF += $$QMAKE_CFLAGS_WARN_OFF
Modified: trunk/packages/qt4-x11/debian/patches/series
===================================================================
--- trunk/packages/qt4-x11/debian/patches/series 2007-10-05 11:29:07 UTC (rev 7345)
+++ trunk/packages/qt4-x11/debian/patches/series 2007-10-06 16:10:34 UTC (rev 7346)
@@ -1,17 +1,20 @@
# qt-copy patches
0163-fix-gcc43-support.diff
0167-fix-group-reading.diff
-#0172-prefer-xrandr-over-xinerama.diff
0175-fix-s390-qatomic.diff
0176-coverity-fixes.diff
0178-transparency-window-types.diff
0179-transient-hack.diff
0180-window-role.diff
-#0181-qdnd-x11-fix.diff
-#0182-argb-visuals-default.diff
0185-fix-format-strings.diff
-0186-fix-component-alpha-text.diff
0187-fix-font-fixed-pitch.diff
+0188-fix-moc-parser-same-name-header.diff
+0189-fix-q3toolbar-qcombobox-signal-slot.diff
+0191-listview-alternate-row-colors.diff
+0192-itemdelegate-palette-state.diff
+0193-qtreeview-division-by-zero.diff
+0194-fix-moveonly-dnd-in-itemviews.diff
+0195-compositing-properties.diff
# debian patches
01_qmake_for_debian.diff
@@ -29,3 +32,4 @@
60_m68k_inotify_fix.diff
70_hppa_ldcw_fix.diff
80_hurd_max_path.diff
+90_qmake_cxxflags_fpermissive.diff
Modified: trunk/packages/qt4-x11/debian/qt4-qtconfig.menu
===================================================================
--- trunk/packages/qt4-x11/debian/qt4-qtconfig.menu 2007-10-05 11:29:07 UTC (rev 7345)
+++ trunk/packages/qt4-x11/debian/qt4-qtconfig.menu 2007-10-06 16:10:34 UTC (rev 7346)
@@ -1,6 +1,6 @@
?package(qt4-qtconfig):\
needs="x11"\
- section="Applications/System"\
+ section="Applications/System/Administration"\
title="QtConfig"\
longtitle="Qt Configuration Utility"\
hints="Qt4 config tool"\
Modified: trunk/packages/qt4-x11/debian/rules
===================================================================
--- trunk/packages/qt4-x11/debian/rules 2007-10-05 11:29:07 UTC (rev 7345)
+++ trunk/packages/qt4-x11/debian/rules 2007-10-06 16:10:34 UTC (rev 7346)
@@ -3,7 +3,10 @@
export QTDIR := $(shell pwd)
export PATH := $(QTDIR)/bin:$(PATH)
export LD_LIBRARY_PATH := $(QTDIR)/lib:$(LD_LIBRARY_PATH)
+export CXXFLAGS := -fpermissive
+QTVERSION := $(shell ls changes-* | cut -f2 -d '-')
+
include /usr/share/cdbs/1/rules/debhelper.mk
include /usr/share/cdbs/1/class/makefile.mk
include /usr/share/cdbs/1/rules/patchsys-quilt.mk
@@ -21,14 +24,18 @@
DEB_MAKE_CLEAN_TARGET := confclean distclean
DEB_DH_MAKESHLIBS_ARGS_ALL := -V
-DEB_DH_STRIP_ARGS_libqt4-debug := -X.debug
+DEB_DH_STRIP_ARGS_libqt4-debug := --exclude=.debug
-DEB_INSTALL_CHANGELOGS_ALL := changes-4.3.1
+DEB_INSTALL_CHANGELOGS_ALL := changes-$(QTVERSION)
+DEB_INSTALL_DOCS_ALL := GPL_EXCEPTION_ADDENDUM.TXT
+
ifeq ($(DEB_HOST_ARCH),arm)
EXTRA_CONFIGURE_OPTS += -DQT_QLOCALE_USES_FCVT
endif
+DEB_CONFIGURE_SCRIPT_ENV += CXXFLAGS=-fpermissive
+
ifeq ($(DEB_HOST_ARCH_OS),linux)
PLATFORM_ARG = linux-g++
else
@@ -123,22 +130,30 @@
common-install-arch::
# Fix wrong path in pkgconfig files
for f in QtAssistantClient.pc QtDBus.pc QtTest.pc QtUiTools.pc; do \
- sed -i "s|-L/build/buildd/qt4-x11-4.3.0/lib||g" $(PKGCONFIGDIR)/$$f; \
+ sed -i "s|-L/build/buildd/qt4-x11-$(QTVERSION)/lib||g" $(PKGCONFIGDIR)/$$f; \
done
install/qt4-designer::
install -D -p -m0644 debian/desktop/designer-qt4.desktop \
debian/qt4-designer/usr/share/applications/designer-qt4.desktop
+ install -D -p -m0644 debian/desktop/designer.png \
+ debian/qt4-designer/usr/share/pixmaps/designer.png
install/qt4-dev-tools::
install -D -p -m0644 debian/desktop/assistant-qt4.desktop \
debian/qt4-dev-tools/usr/share/applications/assistant-qt4.desktop
+ install -D -p -m0644 debian/desktop/assistant.png \
+ debian/qt4-dev-tools/usr/share/pixmaps/assistant.png
install -D -p -m0644 debian/desktop/linguist-qt4.desktop \
debian/qt4-dev-tools/usr/share/applications/linguist-qt4.desktop
+ install -D -p -m0644 debian/desktop/linguist.png \
+ debian/qt4-dev-tools/usr/share/pixmaps/linguist.png
install/qt4-qtconfig::
install -D -p -m0644 debian/desktop/qt4config.desktop \
debian/qt4-qtconfig/usr/share/applications/qt4config.desktop
+ install -D -p -m0644 debian/desktop/qtconfig.png \
+ debian/qt4-qtconfig/usr/share/pixmaps/qtconfig.png
binary-install/qt4-doc::
# Tar up the examples to include them in qt4-doc
More information about the pkg-kde-commits
mailing list