From 21abfd1474b6d43394b5c5c51fbd5da099261a5a8413d8ab73fb2121cc3d3706 Mon Sep 17 00:00:00 2001 From: Martin Pluskal Date: Thu, 20 Jul 2017 10:17:31 +0000 Subject: [PATCH 1/5] Accepting request 511604 from home:WernerFink:branches:Publishing - Update to version 5.0: + new and more modern interface look + highdpi is now supported on windows and linux + a spellcheck annoying trouble on kde5 has been fixed + new pdf engine + synctex updated to 1.18 + Qt4 support has been removed : Qt5 (>=5.7) is now required + de, es, hu, pl, and zh_CN translations have been updated - Drop texmaker-correct-doc-location.patch as now part of upstream - Drop texmaker-appdata.patch as now part of upstream - Require libqt5-qtbase-private-headers-devel at build time - Require recommended LaTeX packages as runtime as well as at least one WEB browser and the xdg-utils for e.g. open help files OBS-URL: https://build.opensuse.org/request/show/511604 OBS-URL: https://build.opensuse.org/package/show/Publishing/texmaker?expand=0&rev=79 --- texmaker-4.5.tar.bz2 | 3 -- texmaker-5.0.tar.bz2 | 3 ++ texmaker-appdata.patch | 61 ----------------------------- texmaker-correct-doc-location.patch | 14 ------- texmaker.changes | 17 ++++++++ texmaker.spec | 34 ++++------------ 6 files changed, 27 insertions(+), 105 deletions(-) delete mode 100644 texmaker-4.5.tar.bz2 create mode 100644 texmaker-5.0.tar.bz2 delete mode 100644 texmaker-appdata.patch delete mode 100644 texmaker-correct-doc-location.patch diff --git a/texmaker-4.5.tar.bz2 b/texmaker-4.5.tar.bz2 deleted file mode 100644 index bbfd502..0000000 --- a/texmaker-4.5.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:2ce9966e410bf878649d1c756e3dc2a077e55e1eaa9f4beb10aa7224cd94d614 -size 11287724 diff --git a/texmaker-5.0.tar.bz2 b/texmaker-5.0.tar.bz2 new file mode 100644 index 0000000..fb19327 --- /dev/null +++ b/texmaker-5.0.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:2a0b329c0ff5c408f72bcefbef16361d26da74e3ca1f39d6b8c78d84c37245a9 +size 15728938 diff --git a/texmaker-appdata.patch b/texmaker-appdata.patch deleted file mode 100644 index 050298a..0000000 --- a/texmaker-appdata.patch +++ /dev/null @@ -1,61 +0,0 @@ -Index: texmaker-4.5/utilities/texmaker.appdata.xml -=================================================================== ---- /dev/null -+++ texmaker-4.5/utilities/texmaker.appdata.xml -@@ -0,0 +1,26 @@ -+ -+ -+ texmaker.desktop -+ CC0-1.0 -+ Texmaker LaTeX Editor -+ GPL-2.0 and BSD-3-Clause -+ Free cross-platform LaTeX editor -+ http://www.xm1math.net/texmaker/ -+ -+

Texmaker is a free LaTeX editor, that integrates many tools -+needed to develop documents with LaTeX, in just one application. -+Texmaker runs on unix, macosx and windows systems and is released -+under the GPL license .

