[arch-commits] Commit in lazarus/trunk (PKGBUILD)

[Ike Devolder]

    Date: Sunday, February 25, 2018 @ 08:41:52
  Author: idevolder
Revision: 297941

upgpkg: lazarus 1.8.0-2

Modified:
  lazarus/trunk/PKGBUILD

----------+
 PKGBUILD |   43 ++++++-------------------------------------
 1 file changed, 6 insertions(+), 37 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2018-02-25 05:00:50 UTC (rev 297940)
+++ PKGBUILD	2018-02-25 08:41:52 UTC (rev 297941)
@@ -4,13 +4,13 @@
 # Contributor: Jens Adam <jra at byte.cx>
 
 pkgbase=lazarus
-pkgname=('lazarus' 'lazarus-gtk2' 'lazarus-qt4' 'lazarus-qt5')
+pkgname=('lazarus' 'lazarus-gtk2' 'lazarus-qt5')
 pkgver=1.8.0
-pkgrel=1
+pkgrel=2
 url='http://www.lazarus.freepascal.org/'
 license=('GPL2' 'MPL' 'custom:modifiedLGPL')
 arch=('x86_64')
-makedepends=('fpc' 'fpc-src' 'gtk2' 'qt4pas' 'qt5pas' 'rsync')
+makedepends=('fpc' 'fpc-src' 'gtk2' 'qt5pas' 'rsync')
 options=('!emptydirs' '!makeflags')
 source=("https://downloads.sourceforge.net/project/lazarus/Lazarus%20Zip%20_%20GZip/Lazarus%20${pkgver}/lazarus-$pkgver.tar.gz")
 sha512sums=('dd5e02e9c0a057cf9a6b2c15605969cf4cb743aa78fc81bfdc7c566434127893cf32bab5bd1729f79b51c611bf9ae015bea8d774e0544ead42a064f1224ffd7b')
@@ -24,12 +24,6 @@
   mv lazarus lazarus-gtk2
   mv startlazarus startlazarus-gtk2
 
-  # build qt4 ide
-  make FPC=/usr/bin/fpc LCL_PLATFORM=qt bigide
-  # move qt binaries
-  mv lazarus lazarus-qt4
-  mv startlazarus startlazarus-qt4
-
   # build qt5 ide
   make FPC=/usr/bin/fpc LCL_PLATFORM=qt5 bigide
   # move qt binaries
@@ -43,7 +37,6 @@
   optdepends=(
     'perl: to run some scirpts in the tools directory'
     'gtk2: to compile gtk2 apps'
-    'qt4pas: to compile qt4 apps and use help viewer'
     'qt5pas: to compile qt5 apps and use help viewer'
   )
 
@@ -86,7 +79,7 @@
 package_lazarus-gtk2() {
   pkgdesc='Delphi-like IDE for FreePascal gtk2 version'
   depends=('lazarus' 'desktop-file-utils' 'gtk2')
-  conflicts=('lazarus-qt4' 'lazarus-qt5')
+  conflicts=('lazarus-qt5')
 
   cd "$srcdir"/${pkgbase}
 
@@ -107,35 +100,11 @@
   install -D -m644 COPYING.modifiedLGPL.txt "$pkgdir"/usr/share/licenses/$pkgname/COPYING.modifiedLGPL
 }
 
-package_lazarus-qt4() {
-  pkgdesc='Delphi-like IDE for FreePascal qt4 version'
-  depends=('lazarus' 'qt4pas')
-  conflicts=('lazarus-gtk2' 'lazarus-qt5')
-  replaces=('lazarus-qt')
-
-  cd "$srcdir"/${pkgbase}
-
-  # install qt binaries
-  install -Dm755 lazarus-qt4 "$pkgdir"/usr/lib/lazarus/lazarus
-  install -Dm755 startlazarus-qt4 "$pkgdir"/usr/lib/lazarus/startlazarus
-  install -dm755 "$pkgdir"/usr/bin
-  ln -s /usr/lib/lazarus/lazarus "$pkgdir"/usr/bin/lazarus
-  ln -s /usr/lib/lazarus/startlazarus "$pkgdir"/usr/bin/startlazarus
-
-  # make 'desktop-file-validate' happy and fix missing .png icon
-  sed -e 's|\(Categories\).*|\1=IDE;Development;|' \
-    -e 's|\.png|\.xpm|' -i install/lazarus.desktop
-  install -Dm644 install/lazarus.desktop "$pkgdir"/usr/share/applications/lazarus.desktop
-  install -Dm644 images/ide_icon48x48.png "$pkgdir"/usr/share/pixmaps/lazarus.png
-
-  # license files: /usr/lib/lazarus/COPYING*
-  install -D -m644 COPYING.modifiedLGPL.txt "$pkgdir"/usr/share/licenses/$pkgname/COPYING.modifiedLGPL
-}
-
 package_lazarus-qt5() {
   pkgdesc='Delphi-like IDE for FreePascal qt5 version'
   depends=('lazarus' 'qt5pas')
-  conflicts=('lazarus-gtk2' 'lazarus-qt4')
+  conflicts=('lazarus-gtk2')
+  replaces=('lazarus-qt' 'lazarus-qt4')
 
   cd "$srcdir"/${pkgbase}