rpms/hercstudio/EL-5 hercstudio-qt42.patch, NONE, 1.1 hercstudio.spec, 1.1, 1.2
Dan Horák
sharkcz at fedoraproject.org
Wed Sep 30 09:36:13 UTC 2009
Author: sharkcz
Update of /cvs/pkgs/rpms/hercstudio/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv902
Modified Files:
hercstudio.spec
Added Files:
hercstudio-qt42.patch
Log Message:
* Wed Sep 30 2009 Dan Horák <dan[at]danny.cz> - 1.0-0.2.beta.1
- backport to QT 4.2
hercstudio-qt42.patch:
HercConfiguration/Configuration.ui | 217 -------------------------------------
HercStudio/mainwindow.cpp | 2
2 files changed, 219 deletions(-)
--- NEW FILE hercstudio-qt42.patch ---
>From 4410cca1e3edea8f9b3bef2ed87d4cc0949248b3 Mon Sep 17 00:00:00 2001
From: =?utf-8?q?Dan=20Hor=C3=A1k?= <dan at danny.cz>
Date: Thu, 17 Sep 2009 12:27:30 +0200
Subject: [PATCH 1/2] remove call of method unsupported in qt 4.2
---
HerculesStudio/HercStudio/mainwindow.cpp | 1 -
1 files changed, 0 insertions(+), 1 deletions(-)
diff --git a/HerculesStudio/HercStudio/mainwindow.cpp b/HerculesStudio/HercStudio/mainwindow.cpp
index e8c468b..c62cb26 100644
--- a/HerculesStudio/HercStudio/mainwindow.cpp
+++ b/HerculesStudio/HercStudio/mainwindow.cpp
@@ -537,7 +537,6 @@ void MainWindow::deleteMessages()
msgBox.setText("Messages belong to to a running Hercules.");
msgBox.setInformativeText("Are you sure you want to delete history messages?");
msgBox.setStandardButtons(QMessageBox::Yes | QMessageBox::No);
- msgBox.setDefaultButton(QMessageBox::Yes);
msgBox.setIcon(QMessageBox::Warning);
int ret = msgBox.exec();
if (ret != QMessageBox::Yes)
--
1.6.3.3
>From deddadf39bc61fff47035ff2c028b3173d25d069 Mon Sep 17 00:00:00 2001
From: =?utf-8?q?Dan=20Hor=C3=A1k?= <dan at danny.cz>
Date: Thu, 17 Sep 2009 12:29:52 +0200
Subject: [PATCH 2/2] remove items unsupported in qt 4.2
---
HerculesStudio/HercConfiguration/Configuration.ui | 216 ---------------------
1 files changed, 0 insertions(+), 216 deletions(-)
diff --git a/HerculesStudio/HercConfiguration/Configuration.ui b/HerculesStudio/HercConfiguration/Configuration.ui
index bce9ca0..b2b92cc 100644
--- a/HerculesStudio/HercConfiguration/Configuration.ui
+++ b/HerculesStudio/HercConfiguration/Configuration.ui
@@ -968,24 +968,6 @@ p, li { white-space: pre-wrap; }
</color>
</brush>
</colorrole>
- <colorrole role="ToolTipBase">
- <brush brushstyle="SolidPattern">
- <color alpha="255">
- <red>255</red>
- <green>255</green>
- <blue>220</blue>
- </color>
- </brush>
- </colorrole>
- <colorrole role="ToolTipText">
- <brush brushstyle="SolidPattern">
- <color alpha="255">
- <red>0</red>
- <green>0</green>
- <blue>0</blue>
- </color>
- </brush>
- </colorrole>
</active>
<inactive>
<colorrole role="WindowText">
@@ -1105,24 +1087,6 @@ p, li { white-space: pre-wrap; }
</color>
</brush>
</colorrole>
- <colorrole role="ToolTipBase">
- <brush brushstyle="SolidPattern">
- <color alpha="255">
- <red>255</red>
- <green>255</green>
- <blue>220</blue>
- </color>
- </brush>
- </colorrole>
- <colorrole role="ToolTipText">
- <brush brushstyle="SolidPattern">
- <color alpha="255">
- <red>0</red>
- <green>0</green>
- <blue>0</blue>
- </color>
- </brush>
- </colorrole>
</inactive>
<disabled>
<colorrole role="WindowText">
@@ -1242,24 +1206,6 @@ p, li { white-space: pre-wrap; }
</color>
</brush>
</colorrole>
- <colorrole role="ToolTipBase">
- <brush brushstyle="SolidPattern">
- <color alpha="255">
- <red>255</red>
- <green>255</green>
- <blue>220</blue>
- </color>
- </brush>
- </colorrole>
- <colorrole role="ToolTipText">
- <brush brushstyle="SolidPattern">
- <color alpha="255">
- <red>0</red>
- <green>0</green>
- <blue>0</blue>
- </color>
- </brush>
- </colorrole>
</disabled>
</palette>
</property>
@@ -1411,24 +1357,6 @@ p, li { white-space: pre-wrap; }
</color>
</brush>
</colorrole>
- <colorrole role="ToolTipBase">
- <brush brushstyle="SolidPattern">
- <color alpha="255">
- <red>255</red>
- <green>255</green>
- <blue>220</blue>
- </color>
- </brush>
- </colorrole>
- <colorrole role="ToolTipText">
- <brush brushstyle="SolidPattern">
- <color alpha="255">
- <red>0</red>
- <green>0</green>
- <blue>0</blue>
- </color>
- </brush>
- </colorrole>
</active>
<inactive>
<colorrole role="WindowText">
@@ -1548,24 +1476,6 @@ p, li { white-space: pre-wrap; }
</color>
</brush>
</colorrole>
- <colorrole role="ToolTipBase">
- <brush brushstyle="SolidPattern">
- <color alpha="255">
- <red>255</red>
- <green>255</green>
- <blue>220</blue>
- </color>
- </brush>
- </colorrole>
- <colorrole role="ToolTipText">
- <brush brushstyle="SolidPattern">
- <color alpha="255">
- <red>0</red>
- <green>0</green>
- <blue>0</blue>
- </color>
- </brush>
- </colorrole>
</inactive>
<disabled>
<colorrole role="WindowText">
@@ -1685,24 +1595,6 @@ p, li { white-space: pre-wrap; }
</color>
</brush>
</colorrole>
- <colorrole role="ToolTipBase">
- <brush brushstyle="SolidPattern">
- <color alpha="255">
- <red>255</red>
- <green>255</green>
- <blue>220</blue>
- </color>
- </brush>
- </colorrole>
- <colorrole role="ToolTipText">
- <brush brushstyle="SolidPattern">
- <color alpha="255">
- <red>0</red>
- <green>0</green>
- <blue>0</blue>
- </color>
- </brush>
- </colorrole>
</disabled>
</palette>
</property>
@@ -1854,24 +1746,6 @@ p, li { white-space: pre-wrap; }
</color>
</brush>
</colorrole>
- <colorrole role="ToolTipBase">
- <brush brushstyle="SolidPattern">
- <color alpha="255">
- <red>255</red>
- <green>255</green>
- <blue>220</blue>
- </color>
- </brush>
- </colorrole>
- <colorrole role="ToolTipText">
- <brush brushstyle="SolidPattern">
- <color alpha="255">
- <red>0</red>
- <green>0</green>
- <blue>0</blue>
- </color>
- </brush>
- </colorrole>
</active>
<inactive>
<colorrole role="WindowText">
@@ -1991,24 +1865,6 @@ p, li { white-space: pre-wrap; }
</color>
</brush>
</colorrole>
- <colorrole role="ToolTipBase">
- <brush brushstyle="SolidPattern">
- <color alpha="255">
- <red>255</red>
- <green>255</green>
- <blue>220</blue>
- </color>
- </brush>
- </colorrole>
- <colorrole role="ToolTipText">
- <brush brushstyle="SolidPattern">
- <color alpha="255">
- <red>0</red>
- <green>0</green>
- <blue>0</blue>
- </color>
- </brush>
- </colorrole>
</inactive>
<disabled>
<colorrole role="WindowText">
@@ -2128,24 +1984,6 @@ p, li { white-space: pre-wrap; }
</color>
</brush>
</colorrole>
- <colorrole role="ToolTipBase">
- <brush brushstyle="SolidPattern">
- <color alpha="255">
- <red>255</red>
- <green>255</green>
- <blue>220</blue>
- </color>
- </brush>
- </colorrole>
- <colorrole role="ToolTipText">
- <brush brushstyle="SolidPattern">
- <color alpha="255">
- <red>0</red>
- <green>0</green>
- <blue>0</blue>
- </color>
- </brush>
- </colorrole>
</disabled>
</palette>
</property>
@@ -2302,24 +2140,6 @@ p, li { white-space: pre-wrap; }
</color>
</brush>
</colorrole>
- <colorrole role="ToolTipBase">
- <brush brushstyle="SolidPattern">
- <color alpha="255">
- <red>255</red>
- <green>255</green>
- <blue>220</blue>
- </color>
- </brush>
- </colorrole>
- <colorrole role="ToolTipText">
- <brush brushstyle="SolidPattern">
- <color alpha="255">
- <red>0</red>
- <green>0</green>
- <blue>0</blue>
- </color>
- </brush>
- </colorrole>
</active>
<inactive>
<colorrole role="WindowText">
@@ -2439,24 +2259,6 @@ p, li { white-space: pre-wrap; }
</color>
</brush>
</colorrole>
- <colorrole role="ToolTipBase">
- <brush brushstyle="SolidPattern">
- <color alpha="255">
- <red>255</red>
- <green>255</green>
- <blue>220</blue>
- </color>
- </brush>
- </colorrole>
- <colorrole role="ToolTipText">
- <brush brushstyle="SolidPattern">
- <color alpha="255">
- <red>0</red>
- <green>0</green>
- <blue>0</blue>
- </color>
- </brush>
- </colorrole>
</inactive>
<disabled>
<colorrole role="WindowText">
@@ -2576,24 +2378,6 @@ p, li { white-space: pre-wrap; }
</color>
</brush>
</colorrole>
- <colorrole role="ToolTipBase">
- <brush brushstyle="SolidPattern">
- <color alpha="255">
- <red>255</red>
- <green>255</green>
- <blue>220</blue>
- </color>
- </brush>
- </colorrole>
- <colorrole role="ToolTipText">
- <brush brushstyle="SolidPattern">
- <color alpha="255">
- <red>0</red>
- <green>0</green>
- <blue>0</blue>
- </color>
- </brush>
- </colorrole>
</disabled>
</palette>
</property>
--
1.6.3.3
Index: hercstudio.spec
===================================================================
RCS file: /cvs/pkgs/rpms/hercstudio/EL-5/hercstudio.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- hercstudio.spec 17 Sep 2009 08:49:12 -0000 1.1
+++ hercstudio.spec 30 Sep 2009 09:36:13 -0000 1.2
@@ -1,6 +1,6 @@
Name: hercstudio
Version: 1.0
-Release: 0.2.beta%{?dist}
+Release: 0.2.beta%{?dist}.1
Summary: GUI front-end to the Hercules mainframe Emulator
Group: Applications/Emulators
@@ -12,6 +12,8 @@ Source0: %{name}-svn3.tar.bz2
Source1: %{name}.desktop
Patch0: %{name}-gcc44.patch
Patch1: %{name}-buttons.patch
+# backport to QT 4.2
+Patch2: %{name}-qt42.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: qt4-devel
@@ -27,10 +29,14 @@ GUI front-end to the Hercules mainframe
%setup -q -n %{name}
%patch0 -p2 -b .gcc44
%patch1 -p0 -b .buttons
+%patch2 -p2 -b .qt42
+
+# remove first line from ui file iff it starts with <?xml ...>
+find . -name \*.ui | xargs sed -i '1{/<?xml/d}'
%build
-%{_qt4_qmake}
+%{_libdir}/qt4/bin/qmake -unix QMAKE_CFLAGS="%{optflags}" QMAKE_CXXFLAGS="%{optflags}"
make %{?_smp_mflags}
@@ -44,7 +50,7 @@ mkdir -p $RPM_BUILD_ROOT%{_datadir}/pixm
install -p -m 755 HerculesStudio $RPM_BUILD_ROOT%{_bindir}
install -p -m 644 HercStudio/icons/tray.xpm $RPM_BUILD_ROOT%{_datadir}/pixmaps/hercstudio.xpm
-desktop-file-install --dir $RPM_BUILD_ROOT%{_datadir}/applications %{SOURCE1}
+desktop-file-install --vendor fedora --dir $RPM_BUILD_ROOT%{_datadir}/applications %{SOURCE1}
%clean
@@ -60,6 +66,9 @@ rm -rf $RPM_BUILD_ROOT
%changelog
+* Wed Sep 30 2009 Dan Horák <dan[at]danny.cz> - 1.0-0.2.beta.1
+- backport to QT 4.2
+
* Mon Sep 7 2009 Dan Horák <dan[at]danny.cz> - 1.0-0.2.beta
- add patch for panel buttons from upstream
More information about the fedora-extras-commits
mailing list