| 1 |
arfrever 10/04/29 20:21:27 |
| 2 |
|
| 3 |
Added: xca-0.8.1-qt_detection.patch |
| 4 |
Log: |
| 5 |
Version bump (bug #317293). |
| 6 |
(Portage version: HEAD/cvs/Linux x86_64) |
| 7 |
|
| 8 |
Revision Changes Path |
| 9 |
1.1 app-crypt/xca/files/xca-0.8.1-qt_detection.patch |
| 10 |
|
| 11 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-crypt/xca/files/xca-0.8.1-qt_detection.patch?rev=1.1&view=markup |
| 12 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-crypt/xca/files/xca-0.8.1-qt_detection.patch?rev=1.1&content-type=text/plain |
| 13 |
|
| 14 |
Index: xca-0.8.1-qt_detection.patch |
| 15 |
=================================================================== |
| 16 |
--- configure |
| 17 |
+++ configure |
| 18 |
@@ -101,15 +101,17 @@ |
| 19 |
# check for libs |
| 20 |
search_lib() { |
| 21 |
for dir in ${DIRS}; do |
| 22 |
- for dbn in $@; do |
| 23 |
- for suffix in so dylib obj a; do |
| 24 |
- for lib in lib out; do |
| 25 |
- if test -r "${dir}/${lib}/lib${dbn}.${suffix}"; then |
| 26 |
- add_lib "${dir}/${lib}" "${dbn}" "${suffix}" |
| 27 |
- echo "Found: lib${dbn}.${suffix} at ${dir}/${lib}" |
| 28 |
- return 0 |
| 29 |
- fi |
| 30 |
- done |
| 31 |
+ for subdir in "" ${subdirs}; do |
| 32 |
+ for dbn in $@; do |
| 33 |
+ for suffix in so dylib obj a; do |
| 34 |
+ for lib in lib out; do |
| 35 |
+ if test -r "${dir}/${lib}/${subdir}/lib${dbn}.${suffix}"; then |
| 36 |
+ add_lib "${dir}/${lib}/${subdir}" "${dbn}" "${suffix}" |
| 37 |
+ echo "Found: lib${dbn}.${suffix} at ${dir}/${lib}/${subdir}" |
| 38 |
+ return 0 |
| 39 |
+ fi |
| 40 |
+ done |
| 41 |
+ done |
| 42 |
done |
| 43 |
done |
| 44 |
done |
| 45 |
@@ -121,7 +123,7 @@ |
| 46 |
######################### QT |
| 47 |
subdirs="/qt /qt4" |
| 48 |
search_includes Qt/qobject.h || err "The QT Library headerfiles were not found. Set QTDIR appropriately." |
| 49 |
-subdirs="/qt/Qt /qt4/Qt /Qt" |
| 50 |
+subdirs="/qt/Qt /qt4/Qt /Qt /qt4" |
| 51 |
search_includes qobject.h || err "The QT Library headerfiles were not found. Set QTDIR appropriately." |
| 52 |
search_lib QtGui4 QtGui || err "The QT library was not found." |
| 53 |
search_lib ltdl || err "Libtool ltdl not found." |
Archives