pesa        14/09/13 01:07:02

  Added:                qscintilla-2.8.4-designer.patch
  Removed:              qscintilla-2.8.3-designer.patch
  Log:
  Bump and finally fix bug #466120. Remove old.
  
  (Portage version: 2.2.12/cvs/Linux x86_64, signed Manifest commit with key 
0xDADED6B2671CB57D!)

Revision  Changes    Path
1.1                  x11-libs/qscintilla/files/qscintilla-2.8.4-designer.patch

file : 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-libs/qscintilla/files/qscintilla-2.8.4-designer.patch?rev=1.1&view=markup
plain: 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-libs/qscintilla/files/qscintilla-2.8.4-designer.patch?rev=1.1&content-type=text/plain

Index: qscintilla-2.8.4-designer.patch
===================================================================
This patch causes the designer plugin to be built against the just-built
libqscintilla2.so, rather than trying to build against the system library
which may either (a) not be installed yet, or (b) belong to an older
installation and thus have a different soname (bug 466120).

diff --git a/designer-Qt4Qt5/designer.pro b/designer-Qt4Qt5/designer.pro
index e3432ff..2b7fa6a 100644
--- a/designer-Qt4Qt5/designer.pro
+++ b/designer-Qt4Qt5/designer.pro
@@ -4,7 +4,11 @@
 TEMPLATE = lib
 TARGET = qscintillaplugin
 
-CONFIG += release plugin qscintilla2
+CONFIG += release plugin
+
+INCLUDEPATH  += ../Qt4Qt5
+QMAKE_LIBDIR += ../Qt4Qt5
+LIBS         += -lqscintilla2
 
 greaterThan(QT_MAJOR_VERSION, 4) {
     QT += designer




Reply via email to