rev 9427 - in trunk/packages/qt-x11-free/debian: . patches

Modestas Vainius modax-guest at alioth.debian.org
Sun Feb 17 13:43:24 UTC 2008 

Author: modax-guest
Date: 2008-02-17 13:43:24 +0000 (Sun, 17 Feb 2008)
New Revision: 9427

Added:
   trunk/packages/qt-x11-free/debian/patches/00_qmake_debian_compliant_release_target.diff
   trunk/packages/qt-x11-free/debian/patches/01_export_stat64_symbols.diff
Removed:
   trunk/packages/qt-x11-free/debian/patches/01_qmake_add_-g_to_release.diff
   trunk/packages/qt-x11-free/debian/patches/01_stat_extern_inline_hack.diff
Modified:
   trunk/packages/qt-x11-free/debian/changelog
   trunk/packages/qt-x11-free/debian/control
   trunk/packages/qt-x11-free/debian/patches/series
   trunk/packages/qt-x11-free/debian/rules
Log:
Preparations for 3:3.3.8-3 - "Optimized Qt3" release

Modified: trunk/packages/qt-x11-free/debian/changelog
===================================================================
--- trunk/packages/qt-x11-free/debian/changelog	2008-02-17 12:43:57 UTC (rev 9426)
+++ trunk/packages/qt-x11-free/debian/changelog	2008-02-17 13:43:24 UTC (rev 9427)
@@ -1,3 +1,23 @@
+qt-x11-free (3:3.3.8b-3~pre2) unstable; urgency=low
+  
+  * "Optimized Qt3" release.
+
+  ++ Changes by Modestas Vainius:
+
+  * Add 00_qmake_debian_compliant_release_target.diff patch to make 'qmake'
+    release target debian policy compliant:
+      - Use C(XX)FLAGS=-02 -g
+      - Prevent qmake from striping binaries. Debian has dh_strip for that.
+      - Patch configure script to build qmake itself with 'release'
+        configuration too.
+  * Build Qt3 using "release" build configuration.
+  * Remove 01_stat_extern_inline_hack.diff and use different way of exporting
+    [fl]?stat64 symbols because previous way is ineffective with -O2. Add
+    01_export_stat64_symbols.diff patch for that.
+  * The hack above depends on libc6-dev (>= 2.7-1). Adjust Build-Depends.
+
+ -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Sun, 17 Feb 2008 15:04:16 +0200
+
 qt-x11-free (3:3.3.8b-2) unstable; urgency=medium
 
   * Re-add *stat64 symbols to Qt3 using 01_stat_extern_inline_hack patch:

Modified: trunk/packages/qt-x11-free/debian/control
===================================================================
--- trunk/packages/qt-x11-free/debian/control	2008-02-17 12:43:57 UTC (rev 9426)
+++ trunk/packages/qt-x11-free/debian/control	2008-02-17 13:43:24 UTC (rev 9427)
@@ -1,7 +1,7 @@
 Source: qt-x11-free
 Maintainer: Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>
 Uploaders: Ana Beatriz Guerrero Lopez <ana at debian.org>, Sune Vuorela <debian at pusling.com>, Fathi Boudra <fabo at debian.org>
-Build-Depends: debhelper (>= 5.0.31), quilt, libxext-dev (>= 4.3.0.dfsg.1-4), libxrandr-dev (>= 4.3.0.dfsg.1-4), 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, zlib1g-dev, libjpeg62-dev, libmng-dev (>= 1.0.3), libpng12-dev | libpng12-0-dev, libfontconfig1-dev, libfreetype6-dev, libxft-dev, libiodbc2-dev (>= 3.51.2-4), libmysqlclient15-dev | libmysqlclient-dev, flex, libpq-dev, libaudio-dev, libcupsys2-dev, libgl1-mesa-dev | libgl-dev, libglu1-mesa-dev | libglu-dev, libsqlite3-dev, firebird2.0-dev [i386 kfreebsd-i386 kfreebsd-amd64 knetbsd-i386 netbsd-i386 amd64 sparc powerpc]
+Build-Depends: libc6-dev (>= 2.7-1), debhelper (>= 5.0.31), quilt, libxext-dev (>= 4.3.0.dfsg.1-4), libxrandr-dev (>= 4.3.0.dfsg.1-4), 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, zlib1g-dev, libjpeg62-dev, libmng-dev (>= 1.0.3), libpng12-dev | libpng12-0-dev, libfontconfig1-dev, libfreetype6-dev, libxft-dev, libiodbc2-dev (>= 3.51.2-4), libmysqlclient15-dev | libmysqlclient-dev, flex, libpq-dev, libaudio-dev, libcupsys2-dev, libgl1-mesa-dev | libgl-dev, libglu1-mesa-dev | libglu-dev, libsqlite3-dev, firebird2.0-dev [i386 kfreebsd-i386 kfreebsd-amd64 knetbsd-i386 netbsd-i386 amd64 sparc powerpc]
 Section: libs
 Priority: optional
 Standards-Version: 3.7.3

