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
This commit is contained in:
Martin Pluskal
2017-07-20 10:17:31 +00:00
committed by Git OBS Bridge
parent c80528316f
commit 21abfd1474
6 changed files with 27 additions and 105 deletions

View File

@@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:2ce9966e410bf878649d1c756e3dc2a077e55e1eaa9f4beb10aa7224cd94d614
size 11287724

3
texmaker-5.0.tar.bz2 Normal file
View File

@@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:2a0b329c0ff5c408f72bcefbef16361d26da74e3ca1f39d6b8c78d84c37245a9
size 15728938

View File

@@ -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 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<component>
+ <id type="desktop">texmaker.desktop</id>
+ <metadata_license>CC0-1.0</metadata_license>
+ <name>Texmaker LaTeX Editor</name>
+ <project_license>GPL-2.0 and BSD-3-Clause</project_license>
+ <summary>Free cross-platform LaTeX editor</summary>
+ <url type="homepage">http://www.xm1math.net/texmaker/</url>
+ <description>
+ <p>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 .</p>
+ </description>
+ <screenshots>
+ <screenshot type="default">
+ <image height="900" width="1600">http://www.xm1math.net/texmaker/texmakertop_big.png</image>
+ <caption>Source editor and PDF preview side by side</caption>
+ </screenshot>
+ <screenshot>
+ <image height="900" width="1600">http://www.xm1math.net/texmaker/sidebyside_big.png</image>
+ <caption>Two documents side by side</caption>
+ </screenshot>
+ </screenshots>
+ <update_contact>pbrachet@xm1math.net</update_contact>
+</component>
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
}

View File

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

View File

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

View File

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