- fix qscintilla2 detection

- rel 5

diff --git a/kde4-smokegen.spec b/kde4-smokegen.spec
index 2eb7974c8fe5a53c2dd440ebfbd6b4d7225659be..c59e42413dea58a09ce61b5f3e31c7307047e425 100644 (file)
--- a/kde4-smokegen.spec
+++ b/kde4-smokegen.spec
@@ -6,12 +6,13 @@ Summary:      smokegen - A SMOKE library
 Summary(pl.UTF-8):     smokegen - Biblioteka SMOKE
 Name:          kde4-smokegen
 Version:       4.14.3
-Release:       4
+Release:       5
 License:       GPL v2+
 Group:         X11/Libraries
 Source0:       http://download.kde.org/%{_state}/%{version}/src/%{orgname}-%{version}.tar.xz
 # Source0-md5: 2689a2a1a30f48112eb181960ecee158
 Patch0:                type-sizes.patch
+Patch1:                qscintilla2.patch
 BuildRequires: kde4-kdelibs-devel
 Obsoletes:     kde4-kdebindings-smoke-qt < 4.6.99
 Obsoletes:     smokegen <= 4.8.0
@@ -41,6 +42,7 @@ Pliki nagłówkowe biblioteki %{name}.
 %prep
 %setup -q -n %{orgname}-%{version}
 %patch0 -p1
+%patch1 -p1
 
 %build
 install -d build

diff --git a/qscintilla2.patch b/qscintilla2.patch
new file mode 100644 (file)
index 0000000..8348c9f
--- /dev/null
+++ b/qscintilla2.patch
@@ -0,0 +1,15 @@
+--- smokegen-4.14.3/cmake/FindQScintilla.cmake.orig    2014-09-15 19:53:01.000000000 +0200
++++ smokegen-4.14.3/cmake/FindQScintilla.cmake 2019-09-21 14:09:51.283110654 +0200
+@@ -18,10 +18,10 @@
+ 
+ IF(QT4_FOUND)
+     FIND_PATH(QSCINTILLA_INCLUDE_DIR qsciglobal.h
+-    "${QT_INCLUDE_DIR}/Qsci" /usr/include /usr/include/Qsci
++    "${QT_INCLUDE_DIR}/Qsci" /usr/include /usr/include/Qsci /usr/include/qt4/Qsci
+     )
+ 
+-    SET(QSCINTILLA_NAMES ${QSCINTILLA_NAMES} qscintilla2 libqscintilla2)
++    SET(QSCINTILLA_NAMES ${QSCINTILLA_NAMES} qscintilla2 libqscintilla2 qscintilla2_qt4 libqscintilla2_qt4 qscintilla2-qt4 libqscintilla2-qt4)
+     FIND_LIBRARY(QSCINTILLA_LIBRARY
+         NAMES ${QSCINTILLA_NAMES}
+         PATHS ${QT_LIBRARY_DIR}