Added: trunk/packages/qt-x11-free/debian/patches/00_qmake_debian_compliant_release_target.diff
===================================================================
--- trunk/packages/qt-x11-free/debian/patches/00_qmake_debian_compliant_release_target.diff	                        (rev 0)
+++ trunk/packages/qt-x11-free/debian/patches/00_qmake_debian_compliant_release_target.diff	2008-02-17 13:43:24 UTC (rev 9427)
@@ -0,0 +1,43 @@
+--- qt-x11-free-3.3.8b/configure	2008-02-17 04:26:04.000000000 +0200
++++ qt-x11-free-3.3.8b/configure	2008-02-17 14:16:25.000000000 +0200
+@@ -2607,8 +2607,14 @@
+         grep "^QMAKE_LFLAGS[^_A-Z0-9]" $QMAKESPEC/qmake.conf >>$mkfile
+ 	if [ "$CFG_DEBUG" = "yes" ]; then
+             grep "QMAKE_CFLAGS_DEBUG[^_A-Z0-9]" $QMAKESPEC/qmake.conf >>$mkfile
++            grep "^QMAKE_CXXFLAGS_DEBUG[^_A-Z0-9]" $QMAKESPEC/qmake.conf | sed "s,\$\$QMAKE_CFLAGS_DEBUG,\$(QMAKE_CFLAGS_DEBUG)," >>$mkfile
+ 	    EXTRA_CFLAGS="$EXTRA_CFLAGS \$(QMAKE_CFLAGS_DEBUG)"
+ 	    EXTRA_CXXFLAGS="$EXTRA_CXXFLAGS \$(QMAKE_CXXFLAGS_DEBUG)"
++	else
++	    grep "QMAKE_CFLAGS_RELEASE[^_A-Z0-9]" $QMAKESPEC/qmake.conf >>$mkfile
++	    grep "^QMAKE_CXXFLAGS_RELEASE[^_A-Z0-9]" $QMAKESPEC/qmake.conf | sed "s,\$\$QMAKE_CFLAGS_RELEASE,\$(QMAKE_CFLAGS_RELEASE)," >>$mkfile
++	    EXTRA_CFLAGS="$EXTRA_CFLAGS \$(QMAKE_CFLAGS_RELEASE)"
++	    EXTRA_CXXFLAGS="$EXTRA_CXXFLAGS \$(QMAKE_CXXFLAGS_RELEASE)"
+         fi
+ 	if [ "$PLATFORM_MAC" = "yes" ]; then
+ 	    echo "CARBON_LFLAGS +=-framework CoreServices" >>$mkfile
+--- qt-x11-free-3.3.8b/mkspecs/linux-g++/qmake.conf	2008-02-17 04:32:14.000000000 +0200
++++ qt-x11-free-3.3.8b/mkspecs/linux-g++/qmake.conf	2008-02-17 14:10:44.000000000 +0200
+@@ -16,12 +16,12 @@
+ QMAKE_YACCFLAGS_MANGLE  = -p $base -b $base
+ QMAKE_YACC_HEADER       = $base.tab.h
+ QMAKE_YACC_SOURCE       = $base.tab.c
+-QMAKE_CFLAGS		= -pipe
++QMAKE_CFLAGS		= -pipe -g
+ QMAKE_CFLAGS_DEPS	= -M
+ QMAKE_CFLAGS_WARN_ON	= -Wall -W
+ QMAKE_CFLAGS_WARN_OFF	= -w
+ QMAKE_CFLAGS_RELEASE	= -O2
+-QMAKE_CFLAGS_DEBUG	= -g
++QMAKE_CFLAGS_DEBUG	= -O0
+ QMAKE_CFLAGS_SHLIB	= -fPIC
+ QMAKE_CFLAGS_YACC	= -Wno-unused -Wno-parentheses
+ QMAKE_CFLAGS_THREAD	= -D_REENTRANT
+@@ -83,7 +83,7 @@
+ QMAKE_MOVE		= mv -f
+ QMAKE_DEL_FILE		= rm -f
+ QMAKE_DEL_DIR		= rmdir
+-QMAKE_STRIP             = strip
++QMAKE_STRIP             =
+ QMAKE_STRIPFLAGS_LIB 	+= --strip-unneeded
+ QMAKE_CHK_DIR_EXISTS	= test -d
+ QMAKE_MKDIR		= mkdir -p

