--- qt4-x11-4.3.3.orig/debian/libqt4-dev.install +++ qt4-x11-4.3.3/debian/libqt4-dev.install @@ -0,0 +1,17 @@ +usr/include/qt4/* +usr/lib/*.a +usr/lib/*.so +usr/lib/*.prl +usr/lib/pkgconfig/ +usr/share/qt4/q3porting.xml +usr/share/qt4/mkspecs/* +usr/bin/qmake-qt4 +usr/bin/lupdate-qt4 +usr/bin/lrelease-qt4 +usr/bin/uic-qt4 +usr/bin/moc-qt4 +usr/bin/qt3to4 +usr/bin/rcc +usr/bin/uic3 +usr/bin/qdbusxml2cpp +usr/bin/qdbuscpp2xml --- qt4-x11-4.3.3.orig/debian/libqt4-debug-dev.install +++ qt4-x11-4.3.3/debian/libqt4-debug-dev.install @@ -0,0 +1,4 @@ +usr/lib/*_debug.so +usr/lib/*_debug.prl +usr/lib/*_debug.pc usr/lib/pkgconfig/ +usr/lib/*_debug.a --- qt4-x11-4.3.3.orig/debian/libqt4-debug.lintian +++ qt4-x11-4.3.3/debian/libqt4-debug.lintian @@ -0,0 +1 @@ +libqt4-debug: package-name-doesnt-match-sonames --- qt4-x11-4.3.3.orig/debian/qt4-designer.prerm +++ qt4-x11-4.3.3/debian/qt4-designer.prerm @@ -0,0 +1,12 @@ +#!/bin/sh + +set -e + +case "$1" in + upgrade) ;; + remove|failed-upgrade|deconfigure) + update-alternatives --remove designer "/usr/bin/designer-qt4" + ;; +esac + +#DEBHELPER# --- qt4-x11-4.3.3.orig/debian/qt4-qtconfig.menu +++ qt4-x11-4.3.3/debian/qt4-qtconfig.menu @@ -0,0 +1,7 @@ +?package(qt4-qtconfig):\ + needs="x11"\ + section="Applications/System/Administration"\ + title="QtConfig"\ + longtitle="Qt Configuration Utility"\ + hints="Qt4 config tool"\ + command="/usr/bin/qtconfig-qt4" --- qt4-x11-4.3.3.orig/debian/copyright +++ qt4-x11-4.3.3/debian/copyright @@ -0,0 +1,374 @@ +This package was debianized by Brian Nelson on Sun, 10 +Apr 2005 21:23:49 -0700. + +It was downloaded from ftp://ftp.trolltech.com/qt/source + +Upstream Author: + + 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. + + This package is distributed in the hope that it will be useful, but + WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this package; if not, write to the Free Software + Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + 02110-1301, USA. + +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 to allow linking +against non-GPL libraries and applications: + +Trolltech GPL Exception version 1.1 +=================================== + +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 +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. + +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: + +A) Your Software is licensed under one of the following licenses: + + +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 Development and + Distribution License (CDDL) 1.0 +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). + + +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. + +and + +C) Your or any other contributor's rights to: + + i) distribute the source code of Your Software to anyone for + any purpose; + + and + + 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 +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. + +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) + +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. + +-------------------------------------------------------------------------- + --- qt4-x11-4.3.3.orig/debian/qt4-dev-tools.install +++ qt4-x11-4.3.3/debian/qt4-dev-tools.install @@ -0,0 +1,5 @@ +usr/bin/assistant-qt4 +usr/bin/linguist-qt4 +usr/bin/qdbusviewer +usr/bin/pixeltool +usr/share/qt4/phrasebooks/* --- qt4-x11-4.3.3.orig/debian/libqt4-sql.lintian +++ qt4-x11-4.3.3/debian/libqt4-sql.lintian @@ -0,0 +1 @@ +libqt4-sql: package-name-doesnt-match-sonames libQtSql4 --- qt4-x11-4.3.3.orig/debian/qt4-dev-tools.menu +++ qt4-x11-4.3.3/debian/qt4-dev-tools.menu @@ -0,0 +1,13 @@ +?package(qt4-dev-tools):\ + needs="x11"\ + section="Applications/Programming"\ + hints="KDE"\ + title="Qt Assistant"\ + command="/usr/bin/assistant-qt4" + +?package(qt4-dev-tools):\ + needs="x11"\ + section="Applications/Programming"\ + hints="KDE"\ + title="Qt Linguist"\ + command="/usr/bin/linguist-qt4" --- qt4-x11-4.3.3.orig/debian/libqt4-sql.install +++ qt4-x11-4.3.3/debian/libqt4-sql.install @@ -0,0 +1 @@ +usr/lib/libQtSql.so.* --- qt4-x11-4.3.3.orig/debian/control +++ qt4-x11-4.3.3/debian/control @@ -0,0 +1,163 @@ +Source: qt4-x11 +Section: libs +Priority: optional +Maintainer: Ubuntu Core developers +XSBC-Original-Maintainer: Debian Qt/KDE Maintainers +Uploaders: Brian Nelson , Sune Vuorela , Fathi Boudra , Ana Beatriz Guerrero Lopez +Build-Depends: cdbs, debhelper (>= 5), quilt, sharutils, libxext-dev (>= 4.3.0.dfsg.1-4), libxrandr-dev (>= 4.3.0.dfsg.1-4), x11proto-core-dev, libsm-dev (>= 4.3.0.dfsg.1-4), libxmu-dev (>= 4.3.0.dfsg.1-4), libice-dev (>= 4.3.0.dfsg.1-4), unixodbc-dev, libx11-dev (>= 4.3.0.dfsg.1-4), libxt-dev (>= 4.3.0.dfsg.1-4), libjpeg62-dev, zlib1g-dev, libmng-dev (>= 1.0.3), libpng12-dev, libfreetype6-dev, libmysqlclient15-dev, flex, libpq-dev, libaudio-dev, libcupsys2-dev, xlibmesa-gl-dev | libgl-dev, libglu1-xorg-dev | libglu1-mesa-dev | libglu-dev, libxft-dev, libxrender-dev, libxcursor-dev, libxinerama-dev, libsqlite0-dev, libsqlite3-dev, libdbus-1-dev, libglib2.0-dev, libxi-dev +Standards-Version: 3.7.2 + +Package: libqt4-dev +Architecture: any +Section: libdevel +Depends: ${misc:Depends}, libqt4-core (= ${binary:Version}), libqt4-gui (= ${binary:Version}), libqt4-sql (= ${binary:Version}), libqt4-qt3support (= ${binary:Version}), libxext-dev (>= 4.3.0.dfsg.1-4), libxrandr-dev (>= 4.3.0.dfsg.1-4), x11proto-core-dev, libsm-dev (>= 4.3.0.dfsg.1-4), libxmu-dev (>= 4.3.0.dfsg.1-4), libice-dev (>= 4.3.0.dfsg.1-4), libx11-dev (>= 4.3.0.dfsg.1-4), libxt-dev (>= 4.3.0.dfsg.1-4), libxrender-dev, libxcursor-dev, libxinerama-dev, libxi-dev, libmng-dev (>= 1.0.3), libpng12-0-dev, libjpeg62-dev, zlib1g-dev, libfreetype6-dev, xlibmesa-gl-dev | libgl-dev, libglu1-xorg-dev | libglu1-mesa-dev | libglu-dev, libxft-dev, libaudio-dev, libpq-dev, libglib2.0-dev, libsqlite0-dev +Conflicts: qt3-dev-tools (<= 3:3.3.4-7) +Recommends: qt4-dev-tools +Suggests: qt4-doc +Description: Qt 4 development files + Qt is a cross-platform C++ application framework. Qt's primary feature + is its rich set of widgets that provide standard GUI functionality. + . + This packages contains the header development files and development + programs such as qmake used for building Qt4 applications. + . + Homepage: http://www.trolltech.com + +Package: libqt4-core +Architecture: any +Section: libs +Depends: ${shlibs:Depends}, ${misc:Depends} +Description: Qt 4 core non-GUI functionality runtime library + Qt is a cross-platform C++ application framework. Qt's primary feature + is its rich set of widgets that provide standard GUI functionality. + . + This packages contains the core non-GUI shared library, and the Network + and XML modules. + . + Homepage: http://www.trolltech.com + +Package: libqt4-gui +Architecture: any +Section: libs +Depends: ${shlibs:Depends}, ${misc:Depends}, fontconfig +Recommends: qt4-qtconfig +Replaces: libqt4-core (<< 4.0.1-3), qt4-designer (<< 4.1.4), libqt4-designer +Conflicts: libqt4-designer +Description: Qt 4 core GUI functionality runtime library + Qt is a cross-platform C++ application framework. Qt's primary feature + is its rich set of widgets that provide standard GUI functionality. + . + This packages contains the core GUI shared library and the OpenGL + module. + . + Homepage: http://www.trolltech.com + +Package: libqt4-sql +Architecture: any +Section: libs +Depends: ${shlibs:Depends}, ${misc:Depends} +Suggests: libqt4-dev +Description: Qt 4 SQL database module + Qt is a cross-platform C++ application framework. Qt's primary feature + is its rich set of widgets that provide standard GUI functionality. + . + This package contains the SQL module for Qt. It includes support for + PostgreSQL, MySQL, and SQLite databases. If you wish to to use the SQL + module for development, you should install the libqt4-dev package. + . + Homepage: http://www.trolltech.com + +Package: libqt4-qt3support +Architecture: any +Section: libs +Depends: ${shlibs:Depends}, ${misc:Depends} +Replaces: libqt4-gui (<< 4.2.1-1) +Description: Qt 3 compatibility library for Qt 4 + Qt is a cross-platform C++ application framework. Qt's primary feature + is its rich set of widgets that provide standard GUI functionality. + . + This packages contains the Qt 3 compatibility library for Qt 4. It + allows applications designed to use deprecated Qt 3 classes and + functions to work with Qt 4, with help from the qt3to4 porting tool + found in the libqt4-dev package. + . + Homepage: http://www.trolltech.com + +Package: qt4-designer +Architecture: any +Section: devel +Depends: ${shlibs:Depends}, ${misc:Depends}, libqt4-dev +Conflicts: libqt4-designer +Replaces: libqt4-designer, qt4-dev-tools (<= 4.0.1-2) +Description: Qt 4 Designer + Qt is a cross-platform C++ application framework. Qt's primary feature + is its rich set of widgets that provide standard GUI functionality. + . + Qt Designer is a tool for designing and building graphical user + interfaces (GUIs) from Qt components. + . + Homepage: http://www.trolltech.com + +Package: libqt4-debug +Architecture: any +Depends: ${shlibs:Depends}, ${misc:Depends}, libqt4-gui (= ${binary:Version}) +Description: Qt 4 library debugging symbols + Qt is a cross-platform C++ application framework. Qt's primary feature + is its rich set of widgets that provide standard GUI functionality. + . + This packages contains the debugging symbols for the Qt 4 libraries. + . + Homepage: http://www.trolltech.com + +Package: qt4-dev-tools +Architecture: any +Section: devel +Depends: ${shlibs:Depends}, ${misc:Depends}, libqt4-core (= ${binary:Version}) +Conflicts: qt3-assistant (<= 3:3.3.4-7), qt3-designer (<= 3:3.3.4-7), qt3-linguist (<= 3:3.3.4-7), qdbusviewer +Recommends: libqt4-dev, qt4-doc, qt4-designer +Description: Qt 4 development tools + Qt is a cross-platform C++ application framework. Qt's primary feature + 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, Linguist, DBus Viewer and Pixel Tool applications. + . + Homepage: http://www.trolltech.com + +Package: qt4-qtconfig +Architecture: any +Section: x11 +Depends: ${shlibs:Depends}, ${misc:Depends} +Replaces: libqt4-gui (<< 4.1.0) +Conflicts: qt3-qtconfig (<= 3:3.3.4-7) +Description: Qt 4 configuration tool + Qt is a cross-platform C++ application framework. Qt's primary feature + is its rich set of widgets that provide standard GUI functionality. + . + The Qt Configuration program allows endusers to configure the look and + behavior of any Qt4 application. + . + Homepage: http://www.trolltech.com + +Package: qt4-doc +Architecture: all +Section: doc +Depends: ${misc:Depends} +Suggests: w3m | www-browser, libqt4-dev, qt4-dev-tools +Description: Qt 4 API documentation + Qt is a cross-platform C++ application framework. Qt's primary feature + is its rich set of widgets that provide standard GUI functionality. + . + This package contains the complete Qt 4 API documentation. The + documentation is provided in HTML and manpage format; the HTML version + can be viewed in conjunction with the Qt Assistant found in the + qt4-dev-tools package. + +Package: libqt4-plugin-odbc +Architecture: any +Section: libs +Depends: ${shlibs:Depends}, ${misc:Depends} +Suggests: libqt4-dev +Description: ODBC database driver for Qt4 + This package contains the ODBC plugin for Qt4. Install it if + you intend to use or write Qt programs that are to access an ODBC DB. --- qt4-x11-4.3.3.orig/debian/qt4-dev-tools.postinst +++ qt4-x11-4.3.3/debian/qt4-dev-tools.postinst @@ -0,0 +1,15 @@ +#!/bin/sh + +set -e + +update-alternatives --install \ + /usr/bin/assistant assistant "/usr/bin/assistant-qt4" "40" \ + --slave /usr/share/man/man1/assistant.1.gz assistant.1.gz \ + "/usr/share/man/man1/assistant-qt4.1.gz" + +update-alternatives --install \ + /usr/bin/linguist linguist "/usr/bin/linguist-qt4" "40" \ + --slave /usr/share/man/man1/linguist.1.gz linguist.1.gz \ + "/usr/share/man/man1/linguist-qt4.1.gz" + +#DEBHELPER# --- qt4-x11-4.3.3.orig/debian/qt4-qtconfig.install +++ qt4-x11-4.3.3/debian/qt4-qtconfig.install @@ -0,0 +1 @@ +usr/bin/qtconfig-qt4 --- qt4-x11-4.3.3.orig/debian/qt4-designer.install +++ qt4-x11-4.3.3/debian/qt4-designer.install @@ -0,0 +1,2 @@ +usr/bin/designer-qt4 +usr/lib/qt4/plugins/designer/*.so --- qt4-x11-4.3.3.orig/debian/qt4-qtconfig.postinst +++ qt4-x11-4.3.3/debian/qt4-qtconfig.postinst @@ -0,0 +1,10 @@ +#!/bin/sh + +set -e + +update-alternatives --install \ + /usr/bin/qtconfig qtconfig "/usr/bin/qtconfig-qt4" "40" \ + --slave /usr/share/man/man1/qtconfig.1.gz qtconfig.1.gz \ + "/usr/share/man/man1/qtconfig-qt4.1.gz" + +#DEBHELPER# --- qt4-x11-4.3.3.orig/debian/libqt4-core.install +++ qt4-x11-4.3.3/debian/libqt4-core.install @@ -0,0 +1,8 @@ +usr/lib/libQtCore.so.* +usr/lib/libQtNetwork.so.* +usr/lib/libQtXml.so.* +usr/lib/libQtTest.so.* +usr/lib/libQtDBus.so.* +usr/lib/libQtScript.so.* +usr/bin/qdbus +usr/share/qt4/translations/*.qm --- qt4-x11-4.3.3.orig/debian/qt4-dev-tools.prerm +++ qt4-x11-4.3.3/debian/qt4-dev-tools.prerm @@ -0,0 +1,13 @@ +#!/bin/sh + +set -e + +case "$1" in + upgrade) ;; + remove|failed-upgrade|deconfigure) + update-alternatives --remove assistant "/usr/bin/assistant-qt4" + update-alternatives --remove linguist "/usr/bin/linguist-qt4" + ;; +esac + +#DEBHELPER# --- qt4-x11-4.3.3.orig/debian/qt4-designer.postinst +++ qt4-x11-4.3.3/debian/qt4-designer.postinst @@ -0,0 +1,10 @@ +#!/bin/sh + +set -e + +update-alternatives --install \ + /usr/bin/designer designer "/usr/bin/designer-qt4" "40" \ + --slave /usr/share/man/man1/designer.1.gz designer.1.gz \ + "/usr/share/man/man1/designer-qt4.1.gz" + +#DEBHELPER# --- qt4-x11-4.3.3.orig/debian/KUBUNTU-DEBIAN-DIFFERENCES +++ qt4-x11-4.3.3/debian/KUBUNTU-DEBIAN-DIFFERENCES @@ -0,0 +1,3 @@ +remove -nomake exmaples and -nomake demos from debian/rules +add qdbusviewer to qt4-dev-tools conflicts + --- qt4-x11-4.3.3.orig/debian/manpages/lrelease-qt4.1 +++ qt4-x11-4.3.3/debian/manpages/lrelease-qt4.1 @@ -0,0 +1,89 @@ +.TH lrelease 1 "18 October 2001" "Trolltech AS" \" -*- nroff -*- +.\" +.\" Copyright 2001 Trolltech AS. All rights reserved. +.\" +.\" This file may be distributed and/or modified under the terms of the +.\" GNU General Public License version 2 as published by the Free Software +.\" Foundation and appearing in the file LICENSE.GPL included in the +.\" packaging of this file. +.\" +.\" This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE +.\" WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. +.\" +.\" See http://www.trolltech.com/gpl/ for GPL licensing information. +.\" +.\" Contact info@trolltech.com if any conditions of this licensing are +.\" not clear to you. +.\" +.SH NAME +lrelease \- generate Qt message files from Qt Linguist translation files +.SH SYNOPSIS +.B lrelease +.RI "[ " options " ] " project-file +.br +.B lrelease +.RI "[ " options " ] " ts-files " [ -qm " qm-file " ]" +.SH DESCRIPTION +This page documents the +.B Qt Linguist Release +tool for the Qt GUI toolkit. +.B Lrelease +reads a qmake/tmake project file (.pro file) and converts the +translation files (.ts files) specified in it into Qt message files +(.qm files) used by the application to translate. +.PP +The .qm file format is a compact binary format that provides +extremely fast lookups for translations and that is used by Qt. +.SH OPTIONS +.TP +.I "-help" +Display the usage and exit. +.TP +.I "-nocompress" +Do not compress the .qm files. +.TP +.I "-verbose" +Explain what is being done. +.TP +.I "-version" +Display the version of +.B lrelease +and exit. +.SH USAGE +Here is an example .pro file that can be given to +.B lrelease: +.PP +.in +4 +.nf +HEADERS = funnydialog.h \\ + wackywidget.h +SOURCES = funnydialog.cpp \\ + main.cpp \\ + wackywidget.cpp +FORMS = fancybox.ui +TRANSLATIONS = gnomovision_dk.ts \\ + gnomovision_fi.ts \\ + gnomovision_no.ts \\ + gnomovision_se.ts +.fi +.in -4 +.PP +When running +.B lrelease +on this project file, the Qt message files gnomovision_dk.qm, +gnomovision_fi.qm, gnomovision_no.qm and gnomovision_se.qm will be +generated from gnomovision_dk.ts, gnomovision_fi.ts, +gnomovision_no.ts and gnomovision_se.ts, respectively. +.PP +.B Lrelease +can also be invoked with a list of .ts files to convert: +.PP +.in +4 +.nf +lrelease gnomovision_*.ts +.fi +.in -4 +.SH "SEE ALSO" +.BR lupdate (1) +and +.BR http://doc.trolltech.com/i18n.html --- qt4-x11-4.3.3.orig/debian/manpages/linguist-qt4.1 +++ qt4-x11-4.3.3/debian/manpages/linguist-qt4.1 @@ -0,0 +1,39 @@ +.TH "LINGUIST-QT4" "1" "4.0.0" "Troll Tech AS, Norway." "" +.SH "NAME" +linguist-qt4 \- translation tool for Qt4. + +.SH "SYNPOSIS" +.B linguist +[ +.I TRANSLATION +] + +.SH "DESCRIPTION" +.B Qt Linguist +is a tool for adding translations to Qt applications. It +introduces the concept of a translation "context" which +means a group of phrases that appear together on the +screen e.g. in the same menu or dialog. + +The only parameter accepted on the command line is +.I TRANSLATION +wich is the name of the translation file you wish to open. + +.SH FILES +.I ~/.qt/qt_designerrc +.RS +Per user configuration file. + +.SH SEE ALSO +.B Qt Linguist +is too complex to be described completely in the "man" page +format. If your system is properly configured, you can access +the full documentation within +.B Qt Linguist +under the Help menu. + +.SH AUTHOR +This manual page was originally written by Jeremy Lain + for the Qt3 linguist, for the Debian GNU/Linux +system (but may be used by others). Brian Nelson +trivially updated it for Qt4. --- qt4-x11-4.3.3.orig/debian/manpages/qmake-qt4.1 +++ qt4-x11-4.3.3/debian/manpages/qmake-qt4.1 @@ -0,0 +1,107 @@ +.TH QMAKE 1 "2005-07-23" +.SH NAME +qmake \- cross-platform makefile generator for Qt + +.SH SYNOPSIS +.B qmake +.I "[mode] [options] [files]" +.br +.SH "DESCRIPTION" +.B qmake +has two modes, one mode for generating project files based on some +heuristics, and the other for generating makefiles. Normally you +shouldn't need to specify a mode, as makefile generation is the default +mode for qmake, but you may use this to test qmake on an existing +project. + +.SH MODE +.TP +.B "\-project" +Put qmake into project file generation mode In this mode qmake +interprets files as files to be built, defaults to *.c; *.ui; *.y; *.l; +*.ts; *.qrc; *.h; *.hpp; *.hh; *.hxx; *.H; *.cpp; *.cc; *.cxx; *.C +.TP +.B "\-makefile" +Put qmake into makefile generation mode (default) In this mode qmake +interprets files as project files to be processed, if skipped qmake will +try to find a project file in your current working directory + +.SH WARNINGS OPTIONS +.TP +.BI "\-Wnone" +Turn off all warnings +.TP +.BI "\-Wall" +Turn on all warnings +.TP +.BI "\-Wparser" +Turn on parser warnings +.TP +.BI "\-Wlogic" +Turn on logic warnings + +.SH OPTIONS +.TP +.BI "\-o" file +Write output to file +.TP +.BI "\-unix" +Run in unix mode +.TP +.BI "\-win32" +Run in win32 mode +.TP +.BI "\-macx" +Run in Mac OS X mode +.TP +.BI "\-d" +Increase debug level +.TP +.BI "\-t" templ +Overrides TEMPLATE as templ +.TP +.BI "\-tp" prefix +Overrides TEMPLATE so that prefix is prefixed +.TP +into the value +.BI "\-help" +This help +.TP +.BI "\-v" +Version information +.TP +.BI "\-after" +All variable assignments after this will be parsed after [files] +.TP +.BI "\-norecursive" +Don't do a recursive search +.TP +.BI "\-recursive" +Do a recursive search +.TP +.BI "\-cache file" +Use file as cache [makefile mode only] +.TP +.BI "\-spec spec" +Use spec as QMAKESPEC [makefile mode only] +.TP +.BI "\-nocache" +Don't use a cache file [makefile mode only] +.TP +.BI "\-nodepend" +Don't generate dependencies [makefile mode only] +.TP +.BI "\-nomoc" +Don't generate moc targets [makefile mode only] +.TP +.BI "\-nopwd" +Don't look for files in pwd [project mode only] + +.SH SEE ALSO +.PP +.BR /usr/share/qt4/doc/html/qmake-manual.html, +.BR assistant (1) +.SH AUTHOR +This manual page was written by Brian Nelson based on +the output of +.B "qmake -help". --- qt4-x11-4.3.3.orig/debian/manpages/lupdate-qt4.1 +++ qt4-x11-4.3.3/debian/manpages/lupdate-qt4.1 @@ -0,0 +1,95 @@ +.TH lupdate 1 "18 October 2001" "Trolltech AS" \" -*- nroff -*- +.\" +.\" Copyright 2001 Trolltech AS. All rights reserved. +.\" +.\" This file may be distributed and/or modified under the terms of the +.\" GNU General Public License version 2 as published by the Free Software +.\" Foundation and appearing in the file LICENSE.GPL included in the +.\" packaging of this file. +.\" +.\" This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE +.\" WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. +.\" +.\" See http://www.trolltech.com/gpl/ for GPL licensing information. +.\" +.\" Contact info@trolltech.com if any conditions of this licensing are +.\" not clear to you. +.\" +.SH NAME +lupdate \- update Qt Linguist translation files +.SH SYNOPSIS +.B lupdate +.RI "[ " options " ] " project-file +.br +.B lupdate +.RI "[ " options " ] " source-files " -ts " ts-files +.SH DESCRIPTION +This page documents the +.B Qt Linguist Update +tool for the Qt GUI toolkit. +.B Lupdate +reads a qmake/tmake project file (.pro file), finds the translatable +strings in the specified source, header and interface files, and +updates the translation files (.ts files) specified in it. The +translation files are given to the translator who uses +.B Qt Linguist +to read the files and insert the translations. +.PP +The .ts file format is a simple human-readable XML format that can be +used with version control systems if required. +.PP +.SH OPTIONS +.TP +.I "-help" +Display the usage and exit. +.TP +.I "-noobsolete" +Drop all obsolete strings. +.TP +.I "-verbose" +Explain what is being done. +.TP +.I "-version" +Display the version of +.B lupdate +and exit. +.SH USAGE +Here is an example .pro file that can be given to +.B lupdate: +.PP +.in +4 +.nf +HEADERS = funnydialog.h \\ + wackywidget.h +SOURCES = funnydialog.cpp \\ + main.cpp \\ + wackywidget.cpp +FORMS = fancybox.ui +TRANSLATIONS = gnomovision_dk.ts \\ + gnomovision_fi.ts \\ + gnomovision_no.ts \\ + gnomovision_se.ts +.fi +.in -4 +.PP +When running +.B lupdate +on this project file, the translatable strings in all the files +listed in the HEADERS, SOURCES and FORMS entries will be put in +the translation files listed in the TRANSLATIONS entry. Previous +translations will be reused as far as possible, and translated +strings that have vanished from the source files are marked obsolete. +.PP +.B Lupdate +can also be invoked with a list of C++ source files, .ui files +and .ts files: +.PP +.in +4 +.nf +lupdate *.cpp *.h *.ui -ts gnomovision_dk.ts +.fi +.in -4 +.SH "SEE ALSO" +.BR lrelease (1) +and +.BR http://doc.trolltech.com/i18n.html --- qt4-x11-4.3.3.orig/debian/manpages/qtconfig-qt4.1 +++ qt4-x11-4.3.3/debian/manpages/qtconfig-qt4.1 @@ -0,0 +1,34 @@ +.TH "qtconfig" "1" "3.0.3" "Troll Tech AS, Norway." "" +.SH "NAME" +.LP +qtconfig \- Configuration tool for Qt +.SH "DESCRIPTION" +.LP +QConfig allows for GUI based configuration of Qt and + other Qt based sources. + +.SH "ENVIRONMENT VARIABLES" +.LP +.TP +\fBQTDIR\fP +Specifies the base Qt dir +.SH "AUTHORS" +.LP +TrollTech +.TH "qtconfig" "1" "3.0.3" "Troll Tech AS, Norway." "" +.SH "NAME" +.LP +qtconfig \- Configuration tool for Qt +.SH "DESCRIPTION" +.LP +QConfig allows for GUI based configuration of Qt and + other Qt based sources. + +.SH "ENVIRONMENT VARIABLES" +.LP +.TP +\fBQTDIR\fP +Specifies the base Qt dir +.SH "AUTHORS" +.LP +TrollTech --- qt4-x11-4.3.3.orig/debian/manpages/moc-qt4.1 +++ qt4-x11-4.3.3/debian/manpages/moc-qt4.1 @@ -0,0 +1,449 @@ +.TH moc 1 "24 June 2001" "Trolltech AS" \" -*- nroff -*- +.\" +.\" $Id: qt/moc.1 3.3.4 edited May 27 2003 $ +.\" +.\" Copyright 1992-2002 Trolltech AS. All rights reserved. +.\" +.\" This file is part of Qt and may be distributed and used according to +.\" the terms and conditions described in the LICENSE file. +.\" +.nh +.SH NAME +moc \- generate Qt meta object support code +.SH SYNOPSIS +.B moc +[\-o file] [\-i] [\-f] [\-k] [\-ldbg] [\-nw] [\-p path] [\-q path] [\-v] file +.SH DESCRIPTION +This page documents the +.B Meta Object Compiler +for the Qt GUI application framework. The +.B moc +reads one or more C++ class declarations from a C++ header or source +file and generates one C++ source file containing meta object +information for the classes. The C++ source file generated by the +.B moc +must be compiled and linked with the implementation of the class (or it +can be #included into the class's source file). +.PP +If you use +.B qmake +to create your Makefiles, build rules will be included that call the +.B moc +when required, so you will not need to use the +.B moc +directly. +.PP +In brief, the meta object system is a structure used by Qt (see +.BR http://doc.trolltech.com ")" +for component programming and run time type information. It adds +properties and inheritance information to (some) classes and +provides a new type of communication between those instances of those +classes, signal\-slot +connections. +.SH OPTIONS +.TP +.I "\-o file" +Write output to +.I file +rather than to stdout. +.TP +.I \-f +Force the generation of an #include statement in the output. +This is the default for files whose name matches the regular +expression .[hH][^.]* (i.e. the extension starts with +.B H +or +.B h +). This +option is only useful if you have header files that do not follow the +standard naming conventions. +.TP +.I "\-i" +Do not generate an #include statement in the output. This may be used +to run +.B moc +on a C++ file containing one or more class declarations. You should then +#include the meta object code in the .cpp file (see USAGE below). If both +.I \-f +and +.I \-i +are present, the last one wins. +.TP +.I "\-nw" +Do not generate any warnings. Not recommended. +.TP +.I "\-ldbg" +Write a flood of lex debug information to stdout. +.TP +.I "\-p path" +Makes +.B moc +prepend +.IR path / +to the file name in the generated #include statement (if one is generated). +.TP +.I "\-q path" +Makes +.B moc +prepend +.IR path / +to the file name of qt #include files in the generated code. +.TP +.I "\-v" +Displays the version of +.B moc +and Qt. +.PP +You can explicitly tell the +.B moc +not to parse parts of a header +file. It recognizes any C++ comment (//) that contains the substrings +MOC_SKIP_BEGIN or MOC_SKIP_END. They work as you would expect and you +can have several levels of them. The net result as seen by the +.B moc +is as if you had removed all lines between a MOC_SKIP_BEGIN and a +MOC_SKIP_END +.SH USAGE +.B moc +is almost always invoked by +.BR make (1), +not by hand. +.PP +.B moc +is typically used with an input file containing class declarations +like this: +.PP +.in +4 +.nf +class YourClass : public QObject { + Q_OBJECT + Q_PROPERTY( ... ) + Q_CLASSINFO( ... ) + +public: + YourClass( QObject * parent=0, const char * name=0 ); + ~YourClass(); + +signals: + +public slots: + +}; +.fi +.in -4 +.PP +Here is a useful makefile rule if you only use GNU make: +.PP +.in +4 +.nf +m%.cpp: %.h + moc $< -o $@ +.fi +.in -4 +.PP +If you want to write portably, you can use individual rules of the +following form: +.PP +.in +4 +.nf +mNAME.cpp: NAME.h + moc $< -o $@ +.fi +.in -4 +.PP +You must also remember to add +.I mNAME.cpp +to your SOURCES (substitute your favorite name) variable and +.I mNAME.o +to your OBJECTS variable. +.PP +(While we prefer to name our C++ source files .cpp, the +.B moc +doesn't know that, so you can use .C, .cc, .CC, .cxx or even .c++ if +you prefer.) +.PP +If you have class declarations in C++ files, we recommend that you use +a makefile rule like this: +.PP +.in +4 +.nf +NAME.o: mNAME.cpp + +mNAME.cpp: NAME.cpp + moc -i $< -o $@ +.fi +.in -4 +.PP +This guarantees that +.BR make (1) +will run the +.B moc +before it compiles +.IR NAME.cpp . +You can then put +.PP +.ti +4 +#include "nNAME.cpp" +.PP +at the end of +.IR NAME.cpp , +where all the classes declared in that file are fully known. +.SH DIAGNOSTICS +Sometimes you may get linkage errors, saying that +YourClass::className() is undefined or that YourClass lacks a vtbl. +Those errors happen most often when you forget to compile the +moc-generated C++ code or include that object file in the link +command. +.PP +The +.B moc +will warn you about a number of dangerous or illegal constructs. +.SH BUGS + +The +.B moc +does not expand #include or #define, it simply skips any preprocessor +directives it encounters. This is regrettable, but is normally not a +problem in practice. + +The +.B moc +does not handle all of C++. The main problem is that class templates +cannot have signals or slots. This is an important bug. Here is an +example: +.PP +.in +4 +.nf +class SomeTemplate : public QFrame { + Q_OBJECT + .... +signals: + void bugInMocDetected( int ); +}; +.fi +.in -4 +.PP +Less importantly, the following constructs are illegal. All of them +have have alternatives which we think are usually better, so removing +these limitations is not a high priority for us. +.SS "Multiple inheritance requires QObject to be first." +If you are using multiple inheritance, +.B moc +assumes that the +.B first +inherited class is a subclass of QObject. Also, be sure that +.B only +the first inherited class is a QObject. +.PP +.in +4 +.nf +class SomeClass : public QObject, public OtherClass { + ... +}; +.fi +.in -4 +.PP +This bug is almost impossible to fix; since the +.B moc +does not expand +#include or #define, it cannot find out which one of the base classes is a +QObject. +.SS "Function pointers cannot be arguments to signals or slots." +In most cases where you would consider that, we think inheritance is a +better alternative. Here is an example of illegal syntax: +.PP +.in +4 +.nf +class SomeClass : public QObject { + Q_OBJECT + ... +public slots: + // illegal + void apply( void (*apply)(List *, void *), void * ); +}; +.fi +.in -4 +.PP +You can work around this restriction like this: +.PP +.in +4 +.nf +typedef void (*ApplyFunctionType)( List *, void * ); + +class SomeClass : public QObject { + Q_OBJECT + ... +public slots: + void apply( ApplyFunctionType, char * ); +}; +.fi +.in -4 +.PP +It may sometimes be even better to replace the function pointer with +inheritance and virtual functions, signals or slots. +.SS "Friend declarations cannot be placed in signals or slots sections" +Sometimes it will work, but in general, friend declarations cannot be +placed in +.B signals +or +.B slots +sections. Put them in the good old +.BR private ", " protected +or +.B public +sections instead. Here is an example of the illegal syntax: +.PP +.in +4 +.nf +class SomeClass : public QObject { + Q_OBJECT + ... +signals: + friend class ClassTemplate; // illegal +}; +.fi +.in -4 +.SS "Signals and slots cannot be upgraded" +The C++ feature of upgrading an inherited member function to +.B public +status is not extended to cover signals and slots. Here is an illegal +example: +.PP +.in +4 +.nf +class Whatever : public QButtonGroup { + ... +public slots: + QButtonGroup::buttonPressed; // illegal + ... +}; +.fi +.in -4 +.PP +The QButtonGroup::buttonPressed() slot is protected. +.PP +C++ quiz: What happens if you try to upgrade a protected member +function which is overloaded? +.IP +- All the functions are upgraded. +.IP +- That is not legal C++. +.\" Good idea, but look in the SEE ALSO section... +.SS "Type macros cannot be used for signal and slot arguments" + +Since the +.B moc +does not expand #define, type macros that take an argument +will not work in signals and slots. Here is an illegal example: +.PP +.in +4 +.nf +#ifdef ultrix +#define SIGNEDNESS(a) unsigned a +#else +#define SIGNEDNESS(a) a +#endif +class Whatever : public QObject { + ... +signals: + void someSignal( SIGNEDNESS(int) ); // illegal +}; +.PP +A #define without arguments works. +.fi +.in -4 +.SS "Nested classes cannot be in the signals or slots sections nor have signals or slots" +Here's an example: +.PP +.in +4 +.nf +class A { + Q_OBJECT +public: + class B { + public slots: // illegal + void b(); + ... + }; +signals: + class B { // illegal + void b(); + ... + }: +}; +.fi +.in -4 +.PP +.SS "Constructors cannot be used in signals or slots sections" +It is a mystery to us why anyone would put a constructor on either the +.B signals +or +.B slots +sections. You can't, anyway (except that it happens to work in some +cases). Put them in +.BR private ", " protected +or +.B public +sections, where they belong. Here is an example of the illegal syntax: +.PP +.in +4 +.nf +class SomeClass : public QObject { + Q_OBJECT +public slots: + SomeClass( QObject *parent, const char *name ) + : QObject( parent, name ) {} // illegal + ... +}; +.fi +.in -4 +.SS "Properties need to be declared before the public section that contains the respective get and set functions" +.PP +Declaring the first property within or after the public section that +contains the type definition and the respective get and set functions +does not work as expected. The +.B moc +will complain that it can neither +find the functions nor resolve the type. Here is an example of the +illegal syntax: +.PP +.in +4 +.nf +class SomeClass : public QObject { + Q_OBJECT +public: + ... + // illegal + Q_PROPERTY( Priority priority READ priority WRITE setPriority ) + Q_ENUMS( Priority ) + enum Priority { High, Low, VeryHigh, VeryLow }; + void setPriority( Priority ); + Priority priority() const; + ... +}; +.fi +.in -4 +.PP +Work around this limitation by declaring all properties at the +beginning of the class declaration, right after Q_OBJECT: +.PP +.in +4 +.nf +class SomeClass : public QObject { + Q_OBJECT + Q_PROPERTY( Priority priority READ priority WRITE setPriority ) + Q_ENUMS( Priority ) +public: + ... + enum Priority { High, Low, VeryHigh, VeryLow }; + void setPriority( Priority ); + Priority priority() const; + ... +}; +.fi +.in -4 +.PP +.SH "SEE ALSO" +.BR http://www.trolltech.com ", " +.BR "C++ ARM, section r.11.3" " (for the answer to the quiz), and" +.BR http://doc.trolltech.com " (for complete Qt documentation)." --- qt4-x11-4.3.3.orig/debian/manpages/uic-qt4.1 +++ qt4-x11-4.3.3/debian/manpages/uic-qt4.1 @@ -0,0 +1,136 @@ +.TH uic 1 "2 Aug 2001" "Trolltech AS" \" -*- nroff -*- +.\" +.\" Copyright 2000 Trolltech AS. All rights reserved. +.\" +.\" This file is part of Qt and may be distributed and used according to +.\" the terms and conditions described in the LICENSE file. +.\" +.SH NAME +uic \- Qt user interface compiler +.SH SYNOPSIS +.B uic +[options] file +.SH DESCRIPTION +This page documents the +.B User Interface Compiler +for the Qt GUI toolkit. The +.B uic +reads a user interface definition (.ui) file in XML as generated by +.I Qt Designer +and creates corresponding C++ header or source files. It also +generates an image file that embeds raw image data in C++ source code. +.PP +.PP +Generate declaration: +.br +.I "\fB uic [options] \fI" +.br +.PP +Generate implementation: +.br +.I "\fB uic [options] -impl \fI " +.br + \fI\fP: name of the declaration file +.br +.PP +Generate image collection: +.br +.I "\fB uic [options] -embed \fI \fP ..." +.br + \fI\fP: project name + \fI\fP: image files +.br +.\" .PP +.\" Generate binary UI file: +.\" .br +.\" .I "\fB uic [options] -binary \fI" +.\" .br +.PP +.PP +For convenience, +.B uic +can also generate declaration or implementation stubs for subclasses. +.PP +Generate subclass declaration: +.br +.I "\fB uic [options] -subdecl \fI " +.br + \fI\fP: name of the subclass to generate +.br + \fI\fP: declaration file of the baseclass +.PP +Generate subclass implementation: +.br +.I "\fB uic [options] -subimpl \fI " +.br + \fI\fP: name of the subclass to generate +.br + \fI\fP: declaration file of the subclass + +.SH GENERAL OPTIONS +.TP +.I "-o file" +Write output to +.I file +rather than to stdout. +.TP +.I "-nofwd" +Omit forward declarations of custom classes in the generated +header file. This is necessary if typedef classes are used. +.TP +.I "-tr func" +Use +.I func() +instead of tr() for internationalization. +.TP +.I "-version" +Display the version of +.B uic +and exit. + +.SH USAGE +.B uic +is almost always invoked by +.BR make (1), +rather than by hand. +.PP +Here are useful makefile rules if you only use GNU make: +.PP +.in +4 +%.h: %.ui +.br + uic $< -o $@ +.br +%.cpp: %.ui +.br + uic -impl $*.h $< -o $@ +.in -4 +.PP +If you want to write portably, you can use individual rules of the +following form: +.PP +.in +4 +NAME.h: NAME.ui +.br + uic $< -o $@ +.br +NAME.cpp: NAME.ui +.br + uic -impl $*.h $< -o $@ +.in -4 +.PP +You must also remember to add +.I NAME.cpp +to your SOURCES (substitute your favorite name) variable and +.I NAME.o +to your OBJECTS variable. +.PP +(While we prefer to name our C++ source files .cpp, the +.B uic +doesn't care, so you can use .C, .cc, .CC, .cxx or even .c++ if +you prefer.) +.PP +.SH "SEE ALSO" +.BR http://www.trolltech.com/ " " +.SH AUTHOR +Trolltech AS --- qt4-x11-4.3.3.orig/debian/manpages/designer-qt4.1 +++ qt4-x11-4.3.3/debian/manpages/designer-qt4.1 @@ -0,0 +1,50 @@ +.TH "DESIGNER-QT4" "1" "4.0.0" "Troll Tech AS, Norway." "" +.SH "NAME" +.LP +designer\-qt4 \- Visual user interface designer for Qt4. +.SH "DESCRIPTION" +.LP +Qt Designer simplifies the process of designing and +creating graphical user interfaces (GUI) using the +award\-winning Qt toolkit. Qt Designer is easy to learn. +There are tutorials, walkthrough examples and the +reference documentation accelerating you through the +learning phase. After that, Qt Designer greatly reduces +the time and effort needed to develop even the most +complex dialogs with an easy\-to\-use GUI and an integrated +help system. + + Qt Designer provides a rich set of features aimed at +making the creation of dialogs as easy and smooth as +possible without reducing the power of Qt. It offers all +the strength of the Qt layout system with a well\-designed +user interface. This, combined with the Qt Designer's +undo/redo system makes it simple to try different +arrangements of the widgets until the result satisfies +you. + + Using Qt Designer's convenient property editor along +with the dynamic Qt property system it is easy to set the +initial state of your widgets. Special editors for some +widgets (like listboxes, comboboxes, etc.) allow you to +fill these widgets with content without writing any code. +Using the object hierarchy view, the parent\-child +relationship between the widgets of a dialog can be +understood at a glance. + + Integrating dialogs into a Qt project is straightforward +thanks to the User Interface Compiler (UIC), which +generates C++ code from the XML dialog description on the +fly. The programmer can easily extend the functionality +of the generated classes by subclassing without touching +generated code at all or running the risk of loosing +their changes. +.SH "ENVIRONMENT VARIABLES" +.LP +.TP +\fBQTDIR\fP +Specifies the Qt base directory. On Debian systems this +should be set to /usr/share/qt4. +.SH "AUTHORS" +.LP +TrollTech --- qt4-x11-4.3.3.orig/debian/manpages/assistant-qt4.1 +++ qt4-x11-4.3.3/debian/manpages/assistant-qt4.1 @@ -0,0 +1,44 @@ +.TH "ASSISTANT-QT4" 1 "4.0.0" "Trolltech AS" \" -*- nroff -*- +.SH NAME +assistant-qt4 \- on\-line documentation browser for Qt4 +.SH SYNOPSIS +.B assistant [options] +.SH DESCRIPTION +This page documents the +.B Qt Assistant +for the Qt application framework, which is typically used to display the +Qt Reference Documentation. +.SH OPTIONS +.TP +.I "\-file Filename" +assistant opens the specified file +.TP +.I \-server +reads commands from a socket after assistant has started +.TP +.I "\-profile fileName" +starts assistant and displays the profile specified in the file +.I fileName +.TP +.I "\-addContentFile file" +adds the content file +.I file +to the set of documentation available by default +.TP +.I "\-removeContentFile file" +removes the content file +.I file +from the documentation available by default +.TP +.I "\-hideSidebar" +assistant will hide the sidebar +.TP +.I "-help" +outputs some help text +.SH "SEE ALSO" +.BR /usr/share/qt4/doc/html/assistant-manual.html, +.BR http://doc.trolltech.com +.SH AUTHOR +This manual page was written by Brian Nelson based on +the output of +.B "assistant -help". --- qt4-x11-4.3.3.orig/debian/compat +++ qt4-x11-4.3.3/debian/compat @@ -0,0 +1 @@ +5 --- qt4-x11-4.3.3.orig/debian/qt4-designer.menu +++ qt4-x11-4.3.3/debian/qt4-designer.menu @@ -0,0 +1,6 @@ +?package(qt4-designer):\ + needs="x11"\ + section="Applications/Programming"\ + hints="KDE"\ + title="Qt Designer"\ + command="/usr/bin/designer-qt4" --- qt4-x11-4.3.3.orig/debian/qt4-dev-tools.manpages +++ qt4-x11-4.3.3/debian/qt4-dev-tools.manpages @@ -0,0 +1,2 @@ +debian/manpages/assistant-qt4.1 +debian/manpages/linguist-qt4.1 --- qt4-x11-4.3.3.orig/debian/patches/0163-fix-gcc43-support.diff +++ qt4-x11-4.3.3/debian/patches/0163-fix-gcc43-support.diff @@ -0,0 +1,164 @@ +qt-bugs@ issue : N154723 +Trolltech task ID : none +bugs.kde.org number : None +applied: no +author: Dirk Mueller + +various fixes to get Qt 4.3 without hundreds of warnings compiling + +--- a/config.tests/unix/endian.test ++++ b/config.tests/unix/endian.test +@@ -30,6 +30,7 @@ + [ "$VERBOSE" = "yes" ] && echo " Found 'MostSignificantByteFirst' in binary" + ENDIAN="BIG" + fi ++[ "$VERBOSE" = "yes" ] && make clean || make clean >/dev/null 2>&1 + + # done + if [ "$ENDIAN" = "LITTLE" ]; then +--- a/config.tests/unix/glib/glib.cpp ++++ b/config.tests/unix/glib/glib.cpp +@@ -6,7 +6,7 @@ + { + GMainContext *context; + GSource *source; +- GPollFD *pollfd; ++ GPollFD *pollfd = NULL; + if (!g_thread_supported()) + g_thread_init(NULL); + context = g_main_context_default(); +--- a/src/corelib/codecs/qtextcodec.cpp ++++ b/src/corelib/codecs/qtextcodec.cpp +@@ -432,7 +432,7 @@ + localeMapper = checkForCodec(lang); + + // 5. "@euro" +- if (!localeMapper && ctype && strstr(ctype, "@euro") || lang && strstr(lang, "@euro")) ++ if ((!localeMapper && ctype && strstr(ctype, "@euro")) || (lang && strstr(lang, "@euro"))) + localeMapper = checkForCodec("ISO 8859-15"); + + // 6. guess locale from ctype unless ctype is "C" +--- a/src/corelib/io/qtextstream.cpp ++++ b/src/corelib/io/qtextstream.cpp +@@ -553,8 +553,8 @@ + if (!codec || autoDetectUnicode) { + autoDetectUnicode = false; + +- if (bytesRead >= 2 && (uchar(buf[0]) == 0xff && uchar(buf[1]) == 0xfe +- || uchar(buf[0]) == 0xfe && uchar(buf[1]) == 0xff)) { ++ if (bytesRead >= 2 && ((uchar(buf[0]) == 0xff && uchar(buf[1]) == 0xfe) ++ || (uchar(buf[0]) == 0xfe && uchar(buf[1]) == 0xff))) { + codec = QTextCodec::codecForName("UTF-16"); + } else if (!codec) { + codec = QTextCodec::codecForLocale(); +--- a/src/corelib/io/qurl.cpp ++++ b/src/corelib/io/qurl.cpp +@@ -4741,9 +4741,9 @@ + if (include.isEmpty()) { + for (int i = 0; i < len; ++i) { + unsigned char c = *inputData++; +- if (c >= 0x61 && c <= 0x7A // ALPHA +- || c >= 0x41 && c <= 0x5A // ALPHA +- || c >= 0x30 && c <= 0x39 // DIGIT ++ if ((c >= 0x61 && c <= 0x7A) // ALPHA ++ || (c >= 0x41 && c <= 0x5A) // ALPHA ++ || (c >= 0x30 && c <= 0x39) // DIGIT + || c == 0x2D // - + || c == 0x2E // . + || c == 0x5F // _ +@@ -4760,9 +4760,9 @@ + const char * alsoEncode = include.constData(); + for (int i = 0; i < len; ++i) { + unsigned char c = *inputData++; +- if ((c >= 0x61 && c <= 0x7A // ALPHA +- || c >= 0x41 && c <= 0x5A // ALPHA +- || c >= 0x30 && c <= 0x39 // DIGIT ++ if (((c >= 0x61 && c <= 0x7A) // ALPHA ++ || (c >= 0x41 && c <= 0x5A) // ALPHA ++ || (c >= 0x30 && c <= 0x39) // DIGIT + || c == 0x2D // - + || c == 0x2E // . + || c == 0x5F // _ +--- a/src/corelib/tools/qlocale.cpp ++++ b/src/corelib/tools/qlocale.cpp +@@ -2609,8 +2609,8 @@ + + QChar c1 = format.at(i); + QChar c2 = format.at(i + 1); +- if (c1.unicode() == 'a' && c2.unicode() == 'p' +- || c1.unicode() == 'A' && c2.unicode() == 'P') ++ if ((c1.unicode() == 'a' && c2.unicode() == 'p') ++ || (c1.unicode() == 'A' && c2.unicode() == 'P')) + return true; + + ++i; +--- a/src/gui/kernel/qapplication.cpp ++++ b/src/gui/kernel/qapplication.cpp +@@ -2036,11 +2036,11 @@ + #ifndef QT_NO_TRANSLATION + static bool qt_detectRTLLanguage() + { +- return force_reverse ^ ++ return (force_reverse ^ + QApplication::tr("QT_LAYOUT_DIRECTION", + "Translate this string to the string 'LTR' in left-to-right" + " languages or to 'RTL' in right-to-left languages (such as Hebrew" +- " and Arabic) to get proper widget layout.") == QLatin1String("RTL"); ++ " and Arabic) to get proper widget layout.") == QLatin1String("RTL")); + } + #endif + +--- a/src/gui/kernel/qkeymapper_x11.cpp ++++ b/src/gui/kernel/qkeymapper_x11.cpp +@@ -1330,8 +1330,8 @@ + } + + if (directionKeyEvent && lastWinId == keyWidget->internalWinId()) { +- if (keysym == XK_Shift_L && directionKeyEvent == XK_Control_L || +- keysym == XK_Control_L && directionKeyEvent == XK_Shift_L) { ++ if ((keysym == XK_Shift_L && directionKeyEvent == XK_Control_L) || ++ (keysym == XK_Control_L && directionKeyEvent == XK_Shift_L)) { + directionKeyEvent = Qt::Key_Direction_L; + } else if (keysym == XK_Shift_R && directionKeyEvent == XK_Control_R || + keysym == XK_Control_R && directionKeyEvent == XK_Shift_R) { +--- a/src/gui/kernel/qwidget.cpp ++++ b/src/gui/kernel/qwidget.cpp +@@ -1872,7 +1872,7 @@ + + for (int i = 0; i < pd->children.size(); ++i) { + QWidget *w = qobject_cast(pd->children.at(i)); +- if (w && !w->isWindow() && !w->testAttribute(Qt::WA_WState_Created)) ++ if (w && !w->isWindow() && !w->testAttribute(Qt::WA_WState_Created)) { + if (w!=q) { + w->create(); + } else { +@@ -1882,6 +1882,7 @@ + if (winid) + w->raise(); + } ++ } + } + } else { + q->create(); +--- a/src/gui/painting/qregion_unix.cpp ++++ b/src/gui/painting/qregion_unix.cpp +@@ -1944,7 +1944,7 @@ + else + --isInside; + +- if (!inside && !isInside || inside && isInside) { ++ if ((!inside && !isInside) || (inside && isInside)) { + pWETE->nextWETE = AET; + pWETE = AET; + inside = !inside; +--- a/src/tools/uic/driver.cpp ++++ b/src/tools/uic/driver.cpp +@@ -175,7 +175,7 @@ + + static bool isAnsiCCharacter(const QChar& c) + { +- return c.toUpper() >= QLatin1Char('A') && c.toUpper() <= QLatin1Char('Z') ++ return (c.toUpper() >= QLatin1Char('A') && c.toUpper() <= QLatin1Char('Z')) + || c.isDigit() || c == QLatin1Char('_'); + } + --- qt4-x11-4.3.3.orig/debian/patches/0188-fix-moc-parser-same-name-header.diff +++ qt4-x11-4.3.3/debian/patches/0188-fix-moc-parser-same-name-header.diff @@ -0,0 +1,35 @@ +qt-bugs@ issue : none +Trolltech task ID : none +applied: yes +author: Helio Chissini de Castro +os: unix + +In situations where included header have same name as their parent dir, i.e. +include/QtMyModule/QtMyModule and #include 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 + +--- a/src/tools/moc/preprocessor.cpp ++++ b/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(); + --- qt4-x11-4.3.3.orig/debian/patches/0167-fix-group-reading.diff +++ qt4-x11-4.3.3/debian/patches/0167-fix-group-reading.diff @@ -0,0 +1,31 @@ +qt-bugs@ issue : none +Trolltech task ID : none yet +bugs.kde.org number : None +applied: no +author: Dirk Mueller + +in big user environments, getgrgid_r() needs more memory than sysconf() returns. +Try a bit harder. + +--- a/src/corelib/io/qfsfileengine_unix.cpp ++++ b/src/corelib/io/qfsfileengine_unix.cpp +@@ -845,9 +845,16 @@ + } else if (own == OwnerGroup) { + struct group *gr = 0; + #if !defined(QT_NO_THREAD) && defined(_POSIX_THREAD_SAFE_FUNCTIONS) && !defined(Q_OS_OPENBSD) +- buf.resize(sysconf(_SC_GETGR_R_SIZE_MAX)); +- struct group entry; +- getgrgid_r(ownerId(own), &entry, buf.data(), buf.size(), &gr); ++ for (unsigned size = sysconf(_SC_GETGR_R_SIZE_MAX); size < 256000; size += size) ++ { ++ buf.resize(size); ++ struct group entry; ++ // ERANGE indicates that the buffer was too small ++ if (!getgrgid_r(ownerId(own), &entry, buf.data(), buf.size(), &gr) ++ || errno != ERANGE) ++ break; ++ } ++ + #else + gr = getgrgid(ownerId(own)); + #endif --- qt4-x11-4.3.3.orig/debian/patches/03_launch_moc-qt4.diff +++ qt4-x11-4.3.3/debian/patches/03_launch_moc-qt4.diff @@ -0,0 +1,15 @@ +author: Brian Nelson + +Ensure the Qt4 version of moc is launched. + +--- a/tools/qdbus/tools/qdbuscpp2xml/qdbuscpp2xml.cpp ++++ b/tools/qdbus/tools/qdbuscpp2xml/qdbuscpp2xml.cpp +@@ -391,7 +391,7 @@ + else { + // run moc on this file + QProcess proc; +- proc.start(QLibraryInfo::location(QLibraryInfo::BinariesPath) + QLatin1String("/moc"), QStringList() << QFile::decodeName(argv[i]), QIODevice::ReadOnly | QIODevice::Text); ++ proc.start(QLibraryInfo::location(QLibraryInfo::BinariesPath) + QLatin1String("/moc-qt4"), QStringList() << QFile::decodeName(argv[i]), QIODevice::ReadOnly | QIODevice::Text); + + if (!proc.waitForStarted()) { + fprintf(stderr, PROGRAMNAME ": could not execute moc! Aborting.\n"); --- qt4-x11-4.3.3.orig/debian/patches/80_hurd_max_path.diff +++ qt4-x11-4.3.3/debian/patches/80_hurd_max_path.diff @@ -0,0 +1,15 @@ +author: Brian Nelson + +--- a/src/corelib/io/qfsfileengine_unix.cpp ++++ b/src/corelib/io/qfsfileengine_unix.cpp +@@ -55,6 +55,10 @@ + # include + #endif + ++#ifndef PATH_MAX ++#define PATH_MAX 4096 ++#endif ++ + /*! + \internal + --- qt4-x11-4.3.3.orig/debian/patches/0175-fix-s390-qatomic.diff +++ qt4-x11-4.3.3/debian/patches/0175-fix-s390-qatomic.diff @@ -0,0 +1,35 @@ +qt-bugs@ issue : none +Trolltech task ID : none +bugs.kde.org number : +applied: no +author: Dirk Mueller + +fix s390(x) build + +--- a/src/corelib/arch/qatomic_s390.h ++++ b/src/corelib/arch/qatomic_s390.h +@@ -197,10 +197,20 @@ + #endif + } + +-#error "fetch-and-add not implemented" +-// int q_atomic_fetch_and_add_int(volatile int *ptr, int value); +-// int q_atomic_fetch_and_add_acquire_int(volatile int *ptr, int value); +-// int q_atomic_fetch_and_add_release_int(volatile int *ptr, int value); ++inline int q_atomic_fetch_and_add_int(volatile int *ptr, int value) ++{ ++ return __sync_fetch_and_add(ptr, value); ++} ++ ++inline int q_atomic_fetch_and_add_acquire_int(volatile int *ptr, int value) ++{ ++ return __sync_fetch_and_add(ptr, value); ++} ++ ++inline int q_atomic_fetch_and_add_release_int(volatile int *ptr, int value) ++{ ++ return __sync_fetch_and_add(ptr, value); ++} + + QT_END_HEADER + --- qt4-x11-4.3.3.orig/debian/patches/0185-fix-format-strings.diff +++ qt4-x11-4.3.3/debian/patches/0185-fix-format-strings.diff @@ -0,0 +1,112 @@ +qt-bugs@ issue : N171087 +Trolltech task ID : 173777 +bugs.kde.org number : +applied: no +author: Dirk Mueller + +This patch fixes various code issues with handling format strings +None of them seem to be exceptionally bad, but its better safe +than sorry. + +--- a/src/corelib/global/qglobal.h ++++ b/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); + #endif /* QT3_SUPPORT */ +-Q_CORE_EXPORT void qErrnoWarning(int code, const char *msg, ...); +-Q_CORE_EXPORT void qErrnoWarning(const char *msg, ...); ++Q_CORE_EXPORT void qErrnoWarning(int code, const char *msg, ...) ++#if defined(Q_CC_GNU) && !defined(__INSURE__) ++ __attribute__ ((format (printf, 2, 3))) ++#endif ++ ; ++Q_CORE_EXPORT void qErrnoWarning(const char *msg, ...) ++#if defined(Q_CC_GNU) && !defined(__INSURE__) ++ __attribute__ ((format (printf, 1, 2))) ++#endif ++ ; + + #if (defined(QT_NO_DEBUG_OUTPUT) || defined(QT_NO_TEXTSTREAM)) && !defined(QT_NO_DEBUG_STREAM) + #define QT_NO_DEBUG_STREAM +--- a/src/corelib/tools/qbytearray.h ++++ b/src/corelib/tools/qbytearray.h +@@ -86,8 +86,16 @@ + Q_CORE_EXPORT int qstrnicmp(const char *, const char *, uint len); + + // implemented in qvsnprintf.cpp +-Q_CORE_EXPORT int qvsnprintf(char *str, size_t n, const char *fmt, va_list ap); +-Q_CORE_EXPORT int qsnprintf(char *str, size_t n, const char *fmt, ...); ++Q_CORE_EXPORT int qvsnprintf(char *str, size_t n, const char *fmt, va_list ap) ++#if defined(Q_CC_GNU) && !defined(__INSURE__) ++ __attribute__ ((format (printf, 3, 0))) ++#endif ++ ; ++Q_CORE_EXPORT int qsnprintf(char *str, size_t n, const char *fmt, ...) ++#if defined(Q_CC_GNU) && !defined(__INSURE__) ++ __attribute__ ((format (printf, 3, 4))) ++#endif ++ ; + + #ifdef QT3_SUPPORT + inline QT3_SUPPORT void *qmemmove(void *dst, const void *src, uint len) +--- a/src/gui/painting/qprintengine_pdf_p.h ++++ b/src/gui/painting/qprintengine_pdf_p.h +@@ -163,7 +163,11 @@ + void writePage(); + + int addXrefEntry(int object, bool printostr = true); +- void xprintf(const char* fmt, ...); ++ void xprintf(const char* fmt, ...) ++#if defined(Q_CC_GNU) && !defined(__INSURE__) ++ __attribute__ ((format (printf, 2, 3))) ++#endif ++ ; + inline void write(const QByteArray &data) { + stream->writeRawData(data.constData(), data.size()); + streampos += data.size(); +--- a/src/qt3support/tools/q3cstring.h ++++ b/src/qt3support/tools/q3cstring.h +@@ -72,7 +72,11 @@ + } + + Q3CString copy() const { return *this; } +- Q3CString &sprintf(const char *format, ...); ++ Q3CString &sprintf(const char *format, ...) ++#if defined(Q_CC_GNU) && !defined(__INSURE__) ++ __attribute__ ((format (printf, 2, 3))) ++#endif ++ ; + + Q3CString left(uint len) const { return QByteArray::left(len); } + Q3CString right(uint len) const { return QByteArray::right(len); } +--- a/tools/linguist/shared/profileevaluator.h ++++ b/tools/linguist/shared/profileevaluator.h +@@ -103,7 +103,11 @@ + + private: + void logMessage(const QString &msg, MessageType mt = MT_DebugLevel2); +- void logMessage(MessageType mt, const char *msg, ...); ++ void logMessage(MessageType mt, const char *msg, ...) ++#if defined(Q_CC_GNU) && !defined(__INSURE__) ++ __attribute__ ((format (printf, 3, 4))) ++#endif ++ ; + QString expandVariableReferences(const QString &value); + QString evaluateExpandFunction(const QByteArray &func, const QString &arguments); + +--- a/tools/qtestlib/src/qtest_global.h ++++ b/tools/qtestlib/src/qtest_global.h +@@ -74,7 +74,11 @@ + enum SkipMode { SkipSingle = 1, SkipAll = 2 }; + enum TestFailMode { Abort = 1, Continue = 2 }; + +- int Q_TESTLIB_EXPORT qt_snprintf(char *str, int size, const char *format, ...); ++ int Q_TESTLIB_EXPORT qt_snprintf(char *str, int size, const char *format, ...) ++#if defined(Q_CC_GNU) && !defined(__INSURE__) ++ __attribute__ ((format (printf, 3, 4))) ++#endif ++ ; + } + + QT_END_HEADER --- qt4-x11-4.3.3.orig/debian/patches/kubuntu_01_load_ssl.diff +++ qt4-x11-4.3.3/debian/patches/kubuntu_01_load_ssl.diff @@ -0,0 +1,22 @@ +author: Jonathan Riddell + +--- qt4-x11-4.3.2~/src/network/qsslsocket_openssl_symbols.cpp 2007-10-01 14:06:20.000000000 +0100 ++++ qt4-x11-4.3.2/src/network/qsslsocket_openssl_symbols.cpp 2007-11-05 16:41:35.000000000 +0000 +@@ -249,7 +249,7 @@ + return false; + } + #else +- QLibrary libssl(QLatin1String("ssl")); ++ QLibrary libssl(QLatin1String("ssl.so.0.9.8")); + if (!libssl.load()) { + // Cannot find libssl + qWarning("QSslSocket: cannot find ssl library: %s.", +@@ -257,7 +257,7 @@ + return false; + } + +- QLibrary libcrypto(QLatin1String("crypto")); ++ QLibrary libcrypto(QLatin1String("crypto.so.0.9.8")); + if (!libcrypto.load()) { + // Cannot find libcrypto + qWarning("QSslSocket: cannot find crypto library: %s.", --- qt4-x11-4.3.3.orig/debian/patches/30_arm_ftbfs_fixes.diff +++ qt4-x11-4.3.3/debian/patches/30_arm_ftbfs_fixes.diff @@ -0,0 +1,15 @@ +author: Fathi Boudra + +Fix arm FTBFS. + +--- a/tools/qtestlib/src/qtestcase.h ++++ b/tools/qtestlib/src/qtestcase.h +@@ -210,7 +210,7 @@ + template + bool qCompare(T1 const &, T2 const &, const char *, const char *, const char *, int); + +-#if defined(QT_COORD_TYPE) || defined(__arm__) ++#if defined(QT_COORD_TYPE) || defined(QT_ARCH_ARM) + template <> + inline bool qCompare(qreal const &t1, double const &t2, const char *actual, + const char *expected, const char *file, int line) --- qt4-x11-4.3.3.orig/debian/patches/0189-fix-q3toolbar-qcombobox-signal-slot.diff +++ qt4-x11-4.3.3/debian/patches/0189-fix-q3toolbar-qcombobox-signal-slot.diff @@ -0,0 +1,31 @@ +qt-bugs@ issue : none +Trolltech task ID : 171843 +bugs.kde.org number : none +applied: yes +author: Laurent Montel + +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) + +--- a/src/qt3support/widgets/q3toolbar.cpp ++++ b/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))); + } + } + } --- qt4-x11-4.3.3.orig/debian/patches/50_kfreebsd_build_fix.diff +++ qt4-x11-4.3.3/debian/patches/50_kfreebsd_build_fix.diff @@ -0,0 +1,73 @@ +author: Petr Salinger + +Fixes FTBFS on GNU/kFreeBSD by creating new Q_OS_GLIBC. + +--- a/src/corelib/global/qglobal.h ++++ b/src/corelib/global/qglobal.h +@@ -125,6 +125,12 @@ + # define Q_OS_RELIANT + #elif defined(__linux__) || defined(__linux) + # define Q_OS_LINUX ++# define Q_OS_GLIBC ++#elif defined(__GNU_HURD__) || defined(__GNU__) ++# define Q_OS_HURD ++# define Q_OS_GLIBC ++#elif defined(__GLIBC__) ++# define Q_OS_GLIBC + #elif defined(__FreeBSD__) || defined(__DragonFly__) + # define Q_OS_FREEBSD + # define Q_OS_BSD4 +@@ -145,8 +151,6 @@ + # define Q_OS_AIX + #elif defined(__Lynx__) + # define Q_OS_LYNX +-#elif defined(__GNU__) +-# define Q_OS_HURD + #elif defined(__DGUX__) + # define Q_OS_DGUX + #elif defined(__QNXNTO__) +--- a/src/corelib/plugin/qlibrary.cpp ++++ b/src/corelib/plugin/qlibrary.cpp +@@ -293,11 +293,11 @@ + + #if defined(Q_OS_UNIX) && !defined(Q_OS_MAC) + +-#if defined(Q_OS_FREEBSD) || defined(Q_OS_LINUX) ++#if defined(Q_OS_FREEBSD) || defined(Q_OS_GLIBC) + # define USE_MMAP + # include + # include +-#endif // Q_OS_FREEBSD || Q_OS_LINUX ++#endif // Q_OS_FREEBSD || Q_OS_GLIBC + + static long qt_find_pattern(const char *s, ulong s_len, + const char *pattern, ulong p_len) +--- a/src/corelib/tools/qlocale.cpp ++++ b/src/corelib/tools/qlocale.cpp +@@ -63,7 +63,7 @@ + #include + #include + +-#if defined(Q_OS_LINUX) && !defined(__UCLIBC__) ++#if defined(Q_OS_GLIBC) && !defined(__UCLIBC__) + # include + #endif + +@@ -5930,7 +5930,7 @@ + _control87(MCW_EM, MCW_EM); + #endif + +-#if defined(Q_OS_LINUX) && !defined(__UCLIBC__) ++#if defined(Q_OS_GLIBC) && !defined(__UCLIBC__) + fenv_t envp; + feholdexcept(&envp); + #endif +@@ -5946,7 +5946,7 @@ + #endif //_M_X64 + #endif //Q_OS_WIN + +-#if defined(Q_OS_LINUX) && !defined(__UCLIBC__) ++#if defined(Q_OS_GLIBC) && !defined(__UCLIBC__) + fesetenv(&envp); + #endif + --- qt4-x11-4.3.3.orig/debian/patches/05_append_qt4_target.diff +++ qt4-x11-4.3.3/debian/patches/05_append_qt4_target.diff @@ -0,0 +1,223 @@ +author: Fathi Boudra + +--- a/config.tests/unix/compile.test ++++ b/config.tests/unix/compile.test +@@ -51,7 +51,7 @@ + cd "$OUTDIR/$TEST" + + make distclean >/dev/null 2>&1 +-"$OUTDIR/bin/qmake" -nocache -spec "$QMKSPEC" "CONFIG+=$QMAKE_CONFIG" "LIBS*=$LFLAGS" "INCLUDEPATH*=$INCLUDEPATH" "QMAKE_CXXFLAGS*=$CXXFLAGS" "$SRCDIR/$TEST/$EXE.pro" -o "$OUTDIR/$TEST/Makefile" ++"$OUTDIR/bin/qmake-qt4" -nocache -spec "$QMKSPEC" "CONFIG+=$QMAKE_CONFIG" "LIBS*=$LFLAGS" "INCLUDEPATH*=$INCLUDEPATH" "QMAKE_CXXFLAGS*=$CXXFLAGS" "$SRCDIR/$TEST/$EXE.pro" -o "$OUTDIR/$TEST/Makefile" + + if [ "$VERBOSE" = "yes" ]; then + make +--- a/config.tests/unix/doubleformat.test ++++ b/config.tests/unix/doubleformat.test +@@ -10,7 +10,7 @@ + + # build and run a test program + test -d "$OUTDIR/config.tests/unix/doubleformat" || mkdir -p "$OUTDIR/config.tests/unix/doubleformat" +-"$OUTDIR/bin/qmake" -nocache -spec "$QMKSPEC" "$SRCDIR/config.tests/unix/doubleformat/doubleformattest.pro" -o "$OUTDIR/config.tests/unix/doubleformat/Makefile" >/dev/null 2>&1 ++"$OUTDIR/bin/qmake-qt4" -nocache -spec "$QMKSPEC" "$SRCDIR/config.tests/unix/doubleformat/doubleformattest.pro" -o "$OUTDIR/config.tests/unix/doubleformat/Makefile" >/dev/null 2>&1 + cd "$OUTDIR/config.tests/unix/doubleformat" + + DOUBLEFORMAT="UNKNOWN" +--- a/config.tests/unix/endian.test ++++ b/config.tests/unix/endian.test +@@ -10,7 +10,7 @@ + + # build and run a test program + test -d "$OUTDIR/config.tests/unix/endian" || mkdir -p "$OUTDIR/config.tests/unix/endian" +-"$OUTDIR/bin/qmake" -nocache -spec "$QMKSPEC" "$SRCDIR/config.tests/unix/endian/endiantest.pro" -o "$OUTDIR/config.tests/unix/endian/Makefile" >/dev/null 2>&1 ++"$OUTDIR/bin/qmake-qt4" -nocache -spec "$QMKSPEC" "$SRCDIR/config.tests/unix/endian/endiantest.pro" -o "$OUTDIR/config.tests/unix/endian/Makefile" >/dev/null 2>&1 + cd "$OUTDIR/config.tests/unix/endian" + + ENDIAN="UNKNOWN" +--- a/config.tests/unix/ptrsize.test ++++ b/config.tests/unix/ptrsize.test +@@ -10,7 +10,7 @@ + + # build and run a test program + test -d "$OUTDIR/config.tests/unix/ptrsize" || mkdir -p "$OUTDIR/config.tests/unix/ptrsize" +-"$OUTDIR/bin/qmake" -nocache -spec "$QMKSPEC" "$SRCDIR/config.tests/unix/ptrsize/ptrsizetest.pro" -o "$OUTDIR/config.tests/unix/ptrsize/Makefile" >/dev/null 2>&1 ++"$OUTDIR/bin/qmake-qt4" -nocache -spec "$QMKSPEC" "$SRCDIR/config.tests/unix/ptrsize/ptrsizetest.pro" -o "$OUTDIR/config.tests/unix/ptrsize/Makefile" >/dev/null 2>&1 + cd "$OUTDIR/config.tests/unix/ptrsize" + + if [ "$VERBOSE" = "yes" ]; then +--- a/config.tests/x11/notype.test ++++ b/config.tests/x11/notype.test +@@ -27,7 +27,7 @@ + NOTYPE=yes + + test -d "$OUTDIR/config.tests/x11/notype" || mkdir -p "$OUTDIR/config.tests/x11/notype" +- "$OUTDIR/bin/qmake" -nocache -spec "$QMKSPEC" "$SRCDIR/config.tests/x11/notype/notypetest.pro" -o "$OUTDIR/config.tests/x11/notype/Makefile" >/dev/null 2>&1 ++ "$OUTDIR/bin/qmake-qt4" -nocache -spec "$QMKSPEC" "$SRCDIR/config.tests/x11/notype/notypetest.pro" -o "$OUTDIR/config.tests/x11/notype/Makefile" >/dev/null 2>&1 + cd "$OUTDIR/config.tests/x11/notype" + + if [ "$VERBOSE" = "yes" ]; then +--- a/configure ++++ b/configure +@@ -3517,7 +3517,7 @@ + } + + # build qmake +-if true; then ###[ '!' -f "$outpath/bin/qmake" ]; ++if true; then ###[ '!' -f "$outpath/bin/qmake-qt4" ]; + echo "Creating qmake. Please wait..." + + OLD_QCONFIG_H= +@@ -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 +-QMAKE_MOC = \$\$QT_BUILD_TREE/bin/moc +-QMAKE_UIC = \$\$QT_BUILD_TREE/bin/uic ++QMAKE_MOC = \$\$QT_BUILD_TREE/bin/moc-qt4 ++QMAKE_UIC = \$\$QT_BUILD_TREE/bin/uic-qt4 + QMAKE_UIC3 = \$\$QT_BUILD_TREE/bin/uic3 + QMAKE_RCC = \$\$QT_BUILD_TREE/bin/rcc + QMAKE_QDBUSXML2CPP = \$\$QT_BUILD_TREE/bin/qdbusxml2cpp +@@ -5703,11 +5703,11 @@ + #------------------------------------------------------------------------------- + + echo "Finding project files. Please wait..." +-"$outpath/bin/qmake" -prl -r "${relpath}/projects.pro" ++"$outpath/bin/qmake-qt4" -prl -r "${relpath}/projects.pro" + if [ -f "${relpath}/projects.pro" ]; then + mkfile="${outpath}/Makefile" + [ -f "$mkfile" ] && chmod +w "$mkfile" +- QTDIR="$outpath" "$outpath/bin/qmake" -spec "$XQMAKESPEC" "${relpath}/projects.pro" -o "$mkfile" ++ QTDIR="$outpath" "$outpath/bin/qmake-qt4" -spec "$XQMAKESPEC" "${relpath}/projects.pro" -o "$mkfile" + fi + + # .projects -> projects to process +@@ -5880,7 +5880,7 @@ + echo " for $a\c" + fi + +- QMAKE="$outpath/bin/qmake" ++ QMAKE="$outpath/bin/qmake-qt4" + QMAKE_ARGS="$QMAKE_SWITCHES $QMAKE_SPEC_ARGS" + if [ "$file" = ".projects.3" ]; then + if echo '\c' | grep '\c' >/dev/null; then +--- a/projects.pro ++++ b/projects.pro +@@ -118,7 +118,7 @@ + win32 { + qmake.files=$$QT_BUILD_TREE/bin/qmake.exe + } else { +- qmake.files=$$QT_BUILD_TREE/bin/qmake ++ qmake.files=$$QT_BUILD_TREE/bin/qmake-qt4 + } + INSTALLS += qmake + +--- a/qmake/Makefile.unix ++++ b/qmake/Makefile.unix +@@ -90,17 +90,17 @@ + + CXXFLAGS = @QMAKE_CXXFLAGS@ $(CPPFLAGS) + +-first all: $(BUILD_PATH)/bin/qmake +-qmake: $(BUILD_PATH)/bin/qmake ++first all: $(BUILD_PATH)/bin/qmake-qt4 ++qmake: $(BUILD_PATH)/bin/qmake-qt4 + +-$(BUILD_PATH)/bin/qmake: $(OBJS) $(QOBJS) ++$(BUILD_PATH)/bin/qmake-qt4: $(OBJS) $(QOBJS) + $(CXX) -o "$@" $(OBJS) $(QOBJS) $(LFLAGS) + + clean:: + rm -f $(OBJS) $(QOBJS) + + distclean:: clean +- rm -rf $(BUILD_PATH)/bin/qmake .deps ++ rm -rf $(BUILD_PATH)/bin/qmake-qt4 .deps + + depend: + makedepend -D__MAKEDEPEND__ $(CPPFLAGS) $(DEPEND_SRC) +--- a/src/tools/moc/moc.pro ++++ b/src/tools/moc/moc.pro +@@ -1,5 +1,5 @@ + TEMPLATE = app +-TARGET = moc ++TARGET = moc-qt4 + + CONFIG += console qtinc + CONFIG -= qt +--- a/src/tools/uic/uic.pro ++++ b/src/tools/uic/uic.pro +@@ -9,7 +9,7 @@ + + unix:!contains(QT_CONFIG, zlib):LIBS += -lz + +-TARGET = uic ++TARGET = uic-qt4 + DESTDIR = ../../../bin + + DEFINES += QT_BOOTSTRAPPED QT_UIC QT_LITE_UNICODE QT_NO_DATASTREAM \ +--- a/tools/assistant/assistant.pro ++++ b/tools/assistant/assistant.pro +@@ -2,7 +2,7 @@ + + TEMPLATE = app + LANGUAGE = C++ +-TARGET = assistant ++TARGET = assistant-qt4 + + CONFIG += qt warn_on + +--- a/tools/designer/src/designer/designer.pro ++++ b/tools/designer/src/designer/designer.pro +@@ -25,7 +25,7 @@ + DEFINES += QT_DESIGNER_STATIC + } + +-TARGET = designer ++TARGET = designer-qt4 + + include($$QT_SOURCE_TREE/tools/shared/fontpanel/fontpanel.pri) + +--- a/tools/linguist/linguist/linguist.pro ++++ b/tools/linguist/linguist/linguist.pro +@@ -50,7 +50,7 @@ + DEFINES += QT_KEYWORDS + + DESTDIR = ../../../bin +-TARGET = linguist ++TARGET = linguist-qt4 + + win32:RC_FILE = linguist.rc + +--- a/tools/linguist/lrelease/lrelease.pro ++++ b/tools/linguist/lrelease/lrelease.pro +@@ -29,7 +29,7 @@ + SOURCES += $$PROPARSERPATH/proitems.cpp \ + $$PROPARSERPATH/proreader.cpp + +-TARGET = lrelease ++TARGET = lrelease-qt4 + INCLUDEPATH += ../shared + DESTDIR = ../../../bin + +--- a/tools/linguist/lupdate/lupdate.pro ++++ b/tools/linguist/lupdate/lupdate.pro +@@ -39,7 +39,7 @@ + $$PROPARSERPATH/proreader.cpp + + +-TARGET = lupdate ++TARGET = lupdate-qt4 + INCLUDEPATH += ../shared + DESTDIR = ../../../bin + +--- a/tools/qtconfig/qtconfig.pro ++++ b/tools/qtconfig/qtconfig.pro +@@ -16,7 +16,7 @@ + RESOURCES = qtconfig.qrc + + PROJECTNAME = Qt Configuration +-TARGET = qtconfig ++TARGET = qtconfig-qt4 + DESTDIR = ../../bin + + target.path=$$[QT_INSTALL_BINS] --- qt4-x11-4.3.3.orig/debian/patches/0172-prefer-xrandr-over-xinerama.diff +++ qt4-x11-4.3.3/debian/patches/0172-prefer-xrandr-over-xinerama.diff @@ -0,0 +1,47 @@ +qt-bugs@ issue : none +Trolltech task ID : none +bugs.kde.org number : +applied: no +author: Dirk Mueller + +only trust libxinerama if its not the emulated information +coming from xrandr 1.2. xrandr 1.2 is merged fb and libxinerama +presents then virtual screens in clone mode, which qt (and KDE) +can't deal with. + +proper fix would be to detect crtcs as virtual screens, but +given that qt can't deal with dynamically changing number of screens, +this is for "when I have time". + +--- src/gui/kernel/qdesktopwidget_x11.cpp ++++ src/gui/kernel/qdesktopwidget_x11.cpp +@@ -142,7 +142,8 @@ void QDesktopWidgetPrivate::init() + + // get the geometry of each screen + int i, x, y, w, h; +- for (i = 0; i < screenCount; i++) { ++ int itScreenCount = screenCount; ++ for (i = 0; i < itScreenCount; i++) { + + #ifndef QT_NO_XINERAMA + if (use_xinerama) { +@@ -160,10 +161,19 @@ void QDesktopWidgetPrivate::init() + } + + rects[i].setRect(x, y, w, h); ++ if (i > 0 && rects[i-1].intersects(rects[i]) && ++ (rects[i].width()*rects[i].height()) > ++ (rects[i-1].width()*rects[i-1].height())) { ++ rects[i-1] = rects[i]; ++ screenCount--; ++ } + workareas[i] = QRect(); + } + + #ifndef QT_NO_XINERAMA ++ if (use_xinerama && screenCount == 1) ++ use_xinerama = false; ++ + if (xinerama_screeninfo) + XFree(xinerama_screeninfo); + #endif // QT_NO_XINERAMA --- qt4-x11-4.3.3.orig/debian/patches/0203-qtexthtmlparser-link-color.diff +++ qt4-x11-4.3.3/debian/patches/0203-qtexthtmlparser-link-color.diff @@ -0,0 +1,18 @@ +qt-bugs@ issue : none +Trolltech task ID : none +applied: yes +author: Rafael Fernández López + +Links are assigned a foreground color according to the system current color scheme. + +--- src/gui/text/qtexthtmlparser.cpp (revisión: 745183) ++++ src/gui/text/qtexthtmlparser.cpp (copia de trabajo) +@@ -1031,7 +1031,7 @@ void QTextHtmlParserNode::initializeProp + && !attributes.at(i + 1).isEmpty()) { + hasHref = true; + charFormat.setUnderlineStyle(QTextCharFormat::SingleUnderline); +- charFormat.setForeground(Qt::blue); ++ charFormat.setForeground(QApplication::palette().link()); + } + } + --- qt4-x11-4.3.3.orig/debian/patches/31_arm_eabi_fix.diff +++ qt4-x11-4.3.3/debian/patches/31_arm_eabi_fix.diff @@ -0,0 +1,15 @@ +author: Lennert Buytenhek + +Add support for EABI ARM platforms to Qt. + +--- a/src/corelib/global/qglobal.h ++++ b/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 + # endif +-# if (defined(__arm__) || defined(__ARMEL__)) && !defined(QT_MOC_CPP) ++# if (defined(__arm__) || defined(__ARMEL__)) && !defined(__ARM_EABI__) && !defined(QT_MOC_CPP) + # define Q_PACKED __attribute__ ((__packed__)) + # define Q_NO_PACKED_REFERENCE + # endif --- qt4-x11-4.3.3.orig/debian/patches/90_qmake_cxxflags_fpermissive.diff +++ qt4-x11-4.3.3/debian/patches/90_qmake_cxxflags_fpermissive.diff @@ -0,0 +1,13 @@ +author: Matthias Klose + +--- a/mkspecs/common/g++.conf ++++ b/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 --- qt4-x11-4.3.3.orig/debian/patches/0180-window-role.diff +++ qt4-x11-4.3.3/debian/patches/0180-window-role.diff @@ -0,0 +1,117 @@ +qt-bugs@ issue : none yet +Trolltech task ID : none +bugs.kde.org number : none +applied: no +author: Lubos Lunak + + Hello, + + there are several problems with Qt's support for the WM_WINDOW_ROLE property: + +- plain "QWidget w; w.setWindowRole( "test" );" aborts with +Qt::WA_WState_Created not being set + +- while QWidgetPrivate::create_sys() uses QObject object name for initial +setting of WM_WINDOW_ROLE, later calls to QObject::setObjectName() have no +effect on it + +- Qt3 used the QObject object name for setting the window role, however Qt4 +uses some strange mix of object name and what's set manually with +setWindowRole(). + + The result is that that Qt3 and KDE3 apps that had WM_WINDOW_ROLE set don't +in their Qt4 and KDE4 versions. I suggest using the attached patch which +fixed all of the above problems: + +- set explicit window role is used when actually set, otherwise the object +name is used. This e.g. takes care of apps ported using setObjectName() from +their Qt3/KDE3 versions (including e.g. Qt Designer) and generally makes it +somewhat less demanding to actually set a usable window role (I can't quite +see how many developers would be bothered to explicitly call +setWindowRole()). + +- calls to QObject::setObjectName() update the WM_WINDOW_ROLE property. Since +QObjectPrivate already has a virtual dtor I think adding another virtual for +handling the QWidget-related functionality from QtCore is fine. + +--- a/src/corelib/kernel/qobject.cpp ++++ b/src/corelib/kernel/qobject.cpp +@@ -1008,9 +1008,18 @@ + { + Q_D(QObject); + d->objectName = name; ++#if defined(Q_WS_X11) ++ d->checkWindowRole(); ++#endif + } + + ++#if defined(Q_WS_X11) ++void QObjectPrivate::checkWindowRole() ++{ ++} ++#endif ++ + #ifdef QT3_SUPPORT + /*! \internal + QObject::child is compat but needs to call itself recursively, +--- a/src/corelib/kernel/qobject_p.h ++++ b/src/corelib/kernel/qobject_p.h +@@ -139,6 +139,9 @@ + mutable quint32 connectedSignals; + + QString objectName; ++#if defined(Q_WS_X11) ++ virtual void checkWindowRole(); ++#endif + }; + + class QSemaphore; +--- a/src/gui/kernel/qwidget_p.h ++++ b/src/gui/kernel/qwidget_p.h +@@ -309,6 +309,7 @@ + + #if defined(Q_WS_X11) + void setWindowRole(const char *role); ++ virtual void checkWindowRole(); + void sendStartupMessage(const char *message) const; + #endif + +--- a/src/gui/kernel/qwidget_x11.cpp ++++ b/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; + +- // declare the widget's object name as window role +- QByteArray objName = q->objectName().toLocal8Bit(); +- XChangeProperty(dpy, id, +- ATOM(WM_WINDOW_ROLE), XA_STRING, 8, PropModeReplace, +- (unsigned char *)objName.constData(), objName.length()); ++ // 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), +@@ -2671,12 +2668,20 @@ + void QWidgetPrivate::setWindowRole(const char *role) + { + Q_Q(QWidget); +- Q_ASSERT(q->testAttribute(Qt::WA_WState_Created)); ++ if( !q->testAttribute(Qt::WA_WState_Created)) ++ return; + XChangeProperty(X11->display, q->internalWinId(), + ATOM(WM_WINDOW_ROLE), XA_STRING, 8, PropModeReplace, + (unsigned char *)role, qstrlen(role)); + } + ++void QWidgetPrivate::checkWindowRole() ++{ ++ Q_Q(QWidget); ++ if( q->windowRole().isEmpty()) ++ setWindowRole( objectName.toUtf8()); ++} ++ + Q_GLOBAL_STATIC(QX11PaintEngine, qt_widget_paintengine) + QPaintEngine *QWidget::paintEngine() const + { --- qt4-x11-4.3.3.orig/debian/patches/02_launch_assistant-qt4.diff +++ qt4-x11-4.3.3/debian/patches/02_launch_assistant-qt4.diff @@ -0,0 +1,18 @@ +author: Brian Nelson + +--- a/tools/assistant/lib/qassistantclient.cpp ++++ b/tools/assistant/lib/qassistantclient.cpp +@@ -187,11 +187,11 @@ + : QObject( parent ), host ( QLatin1String("localhost") ) + { + if ( path.isEmpty() ) +- assistantCommand = QLatin1String("assistant"); ++ assistantCommand = QLatin1String("assistant-qt4"); + else { + QFileInfo fi( path ); + if ( fi.isDir() ) +- assistantCommand = path + QLatin1String("/assistant"); ++ assistantCommand = path + QLatin1String("/assistant-qt4"); + else + assistantCommand = path; + } --- qt4-x11-4.3.3.orig/debian/patches/0195-compositing-properties.diff +++ qt4-x11-4.3.3/debian/patches/0195-compositing-properties.diff @@ -0,0 +1,73 @@ +qt-bugs@ issue : none +bugs.kde.org number : none +applied: no +author: Lubos Lunak + +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. + +--- a/src/gui/kernel/qwidget_x11.cpp ++++ b/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(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; --- qt4-x11-4.3.3.orig/debian/patches/0178-transparency-window-types.diff +++ qt4-x11-4.3.3/debian/patches/0178-transparency-window-types.diff @@ -0,0 +1,344 @@ +qt-bugs@ issue : none yet +Trolltech task ID : none +bugs.kde.org number : none +applied: no +author: Lubos Lunak + +This patch adds Qt support for new window types used for compositing. + +diff -Nur -x '*.orig' -x '*~' qt4-x11-4.3.3/src/gui/kernel/qapplication_x11.cpp qt4-x11-4.3.3.new/src/gui/kernel/qapplication_x11.cpp +--- qt4-x11-4.3.3/src/gui/kernel/qapplication_x11.cpp 2007-12-05 17:01:40.000000000 +0000 ++++ qt4-x11-4.3.3.new/src/gui/kernel/qapplication_x11.cpp 2007-12-05 17:03:02.000000000 +0000 +@@ -212,6 +212,11 @@ + "_NET_WM_WINDOW_TYPE_SPLASH\0" + "_NET_WM_WINDOW_TYPE_TOOLBAR\0" + "_NET_WM_WINDOW_TYPE_UTILITY\0" ++ "_NET_WM_WINDOW_TYPE_DROPDOWN_MENU\0" ++ "_NET_WM_WINDOW_TYPE_POPUP_MENU\0" ++ "_NET_WM_WINDOW_TYPE_COMBO\0" ++ "_NET_WM_WINDOW_TYPE_DND\0" ++ "_NET_WM_WINDOW_TYPE_TOOLTIP\0" + + "_KDE_NET_WM_FRAME_STRUT\0" + +diff -Nur -x '*.orig' -x '*~' qt4-x11-4.3.3/src/gui/kernel/qdnd_x11.cpp qt4-x11-4.3.3.new/src/gui/kernel/qdnd_x11.cpp +--- qt4-x11-4.3.3/src/gui/kernel/qdnd_x11.cpp 2007-12-05 17:01:40.000000000 +0000 ++++ qt4-x11-4.3.3.new/src/gui/kernel/qdnd_x11.cpp 2007-12-05 17:03:02.000000000 +0000 +@@ -268,6 +268,7 @@ + QWidget(QApplication::desktop()->screen(screen), + Qt::Tool | Qt::FramelessWindowHint | Qt::X11BypassWindowManagerHint) + { ++ x11SetWindowType( X11WindowTypeDND ); + } + + void setPixmap(const QPixmap &pm) +@@ -1436,6 +1437,7 @@ + // recreate the pixmap on the new screen... + delete xdnd_data.deco; + xdnd_data.deco = new QShapedPixmapWidget(screen); ++ xdnd_data.deco->x11SetWindowTransient( object->source()->topLevelWidget()); + if (!QWidget::mouseGrabber()) { + updatePixmap(); + xdnd_data.deco->grabMouse(); +@@ -1897,6 +1899,7 @@ + object = o; + object->d_func()->target = 0; + xdnd_data.deco = new QShapedPixmapWidget(); ++ xdnd_data.deco->x11SetWindowTransient( object->source()->topLevelWidget()); + + willDrop = false; + +diff -Nur -x '*.orig' -x '*~' qt4-x11-4.3.3/src/gui/kernel/qtooltip.cpp qt4-x11-4.3.3.new/src/gui/kernel/qtooltip.cpp +--- qt4-x11-4.3.3/src/gui/kernel/qtooltip.cpp 2007-12-05 17:01:40.000000000 +0000 ++++ qt4-x11-4.3.3.new/src/gui/kernel/qtooltip.cpp 2007-12-05 17:03:02.000000000 +0000 +@@ -147,6 +147,9 @@ + setMouseTracking(true); + fadingOut = false; + reuseTip(text); ++#ifdef Q_WS_X11 ++ x11SetWindowType( X11WindowTypeTooltip ); ++#endif + } + + void QTipLabel::restartHideTimer() +@@ -367,6 +370,10 @@ + // that is showing (removes flickering) + if (QTipLabel::instance->tipChanged(pos, text, w)){ + QTipLabel::instance->reuseTip(text); ++#ifdef Q_WS_X11 ++ if (w) ++ QTipLabel::instance->x11SetWindowTransient( w->topLevelWidget()); ++#endif + QTipLabel::instance->setTipRect(w, rect); + QTipLabel::instance->placeTip(pos, w); + } +@@ -376,6 +383,10 @@ + + if (!text.isEmpty()){ // no tip can be reused, create new tip: + new QTipLabel(pos, text, w); // sets QTipLabel::instance to itself ++#ifdef Q_WS_X11 ++ if (w) ++ QTipLabel::instance->x11SetWindowTransient( w->topLevelWidget()); ++#endif + QTipLabel::instance->setTipRect(w, rect); + QTipLabel::instance->placeTip(pos, w); + QTipLabel::instance->setObjectName(QLatin1String("qtooltip_label")); +diff -Nur -x '*.orig' -x '*~' qt4-x11-4.3.3/src/gui/kernel/qt_x11_p.h qt4-x11-4.3.3.new/src/gui/kernel/qt_x11_p.h +--- qt4-x11-4.3.3/src/gui/kernel/qt_x11_p.h 2007-12-05 17:01:40.000000000 +0000 ++++ qt4-x11-4.3.3.new/src/gui/kernel/qt_x11_p.h 2007-12-05 17:03:02.000000000 +0000 +@@ -528,6 +528,11 @@ + _NET_WM_WINDOW_TYPE_SPLASH, + _NET_WM_WINDOW_TYPE_TOOLBAR, + _NET_WM_WINDOW_TYPE_UTILITY, ++ _NET_WM_WINDOW_TYPE_DROPDOWN_MENU, ++ _NET_WM_WINDOW_TYPE_POPUP_MENU, ++ _NET_WM_WINDOW_TYPE_COMBO, ++ _NET_WM_WINDOW_TYPE_DND, ++ _NET_WM_WINDOW_TYPE_TOOLTIP, + + _KDE_NET_WM_FRAME_STRUT, + +diff -Nur -x '*.orig' -x '*~' qt4-x11-4.3.3/src/gui/kernel/qwidget.h qt4-x11-4.3.3.new/src/gui/kernel/qwidget.h +--- qt4-x11-4.3.3/src/gui/kernel/qwidget.h 2007-12-05 17:01:40.000000000 +0000 ++++ qt4-x11-4.3.3.new/src/gui/kernel/qwidget.h 2007-12-05 17:03:02.000000000 +0000 +@@ -352,6 +352,19 @@ + + void setWindowOpacity(qreal level); + qreal windowOpacity() const; ++#if defined(Q_WS_X11) ++ enum X11WindowType { ++ X11WindowTypeSelect, ++ X11WindowTypeCombo, ++ X11WindowTypeDND, ++ X11WindowTypeTooltip, ++ X11WindowTypeMenu, // torn-off ++ X11WindowTypeDropdown, ++ X11WindowTypePopup ++ }; ++ void x11SetWindowType( X11WindowType type = X11WindowTypeSelect ); ++ void x11SetWindowTransient( QWidget* parent ); ++#endif + + bool isWindowModified() const; + #ifndef QT_NO_TOOLTIP +diff -Nur -x '*.orig' -x '*~' qt4-x11-4.3.3/src/gui/kernel/qwidget_x11.cpp qt4-x11-4.3.3.new/src/gui/kernel/qwidget_x11.cpp +--- qt4-x11-4.3.3/src/gui/kernel/qwidget_x11.cpp 2007-12-05 17:01:40.000000000 +0000 ++++ qt4-x11-4.3.3.new/src/gui/kernel/qwidget_x11.cpp 2007-12-05 17:03:02.000000000 +0000 +@@ -560,10 +560,6 @@ + } + #endif // QT_NO_XRENDER + +- // NET window types +- long net_wintypes[7] = { 0, 0, 0, 0, 0, 0, 0 }; +- int curr_wintype = 0; +- + QtMWMHints mwmhints; + mwmhints.flags = 0L; + mwmhints.functions = MWM_FUNC_ALL; +@@ -574,15 +570,11 @@ + if (topLevel) { + ulong wsa_mask = 0; + if (type == Qt::SplashScreen) { +- net_wintypes[curr_wintype++] = ATOM(_NET_WM_WINDOW_TYPE_SPLASH); + } else { // if (customize) { + mwmhints.decorations = 0L; + mwmhints.flags |= MWM_HINTS_DECORATIONS; + +- if (flags & Qt::FramelessWindowHint) { +- // override netwm type - quick and easy for KDE noborder +- net_wintypes[curr_wintype++] = ATOM(_KDE_NET_WM_WINDOW_TYPE_OVERRIDE); +- } else { ++ if ((flags & Qt::FramelessWindowHint) == 0 ) { + mwmhints.decorations |= MWM_DECOR_BORDER; + mwmhints.decorations |= MWM_DECOR_RESIZEH; + +@@ -604,22 +596,6 @@ + wsa.save_under = True; + wsa_mask |= CWSaveUnder; + } +- // ### need a better way to do this +- if (q->inherits("QMenu")) { +- // menu netwm type +- net_wintypes[curr_wintype++] = ATOM(_NET_WM_WINDOW_TYPE_MENU); +- } else if (q->inherits("QToolBar")) { +- // toolbar netwm type +- net_wintypes[curr_wintype++] = ATOM(_NET_WM_WINDOW_TYPE_TOOLBAR); +- } else if (type == Qt::Tool || type == Qt::Drawer) { +- // utility netwm type +- net_wintypes[curr_wintype++] = ATOM(_NET_WM_WINDOW_TYPE_UTILITY); +- } +- +- if (dialog) // dialog netwm type +- net_wintypes[curr_wintype++] = ATOM(_NET_WM_WINDOW_TYPE_DIALOG); +- // normal netwm type - default +- net_wintypes[curr_wintype++] = ATOM(_NET_WM_WINDOW_TYPE_NORMAL); + + if (flags & Qt::X11BypassWindowManagerHint) { + wsa.override_redirect = True; +@@ -638,6 +614,7 @@ + wsa.save_under = True; + XChangeWindowAttributes(dpy, id, CWOverrideRedirect | CWSaveUnder, + &wsa); ++ q->x11SetWindowType(); + } else if (topLevel && !desktop) { // top-level widget + if (!X11->wm_client_leader) + create_wm_client_leader(); +@@ -682,12 +659,7 @@ + // set mwm hints + SetMWMHints(dpy, id, mwmhints); + +- // set _NET_WM_WINDOW_TYPE +- if (curr_wintype > 0) +- XChangeProperty(dpy, id, ATOM(_NET_WM_WINDOW_TYPE), XA_ATOM, 32, PropModeReplace, +- (unsigned char *) net_wintypes, curr_wintype); +- else +- XDeleteProperty(dpy, id, ATOM(_NET_WM_WINDOW_TYPE)); ++ q->x11SetWindowType(); // set _NET_WM_WINDOW_TYPE + + // set _NET_WM_PID + long curr_pid = getpid(); +@@ -783,6 +755,63 @@ + q->setAttribute(Qt::WA_OutsideWSRange, true); + } + ++// Sets the EWMH (netwm) window type. Needed as a separate function ++// because create() may be too soon in some cases. ++void QWidget::x11SetWindowType( X11WindowType type ) ++{ ++ Display* dpy = X11->display; ++ // NET window types ++ long net_wintypes[7] = { 0, 0, 0, 0, 0, 0, 0 }; ++ int curr_wintype = 0; ++ if( type == X11WindowTypeSelect ) { ++ if ( windowType() == Qt::SplashScreen ) { ++ net_wintypes[curr_wintype++] = ATOM(_NET_WM_WINDOW_TYPE_SPLASH); ++ } else if (inherits("QToolBar")) { ++ // toolbar netwm type ++ net_wintypes[curr_wintype++] = ATOM(_NET_WM_WINDOW_TYPE_TOOLBAR); ++ } else if (windowType() == Qt::Tool || windowType() == Qt::Drawer) { ++ // utility netwm type ++ net_wintypes[curr_wintype++] = ATOM(_NET_WM_WINDOW_TYPE_UTILITY); ++ } else if (windowType() == Qt::Dialog || windowType() == Qt::Sheet ++ || (windowFlags() & Qt::MSWindowsFixedSizeDialogHint)) { ++ // dialog netwm type ++ net_wintypes[curr_wintype++] = ATOM(_NET_WM_WINDOW_TYPE_DIALOG); ++ } ++ } else if( type == X11WindowTypeCombo ) { ++ // combo netwm type ++ net_wintypes[curr_wintype++] = ATOM(_NET_WM_WINDOW_TYPE_COMBO); ++ } else if( type == X11WindowTypeDND ) { ++ // dnd netwm type ++ net_wintypes[curr_wintype++] = ATOM(_NET_WM_WINDOW_TYPE_DND); ++ } else if( type == X11WindowTypeDropdown ) { ++ // dropdown netwm type ++ net_wintypes[curr_wintype++] = ATOM(_NET_WM_WINDOW_TYPE_DROPDOWN_MENU); ++ } else if( type == X11WindowTypePopup ) { ++ // popup netwm type ++ net_wintypes[curr_wintype++] = ATOM(_NET_WM_WINDOW_TYPE_POPUP_MENU); ++ } else if( type == X11WindowTypeMenu ) { ++ // menu netwm type ++ net_wintypes[curr_wintype++] = ATOM(_NET_WM_WINDOW_TYPE_MENU); ++ } else if( type == X11WindowTypeTooltip ) { ++ // tooltip netwm type ++ net_wintypes[curr_wintype++] = ATOM(_NET_WM_WINDOW_TYPE_TOOLTIP); ++ } ++ ++ // normal netwm type - default ++ net_wintypes[curr_wintype++] = ATOM(_NET_WM_WINDOW_TYPE_NORMAL); ++ // set _NET_WM_WINDOW_TYPE ++ if (curr_wintype > 0) ++ XChangeProperty(dpy, winId(), ATOM(_NET_WM_WINDOW_TYPE), XA_ATOM, 32, PropModeReplace, ++ (unsigned char *) net_wintypes, curr_wintype); ++ else ++ XDeleteProperty(dpy, winId(), ATOM(_NET_WM_WINDOW_TYPE)); ++} ++ ++void QWidget::x11SetWindowTransient( QWidget* parent ) ++{ ++ XSetTransientForHint( X11->display, winId(), parent->window()->winId()); ++} ++ + /*! + Frees up window system resources. Destroys the widget window if \a + destroyWindow is true. +diff -Nur -x '*.orig' -x '*~' qt4-x11-4.3.3/src/gui/widgets/qcombobox.cpp qt4-x11-4.3.3.new/src/gui/widgets/qcombobox.cpp +--- qt4-x11-4.3.3/src/gui/widgets/qcombobox.cpp 2007-12-05 17:01:40.000000000 +0000 ++++ qt4-x11-4.3.3.new/src/gui/widgets/qcombobox.cpp 2007-12-05 17:03:02.000000000 +0000 +@@ -332,6 +332,10 @@ + combo->update(); + } + } ++#ifdef Q_WS_X11 ++ x11SetWindowType( X11WindowTypeCombo ); ++ x11SetWindowTransient( combo->topLevelWidget()); ++#endif + } + + void QComboBoxPrivateContainer::resizeEvent(QResizeEvent *e) +diff -Nur -x '*.orig' -x '*~' qt4-x11-4.3.3/src/gui/widgets/qmenu.cpp qt4-x11-4.3.3.new/src/gui/widgets/qmenu.cpp +--- qt4-x11-4.3.3/src/gui/widgets/qmenu.cpp 2007-12-05 17:01:40.000000000 +0000 ++++ qt4-x11-4.3.3.new/src/gui/widgets/qmenu.cpp 2007-12-05 17:12:51.000000000 +0000 +@@ -97,6 +97,9 @@ + QTornOffMenu(QMenu *p) : QMenu(*(new QTornOffMenuPrivate(p))) + { + setParent(p, Qt::Window | Qt::Tool); ++#ifdef Q_WS_X11 ++ x11SetWindowType( X11WindowTypeMenu ); ++#endif + setAttribute(Qt::WA_DeleteOnClose, true); + setWindowTitle(p->windowTitle()); + setEnabled(p->isEnabled()); +@@ -143,6 +146,9 @@ + } + defaultMenuAction = menuAction = new QAction(q); + menuAction->d_func()->menu = q; ++#ifdef Q_WS_X11 ++ q->x11SetWindowType( QWidget::X11WindowTypePopup ); ++#endif + } + + //Windows and KDE allows menus to cover the taskbar, while GNOME and Mac don't +@@ -1678,6 +1684,33 @@ + } + } + setGeometry(QRect(pos, size)); ++ ++#ifdef Q_WS_X11 ++ QWidget* top = this; ++ for(;;) { ++ if( QMenu* m = qobject_cast< QMenu* >( top )) { ++ if( m->d_func()->causedPopup.widget == NULL ) ++ break; // ---> ++ top = m->d_func()->causedPopup.widget; ++ } else ++ break; // --> ++ } ++ if( QMenu* m = qobject_cast< QMenu* >( top )) ++ x11SetWindowType( X11WindowTypePopup ); ++ else ++ x11SetWindowType( X11WindowTypeDropdown ); ++ // hackish ... try to find the main window related to this popup ++ QWidget* parent = d_func()->causedPopup.widget; ++ if( parent == NULL ) ++ parent = parentWidget() ? parentWidget()->topLevelWidget() : NULL; ++ if( parent == NULL ) ++ parent = QApplication::widgetAt( pos ); ++ if( parent == NULL ) ++ parent = qApp->activeWindow(); ++ if( parent != NULL ) ++ x11SetWindowTransient( parent ); ++#endif ++ + #ifndef QT_NO_EFFECTS + int hGuess = qApp->layoutDirection() == Qt::RightToLeft ? QEffects::LeftScroll : QEffects::RightScroll; + int vGuess = QEffects::DownScroll; +@@ -1874,6 +1907,9 @@ + if (QMenuBar *mb = qobject_cast(d->causedPopup.widget)) + mb->d_func()->setCurrentAction(0); + #endif ++#ifdef Q_WS_X11 ++ x11SetWindowType( X11WindowTypePopup ); // reset ++#endif + d->mouseDown = 0; + d->hasHadMouse = false; + d->causedPopup.widget = 0; --- qt4-x11-4.3.3.orig/debian/patches/kubuntu_03_use_bash_in_configure.diff +++ qt4-x11-4.3.3/debian/patches/kubuntu_03_use_bash_in_configure.diff @@ -0,0 +1,9 @@ +diff -Nru qt4-x11-4.3.3.orig/configure qt4-x11-4.3.3/configure +--- qt4-x11-4.3.3.orig/configure 2008-02-07 19:13:04.000000000 +0000 ++++ qt4-x11-4.3.3/configure 2008-02-07 19:16:34.000000000 +0000 +@@ -1,4 +1,4 @@ +-#!/bin/sh ++#!/bin/bash + # + # Configures to build the Qt library + # --- qt4-x11-4.3.3.orig/debian/patches/20_mips_atomic_ops.diff +++ qt4-x11-4.3.3/debian/patches/20_mips_atomic_ops.diff @@ -0,0 +1,62 @@ +author: Thiemo Seufer + +Fix compilation for Linux MIPS-I code. + +--- a/src/corelib/arch/mips/qatomic32.s ++++ b/src/corelib/arch/mips/qatomic32.s +@@ -6,10 +6,12 @@ + .globl q_atomic_test_and_set_int + .ent q_atomic_test_and_set_int + q_atomic_test_and_set_int: ++ .set mips2 + 1: ll $8,0($4) + bne $8,$5,2f + move $2,$6 + sc $2,0($4) ++ .set mips0 + beqz $2,1b + nop + jr $31 +@@ -21,6 +23,7 @@ + .globl q_atomic_test_and_set_acquire_int + .ent q_atomic_test_and_set_acquire_int + q_atomic_test_and_set_acquire_int: ++ .set mips2 + 1: ll $8,0($4) + bne $8,$5,2f + move $2,$6 +@@ -30,6 +33,7 @@ + jr $31 + nop + 2: sync ++ .set mips0 + jr $31 + move $2,$0 + .end q_atomic_test_and_set_acquire_int +@@ -37,11 +41,13 @@ + .globl q_atomic_test_and_set_release_int + .ent q_atomic_test_and_set_release_int + q_atomic_test_and_set_release_int: ++ .set mips2 + sync + 1: ll $8,0($4) + bne $8,$5,2f + move $2,$6 + sc $2,0($4) ++ .set mips0 + beqz $2,1b + nop + jr $31 +@@ -53,10 +59,12 @@ + .globl q_atomic_test_and_set_ptr + .ent q_atomic_test_and_set_ptr + q_atomic_test_and_set_ptr: ++ .set mips2 + 1: ll $8,0($4) + bne $8,$5,2f + move $2,$6 + sc $2,0($4) ++ .set mips0 + beqz $2,1b + nop + jr $31 --- qt4-x11-4.3.3.orig/debian/patches/0176-coverity-fixes.diff +++ qt4-x11-4.3.3/debian/patches/0176-coverity-fixes.diff @@ -0,0 +1,37 @@ +qt-bugs@ issue : none +Trolltech task ID : none +bugs.kde.org number : +applied: no +author: Dirk Mueller + +fix various obvious memory leaks etc + +--- a/src/gui/painting/qimagescale.cpp ++++ b/src/gui/painting/qimagescale.cpp +@@ -1020,6 +1020,7 @@ + buffer = QImage(dw, dh, src.format()); + if (buffer.isNull()) { + qWarning("QImage: out of memory, returning null"); ++ qimageFreeScaleInfo(scaleinfo); + return QImage(); + } + +--- a/src/svg/qsvghandler.cpp ++++ b/src/svg/qsvghandler.cpp +@@ -1144,15 +1144,9 @@ + if (!size.isEmpty()) { + QSvgHandler::LengthType type; + qreal len = parseLength(size, type, handler); +- //len = convertToPixels(len, false, type); + // ### org_module.svg shows that font size + // seems to be always in px... +- type = QSvgHandler::PX; +- if (type == QSvgHandler::PX || +- type == QSvgHandler::OTHER) +- font.setPixelSize(int(len)); +- else +- font.setPointSizeF(len); ++ font.setPixelSize(int(len)); + } + if (!style.isEmpty()) { + if (style == QLatin1String("normal")) { --- qt4-x11-4.3.3.orig/debian/patches/0191-listview-alternate-row-colors.diff +++ qt4-x11-4.3.3/debian/patches/0191-listview-alternate-row-colors.diff @@ -0,0 +1,22 @@ +qt-bugs@ issue : 178507 +Trolltech task ID : 179170 +applied: no +author: Matthew Woehlke + +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.) + +--- a/src/gui/itemviews/qlistview.cpp ++++ b/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); + } --- qt4-x11-4.3.3.orig/debian/patches/06_qtdemo_destdir.diff +++ qt4-x11-4.3.3/debian/patches/06_qtdemo_destdir.diff @@ -0,0 +1,25 @@ +author: Fathi Boudra + +Fix qtdemo destdir. + +--- a/demos/arthurplugin/arthurplugin.pro ++++ b/demos/arthurplugin/arthurplugin.pro +@@ -3,7 +3,7 @@ + + CONFIG += designer plugin debug_and_release + TEMPLATE = lib +-QTDIR_build:DESTDIR = $$QT_BUILD_TREE/plugins/designer ++QTDIR_build:DESTDIR = plugins/designer + + contains(QT_CONFIG, opengl) { + DEFINES += QT_OPENGL_SUPPORT +--- a/demos/qtdemo/qtdemo.pro ++++ b/demos/qtdemo/qtdemo.pro +@@ -1,6 +1,6 @@ + CONFIG += assistant x11inc + TARGET = qtdemo +-DESTDIR = $$QT_BUILD_TREE/bin ++DESTDIR = bin + OBJECTS_DIR = .obj + MOC_DIR = .moc + INSTALLS += target sources --- qt4-x11-4.3.3.orig/debian/patches/0192-itemdelegate-palette-state.diff +++ qt4-x11-4.3.3/debian/patches/0192-itemdelegate-palette-state.diff @@ -0,0 +1,25 @@ +qt-bugs@ issue : 178507 +Trolltech task ID : 179170 +applied: no +author: Matthew Woehlke + +This patch fixes incorrect setting of the palette color group in +QItemDelegate that resulted in inactive colors being used for widgets +in active windows. + +--- a/src/gui/itemviews/qitemdelegate.cpp ++++ b/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 { --- qt4-x11-4.3.3.orig/debian/patches/70_hppa_ldcw_fix.diff +++ qt4-x11-4.3.3/debian/patches/70_hppa_ldcw_fix.diff @@ -0,0 +1,26 @@ +author: LaMont Jones + +patch from Ubuntu to properly support hppa. + +--- a/src/corelib/arch/parisc/q_ldcw.s ++++ b/src/corelib/arch/parisc/q_ldcw.s +@@ -1,17 +1,7 @@ +- .SPACE $PRIVATE$ +- .SUBSPA $DATA$,QUAD=1,ALIGN=8,ACCESS=31 +- .SUBSPA $BSS$,QUAD=1,ALIGN=8,ACCESS=31,ZERO,SORT=82 +- .SPACE $TEXT$ +- .SUBSPA $LIT$,QUAD=0,ALIGN=8,ACCESS=44 +- .SUBSPA $CODE$,QUAD=0,ALIGN=8,ACCESS=44,CODE_ONLY +- .IMPORT $global$,DATA +- .IMPORT $$dyncall,MILLICODE +- .SPACE $TEXT$ +- .SUBSPA $CODE$ +- ++ .text + .align 4 + .EXPORT q_ldcw,ENTRY,PRIV_LEV=3,ARGW0=GR,RTNVAL=GR +-q_ldcw ++ .label q_ldcw + .PROC + .CALLINFO FRAME=0,CALLS,SAVE_RP + .ENTRY --- qt4-x11-4.3.3.orig/debian/patches/40_alpha_ice.diff +++ qt4-x11-4.3.3/debian/patches/40_alpha_ice.diff @@ -0,0 +1,45 @@ +--- a/src/corelib/global/qlibraryinfo.cpp ++++ b/src/corelib/global/qlibraryinfo.cpp +@@ -69,14 +69,7 @@ + { + public: + static QSettings *findConfiguration(); +- static void cleanup() +- { +- QLibrarySettings *ls = qt_library_settings(); +- if (ls) { +- delete static_cast(ls->settings); +- ls->settings = 0; +- } +- } ++ static void cleanup(); + static QSettings *configuration() + { + #ifdef QT_NO_THREAD +@@ -95,6 +88,15 @@ + } + }; + ++void QLibraryInfoPrivate::cleanup() ++{ ++ QLibrarySettings *ls = qt_library_settings(); ++ if (ls) { ++ delete static_cast(ls->settings); ++ ls->settings = 0; ++ } ++} ++ + QLibrarySettings::QLibrarySettings() + { + settings = QLibraryInfoPrivate::findConfiguration(); +--- a/src/corelib/tools/qhash.h ++++ b/src/corelib/tools/qhash.h +@@ -479,7 +479,7 @@ + } + + template +-Q_INLINE_TEMPLATE void QHash::duplicateNode(QHashData::Node *node, void *newNode) ++void QHash::duplicateNode(QHashData::Node *node, void *newNode) + { + Node *concreteNode = concrete(node); + if (QTypeInfo::isDummy) { --- qt4-x11-4.3.3.orig/debian/patches/series +++ qt4-x11-4.3.3/debian/patches/series @@ -0,0 +1,41 @@ +# qt-copy patches +0163-fix-gcc43-support.diff +0167-fix-group-reading.diff +0175-fix-s390-qatomic.diff +0176-coverity-fixes.diff +0178-transparency-window-types.diff +0179-transient-hack.diff +0180-window-role.diff +0185-fix-format-strings.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 +02_launch_assistant-qt4.diff +03_launch_moc-qt4.diff +04_launch_uic-qt4.diff +05_append_qt4_target.diff +06_qtdemo_destdir.diff +07_trust_dpkg-arch_over_uname-m.diff +20_mips_atomic_ops.diff +30_arm_ftbfs_fixes.diff +31_arm_eabi_fix.diff +40_alpha_ice.diff +41_disable_opengl_visibility.diff +50_kfreebsd_build_fix.diff +60_m68k_inotify_fix.diff +70_hppa_ldcw_fix.diff +80_hurd_max_path.diff +90_qmake_cxxflags_fpermissive.diff + +# kubuntu patches +kubuntu_01_load_ssl.diff +kubuntu_02_no_undefined.diff +kubuntu_03_use_bash_in_configure.diff --- qt4-x11-4.3.3.orig/debian/patches/0187-fix-font-fixed-pitch.diff +++ qt4-x11-4.3.3/debian/patches/0187-fix-font-fixed-pitch.diff @@ -0,0 +1,56 @@ +qt-bugs@ issue : 173297 +Trolltech task ID : 175024 +applied: no +author: Matthew Woehlke + +This patch works around broken QFontInfo::fixedPitch by always using a +glyph metrics comparison test to guess the information. This has the +property of both ignoring (bad) and not relying on (good) any information +that might be provided by the OS's font facility. + +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. + +--- a/src/gui/text/qfont.cpp ++++ b/src/gui/text/qfont.cpp +@@ -2093,7 +2093,6 @@ + { + QFontEngine *engine = d->engineForScript(QUnicodeTables::Common); + Q_ASSERT(engine != 0); +-#ifdef Q_OS_MAC + if (!engine->fontDef.fixedPitchComputed) { + QChar ch[2] = { QLatin1Char('i'), QLatin1Char('m') }; + QGlyphLayout g[2]; +@@ -2102,7 +2101,6 @@ + engine->fontDef.fixedPitch = g[0].advance.x == g[1].advance.x; + engine->fontDef.fixedPitchComputed = true; + } +-#endif + return engine->fontDef.fixedPitch; + } + +--- a/src/gui/text/qfont_p.h ++++ b/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), + ignorePitch(true) +-#ifdef Q_WS_MAC + ,fixedPitchComputed(false) +-#endif + { + } + +@@ -90,7 +88,7 @@ + uint stretch : 12; // 0-400 + + uint ignorePitch : 1; +- uint fixedPitchComputed : 1; // for Mac OS X only ++ uint fixedPitchComputed : 1; + uint reserved : 16; // for future extensions + + bool exactMatch(const QFontDef &other) const; --- qt4-x11-4.3.3.orig/debian/patches/01_qmake_for_debian.diff +++ qt4-x11-4.3.3/debian/patches/01_qmake_for_debian.diff @@ -0,0 +1,31 @@ +author: Brian Nelson + +Ensures qmake generates Makefiles that use the -qt4 tools and that use +recursively link against all indirectly-used libraries. + +--- a/mkspecs/common/linux.conf ++++ b/mkspecs/common/linux.conf +@@ -23,8 +23,8 @@ + QMAKE_LIBS_OPENGL_QT = -lGL + QMAKE_LIBS_THREAD = -lpthread + +-QMAKE_MOC = $$[QT_INSTALL_BINS]/moc +-QMAKE_UIC = $$[QT_INSTALL_BINS]/uic ++QMAKE_MOC = $$[QT_INSTALL_BINS]/moc-qt4 ++QMAKE_UIC = $$[QT_INSTALL_BINS]/uic-qt4 + + QMAKE_AR = ar cqs + QMAKE_RANLIB = +--- a/mkspecs/linux-g++/qmake.conf ++++ b/mkspecs/linux-g++/qmake.conf +@@ -4,8 +4,9 @@ + + MAKEFILE_GENERATOR = UNIX + TEMPLATE = app +-CONFIG += qt warn_on release incremental link_prl ++CONFIG += qt warn_on release incremental + QT += core gui ++DEFINES += QT_SHARED + QMAKE_INCREMENTAL_STYLE = sublib + + include(../common/g++.conf) --- qt4-x11-4.3.3.orig/debian/patches/07_trust_dpkg-arch_over_uname-m.diff +++ qt4-x11-4.3.3/debian/patches/07_trust_dpkg-arch_over_uname-m.diff @@ -0,0 +1,52 @@ +author: Sune Vuorela +Reported to trolltech as N180631 - and task 181882 +Index: b/configure +=================================================================== +--- a/configure ++++ b/configure +@@ -93,7 +93,44 @@ + #------------------------------------------------------------------------------- + + # need that throughout the script +-UNAME_MACHINE=`(uname -m) 2>/dev/null` || UNAME_MACHINE=unknown ++DPKG_ARCH=`(dpkg-architecture -qDEB_HOST_ARCH) 2>/dev/null` || UNAME_MACHINE=unknown ++case $DPKG_ARCH in ++ amd64) ++ UNAME_MACHINE="x86_64" ++ ;; ++ arm) ++ UNAME_MACHINE="armv4l" ++ ;; ++ armel) ++ UNAME_MACHINE="armv5tel" ++ ;; ++ hppa) ++ UNAME_MACHINE="parisc64" ++ ;; ++ hurd-i386) ++ UNAME_MACHINE="i686-AT386" ++ ;; ++ i386) ++ UNAME_MACHINE="i686" ++ ;; ++ kfreebsd-amd64) ++ UNAME_MACHINE="x86_64" ++ ;; ++ kfreebsd-i386) ++ UNAME_MACHINE="i586" ++ ;; ++ mipsel) ++ UNAME_MACHINE="mips" ++ ;; ++ powerpc) ++ UNAME_MACHINE="ppc" ++ ;; ++ *) ++ UNAME_MACHINE="$DPKG_ARCH" ++ ;; ++ ++ ++esac + UNAME_RELEASE=`(uname -r) 2>/dev/null` || UNAME_RELEASE=unknown + UNAME_SYSTEM=`(uname -s) 2>/dev/null` || UNAME_SYSTEM=unknown + UNAME_VERSION=`(uname -v) 2>/dev/null` || UNAME_VERSION=unknown --- qt4-x11-4.3.3.orig/debian/patches/0194-fix-moveonly-dnd-in-itemviews.diff +++ qt4-x11-4.3.3/debian/patches/0194-fix-moveonly-dnd-in-itemviews.diff @@ -0,0 +1,38 @@ +qt-bugs@ issue : 181399 +Trolltech task ID : 181413 +applied: no +author: Matthias Kretz + +Allows drag and drop to work without pressing the shift key for itemviews that use InternalMove. + +--- a/src/gui/itemviews/qabstractitemview.cpp ++++ b/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(); + } + } +--- a/src/gui/itemviews/qlistview.cpp ++++ b/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(); --- qt4-x11-4.3.3.orig/debian/patches/41_disable_opengl_visibility.diff +++ qt4-x11-4.3.3/debian/patches/41_disable_opengl_visibility.diff @@ -0,0 +1,12 @@ +temporary fix because of alpha, has to be dropped as soon as gcc's bug is fixed. + +--- a/src/opengl/opengl.pro ++++ b/src/opengl/opengl.pro +@@ -5,6 +5,7 @@ + win32-msvc*|win32-icc:QMAKE_LFLAGS += /BASE:0x63000000 + solaris-cc*:QMAKE_CXXFLAGS_RELEASE -= -O2 + ++QMAKE_CXXFLAGS_HIDESYMS -= -fvisibility-inlines-hidden + + include(../qbase.pri) + --- qt4-x11-4.3.3.orig/debian/patches/60_m68k_inotify_fix.diff +++ qt4-x11-4.3.3/debian/patches/60_m68k_inotify_fix.diff @@ -0,0 +1,18 @@ +author: Brian Nelson + +From Roman Zippel : These defines are taken from the +m68k tree, they should appear like this soon also in the upstream source. + +--- a/src/corelib/io/qfilesystemwatcher_inotify.cpp ++++ b/src/corelib/io/qfilesystemwatcher_inotify.cpp +@@ -103,6 +103,10 @@ + # define __NR_inotify_init 269 + # define __NR_inotify_add_watch 270 + # define __NR_inotify_rm_watch 271 ++#elif defined (__mc68000__) ++# define __NR_inotify_init 284 ++# define __NR_inotify_add_watch 285 ++# define __NR_inotify_rm_watch 286 + #else + # error "This architecture is not supported. Please talk to qt-bugs@trolltech.com" + #endif --- qt4-x11-4.3.3.orig/debian/patches/04_launch_uic-qt4.diff +++ qt4-x11-4.3.3/debian/patches/04_launch_uic-qt4.diff @@ -0,0 +1,13 @@ +author: Fathi Boudra + +--- a/tools/designer/src/lib/shared/qdesigner_utils.cpp ++++ b/tools/designer/src/lib/shared/qdesigner_utils.cpp +@@ -133,7 +133,7 @@ + binary += QDir::separator(); + switch (mode) { + case UIC_GenerateCode: +- binary += QLatin1String("uic"); ++ binary += QLatin1String("uic-qt4"); + break; + case UIC_ConvertV3: + binary += QLatin1String("uic3"); --- qt4-x11-4.3.3.orig/debian/patches/0179-transient-hack.diff +++ qt4-x11-4.3.3/debian/patches/0179-transient-hack.diff @@ -0,0 +1,21 @@ +qt-bugs@ issue : 166027 +Trolltech task ID : none +bugs.kde.org number : none +applied: no +author: Lubos Lunak + +This patch is just a hackish workaround that makes setting of WM_TRANSIENT_FOR +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. + +--- a/src/gui/kernel/qwidget_x11.cpp ++++ b/src/gui/kernel/qwidget_x11.cpp +@@ -1650,7 +1650,7 @@ + do_size_hints(q, extra); + + // udpate WM_TRANSIENT_FOR +- if (isTransient(q)) { ++ if (isTransient(q) && !( q->windowFlags() & Qt::X11BypassWindowManagerHint)) { + QWidget *p = q->parentWidget(); + if (p) + p = p->window(); --- qt4-x11-4.3.3.orig/debian/patches/kubuntu_02_no_undefined.diff +++ qt4-x11-4.3.3/debian/patches/kubuntu_02_no_undefined.diff @@ -0,0 +1,11 @@ +--- a/mkspecs/common/g++.conf~ 2007-12-18 13:35:25.000000000 +0000 ++++ b/mkspecs/common/g++.conf 2007-12-18 13:36:04.000000000 +0000 +@@ -32,7 +32,7 @@ + + QMAKE_LINK = g++ + QMAKE_LINK_SHLIB = g++ +-QMAKE_LFLAGS += ++QMAKE_LFLAGS += -Wl,--no-undefined + QMAKE_LFLAGS_RELEASE += + QMAKE_LFLAGS_DEBUG += + QMAKE_LFLAGS_APP += --- qt4-x11-4.3.3.orig/debian/qt4-doc.doc-base +++ qt4-x11-4.3.3/debian/qt4-doc.doc-base @@ -0,0 +1,11 @@ +Document: qt4-doc +Title: Qt4 Reference Documentation +Author: Trolltech AS +Abstract: Qt is a cross-platform C++ application framework. Qt's + primary feature is its rich set of widgets that provide standard GUI + functionality. +Section: Apps/Programming + +Format: HTML +Index: /usr/share/doc/qt4-doc/html/index.html +Files: /usr/share/doc/qt4-doc/html/*.html --- qt4-x11-4.3.3.orig/debian/qt4-designer.manpages +++ qt4-x11-4.3.3/debian/qt4-designer.manpages @@ -0,0 +1 @@ +debian/manpages/designer-qt4.1 --- qt4-x11-4.3.3.orig/debian/libqt4-dev.links +++ qt4-x11-4.3.3/debian/libqt4-dev.links @@ -0,0 +1,9 @@ +usr/include/qt4 usr/share/qt4/include +usr/bin/lrelease-qt4 usr/share/qt4/bin/lrelease +usr/bin/lupdate-qt4 usr/share/qt4/bin/lupdate +usr/bin/moc-qt4 usr/share/qt4/bin/moc +usr/bin/qmake-qt4 usr/share/qt4/bin/qmake +usr/bin/uic-qt4 usr/share/qt4/bin/uic +usr/bin/rcc usr/share/qt4/bin/rcc +usr/lib/qt4/plugins usr/share/qt4/plugins +usr/share/qt4/mkspecs/linux-g++ usr/share/qt4/mkspecs/default --- qt4-x11-4.3.3.orig/debian/qt4-doc.install +++ qt4-x11-4.3.3/debian/qt4-doc.install @@ -0,0 +1 @@ +usr/share/qt4/doc --- qt4-x11-4.3.3.orig/debian/libqt4-core.lintian +++ qt4-x11-4.3.3/debian/libqt4-core.lintian @@ -0,0 +1 @@ +libqt4-core: package-name-doesnt-match-sonames --- qt4-x11-4.3.3.orig/debian/libqt4-qt3support.lintian +++ qt4-x11-4.3.3/debian/libqt4-qt3support.lintian @@ -0,0 +1 @@ +libqt4-qt3support: package-name-doesnt-match-sonames libQt3Support4 --- qt4-x11-4.3.3.orig/debian/qt4-qtconfig.prerm +++ qt4-x11-4.3.3/debian/qt4-qtconfig.prerm @@ -0,0 +1,12 @@ +#!/bin/sh + +set -e + +case "$1" in + upgrade) ;; + remove|failed-upgrade|deconfigure) + update-alternatives --remove qtconfig "/usr/bin/qtconfig-qt4" + ;; +esac + +#DEBHELPER# --- qt4-x11-4.3.3.orig/debian/rules +++ qt4-x11-4.3.3/debian/rules @@ -0,0 +1,194 @@ +#!/usr/bin/make -f + +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 '-') +CURRENTVERSION := $(shell head -1 debian/changelog | sed 's/[^(]*(\([^)]*\)).*/\1/') + +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 +include /usr/share/cdbs/1/rules/simple-patchsys.mk +include /usr/share/cdbs/1/rules/utils.mk + +DEB_MAKE_INVOKE := $(MAKE) +DEB_MAKE_BUILD_TARGET := sub-src sub-tools +DEB_MAKE_INSTALL_TARGET := INSTALL_ROOT=$(DEB_DESTDIR) install +DEB_DH_INSTALL_SOURCEDIR := debian/tmp + +# Ensure the *.debug files aren't included in any package other than +# libqt4-debug. +DEB_DH_INSTALL_ARGS := --exclude=.debug + +DEB_MAKE_CLEAN_TARGET := confclean distclean +DEB_DH_MAKESHLIBS_ARGS_ALL := -V + +DEB_DH_STRIP_ARGS_libqt4-debug := --exclude=.debug + +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 + PLATFORM_ARG = glibc-g++ +endif + +common-configure-arch:: +ifeq ($(DEB_HOST_ARCH),hppa) + mkdir -p debian/hppa-tmp + echo "Testing whether getdents kernel bug is present on this buildd - see #433768" + gcc -o debian/hppa-tmp/hppa-test-program debian/readdir-hppa-test.c + cd $(CURDIR)/doc/html && $(CURDIR)/debian/hppa-tmp/hppa-test-program | sort > $(CURDIR)/debian/hppa-tmp/readdir_r-out + cd $(CURDIR)/doc/html && ls -a | sort > $(CURDIR)/debian/hppa-tmp/ls-a-out + @if ! diff -q $(CURDIR)/debian/hppa-tmp/readdir_r-out $(CURDIR)/debian/hppa-tmp/ls-a-out ; \ + then \ + echo "Kernel bug present. This will misbuild qt4 if proceeding. Failing" ; \ + echo "Please update kernel and test again" ; \ + exit 5 ; \ + fi +endif + + # Create mkspecs/glibc-g++ from mkspecs/linux-g++, needed by GNU/kFreeBSD + # we cannot use directly linux-g++ due to src/corelib/io/io.pri + rm -rf mkspecs/glibc-g++ + cp -a mkspecs/linux-g++ mkspecs/glibc-g++ + + ./configure -confirm-license \ + -prefix "/usr" \ + -bindir "/usr/bin" \ + -libdir "/usr/lib" \ + -docdir "/usr/share/qt4/doc" \ + -headerdir "/usr/include/qt4" \ + -datadir "/usr/share/qt4" \ + -plugindir "/usr/lib/qt4/plugins" \ + -translationdir "/usr/share/qt4/translations" \ + -sysconfdir "/etc/xdg" \ + -platform $(PLATFORM_ARG) \ + -fast \ + -no-rpath \ + -system-zlib \ + -system-libpng \ + -system-libjpeg \ + -system-nas-sound \ + -qt-gif \ + -qt-sql-psql \ + -qt-sql-mysql \ + -qt-sql-sqlite \ + -system-sqlite \ + -qt-sql-sqlite2 \ + -plugin-sql-odbc \ + -I/usr/include/freetype2 \ + -lfontconfig \ + -cups \ + -no-exceptions \ + -debug \ + -qdbus \ + -pch \ + $(EXTRA_CONFIGURE_OPTS) + +clean:: +# Extra stuff missed by confclean/distclean + rm -f Makefile \ + bin/qmake-qt4 \ + mkspecs/default \ + src/corelib/global/arch \ + examples/tools/plugandpaint/plugins/*.so \ + config.status \ + demos/shared/libdemo_shared.prl \ + mkspecs/qconfig.pri \ + src/corelib/global/qconfig.* \ + tools/qtestlib/updater/updater \ + tools/qtestlib/updater/updater.debug \ + examples/tools/plugandpaint/plugins/libpnp_basictools.a \ + examples/qdbus/complexpingpong/Makefile* \ + examples/qdbus/pingpong/Makefile* + + rm -rf lib/ plugins/ mkspecs/glibc-g++ + + # clean up after hppa tests + rm -rf debian/hppa-tmp + + find bin/ config.tests/ qmake/ -exec file {} \; | grep ELF | sed 's/:.*//' | xargs rm -f + + find include/ -type l -print0 | xargs -0r rm -f + find . -mindepth 2 -name Makefile -print0 \ + -o -name Makefile.Debug -print0 \ + -o -name Makefile.Release -print0 \ + | xargs -0r rm -f + + # generate on build + rm -f debian/shlibs.local + +PKGCONFIGDIR := $(DEB_DESTDIR)/usr/lib/pkgconfig +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-$(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 + mkdir -p debian/qt4-designer/usr/share/pixmaps + uudecode -o debian/qt4-designer/usr/share/pixmaps/designer.png \ + debian/desktop/designer.png.uu + +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/linguist-qt4.desktop \ + debian/qt4-dev-tools/usr/share/applications/linguist-qt4.desktop + mkdir -p debian/qt4-dev-tools/usr/share/pixmaps + uudecode -o debian/qt4-dev-tools/usr/share/pixmaps/assistant.png \ + debian/desktop/assistant.png.uu + uudecode -o debian/qt4-dev-tools/usr/share/pixmaps/linguist.png \ + debian/desktop/linguist.png.uu + +install/qt4-qtconfig:: + install -D -p -m0644 debian/desktop/qt4config.desktop \ + debian/qt4-qtconfig/usr/share/applications/qt4config.desktop + mkdir -p debian/qt4-qtconfig/usr/share/pixmaps + uudecode -o debian/qt4-qtconfig/usr/share/pixmaps/qtconfig.png \ + debian/desktop/qtconfig.png.uu + +binary-install/qt4-doc:: +# Tar up the examples to include them in qt4-doc + [ ! -f examples/Makefile ] || $(MAKE) -k -C examples distclean + find examples/ -name '*.debug' -print0 | xargs -0r rm -f + tar -cv examples/ | \ + gzip -9 > debian/qt4-doc/usr/share/doc/qt4-doc/qt4-examples.tar.gz + + [ ! -f demos/Makefile ] || $(MAKE) -k -C demos distclean + find demos/ -name '*.debug' -print0 | xargs -0r rm -f + tar -cv demos/ | \ + gzip -9 > debian/qt4-doc/usr/share/doc/qt4-doc/qt4-demos.tar.gz + +binary-install/libqt4-debug:: +# Run dh_install without the default DEB_DH_INSTALL_ARGS to install the +# *.debug files. + dh_install -plibqt4-debug --sourcedir=$(DEB_DH_INSTALL_SOURCEDIR) + +# Automatically install lintian overrides, stolen from debian-qt-kde.mk +$(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%: + if test -e debian/$(cdbs_curpkg).lintian; then \ + install -p -D -m644 debian/$(cdbs_curpkg).lintian \ + debian/$(cdbs_curpkg)/usr/share/lintian/overrides/$(cdbs_curpkg); \ + fi + +# Generate shlibs local files +$(patsubst %,binary-fixup/%,$(DEB_ALL_PACKAGES)) :: binary-fixup/%: binary-strip/% + if test -e debian/$(cdbs_curpkg)/DEBIAN/shlibs ; then \ + sed 's/>=[^)]*/= $(CURRENTVERSION)/' debian/$(cdbs_curpkg)/DEBIAN/shlibs >> debian/shlibs.local ;\ + fi + --- qt4-x11-4.3.3.orig/debian/qt4-doc.links +++ qt4-x11-4.3.3/debian/qt4-doc.links @@ -0,0 +1 @@ +usr/share/qt4/doc/html usr/share/doc/qt4-doc/html --- qt4-x11-4.3.3.orig/debian/changelog +++ qt4-x11-4.3.3/debian/changelog @@ -0,0 +1,804 @@ +qt4-x11 (4.3.3-0ubuntu3) hardy; urgency=low + + * Added build-dep on unixodbc-dev + * Added kubuntu_03_use_bash_in_configure.diff to fix detection of + available plugins for libQtSql + * Added package libqt4-plugin-odbc for odbc support (LP: #179261) + + -- Terence Simpson Thu, 07 Feb 2008 19:23:31 +0000 + +qt4-x11 (4.3.3-0ubuntu2) hardy; urgency=low + + * Add kubuntu_02_no_undefined.diff as used upstream in Qt 4.4, + ensures no undefined symbols + + -- Jonathan Riddell Tue, 18 Dec 2007 16:23:03 +0000 + +qt4-x11 (4.3.3-0ubuntu1) hardy; urgency=low + + * New upstream release + * Added back 0172-prefer-xrandr-over-xinerama.diff, updated by dirk + * Updated 0178-transparency-window-types.diff + * Removed 0193-qtreeview-division-by-zero.diff, applied upstream + * Add CDDL exception to debian/copyright + * Add 0203-qtexthtmlparser-link-color.diff from qt-copy + + -- Jonathan Riddell Wed, 05 Dec 2007 16:55:12 +0000 + +qt4-x11 (4.3.2-1ubuntu1) hardy; urgency=low + + * Merge with Debian, remaining changes: + - qt4-dev-tools conflicts on qdbusviewer + - Add kubuntu_01_load_ssl.diff, LP: #155784 + + -- Jonathan Riddell Mon, 05 Nov 2007 17:20:28 +0000 + +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) + + [Sune Vuorela] + * Have strict interdependencies between packages with a shlibs.local file. + (Closes: #438746) + * Don't trust uname in generating the qt build key. This has bitten us in + qt3, but will soon bite us in qt4 as qt4 becomes more popular. + + [Ana Beatriz Guerrero Lopez] + * Add desktop files icons uuencoded and update rules to install them uudecoded. + * Add sharutils build dependency. + + -- Debian Qt/KDE Maintainers 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. + + -- Sune Vuorela Fri, 10 Aug 2007 22:20:45 +0200 + +qt4-x11 (4.3.1-1) unstable; urgency=low + + * New upstream release. + + [Fathi Boudra] + * Switch to quilt patch system. + * Update copyright. Add Trolltech GPL Exception. + * Update section in Debian menu files. + * Update patches for Qt4.3.1. + * Remove 51_kfreebsd_mkspecs patch. Moved in rules. + * Add 0187-fix-font-fixed-pitch patch: + This patch works around broken QFontInfo::fixedPitch by always using a + glyph metrics comparison test to guess the information. This has the + property of both ignoring (bad) and not relying on (good) any information + that might be provided by the OS's font facility. For Mac OS X only. + * Remove patches merged upstream: + * 0177-qurl-clear-fix + * 0183-qprocess-corruption + * 42_alpha_fetch_and_add + * Disable: + * 0172-prefer-xrandr-over-xinerama patch. (Closes: #433931) + * 0181-qdnd-x11-fix patch. + + [Sune Vuorela] + * Add a quick and dirty test to make build on hppa fail if a current + getdents kernel bug is detected. + + -- Fathi Boudra Wed, 08 Aug 2007 15:08:11 +0200 + +qt4-x11 (4.3.2-0ubuntu3) gutsy; urgency=low + + * Disable 00_0172-prefer-xrandr-over-xinerama.dpatch, causes menus + to appear on the primary screen even when app is on a second screen + Closes LP: #135882 + + -- Jonathan Riddell Mon, 08 Oct 2007 12:51:57 +0100 + +qt4-x11 (4.3.2-0ubuntu2) gutsy; urgency=low + + * Remove excessive categories from debian/desktop/qt4config.desktop + Closes LP: #136425 + + -- Jonathan Riddell Thu, 04 Oct 2007 16:21:06 +0100 + +qt4-x11 (4.3.2-0ubuntu1) gutsy; urgency=low + + * New upstream bugfix release + + -- Jonathan Riddell Wed, 03 Oct 2007 17:04:56 +0100 + +qt4-x11 (4.3.1-0ubuntu3) gutsy; urgency=low + + * SECURITY UPDATE: unterminated UTF8 strings could lead to 2 byte + overflow that may allow arbitrary code execution. + * Add debian/patches/kubuntu_01_CVE_2007_4137.dpatch: upstream fixes. + * References + CVE-2007-4137 + http://trolltech.com/company/newsroom/announcements/press.2007-09-03.7564032119 + + -- Jonathan Riddell Mon, 01 Oct 2007 22:23:19 +0100 + +qt4-x11 (4.3.1-0ubuntu2) gutsy; urgency=low + + * Build with -fpermissive when building with g++-4.3. LP: #138646. + + -- Matthias Klose Thu, 13 Sep 2007 17:08:20 +0000 + +qt4-x11 (4.3.1-0ubuntu1) gutsy; urgency=low + + * Merge with Debian + * New upstream release + * Update copyright file + * Remove qdbusviewer package, now in qt4-dev-tools + + -- Jonathan Riddell Tue, 07 Aug 2007 12:02:01 +0100 + +qt4-x11 (4.3.0-5) unstable; urgency=low + + [Fathi Boudra] + * Update 01_qmake_for_debian patch. Add DEFINES += QT_SHARED in qmake.conf + along with the removal of link_prl. (Closes: #434019) + * Apply qt-copy patches: + * 00_0185-fix-format-strings: This patch fixes various code issues with + handling format strings. None of them seem to be exceptionally bad, + but its better safe than sorry. It is related to CVE-2007-3388. + TT claims the problem is not present in any version of Qt 4. Dirk Muller + disagrees and believes that some of them are possible to exploit. + * 00_0186-fix-component-alpha-text: This patch fixes component alpha + (LCD hinted) text when it's drawn on a non-opaque background. Qt doesn't + initialize the alpha channel in the glyph masks, which causes problems + in Konsole when transparency is enabled, and in other situations where + the background isn't fully opaque. + + -- Fathi Boudra Mon, 30 Jul 2007 21:36:25 +0200 + +qt4-x11 (4.3.0-4ubuntu1) gutsy; urgency=low + + * Sync with Debian, no changes except .orig md5sum + - Closes https://bugs.launchpad.net/bugs/126766 + * Add package qdbusviewer, replaces dbus-viewer + + -- Jonathan Riddell Wed, 18 Jul 2007 15:43:24 +0100 + +qt4-x11 (4.3.0-4) unstable; urgency=low + + [Fathi Boudra] + * Add 42_alpha_fetch_and_add patch to fix broken threading on alpha, hangs + uselessly on startup. fetch-and-add is supposed to return the original + value before the addition. Thanks to Steve Langasek and Bradley Hughes. + (Closes: #433031) + * Update control: Replace ${source:Version} by ${binary:Version}. + Make the package binNMU safe. Thanks to Lior Kaplan. (Closes: #433548) + + -- Fathi Boudra Mon, 16 Jul 2007 21:32:01 +0200 + +qt4-x11 (4.3.0-3) unstable; urgency=low + + [Fathi Boudra] + * Update control: Replace deprecated ${Source-Version} by ${source:Version}. + * Update rules: + * Add bindir and libdir configure options. + * Replace common-install-arch target. Replaced by build system patches and + a fix for pkgconfig files. (Closes: #401807) + * Add patches: + * 04_launch_uic-qt4: call uic-qt4 binary. + * 05_append_qt4_target: append -qt4 when needed. It fixes moc-location and + uic_location are properly in pkgconfig files. (See bug #401807) + * 06_qtdemo_destdir: remove QT_BUILD_TREE in qtdemo DESTDIR target. + (Closes: #408639) + * Revert Qt handling argb visuals on X11 patch. There are dependencies + not fixed in Qt. They cause a few regressions when this patch is applied. + (Closes: #430907, #431436, #431943) + * Update Qt support for new window types used for compositing patch. + Fix crashes when 'w' is null. (Closes: #431322) + * Apply qt-copy patches: + * 00_0172-prefer-xrandr-over-xinerama: only trust libxinerama if it is not + the emulated information coming from xrandr 1.2. + * 00_0177-qurl-clear-fix: fix QUrl::clear(). Applied upstream. + * 00_0183-qprocess-corruption: fix plain data loss bug. Applied Upstream. + + -- Fathi Boudra Fri, 29 Jun 2007 08:15:23 +0200 + +qt4-x11 (4.3.0-2ubuntu1) gutsy; urgency=low + + * Sync with Debian, no diff except .orig md5sum + + -- Jonathan Riddell Mon, 09 Jul 2007 10:04:03 +0000 + +qt4-x11 (4.3.0-2) unstable; urgency=low + + [Brian Nelson] + * Changed dist back to unstable. + * Tightened qt4-dev-tools's dependency on libqt4-core to + (= ${Source-Version}), since it uses internal (non-public) classes in + Qt whose ABI can change. (Closes: #429817) + * Added a build-dependency on libxi-dev to enable tablet support. + * Constrict the hack to clean all binary files to the bin, config.tests, + and qmake directories to drastically improve its speed + + [Fathi Boudra] + * Qt4 demos builds properly in Qt4.3. (Closes: #408639) + * Apply qt-copy patches: + * 00_0178-transparency-window-types: adds Qt support for new window types + used for compositing. + * 00_0179-transient-hack: workaround that makes setting of WM_TRANSIENT_FOR + work with some window types. + * 00_0180-window-role: several problems with Qt's support for the + WM_WINDOW_ROLE property. + * 00_0181-qdnd-x11-fix: makes the find_child algorithm in qdnd look at + _all_ widgets that contain the QPoint. + * 00_0182-argb-visuals-default: Qt handling argb visuals on X11. + + -- Brian Nelson Wed, 27 Jun 2007 00:02:07 -0400 + +qt4-x11 (4.3.0-1) experimental; urgency=low + + * New upstream release. + * Fixes a QListView issue. (Closes: #419654) + + * Update uploaders. Add Ana, Sune and Fathi. + + [Sune Vuorela] + * Remove 04_utf8_bug_fix: Merged upstream. + * Update libqt4-dev.install. Upstream installs pkgconfig files the right place. + * Update libqt4-core.install. Add libQtScript. + * Update rules: + * Add utils.mk to use list-missing. + * Cleaning seems to fail a bit. Trying to hack around that in clean:: + target. + + [Fathi Boudra] + * Redo 30_arm_ftbfs_fixes to fix another FTBFS. Add arm target to configure + script. Thanks to Sune Vuorela and Aurelien Jarno. (Closes: #426129) + * Remove 71_hppa_inotify_fix: Merged upstream. + * Update patches: + * 02_launch_assistant-qt4 + * 03_launch_moc-qt4 + * 50_kfreebsd_build_fix + * 80_hurd_max_path + * Apply qt-copy patches: + * 00_0163-fix-gcc43-support: Various fixes to get Qt 4.3 without hundreds + of warnings compiling. + * 00_0167-fix-group-reading: In big user environments, getgrgid_r() needs + more memory than sysconf() returns. + * 00_0175-fix-s390-qatomic: Fix s390(x) build. + * 00_0176-coverity-fixes: Fix various obvious memory leaks. + * Rename disable opengl visibility patch. It is not alpha architecture only. + * Add desktop files to support Desktop Environments. (Closes: #378915) + * Update qt4-dev-tools.install. Add qdbusviewer and pixeltool. + Thanks to Benjamin Meyer for the reminder. + * Update libqt4-dev.install. Remove qtdemo binary as we provide a tarball of the + demos directory. qtdemo is useless, it can't launch anything without demos + builded. It can only show screenshots and short description of demos, + users have it in Qt assistant. + * Update rules: + * Remove -debug-and-release option. Deprecated. + * Add configure options: + * -no-exceptions + * -debug + * -qdbus + * -pch + * -nomake examples + * -nomake demos + + -- Debian Qt/KDE Maintainers Sat, 09 Jun 2007 00:25:41 +0200 + +qt4-x11 (4.2.3-1) unstable; urgency=low + + * New upstream release + - Fixes build failures when QT_NO_DEBUG_OUTPUT defined + (Closes: #418832) + - Fixes broken signal/slot connection in QSvgRenderer + (Closes: #411292) + + -- Brian Nelson Thu, 12 Apr 2007 12:38:06 -0400 + +qt4-x11 (4.2.2-2) unstable; urgency=high + + * debian/patches/04_utf8_bug_fix.dpatch: new patch to fix the "UTF-8 + overlong sequence decoding vulnerability" [CVE-2007-0242] + + -- Brian Nelson Fri, 30 Mar 2007 11:04:20 -0400 + +qt4-x11 (4.2.2-1) unstable; urgency=low + + * New upstream release (Closes: #410862) + + * debian/rules: set the sysconfdir to /etc/xdg instead of /etc/qt4 to + match the QSettings documentation (Closes: #407297) + + * Added Riku Voipio's patch for ARM EABI (Closes: #408813) + + * debian/patches/22_launch_moc-qt4.dpatch: new patch to ensure the Qt4 + version of moc is launched by qdbuscpp2xml (Closes: #399049) + + * Added a doc-base file for qt4-doc (Closes: #403290) + + * debian/qt4-designer.links: added a link /usr/share/qt4/bin/designer -> + /usr/bin/designer-qt4 (Closes: #410885) + + * Re-arranged patches to group them by arch so that they're easier to + deal with + + * Applied new patches for kFreeBSD and Hurd support + (Closes: #380097, #402007) + + * debian/libqt4-gui.install: added the codecs plugins, somehow these got + accidentally dropped (Closes: #409228) + + -- Brian Nelson Sun, 4 Mar 2007 13:50:39 -0500 + +qt4-x11 (4.2.1-2) unstable; urgency=low + + * debian/patches/20_hppa_inotify_fix.dpatch: new patch that should fix + the FTBFS on hppa due to missing defines (Closes: #394953) + + * Added patches for hurd support (Closes: #380097) + + * debian/patches/10_qmake_for_debian.dpatch: restored the modification + to remove link_prl from the CONFIG line, which fixes problems with + unnecessary linkage (Closes: #394836) + + -- Brian Nelson Tue, 31 Oct 2006 02:42:02 -0500 + +qt4-x11 (4.2.1-1) unstable; urgency=high + + * New upstream release + - Fixes integer overflow in pixmap handling [CVE-2006-4811] + (Closes: #394192) + + * Install the libqtaccessiblecompatwidgets.so plugin into + libqt4-qt3support, so that libqt4-gui does not circularly depend on + libqt4-qt3support (Closes: #394351, #394629) + + -- Brian Nelson Mon, 23 Oct 2006 11:59:52 -0400 + +qt4-x11 (4.2.0-2) unstable; urgency=low + + * debian/control: added a dependency on libglib2.0-dev for libqt4-dev + (Closes: #392797, #392173) + + * Added a bunch of plugins and their debugging symbols to be installed + + * debian/patches/19_m68k_inotify_fix.dpatch: new patch to fix FTBFS on + m68k (Closes: #391902) + + * Imported Ubuntu fixes, thanks to Jonathan Riddell for the tip + - Fix typo in debian/rules -qt-sql-slite to -qt-sql-sqlite + (Closes: #392808) + - Install usr/bin/qdbus usr/bin/qdbusxml2cpp and usr/bin/qdbuscpp2xml + (Closes: #391726) + + * debian/control: added a libqt4-dev dependency on libsqlite0-dev + (Closes: #392558) + + -- Brian Nelson Tue, 17 Oct 2006 23:44:31 -0400 + +qt4-x11 (4.2.0-1) unstable; urgency=low + + * New upstream release + - No longer includes "CONFIG = ... debug" in the mkspecs/qconfig.pri + (Closes: #357136) + - Fixes QFontDialog assert() failures (Closes: #380418) + + * debian/control: made libqt4-gui conflict/replace libqt4-designer, to + ensure that old package is removed (Closes: #380253) + + * Enable Qt's new support for using the system's SQLite 3 library + (Closes: #382238) + + * debian/rules: removed the PostgreSQL and MySQL include hacks from the + configure arguments, since the configure script now autodetects them + itself + + * debian/patches/10_qmake_for_debian.dpatch: updated for new upstream + + * debian/patches/13_arm_ftbfs_fixes.dpatch: updated for new upstream + + * debian/patches/19_s390_atomic.dpatch: removed, since it appears to be + obsolete + + * debian/libqt4-debug.install: changed the wildcards to match the new + debug lib names. What was once *_debug.so.* is now *.debug. Ick. + + * debian/control: removed libqt4-debug-dev since now that the _debug + libs have been removed and debugging symbols are shipped in their + place, this package is no longer needed + + * Tar up the demos directory and include it in qt4-doc. Also added the + qtdemo binary to libqt4-dev. (Closes: #390925) + + * debian/rules: add -DQT_QLOCALE_USES_FCVT to the configure arguments + when building on arm, like Qt3, to fix a uic problem (Closes: #386460) + + * debian/libqt4-gui.install: added usr/lib/libQtAssistantClient.so.*, + since it's now shipped as a shared library; previously it was a static + library + + * Added build-deps on libdbus-1-dev and libglib2.0-dev, and added + libQtDBus to the libqt4-core package + + -- Brian Nelson Fri, 6 Oct 2006 23:16:46 -0400 + +qt4-x11 (4.1.4-1.1) unstable; urgency=medium + + * Non-maintainer upload. + * Reintroduce the libpq-dev dependency, which seems to have been removed by + mistake in 4.1.0-2. (Closes: #327618) + + -- Steinar H. Gunderson Tue, 29 Aug 2006 01:10:59 +0200 + +qt4-x11 (4.1.4-1) unstable; urgency=low + + * New upstream release (Closes: #378443) + + * Moved usr/lib/libQtDesigner.so.* and + usr/lib/libQtDesignerComponents.so.* from qt4-designer to libqt4-gui + so there the libqt4-dev package won't contain dangling symlinks + (Closes: #374612) + + -- Brian Nelson Sun, 16 Jul 2006 15:39:29 -0700 + +qt4-x11 (4.1.3-3) unstable; urgency=low + + * debian/patches/19_s390_atomic: patch from Bastian Blank to fix + including of s390 specific atomic header. (Closes: #370241) + + * debian/patches/18_disable_opengl_visibility.dpatch: regenerated so + that it applies correctly for me + + -- Brian Nelson Sun, 25 Jun 2006 11:42:57 -0700 + +qt4-x11 (4.1.3-2) unstable; urgency=high + + * patches/18_disable_opengl_visibility: disable -fvisibility-inlines-hidden + for src/opengl/opengl.pro as it makes gcc ICE on alpha. + (Closes: #368883) + + * urgency set to high so that qt4-x11 stops blocking half of unstable out of + testing. + + -- Pierre Habouzit Mon, 5 Jun 2006 10:28:29 +0200 + +qt4-x11 (4.1.3-1) unstable; urgency=high + + * New upstream release + + * debian/patches/16_hppa_ldcw_fix.dpatch: new patch from Ubuntu to + properly support hppa + + * debian/patches/17_alpha_ice.dpatch: new patch from Steve Langasek to + fix FTBFS on alpha (Closes: #368883) + (urgency set to high for that fix). + + * Dropped the .la files since they pull in too many unneeded + dependencies (Closes: #360802) + + * debian/libqt4-debug.install: removed + usr/lib/qt4/plugins/codecs/*_debug.so since those aren't included + upstream anymore + + * Increased standards version to 3.7.2 + + -- Brian Nelson Sat, 3 Jun 2006 17:56:32 -0700 + +qt4-x11 (4.1.2-2) unstable; urgency=low + + * debian/libqt4-debug-dev.install, debian/libqt4-dev.install: added + wildcards to install .a static libraries so that the libQtUiTools and + libQtAssistantClient libraries are included (Closes: #358224, #355902) + + -- Brian Nelson Sun, 14 May 2006 10:03:40 -0700 + +qt4-x11 (4.1.2-1) unstable; urgency=low + + * New upstream release + + * debian/control: removed dependencies on xlibs-static-dev and + xlibs-static-pic to transition to building against modular X + (Closes: #362262) + + * debian/control: changed x-dev dependencies to x11proto-core-dev, for + modular X transition (Closes: #362053) + + -- Brian Nelson Thu, 13 Apr 2006 10:35:28 -0700 + +qt4-x11 (4.1.1-1) unstable; urgency=low + + * New upstream release + - Fixes the broken debug-and-release build and a load of resulting + bugs (Closes: #337764, #337847, #341807, #338380, #354993, #347251) + - debian/patches/15_alpha_ftbfs_fix.dpatch: removed, integrated upstream + + * debian/control: updated libqt4-debug-dev priority to match that of the + override file + + * debian/libqt4-dev.links: added a symlink /usr/share/qt4/bin/rcc to + /usr/bin/rcc (Closes: #349438) + + * debian/libqt4-gui.install: added libqmng.so and libqgif.so plugins + (Closes: #354266) + + -- Brian Nelson Mon, 6 Mar 2006 10:20:47 -0800 + +qt4-x11 (4.1.0-3) unstable; urgency=low + + * Moved *_debug.prl and *_debug.la support files to the libqt4-debug-dev + package + + * Updated to debhelper v5 compatibility + + * debian/qt4-dev-tools.install: removed the /usr/share/qt4/templates + entry, which no longer contains anything + + * Added gif support (Closes: #348092) + + * debian/patches/12_mips_atomic_ops.dpatch: applied fixes from Isaac + Clerencia , as the last patch was not good enough to + fix the FTBFS bug (Closes: #335831) + + -- Brian Nelson Tue, 17 Jan 2006 09:49:11 -0800 + +qt4-x11 (4.1.0-2) unstable; urgency=low + + * debian/patches/12_mips_atomic_ops.dpatch: Updated patch to account for + 2 new functions, q_atomic_test_and_set_acquire_int and + q_atomic_test_and_set_release_int, that were added in this release. + This should again fix the build failures on mips. (Closes: #335831) + + * debian/patches/13_arm_ftbfs_fixes.dpatch: renamed, added a fix for the + new build failure due to a poorly defined qreal (Closes: #347360) + + * debian/control: build against libmysqlclient15, and updated all + dependencies to libmysqlclient15-dev (Closes: #346586) + + * debian/control: added explicit dependencies for libqt4-dev on the + Source-Version packages libqt4-core, libqt4-gui, libqt4-sql, and + libqt4-qt3support. These dependencies were accidentally dropped in + the last version. Also removed some unneeded dependencies. + + * Split the *_debug.so symlinks out of libqt4-dev and into a separate + libqt4-debug-dev package. Made the libqt4-debug-dev package depend on + the Source-Version of libqt4-debug. This way, the symlinks won't be + dangling if libqt4-debug isn't installed and prevents failed linking + due to version mismatches. (Closes: #346603, #346605) + + * Re-enabled sqlite3 support. It's still statically linked, however, + but that'll have to do because I really don't want to futz with the + build system. (Closes: #330976) + + * Enabled sqlite2 support + + * debian/patches/15_alpha_ftbfs_fix.dpatch: new patch to rename + q_atomic_test_and_set_release_ptr to q_atomic_test_and_set_ptr, as + suggested by Isaac Clerencia , to fix a FTBFS on + alpha. (Closes: #347353) + + * debian/patches/10_qmake_for_debian: renamed from + 10_qmake_use_qt4_tools, and updated to remove the "link_prl" from the + default qmake CONFIG line. This disables the recursive linkage + against all indirectly-used libraries. (Closes: #343190) + + -- Brian Nelson Tue, 10 Jan 2006 19:29:52 -0800 + +qt4-x11 (4.1.0-1) unstable; urgency=low + + * New upstream release + - Fixes missing QBitArray operators (Closes: #341658) + - Fixes qmake problem with including bad build path (Closes: #327359) + + * Added the new QTestLib unit testing framework to the libqt4-core + package + + * Added the new QtSvg module to the libqt4-gui package + + * debian/patches/13_arm_gcc4.dpatch: new patch from Jeremy Laine to fix + FTBFS on arm (Closes: #343176) + + * debian/patches/14_kfreebsd_build_fix.dpatch: new patch from Petr + Salinger to fix FTBFS on GNU/kFreeBSD (Closes: #343191) + + * Split the qtconfig tool out of libqt4-gui and into a separate + qt4-qtconfig package, due to its linkage against libqt4-qt3support and + hence ridiculous dependency chain. + + * debian/rules: improved/cleaned up the clean target + + -- Brian Nelson Wed, 4 Jan 2006 12:56:23 -0800 + +qt4-x11 (4.0.1-6) unstable; urgency=low + + * Added a target to automatically install lintian overrides, stolen from + debian-qt-kde.mk + + * Added a bunch of lintian overrides for stuff that should be ignored + + -- Brian Nelson Sat, 19 Nov 2005 01:17:03 -0800 + +qt4-x11 (4.0.1-5) unstable; urgency=low + + * debian/control: made libqt4-gui replace libqt4-core (<< 4.0.1-3), for + the plugins move (Closes: #336492) + + * debian/control: removed the mention of a qt4-examples package that + doesn't actually exist from the qt4-doc package description + + * debian/rules: remove all *.so files under + examples/tools/plugandpaint/plugins/ in the clean target + (Closes: #339674) + + * Removed the menu entry for designer-qt4 from qt4-dev-tools.menu, and + added it to a new qt4-designer.menu + + * Added a tarball of the examples to qt4-doc (Closes: #336832) + + -- Brian Nelson Fri, 18 Nov 2005 10:27:03 -0800 + +qt4-x11 (4.0.1-4) unstable; urgency=low + + * debian/control: changed qt4-designer's section to "devel" + + * Added a patch from Thiemo Seufer to fix the FTBFS on mips/mipsel + (Closes: #335831) + + -- Brian Nelson Wed, 26 Oct 2005 00:13:40 -0700 + +qt4-x11 (4.0.1-3) unstable; urgency=low + + * debian/libqt4-core.install: only install the non-debug codecs, since + the debug ones pull in a gratuitous dependency on libqt4-debug + (Closes: #328913) + + * debian/libqt4-debug.install: install the debug codecs here instead + + * debian/control: replaced obsolete xlibs-dev dependency with the + required split packages (Closes: #329302) + + * Completely disabled SQLite support since it's too fubar in this + version to be usable. The build fails with SQLite2 support, and + SQLite3 is only supported by linking staticly with a version + distributed in the Qt source. Meh. + + * Renamed libqt4-designer to qt4-designer, merged in the designer binary + from qt4-dev-tools, and added a dependency on libqt4-dev + (Closes: #330094) + + * Moved the plugins installed in libqt4-core to libqt4-gui, since they + link against the GUI library. Otherwise a circular libqt4-core <-> + libqt4-gui dependency results. + + -- Brian Nelson Fri, 21 Oct 2005 00:28:53 -0700 + +qt4-x11 (4.0.1-2) unstable; urgency=low + + * debian/patches/10_qmake_use_qt4_tools.dpatch: new patch that modifies + qmake.conf so that qmake generates Makefiles that use the -qt4 tools. + This way, it can cope with systems that have alternatives set to use + the -qt3 versions. + + * Increased the conflicting Qt3 package versions to <= 3.3.4-7, since + the Qt3 packages still don't use the alternatives system as needed to + coexist with Qt4. + + * debian/libqt4-core.install: added /usr/lib/qt4/plugins/codecs + + * debian/patches/11_launch_assistant-qt4: new patch that modifies the + QAssistantClient class to launch Qt Assistant as "assistant-qt4" to + cope with the alternatives system (Closes: #327294) + + * debian/control: Upgraded libqt4-dev's dependencies on the modules + libqt4-sql and libqt4-qt3support from suggests to depends, and added + libpq-dev and libmysqlclient14-dev | libmysqlclient-dev as + dependencies. These dependencies are apparently required to make + building pkg-config-using packages happy. (Closes: #327618) + + * debian/control: corrected libqt4-sql to suggest libmysqlclient14-dev, + not libmysqlclient12-dev which is deprecated + + * debian/copyright: updated FSF snailmail address + + * debian/libqt4-debug.install: removed the libqt3supportwidgets_debug.so + designer plugin, since for some reason having this installed breaks + designer (Closes: #325782) + + -- Brian Nelson Mon, 12 Sep 2005 12:32:53 -0700 + +qt4-x11 (4.0.1-1) unstable; urgency=low + + * New upstream release + + * Install changes-4.0.1 as upstream changelog + + * debian/manpages/assistant-qt4.1: new manpage written from scratch + based on the output of "assistant -help" + + * debian/manpages/designer-qt4.1, debian/manpages/linguist-qt4.1: + manpages stolen from the Qt3 packages and trivially adapted for Qt4 + (Closes: #322403) + + * debian/manpages/moc-qt4.1: escape some '-' characters + + * debian/qt4-dev-tools.manpages: install the new assistant-qt4.1, + designer-qt4.1, and linguist-qt4.1 manpages + + * debian/control: made qt4-dev-tools recommend qt4-doc, since assisant + needs it to be useful (Closes: #323251) + + * Removed the FAQ from qt4-doc.docs, since it's no longer included in + 4.0.1, and was useless anyway + + * Build-depend on libmysqlclient14-dev since libmysqlclient12-dev is + scheduled to be removed + + * debian/libqt4-dev.install: work around TT's broken "install" target in + this release so that the pkgconfig files are installed in + /usr/lib/pkgconfig instead of directly in /usr/lib. Grrrr. + + -- Brian Nelson Thu, 25 Aug 2005 19:28:35 -0700 + +qt4-x11 (4.0.0-3) unstable; urgency=low + + * debian/control: changed the xlibs-pic dependency to xlibs-static-pic + for the X.org transition (Closes: #319586) + + * Added manpages for lrelease, lupdate, moc, qtconfig, and uic, stolen + from the Qt3 upstream tarball, and wrote a manpage for qmake from + scratch. Since now manpages are included for all executables using + the alternatives, the symlinks to them no longer dangle. + (Closes: #319456) + + * debian/libqt4-core.install: added + usr/lib/qt4/plugins/imageformats/libqjpeg.so to include the jpeg + plugin (Closes: #321582) + + * debian/libqt4-debug.install: added the libqjpeg_debug.so plugin + + * debian/rules: don't hardcode the /usr/include/postgresql/8.0 path, + instead of the output of `pg_config --includedir`, stolen from Qt3 + packages + + * debian/libqt4-gui.install: added the OpenGL module library so that it + actually gets included in a package (Closes: #321874) + + * debian/control: updated the package descriptions to note that the + Network and XML modules are included in the libqt4-core package, and + the OpenGL module is included in the libqt4-gui package + + -- Brian Nelson Mon, 8 Aug 2005 08:58:10 -0700 + +qt4-x11 (4.0.0-2) unstable; urgency=low + + * libqt4-dev: added /usr/bin/uic3 (Closes: #318451) + + * Transition to the new X.org packages: + + (Build-)depend on libglu1-xorg-dev instead of xlibmesa-gl-dev + + (Build-)depend on libxinerama-dev (Closes: #318682) + + -- Brian Nelson Tue, 19 Jul 2005 21:28:19 -0700 + +qt4-x11 (4.0.0-1) unstable; urgency=low + + * Initial release (Closes: #306694) + + -- Brian Nelson Tue, 5 Jul 2005 19:42:18 -0700 --- qt4-x11-4.3.3.orig/debian/qt4-qtconfig.manpages +++ qt4-x11-4.3.3/debian/qt4-qtconfig.manpages @@ -0,0 +1 @@ +debian/manpages/qtconfig-qt4.1 --- qt4-x11-4.3.3.orig/debian/libqt4-dev.manpages +++ qt4-x11-4.3.3/debian/libqt4-dev.manpages @@ -0,0 +1,5 @@ +debian/manpages/lrelease-qt4.1 +debian/manpages/lupdate-qt4.1 +debian/manpages/moc-qt4.1 +debian/manpages/qmake-qt4.1 +debian/manpages/uic-qt4.1 --- qt4-x11-4.3.3.orig/debian/libqt4-debug.install +++ qt4-x11-4.3.3/debian/libqt4-debug.install @@ -0,0 +1,2 @@ +usr/lib/*.debug +usr/lib/qt4/plugins/*/*.debug --- qt4-x11-4.3.3.orig/debian/qt4-designer.lintian +++ qt4-x11-4.3.3/debian/qt4-designer.lintian @@ -0,0 +1 @@ +qt4-designer: package-name-doesnt-match-sonames libQtDesignerComponents4 libQtDesigner4 --- qt4-x11-4.3.3.orig/debian/libqt4-gui.install +++ qt4-x11-4.3.3/debian/libqt4-gui.install @@ -0,0 +1,11 @@ +usr/lib/libQtGui.so.* +usr/lib/libQtOpenGL.so.* +usr/lib/libQtSvg.so.* +usr/lib/libQtDesigner.so.* +usr/lib/libQtDesignerComponents.so.* +usr/lib/libQtAssistantClient.so.* +usr/lib/qt4/plugins/imageformats/*.so +usr/lib/qt4/plugins/iconengines/*.so +usr/lib/qt4/plugins/inputmethods/*.so +usr/lib/qt4/plugins/accessible/libqtaccessiblewidgets.so +usr/lib/qt4/plugins/codecs/*.so --- qt4-x11-4.3.3.orig/debian/desktop/linguist.png.uu +++ qt4-x11-4.3.3/debian/desktop/linguist.png.uu @@ -0,0 +1,47 @@ +begin 644 linguist.png +MB5!.1PT*&@H````-24A$4@```"`````@"`8```!S>GKT````!&=!34$``-;8 +MU$]8,@```!ET15AT4V]F='=A7')93P```HIPH +M).XGKB*\YXP`1W,:'-6ZK3S?]7;Y+&V0X(ZA@C\-$?0;++A]@*!;;T'JC8)6 +M;011,?(U_U-'S";:_\<$..*\/IG1/4V.3UTF6+A6,/-QP91\P>0E]G,:G\]8 +M(9C%Y[-7\OMRP9A9`B79IKT@$)1_NL +M\9PG.2^V9$9-$=S41Q"7(+IY_IGZ.--XCS^/\/SCA:/16%SLP8/3!)ES!=D+ +MK==J^*X'!!=?)@A'F0T-8N($5UTO>(AD"TL%N>L%>1L$^25V/GJZH,]`06*2 +M6;^D(8F&QI.N[^%\O/?#."PO\^$!U[AZ_C##J3JXKGN]407%^:/O/K_@SOL$ +M*RH$!212N$7P:+E@*8F,>-B*5LER[?"?$(B.E?P->Z-1?B#*"$F]&;>`85], +MSRFTSK?6&TKY@V#`2%<7"^R\:5+][_=F"58_;XD\7BGXZW:FID@P>*S@UOZ& +M^`=@Y].Z$XG,H0V];JZA5\^'CJ_W]NI.-L_YF^CE9NN=5L*2 +MIP477>JF))ZA9PK6[+#&U^RT&#.3NLD6M+S8K)M(A`P!;CXRMSB,W>_&&X_4 +M>Q/Z7*ON*Z^S&R>U$,Q99?.JT!!W[FG*#1DS*+ZUI@^8M7\9)=BX3_#D;L%3 +MU8(-^RQQ%6[/.\T:;6(M#8&$IK*^M#8.FVNCD$&6F51X-LMM_/$N +MZ[D:7U9&=?>N#_N-O01/ORRXP4U5:A=!R2N"XI=HO$:PZ56F8ZM@^`2FXB&! +MQR-'M=P-@92+I+KJK02LJPX93TSN04J:H\&$^F82/`B/*G +ML[--6%P?5F6O86]H7-$LV::J\I`5I#[K<*W@F0."TM?4N(>_^5'\HM77R,D" +MOU].<%VZ(1`,26[1SAAL/11K/#Y=]\MMFSV_I=U4%:R"BQA6+YD^,X]O8AM0 +MQR[VNYX/54<)0`-O_'J80O2;"6@U<\QZ1%JF"[IES`M^_\EFB*3F- +M@/9Z;3S:W;23Z:8L52/"^YB*:[M996O_=VL;44R5/V#G$Q9YL.,=/[8>#N&Y +M(]'8]6X,\C8Z9N\NO3[K?4A6?2\(AFWY#1HCN)NBZW2S+<4(@>04!\NV +M!+'G_5AC?.^'B>R(7K-GQZYFS6%B()'P:2QS&>[%Q;;^M:MIATL?(;B\H^#"=K;[J5<9,SRH>"-`T0:1 +MG1/&_N.)J/FH&"QDAW]S/1/`[VEA)W$8T_:7C.(DYVC:UT(^JMX)XHLJ# +MA>LL`3U8M,=K8S'89QM,Y6''"$Y)5W\0RS0F,NP)]-QOCFTERWV_=(VG$2T( +MS]DN)/'$O"Z]G$^6EGA16A?$8Y6.2<.JYX27%"O"2(.I/.QCF87PPM$8[/TH +M%A4'U6O'J-T5YR$W[#U=X[Y&W0DYYH^>YC]5=Z(YBG9Z2((=;P\-L[N5[+=5 +ML+G.X=S'DO3S`N+%W1F"2Z\VY?@]_W^$>((80G34L$<\;\R=,'W8.-^WFLNG +MJGTF_-H%M30'9PHNNT;0HI4%.^$IBN\D__.YJ_!G7(]5Z9W,H4/!_98[8?][ +MLWS_JOT\@<+SF3XP*,.VUU#8U/#[1"FQB)A)3-8['S&8Z.T:O80XCPAKA37Z +M4LK1;TBF]V3-L1@\4N!%IUMLKW?+9S]10`PENKE&+M#[A&NLF=ZF37F=$>I& +M$6"9]!DZSCE9?B"`V](=O6+]FQOI[64+,+-6<9YMCTI:,>IMRKKP] +M:P0X8HDH-Y>MW9()_$]?3M5+C<9_R]N?PP]6!?$.\F*;AP````!)14Y$KD)@ +!@@`` +` +end --- qt4-x11-4.3.3.orig/debian/desktop/qt4config.desktop +++ qt4-x11-4.3.3/debian/desktop/qt4config.desktop @@ -0,0 +1,32 @@ +[Desktop Entry] +Categories=Qt;Settings; +Encoding=UTF-8 +Exec=/usr/bin/qtconfig-qt4 +Name=Qt 4 Settings +X-KDE-StartupNotify=true +Icon=qtconfig +Terminal=false +Type=Application + + +Name[bg]=Настройки на Qt 4 +Name[cs]=Qt 4 nastavení +Name[de]=Qt 4-Einstellungen +Name[el]=Ρυθμίσεις Qt 4 +Name[fi]=Qt 4 asetukset +Name[fr]=Paramètres Qt 4 +Name[hu]=Qt 4 beállítások +Name[it]=Impostazioni Qt 4 +Name[ja]=Qt 4設定 +Name[km]=ការ​កំណត់ Qt 4 +Name[nb]=Qt 4-innstillinger +Name[nl]=Qt4 Instellingen +Name[pa]=Qt 4 ਸਥਾਪਨ +Name[pl]=Ustawienia Qt 4 +Name[pt]=Definições QT 4 +Name[pt_BR]=Configurações do Qt 4 +Name[ru]=Настройки Qt 4 +Name[sv]=Qt 4-inställningar +Name[uk]=Параметри Qt 4 +Name[zh_CN]=Qt 4 设置 +Name[zh_TW]=Qt 4 設定 --- qt4-x11-4.3.3.orig/debian/desktop/linguist-qt4.desktop +++ qt4-x11-4.3.3/debian/desktop/linguist-qt4.desktop @@ -0,0 +1,86 @@ +[Desktop Entry] +Categories=Qt;Development;Translation; +Encoding=UTF-8 +Exec=/usr/bin/linguist-qt4 +Name=Qt 4 Linguist +GenericName=Translation Tool +GenericName[af]=Vertaling Program +GenericName[ar]=أداة للترجمة +GenericName[az]=Tərcümə Vasitəsi +GenericName[bn]=অনুবাদ টুল +GenericName[bs]=Alat za prevođenje +GenericName[ca]=Eina de traducció +GenericName[cs]=Překladatelský nástroj +GenericName[cy]=Erfyn Cyfieithu +GenericName[da]=Oversættelsesværktøj +GenericName[de]=Übersetzungsprogramm +GenericName[el]=Εργαλείο μεταφράσεων +GenericName[eo]=Tradukilo por Qt-programoj +GenericName[es]=Herramienta de traducción +GenericName[et]=Tõlkimise rakendus +GenericName[eu]=Itzulpenerako Tresnak +GenericName[fa]=ابزار ترجمه +GenericName[fi]=Käännöstyökalu +GenericName[fo]=Umsetingaramboð +GenericName[fr]=Outil de traduction +GenericName[gl]=Ferramenta de Traducción +GenericName[he]=כלי תרגום +GenericName[hi]=अनुवाद उपकरण +GenericName[hr]=Uslužni program za prevođenje +GenericName[hu]=Fordítássegítő +GenericName[is]=Þýðingartól +GenericName[it]=Strumento per le traduzioni +GenericName[ja]=翻訳ツール +GenericName[ko]=번역 도구 +GenericName[lo]=ເຄື່ອງມືແປພາສາ +GenericName[lt]=Vertimo įrankis +GenericName[lv]=Tulkošanas Rīks +GenericName[mn]=Орчуулгын програм +GenericName[ms]=Perkakasan Penterjemahan +GenericName[mt]=Għodda tat-traduzzjoni +GenericName[nb]=Oversettelsesverktøy +GenericName[nl]=Vertaalprogramma +GenericName[nn]=Omsetjingsverktøy +GenericName[nso]=Sebereka sa Thlathollo +GenericName[pa]=ਅਨੁਵਾਦ ਸੰਦ +GenericName[pl]=Narzędzie dla tłumaczy +GenericName[pt]=Ferramenta de Tradução +GenericName[pt_BR]=Ferramenta de Tradução +GenericName[ro]=Utilitar de traducere +GenericName[ru]=Утилита локализации приложений +GenericName[se]=Jorgalanneavvu +GenericName[sk]=Prekladací nástroj +GenericName[sl]=Orodje za prevajanje +GenericName[sr]=Алат за превођење +GenericName[sr@Latn]=Alat za prevođenje +GenericName[ss]=Lithulusi lekuhumusha +GenericName[sv]=Översättningsverktyg +GenericName[ta]=மொழிபெயர்ப்புக் கருவி +GenericName[tg]=Тарҷумагар барои QT +GenericName[th]=เครื่องมือแปลภาษา +GenericName[tr]=Çeviri Aracı +GenericName[uk]=Засіб для перекладів +GenericName[uz]=Таржима қилиш воситаси +GenericName[ven]=Zwishumiswa zwau Dologa +GenericName[vi]=Công cụ dịch +GenericName[wa]=Usteye di ratournaedje +GenericName[xh]=Isixhobo Soguqulelo lomsebenzi kolunye ulwimi +GenericName[xx]=xxTranslation Toolxx +GenericName[zh_CN]=翻译工具 +GenericName[zh_TW]=翻譯工具 +GenericName[zu]=Ithuluzi Lokuguqulela +X-KDE-StartupNotify=true +MimeType=application/x-linguist +Terminal=false +Type=Application +Icon=linguist + +GenericName[bg]=Инструмент за превод +Name[hu]=Qt 4 Nyelvész +Name[ja]=Qt 4リンギスト +Name[km]=ភាសាវិទូ Qt 4 +GenericName[km]=ឧបករណ៍​បកប្រែ +Name[nb]=Qt 4-Linguist +Name[pa]=Qt 4 ਅਨੁਵਾਦਕ +Name[pl]=Lingwista Qt 4 +Name[zh_TW]=Qt 4 語言專家 --- qt4-x11-4.3.3.orig/debian/desktop/designer.png.uu +++ qt4-x11-4.3.3/debian/desktop/designer.png.uu @@ -0,0 +1,11 @@ +begin 644 designer.png +MB5!.1PT*&@H````-24A$4@```"`````@!`,```"!5&?'````!&=!34$``+&/ +M"_QA!0```!)03%1%____````P,``@(``H*"@6%A8\=)7@`````%T4DY3`$#F +MV&8````!8DM'1`"(!1U(````"7!(67,```L1```+$0%_9%^1````!W1)344' +MT00#%38#^'O-4````)M)1$%4>)QE4=$5`R$,,AN(3G"Y6\#K!.T&W7^9HJ^M +M1/.E"(3$E'KEM)1MP$;!!JP4:B)DL$6%581(R.*:OPY_QLA$ARGI9+:8&N.1 +M#$D/5LS1,V0=QT8J2<86O!'&CS!4AD?#S,;GV[W)0*CN?@I@Q?UY:2LJ4)H` +M+S_@"MP7?=_J<0!5UU2]M+!'YC@#,)*&S?8U[A^V_6G^`"^G#,'-]:H-```` +)`$E%3D2N0F"" +` +end --- qt4-x11-4.3.3.orig/debian/desktop/designer-qt4.desktop +++ qt4-x11-4.3.3/debian/desktop/designer-qt4.desktop @@ -0,0 +1,93 @@ +[Desktop Entry] +Categories=Qt;Development;GUIDesigner; +Encoding=UTF-8 +Exec=/usr/bin/designer-qt4 +Name=Qt 4 Designer +GenericName=Interface Designer +GenericName[af]=Koppelvlak Ontwerper +GenericName[ar]=أداة لتصميم واجهة البرامج +GenericName[az]=Ara Üz Tərtibçisi +GenericName[bn]=ইন্টারফেস পরিকল্পনা +GenericName[bs]=Qt alat za dizajniranje interfejsa +GenericName[ca]=Dissenyador d'interfícies +GenericName[cs]=Návrhář rozhraní +GenericName[cy]=Dylunydd Rhyngwyneb +GenericName[da]=Grænsefladedesigner +GenericName[de]=Schnittstellen-Designer +GenericName[el]=Σχεδιαστής διασυνδέσεων +GenericName[eo]=Interfacdesegnilo +GenericName[es]=Diseñador de interfaces +GenericName[et]=Kasutajaliidese disainer +GenericName[eu]=Interfaze Diseinatzailea +GenericName[fa]=طراح رابط +GenericName[fi]=Käyttöliittymäsuunnittelija +GenericName[fo]=Nýtaramótssniðari +GenericName[fr]=Concepteur d'interface +GenericName[gl]=Deseñador de Interfaces +GenericName[he]=מעצב ממשקים +GenericName[hi]=इंटरफेस डिज़ाइनर +GenericName[hr]=Dizajner sučelja +GenericName[hu]=Felülettervező +GenericName[is]=Viðmótshönnun +GenericName[it]=Disegnatore di interfacce +GenericName[ja]=インターフェースデザイナー +GenericName[ko]=인터페이스 디자이너 +GenericName[lo]=ເຄື່ອງມືອອກແບບສ່ວນຕິດຕໍ່ຜູ້ໃຊ້ +GenericName[lt]=Sąsajos redaktorius +GenericName[lv]=Starsejas Dizainers +GenericName[mn]=Гадаргуун дизайнер +GenericName[ms]=Pereka Antaramuka +GenericName[mt]=Diżinjatur tal-interfaċċji +GenericName[nb]=Utforming av grensesnitt +GenericName[nl]=Interface-ontwerper +GenericName[nn]=Utforming av grensesnitt +GenericName[nso]=Mohlami wa Interface +GenericName[pa]=ਇੰਟਰਫੇਸ ਡਿਜਾਇਨਰ +GenericName[pl]=Projektowanie interfejsów +GenericName[pt]=Editor de Interfaces +GenericName[pt_BR]=Interface do Designer +GenericName[ro]=Dezvoltator de interfeţe +GenericName[ru]=Редактор интерфейса приложений Qt +GenericName[se]=Laktahábmejeaddji +GenericName[sk]=Návrh rozhrania +GenericName[sl]=Snovalnik vmesnikov +GenericName[sr]=Дизајнер интерфејса +GenericName[sr@Latn]=Dizajner interfejsa +GenericName[ss]=Umhleli wesichumanisi +GenericName[sv]=Gränssnittseditor +GenericName[ta]=முகப்புப் வடிவமைப்பாளர் +GenericName[tg]=Тароҳи робита +GenericName[th]=เครื่องมือออกแบบส่วนติดต่อผู้ใช้ +GenericName[tr]=Arayüz tasarım programı +GenericName[uk]=Дизайн інтерфейсу +GenericName[uz]=Интерфейс дизайнери +GenericName[ven]=Muvhati wa nga Phanda +GenericName[vi]=Trình thiết kế giao diện +GenericName[wa]=Dessineu d' eterfaces +GenericName[xh]=Umyili Wezojongongano +GenericName[xx]=xxInterface Designerxx +GenericName[zh_CN]=界面设计器 +GenericName[zh_TW]=界面設計師 +GenericName[zu]=Umakhi Womxhumanisi +X-KDE-StartupNotify=true +MimeType=application/x-designer +Icon=designer +Terminal=false +Type=Application + + + +GenericName[bg]=Дизайнер на интерфейси +Name[el]=Σχεδιαστής Qt 4 +Name[hu]=Qt 4 Tervező +Name[it]=Progettazione Qt 4 +Name[ja]=Qt 4デザイナ +Name[km]=កម្មវិធី​រចនា Qt 4 +GenericName[km]=កម្មវិធី​រចនា​ចំណុច​ប្រទាក់ +Name[nl]=Qt 4 ontwerper +Name[pa]=Qt 4 ਡਿਜ਼ਾਇਨਰ +Name[pl]=Projektowanie interfejsów w Qt 4 +Name[ru]=Qt 4 дизайнер +Name[uk]=Дизайнер Qt 4 +Name[zh_CN]=Qt 4 设计器 +Name[zh_TW]=Qt 4 設計師 --- qt4-x11-4.3.3.orig/debian/desktop/assistant.png.uu +++ qt4-x11-4.3.3/debian/desktop/assistant.png.uu @@ -0,0 +1,56 @@ +begin 644 assistant.png +MB5!.1PT*&@H````-24A$4@```"`````@"`8```!S>GKT````!&=!34$``-;8 +MU$]8,@```!ET15AT4V]F='=A7')93P```C# +M241!5%C#K9=;C%UE&8:??ZV]]^PY=J;#=#HMS$Q;VPX])(KT`*0%)10#03E% +MP7@':DB,%]R;>.TAQ!B-\1"-7B$0C1"@6A/"J40YE%(L=$IGVNETVIG9>\_> +MZ[S^P^?%6H,5T8"ZDG_M/_MBO>_W?FL8>[]^W?=.6!??>Q==-!UO2-8D7(\X@P;M`.+K(2+-!H +MSG*I.;.SW!N;H9F:PGK0JKUC%IW@B8@##ND:4R:16C;)LER7GR*PZ?>X/O` +MJR+26L6L?$#]?F#7Q'8>NNVNC3<^_-7'&!^[AL;*'(Z4/`]XX867.'SX.4Y/ +MS]#I=,CS'*4LE1H,#?M,3G4Q.:7PJBG*&#QJU+LM-]WM;LU3"69/$BFECHE( +M_$\$RFC?.##,W3?W.%H?4.$QDPBJZZXN"=W-&X)--!DTM*J5D1 +ML=YEU@_X/GMW[N&>>^_XAK]K^ZTT5N90GN;LW`S?_M9W^?.1%_$K@J=`L`Q> +M467#1)WA=17\BB`B5+N$B_,Y?WHBYN)Y3:W;XE4$H^&*,;KVW\H7@4^6:A<* +ME-:/#8]Q:-_^R8T']GR-3K"(UA&9"?G!(S_E[1/OT-?719RD;-\YS*>O7\?0 +M.L$1$J=MEA8[O/UJFW>/9U0JD$:.EY]VW/PE1;T';"ID&4SM45N.OR0W7SK' +M6TJISJH"W<#VR2FN.[#_R_34!PGC!G@Y3S]UF%>.OD973Y4TS[CIT&;N?W`7 +MDUNK^+4(2X!735BWT7+3G34.W%'!\QU^%=HM.'$4/!]`H7.H]\*NZ]1!8`M0 +M6R706ZNS<_/6_O%MFPX0QBV,C5ECK6;'7KCVLQ[.0K4*YZ:%UA(H7[`:L@0F=S)1[V4'T.,II3Q@ +M8'"$[1/CX_Y`WWK">!EM`MYY]R1GSYY#>8ZN;H_K;AHC39M$:8O`X\I-`_0/:3I1$R,!<13RS*,-XM#@^0Z'`$4@*@5) +M"%X%K!56%D'G"F)DB91O(Q3';2),=8@3HCCF$P':!OC2!'1^%6H5,'S!6O_`:X$ +MQ`E.P%D0!R8'G8/18"U4:O@4(A7#A%+H5GN>=F>AJ/6ZR=:=W7QE^&IR$^+7 +M$J(XP+@8Y>4X-"`X)_A5N.%SBH%AR#-P5C!&H37H#)0':0)Y6L2%YX$U&,!6 +MRDDF,3F=Q<8,*\$"4=(BSAKX70GKQSVT@UQ;LCS&*8U"XS`(@I2R#X_!\`9( +M(WD?.,\A2R&+BYC0.51J4*E#'-`!TDHYS02=)N<;K8LLM68!0Y0UT;I#[@*L +MB["2@,IQRJ"PR"IR^@.=I>;+B/YT+O6L4G@?-!2XCR-8,`9/.5PSI4?+20VIBBWJ^`Z*X#S +MK+CK7'`&!H8A[A`LSW,*"%>;49@FO+5P3LY<-3Z]3:DMY#;`2(20@IY.@G +M=C>V56L]5*I>(;NG`0W*H'"@!.>@TB4N'H?O/F\G+SP'D>`)1%QE[?C +M0(0WWGR)QU<:6F>F@]8&ZRS..:QU."=86Y!X[X1C^I@0A3!]#.9.%44FST"G +MEX&7:3BU7V$T\9%?\UO@>#FZ\SZ!;S3X"G@XNIV%B"M:,%+F>I_)^]'?UP.X; +M%9MW(X]^1_YP^AB_!$Z+2/J?IF*O'$P_-3'%UP]^0=T^/$9]-9>M+:QUKE`D +MC8M[ED">%:GF56'MF&)J#UA#],0C\L2IU_@5<.R#H_F_VPL\8`TP-;"6S^\] +MQ#U3>]36>F\!E(1%@\G*)F-UT5&ZNF'@BB+5>@;@^//RMR._X?'V$D\"ITMP +M^ +MF)_F"/!6Z?/DO]T-_7(W'`&V=/>Q8^UZMJT=94/O(`.5&KZSV*A#NWF1\\OS +MG$H"3@"SP&*YDMG_QW;L`36@IYQH^\IM^?+M."RWXP3(/\JJ_G=AXG7B'4(? +-*P````!)14Y$KD)@@@`` +` +end --- qt4-x11-4.3.3.orig/debian/desktop/assistant-qt4.desktop +++ qt4-x11-4.3.3/debian/desktop/assistant-qt4.desktop @@ -0,0 +1,90 @@ +[Desktop Entry] +Categories=Qt;Development;Documentation; +Encoding=UTF-8 +Exec=/usr/bin/assistant-qt4 +Name=Qt 4 Assistant +GenericName=Document Browser +GenericName[af]=Dokument Blaaier +GenericName[az]=Sənəd Səyyahı +GenericName[bg]=Преглед на документи +GenericName[bn]=নথী ব্রাউজার +GenericName[br]=Furcher Teulioù +GenericName[bs]=Preglednik QT dokumenata +GenericName[ca]=Navegador de documents +GenericName[cs]=Prohlížeč dokumentace +GenericName[cy]=Porydd Dogfen +GenericName[da]=Dokumentfremviser +GenericName[de]=Dokumentbrowser +GenericName[el]=Προβολέας εγγράφων +GenericName[eo]=Dokumentorigardilo +GenericName[es]=Navegador de documentos +GenericName[et]=Dokumentatsiooni brauser +GenericName[eu]=Dokumentu Ikustailua +GenericName[fa]=مرورگر سند +GenericName[fi]=Asiakirjaselain +GenericName[fo]=Skjalakagari +GenericName[fr]=Explorateur de documentation Qt +GenericName[gl]=Explorador de Documentos +GenericName[he]=דפדפן מסמכים +GenericName[hi]=दस्तावेज़़ ब्राउज़र +GenericName[hr]=Preglednik dokumenata +GenericName[hu]=Dokumentumböngésző +GenericName[is]=Skjalavafri +GenericName[it]=Visualizzatore di documenti +GenericName[ja]=ドキュメントブラウザ +GenericName[ko]=문서 탐색기 +GenericName[lo]=ເຄື່ອງມືເລືອກເບິ່ງແຟ້ມເອກະສານ +GenericName[lt]=Dokumentų žiūriklis +GenericName[lv]=Dokumentu Pārlūks +GenericName[mn]=Баримтын хөтөч +GenericName[ms]=Pelungsur Dokumen +GenericName[mt]=Browser ta' Dokumenti +GenericName[nb]=Dokumentleser +GenericName[nds]=Dokmentkieker +GenericName[nl]=Documentbrowser +GenericName[nn]=Dokumentlesar +GenericName[nso]=Seinyakisi sa Tokomane +GenericName[pa]=ਦਸਤਾਵੇਜ਼ ਝਲਕਾਰਾ +GenericName[pl]=Przeglądarka dokumentów +GenericName[pt]=Navegador de Documentos +GenericName[pt_BR]=Navegador de Documentos +GenericName[ro]=Navigator de documente +GenericName[ru]=Программа просмотра документов +GenericName[se]=Dokumeantalogan +GenericName[sk]=Prehliadač dokumentácie +GenericName[sl]=Pregledovalnik dokumentov +GenericName[sr]=Претраживач докумената +GenericName[sr@Latn]=Pretraživač dokumenata +GenericName[ss]=Ibrawuza yelidokhumente +GenericName[sv]=Dokumentbläddrare +GenericName[ta]=ஆவண உலாவி +GenericName[tg]=Тафсири ҳуҷҷат +GenericName[th]=เครื่องมือเลือกดูแฟ้มเอกสาร +GenericName[tr]=Belge Tarayıcısı +GenericName[uk]=Навігатор документів +GenericName[uz]=Ҳужжат браузери +GenericName[ven]=Buronza ya manwalwa +GenericName[vi]=Trình duyệt tài liệu +GenericName[wa]=Foyteu di documints +GenericName[xh]=Umkhangeli Wencwadi Zoxwebhu +GenericName[xx]=xxDocument Browserxx +GenericName[zh_CN]=文档浏览器 +GenericName[zh_TW]=文件閱讀器 +GenericName[zu]=Umcingi Woshicilelo +X-KDE-StartupNotify=true +Icon=assistant +Terminal=false +Type=Application + + +Name[bg]=Qt 4 асистент +Name[cs]=Qt4 asistent +Name[hu]=Qt 4 Asszisztens +Name[ja]=Qt 4アシスタント +Name[km]=អ្នក​ជំនួយការ Qt 4 +GenericName[km]=កម្មវិធី​រុករក​ឯកសារ +Name[nb]=Qt 4-assistent +Name[pa]=Qt 4 ਸਹਾਇਕ +Name[sv]=Qt 4-assistent +Name[zh_CN]=Qt 4 助手 +Name[zh_TW]=Qt 4 助理 --- qt4-x11-4.3.3.orig/debian/desktop/qtconfig.png.uu +++ qt4-x11-4.3.3/debian/desktop/qtconfig.png.uu @@ -0,0 +1,11 @@ +begin 644 qtconfig.png +MB5!.1PT*&@H````-24A$4@```"`````@!`,```"!5&?'````!&=!34$``+&/ +M"_QA!0```!)03%1%____````P,``@(``H*"@6%A8\=)7@`````%T4DY3`$#F +MV&8````!8DM'1`"(!1U(````"7!(67,```L1```+$0%_9%^1````!W1)344' +MT00#%38#^'O-4````)M)1$%4>)QE4=$5`R$,,AN(3G"Y6\#K!.T&W7^9HJ^M +M1/.E"(3$E'KEM)1MP$;!!JP4:B)DL$6%581(R.*:OPY_QLA$ARGI9+:8&N.1 +M#$D/5LS1,V0=QT8J2<86O!'&CS!4AD?#S,;GV[W)0*CN?@I@Q?UY:2LJ4)H` +M+S_@"MP7?=_J<0!5UU2]M+!'YC@#,)*&S?8U[A^V_6G^`"^G#,'-]:H-```` +)`$E%3D2N0F"" +` +end --- qt4-x11-4.3.3.orig/debian/libqt4-qt3support.install +++ qt4-x11-4.3.3/debian/libqt4-qt3support.install @@ -0,0 +1,2 @@ +usr/lib/libQt3Support.so.* +usr/lib/qt4/plugins/accessible/libqtaccessiblecompatwidgets.so --- qt4-x11-4.3.3.orig/debian/readdir-hppa-test.c +++ qt4-x11-4.3.3/debian/readdir-hppa-test.c @@ -0,0 +1,25 @@ +#include +#include +#include +#include + +main() { + int return_code; + DIR *dir; + struct dirent entry; + struct dirent *result; + + if ((dir = opendir(".")) == NULL) + perror("opendir() error"); + else { + // puts("contents of .:"); + for (return_code = readdir_r(dir, &entry, &result); + result != NULL && return_code == 0; + return_code = readdir_r(dir, &entry, &result)) + printf("%s\n", entry.d_name); + if (return_code != 0) + perror("readdir_r() error"); + closedir(dir); + } +} + --- qt4-x11-4.3.3.orig/debian/libqt4-dev.prerm +++ qt4-x11-4.3.3/debian/libqt4-dev.prerm @@ -0,0 +1,16 @@ +#!/bin/sh + +set -e + +case "$1" in + upgrade) ;; + remove|failed-upgrade|deconfigure) + update-alternatives --remove moc "/usr/bin/moc-qt4" + update-alternatives --remove uic "/usr/bin/uic-qt4" + update-alternatives --remove qmake "/usr/bin/qmake-qt4" + update-alternatives --remove lupdate "/usr/bin/lupdate-qt4" + update-alternatives --remove lrelease "/usr/bin/lrelease-qt4" + ;; +esac + +#DEBHELPER# --- qt4-x11-4.3.3.orig/debian/libqt4-plugin-odbc.install +++ qt4-x11-4.3.3/debian/libqt4-plugin-odbc.install @@ -0,0 +1,2 @@ +usr/lib/qt4/plugins/sqldrivers/libqsqlodbc.so + --- qt4-x11-4.3.3.orig/debian/libqt4-gui.lintian +++ qt4-x11-4.3.3/debian/libqt4-gui.lintian @@ -0,0 +1 @@ +libqt4-gui: package-name-doesnt-match-sonames libQtGui4 libQtOpenGL4 --- qt4-x11-4.3.3.orig/debian/qt4-designer.links +++ qt4-x11-4.3.3/debian/qt4-designer.links @@ -0,0 +1 @@ +usr/bin/designer-qt4 usr/share/qt4/bin/designer --- qt4-x11-4.3.3.orig/debian/libqt4-dev.postinst +++ qt4-x11-4.3.3/debian/libqt4-dev.postinst @@ -0,0 +1,30 @@ +#!/bin/sh + +set -e + +update-alternatives --install \ + /usr/bin/moc moc "/usr/bin/moc-qt4" "40" \ + --slave /usr/share/man/man1/moc.1.gz moc.1.gz \ + "/usr/share/man/man1/moc-qt4.1.gz" + +update-alternatives --install \ + /usr/bin/uic uic "/usr/bin/uic-qt4" "40" \ + --slave /usr/share/man/man1/uic.1.gz uic.1.gz \ + "/usr/share/man/man1/uic-qt4.1.gz" + +update-alternatives --install \ + /usr/bin/qmake qmake "/usr/bin/qmake-qt4" "40" \ + --slave /usr/share/man/man1/qmake.1.gz qmake.1.gz \ + "/usr/share/man/man1/qmake-qt4.1.gz" + +update-alternatives --install \ + /usr/bin/lupdate lupdate "/usr/bin/lupdate-qt4" "40" \ + --slave /usr/share/man/man1/lupdate.1.gz lupdate.1.gz \ + "/usr/share/man/man1/lupdate-qt4.1.gz" + +update-alternatives --install \ + /usr/bin/lrelease lrelease "/usr/bin/lrelease-qt4" "40" \ + --slave /usr/share/man/man1/lrelease.1.gz lrelease.1.gz \ + "/usr/share/man/man1/lrelease-qt4.1.gz" + +#DEBHELPER#