Seems like upstream fixed their missing libtool scripts.

3 files changed, 5 insertions, 20 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 7337be8fd4fd..66553bb13495 100755
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = pulseaudio-git
 	pkgdesc = A featureful, general-purpose sound server (development version)
-	pkgver = v12.0.271.g904dd3800
-	pkgrel = 2
+	pkgver = v12.0.309.geadd987a6
+	pkgrel = 1
 	url = http://pulseaudio.org/
 	arch = i686
 	arch = x86_64
@@ -84,7 +84,6 @@ pkgbase = pulseaudio-git
 	backup = etc/pulse/system.pa
 	backup = etc/pulse/client.conf
 	source = git+git://anongit.freedesktop.org/pulseaudio/pulseaudio
-	source = fixlibtool
 	sha256sums = SKIP
 	sha256sums = 8478cb2b495d3ef4844b700140d04ecbcbeb06d5d7bdae5308dec2b74a2c59c4
 
diff --git a/PKGBUILD b/PKGBUILD
index 36816c3f0e96..fa1e8e5c6d74 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -10,8 +10,8 @@
 _pkgname="pulseaudio"
 pkgname="$_pkgname-git"
 pkgdesc="A featureful, general-purpose sound server (development version)"
-pkgver=v12.0.271.g904dd3800
-pkgrel=2
+pkgver=v12.0.309.geadd987a6
+pkgrel=1
 arch=("i686" "x86_64" "armv7h")
 url="http://pulseaudio.org/"
 license=("GPL" "LGPL")
@@ -29,8 +29,7 @@ backup=(etc/pulse/{daemon.conf,default.pa,system.pa,client.conf})
 provides=(pulseaudio{,-{zeroconf,lirc,jack,bluetooth,equalizer}} "libpulse") #"pulseaudio-xen" "pulseaudio-gconf"
 conflicts=(pulseaudio{,-{zeroconf,lirc,jack,bluetooth,equalizer}} "libpulse") #"pulseaudio-xen" "pulseaudio-gconf"
 options=(!emptydirs)
-source=("git+git://anongit.freedesktop.org/pulseaudio/pulseaudio"
-        'fixlibtool')
+source=("git+git://anongit.freedesktop.org/pulseaudio/pulseaudio")
 sha256sums=('SKIP'
             '8478cb2b495d3ef4844b700140d04ecbcbeb06d5d7bdae5308dec2b74a2c59c4')
 
@@ -60,9 +59,6 @@ build() {
         --disable-default-build-tests \
         DATADIRNAME=share
 
-    #Incomplete libtool breaks LTO, possibly other things.
-    patch -Np2 < ../fixlibtool
-
     # fight unused direct deps
     sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool
 
diff --git a/fixlibtool b/fixlibtool
deleted file mode 100644
index 45d4e65ee9e7..000000000000
--- a/fixlibtool
+++ /dev/null
@@ -1,10 +0,0 @@
---- src/pulseaudio/libtool	2019-03-08 23:19:38.517861857 +0900
-+++ src/pulseaudio/libtool	2019-03-08 23:36:25.137849805 +0900
-@@ -176,5 +176,5 @@
- # Take the output of nm and produce a listing of raw symbols and C names.
--global_symbol_pipe=""
-+global_symbol_pipe="sed -n -e 's/^.*[	 ]\\([ABCDGIRSTW][ABCDGIRSTW]*\\)[	 ][	 ]*\\([_A-Za-z][_A-Za-z0-9]*\\)\$/\\1 \\2 \\2/p' | sed '/ __gnu_lto/d'"
-
- # Transform the output of nm in a proper C declaration.
--global_symbol_to_cdecl=""
-+global_symbol_to_cdecl="sed -n -e 's/^T .* \\(.*\\)\$/extern int \\1();/p' -e 's/^[ABCDGIRSTW][ABCDGIRSTW]* .* \\(.*\\)\$/extern char \\1;/p'"