-+ -+ -+ -+ http://www.xm1math.net/texmaker/texmakertop_big.png -+ Source editor and PDF preview side by side -+ -+ -+ http://www.xm1math.net/texmaker/sidebyside_big.png -+ Two documents side by side -+ -+ -+ pbrachet@xm1math.net -+ -Index: texmaker-4.5/texmaker.pro -=================================================================== ---- texmaker-4.5.orig/texmaker.pro -+++ texmaker-4.5/texmaker.pro -@@ -323,6 +323,9 @@ isEmpty( DESKTOPDIR ) { - isEmpty( ICONDIR ) { - ICONDIR=/usr/share/pixmaps - } -+isEmpty( METAINFODIR ) { -+ METAINFODIR=/usr/share/metainfo -+} - - DEFINES += PREFIX=\\\"$${PREFIX}\\\" - -@@ -333,6 +336,7 @@ target.path = $${PREFIX}/bin - utilities.path = $${PREFIX}/share/texmaker - desktop.path = $${DESKTOPDIR} - icon.path = $${ICONDIR} -+metainfo.path = $${METAINFODIR} - - INSTALLS = target - HEADERS += x11fontdialog.h -@@ -477,4 +481,7 @@ INSTALLS += desktop - - icon.files = utilities/texmaker.png - INSTALLS += icon -+ -+metainfo.files = utilities/texmaker.appdata.xml -+INSTALLS += metainfo - } diff --git a/texmaker-correct-doc-location.patch b/texmaker-correct-doc-location.patch deleted file mode 100644 index dccf951..0000000 --- a/texmaker-correct-doc-location.patch +++ /dev/null @@ -1,14 +0,0 @@ -Index: texmaker-4.3/texmaker.pro -=================================================================== ---- texmaker-4.3.orig/texmaker.pro -+++ texmaker-4.3/texmaker.pro -@@ -387,9 +387,6 @@ utilities.files = doc/doc1.png \ - atd/atd.css \ - atd/csshttprequest.js \ - atd/jquery.atd.textarea.js \ -- utilities/AUTHORS \ -- utilities/COPYING \ -- utilities/CHANGELOG.txt \ - utilities/texmaker16x16.png \ - utilities/texmaker22x22.png \ - utilities/texmaker32x32.png \ diff --git a/texmaker.changes b/texmaker.changes index d764c0c..332f100 100644 --- a/texmaker.changes +++ b/texmaker.changes @@ -1,3 +1,20 @@ +------------------------------------------------------------------- +Thu Jul 20 08:41:36 UTC 2017 - werner@suse.de + +- Update to version 5.0: + + new and more modern interface look + + highdpi is now supported on windows and linux + + a spellcheck annoying trouble on kde5 has been fixed + + new pdf engine + + synctex updated to 1.18 + + Qt4 support has been removed : Qt5 (>=5.7) is now required + + de, es, hu, pl, and zh_CN translations have been updated +- Drop texmaker-correct-doc-location.patch as now part of upstream +- Drop texmaker-appdata.patch as now part of upstream +- Require libqt5-qtbase-private-headers-devel at build time +- Require recommended LaTeX packages as runtime as well as at least + one WEB browser and the xdg-utils for e.g. open help files + ------------------------------------------------------------------- Tue Jul 26 02:50:25 UTC 2016 - badshah400@gmail.com diff --git a/texmaker.spec b/texmaker.spec index 8306957..89ee3ab 100644 --- a/texmaker.spec +++ b/texmaker.spec @@ -1,7 +1,7 @@ # # spec file for package texmaker # -# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2017 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 @@ -17,26 +17,17 @@ Name: texmaker -Version: 4.5 +Version: 5.0 Release: 0 Summary: Free cross-platform LaTeX editor License: GPL-2.0 and BSD-3-Clause Group: Productivity/Publishing/TeX/Frontends Url: http://www.xm1math.net/texmaker/ Source: http://www.xm1math.net/texmaker/texmaker-%{version}.tar.bz2 -# PATCH-FIX-UPSTREAM texmaker-correct-doc-location.patch badshah400@gmail.com -- Handle doc files in the spec file rather than placing them in %%{_datadir} during compilation -Patch1: texmaker-correct-doc-location.patch -# PATCH-FIX-UPSTREAM texmaker-appdata.patch badshah400@gmail.com -- Install appstream metainfo file; patch sent upstream -Patch2: texmaker-appdata.patch BuildRequires: fdupes -BuildRequires: update-desktop-files -%if 0%{?suse_version} == 1315 -BuildRequires: libQtWebKit-devel -BuildRequires: libpoppler-qt4-devel >= 0.16 -BuildRequires: libqt4-devel >= 4.6.1 -Requires: libQtWebKit4 >= 4.6.1 -%else BuildRequires: libpoppler-qt5-devel +BuildRequires: libqt5-qtbase-private-headers-devel >= 5.7 +BuildRequires: update-desktop-files BuildRequires: pkgconfig(Qt5Concurrent) BuildRequires: pkgconfig(Qt5Core) BuildRequires: pkgconfig(Qt5Gui) @@ -46,9 +37,10 @@ BuildRequires: pkgconfig(Qt5Script) BuildRequires: pkgconfig(Qt5WebKit) BuildRequires: pkgconfig(Qt5WebKitWidgets) BuildRequires: pkgconfig(Qt5Xml) -%endif Requires: hunspell -Requires: texlive-latex +Requires: texlive-collection-latexrecommended +Requires: web_browser +Requires: xdg-utils BuildRoot: %{_tmppath}/%{name}-%{version}-build %description @@ -59,29 +51,17 @@ under the GPL license . %prep %setup -q -%patch1 -p1 -%patch2 -p1 %build -%if 0%{?suse_version} == 1315 -QTDIR=%{_libdir}/qt4 -%else QTDIR=%{_libdir}/qt5 -%endif - PATH=$QTDIR/bin:$PATH LD_LIBRARY_PATH=$QTDIR/lib:$LD_LIBRARY_PATH DYLD_LIBRARY_PATH=$QTDIR/lib:$DYLD_LIBRARY_PATH export QTDIR PATH LD_LIBRARY_PATH DYLD_LIBRARY_PATH PREFIX=%{_prefix} -%if 0%{?suse_version} == 1315 -qmake QMAKE_CXXFLAGS="%optflags -fvisibility=hidden -fvisibility-inlines-hidden" \ - METAINFODIR="%{_datadir}/appdata" -unix texmaker.pro -%else qmake-qt5 QMAKE_CXXFLAGS="%optflags -fvisibility=hidden -fvisibility-inlines-hidden" \ METAINFODIR="%{_datadir}/appdata" -unix texmaker.pro -%endif make %{?_smp_mflags} %install From a636697810787610eaa84d5dd4342064f1f3e07c16e4aa783adc891cd3b77f68 Mon Sep 17 00:00:00 2001 From: Atri Bhattacharya Date: Mon, 24 Jul 2017 15:20:50 +0000 Subject: [PATCH 2/5] Accepting request 512281 from home:jengelh:branches:Publishing - Remove redundant wording from descriptions. OBS-URL: https://build.opensuse.org/request/show/512281 OBS-URL: https://build.opensuse.org/package/show/Publishing/texmaker?expand=0&rev=80 --- texmaker.changes | 5 +++++ texmaker.spec | 12 +++++++----- 2 files changed, 12 insertions(+), 5 deletions(-) diff --git a/texmaker.changes b/texmaker.changes index 332f100..c40672f 100644 --- a/texmaker.changes +++ b/texmaker.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Mon Jul 24 13:40:55 UTC 2017 - jengelh@inai.de + +- Remove redundant wording from descriptions. + ------------------------------------------------------------------- Thu Jul 20 08:41:36 UTC 2017 - werner@suse.de diff --git a/texmaker.spec b/texmaker.spec index 89ee3ab..b53ee41 100644 --- a/texmaker.spec +++ b/texmaker.spec @@ -19,7 +19,7 @@ Name: texmaker Version: 5.0 Release: 0 -Summary: Free cross-platform LaTeX editor +Summary: LaTeX editor License: GPL-2.0 and BSD-3-Clause Group: Productivity/Publishing/TeX/Frontends Url: http://www.xm1math.net/texmaker/ @@ -44,10 +44,12 @@ Requires: xdg-utils BuildRoot: %{_tmppath}/%{name}-%{version}-build %description -Texmaker is a free LaTeX editor, that integrates many tools -needed to develop documents with LaTeX, in just one application. -Texmaker runs on unix, macosx and windows systems and is released -under the GPL license . +Texmaker is a LaTeX editor that integrates many tools +needed to develop documents with LaTeX in just one application. + +Texmaker includes unicode support, spell checking, auto-completion, +code folding and a built-in PDF viewer with synctex support and +continuous view mode. %prep %setup -q From eecccc513df42198822fb8ba1737b7888d85755634363ef611915e87a913bf0b Mon Sep 17 00:00:00 2001 From: OBS User mrdocs Date: Sat, 5 Aug 2017 16:05:42 +0000 Subject: [PATCH 3/5] Accepting request 514691 from home:badshah400:branches:Publishing - Update to version 5.0.1: - A trouble with the MikTex's ps2pdf command has been fixed - The "-dpiscale x" option has been added to the Texmaker command line : with this option the environment variable QT_SCALE_FACTOR will be set to x before building the GUI (same behavior than adding "export QT_SCALE_FACTOR=x" to the environment variables). Can be used to adjust the interface if the monitor dpi is not well detected. - Updated translations. OBS-URL: https://build.opensuse.org/request/show/514691 OBS-URL: https://build.opensuse.org/package/show/Publishing/texmaker?expand=0&rev=81 --- texmaker-5.0.1.tar.bz2 | 3 +++ texmaker-5.0.tar.bz2 | 3 --- texmaker.changes | 13 +++++++++++++ texmaker.spec | 2 +- 4 files changed, 17 insertions(+), 4 deletions(-) create mode 100644 texmaker-5.0.1.tar.bz2 delete mode 100644 texmaker-5.0.tar.bz2 diff --git a/texmaker-5.0.1.tar.bz2 b/texmaker-5.0.1.tar.bz2 new file mode 100644 index 0000000..f8fccbc --- /dev/null +++ b/texmaker-5.0.1.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:bdf3bcf91405719fc2ff80c2168f6bff2b3cce9a0012923efc43638b2a278b48 +size 15782430 diff --git a/texmaker-5.0.tar.bz2 b/texmaker-5.0.tar.bz2 deleted file mode 100644 index fb19327..0000000 --- a/texmaker-5.0.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:2a0b329c0ff5c408f72bcefbef16361d26da74e3ca1f39d6b8c78d84c37245a9 -size 15728938 diff --git a/texmaker.changes b/texmaker.changes index c40672f..66adc8c 100644 --- a/texmaker.changes +++ b/texmaker.changes @@ -1,3 +1,16 @@ +------------------------------------------------------------------- +Sat Aug 5 14:08:31 UTC 2017 - badshah400@gmail.com + +- Update to version 5.0.1: + - A trouble with the MikTex's ps2pdf command has been fixed + - The "-dpiscale x" option has been added to the Texmaker + command line : with this option the environment variable + QT_SCALE_FACTOR will be set to x before building the GUI (same + behavior than adding "export QT_SCALE_FACTOR=x" to the + environment variables). Can be used to adjust the interface + if the monitor dpi is not well detected. + - Updated translations. + ------------------------------------------------------------------- Mon Jul 24 13:40:55 UTC 2017 - jengelh@inai.de diff --git a/texmaker.spec b/texmaker.spec index b53ee41..9114ba8 100644 --- a/texmaker.spec +++ b/texmaker.spec @@ -17,7 +17,7 @@ Name: texmaker -Version: 5.0 +Version: 5.0.1 Release: 0 Summary: LaTeX editor License: GPL-2.0 and BSD-3-Clause From 646ca6858187afec002283bd3e68fa77e91ede2485b21a32de538062c4b7fcd8 Mon Sep 17 00:00:00 2001 From: Martin Pluskal Date: Tue, 19 Dec 2017 14:59:07 +0000 Subject: [PATCH 4/5] Accepting request 558557 from home:badshah400:branches:Publishing - Update to version 5.0.2: + A memory leak has been fixed in the internal pdf viewer. - Drop BuildRequires: libpoppler-qt5-devel; no longer required by upstream as it uses bundled pdfium instead. OBS-URL: https://build.opensuse.org/request/show/558557 OBS-URL: https://build.opensuse.org/package/show/Publishing/texmaker?expand=0&rev=82 --- texmaker-5.0.1.tar.bz2 | 3 --- texmaker-5.0.2.tar.bz2 | 3 +++ texmaker.changes | 8 ++++++++ texmaker.spec | 3 +-- 4 files changed, 12 insertions(+), 5 deletions(-) delete mode 100644 texmaker-5.0.1.tar.bz2 create mode 100644 texmaker-5.0.2.tar.bz2 diff --git a/texmaker-5.0.1.tar.bz2 b/texmaker-5.0.1.tar.bz2 deleted file mode 100644 index f8fccbc..0000000 --- a/texmaker-5.0.1.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:bdf3bcf91405719fc2ff80c2168f6bff2b3cce9a0012923efc43638b2a278b48 -size 15782430 diff --git a/texmaker-5.0.2.tar.bz2 b/texmaker-5.0.2.tar.bz2 new file mode 100644 index 0000000..005d145 --- /dev/null +++ b/texmaker-5.0.2.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:a94e8d77a16fddd0789c452b0913bb098b1f895397b3ad53be29ad84aaac0179 +size 15695684 diff --git a/texmaker.changes b/texmaker.changes index 66adc8c..af503d2 100644 --- a/texmaker.changes +++ b/texmaker.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +Tue Dec 19 13:06:45 UTC 2017 - badshah400@gmail.com + +- Update to version 5.0.2: + + A memory leak has been fixed in the internal pdf viewer. +- Drop BuildRequires: libpoppler-qt5-devel; no longer required by + upstream as it uses bundled pdfium instead. + ------------------------------------------------------------------- Sat Aug 5 14:08:31 UTC 2017 - badshah400@gmail.com diff --git a/texmaker.spec b/texmaker.spec index 9114ba8..857c274 100644 --- a/texmaker.spec +++ b/texmaker.spec @@ -17,7 +17,7 @@ Name: texmaker -Version: 5.0.1 +Version: 5.0.2 Release: 0 Summary: LaTeX editor License: GPL-2.0 and BSD-3-Clause @@ -25,7 +25,6 @@ Group: Productivity/Publishing/TeX/Frontends Url: http://www.xm1math.net/texmaker/ Source: http://www.xm1math.net/texmaker/texmaker-%{version}.tar.bz2 BuildRequires: fdupes -BuildRequires: libpoppler-qt5-devel BuildRequires: libqt5-qtbase-private-headers-devel >= 5.7 BuildRequires: update-desktop-files BuildRequires: pkgconfig(Qt5Concurrent) From e408e02b325f5188ecbf91650f63afc7d6dbb794fb03e2c6e2ee662d4e63ec34 Mon Sep 17 00:00:00 2001 From: Martin Pluskal Date: Tue, 19 Dec 2017 15:08:50 +0000 Subject: [PATCH 5/5] - Use qmake macros - Cleanup a bit with spec-cleaner OBS-URL: https://build.opensuse.org/package/show/Publishing/texmaker?expand=0&rev=83 --- texmaker.changes | 6 ++++++ texmaker.spec | 12 +++++------- 2 files changed, 11 insertions(+), 7 deletions(-) diff --git a/texmaker.changes b/texmaker.changes index af503d2..91424c9 100644 --- a/texmaker.changes +++ b/texmaker.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Tue Dec 19 15:07:43 UTC 2017 - mpluskal@suse.com + +- Use qmake macros +- Cleanup a bit with spec-cleaner + ------------------------------------------------------------------- Tue Dec 19 13:06:45 UTC 2017 - badshah400@gmail.com diff --git a/texmaker.spec b/texmaker.spec index 857c274..1043cad 100644 --- a/texmaker.spec +++ b/texmaker.spec @@ -20,12 +20,13 @@ Name: texmaker Version: 5.0.2 Release: 0 Summary: LaTeX editor -License: GPL-2.0 and BSD-3-Clause +License: GPL-2.0 AND BSD-3-Clause Group: Productivity/Publishing/TeX/Frontends Url: http://www.xm1math.net/texmaker/ Source: http://www.xm1math.net/texmaker/texmaker-%{version}.tar.bz2 BuildRequires: fdupes BuildRequires: libqt5-qtbase-private-headers-devel >= 5.7 +BuildRequires: pkgconfig BuildRequires: update-desktop-files BuildRequires: pkgconfig(Qt5Concurrent) BuildRequires: pkgconfig(Qt5Core) @@ -40,7 +41,6 @@ Requires: hunspell Requires: texlive-collection-latexrecommended Requires: web_browser Requires: xdg-utils -BuildRoot: %{_tmppath}/%{name}-%{version}-build %description Texmaker is a LaTeX editor that integrates many tools @@ -61,16 +61,14 @@ DYLD_LIBRARY_PATH=$QTDIR/lib:$DYLD_LIBRARY_PATH export QTDIR PATH LD_LIBRARY_PATH DYLD_LIBRARY_PATH PREFIX=%{_prefix} -qmake-qt5 QMAKE_CXXFLAGS="%optflags -fvisibility=hidden -fvisibility-inlines-hidden" \ - METAINFODIR="%{_datadir}/appdata" -unix texmaker.pro -make %{?_smp_mflags} +%qmake5 METAINFODIR="%{_datadir}/appdata" -unix texmaker.pro +%make_jobs %install -make INSTALL_ROOT=%{buildroot} install +%qmake5_install %fdupes %{buildroot}%{_datadir}/%{name}/ %files -%defattr(-,root,root,-) %doc utilities/AUTHORS utilities/COPYING utilities/CHANGELOG.txt %{_bindir}/texmaker %{_datadir}/applications/texmaker.desktop