rev 6279 - in branches/kde4/packages/qt4-x11/debian: . patches

Fathi Boudra fboudra-guest at alioth.debian.org
Sat May 19 07:19:38 UTC 2007 

Author: fboudra-guest
Date: 2007-05-19 07:19:38 +0000 (Sat, 19 May 2007)
New Revision: 6279

Added:
   branches/kde4/packages/qt4-x11/debian/patches/00_0176-coverity-fixes.dpatch
Modified:
   branches/kde4/packages/qt4-x11/debian/changelog
   branches/kde4/packages/qt4-x11/debian/patches/00list
   branches/kde4/packages/qt4-x11/debian/patches/50_kfreebsd_build_fix.dpatch
   branches/kde4/packages/qt4-x11/debian/rules
Log:
* Add coverity fixes patch.
* Add some configure options.
* Fix desktop files installation.



Modified: branches/kde4/packages/qt4-x11/debian/changelog
===================================================================
--- branches/kde4/packages/qt4-x11/debian/changelog	2007-05-19 02:49:46 UTC (rev 6278)
+++ branches/kde4/packages/qt4-x11/debian/changelog	2007-05-19 07:19:38 UTC (rev 6279)
@@ -1,9 +1,6 @@
 qt4-x11 (4.3.0~rc1-1) experimental; urgency=low
 
   * New upstream release.
-  WARNING: -debug-and-release is not supported anymore on Qt/X11 and Qtopia Core
-  By default, Qt is built in release mode with separate debug information, so
-  -debug-and-release is not necessary anymore
 
   [Sune Vuorela]
   * Remove:
@@ -37,8 +34,18 @@
       more memory than sysconf() returns.
     * 00_0173-streaming-operators-fix: Fixes build of KDE with release-build Qt.
     * 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 rules:
+    * Remove -debug-and-release option. Deprecated.
+    * Add configure options:
+      * -no-exceptions
+      * -debug
+      * -qdbus
+      * -pch
+      * -nomake examples
+      * -nomake demos
 
  -- Fathi Boudra <fboudra at free.fr>  Thu, 17 May 2007 18:28:57 +0200
 

Added: branches/kde4/packages/qt4-x11/debian/patches/00_0176-coverity-fixes.dpatch
===================================================================
--- branches/kde4/packages/qt4-x11/debian/patches/00_0176-coverity-fixes.dpatch	                        (rev 0)
+++ branches/kde4/packages/qt4-x11/debian/patches/00_0176-coverity-fixes.dpatch	2007-05-19 07:19:38 UTC (rev 6279)
@@ -0,0 +1,30 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 00_0176-coverity-fixes.diff.dpatch by Dirk Mueller <mueller at kde.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Fix various obvious memory leaks.
+
+ at DPATCH@
+diff -urNad qt4-x11-4.3.0~rc1~/src/gui/painting/qimagescale.cpp qt4-x11-4.3.0~rc1/src/gui/painting/qimagescale.cpp
+--- qt4-x11-4.3.0~rc1~/src/gui/painting/qimagescale.cpp	2007-05-06 17:54:25.000000000 +0200
++++ qt4-x11-4.3.0~rc1/src/gui/painting/qimagescale.cpp	2007-05-19 08:46:30.000000000 +0200
+@@ -1005,6 +1005,7 @@
+     buffer = QImage(dw, dh, src.format());
+     if (buffer.isNull()) {
+         qWarning("QImage: out of memory, returning null");
++        qimageFreeScaleInfo(scaleinfo);
+         return QImage();
+     }
+ 
+diff -urNad qt4-x11-4.3.0~rc1~/src/tools/uic/cpp/cppwriteicondata.cpp qt4-x11-4.3.0~rc1/src/tools/uic/cpp/cppwriteicondata.cpp
+--- qt4-x11-4.3.0~rc1~/src/tools/uic/cpp/cppwriteicondata.cpp	2007-05-06 17:54:47.000000000 +0200
++++ qt4-x11-4.3.0~rc1/src/tools/uic/cpp/cppwriteicondata.cpp	2007-05-19 08:47:22.000000000 +0200
+@@ -50,7 +50,7 @@
+         ba[i] = r;
+     }
+     QByteArray ret(reinterpret_cast<const char *>(ba), baSize);
+-    delete ba;
++    delete [] ba;
+     return ret;
+ }
+ 


Property changes on: branches/kde4/packages/qt4-x11/debian/patches/00_0176-coverity-fixes.dpatch
___________________________________________________________________
Name: svn:executable
   + *

