Sisyphus repositório
Última atualização: 1 outubro 2023 | SRPMs: 18631 | Visitas: 37635372
en ru br
ALT Linux repositórios
S:2.13.1-alt1.1
D:2.3-alt1
5.0: 2.3.2-alt1
4.1: 2.3-alt0.M41.3
+backports:2.2-alt1.M41.1

Group :: Desenvolvimento/KDE e QT
RPM: qscintilla2

 Main   Changelog   Spec   Patches   Sources   Download   Gear   Bugs e FR  Repocop 

Patch: qscintilla-2.2-alt-allinone.patch
Download


 Python/configure.py       |   10 +++++++++-
 designer-Qt3/designer.pro |    7 +++++--
 designer-Qt4/designer.pro |    3 ++-
 3 files changed, 16 insertions(+), 4 deletions(-)
diff --git a/Python/configure.py b/Python/configure.py
index ae628a2..4beeec6 100644
--- a/Python/configure.py
+++ b/Python/configure.py
@@ -35,6 +35,7 @@
 
 import sys
 import os
+import re
 import glob
 import getopt
 
@@ -86,6 +87,11 @@ opt_static = False
 opt_tracing = False
 opt_debug = False
 
+qsci_version = None
+
+# get python version
+python_version = re.compile('^(\d\.\d).*').findall(sys.version)[0]
+
 if sys.platform == "win32":
     qsci_define = "QEXTSCINTILLA_DLL"
 else:
@@ -267,8 +273,10 @@ def generate_code():
         )
 
     makefile.extra_include_dirs.append(opt_qsciincdir)
-    makefile.extra_lib_dirs.append(opt_qscilibdir)
+    # do not include opt_qscilibdir to RPATH
+    makefile.LIBDIR.append(opt_qscilibdir)
     makefile.extra_libs.append("qscintilla2")
+    makefile.extra_libs.append("python%s" % python_version)
 
     makefile.generate()
 
diff --git a/designer-Qt3/designer.pro b/designer-Qt3/designer.pro
index afca518..418072d 100644
--- a/designer-Qt3/designer.pro
+++ b/designer-Qt3/designer.pro
@@ -3,10 +3,13 @@
 
 TEMPLATE = lib
 TARGET = qscintillaplugin
-DESTDIR = $(QTDIR)/plugins/designer
 
 CONFIG += qt warn_on release plugin
 
 SOURCES += qscintillaplugin.cpp
 
-LIBS += -lqscintilla2
+target.path = $$[QT_INSTALL_PLUGINS]/designer
+INSTALLS += target
+
+LIBS += -L../Qt3 -lqscintilla2
+INCPATH = ../Qt3
diff --git a/designer-Qt4/designer.pro b/designer-Qt4/designer.pro
index 18df870..6cdbeff 100644
--- a/designer-Qt4/designer.pro
+++ b/designer-Qt4/designer.pro
@@ -12,4 +12,5 @@ SOURCES = qscintillaplugin.cpp
 target.path = $$[QT_INSTALL_PLUGINS]/designer
 INSTALLS += target
 
-LIBS += -lqscintilla2
+LIBS += -L../Qt4 -lqscintilla2
+INCPATH = ../Qt4
 
projeto & código: Vladimir Lettiev aka crux © 2004-2005, Andrew Avramenko aka liks © 2007-2008
mantenedor atual: Michael Shigorin
mantenedor da tradução: Fernando Martini aka fmartini © 2009