Added: trunk/packages/qt-x11-free/debian/patches/01_export_stat64_symbols.diff
===================================================================
--- trunk/packages/qt-x11-free/debian/patches/01_export_stat64_symbols.diff	                        (rev 0)
+++ trunk/packages/qt-x11-free/debian/patches/01_export_stat64_symbols.diff	2008-02-17 13:43:24 UTC (rev 9427)
@@ -0,0 +1,43 @@
+diff -uNr -x debian -x .pc qt-x11-free-3.3.8b/src/__debian_export_symbols.cpp qt-x11-free-3.3.8b.n/src/__debian_export_symbols.cpp
+--- qt-x11-free-3.3.8b/src/__debian_export_symbols.cpp	1970-01-01 03:00:00.000000000 +0300
++++ qt-x11-free-3.3.8b.n/src/__debian_export_symbols.cpp	2008-02-17 11:58:54.000000000 +0200
+@@ -0,0 +1,24 @@
++// Use the __NO_INLINE__ hack below to prevent sys/stat.h from ever
++// (with g++-4.3 or later) exporting __extern_inline definitions
++// of the symbols [fl]?stat64. We must ensure that [fl]?stat64 is
++// exported in libqt-mt.so.3 as dynamic symbols to preserve its ABI.
++#ifndef __NO_INLINE__
++# define __NO_INLINE__
++#endif
++
++#include <sys/stat.h>
++
++int stat64 (__const char *__path, struct stat64 *__statbuf)
++{
++    return __xstat64 (_STAT_VER, __path, __statbuf);
++}
++
++int lstat64 (__const char *__path, struct stat64 *__statbuf)
++{
++    return __lxstat64 (_STAT_VER, __path, __statbuf);
++}
++
++int fstat64 (int __fd, struct stat64 *__statbuf)
++{
++    return __fxstat64 (_STAT_VER, __fd, __statbuf);
++}
+diff -uNr -x debian -x .pc qt-x11-free-3.3.8b/src/qt.pro qt-x11-free-3.3.8b.n/src/qt.pro
+--- qt-x11-free-3.3.8b/src/qt.pro	2008-02-16 23:37:36.000000000 +0200
++++ qt-x11-free-3.3.8b.n/src/qt.pro	2008-02-17 12:01:12.000000000 +0200
+@@ -174,6 +174,11 @@
+    QMAKE_PKGCONFIG_INCDIR = $$headers.path
+ }
+ 
++unix {
++   # Debian - export symbols (stat64, fstat64, lstat64) hack
++   SOURCES += __debian_export_symbols.cpp
++}
++
+ wince-* {
+ 	CONFIG -= incremental
+ 	message( ...removing plugin stuff... (not permanent) )

Deleted: trunk/packages/qt-x11-free/debian/patches/01_qmake_add_-g_to_release.diff

Deleted: trunk/packages/qt-x11-free/debian/patches/01_stat_extern_inline_hack.diff

Modified: trunk/packages/qt-x11-free/debian/patches/series
===================================================================
--- trunk/packages/qt-x11-free/debian/patches/series	2008-02-17 12:43:57 UTC (rev 9426)
+++ trunk/packages/qt-x11-free/debian/patches/series	2008-02-17 13:43:24 UTC (rev 9427)
@@ -18,7 +18,8 @@
 0085-fix-buildkey.diff
 0086-revert-qt-khmer-fix.diff
 0087-use-xrandr-1.2.diff
-01_stat_extern_inline_hack.diff
+00_qmake_debian_compliant_release_target.diff
+01_export_stat64_symbols.diff
 02_various_fixes.diff
 03_qt_fontlist_fix.diff
 04_qsql_odbc.diff

Modified: trunk/packages/qt-x11-free/debian/rules
===================================================================
--- trunk/packages/qt-x11-free/debian/rules	2008-02-17 12:43:57 UTC (rev 9426)
+++ trunk/packages/qt-x11-free/debian/rules	2008-02-17 13:43:24 UTC (rev 9427)
@@ -42,7 +42,6 @@
 		-plugindir	"/usr/lib/qt3/plugins"		\
 		-translationdir	"/usr/share/qt3/translations"	\
 						\
-		-debug				\
 		-thread				\
 		-shared				\
 		-fast				\

More information about the pkg-kde-commits mailing list