rev 8673 - in trunk/packages/qt4-x11/debian: . patches
Fathi Boudra
fabo at alioth.debian.org
Sun Dec 30 22:31:51 UTC 2007
Author: fabo
Date: 2007-12-30 22:31:51 +0000 (Sun, 30 Dec 2007)
New Revision: 8673
Added:
trunk/packages/qt4-x11/debian/patches/91_qmake_lflags_no-undefined.diff
Removed:
trunk/packages/qt4-x11/debian/patches/91_qmake_ldflags_as-needed.diff
Modified:
trunk/packages/qt4-x11/debian/changelog
trunk/packages/qt4-x11/debian/control
trunk/packages/qt4-x11/debian/patches/0203-qtexthtmlparser-link-color.diff
trunk/packages/qt4-x11/debian/patches/0204-fix-tulip-aliasing.diff
trunk/packages/qt4-x11/debian/patches/40_alpha_ice.diff
trunk/packages/qt4-x11/debian/patches/series
trunk/packages/qt4-x11/debian/rules
Log:
* Revert build with --as-needed linker flag:
It breaks other packages. (Closes: #457038, #457284)
* Add 91_qmake_lflags_no-undefined patch:
By default, qmake adds --no-undefined linker flag.
Modified: trunk/packages/qt4-x11/debian/changelog
===================================================================
--- trunk/packages/qt4-x11/debian/changelog 2007-12-30 21:34:55 UTC (rev 8672)
+++ trunk/packages/qt4-x11/debian/changelog 2007-12-30 22:31:51 UTC (rev 8673)
@@ -1,20 +1,18 @@
-qt4-x11 (4.3.3-2) unstable; urgency=low
+qt4-x11 (4.3.3-2) UNRELEASED; urgency=low
- [Matthew Rosewarne]
-
- * Add qt-copy patches:
- * 0204-fix-tulip-aliasing.
- Should fix KDE 4.0-rc2 startup crash.
- * Update qt-copy-patches:
- * 0203-qtexthtmlparser-link-color.
-
- [Fathi Boudra]
-
+ * Update 0203-qtexthtmlparser-link-color qt-copy patch:
+ Add qt-bugs@ issue and Trolltech task ID.
+ * Add 0204-fix-tulip-aliasing qt-copy patch:
+ Fix KDE4 RC2 crashing on startup due to Qt 4.3.3 update.
* Downgrade libqt4-dev dependency to qt4-dev-tools from Recommends to
Suggests.
* Add semicolon at the end of the MimeType key. Thanks to Pino Toscano.
+ * Revert build with --as-needed linker flag:
+ It breaks other packages. (Closes: #457038, #457284)
+ * Add 91_qmake_lflags_no-undefined patch:
+ By default, qmake adds --no-undefined linker flag.
- -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org> Wed, 12 Dec 2007 14:40:31 -0500
+ -- Fathi Boudra <fabo at debian.org> Sun, 30 Dec 2007 23:29:09 +0100
qt4-x11 (4.3.3-1) unstable; urgency=low
Modified: trunk/packages/qt4-x11/debian/control
===================================================================
--- trunk/packages/qt4-x11/debian/control 2007-12-30 21:34:55 UTC (rev 8672)
+++ trunk/packages/qt4-x11/debian/control 2007-12-30 22:31:51 UTC (rev 8673)
@@ -99,13 +99,13 @@
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)
-Recommends: libqt4-dev, qt4-designer, qt4-doc
+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.
+ including the Qt Assistant, Linguist, D-Bus Viewer and Pixel Tool applications.
Package: qt4-qtconfig
Architecture: any
Modified: trunk/packages/qt4-x11/debian/patches/0203-qtexthtmlparser-link-color.diff
===================================================================
--- trunk/packages/qt4-x11/debian/patches/0203-qtexthtmlparser-link-color.diff 2007-12-30 21:34:55 UTC (rev 8672)
+++ trunk/packages/qt4-x11/debian/patches/0203-qtexthtmlparser-link-color.diff 2007-12-30 22:31:51 UTC (rev 8673)
@@ -5,9 +5,9 @@
Links are assigned a foreground color according to the system current color scheme.
---- a/src/gui/text/qtexthtmlparser.cpp (revisión: 745183)
-+++ b/src/gui/text/qtexthtmlparser.cpp (copia de trabajo)
-@@ -1031,7 +1031,7 @@ void QTextHtmlParserNode::initializeProp
+--- a/src/gui/text/qtexthtmlparser.cpp
++++ b/src/gui/text/qtexthtmlparser.cpp
+@@ -1031,7 +1031,7 @@
&& !attributes.at(i + 1).isEmpty()) {
hasHref = true;
charFormat.setUnderlineStyle(QTextCharFormat::SingleUnderline);
Modified: trunk/packages/qt4-x11/debian/patches/0204-fix-tulip-aliasing.diff
===================================================================
--- trunk/packages/qt4-x11/debian/patches/0204-fix-tulip-aliasing.diff 2007-12-30 21:34:55 UTC (rev 8672)
+++ trunk/packages/qt4-x11/debian/patches/0204-fix-tulip-aliasing.diff 2007-12-30 22:31:51 UTC (rev 8673)
@@ -11,7 +11,7 @@
--- a/src/corelib/tools/qmap.h
+++ b/src/corelib/tools/qmap.h
-@@ -185,6 +185,7 @@ public:
+@@ -185,6 +185,7 @@
class iterator
{
@@ -19,7 +19,7 @@
QMapData::Node *i;
public:
-@@ -240,9 +241,9 @@ public:
+@@ -240,9 +241,9 @@
public:
#endif
inline bool operator==(const const_iterator &o) const
@@ -31,7 +31,7 @@
private:
// ### Qt 5: remove
-@@ -252,6 +253,7 @@ public:
+@@ -252,6 +253,7 @@
class const_iterator
{
@@ -39,7 +39,7 @@
QMapData::Node *i;
public:
-@@ -270,7 +272,7 @@ public:
+@@ -270,7 +272,7 @@
#else
inline const_iterator(const iterator &o)
#endif
@@ -50,7 +50,7 @@
inline const T &value() const { return concrete(i)->value; }
--- a/src/corelib/tools/qset.h
+++ b/src/corelib/tools/qset.h
-@@ -84,6 +84,7 @@ public:
+@@ -84,6 +84,7 @@
{
typedef QHash<T, QHashDummyValue> Hash;
typename Hash::iterator i;
@@ -58,7 +58,7 @@
public:
typedef std::bidirectional_iterator_tag iterator_category;
-@@ -101,9 +102,9 @@ public:
+@@ -101,9 +102,9 @@
inline bool operator==(const iterator &o) const { return i == o.i; }
inline bool operator!=(const iterator &o) const { return i != o.i; }
inline bool operator==(const const_iterator &o) const
@@ -70,7 +70,7 @@
inline iterator &operator++() { ++i; return *this; }
inline iterator operator++(int) { iterator r = *this; ++i; return r; }
inline iterator &operator--() { --i; return *this; }
-@@ -118,6 +119,7 @@ public:
+@@ -118,6 +119,7 @@
{
typedef QHash<T, QHashDummyValue> Hash;
typename Hash::const_iterator i;
@@ -78,7 +78,7 @@
public:
typedef std::bidirectional_iterator_tag iterator_category;
-@@ -130,7 +132,7 @@ public:
+@@ -130,7 +132,7 @@
inline const_iterator(typename Hash::const_iterator o) : i(o) {}
inline const_iterator(const const_iterator &o) : i(o.i) {}
inline const_iterator(const iterator &o)
@@ -89,7 +89,7 @@
inline const T *operator->() const { return &i.key(); }
--- a/src/corelib/tools/qhash.h
+++ b/src/corelib/tools/qhash.h
-@@ -291,6 +291,7 @@ public:
+@@ -291,6 +291,7 @@
class iterator
{
@@ -97,7 +97,7 @@
QHashData::Node *i;
public:
-@@ -343,9 +344,9 @@ public:
+@@ -343,9 +344,9 @@
public:
#endif
inline bool operator==(const const_iterator &o) const
@@ -109,7 +109,7 @@
private:
// ### Qt 5: remove
-@@ -355,6 +356,7 @@ public:
+@@ -355,6 +356,7 @@
class const_iterator
{
@@ -117,7 +117,7 @@
QHashData::Node *i;
public:
-@@ -374,7 +376,7 @@ public:
+@@ -374,7 +376,7 @@
#else
inline const_iterator(const iterator &o)
#endif
@@ -128,7 +128,7 @@
inline const T &value() const { return concrete(i)->value; }
--- a/src/corelib/tools/qlist.h
+++ b/src/corelib/tools/qlist.h
-@@ -162,17 +162,17 @@ public:
+@@ -162,17 +162,17 @@
inline bool operator>=(const iterator& other) const { return i >= other.i; }
#ifndef QT_STRICT_ITERATORS
inline bool operator==(const const_iterator &o) const
@@ -154,7 +154,7 @@
inline iterator operator++(int) { Node *n = i; ++i; return n; }
--- a/src/corelib/tools/qlinkedlist.h
+++ b/src/corelib/tools/qlinkedlist.h
-@@ -119,9 +119,9 @@ public:
+@@ -119,9 +119,9 @@
inline bool operator==(const iterator &o) const { return i == o.i; }
inline bool operator!=(const iterator &o) const { return i != o.i; }
inline bool operator==(const const_iterator &o) const
Modified: trunk/packages/qt4-x11/debian/patches/40_alpha_ice.diff
===================================================================
--- trunk/packages/qt4-x11/debian/patches/40_alpha_ice.diff 2007-12-30 21:34:55 UTC (rev 8672)
+++ trunk/packages/qt4-x11/debian/patches/40_alpha_ice.diff 2007-12-30 22:31:51 UTC (rev 8673)
@@ -34,7 +34,7 @@
settings = QLibraryInfoPrivate::findConfiguration();
--- a/src/corelib/tools/qhash.h
+++ b/src/corelib/tools/qhash.h
-@@ -477,7 +477,7 @@
+@@ -479,7 +479,7 @@
}
template <class Key, class T>
Deleted: trunk/packages/qt4-x11/debian/patches/91_qmake_ldflags_as-needed.diff
Added: trunk/packages/qt4-x11/debian/patches/91_qmake_lflags_no-undefined.diff
===================================================================
--- trunk/packages/qt4-x11/debian/patches/91_qmake_lflags_no-undefined.diff (rev 0)
+++ trunk/packages/qt4-x11/debian/patches/91_qmake_lflags_no-undefined.diff 2007-12-30 22:31:51 UTC (rev 8673)
@@ -0,0 +1,11 @@
+--- a/mkspecs/common/g++.conf
++++ b/mkspecs/common/g++.conf
+@@ -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 +=
Modified: trunk/packages/qt4-x11/debian/patches/series
===================================================================
--- trunk/packages/qt4-x11/debian/patches/series 2007-12-30 21:34:55 UTC (rev 8672)
+++ trunk/packages/qt4-x11/debian/patches/series 2007-12-30 22:31:51 UTC (rev 8673)
@@ -35,4 +35,4 @@
70_hppa_ldcw_fix.diff
80_hurd_max_path.diff
90_qmake_cxxflags_fpermissive.diff
-91_qmake_ldflags_as-needed.diff
+91_qmake_lflags_no-undefined.diff
Modified: trunk/packages/qt4-x11/debian/rules
===================================================================
--- trunk/packages/qt4-x11/debian/rules 2007-12-30 21:34:55 UTC (rev 8672)
+++ trunk/packages/qt4-x11/debian/rules 2007-12-30 22:31:51 UTC (rev 8673)
@@ -4,7 +4,6 @@
export PATH := $(QTDIR)/bin:$(PATH)
export LD_LIBRARY_PATH := $(QTDIR)/lib:$(LD_LIBRARY_PATH)
export CXXFLAGS := -fpermissive
-export LDFLAGS := -Wl,--as-needed
QTVERSION := $(shell ls changes-* | cut -f2 -d '-')
CURRENTVERSION := $(shell head -1 debian/changelog | sed 's/[^(]*(\([^)]*\)).*/\1/')
@@ -36,7 +35,7 @@
EXTRA_CONFIGURE_OPTS += -DQT_QLOCALE_USES_FCVT
endif
-DEB_CONFIGURE_SCRIPT_ENV += CXXFLAGS="-fpermissive" LDFLAGS="-Wl,--as-needed"
+DEB_CONFIGURE_SCRIPT_ENV += CXXFLAGS="-fpermissive"
ifeq ($(DEB_HOST_ARCH_OS),linux)
PLATFORM_ARG = linux-g++
More information about the pkg-kde-commits
mailing list