Release: 1
drop an old (unuseful) patch that no longer applies
This commit is contained in:
parent
ded6d74c65
commit
d72d8fa998
@ -1,56 +0,0 @@
|
||||
From 86fc0d43cdcf3232ae0e4e6f4f28cf8f1a45ede5 Mon Sep 17 00:00:00 2001
|
||||
From: Benjamin Reed <rangerrick@befunk.com>
|
||||
Date: Tue, 19 Feb 2008 17:37:37 +0100
|
||||
Subject: [PATCH 04/13] This patch adds support for using -isystem to allow putting an include
|
||||
directory at the end of the compiler's header search path.
|
||||
|
||||
I don't have the exact output anymore (I've since patched Qt's configure) but
|
||||
essentially, since I have pcre.h in /opt/kde4-deps/include, it was
|
||||
conflicting with Qt's (modified) pcre.h in the WebKit bits, since
|
||||
-I /opt/kde4-deps/include ends up in CXXFLAGS in the generated makefiles, it
|
||||
comes *before* the specific locations in INCPATH on the compile line, and you
|
||||
end up with a conflict with the system-installed pcre.h.
|
||||
|
||||
Presumably, if your pcre.h is in /usr/include as on most Linux systems, you
|
||||
wouldn't notice this issue since /usr/include's already in your include path
|
||||
and people likely don't pass -I /usr/include to configure. I suspect that on
|
||||
any platform with a regular, system-installed pcre.h (or clucene headers),
|
||||
adding -I /usr/include would exhibit this bug, just as a custom-installed
|
||||
pcre/clucene in another root would.
|
||||
|
||||
qt-bugs@ issue : 199610
|
||||
Trolltech task ID :
|
||||
bugs.kde.org number :
|
||||
---
|
||||
configure | 8 ++++++++
|
||||
1 files changed, 8 insertions(+), 0 deletions(-)
|
||||
|
||||
diff --git a/configure b/configure
|
||||
index 2c108ad..610a201 100755
|
||||
--- a/configure
|
||||
+++ b/configure
|
||||
@@ -927,6 +927,11 @@ while [ "$#" -gt 0 ]; do
|
||||
VAL=`echo $1 | sed 's,-D,,'`
|
||||
fi
|
||||
;;
|
||||
+ -isystem)
|
||||
+ VAR="add_isystempath"
|
||||
+ shift
|
||||
+ VAL="$1"
|
||||
+ ;;
|
||||
-I?*|-I)
|
||||
VAR="add_ipath"
|
||||
if [ "$1" = "-I" ]; then
|
||||
@@ -1890,6 +1895,9 @@ while [ "$#" -gt 0 ]; do
|
||||
add_ipath)
|
||||
I_FLAGS="$I_FLAGS -I\"${VAL}\""
|
||||
;;
|
||||
+ add_isystempath)
|
||||
+ I_FLAGS="$I_FLAGS -isystem \"${VAL}\""
|
||||
+ ;;
|
||||
add_lpath)
|
||||
L_FLAGS="$L_FLAGS -L\"${VAL}\""
|
||||
;;
|
||||
--
|
||||
1.6.5.1
|
||||
|
8
qt.spec
8
qt.spec
@ -18,7 +18,7 @@ Summary: Qt toolkit
|
||||
Name: qt
|
||||
Epoch: 1
|
||||
Version: 4.7.2
|
||||
Release: 18%{?dist}
|
||||
Release: 1%{?dist}
|
||||
|
||||
# See LGPL_EXCEPTIONS.txt, LICENSE.GPL3, respectively, for exception details
|
||||
License: (LGPLv2 with exceptions or GPLv3 with exceptions) and ASL 2.0 and BSD and FTL and MIT
|
||||
@ -57,7 +57,7 @@ Patch19: qt-everywhere-opensource-src-4.7.0-beta2-phonon_servicesfile.patch
|
||||
Patch23: qt-everywhere-opensource-src-4.6.3-glib_eventloop_nullcheck.patch
|
||||
|
||||
# remove dependency of webkit in assistant
|
||||
Patch24: qt-everywhere-opensource-src-4.7.1-webkit.patch
|
||||
Patch24: qt-everywhere-opensource-src-4.7.1-assistant_no_webkit.patch
|
||||
|
||||
## upstreamable bits
|
||||
# fix invalid inline assembly in qatomic_{i386,x86_64}.h (de)ref implementations
|
||||
@ -98,7 +98,6 @@ Patch105: qt-everywhere-opensource-src-4.7.1-webkit_debug_javascriptcore.patch
|
||||
|
||||
# kde-qt git patches
|
||||
Patch202: 0002-This-patch-makes-override-redirect-windows-popup-men.patch
|
||||
Patch204: 0004-This-patch-adds-support-for-using-isystem-to-allow-p.patch
|
||||
Patch205: 0005-When-tabs-are-inserted-or-removed-in-a-QTabBar.patch
|
||||
Patch212: 0012-Add-context-to-tr-calls-in-QShortcut.patch
|
||||
|
||||
@ -476,7 +475,7 @@ Qt libraries used for drawing widgets and OpenGL items.
|
||||
%patch19 -p1 -b .phonon_servicesfile
|
||||
%patch23 -p1 -b .glib_eventloop_nullcheck
|
||||
## make -assistant subpkg instead (#660287#9)
|
||||
#patch24 -p1 -b .webkit
|
||||
#patch24 -p1 -b .assistant_no_webkit
|
||||
## TODO: still worth carrying? if so, upstream it.
|
||||
%patch53 -p1 -b .qatomic-inline-asm
|
||||
## TODO: upstream me
|
||||
@ -498,7 +497,6 @@ Qt libraries used for drawing widgets and OpenGL items.
|
||||
# kde-qt branch
|
||||
%if 0%{?kde_qt}
|
||||
%patch202 -p1 -b .kde-qt-0002
|
||||
%patch204 -p1 -b .kde-qt-0004
|
||||
%patch205 -p1 -b .kde-qt-0005
|
||||
%patch212 -p1 -b .kde-qt-0012
|
||||
%endif
|
||||
|
Loading…
Reference in New Issue
Block a user