summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMaurice van der Pot <griffon26@gentoo.org>2008-07-08 12:41:57 +0000
committerMaurice van der Pot <griffon26@gentoo.org>2008-07-08 12:41:57 +0000
commitfa2169ea091e5b324c9196530ddc6a41038471af (patch)
treee782a55a06183e03acbadd5c56db45011bf4efe1
parentversion bump as per bug #230927 thanks Hanno (diff)
downloadgentoo-2-fa2169ea091e5b324c9196530ddc6a41038471af.tar.gz
gentoo-2-fa2169ea091e5b324c9196530ddc6a41038471af.tar.bz2
gentoo-2-fa2169ea091e5b324c9196530ddc6a41038471af.zip
Corrected library paths used in qscintilla-2.2 patches (bug #223911).
(Portage version: 2.1.5)
-rw-r--r--x11-libs/qscintilla/ChangeLog8
-rw-r--r--x11-libs/qscintilla/files/qscintilla-2.2-qt.patch2
-rw-r--r--x11-libs/qscintilla/files/qscintilla-2.2-qt4.patch2
3 files changed, 9 insertions, 3 deletions
diff --git a/x11-libs/qscintilla/ChangeLog b/x11-libs/qscintilla/ChangeLog
index bd4fc3771bfa..9771b0424442 100644
--- a/x11-libs/qscintilla/ChangeLog
+++ b/x11-libs/qscintilla/ChangeLog
@@ -1,6 +1,12 @@
# ChangeLog for x11-libs/qscintilla
# Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/qscintilla/ChangeLog,v 1.11 2008/05/25 10:40:59 yngwin Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/qscintilla/ChangeLog,v 1.12 2008/07/08 12:41:57 griffon26 Exp $
+
+ 08 Jul 2008; Maurice van der Pot <griffon26@gentoo.org>
+ files/qscintilla-2.2-qt.patch, files/qscintilla-2.2-qt4.patch:
+ Fixed library path in qscintilla-2.2 patches, because libraries are now built
+ in a different location. Fixes bug #223911 reported by Bryce Verdier
+ <btv@pdx.edu>.
25 May 2008; Ben de Groot <yngwin@gentoo.org>
+files/qscintilla-2.2-qt.patch, +files/qscintilla-2.2-qt4.patch:
diff --git a/x11-libs/qscintilla/files/qscintilla-2.2-qt.patch b/x11-libs/qscintilla/files/qscintilla-2.2-qt.patch
index 3579ea2400af..98b4fb5a237b 100644
--- a/x11-libs/qscintilla/files/qscintilla-2.2-qt.patch
+++ b/x11-libs/qscintilla/files/qscintilla-2.2-qt.patch
@@ -11,4 +11,4 @@
SOURCES += qscintillaplugin.cpp
-LIBS += -lqscintilla2
-+LIBS += -L../Qt3/lib -lqscintilla2
++LIBS += -L../Qt3 -lqscintilla2
diff --git a/x11-libs/qscintilla/files/qscintilla-2.2-qt4.patch b/x11-libs/qscintilla/files/qscintilla-2.2-qt4.patch
index 646e38f45dbb..35062e4695ef 100644
--- a/x11-libs/qscintilla/files/qscintilla-2.2-qt4.patch
+++ b/x11-libs/qscintilla/files/qscintilla-2.2-qt4.patch
@@ -16,4 +16,4 @@
INSTALLS += target
-LIBS += -lqscintilla2
-+LIBS += -L../Qt4/lib -lqscintilla2
++LIBS += -L../Qt4 -lqscintilla2