[arch-commits] Commit in lyx/trunk (PKGBUILD lyx.desktop)

[Antonio Rojas]

    Date: Friday, June 24, 2016 @ 19:26:01
  Author: arojas
Revision: 270611

Update to 2.2.0

Modified:
  lyx/trunk/PKGBUILD
Deleted:
  lyx/trunk/lyx.desktop

-------------+
 PKGBUILD    |   25 ++++++-------------------
 lyx.desktop |   14 --------------
 2 files changed, 6 insertions(+), 33 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2016-06-24 19:04:43 UTC (rev 270610)
+++ PKGBUILD	2016-06-24 19:26:01 UTC (rev 270611)
@@ -3,12 +3,12 @@
 # Contributor: Jason Chu <jason at archlinux.org>
 
 pkgname=lyx
-pkgver=2.1.4
-pkgrel=6
+pkgver=2.2.0
+pkgrel=1
 pkgdesc="An advanced WYSIWYM document processor & LaTeX front-end"
 arch=('i686' 'x86_64')
 url="http://www.lyx.org"
-depends=('qt4' 'texlive-core' 'python2' 'imagemagick' 'enchant' 'boost-libs' 'libmythes' 'file')
+depends=('qt5-svg' 'texlive-core' 'python' 'imagemagick' 'enchant' 'boost-libs' 'libmythes' 'file')
 makedepends=('boost' 'bc')
 optdepends=('rcs: built-in version control system'
             'texlive-latexextra: float wrap support')
@@ -15,23 +15,15 @@
 license=('GPL')
 backup=('etc/lyx/lyxrc.dist')
 options=('emptydirs')
-source=(ftp://ftp.lyx.org/pub/lyx/stable/2.1.x/$pkgname-$pkgver.tar.xz
-        lyx.desktop lyxrc.dist)
-sha1sums=('956662191437685789a2ffc2eec3048a21d3e37b'
-          'e2b8f6d6cdeec41e1d5795167f5557e4a6ea28ad'
+source=(ftp://ftp.lyx.org/pub/lyx/stable/2.2.x/$pkgname-$pkgver.tar.xz lyxrc.dist)
+sha1sums=('5b1430273d8e9a3f174b2dcdfd9f25ce717ffb25'
           '56416642cc3da2a13b87b84e6b87c1a239f3d09a')
 
-prepare() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  find . -type f -exec sed -i 's|#!.*python|#!/usr/bin/env python2|' {} +
-  sed -i 's|"python|"python2|' lib/configure.py src/support/os.cpp
-}
-
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
   export CXXFLAGS="$CXXFLAGS -fpermissive"
   ./configure --prefix=/usr \
-    --with-frontend=qt4 --without-included-boost \
+    --enable-qt5 --without-included-boost \
     --without-included-mythes
   make
 }
@@ -39,11 +31,6 @@
 package() {
   cd "${srcdir}/${pkgname}-${pkgver}"
   make DESTDIR="${pkgdir}" install
-  # install desktop entry
-  install -Dm644 "${srcdir}/lyx.desktop" \
-    "${pkgdir}/usr/share/applications/lyx.desktop"
-  install -Dm644 "lib/images/lyx.png" \
-    "${pkgdir}/usr/share/pixmaps/lyx.png"
   # install default config file
   install -Dm644 "${srcdir}/lyxrc.dist" "${pkgdir}/etc/lyx/lyxrc.dist"
   ln -sf /etc/lyx/lyxrc.dist "${pkgdir}/usr/share/lyx/lyxrc.dist"

Deleted: lyx.desktop
===================================================================
--- lyx.desktop	2016-06-24 19:04:43 UTC (rev 270610)
+++ lyx.desktop	2016-06-24 19:26:01 UTC (rev 270611)
@@ -1,14 +0,0 @@
-[Desktop Entry]
-Version=1.0
-Type=Application
-Name=LyX Document Processor
-GenericName=Document Processor
-Comment=High level LaTeX frontend
-Exec=lyx %F
-TryExec=lyx
-Icon=lyx
-StartupNotify=false
-StartupWMClass=Lyx
-Terminal=false
-Categories=Office;WordProcessor;Qt;
-MimeType=text/x-lyx;application/x-lyx;