Login
[x]
Log in using an account from:
Fedora Account System
Red Hat Associate
Red Hat Customer
Or login using a Red Hat Bugzilla account
Forgot Password
Login:
Hide Forgot
Create an Account
Red Hat Bugzilla – Attachment 295196 Details for
Bug 429508
update vym
[?]
New
Simple Search
Advanced Search
My Links
Browse
Requests
Reports
Current State
Search
Tabular reports
Graphical reports
Duplicates
Other Reports
User Changes
Plotly Reports
Bug Status
Bug Severity
Non-Defaults
|
Product Dashboard
Help
Page Help!
Bug Writing Guidelines
What's new
Browser Support Policy
5.0.4.rh83 Release notes
FAQ
Guides index
User guide
Web Services
Contact
Legal
This site requires JavaScript to be enabled to function correctly, please enable it.
[patch]
Fix for vym build in RHEL-5
vym-1.10.0-RHEL5.diff (text/plain), 21.27 KB, created by
Lubomir Kundrak
on 2008-02-18 19:24:45 UTC
(
hide
)
Description:
Fix for vym build in RHEL-5
Filename:
MIME Type:
Creator:
Lubomir Kundrak
Created:
2008-02-18 19:24:45 UTC
Size:
21.27 KB
patch
obsolete
>diff -Nur vym-1.10.0-1.el5.src.rpm/vym-1.10.0-qt42.patch vym-1.10.0-1.el5.1.src.rpm/vym-1.10.0-qt42.patch >--- vym-1.10.0-1.el5.src.rpm/vym-1.10.0-qt42.patch 1970-01-01 01:00:00.000000000 +0100 >+++ vym-1.10.0-1.el5.1.src.rpm/vym-1.10.0-qt42.patch 2008-02-18 20:22:51.000000000 +0100 >@@ -0,0 +1,632 @@ >+qt-4.2 can't compile stuff generated by qt-4.3's designer. >+This is rougly what 4.2's designer generates. >+ >+Lubomir Kundrak <lkundrak@redhat.com> >+ >+diff -urp vym-1.10.0.orig/branchpropwindow.ui vym-1.10.0/branchpropwindow.ui >+--- vym-1.10.0.orig/branchpropwindow.ui 2007-05-02 17:31:17.000000000 +0200 >++++ vym-1.10.0/branchpropwindow.ui 2008-02-18 20:02:38.000000000 +0100 >+@@ -5,14 +5,20 @@ >+ <rect> >+ <x>0</x> >+ <y>0</y> >+- <width>257</width> >+- <height>334</height> >++ <width>263</width> >++ <height>354</height> >+ </rect> >+ </property> >+ <property name="windowTitle" > >+ <string>Branch Property Editor</string> >+ </property> >+ <layout class="QVBoxLayout" > >++ <property name="margin" > >++ <number>9</number> >++ </property> >++ <property name="spacing" > >++ <number>6</number> >++ </property> >+ <item> >+ <widget class="QTabWidget" name="tabWidget" > >+ <property name="currentIndex" > >+@@ -23,20 +29,11 @@ >+ <string>Frame</string> >+ </attribute> >+ <layout class="QVBoxLayout" > >+- <property name="spacing" > >+- <number>6</number> >+- </property> >+- <property name="leftMargin" > >+- <number>9</number> >+- </property> >+- <property name="topMargin" > >+- <number>9</number> >+- </property> >+- <property name="rightMargin" > >++ <property name="margin" > >+ <number>9</number> >+ </property> >+- <property name="bottomMargin" > >+- <number>9</number> >++ <property name="spacing" > >++ <number>6</number> >+ </property> >+ <item> >+ <widget class="QGroupBox" name="groupBox" > >+@@ -44,10 +41,18 @@ >+ <string>Geometry</string> >+ </property> >+ <layout class="QGridLayout" > >++ <property name="margin" > >++ <number>9</number> >++ </property> >++ <property name="spacing" > >++ <number>6</number> >++ </property> >+ <item row="0" column="0" colspan="4" > >+ <widget class="QComboBox" name="frameTypeCombo" > >+ <property name="sizePolicy" > >+- <sizepolicy vsizetype="Fixed" hsizetype="Expanding" > >++ <sizepolicy> >++ <hsizetype>0</hsizetype> >++ <vsizetype>0</vsizetype> >+ <horstretch>0</horstretch> >+ <verstretch>0</verstretch> >+ </sizepolicy> >+@@ -118,25 +123,18 @@ >+ </item> >+ <item> >+ <layout class="QVBoxLayout" > >+- <property name="spacing" > >+- <number>6</number> >+- </property> >+- <property name="leftMargin" > >+- <number>0</number> >+- </property> >+- <property name="topMargin" > >++ <property name="margin" > >+ <number>0</number> >+ </property> >+- <property name="rightMargin" > >+- <number>0</number> >+- </property> >+- <property name="bottomMargin" > >+- <number>0</number> >++ <property name="spacing" > >++ <number>6</number> >+ </property> >+ <item> >+ <widget class="QGroupBox" name="colorGroupBox" > >+ <property name="sizePolicy" > >+- <sizepolicy vsizetype="Preferred" hsizetype="Expanding" > >++ <sizepolicy> >++ <hsizetype>0</hsizetype> >++ <vsizetype>0</vsizetype> >+ <horstretch>0</horstretch> >+ <verstretch>0</verstretch> >+ </sizepolicy> >+@@ -145,22 +143,10 @@ >+ <string>Colors</string> >+ </property> >+ <layout class="QGridLayout" > >+- <property name="leftMargin" > >+- <number>7</number> >+- </property> >+- <property name="topMargin" > >+- <number>7</number> >+- </property> >+- <property name="rightMargin" > >+- <number>7</number> >++ <property name="margin" > >++ <number>9</number> >+ </property> >+- <property name="bottomMargin" > >+- <number>7</number> >+- </property> >+- <property name="horizontalSpacing" > >+- <number>6</number> >+- </property> >+- <property name="verticalSpacing" > >++ <property name="spacing" > >+ <number>6</number> >+ </property> >+ <item row="0" column="0" > >+@@ -179,7 +165,9 @@ >+ <item row="0" column="1" > >+ <widget class="QLabel" name="penColorLabelDesc" > >+ <property name="sizePolicy" > >+- <sizepolicy vsizetype="Preferred" hsizetype="Expanding" > >++ <sizepolicy> >++ <hsizetype>0</hsizetype> >++ <vsizetype>0</vsizetype> >+ <horstretch>0</horstretch> >+ <verstretch>0</verstretch> >+ </sizepolicy> >+@@ -240,8 +228,20 @@ >+ <string>Layout</string> >+ </attribute> >+ <layout class="QVBoxLayout" > >++ <property name="margin" > >++ <number>9</number> >++ </property> >++ <property name="spacing" > >++ <number>6</number> >++ </property> >+ <item> >+ <layout class="QVBoxLayout" > >++ <property name="margin" > >++ <number>0</number> >++ </property> >++ <property name="spacing" > >++ <number>6</number> >++ </property> >+ <item> >+ <widget class="QCheckBox" name="incImgHor" > >+ <property name="text" > >+@@ -278,6 +278,12 @@ >+ <string>Link</string> >+ </attribute> >+ <layout class="QVBoxLayout" > >++ <property name="margin" > >++ <number>9</number> >++ </property> >++ <property name="spacing" > >++ <number>6</number> >++ </property> >+ <item> >+ <widget class="QCheckBox" name="hideLinkIfUnselected" > >+ <property name="text" > >+@@ -317,20 +323,11 @@ >+ </item> >+ <item> >+ <layout class="QHBoxLayout" > >+- <property name="spacing" > >+- <number>6</number> >+- </property> >+- <property name="leftMargin" > >++ <property name="margin" > >+ <number>0</number> >+ </property> >+- <property name="topMargin" > >+- <number>0</number> >+- </property> >+- <property name="rightMargin" > >+- <number>0</number> >+- </property> >+- <property name="bottomMargin" > >+- <number>0</number> >++ <property name="spacing" > >++ <number>6</number> >+ </property> >+ <item> >+ <spacer> >+diff -urp vym-1.10.0.orig/exportxhtmldialog.ui vym-1.10.0/exportxhtmldialog.ui >+--- vym-1.10.0.orig/exportxhtmldialog.ui 2007-07-23 14:42:01.000000000 +0200 >++++ vym-1.10.0/exportxhtmldialog.ui 2008-02-18 20:02:38.000000000 +0100 >+@@ -6,7 +6,7 @@ >+ <x>0</x> >+ <y>0</y> >+ <width>588</width> >+- <height>523</height> >++ <height>521</height> >+ </rect> >+ </property> >+ <property name="minimumSize" > >+@@ -19,27 +19,26 @@ >+ <string>Export XHTML</string> >+ </property> >+ <layout class="QVBoxLayout" > >++ <property name="margin" > >++ <number>11</number> >++ </property> >++ <property name="spacing" > >++ <number>6</number> >++ </property> >+ <item> >+ <layout class="QHBoxLayout" > >++ <property name="margin" > >++ <number>11</number> >++ </property> >+ <property name="spacing" > >+ <number>6</number> >+ </property> >+- <property name="leftMargin" > >+- <number>0</number> >+- </property> >+- <property name="topMargin" > >+- <number>0</number> >+- </property> >+- <property name="rightMargin" > >+- <number>0</number> >+- </property> >+- <property name="bottomMargin" > >+- <number>0</number> >+- </property> >+ <item> >+ <widget class="QLabel" name="textLabel1" > >+ <property name="sizePolicy" > >+- <sizepolicy vsizetype="Preferred" hsizetype="Minimum" > >++ <sizepolicy> >++ <hsizetype>0</hsizetype> >++ <vsizetype>0</vsizetype> >+ <horstretch>0</horstretch> >+ <verstretch>0</verstretch> >+ </sizepolicy> >+@@ -52,7 +51,9 @@ >+ <item> >+ <widget class="QLineEdit" name="lineEditDir" > >+ <property name="sizePolicy" > >+- <sizepolicy vsizetype="Fixed" hsizetype="Expanding" > >++ <sizepolicy> >++ <hsizetype>0</hsizetype> >++ <vsizetype>0</vsizetype> >+ <horstretch>0</horstretch> >+ <verstretch>0</verstretch> >+ </sizepolicy> >+@@ -62,7 +63,9 @@ >+ <item> >+ <widget class="QPushButton" name="browseExportDirButton" > >+ <property name="sizePolicy" > >+- <sizepolicy vsizetype="Fixed" hsizetype="Fixed" > >++ <sizepolicy> >++ <hsizetype>0</hsizetype> >++ <vsizetype>0</vsizetype> >+ <horstretch>0</horstretch> >+ <verstretch>0</verstretch> >+ </sizepolicy> >+@@ -77,7 +80,9 @@ >+ <item> >+ <widget class="Q3ButtonGroup" name="buttonGroup2" > >+ <property name="sizePolicy" > >+- <sizepolicy vsizetype="Preferred" hsizetype="Preferred" > >++ <sizepolicy> >++ <hsizetype>0</hsizetype> >++ <vsizetype>0</vsizetype> >+ <horstretch>0</horstretch> >+ <verstretch>0</verstretch> >+ </sizepolicy> >+@@ -104,7 +109,9 @@ >+ </rect> >+ </property> >+ <property name="sizePolicy" > >+- <sizepolicy vsizetype="Fixed" hsizetype="Minimum" > >++ <sizepolicy> >++ <hsizetype>0</hsizetype> >++ <vsizetype>0</vsizetype> >+ <horstretch>0</horstretch> >+ <verstretch>0</verstretch> >+ </sizepolicy> >+@@ -123,21 +130,12 @@ >+ </rect> >+ </property> >+ <layout class="QVBoxLayout" > >++ <property name="margin" > >++ <number>11</number> >++ </property> >+ <property name="spacing" > >+ <number>6</number> >+ </property> >+- <property name="leftMargin" > >+- <number>0</number> >+- </property> >+- <property name="topMargin" > >+- <number>0</number> >+- </property> >+- <property name="rightMargin" > >+- <number>0</number> >+- </property> >+- <property name="bottomMargin" > >+- <number>0</number> >+- </property> >+ <item> >+ <widget class="QCheckBox" name="imageButton" > >+ <property name="text" > >+@@ -179,45 +177,26 @@ >+ <enum>Qt::Vertical</enum> >+ </property> >+ <layout class="QGridLayout" > >+- <property name="leftMargin" > >++ <property name="margin" > >+ <number>11</number> >+ </property> >+- <property name="topMargin" > >+- <number>11</number> >+- </property> >+- <property name="rightMargin" > >+- <number>11</number> >+- </property> >+- <property name="bottomMargin" > >+- <number>11</number> >+- </property> >+- <property name="horizontalSpacing" > >+- <number>6</number> >+- </property> >+- <property name="verticalSpacing" > >++ <property name="spacing" > >+ <number>6</number> >+ </property> >+ <item row="1" column="0" > >+ <layout class="QHBoxLayout" > >++ <property name="margin" > >++ <number>11</number> >++ </property> >+ <property name="spacing" > >+ <number>6</number> >+ </property> >+- <property name="leftMargin" > >+- <number>0</number> >+- </property> >+- <property name="topMargin" > >+- <number>0</number> >+- </property> >+- <property name="rightMargin" > >+- <number>0</number> >+- </property> >+- <property name="bottomMargin" > >+- <number>0</number> >+- </property> >+ <item> >+ <widget class="QLabel" name="textLabel2" > >+ <property name="sizePolicy" > >+- <sizepolicy vsizetype="Preferred" hsizetype="Fixed" > >++ <sizepolicy> >++ <hsizetype>0</hsizetype> >++ <vsizetype>0</vsizetype> >+ <horstretch>0</horstretch> >+ <verstretch>0</verstretch> >+ </sizepolicy> >+@@ -242,7 +221,9 @@ >+ <item> >+ <widget class="QPushButton" name="browseXSLButton" > >+ <property name="sizePolicy" > >+- <sizepolicy vsizetype="Fixed" hsizetype="Fixed" > >++ <sizepolicy> >++ <hsizetype>0</hsizetype> >++ <vsizetype>0</vsizetype> >+ <horstretch>0</horstretch> >+ <verstretch>0</verstretch> >+ </sizepolicy> >+@@ -256,25 +237,18 @@ >+ </item> >+ <item row="0" column="0" > >+ <layout class="QHBoxLayout" > >++ <property name="margin" > >++ <number>11</number> >++ </property> >+ <property name="spacing" > >+ <number>6</number> >+ </property> >+- <property name="leftMargin" > >+- <number>0</number> >+- </property> >+- <property name="topMargin" > >+- <number>0</number> >+- </property> >+- <property name="rightMargin" > >+- <number>0</number> >+- </property> >+- <property name="bottomMargin" > >+- <number>0</number> >+- </property> >+ <item> >+ <widget class="QLabel" name="textLabel1_2" > >+ <property name="sizePolicy" > >+- <sizepolicy vsizetype="Preferred" hsizetype="Fixed" > >++ <sizepolicy> >++ <hsizetype>0</hsizetype> >++ <vsizetype>0</vsizetype> >+ <horstretch>0</horstretch> >+ <verstretch>0</verstretch> >+ </sizepolicy> >+@@ -299,7 +273,9 @@ >+ <item> >+ <widget class="QPushButton" name="browseCSSButton" > >+ <property name="sizePolicy" > >+- <sizepolicy vsizetype="Fixed" hsizetype="Fixed" > >++ <sizepolicy> >++ <hsizetype>0</hsizetype> >++ <vsizetype>0</vsizetype> >+ <horstretch>0</horstretch> >+ <verstretch>0</verstretch> >+ </sizepolicy> >+@@ -323,45 +299,26 @@ >+ <enum>Qt::Vertical</enum> >+ </property> >+ <layout class="QGridLayout" > >+- <property name="leftMargin" > >+- <number>11</number> >+- </property> >+- <property name="topMargin" > >+- <number>11</number> >+- </property> >+- <property name="rightMargin" > >++ <property name="margin" > >+ <number>11</number> >+ </property> >+- <property name="bottomMargin" > >+- <number>11</number> >+- </property> >+- <property name="horizontalSpacing" > >+- <number>6</number> >+- </property> >+- <property name="verticalSpacing" > >++ <property name="spacing" > >+ <number>6</number> >+ </property> >+ <item row="0" column="0" > >+ <layout class="QHBoxLayout" > >++ <property name="margin" > >++ <number>11</number> >++ </property> >+ <property name="spacing" > >+ <number>6</number> >+ </property> >+- <property name="leftMargin" > >+- <number>0</number> >+- </property> >+- <property name="topMargin" > >+- <number>0</number> >+- </property> >+- <property name="rightMargin" > >+- <number>0</number> >+- </property> >+- <property name="bottomMargin" > >+- <number>0</number> >+- </property> >+ <item> >+ <widget class="QLabel" name="textLabel1_3" > >+ <property name="sizePolicy" > >+- <sizepolicy vsizetype="Preferred" hsizetype="Fixed" > >++ <sizepolicy> >++ <hsizetype>0</hsizetype> >++ <vsizetype>0</vsizetype> >+ <horstretch>0</horstretch> >+ <verstretch>0</verstretch> >+ </sizepolicy> >+@@ -386,7 +343,9 @@ >+ <item> >+ <widget class="QPushButton" name="browsePreExportButton" > >+ <property name="sizePolicy" > >+- <sizepolicy vsizetype="Fixed" hsizetype="Fixed" > >++ <sizepolicy> >++ <hsizetype>0</hsizetype> >++ <vsizetype>0</vsizetype> >+ <horstretch>0</horstretch> >+ <verstretch>0</verstretch> >+ </sizepolicy> >+@@ -400,25 +359,18 @@ >+ </item> >+ <item row="1" column="0" > >+ <layout class="QHBoxLayout" > >++ <property name="margin" > >++ <number>11</number> >++ </property> >+ <property name="spacing" > >+ <number>6</number> >+ </property> >+- <property name="leftMargin" > >+- <number>0</number> >+- </property> >+- <property name="topMargin" > >+- <number>0</number> >+- </property> >+- <property name="rightMargin" > >+- <number>0</number> >+- </property> >+- <property name="bottomMargin" > >+- <number>0</number> >+- </property> >+ <item> >+ <widget class="QLabel" name="textLabel2_2" > >+ <property name="sizePolicy" > >+- <sizepolicy vsizetype="Preferred" hsizetype="Fixed" > >++ <sizepolicy> >++ <hsizetype>0</hsizetype> >++ <vsizetype>0</vsizetype> >+ <horstretch>0</horstretch> >+ <verstretch>0</verstretch> >+ </sizepolicy> >+@@ -446,7 +398,9 @@ >+ <item> >+ <widget class="QPushButton" name="browsePostExportButton" > >+ <property name="sizePolicy" > >+- <sizepolicy vsizetype="Fixed" hsizetype="Fixed" > >++ <sizepolicy> >++ <hsizetype>0</hsizetype> >++ <vsizetype>0</vsizetype> >+ <horstretch>0</horstretch> >+ <verstretch>0</verstretch> >+ </sizepolicy> >+@@ -479,6 +433,12 @@ >+ </item> >+ <item> >+ <layout class="QHBoxLayout" > >++ <property name="margin" > >++ <number>11</number> >++ </property> >++ <property name="spacing" > >++ <number>6</number> >++ </property> >+ <item> >+ <spacer> >+ <property name="orientation" > >+diff -urp vym-1.10.0.orig/historywindow.ui vym-1.10.0/historywindow.ui >+--- vym-1.10.0.orig/historywindow.ui 2007-05-17 22:19:03.000000000 +0200 >++++ vym-1.10.0/historywindow.ui 2008-02-18 20:02:38.000000000 +0100 >+@@ -5,7 +5,7 @@ >+ <rect> >+ <x>0</x> >+ <y>0</y> >+- <width>1160</width> >++ <width>790</width> >+ <height>340</height> >+ </rect> >+ </property> >+@@ -13,22 +13,10 @@ >+ <string>Dialog</string> >+ </property> >+ <layout class="QGridLayout" > >+- <property name="leftMargin" > >++ <property name="margin" > >+ <number>9</number> >+ </property> >+- <property name="topMargin" > >+- <number>9</number> >+- </property> >+- <property name="rightMargin" > >+- <number>9</number> >+- </property> >+- <property name="bottomMargin" > >+- <number>9</number> >+- </property> >+- <property name="horizontalSpacing" > >+- <number>6</number> >+- </property> >+- <property name="verticalSpacing" > >++ <property name="spacing" > >+ <number>6</number> >+ </property> >+ <item row="0" column="0" > >+@@ -88,20 +76,11 @@ >+ </item> >+ <item row="4" column="0" colspan="2" > >+ <layout class="QHBoxLayout" > >+- <property name="spacing" > >+- <number>6</number> >+- </property> >+- <property name="leftMargin" > >++ <property name="margin" > >+ <number>0</number> >+ </property> >+- <property name="topMargin" > >+- <number>0</number> >+- </property> >+- <property name="rightMargin" > >+- <number>0</number> >+- </property> >+- <property name="bottomMargin" > >+- <number>0</number> >++ <property name="spacing" > >++ <number>6</number> >+ </property> >+ <item> >+ <spacer> >+diff -urp vym-1.10.0.orig/showtextdialog.ui vym-1.10.0/showtextdialog.ui >+--- vym-1.10.0.orig/showtextdialog.ui 2006-09-06 14:47:06.000000000 +0200 >++++ vym-1.10.0/showtextdialog.ui 2008-02-18 20:02:38.000000000 +0100 >+@@ -1,7 +1,4 @@ >+ <ui version="4.0" > >+- <author></author> >+- <comment></comment> >+- <exportmacro></exportmacro> >+ <class>ShowTextDialog</class> >+ <widget class="QDialog" name="ShowTextDialog" > >+ <property name="geometry" > >+@@ -57,7 +54,6 @@ >+ </item> >+ </layout> >+ </widget> >+- <pixmapfunction></pixmapfunction> >+ <resources/> >+ <connections> >+ <connection> >diff -Nur vym-1.10.0-1.el5.src.rpm/vym.spec vym-1.10.0-1.el5.1.src.rpm/vym.spec >--- vym-1.10.0-1.el5.src.rpm/vym.spec 2008-02-18 20:22:51.000000000 +0100 >+++ vym-1.10.0-1.el5.1.src.rpm/vym.spec 2008-02-18 20:22:51.000000000 +0100 >@@ -1,6 +1,6 @@ > Name: vym > Version: 1.10.0 >-Release: 1%{?dist} >+Release: 1%{?dist}.1 > Summary: View your mind > > Group: Applications/Productivity >@@ -11,6 +11,7 @@ > Patch0: vym-1.10.0-dir-vars.patch > Patch1: vym-1.10.0-docdir-searchList.patch > Patch2: vym-1.10.0-xdg-open.patch >+Patch3: vym-1.10.0-qt42.patch > BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) > > BuildRequires: qt4-devel libXext-devel desktop-file-utils >@@ -27,6 +28,7 @@ > %patch0 > %patch1 > %patch2 >+%patch3 -p1 > > %build > >@@ -84,6 +86,9 @@ > %{_datadir}/icons/hicolor/128x128/apps/%{name}.png > > %changelog >+* Mon Feb 18 2008 Lubomir Kundrak <lkundrak@redhat.com> - 1.10.0-1.1 >+- Fix build with RHEL-5's qt-4.2 (#429508) >+ > * Thu Oct 18 2007 Jon Ciesla <limb@jcomserv.net> - 1.10.0-1 > - Upgrade to 1.10.0. > - Applied several patches from Till Maas, which he sent upstream.
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
Attachments on
bug 429508
:
294497
| 295196