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

[Balló György]

    Date: Tuesday, March 17, 2020 @ 11:47:04
  Author: bgyorgy
Revision: 600153

upgpkg: lib32-libindicator 12.10.1-8: Fix build

Modified:
  lib32-libindicator/trunk/PKGBUILD

----------+
 PKGBUILD |   21 +++++++--------------
 1 file changed, 7 insertions(+), 14 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2020-03-17 11:40:20 UTC (rev 600152)
+++ PKGBUILD	2020-03-17 11:47:04 UTC (rev 600153)
@@ -7,7 +7,7 @@
 pkgbase=lib32-${_pkgbase}
 pkgname=("${pkgbase}-gtk"{2,3})
 pkgver=12.10.1
-pkgrel=7
+pkgrel=8
 pkgdesc='Set of symbols and convenience functions for Ayatana indicators (32-bit)'
 url='https://launchpad.net/libindicator'
 arch=('x86_64')
@@ -20,13 +20,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}
 }
@@ -47,6 +42,7 @@
       --with-gtk=3 \
       --disable-static \
       --disable-tests
+    sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool
     make
   )
 
@@ -61,6 +57,7 @@
       --with-gtk=2 \
       --disable-static \
       --disable-tests
+    sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool
     make
   )
 }
@@ -68,11 +65,9 @@
 package_lib32-libindicator-gtk2() {
   pkgdesc+=" (GTK+ 2 library)"
   depends=("${_pkgbase}-gtk2" 'lib32-gtk2')
-  provides=("${pkgbase}")
-  conflicts=("${pkgbase}")
 
   cd ${_pkgbase}-${pkgver}-gtk2
-  make -j1 DESTDIR="${pkgdir}" install
+  make DESTDIR="${pkgdir}" install
   rm -rf "${pkgdir}"/usr/{include,share,bin}
 }
 
@@ -79,11 +74,9 @@
 package_lib32-libindicator-gtk3() {
   pkgdesc+=" (GTK+ 3 library)"
   depends=("${_pkgbase}-gtk3" 'lib32-gtk3')
-  provides=("${pkgbase}3")
-  conflicts=("${pkgbase}3")
 
   cd ${_pkgbase}-${pkgver}
-  make -j1 DESTDIR="${pkgdir}" install
+  make DESTDIR="${pkgdir}" install
   rm -rf "${pkgdir}"/usr/{include,share,bin}
 }