Attachment 148274 Details for Bug 223663 – Patch for qt4-4.2.2-2.

[patch] Patch for qt4-4.2.2-2.

qt4-4.2.2-2.spec.patch (text/plain), 3.00 KB, created by Laurent Rineau on 2007-02-17 17:38:23 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Laurent Rineau

Created: 2007-02-17 17:38:23 UTC

Size: 3.00 KB

patch

obsolete

>Index: qt4.spec
>===================================================================
>RCS file: /cvs/extras/rpms/qt4/devel/qt4.spec,v
>retrieving revision 1.29
>diff -c -r1.29 qt4.spec
>--- qt4.spec	6 Dec 2006 17:22:25 -0000	1.29
>+++ qt4.spec	17 Feb 2007 17:36:19 -0000
>@@ -13,7 +13,7 @@
> Summary: Qt toolkit
> Name:	 qt4
> Version: 4.2.2
>-Release: 2%{?dist}
>+Release: 3%{?dist}
> 
> License: GPL/QPL
> Group: 	 System Environment/Libraries
>@@ -218,18 +218,48 @@
> #RPM_OPT_FLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing"
> #endif
> 
>-# use $RPM_OPT_FLAGS for our platform
>-%if "%{_lib}" == "lib64"
>-%define platform linux-g++-64
>-%else
>-%define platform linux-g++
>-%endif
>-sed -i -e "s|-O2|$RPM_OPT_FLAGS|g" mkspecs/%{platform}/qmake.conf
>-sed -i -e "s|-O2|$RPM_OPT_FLAGS|g" mkspecs/common/*.conf ||:
>+## mkspecs modifications
> 
>+cat > mkspecs-modifications.sed <<ENDOFSCRIPT
>+# Use $RPM_OPT_FLAGS instead of -O2
>+s|-O2|$RPM_OPT_FLAGS|g
> # undefine QMAKE_STRIP, so we get useful -debuginfo pkgs
>-sed -i -e "s|^QMAKE_STRIP.*=.*|QMAKE_STRIP             =|" mkspecs/linux-g++*/qmake.conf
>-sed -i -e "s|^QMAKE_STRIP.*=.*|QMAKE_STRIP             =|" mkspecs/common/*.conf ||:
>+s|^QMAKE_STRIP.*=.*|QMAKE_STRIP             =|
>+# Remove all occurence to /usr/X11R6
>+s|/usr/X11R6/.*||g
>+# Make QMAKE_INCDIR_QT and QMAKE_LIBDIR_QT be empty to avoid anoying 
>+# flags -I/usr/include and -L/usr/lib*
>+s|QMAKE_INCDIR_QT.*=.*|QMAKE_INCDIR_QT       =|
>+s|QMAKE_LIBDIR_QT.*=.*|QMAKE_LIBDIR_QT       =|
>+ENDOFSCRIPT
>+
>+mkdir mkspecs/linux-g++-fedora
>+for d in linux-g++ linux-g++-32 linux-g++-64; do 
>+  cp -a mkspecs/$d mkspecs/common mkspecs/linux-g++-fedora/
>+done
>+sed -i -f mkspecs-modifications.sed mkspecs/linux-g++-fedora/*/*.conf
>+
>+# check if linux-g++-*/qplatformdefs.h have changed since the current spec file has
>+# been written...
>+fgrep -q '#include "../linux-g++/qplatformdefs.h"' mkspecs/linux-g++-fedora/linux-g++-*/*.h
>+# then (re)move them:
>+rm -f mkspecs/linux-g++-fedora/linux-g++-*/*.h
>+mv mkspecs/linux-g++-fedora/linux-g++/*.h mkspecs/linux-g++-fedora
>+rm -rf mkspecs/linux-g++-fedora/linux-g++
>+
>+# install mkspecs/linux-g++-fedora/qmake.conf
>+cat > mkspecs/linux-g++-fedora/qmake.conf << 'EOF'
>+FEDORA_UNAME = $$system(uname -m)
>+FEDORA_PLATFORM_IS_64 = $$find( FEDORA_UNAME, .*64.* )
>+isEmpty( FEDORA_PLATFORM_IS_64 ) {
>+  FEDORA_PLATFORM = 32
>+} else {
>+  FEDORA_PLATFORM = 64
>+}
>+
>+include(linux-g++-$${FEDORA_PLATFORM}/qmake.conf)
>+EOF
>+## end of mkspec modifications
> 
> # set correct lib path
> if [ "%{_lib}" == "lib64" ] ; then
>@@ -254,7 +284,7 @@
>   -libdir %{qt_libdir} \
>   -sysconfdir %{qt_sysconfdir} \
>   -translationdir %{qt_translationdir} \
>-  -platform %{platform} \
>+  -platform linux-g++-fedora \
>   -release \
>   -shared \
>   -cups \
>@@ -507,6 +537,10 @@
> 
> 
> %changelog
>+* Sat Feb 17 2007 Laurent Rineau <laurent.rineau__fedora_extras@normalesup.org> - 4.2.2-3
>+- Add a platform named "linux-g++-fedora".
>+- First step towards fix of multilib issues (bug #223663).
>+
> * Wed Dec 06 2006 Rex Dieter <rexdieter[AT]users.sf.net. 4.2.2-2
> - respin for postgresql 
>

Actions: View | Diff

Attachments on bug 223663: 148274 | 148871 | 148872 | 148923