rev 8674 - in branches/qt4-x11/debian: . patches

Fathi Boudra fabo at alioth.debian.org
Sun Dec 30 22:55:31 UTC 2007 

Author: fabo
Date: 2007-12-30 22:55:31 +0000 (Sun, 30 Dec 2007)
New Revision: 8674

Removed:
   branches/qt4-x11/debian/libqt4-phonon.install
   branches/qt4-x11/debian/libqt4-webkit.install
   branches/qt4-x11/debian/patches/91_qmake_ldflags_as-needed.diff
Modified:
   branches/qt4-x11/debian/TODO
   branches/qt4-x11/debian/changelog
   branches/qt4-x11/debian/control
   branches/qt4-x11/debian/patches/series
   branches/qt4-x11/debian/rules
Log:
* Sync Qt4.4.0 branches with upcoming Qt4.3.3-2.


Modified: branches/qt4-x11/debian/TODO
===================================================================
--- branches/qt4-x11/debian/TODO	2007-12-30 22:31:51 UTC (rev 8673)
+++ branches/qt4-x11/debian/TODO	2007-12-30 22:55:31 UTC (rev 8674)
@@ -1,6 +1,4 @@
 * Review and port qt-copy patches to Qt4.4.0
-* Fix dpkg-shlibdeps failure: couldn't find library libQtWebKit.so.4
-   debian/qt4-designer/usr/lib/qt4/plugins/designer/libqaxwidget.so (its RPATH is '').
 * Find a way to enable exceptions only for XmlPatterns
   From Thiago:
   That would require some modification to the buildsystem, which hasn't
@@ -8,4 +6,5 @@
   Anyways, a simple workaround for your case is to build Qt without exceptions,
   then reconfigure with them and build QtXmlPatterns only. Unless the ABI for
   with/without exceptions changes for your compiler, of course.
-* Check conflicts with WebKit and Phonon (from KDE4/kdelibs) packages
\ No newline at end of file
+* Phonon packages must be provided from KDE sources
+* Webkit packages must be provided from WebKit.org

Modified: branches/qt4-x11/debian/changelog
===================================================================
--- branches/qt4-x11/debian/changelog	2007-12-30 22:31:51 UTC (rev 8673)
+++ branches/qt4-x11/debian/changelog	2007-12-30 22:55:31 UTC (rev 8674)
@@ -1,43 +1,46 @@
-qt4-x11 (4.4.0~tp1-1) experimental; urgency=low
+qt4-x11 (4.4.0~tp1-1) UNRELEASED; urgency=low
 
   * New upstream release.
