RPM Packaging: update 3.5.13.2 packages

3 files changed, 81 insertions, 4 deletions

diff --git a/redhat/libraries/libksquirrel/libksquirrel-3.5.13.2.spec b/redhat/libraries/libksquirrel/libksquirrel-3.5.13.2.spec
index 3dbfa02d8..16c1ca7c4 100644
--- a/redhat/libraries/libksquirrel/libksquirrel-3.5.13.2.spec
+++ b/redhat/libraries/libksquirrel/libksquirrel-3.5.13.2.spec
@@ -79,7 +79,9 @@ BuildRequires:	xmedcon-devel
 %define with_svg 1
 %if 0%{?fedora} || 0%{?rhel} 
 BuildRequires:	librsvg2
-BuildRequires:	librsvg2-devel
+%endif
+%if 0%{?fedora}
+BuildRequires:	librsvg2-tools
 %endif
 %if 0%{?mgaversion} || 0%{?mdkversion}
 BuildRequires:	librsvg
@@ -156,13 +158,20 @@ Tools for KSquirrel.
 %patch0 -p1 -b .netpbm
 %patch1 -p1 -b .giflib5
 
+# FIXME: under PCLinuxOS, headers are under 'freetype2' not 'freetype'
+if [ -r /usr/include/freetype2/ftbitmap.h ]; then
+  %__sed -i "configure.ac" -e "s|freetype/ftbitmap.h|freetype2/ftbitmap.h|"
+  %__sed -i "kernel/kls_ttf/ttf2pnm.cpp" -e "s|freetype/config/|freetype2/config/|"
+fi
+
 %__cp "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in"
 %__cp "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" || %__cp "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh"
 %__make -f "admin/Makefile.common"
 
 
 %build
-unset QTDIR; . /etc/profile.d/qt3.sh
+unset QTDIR QTINC QTLIB
+. /etc/profile.d/qt3.sh
 export PATH="%{tde_bindir}:${PATH}"
 export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}"
 
diff --git a/redhat/libraries/python-trinity/python-trinity-3.5.13.2-fix_is_private.patch b/redhat/libraries/python-trinity/python-trinity-3.5.13.2-fix_is_private.patch
new file mode 100644
index 000000000..fb41680f1
--- /dev/null
+++ b/redhat/libraries/python-trinity/python-trinity-3.5.13.2-fix_is_private.patch
@@ -0,0 +1,56 @@
+--- trinity-python-trinity-3.5.13.2/sip/kdecore/kconfigbase.sip.ORI	2014-03-22 23:47:29.217935267 +0100
++++ trinity-python-trinity-3.5.13.2/sip/kdecore/kconfigbase.sip	2014-03-22 23:47:53.355370778 +0100
+@@ -153,10 +153,8 @@
+     bool                 deleteGroup (const QString&, bool = 1, bool = 0);
+     void                 setDollarExpansion (bool = 1);
+     bool                 isDollarExpansion () const;
+-    virtual void         rollback (bool = 1);
+     virtual void         sync ();
+     bool                 isDirty () const;
+-    virtual void         setReadOnly (bool);
+     bool                 isReadOnly () const;
+     bool                 hasKey (const QString&) const;
+     virtual QMap<QString,QString> entryMap (const QString&) const = 0;
+@@ -182,6 +180,9 @@
+     bool                 hasDefault (const QString&) const;
+ %End
+ 
++private:
++    virtual void         rollback (bool = 1);
++    virtual void         setReadOnly (bool);
+ 
+ protected:
+     void                 setLocale ();
+--- trinity-python-trinity-3.5.13.2/sip/kdeui/kactivelabel.sip.ORI	2014-03-22 23:56:28.448338190 +0100
++++ trinity-python-trinity-3.5.13.2/sip/kdeui/kactivelabel.sip	2014-03-22 23:58:44.540121011 +0100
+@@ -53,6 +53,8 @@
+     virtual void         keyPressEvent (QKeyEvent*);
+ %End
+ 
++private:
++    virtual void         setSource(const QString&);
+ 
+ };  // class KActiveLabel
+ 
+--- trinity-python-trinity-3.5.13.2/sip/kdeui/kpixmapregionselectorwidget.sip.ORI	2014-03-23 00:02:17.343077605 +0100
++++ trinity-python-trinity-3.5.13.2/sip/kdeui/kpixmapregionselectorwidget.sip	2014-03-23 00:03:42.151069824 +0100
+@@ -54,6 +54,8 @@
+ protected:
+     virtual KPopupMenu*  createPopupMenu ();
+ 
++private:
++    virtual bool         eventFilter(QObject*, QEvent*);
+ };  // class KPixmapRegionSelectorWidget
+ 
+ %End
+--- trinity-python-trinity-3.5.13.2/sip/kfile/knotifydialog.sip.ORI	2014-03-23 00:13:21.583382771 +0100
++++ trinity-python-trinity-3.5.13.2/sip/kfile/knotifydialog.sip	2014-03-23 00:17:02.715146838 +0100
+@@ -77,6 +77,8 @@
+     virtual void         addApplicationEvents (const QString&);
+     virtual void         clearApplicationEvents ();
+ 
++private slots:
++    virtual void         slotDefault();
+ };  // class KNotifyDialog
+ 
+ %End
diff --git a/redhat/libraries/python-trinity/python-trinity-3.5.13.2.spec b/redhat/libraries/python-trinity/python-trinity-3.5.13.2.spec
index 3dc55c64d..ee6f31361 100644
--- a/redhat/libraries/python-trinity/python-trinity-3.5.13.2.spec
+++ b/redhat/libraries/python-trinity/python-trinity-3.5.13.2.spec
@@ -45,6 +45,8 @@ Source0:		%{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
 
 # Fix include subdirectory 'tde' instead of 'kde'
 Patch1:		python-trinity-3.5.13.2-fix_tde_includedir.patch
+# Fix "is private" FTBFS using SIP >= 4.15
+Patch2:		python-trinity-3.5.13.2-fix_is_private.patch
 
 BuildRequires:	trinity-tqtinterface-devel >= %{tde_version}
 BuildRequires:	trinity-arts-devel >= 1:1.5.10
@@ -116,10 +118,12 @@ tips and working code you can use to learn from.
 %prep
 %setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}}
 %patch1 -p1 -b .inc
+%patch2 -p1 -b .private
 
 
 %build
-unset QTDIR; . /etc/profile.d/qt3.sh
+unset QTDIR QTINC QTLIB
+. /etc/profile.d/qt3.sh
 export PATH="%{tde_bindir}:${PATH}"
 export LD_RUN_PATH="%{tde_libdir}"
 export KDEDIR=%{tde_prefix}
@@ -139,7 +143,15 @@ export PYTHONPATH=%{python_sitearch}/trinity-sip:%{python_sitearch}/python-qt3
 	-e "/^LIBS = / s|$| -lpython2.7 -lDCOP -lkdecore -lkdefx -lkdeui -lkresources -lkabc -lkparts -lkio|"
 %endif
 
-%__make %{_smp_mflags}
+# Shitty hack to fix issue with SIP >= 4.15
+%__sed -i "kfile/sipkfilepart0.cpp" \
+  -e "s| KFileIconView::selectionMode(| KFileView::selectionMode(|g" \
+  -e "s| KFileIconView::clear()| KFileView::clear()|g" \
+  -e "s| KFileDetailView::selectionMode(| KFileView::selectionMode(|g" \
+  -e "s| KFileDetailView::clear()| KFileView::clear()|g"
+  
+
+%__make %{_smp_mflags} || %__make
 
 
 %install