Accepting request 403737 from home:MargueriteSu:branches:editors
fix for gcc 6 OBS-URL: https://build.opensuse.org/request/show/403737 OBS-URL: https://build.opensuse.org/package/show/editors/vym?expand=0&rev=45
This commit is contained in:
Martin Pluskal
Git OBS Bridge
parent
08cf06ecba
commit
458df593d6
31
vym-2.5.0-gcc6.patch
Normal file
31
vym-2.5.0-gcc6.patch
Normal file
@ -0,0 +1,31 @@
|
||||
Index: vym-2.5.0/exports.cpp
|
||||
===================================================================
|
||||
--- vym-2.5.0.orig/exports.cpp
|
||||
+++ vym-2.5.0/exports.cpp
|
||||
@@ -556,7 +556,7 @@ void ExportKDE4Bookmarks::doExport()
|
||||
dia.setShowAgainName("/exports/overwrite/KDE4Bookmarks");
|
||||
if (dia.exec()==QDialog::Accepted)
|
||||
{
|
||||
- model->exportXML(tmpDir.path(),false);
|
||||
+ model->exportXML(tmpDir.path(),"",false);
|
||||
|
||||
XSLTProc p;
|
||||
p.setInputFile (tmpDir.path()+"/"+model->getMapName()+".xml");
|
||||
@@ -586,7 +586,7 @@ void ExportFirefoxBookmarks::doExport()
|
||||
dia.setShowAgainName("/vym/warnings/overwriteImportBookmarks");
|
||||
if (dia.exec()==QDialog::Accepted)
|
||||
{
|
||||
- model->exportXML(tmpDir.path(),false);
|
||||
+ model->exportXML(tmpDir.path(),"",false);
|
||||
|
||||
/*
|
||||
XSLTProc p;
|
||||
@@ -998,7 +998,7 @@ void ExportHTML::doExport(bool useDialog
|
||||
////////////////////////////////////////////////////////////////////////
|
||||
void ExportTaskjuggler::doExport()
|
||||
{
|
||||
- model->exportXML(tmpDir.path(),false);
|
||||
+ model->exportXML(tmpDir.path(),"",false);
|
||||
|
||||
XSLTProc p;
|
||||
p.setInputFile (tmpDir.path()+"/"+model->getMapName()+".xml");
|
||||
@ -1,3 +1,11 @@
|
||||
-------------------------------------------------------------------
|
||||
Mon Jun 20 17:01:00 UTC 2016 - i@marguerite.su
|
||||
|
||||
- add patch vym-2.5.0-gcc6.patch
|
||||
* no known conversion for argument 2 from bool to QString,
|
||||
actually the second QString was skipped, the bool value
|
||||
was the 3rd argument.
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Wed Oct 28 08:53:55 UTC 2015 - vym@insilmaril.de
|
||||
|
||||
|
||||
82
vym.spec
82
vym.spec
@ -1,7 +1,7 @@
|
||||
#
|
||||
# spec file for package vym
|
||||
#
|
||||
# Copyright (c) 2015 SUSE LINUX Products GmbH, Nuernberg, Germany.
|
||||
# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany.
|
||||
#
|
||||
# All modifications and additions to the file contributed by third parties
|
||||
# remain the property of their copyright owners, unless otherwise agreed
|
||||
@ -15,30 +15,32 @@
|
||||
# Please submit bugfixes or comments via http://bugs.opensuse.org/
|
||||
#
|
||||
|
||||
Name: vym
|
||||
|
||||
BuildRequires: libQt5Core-devel
|
||||
BuildRequires: libQt5Gui-devel
|
||||
BuildRequires: libqt5-qtbase-devel
|
||||
BuildRequires: libqt5-qtsvg-devel
|
||||
BuildRequires: libqt5-linguist-devel
|
||||
BuildRequires: update-desktop-files
|
||||
Requires: unzip
|
||||
Requires: zip
|
||||
Url: http://www.insilmaril.de/vym/index.html
|
||||
BuildRoot: %{_tmppath}/%{name}-%{version}-build
|
||||
Name: vym
|
||||
Version: 2.5.0
|
||||
Release: 0
|
||||
Summary: View Your Mind - generate and manipulate maps which show your thoughts
|
||||
License: GPL-2.0
|
||||
Group: Productivity/Office/Other
|
||||
Version: 2.5.0
|
||||
Release: 0
|
||||
Source0: %name-%version.tar.bz2
|
||||
Source1: %name.xml
|
||||
Source2: %name.desktop
|
||||
Source3: x-%name.desktop
|
||||
Url: http://www.insilmaril.de/vym/index.html
|
||||
Source0: %{name}-%{version}.tar.bz2
|
||||
Source1: %{name}.xml
|
||||
Source2: %{name}.desktop
|
||||
Source3: x-%{name}.desktop
|
||||
Source4: debian.dirs
|
||||
Source5: debian.docs
|
||||
Source6: makedist.config
|
||||
#PATCH-FIX-UPSTREAM fix no known conversion for argument 2 from 'bool' to 'QString'
|
||||
Patch: vym-2.5.0-gcc6.patch
|
||||
BuildRequires: libQt5Core-devel
|
||||
BuildRequires: libQt5Gui-devel
|
||||
BuildRequires: libqt5-linguist-devel
|
||||
BuildRequires: libqt5-qtbase-devel
|
||||
BuildRequires: libqt5-qtsvg-devel
|
||||
BuildRequires: update-desktop-files
|
||||
Requires: unzip
|
||||
Requires: zip
|
||||
BuildRoot: %{_tmppath}/%{name}-%{version}-build
|
||||
|
||||
%description
|
||||
VYM (View Your Mind) is a tool to generate and manipulate maps which
|
||||
@ -49,34 +51,32 @@ etc. Some people even think it is fun to work with such maps...
|
||||
|
||||
%prep
|
||||
%setup -q
|
||||
%patch -p1
|
||||
|
||||
%build
|
||||
qmake-qt5 -o Makefile vym.pro PREFIX=%_prefix/share BINDIR=%_prefix/bin CONFIG+=RELEASE
|
||||
make
|
||||
qmake-qt5 -o Makefile vym.pro PREFIX=%{_datadir} BINDIR=%{_bindir} CONFIG+=RELEASE
|
||||
make %{?_smp_mflags}
|
||||
lrelease-qt5 vym.pro
|
||||
|
||||
%install
|
||||
mkdir -p $RPM_BUILD_ROOT%{_prefix}/share/vym
|
||||
mkdir -p $RPM_BUILD_ROOT%{_prefix}/share/pixmaps
|
||||
install -m 0644 icons/vym.png $RPM_BUILD_ROOT%{_prefix}/share/pixmaps
|
||||
mkdir -p $RPM_BUILD_ROOT%{_defaultdocdir}/%{name}
|
||||
install -m 0644 README.md LICENSE.txt INSTALL.txt $RPM_BUILD_ROOT%{_defaultdocdir}/%{name}
|
||||
install -m 0644 doc/*.pdf $RPM_BUILD_ROOT%{_defaultdocdir}/%{name}
|
||||
%makeinstall INSTALL_ROOT=$RPM_BUILD_ROOT
|
||||
mkdir -p %{buildroot}%{_datadir}/vym
|
||||
mkdir -p %{buildroot}%{_datadir}/pixmaps
|
||||
install -m 0644 icons/vym.png %{buildroot}%{_datadir}/pixmaps
|
||||
mkdir -p %{buildroot}%{_defaultdocdir}/%{name}
|
||||
install -m 0644 README.md LICENSE.txt INSTALL.txt %{buildroot}%{_defaultdocdir}/%{name}
|
||||
install -m 0644 doc/*.pdf %{buildroot}%{_defaultdocdir}/%{name}
|
||||
make %{?_smp_mflags} DESTDIR=%{buildroot} install INSTALL_ROOT=%{buildroot}
|
||||
|
||||
mkdir -p $RPM_BUILD_ROOT/usr/share/applications
|
||||
install -Dm644 %{SOURCE2} $RPM_BUILD_ROOT/usr/share/applications
|
||||
mkdir -p %{buildroot}%{_datadir}/applications
|
||||
install -Dm644 %{SOURCE2} %{buildroot}%{_datadir}/applications
|
||||
|
||||
mkdir -p $RPM_BUILD_ROOT%{_mandir}/man1
|
||||
install -m 0644 doc/vym.1.gz $RPM_BUILD_ROOT%{_mandir}/man1
|
||||
mkdir -p %{buildroot}%{_mandir}/man1
|
||||
install -m 0644 doc/vym.1.gz %{buildroot}%{_mandir}/man1
|
||||
|
||||
mkdir -p $RPM_BUILD_ROOT/usr/share/mime/packages
|
||||
install -m 0644 %{SOURCE1} $RPM_BUILD_ROOT/usr/share/mime/packages/
|
||||
mkdir -p %{buildroot}%{_datadir}/mime/packages
|
||||
install -m 0644 %{SOURCE1} %{buildroot}%{_datadir}/mime/packages/
|
||||
%suse_update_desktop_file -i vym Office ProjectManagement
|
||||
|
||||
%clean
|
||||
rm -rf $RPM_BUILD_ROOT
|
||||
|
||||
%post
|
||||
if test -x usr/bin/update-mime-database ; then
|
||||
usr/bin/update-mime-database usr/share/mime >/dev/null
|
||||
@ -84,13 +84,13 @@ fi
|
||||
|
||||
%files
|
||||
%defattr(-,root,root)
|
||||
/usr/share/applications/*
|
||||
/usr/share/pixmaps/*
|
||||
/usr/bin/vym
|
||||
/usr/share/vym
|
||||
%{_datadir}/applications/*
|
||||
%{_datadir}/pixmaps/*
|
||||
%{_bindir}/vym
|
||||
%{_datadir}/vym
|
||||
|
||||
%doc %{_docdir}/%{name}
|
||||
%doc %{_mandir}/*/*
|
||||
%{_mandir}/*/*
|
||||
%{_datadir}/mime/packages/vym.xml
|
||||
|
||||
%changelog
|
||||
|
||||
Loading…
Reference in New Issue
Block a user