Compare commits

...
Sign in to create a new pull request.

14 commits

Author SHA1 Message Date
Jon Ciesla
fc2bbc03bb Requires fix. 2012-03-07 07:50:24 -06:00
Fedora Release Engineering
076d493010 dist-git conversion 2010-07-29 15:10:35 +00:00
Bill Nottingham
b089b3dfd5 Fix typo that causes a failure to update the common directory. (releng
#2781)
2009-11-26 01:16:12 +00:00
47a22b66c1 BZ 434929. 2008-06-12 18:55:12 +00:00
05f784bdea x86_64 fix 2008-02-18 21:27:31 +00:00
2129e30e69 Forgot to cvs-import... I should refrain from doing this while not at my
senses.
2008-02-18 21:10:23 +00:00
316b1b97d5 Fix patch 2008-02-18 21:07:57 +00:00
4ef2205679 LKundrak qt42 fix. 2008-02-18 19:35:16 +00:00
b332fc0438 qmake path fix. 2008-01-28 15:45:33 +00:00
0322aca312 EL-5 qmake fix. 2008-01-28 14:32:36 +00:00
f60c2877af Update to 1.10.0, BZ 429508 2008-01-28 12:52:13 +00:00
dcd087b22e License tag correction. 2007-08-16 17:34:14 +00:00
f5fe9377f5 Initialize branch EL-5 for vym 2007-05-27 03:44:42 +00:00
64277cbe62 Initial import. 2007-03-21 19:00:09 +00:00
19 changed files with 1033 additions and 21 deletions

View file

1
.gitignore vendored Normal file
View file

@ -0,0 +1 @@
vym-1.10.0.tar.bz2

View file

@ -1,21 +0,0 @@
# Makefile for source rpm: vym
# $Id$
NAME := vym
SPECFILE = $(firstword $(wildcard *.spec))
define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef
MAKEFILE_COMMON := $(shell $(find-makefile-common))
ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
endef
MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
endif
include $(MAKEFILE_COMMON)

View file

@ -0,0 +1 @@
188f08f2e0af5e122e2613351f3b92d9 vym-1.10.0.tar.bz2

View file

@ -0,0 +1,10 @@
--- editxlinkdialog.cpp 2008-01-09 13:38:11.000000000 -0600
+++ editxlinkdialog.cpp 2008-01-09 13:38:11.000000000 -0600
@@ -1,6 +1,7 @@
#include "editxlinkdialog.h"
#include <QColorDialog>
+#include <typeinfo>
EditXLinkDialog::EditXLinkDialog (QWidget *parent):QDialog (parent)
{

View file

@ -0,0 +1,10 @@
--- mainwindow.cpp~ 2008-01-09 13:40:12.000000000 -0600
+++ mainwindow.cpp 2008-01-09 13:40:12.000000000 -0600
@@ -3,6 +3,7 @@
#include <QtGui>
#include <iostream>
+#include <typeinfo>
#include "aboutdialog.h"
#include "branchpropwindow.h"

View file

@ -0,0 +1,11 @@
--- selection.cpp 2008-01-09 13:39:27.000000000 -0600
+++ selection.cpp 2008-01-09 13:39:27.000000000 -0600
@@ -2,7 +2,7 @@
#include "mainwindow.h"
#include "mapeditor.h"
-
+#include <typeinfo>
extern Main *mainWindow;

View file

@ -0,0 +1,10 @@
--- xml-vym.cpp 2008-01-09 13:37:09.000000000 -0600
+++ xml-vym.cpp 2008-01-09 13:37:09.000000000 -0600
@@ -4,6 +4,7 @@
#include <QColor>
#include <QTextStream>
#include <iostream>
+#include <typeinfo>
#include "misc.h"
#include "settings.h"

60
vym-1.10.0-dir-vars.patch Normal file
View file

@ -0,0 +1,60 @@
Author: Till Maas <opensource till name>
License: same as vym
Define more variables to make it easier to configure the path where
the parts of vym should be installed, e.g. the prefix (PREFIX is imho
more ofen used than INSTALLDIR) and DOCDIR.
diff -up vym-1.10.0/vym.pro.dir-vars vym-1.10.0/vym.pro
--- vym.pro 2007-07-30 11:47:12.000000000 +0200
+++ vym.pro 2007-10-18 21:55:44.000000000 +0200
@@ -121,26 +121,42 @@ TRANSLATIONS += lang/vym_en.ts
TRANSLATIONS += lang/vym_es.ts
TRANSLATIONS += lang/vym_it.ts
-count( INSTALLDIR, 0 ) {
- INSTALLDIR = /usr/local
+isEmpty( PREFIX ) {
+ PREFIX = /usr/local
+ count( INSTALLDIR, 1 ) {
+ PREFIX = $${INSTALLDIR}
+ message( "Please use PREFIX instead of INSTALLDIR" )
+ }
+}
+isEmpty( BINDIR ) {
+ BINDIR = $${PREFIX}/bin
+}
+isEmpty( DATADIR ) {
+ DATADIR = $${PREFIX}/share
+}
+isEmpty( DOCDIR ) {
+ DOCDIR = $${DATADIR}/doc/packages/vym
+}
+isEmpty( DEMODIR ) {
+ DEMODIR = $${DOCDIR}
}
message( "Installation directory" )
-message( $$INSTALLDIR )
+message( $$PREFIX )
-target.path = $${INSTALLDIR}/bin
+target.path = $${BINDIR}
INSTALLS += target
support.files = styles/ scripts/ icons/ flags/ lang/ macros/ exports/
-support.path = $${INSTALLDIR}/share/vym
+support.path = $${DATADIR}/vym
INSTALLS += support
doc.files = tex/vym.pdf
-doc.path = $${INSTALLDIR}/share/doc/packages/vym
+doc.path = $${DOCDIR}
INSTALLS += doc
demo.files = demos/
-demo.path = $${INSTALLDIR}/share/doc/packages/vym
+demo.path = $${DEMODIR}
INSTALLS += demo

View file

@ -0,0 +1,34 @@
Author: Till Maas <opensource till name>
License: same as vym
Add the used DOCDIR when building vym to the searchList when searching the
pdf with the documentation.
diff -up vym-1.10.0/vym.pro.docdir-searchList vym-1.10.0/vym.pro
--- vym.pro 2007-10-18 23:43:25.000000000 +0200
+++ vym.pro 2007-10-18 23:43:25.000000000 +0200
@@ -152,9 +152,10 @@ support.files = styles/ scripts/ icons/
support.path = $${DATADIR}/vym
INSTALLS += support
-doc.files = tex/vym.pdf
+doc.files = tex/vym.pdf
doc.path = $${DOCDIR}
INSTALLS += doc
+DEFINES += VYM_DOCDIR=\\\"$${DOCDIR}\\\"
demo.files = demos/
demo.path = $${DEMODIR}
diff -up vym-1.10.0/mainwindow.cpp.docdir-searchList vym-1.10.0/mainwindow.cpp
--- mainwindow.cpp 2007-09-04 15:53:33.000000000 +0200
+++ mainwindow.cpp 2007-10-18 23:44:51.000000000 +0200
@@ -3629,6 +3629,9 @@ void Main::helpDoc()
#if defined(Q_OS_MACX)
searchList << "./vym.app/Contents/Resources/doc";
#else
+ #if defined(VYM_DOCDIR)
+ searchList << VYM_DOCDIR;
+ #endif
// default path in SUSE LINUX
searchList <<"/usr/share/doc/packages/vym";
#endif

View file

@ -0,0 +1,10 @@
--- ornamentedobj.cpp 2008-01-09 13:43:37.000000000 -0600
+++ ornamentedobj.cpp 2008-01-09 13:43:37.000000000 -0600
@@ -2,6 +2,7 @@
#include "texteditor.h"
#include "mapeditor.h"
#include "linkablemapobj.h"
+#include <typeinfo>
extern TextEditor *textEditor;
extern FlagRowObj *systemFlagsDefault;

632
vym-1.10.0-qt42.patch Normal file
View file

@ -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>

27
vym-1.10.0-xdg-open.patch Normal file
View file

@ -0,0 +1,27 @@
Author: Till Maas <opensource till name>
License: same as vym
This makes vym use xdg-open instead of konqueror or acroread by default to
open an URL or a PDF-document.
diff -up vym-1.10.0/mainwindow.cpp.xdg-open vym-1.10.0/mainwindow.cpp
--- mainwindow.cpp 2007-10-18 23:36:22.000000000 +0200
+++ mainwindow.cpp 2007-10-18 23:38:02.000000000 +0200
@@ -135,7 +135,7 @@ Main::Main(QWidget* parent, const char*
// application to open URLs
p="/mainwindow/readerURL";
#if defined(Q_OS_LINUX)
- s=settings.value (p,"konqueror").toString();
+ s=settings.value (p,"xdg-open").toString();
#else
#if defined(Q_OS_MACX)
s=settings.value (p,"/usr/bin/open").toString();
@@ -148,7 +148,7 @@ Main::Main(QWidget* parent, const char*
// application to open PDFs
p="/mainwindow/readerPDF";
#if defined(Q_OS_LINUX)
- s=settings.value (p,"acroread").toString();
+ s=settings.value (p,"xdg-open").toString();
#else
#if defined(Q_OS_MACX)
s=settings.value (p,"/usr/bin/open").toString();

20
vym-mainwindow.patch Normal file
View file

@ -0,0 +1,20 @@
--- mainwindow.cpp 2007-03-21 10:31:33.000000000 -0500
+++ mainwindow.cpp 2007-03-21 10:36:12.000000000 -0500
@@ -2764,7 +2764,7 @@
docpath="./vym.app/Contents/vym.pdf";
#else
// default path in SUSE LINUX
- docpath="/usr/share/doc/packages/vym/doc/vym.pdf";
+ docpath="/usr/share/doc/vym-1.8.1/doc/vym.pdf";
#endif
if (!QFile (docpath).exists() )
@@ -2778,7 +2778,7 @@
if (!QFile (docpath).exists() )
{
// Try yet another one for Knoppix
- docpath="/usr/share/doc/packages/vym/vym.pdf";
+ docpath="/usr/share/doc/vym-1.8.1/vym.pdf";
if (!QFile (docpath).exists() )
{
QMessageBox::critical(0,

16
vym-pro.patch Normal file
View file

@ -0,0 +1,16 @@
--- vym.pro 2007-03-21 10:31:33.000000000 -0500
+++ vym.pro 2007-03-21 10:36:44.000000000 -0500
@@ -101,11 +101,11 @@
INSTALLS += support
doc.files = tex/vym.pdf
-doc.path = $${INSTALLDIR}/share/doc/packages/vym
+doc.path = $${INSTALLDIR}/share/doc/vym-1.8.1
INSTALLS += doc
demo.files = demos/
-demo.path = $${INSTALLDIR}/share/doc/packages/vym
+demo.path = $${INSTALLDIR}/share/doc/vym-1.8.1
INSTALLS += demo
exports.files = exports/

20
vym-tex.patch Normal file
View file

@ -0,0 +1,20 @@
--- tex/vym.tex 2007-03-21 10:31:32.000000000 -0500
+++ tex/vym.tex 2007-03-21 10:38:28.000000000 -0500
@@ -500,7 +500,7 @@
paste it from your browser). Examples for valid paths are:
\begin{verbatim}
http://www.insilmaril.de/vym/index.html
- file:/usr/share/doc/packages/vym/doc/vym.pdf
+ file:/usr/share/doc/vym-1.8.1/doc/vym.pdf
\end{verbatim}
If an URL was entered, a little globe will appear in the branch. By
clicking on the globe in the toolbar or the context menu an external
@@ -1117,7 +1117,7 @@
Together with \vym you should have received a directory with several
maps e.g. on SUSE~LINUX this is
\begin{center}
- {\tt /usr/share/doc/packages/vym/demos}
+ {\tt /usr/share/doc/vym-1.8.1/demos}
\end{center}
where you find the map {\tt todo.vym}. It lists quite a lot of things to
be done in future. If you have more ideas, contact the development team

9
vym.desktop Normal file
View file

@ -0,0 +1,9 @@
[Desktop Entry]
Encoding=UTF-8
Name=Vym
Comment=View your mind
Exec=vym
Icon=vym.png
Terminal=false
Type=Application
Categories=Qt;KDE;Office;

154
vym.spec Normal file
View file

@ -0,0 +1,154 @@
Name: vym
Version: 1.10.0
Release: 5%{?dist}
Summary: View your mind
Group: Applications/Productivity
License: GPLv2+
URL: http://www.insilmaril.de/vym/
Source0: http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.bz2
Source1: %{name}.desktop
Source2: vym.xml
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-0.10.0-editxlinkdialog-typeinfo.patch
Patch4: vym-0.10.0-selection-typeinfo.patch
Patch5: vym-0.10.0-mainwindow-typeinfo.patch
Patch6: vym-0.10.0-xml-vym-typeinfo.patch
Patch7: vym-1.10.0-ornamentedobj-typeinfo.patch
Patch8: vym-1.10.0-qt42.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: qt4-devel libXext-devel desktop-file-utils
# For file operations, we use command-line utilities.
Requires: coreutils zip unzip
%description
VYM (View Your Mind) is a tool to generate and manipulate maps
which show your thoughts. Such maps can help you to improve
your creativity and effectivity. You can use them for time management,
to organize tasks, to get an overview over complex contexts.
%prep
%setup -q
%patch0
%patch1
%patch2
%patch3 -p0
%patch4 -p0
%patch5 -p0
%patch6 -p0
%patch7 -p0
%patch8 -p1
%build
%{_libdir}/qt4/bin/qmake DOCDIR="%{_docdir}/%{name}-%{version}" PREFIX=%{_prefix}
%{__make} %{?_smp_mflags}
%install
%{__rm} -rf %{buildroot}
%{__make} install INSTALL_ROOT=%{buildroot} COPY="%{__cp} -p -f"
%{__mkdir} -p %{buildroot}%{_datadir}/applications/
desktop-file-install --vendor fedora \
--dir %{buildroot}%{_datadir}/applications \
%{SOURCE1}
%{__mkdir} -p %{buildroot}%{_datadir}/icons/hicolor/16x16/apps
%{__cp} -p icons/%{name}-16x16.png %{buildroot}%{_datadir}/icons/hicolor/16x16/apps/%{name}.png
%{__cp} -p icons/%{name}.xpm %{buildroot}%{_datadir}/icons/hicolor/16x16/apps/%{name}.xpm
%{__mkdir} -p %{buildroot}%{_datadir}/icons/hicolor/128x128/apps
%{__cp} -p icons/%{name}-128x128.png %{buildroot}%{_datadir}/icons/hicolor/128x128/apps/%{name}.png
%{__mkdir} -p %{buildroot}%{_datadir}/icons/hicolor/48x48/apps
%{__cp} -p icons/%{name}.png %{buildroot}%{_datadir}/icons/hicolor/48x48/apps/%{name}.png
%{__cp} -p icons/%{name}-editor.png %{buildroot}%{_datadir}/icons/hicolor/48x48/apps/%{name}-editor.png
install -m a+rx,u+w -d %{buildroot}%{_datadir}/mime/packages
install -p -m a+r,u+w %{SOURCE2} %{buildroot}%{_datadir}/mime/packages/vym.xml
%clean
%{__rm} -rf %{buildroot}
%post
touch --no-create %{_datadir}/icons/hicolor || :
if [ -x %{_bindir}/gtk-update-icon-cache ]; then
%{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
fi
update-desktop-database &> /dev/null || :
%postun
touch --no-create %{_datadir}/icons/hicolor || :
if [ -x %{_bindir}/gtk-update-icon-cache ]; then
%{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
fi
update-desktop-database &> /dev/null || :
%files
%defattr(-,root,root,-)
%doc LICENSE.txt README.txt INSTALL.txt demos/* doc/*
%{_bindir}/%{name}
%{_datadir}/%{name}/
%{_datadir}/applications/fedora-%{name}.desktop
%{_datadir}/icons/hicolor/16x16/apps/%{name}*
%{_datadir}/icons/hicolor/48x48/apps/%{name}*
%{_datadir}/icons/hicolor/128x128/apps/%{name}.png
%{_datadir}/mime/packages/vym.xml
%changelog
* Wed Mar 07 2012 Jon Ciesla <limburgher@gmail.com> - 1.10.0-5
- Require needed utilities, BZ 799006.
* Tue Jun 10 2008 Jon Ciesla <limb@jcomserv.net> - 1.10.0-4
- Added mime type xml, BZ434929.
* Mon Feb 18 2008 Lubomir Kundrak <lkundrak@redhat.com> - 1.10.0-1.3
- Try to fix build on 64bit
* Mon Feb 18 2008 Lubomir Kundrak <lkundrak@redhat.com> - 1.10.0-1.2
- 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.
- Dropped findlang, as it doesn't work with Vym.
* Thu Aug 16 2007 Jon Ciesla <limb@jcomserv.net> - 1.8.1-9
- License tag correction.
* Wed Mar 21 2007 Jon Ciesla <limb@jcomserv.net> - 1.8.1-8
- Converted patches to unified output format.
* Wed Mar 21 2007 Jon Ciesla <limb@jcomserv.net> - 1.8.1-7
- Dropped symlink in favor of path patches.
* Wed Mar 21 2007 Jon Ciesla <limb@jcomserv.net> - 1.8.1-6
- Fixed Source URL.
* Tue Mar 20 2007 Jon Ciesla <limb@jcomserv.net> - 1.8.1-5
- doc link fix, icon fix.
* Mon Mar 19 2007 Jon Ciesla <limb@jcomserv.net> - 1.8.1-4
- Fixed Desktop icon path, make copy timestamps, cleaned scripts.
- Added symlink to fix PDF location.
* Tue Mar 13 2007 Jon Ciesla <limb@jcomserv.net> - 1.8.1-3
- Fixed source url.
- added desktop-file-utils,kdelibs BRs.
- Fixed desktop file handling.
* Tue Mar 13 2007 Jon Ciesla <limb@jcomserv.net> - 1.8.1-2
- Submitting for review.
* Wed Nov 22 2006 Chitlesh Goorah <chitlesh [AT] fedoraproject DOT org > - 1.8.1-1
- Initial Package.

8
vym.xml Normal file
View file

@ -0,0 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<mime-info xmlns="http://www.freedesktop.org/standards/shared-mime-info">
<mime-type type="application/x-vym">
<sub-class-of type="application/zip"/>
<comment>View Your Mind file</comment>
<glob pattern="*.vym"/>
</mime-type>
</mime-info>