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

[Balló György]

    Date: Thursday, March 29, 2018 @ 02:57:36
  Author: bgyorgy
Revision: 313228

upgpkg: lxterminal 0.3.1-2

Remove GTK2-based lxterminal. GTK2-based VTE is unmaintained since 2011 and buggy. (FS#57676)

Modified:
  lxterminal/trunk/PKGBUILD

----------+
 PKGBUILD |   42 +++++++++++-------------------------------
 1 file changed, 11 insertions(+), 31 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2018-03-29 02:23:16 UTC (rev 313227)
+++ PKGBUILD	2018-03-29 02:57:36 UTC (rev 313228)
@@ -4,48 +4,28 @@
 # Contributor: Angel Velasquez <angvp at archlinux.org> 
 # Contributor: Geoffroy Carrier <geoffroy.carrier at koon.fr>
 
-pkgbase=lxterminal
-pkgname=(lxterminal lxterminal-gtk3)
+pkgname=lxterminal
 pkgver=0.3.1
-pkgrel=1
+pkgrel=2
 pkgdesc="VTE-based terminal emulator (part of LXDE)"
 arch=('x86_64')
+url="https://lxde.org/"
 license=('GPL2')
-url="https://lxde.org/"
-depends=('vte' 'vte3')
+groups=('lxde' 'lxde-gtk3')
+depends=('vte3')
 makedepends=('intltool')
-source=(https://downloads.sourceforge.net/lxde/${pkgbase}-${pkgver}.tar.xz)
+conflicts=('lxterminal-gtk3')
+replaces=('lxterminal-gtk3')
+source=(https://downloads.sourceforge.net/lxde/${pkgname}-${pkgver}.tar.xz)
 sha256sums=('cd8df387c2dd40e03b48caacf700820f9421b421954a0ed56395f505411d2c4b')
 
 build() {
-  # GTK+ 2 version
-  [ -d gtk2 ] || cp -r $pkgbase-$pkgver gtk2
-  cd gtk2
-  ./configure --sysconfdir=/etc --prefix=/usr
-  make
-
-  cd "$srcdir"
-  # GTK+ 3 version
-  [ -d gtk3 ] || cp -r $pkgbase-$pkgver gtk3
-  cd gtk3
+  cd $pkgname-$pkgver
   ./configure --sysconfdir=/etc --prefix=/usr --enable-gtk3
   make
 }
 
-package_lxterminal() {
-  groups=('lxde')
-  depends=('vte')
-
-  cd gtk2
+package() {
+  cd $pkgname-$pkgver
   make DESTDIR="$pkgdir" install
 }
-
-package_lxterminal-gtk3() {
-  groups=('lxde-gtk3')
-  pkgdesc+=' (GTK+ 3 version)'
-  depends=('vte3')
-  conflicts=('lxterminal')
-
-  cd gtk3
-  make DESTDIR="$pkgdir" install
-}