-
-  [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.
   * Add some pedantic fixes from David Faure.
-
-  * 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.
-
   * Add TODO file.
   * Add libgstreamer-plugins-base0.10-dev build dependency.
   * Update rules:
     * Disable DEB_INSTALL_CHANGELOGS_ALL.
     * Disable DEB_INSTALL_DOCS_ALL.
     * Add DEB_DH_SHLIBDEPS_ARGS_ALL workaround.
-    * Enable Phonon, WebKit and XmlPatterns.
+    * Enable XmlPatterns.
     * Enable exceptions. It is a dependency to XmlPatterns module.
   * Refresh Debian patches.
   * Refresh qt-copy patches: 0167, 0176, 0179, 0194, 0203, and 0300.
   * Disable qt-copy patches: 0175, O178, 0180, 0187 and 0195.
   * Remove qt-copy patches: 0191, 0192, 0200 and 0204.
-  * Add patch to fix phonon_gstreamer plugin install.
   * Remove patches:
     * 21_assume_no_fpu_for_embedded_devices. Merged upstream.
       It breaks ABI on mips.
     * 30_arm_ftbfs_fixes. Merged upstream.
+    * 91_qmake_lflags_no-undefined. Merged upstream.
   * Update .install files: libqt4-core, libqt4-gui and qt4-dev-tools.
-  * Add packages: libqt4-dbus, libqt4-phonon, libqt4-webkit and
-    libqt4-xmlpatterns.
+  * Add packages: libqt4-dbus and libqt4-xmlpatterns.
   * Move QtDBus module from libqt4-core in libqt4-dbus package.
 
- -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Thu, 20 Dec 2007 11:20:46 +0100
+ -- Fathi Boudra <fabo at debian.org>  Sun, 30 Dec 2007 23:43:04 +0100
 
+qt4-x11 (4.3.3-2) unstable; urgency=low
+
+  * 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.
+
+ -- Fathi Boudra <fabo at debian.org>  Sun, 30 Dec 2007 23:29:09 +0100
+
 qt4-x11 (4.3.3-1) unstable; urgency=low
 
   * New upstream release.

Modified: branches/qt4-x11/debian/control
===================================================================
--- branches/qt4-x11/debian/control	2007-12-30 22:31:51 UTC (rev 8673)
+++ branches/qt4-x11/debian/control	2007-12-30 22:55:31 UTC (rev 8674)
@@ -164,35 +164,3 @@
  This package contains the XmlPatterns module for Qt.
  .
  QtXmlPatterns is a XQuery and XPath engine for XML and custom data models.
-
-Package: libqt4-phonon
-Architecture: any
-Section: libs
-Depends: ${shlibs:Depends}, ${misc:Depends}
-Recommends: gstreamer0.10-plugins-good
-Description: Qt 4 Phonon 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 Phonon module for Qt.
- .
- Phonon is a cross-platform multimedia framework that enables the use of audio
- and video content in Qt applications.
-
-Package: libqt4-webkit
-Architecture: any
-Section: libs
-Depends: ${shlibs:Depends}, ${misc:Depends}
-Description: Qt 4 WebKit 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 WebKit module for Qt.
- .
- QtWebKit provides a Web browser engine that makes it easy to embed content
- from the World Wide Web into your Qt application. At the same time Web content
- can be enhanced with native controls.
- .
- QtWebKit provides facilities for rendering of HyperText Markup Language (HTML),
- Extensible HyperText Markup Language (XHTML) and Scalable Vector Graphics (SVG)
- documents, styled using Cascading Style Sheets (CSS) and scripted with JavaScript.

Deleted: branches/qt4-x11/debian/libqt4-phonon.install

Deleted: branches/qt4-x11/debian/libqt4-webkit.install

Deleted: branches/qt4-x11/debian/patches/91_qmake_ldflags_as-needed.diff

Modified: branches/qt4-x11/debian/patches/series
===================================================================
--- branches/qt4-x11/debian/patches/series	2007-12-30 22:31:51 UTC (rev 8673)
+++ branches/qt4-x11/debian/patches/series	2007-12-30 22:55:31 UTC (rev 8674)
@@ -21,7 +21,7 @@
 06_qtdemo_destdir.diff
 07_trust_dpkg-arch_over_uname-m.diff
 08_load_ssl.diff
-09_install_phonon_gstreamer.diff
+# no phonon 09_install_phonon_gstreamer.diff
 20_mips_atomic_ops.diff
 31_arm_eabi_fix.diff
 40_alpha_ice.diff
@@ -30,5 +30,4 @@
 60_m68k_inotify_fix.diff
 70_hppa_ldcw_fix.diff
 80_hurd_max_path.diff
-90_qmake_cxxflags_fpermissive.diff
-91_qmake_ldflags_as-needed.diff
+90_qmake_cxxflags_fpermissive.diff
\ No newline at end of file

Modified: branches/qt4-x11/debian/rules
===================================================================
--- branches/qt4-x11/debian/rules	2007-12-30 22:31:51 UTC (rev 8673)
+++ branches/qt4-x11/debian/rules	2007-12-30 22:55:31 UTC (rev 8674)
@@ -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/')
@@ -34,16 +33,11 @@
 # Qt4.4.0-tp1 does not contain GPL_EXCEPTION_ADDENDUM.TXT file
 #DEB_INSTALL_DOCS_ALL := GPL_EXCEPTION_ADDENDUM.TXT
 
-# Qt4.4.0-tp1 workaround
-# dpkg-shlibdeps: failure: couldn't find library libQtWebKit.so.4 needed by
-# debian/qt4-designer/usr/lib/qt4/plugins/designer/libqaxwidget.so (its RPATH is '').
-DEB_DH_SHLIBDEPS_ARGS_ALL := --dpkg-shlibdeps-params=--ignore-missing-info
-
 ifeq ($(DEB_HOST_ARCH),arm)
 	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++
@@ -103,8 +97,8 @@
 	            -pch \
 	            -nomake examples \
 	            -nomake demos \
-	            -phonon \
-	            -webkit \
+	            -no-phonon \
+	            -no-webkit \
 	            -xmlpatterns \
 	            $(EXTRA_CONFIGURE_OPTS)

More information about the pkg-kde-commits mailing list