From: Jan Rękorajski <baggins@pld-linux.org>
Date: Sat, 21 Sep 2019 12:36:18 +0000 (+0200)
Subject: - fix building with qscintilla 2.11
X-Git-Tag: auto/th/tora-2.1.3-9
X-Git-Url: http://git.pld-linux.org/gitweb.cgi?a=commitdiff_plain;h=339c1232fae959f31e94195f23d6280fd070f54d;p=packages%2Ftora.git

- fix building with qscintilla 2.11
- rel 9
---

diff --git a/qscintilla.patch b/qscintilla.patch
new file mode 100644
index 0000000..8d58d0a
--- /dev/null
+++ b/qscintilla.patch
@@ -0,0 +1,20 @@
+--- tora-2.1.3/config/m4/qtkde.m4~	2009-10-23 18:19:57.000000000 +0200
++++ tora-2.1.3/config/m4/qtkde.m4	2019-09-21 14:31:04.023094843 +0200
+@@ -112,7 +112,7 @@
+     @LIB_DCOP@ \
+     @LIB_KHTML@ \
+     $scin_ldflags"
+-  LIBS="-lqscintilla2"
++  LIBS="-lqscintilla2_qt4"
+ 
+   AC_LANG_PUSH(C++)
+ 
+@@ -148,7 +148,7 @@
+ 
+   AC_DEFINE_UNQUOTED(QSCINTILLA_DLL, 1, [True if on Windows.])
+   AC_SUBST(QSCINTILLA_CXXFLAGS, $scin_cflags)
+-  AC_SUBST(QSCINTILLA_LDFLAGS, "$scin_ldflags -lqscintilla2")
++  AC_SUBST(QSCINTILLA_LDFLAGS, "$scin_ldflags -lqscintilla2_qt4")
+   AC_MSG_RESULT(yes)
+ ])
+ 
diff --git a/tora-gcc.patch b/tora-gcc.patch
index 3ecd082..c80a72b 100644
--- a/tora-gcc.patch
+++ b/tora-gcc.patch
@@ -8,3 +8,14 @@
  using namespace std;
  
  int main(int c, char **v) {
+--- tora-2.1.3/src/toplsqltext.cpp~	2010-07-27 19:10:39.000000000 +0200
++++ tora-2.1.3/src/toplsqltext.cpp	2019-09-21 14:27:23.043097560 +0200
+@@ -77,7 +77,7 @@
+     { "LOOP", "Loop", NULL, false, false},
+     { "WHILE", "Loop", NULL, false, false},
+     { "FOR", "Loop", NULL, false, false},
+-    { NULL, NULL, false, false}
++    { NULL, NULL, NULL, false, false}
+ };
+ 
+ 
diff --git a/tora.spec b/tora.spec
index a922d5c..c23cbb6 100644
--- a/tora.spec
+++ b/tora.spec
@@ -7,7 +7,7 @@ Summary:	A graphical toolkit for database developers and administrators
 Summary(pl.UTF-8):	Zestaw graficznych narzędzi dla programistów i administratorów baz danych
 Name:		tora
 Version:	2.1.3
-Release:	8
+Release:	9
 License:	GPL v2
 Group:		Applications/Databases/Interfaces
 Source0:	http://downloads.sourceforge.net/tora/%{name}-%{version}.tar.gz
@@ -17,6 +17,7 @@ Patch0:		%{name}-postgresql.patch
 Patch1:		%{name}-gcc.patch
 Patch2:		%{name}-build.patch
 Patch3:		gethostname.patch
+Patch4:		qscintilla.patch
 URL:		http://tora.sourceforge.net/
 BuildRequires:	QtCore-devel
 BuildRequires:	QtGui-devel
@@ -30,6 +31,7 @@ BuildRequires:	postgresql-devel
 BuildRequires:	qscintilla2-qt4-devel
 BuildRequires:	qt4-build
 BuildRequires:	qt4-linguist
+BuildRequires:	texinfo
 BuildRequires:	xorg-lib-libICE-devel
 Suggests:	QtSql-pgsql
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -58,6 +60,7 @@ być obsługiwane poprzez ODBC.
 %patch1 -p1
 %patch2 -p1
 %patch3 -p1
+%patch4 -p1
 
 rm -f src/moc_*