rev 9674 - in trunk/packages/qt4-x11/debian: . patches
Fathi Boudra
fabo at alioth.debian.org
Sat Mar 8 09:56:56 UTC 2008
Author: fabo
Date: 2008-03-08 09:56:56 +0000 (Sat, 08 Mar 2008)
New Revision: 9674
Added:
trunk/packages/qt4-x11/debian/patches/09_qmake_lflags_as-needed.diff
trunk/packages/qt4-x11/debian/patches/10_config_tests_fixes.diff
Modified:
trunk/packages/qt4-x11/debian/changelog
trunk/packages/qt4-x11/debian/patches/01_qmake_for_debian.diff
trunk/packages/qt4-x11/debian/patches/series
trunk/packages/qt4-x11/debian/rules
Log:
Some backports from qt4-x11 branches:
* Add patches:
* 09_qmake_lflags_as-needed
workaround as LDFLAGS isn't honored by configure script.
we set --as-needed flag for Qt build only.
* 10_config_tests_fixes.diff
configuration test fixes for Interbase/Firebird and ODBC sql drivers.
* Update 01_qmake_for_debian patch:
* re-introduce link_prl and drop QT_SHARED workaround.
* Update rules:
* Remove exported LD_LIBRARY_PATH and LDFLAGS.
* Remove DEB_CONFIGURE_SCRIPT_ENV.
* Exclude debug files from dh_shlibdeps using DEB_DH_SHLIBDEPS_ARGS_ALL.
* Update configure options to use libtiff from system.
* Remove debug configure option to build with -02.
* Update common-install-arch target to fix wrong path in pkconfig and prl files.
Modified: trunk/packages/qt4-x11/debian/changelog
===================================================================
--- trunk/packages/qt4-x11/debian/changelog 2008-03-08 01:22:08 UTC (rev 9673)
+++ trunk/packages/qt4-x11/debian/changelog 2008-03-08 09:56:56 UTC (rev 9674)
@@ -1,3 +1,23 @@
+qt4-x11 (4.3.4-2) unstable; urgency=low
+
+ * Add patches:
+ * 09_qmake_lflags_as-needed
+ workaround as LDFLAGS isn't honored by configure script.
+ we set --as-needed flag for Qt build only.
+ * 10_config_tests_fixes.diff
+ configuration test fixes for Interbase/Firebird and ODBC sql drivers.
+ * Update 01_qmake_for_debian patch:
+ * re-introduce link_prl and drop QT_SHARED workaround.
+ * Update rules:
+ * Remove exported LD_LIBRARY_PATH and LDFLAGS.
+ * Remove DEB_CONFIGURE_SCRIPT_ENV.
+ * Exclude debug files from dh_shlibdeps using DEB_DH_SHLIBDEPS_ARGS_ALL.
+ * Update configure options to use libtiff from system.
+ * Remove debug configure option to build with -02.
+ * Update common-install-arch target to fix wrong path in pkconfig and prl files.
+
+ -- Fathi Boudra <fabo at debian.org> Sat, 08 Mar 2008 10:09:02 +0100
+
qt4-x11 (4.3.4-1) unstable; urgency=low
* New upstream release:
Modified: trunk/packages/qt4-x11/debian/patches/01_qmake_for_debian.diff
===================================================================
--- trunk/packages/qt4-x11/debian/patches/01_qmake_for_debian.diff 2008-03-08 01:22:08 UTC (rev 9673)
+++ trunk/packages/qt4-x11/debian/patches/01_qmake_for_debian.diff 2008-03-08 09:56:56 UTC (rev 9674)
@@ -1,7 +1,6 @@
author: Brian Nelson <pyro at debian.org>
-Ensures qmake generates Makefiles that use the -qt4 tools and that use
-recursively link against all indirectly-used libraries.
+Ensures qmake generates Makefiles that use the -qt4 tools.
--- a/mkspecs/common/linux.conf
+++ b/mkspecs/common/linux.conf
@@ -16,16 +15,3 @@
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)
Added: trunk/packages/qt4-x11/debian/patches/09_qmake_lflags_as-needed.diff
===================================================================
--- trunk/packages/qt4-x11/debian/patches/09_qmake_lflags_as-needed.diff (rev 0)
+++ trunk/packages/qt4-x11/debian/patches/09_qmake_lflags_as-needed.diff 2008-03-08 09:56:56 UTC (rev 9674)
@@ -0,0 +1,16 @@
+author: Fathi Boudra <fabo at debian.org>
+
+workaround as LDFLAGS isn't honored by configure script.
+Bug reported to Trolltech.
+
+--- a/configure
++++ b/configure
+@@ -497,6 +497,8 @@
+ rm -f "$outpath/config.tests/.qmake.cache"
+ cp "$QMAKE_VARS_FILE" "$outpath/config.tests/.qmake.cache"
+
++QMakeVar add QMAKE_LFLAGS -Wl,--as-needed
++
+ QMakeVar add styles "cde mac motif plastique cleanlooks windows"
+ QMakeVar add decorations "default windows styled"
+ QMakeVar add gfx-drivers "linuxfb"
Added: trunk/packages/qt4-x11/debian/patches/10_config_tests_fixes.diff
===================================================================
--- trunk/packages/qt4-x11/debian/patches/10_config_tests_fixes.diff (rev 0)
+++ trunk/packages/qt4-x11/debian/patches/10_config_tests_fixes.diff 2008-03-08 09:56:56 UTC (rev 9674)
@@ -0,0 +1,62 @@
+author: Fathi Boudra <fabo at debian.org>
+
+Configuration test fixes for Interbase/Firebird and ODBC sql drivers.
+
+--- a/config.tests/unix/ibase/ibase.pro
++++ b/config.tests/unix/ibase/ibase.pro
+@@ -1,4 +1,4 @@
+ SOURCES = ibase.cpp
+ CONFIG -= qt dylib
+ mac:CONFIG -= app_bundle
+-LIBS += -lgds
++LIBS += -lfbclient
+--- a/config.tests/unix/odbc/odbc.pro
++++ b/config.tests/unix/odbc/odbc.pro
+@@ -1,4 +1,4 @@
+ SOURCES = odbc.cpp
+ CONFIG -= qt dylib
+ CONFIG -= app_bundle
+-LIBS += -lodbc
++LIBS += -liodbc
+--- a/src/plugins/sqldrivers/odbc/odbc.pro
++++ b/src/plugins/sqldrivers/odbc/odbc.pro
+@@ -12,7 +12,7 @@
+
+ unix {
+ !contains( LIBS, .*odbc.* ) {
+- LIBS *= -lodbc
++ LIBS *= -liodbc
+ }
+ }
+
+--- a/src/sql/drivers/drivers.pri
++++ b/src/sql/drivers/drivers.pri
+@@ -48,7 +48,7 @@
+ SOURCES += drivers/odbc/qsql_odbc.cpp
+
+ mac:!contains( LIBS, .*odbc.* ):LIBS *= -liodbc
+- unix:!contains( LIBS, .*odbc.* ):LIBS *= -lodbc
++ unix:!contains( LIBS, .*odbc.* ):LIBS *= -liodbc
+
+ win32 {
+ !win32-borland:LIBS *= -lodbc32
+@@ -93,7 +93,7 @@
+ HEADERS += drivers/ibase/qsql_ibase.h
+ SOURCES += drivers/ibase/qsql_ibase.cpp
+
+- unix:LIBS *= -lgds
++ unix:LIBS *= -lfbclient
+
+ win32 {
+ !win32-borland:LIBS *= -lgds32_ms
+--- a/src/plugins/sqldrivers/ibase/ibase.pro
++++ b/src/plugins/sqldrivers/ibase/ibase.pro
+@@ -4,7 +4,7 @@
+ SOURCES = main.cpp \
+ ../../../sql/drivers/ibase/qsql_ibase.cpp
+
+-unix:!contains( LIBS, .*gds.* ):!contains( LIBS, .*libfb.* ):LIBS *= -lgds
++unix:!contains( LIBS, .*gds.* ):!contains( LIBS, .*libfb.* ):LIBS *= -lfbclient
+
+ win32:!contains( LIBS, .*gds.* ):!contains( LIBS, .*fbclient.* ) {
+ !win32-borland:LIBS *= -lgds32_ms
Modified: trunk/packages/qt4-x11/debian/patches/series
===================================================================
--- trunk/packages/qt4-x11/debian/patches/series 2008-03-08 01:22:08 UTC (rev 9673)
+++ trunk/packages/qt4-x11/debian/patches/series 2008-03-08 09:56:56 UTC (rev 9674)
@@ -27,6 +27,8 @@
06_qtdemo_destdir.diff
07_trust_dpkg-arch_over_uname-m.diff
08_load_ssl.diff
+09_qmake_lflags_as-needed.diff
+10_config_tests_fixes.diff
20_mips_atomic_ops.diff
#21_assume_no_fpu_for_embedded_devices.diff
30_arm_ftbfs_fixes.diff
Modified: trunk/packages/qt4-x11/debian/rules
===================================================================
--- trunk/packages/qt4-x11/debian/rules 2008-03-08 01:22:08 UTC (rev 9673)
+++ trunk/packages/qt4-x11/debian/rules 2008-03-08 09:56:56 UTC (rev 9674)
@@ -2,8 +2,6 @@
export QTDIR := $(shell pwd)
export PATH := $(QTDIR)/bin:$(PATH)
-export LD_LIBRARY_PATH := $(QTDIR)/lib:$(LD_LIBRARY_PATH)
-export LDFLAGS := -Wl,--no-undefined -Wl,--as-needed
QTVERSION := $(shell ls changes-* | cut -f2 -d '-')
CURRENTVERSION := $(shell head -1 debian/changelog | sed 's/[^(]*(\([^)]*\)).*/\1/')
@@ -27,6 +25,8 @@
DEB_DH_STRIP_ARGS_libqt4-debug := --exclude=.debug
+DEB_DH_SHLIBDEPS_ARGS_ALL := --exclude=.debug
+
DEB_INSTALL_CHANGELOGS_ALL := changes-$(QTVERSION)
DEB_INSTALL_DOCS_ALL := GPL_EXCEPTION_ADDENDUM.TXT
@@ -35,8 +35,6 @@
EXTRA_CONFIGURE_OPTS += -DQT_QLOCALE_USES_FCVT
endif
-DEB_CONFIGURE_SCRIPT_ENV += LDFLAGS="-Wl,--no-undefined -Wl,--as-needed"
-
ifeq ($(DEB_HOST_ARCH_OS),linux)
PLATFORM_ARG = linux-g++
else
@@ -77,6 +75,7 @@
-fast \
-no-rpath \
-system-zlib \
+ -system-libtiff \
-system-libpng \
-system-libjpeg \
-system-nas-sound \
@@ -90,7 +89,6 @@
-lfontconfig \
-cups \
-no-exceptions \
- -debug \
-qdbus \
-pch \
-nomake examples \
@@ -130,12 +128,15 @@
# 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
+ find $(DEB_DESTDIR)/usr/lib/pkgconfig -type f -name '*.pc' \
+ -exec perl -pi -e "s, -L$(CURDIR)/?\S+,,g" {} \;
+# Fix wrong path in prl files
+ find $(DEB_DESTDIR)/usr/lib -type f -name '*.prl' \
+ -exec perl -pi -e "s, -L$(CURDIR)/\S+,,g" {} \;
+ find $(DEB_DESTDIR)/usr/lib -type f -name '*.prl' \
+ -exec sed -i -e "/^QMAKE_PRL_BUILD_DIR/d" {} \;
install/libqt4-core::
$(CURDIR)/bin/lrelease-qt4 debian/translations/qt_ca.ts \
More information about the pkg-kde-commits
mailing list