rpms/qscintilla/F-10 QScintilla-gpl-2.4-autocomplete_popup.patch, NONE, 1.1 QScintilla-gpl-2.4-qt4_designer_incpath.patch, NONE, 1.1 qscintilla.spec, 1.23, 1.24 QScintilla-2-gpl-Qt4-incpath.patch, 1.2, NONE

[Rex Dieter]

Author: rdieter

Update of /cvs/pkgs/rpms/qscintilla/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16413/F-10

Modified Files:
	qscintilla.spec 
Added Files:
	QScintilla-gpl-2.4-autocomplete_popup.patch 
	QScintilla-gpl-2.4-qt4_designer_incpath.patch 
Removed Files:
	QScintilla-2-gpl-Qt4-incpath.patch 
Log Message:
sync w/devel


QScintilla-gpl-2.4-autocomplete_popup.patch:
 SciClasses.cpp |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE QScintilla-gpl-2.4-autocomplete_popup.patch ---
diff -up QScintilla-gpl-2.4/Qt4/SciClasses.cpp.autocomplete_popup QScintilla-gpl-2.4/Qt4/SciClasses.cpp
--- QScintilla-gpl-2.4/Qt4/SciClasses.cpp.autocomplete_popup	2009-06-05 04:00:41.000000000 -0500
+++ QScintilla-gpl-2.4/Qt4/SciClasses.cpp	2009-10-21 07:56:58.804972430 -0500
@@ -128,7 +128,7 @@ void SciPopup::on_triggered(int cmd)
 SciListBox::SciListBox(QWidget *parent, ListBoxQt *lbx_)
     : QListWidget(parent), lbx(lbx_)
 {
-    setWindowFlags(Qt::Tool|Qt::FramelessWindowHint);
+    setWindowFlags(Qt::ToolTip|Qt::WindowStaysOnTopHint);
     setAttribute(Qt::WA_StaticContents);
 
     setFocusProxy(parent);

QScintilla-gpl-2.4-qt4_designer_incpath.patch:
 designer.pro |    4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

--- NEW FILE QScintilla-gpl-2.4-qt4_designer_incpath.patch ---
diff -up QScintilla-gpl-2.4/designer-Qt4/designer.pro.qt4_designer_incpath QScintilla-gpl-2.4/designer-Qt4/designer.pro
--- QScintilla-gpl-2.4/designer-Qt4/designer.pro.qt4_designer_incpath	2009-05-03 11:26:12.000000000 -0500
+++ QScintilla-gpl-2.4/designer-Qt4/designer.pro	2009-10-21 08:01:56.561731098 -0500
@@ -12,4 +12,6 @@ SOURCES = qscintillaplugin.cpp
 target.path = $$[QT_INSTALL_PLUGINS]/designer
 INSTALLS += target
 
-LIBS += -lqscintilla2
+LIBS += -L$(DESTDIR)../Qt4 -lqscintilla2
+
+INCPATH = $(DESTDIR)../Qt4


Index: qscintilla.spec
===================================================================
RCS file: /cvs/pkgs/rpms/qscintilla/F-10/qscintilla.spec,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -p -r1.23 -r1.24
--- qscintilla.spec	11 Aug 2009 17:46:46 -0000	1.23
+++ qscintilla.spec	11 Nov 2009 16:33:47 -0000	1.24
@@ -6,7 +6,7 @@
 
 Name:    qscintilla
 Version: 2.4
-Release: 4%{?dist}
+Release: 7%{?dist}
 Summary: A Scintilla port to Qt
 # matches up (pretty much) with qt4
 License: GPLv3 or GPLv2 with exceptions
@@ -15,8 +15,11 @@ Url:     http://www.riverbankcomputing.c
 Source0: http://www.riverbankcomputing.com/static/Downloads/QScintilla2/QScintilla-gpl-%{version}.tar.gz  
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-# TODO: upstream this
-Patch1:         QScintilla-2-gpl-Qt4-incpath.patch
+## Upstreamable patches
+# posted to upstream ml, not in archive yet
+Patch50: QScintilla-gpl-2.4-qt4_designer_incpath.patch 
+# http://www.riverbankcomputing.com/pipermail/qscintilla/2009-October/000496.html
+Patch51: QScintilla-gpl-2.4-autocomplete_popup.patch
 
 Obsoletes: qscintilla-designer < 2.4-3
 Provides:  qscintilla-designer = %{version}-%{release}
@@ -26,7 +29,7 @@ BuildRequires:  qt4-devel
 # for -python
 %if 0%{?python}
 %{!?python_sitearch:%global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
-%global pyqt4_version 4.5
+%global pyqt4_version 4.6.1
 BuildRequires:  PyQt4-devel >= %{pyqt4_version} 
 BuildRequires:  chrpath
 %endif
@@ -70,7 +73,8 @@ Obsoletes: qscintilla-python-devel < 2.4
 %prep
 %setup -q -n QScintilla-gpl-%{version}
 
-%patch1 -p1 -b .designer-incpath-qt4
+%patch50 -p1 -b .qt4_designer_incpath
+%patch51 -p1 -b .autocomplete_popup
 
 # fix permissions on doc files
 find doc example-Qt4  -type f -exec chmod 0644 {} ';'
@@ -93,10 +97,11 @@ popd
 
 %if 0%{?python}
 pushd Python
-%{__python} configure.py \
-            -c -j 3 \
-            -n ../Qt4 \
-            -o ../Qt4
+%{__python} \
+  configure.py \
+    -c -j 3 \
+    -n ../Qt4 \
+    -o ../Qt4
 make %{?_smp_mflags}
 popd
 %endif
@@ -152,6 +157,15 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Wed Nov 11 2009 Rex Dieter <rdieter at fedoraproject.org> - 2.4-7
+- pyqt4_version 4.6.1
+
+* Wed Oct 21 2009 Rex Dieter <rdieter at fedoraproject.org> - 2.4-6
+- autocomplete_popup patch
+
+* Fri Oct 16 2009 Rex Dieter <rdieter at fedoraproject.org> - 2.4-5
+- rebuild (PyQt4)
+
 * Tue Aug 11 2009 Rex Dieter <rdieter at fedoraproject.org> - 2.4-4
 - -python-devel: make noarch, drop dep on -python
 


--- QScintilla-2-gpl-Qt4-incpath.patch DELETED ---