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

Balló György bgyorgy at gemini.archlinux.org
Sat Nov 13 19:27:14 UTC 2021


    Date: Saturday, November 13, 2021 @ 19:27:14
  Author: bgyorgy
Revision: 1045935

upgpkg: galculator 2.1.4-6: Drop GTK2 version as the toolkit is deprecated and it has no real benefit

Modified:
  galculator/trunk/PKGBUILD

----------+
 PKGBUILD |   40 ++++++++--------------------------------
 1 file changed, 8 insertions(+), 32 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2021-11-13 19:27:13 UTC (rev 1045934)
+++ PKGBUILD	2021-11-13 19:27:14 UTC (rev 1045935)
@@ -4,51 +4,27 @@
 # Contributor: SpepS <dreamspepser at yahoo dot it>
 # Contributor: Alexander Fehr <pizzapunk gmail com>
 
-pkgbase=galculator
-pkgname=(galculator galculator-gtk2)
+pkgname=galculator
 pkgver=2.1.4
-pkgrel=5
+pkgrel=6
 pkgdesc='GTK+ based scientific calculator'
 arch=('x86_64')
 url='http://galculator.sourceforge.net/'
 license=('GPL')
-depends=('gtk2' 'gtk3')
+depends=('gtk3')
 makedepends=('intltool')
-source=("http://galculator.mnim.org/downloads/${pkgbase}-${pkgver}.tar.bz2")
+source=("http://galculator.mnim.org/downloads/${pkgname}-${pkgver}.tar.bz2")
 sha256sums=('01cfafe6606e7ec45facb708ef85efd6c1e8bb41001a999d28212a825ef778ae')
 
 build() {
   CFLAGS+=' -fcommon' # https://wiki.gentoo.org/wiki/Gcc_10_porting_notes/fno_common
-  # GTK3 version
-  cd "${srcdir}/${pkgbase}-${pkgver}"
-  [ -d gtk3 ] || mkdir gtk3
-  cd gtk3
-  ../configure \
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  ./configure \
     --prefix=/usr
   make
-
-  # GTK2 version
-  cd "${srcdir}/${pkgbase}-${pkgver}"
-  [ -d gtk2 ] || mkdir gtk2
-  cd gtk2
-  ../configure \
-    --prefix=/usr \
-    --disable-gtk3
-  make
 }
 
-package_galculator() {
-  depends=('gtk3')
-
-  cd "${pkgbase}-${pkgver}/gtk3"
+package() {
+  cd "${pkgname}-${pkgver}"
   make DESTDIR="$pkgdir" install
 }
-
-package_galculator-gtk2() {
-  pkgdesc+=' (GTK2 version)'
-  depends=('gtk2')
-  conflicts=('galculator')
-
-  cd "${pkgbase}-${pkgver}/gtk2"
-  make DESTDIR="$pkgdir" install
-}



More information about the arch-commits mailing list