From d7d223089e5b7d84834b970ef6c9cbcb212195ba Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fran=C3=A7ois=20Andriot?= <albator78@libertysurf.fr>
Date: Mon, 12 May 2014 21:01:49 +0200
Subject: RPM packaging: update R14 packages

---
 .../tqt3/tqt3-14.0.0-rhel5_ftbfs.patch             | 35 ++++++++++++++++++++++
 redhat/dependencies/tqt3/tqt3-14.0.0.spec          |  6 ++++
 2 files changed, 41 insertions(+)
 create mode 100644 redhat/dependencies/tqt3/tqt3-14.0.0-rhel5_ftbfs.patch

(limited to 'redhat/dependencies/tqt3')

diff --git a/redhat/dependencies/tqt3/tqt3-14.0.0-rhel5_ftbfs.patch b/redhat/dependencies/tqt3/tqt3-14.0.0-rhel5_ftbfs.patch
new file mode 100644
index 000000000..beb82b4d4
--- /dev/null
+++ b/redhat/dependencies/tqt3/tqt3-14.0.0-rhel5_ftbfs.patch
@@ -0,0 +1,35 @@
+--- trinity-tqt3-14.0.0~pre193+a9ec6a15/src/kernel/ntqstyle.h.ORI	2014-05-04 12:49:48.579786273 -0400
++++ trinity-tqt3-14.0.0~pre193+a9ec6a15/src/kernel/ntqstyle.h	2014-05-04 12:50:00.948216121 -0400
+@@ -287,6 +287,7 @@
+ 		TQ_UINT32 topLevelWidgetFlags;
+ 		TQPixmap paletteBgPixmap;
+ 
++/*
+ #ifdef ENABLE_TQSTYLECONTROLELEMENTDATA_SLOW_COPY
+ 	public:
+ 		TQStyleControlElementData(const TQStyleControlElementData&);
+@@ -295,6 +296,7 @@
+ 		// Disable copy constructor
+ 		TQStyleControlElementData(const TQStyleControlElementData&);
+ #endif // ENABLE_TQSTYLECONTROLELEMENTDATA_SLOW_COPY
++*/
+ 
+ };
+ 
+--- trinity-tqt3-14.0.0~pre193+a9ec6a15/src/kernel/qstyle.cpp.ORI	2014-05-04 12:50:38.499448860 -0400
++++ trinity-tqt3-14.0.0~pre193+a9ec6a15/src/kernel/qstyle.cpp	2014-05-04 12:50:49.766018474 -0400
+@@ -2836,6 +2836,7 @@
+ 	//
+ }
+ 
++/*
+ TQStyleControlElementData::TQStyleControlElementData(const TQStyleControlElementData& orig) {
+ 	isNull = orig.isNull;
+ 	widgetObjectTypes = orig.widgetObjectTypes;
+@@ -2898,5 +2899,6 @@
+ 	topLevelWidgetFlags = orig.topLevelWidgetFlags;
+ 	paletteBgPixmap = orig.paletteBgPixmap;
+ }
++*/
+ 
+ #endif // QT_NO_STYLE
diff --git a/redhat/dependencies/tqt3/tqt3-14.0.0.spec b/redhat/dependencies/tqt3/tqt3-14.0.0.spec
index 13ffbccf2..a622c18bc 100644
--- a/redhat/dependencies/tqt3/tqt3-14.0.0.spec
+++ b/redhat/dependencies/tqt3/tqt3-14.0.0.spec
@@ -22,6 +22,9 @@ Prefix:		%{tde_prefix}
 
 Source0:	%{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
 
+# [tqt3] Unexplained FTBFS on RHEL5
+Patch1:		tqt3-14.0.0-rhel5_ftbfs.patch
+
 BuildRequires: desktop-file-utils
 BuildRequires: libmng-devel
 BuildRequires: glibc-devel
@@ -458,6 +461,9 @@ for the TQt 3 toolkit.
 
 %prep
 %setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}}
+%if 0%{?rhel} == 5
+%patch1 -p1 -b .ftbfs
+%endif
 
 # fix variables in 'qmake.conf'
 %__sed -i mkspecs/*/qmake.conf \
-- 
cgit v1.2.3