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

[Balló György]

    Date: Monday, March 16, 2020 @ 08:35:59
  Author: bgyorgy
Revision: 599097

upgpkg: libindicator 12.10.1-9: Fix build

Modified:
  libindicator/trunk/PKGBUILD

----------+
 PKGBUILD |   23 ++++++++---------------
 1 file changed, 8 insertions(+), 15 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2020-03-16 08:23:46 UTC (rev 599096)
+++ PKGBUILD	2020-03-16 08:35:59 UTC (rev 599097)
@@ -8,12 +8,12 @@
 pkgbase=libindicator
 pkgname=("${pkgbase}-gtk"{2,3})
 pkgver=12.10.1
-pkgrel=8
+pkgrel=9
 pkgdesc='Set of symbols and convenience functions for Ayatana indicators'
 url='https://launchpad.net/libindicator'
 arch=('x86_64')
 license=('GPL3')
-makedepends=('gtk2' 'gtk3' 'pkg-config' 'python')
+makedepends=('gtk2' 'gtk3' 'python')
 source=(https://launchpad.net/${pkgbase}/${pkgver%.*}/${pkgver}/+download/${pkgbase}-${pkgver}.tar.gz{,.asc})
 sha512sums=('d6d77d0309b15cf6b52539323920ab0c1594cb1c1cef8a8d67cd0f76f8ceeeac28eb6db6227563df1932e6f1fadcffac68d82982182b745257dfaf91f1c945af'
             'SKIP')
@@ -21,13 +21,8 @@
 
 prepare() {
   (cd ${pkgbase}-${pkgver}
-    sed '/-Werror/s/$/ -Wno-deprecated-declarations/' -i ${pkgbase}/Makefile.{am,in}
-    sed 's/LIBINDICATOR_LIBS+="$LIBM"/LIBINDICATOR_LIBS+=" $LIBM"/g' -i configure
-    sed 's/LIBM="-lmw"/LIBM=" -lmw"/g' -i configure
-    sed 's/LIBM="-lm"/LIBM=" -lm"/g' -i configure
-    sed 's/LIBS="-lm  $LIBS"/LIBS=" -lm  $LIBS"/g' -i configure
-    sed 's/LIBS="-lmw  $LIBS"/LIBS=" -lmw  $LIBS"/g' -i configure
-    sed 's/LIBM="-lm"/LIBM=" -lm"/g' -i m4/libtool.m4
+    sed -i 's/-Werror//' {libindicator,tools}/Makefile.am
+    autoreconf -fi
   )
   cp -ra ${pkgbase}-${pkgver}{,-gtk2}
 }
@@ -43,6 +38,7 @@
       --with-gtk=3 \
       --disable-static \
       --disable-tests
+    sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool
     make
   )
 
@@ -56,6 +52,7 @@
       --with-gtk=2 \
       --disable-static \
       --disable-tests
+    sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool
     make
   )
 }
@@ -63,11 +60,9 @@
 package_libindicator-gtk2() {
   pkgdesc+=" (GTK+ 2 library)"
   depends=('gtk2')
-  provides=("${pkgbase}")
-  conflicts=("${pkgbase}")
 
   cd ${pkgbase}-${pkgver}-gtk2
-  make -j1 DESTDIR="${pkgdir}" install
+  make DESTDIR="${pkgdir}" install
   rm -rf "${pkgdir}"/usr/share
 }
 
@@ -74,11 +69,9 @@
 package_libindicator-gtk3() {
   pkgdesc+=" (GTK+ 3 library)"
   depends=('gtk3')
-  provides=("${pkgbase}3")
-  conflicts=("${pkgbase}3")
 
   cd ${pkgbase}-${pkgver}
-  make -j1 DESTDIR="${pkgdir}" install
+  make DESTDIR="${pkgdir}" install
   rm -rf "${pkgdir}"/usr/share
 }