From 458df593d6f035614f7feb217e4132378b13e6709d60d4a7ae2ffe35594dcbf4 Mon Sep 17 00:00:00 2001 From: Martin Pluskal Date: Mon, 20 Jun 2016 17:13:57 +0000 Subject: [PATCH 1/2] 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 --- vym-2.5.0-gcc6.patch | 31 +++++++++++++++++ vym.changes | 8 +++++ vym.spec | 82 ++++++++++++++++++++++---------------------- 3 files changed, 80 insertions(+), 41 deletions(-) create mode 100644 vym-2.5.0-gcc6.patch diff --git a/vym-2.5.0-gcc6.patch b/vym-2.5.0-gcc6.patch new file mode 100644 index 0000000..cffde10 --- /dev/null +++ b/vym-2.5.0-gcc6.patch @@ -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"); diff --git a/vym.changes b/vym.changes index 905fbf8..ded952e 100644 --- a/vym.changes +++ b/vym.changes @@ -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 diff --git a/vym.spec b/vym.spec index e3543ba..e042e64 100644 --- a/vym.spec +++ b/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 From f8920da37179839b9c33d1332a50bc8f83a4c2c372cdf803d61506e39b0e3641 Mon Sep 17 00:00:00 2001 From: Uwe Drechsel Date: Tue, 21 Jun 2016 07:00:28 +0000 Subject: [PATCH 2/2] Update to 2.5.4, including gcc6 changes OBS-URL: https://build.opensuse.org/package/show/editors/vym?expand=0&rev=46 --- debian.changelog | 12 ++++++++++++ vym-2.5.0-gcc6.patch | 31 ------------------------------- vym-2.5.0.tar.bz2 | 3 --- vym-2.5.4.tar.bz2 | 3 +++ vym.changes | 6 ++++++ vym.spec | 7 ++----- 6 files changed, 23 insertions(+), 39 deletions(-) delete mode 100644 vym-2.5.0-gcc6.patch delete mode 100644 vym-2.5.0.tar.bz2 create mode 100644 vym-2.5.4.tar.bz2 diff --git a/debian.changelog b/debian.changelog index 7e7a1be..1392af3 100644 --- a/debian.changelog +++ b/debian.changelog @@ -1,3 +1,15 @@ +vym (2.5.4.1) unstable; urgency=low + + * New upstream release + + -- Uwe Drechsel Mon, 22 Feb 2016 08:04:00 +0100 + +vym (2.5.3.1) unstable; urgency=low + + * New upstream release + + -- Uwe Drechsel Mon, 22 Feb 2016 07:04:00 +0100 + vym (2.5.0.1) unstable; urgency=low * New upstream release diff --git a/vym-2.5.0-gcc6.patch b/vym-2.5.0-gcc6.patch deleted file mode 100644 index cffde10..0000000 --- a/vym-2.5.0-gcc6.patch +++ /dev/null @@ -1,31 +0,0 @@ -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"); diff --git a/vym-2.5.0.tar.bz2 b/vym-2.5.0.tar.bz2 deleted file mode 100644 index 04d4d22..0000000 --- a/vym-2.5.0.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:55550549fcc8cc151ff6235a09bb8fc1412f0b598cc6f9072345058c5e12b9f3 -size 6740098 diff --git a/vym-2.5.4.tar.bz2 b/vym-2.5.4.tar.bz2 new file mode 100644 index 0000000..dc11137 --- /dev/null +++ b/vym-2.5.4.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:d4d4d325842f487a16c5544859da96789792130c5c8c554e7d6abcaf94b8b3bb +size 6743390 diff --git a/vym.changes b/vym.changes index ded952e..b57a10a 100644 --- a/vym.changes +++ b/vym.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Tue Jun 21 06:57:11 UTC 2016 - vym@insilmaril.de + +- Update to upstream 2.5.4 +- Remove vym-2.5.0-gcc6.patch again, not required + ------------------------------------------------------------------- Mon Jun 20 17:01:00 UTC 2016 - i@marguerite.su diff --git a/vym.spec b/vym.spec index e042e64..cb51f11 100644 --- a/vym.spec +++ b/vym.spec @@ -17,7 +17,7 @@ Name: vym -Version: 2.5.0 +Version: 2.5.4 Release: 0 Summary: View Your Mind - generate and manipulate maps which show your thoughts License: GPL-2.0 @@ -30,8 +30,6 @@ 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 @@ -51,12 +49,11 @@ etc. Some people even think it is fun to work with such maps... %prep %setup -q -%patch -p1 %build +lrelease-qt5 vym.pro qmake-qt5 -o Makefile vym.pro PREFIX=%{_datadir} BINDIR=%{_bindir} CONFIG+=RELEASE make %{?_smp_mflags} -lrelease-qt5 vym.pro %install mkdir -p %{buildroot}%{_datadir}/vym