Modified: branches/kde4/packages/qt4-x11/debian/patches/00list
===================================================================
--- branches/kde4/packages/qt4-x11/debian/patches/00list	2007-05-19 02:49:46 UTC (rev 6278)
+++ branches/kde4/packages/qt4-x11/debian/patches/00list	2007-05-19 07:19:38 UTC (rev 6279)
@@ -2,6 +2,7 @@
 00_0167-fix-group-reading
 00_0173-streaming-operators-fix
 00_0175-fix-s390-qatomic
+00_0176-coverity-fixes
 01_qmake_for_debian
 02_launch_assistant-qt4
 03_launch_moc-qt4

Modified: branches/kde4/packages/qt4-x11/debian/patches/50_kfreebsd_build_fix.dpatch
===================================================================
--- branches/kde4/packages/qt4-x11/debian/patches/50_kfreebsd_build_fix.dpatch	2007-05-19 02:49:46 UTC (rev 6278)
+++ branches/kde4/packages/qt4-x11/debian/patches/50_kfreebsd_build_fix.dpatch	2007-05-19 07:19:38 UTC (rev 6279)
@@ -2,7 +2,7 @@
 ## 14_kfreebsd_build_fix.dpatch by Petr Salinger <Petr.Salinger at seznam.cz>
 ##
 ## All lines beginning with `## DP:' are a description of the patch.
-## DP: No description.
+## DP: Fixes FTBFS on GNU/kFreeBSD by creating new Q_OS_GLIBC.
 
 @DPATCH@
 diff -urNad qt4-x11-4.3.0~rc1~/src/corelib/global/qglobal.h qt4-x11-4.3.0~rc1/src/corelib/global/qglobal.h

Modified: branches/kde4/packages/qt4-x11/debian/rules
===================================================================
--- branches/kde4/packages/qt4-x11/debian/rules	2007-05-19 02:49:46 UTC (rev 6278)
+++ branches/kde4/packages/qt4-x11/debian/rules	2007-05-19 07:19:38 UTC (rev 6279)
@@ -44,7 +44,6 @@
 	            -translationdir "/usr/share/qt4/translations" \
 	            -sysconfdir "/etc/xdg" \
 	            -platform $(PLATFORM_ARG) \
-	            -debug-and-release \
 	            -fast \
 	            -no-rpath \
 	            -system-zlib \
@@ -60,6 +59,12 @@
 	            -I/usr/include/freetype2 \
 	            -lfontconfig \
 	            -cups \
+	            -no-exceptions \
+	            -debug \
+	            -qdbus \
+	            -pch \
+	            -nomake examples \
+	            -nomake demos \
 	            $(EXTRA_CONFIGURE_OPTS)
 
 clean::
@@ -98,6 +103,20 @@
 	    mv "$(BINDIR)/$$f" "$(BINDIR)/$$f-qt4"; \
 	done
 
+install/qt4-designer::
+	install -D -p -m0644 debian/desktop/designer-qt4.desktop \
+		debian/qt4-designer/usr/share/applications/designer-qt4.desktop
+
+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
+
+install/qt4-qtconfig::
+	install -D -p -m0644 debian/desktop/qt4config.desktop \
+		debian/qt4-qtconfig/usr/share/applications/qt4config.desktop
+
 binary-install/qt4-doc::
 # Tar up the examples to include them in qt4-doc
 	-$(MAKE) -k -C examples distclean
@@ -121,18 +140,3 @@
 	    install -p -D -m644 debian/$(cdbs_curpkg).lintian \
 	    debian/$(cdbs_curpkg)/usr/share/lintian/overrides/$(cdbs_curpkg); \
         fi
-
-install/qt4-designer::
-	install -D -p -m0644 debian/desktop/designer-qt4.desktop \
-		$(DEB_DESTDIR)/usr/share/applications/designer-qt4.desktop
-
-install/qt4-dev-tools::
-	install -D -p -m0644 debian/desktop/assistant-qt4.desktop \
-		$(DEB_DESTDIR)/usr/share/applications/assistant-qt4.desktop
-	install -D -p -m0644 debian/desktop/linguist-qt4.desktop \
-		$(DEB_DESTDIR)/usr/share/applications/linguist-qt4.desktop
-
-install/qt4-qtconfig::
-	install -D -p -m0644 debian/desktop/qt4config.desktop \
-		$(DEB_DESTDIR)/usr/share/applications/qt4config.desktop
-

More information about the pkg-kde-commits mailing list