Revert to the temporary fix from -4 for now

3 files changed, 14 insertions, 6 deletions

diff --git a/.SRCINFO b/.SRCINFO
index a4af04958343..c824fb1fb19b 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = orbit2
 	pkgdesc = Thin/fast CORBA ORB
 	pkgver = 2.14.19
-	pkgrel = 5
+	pkgrel = 6
 	url = https://projects.gnome.org/ORBit2/
 	arch = i686
 	arch = x86_64
@@ -9,11 +9,15 @@ pkgbase = orbit2
 	license = GPL
 	makedepends = gtk-doc
 	depends = libidl2
+	noextract = libname-server-2.a
+	options = !makeflags
 	options = staticlibs
 	source = https://download.gnome.org/sources/ORBit2/2.14/ORBit2-2.14.19.tar.bz2
 	source = git-fixes.patch
+	source = libname-server-2.a
 	sha256sums = 55c900a905482992730f575f3eef34d50bda717c197c97c08fa5a6eafd857550
 	sha256sums = 7f145ed715d5a1d7f6ccf1e9bcce6a6a584a6b125845a84a3d69bfe30b0d6e04
+	sha256sums = 41a7f7b169676a30a3b1a312dc9cd12ead58f1ef9674dc10deb2941cc86a5fb5
 
 pkgname = orbit2
 
diff --git a/PKGBUILD b/PKGBUILD
index 70cc8ae911ef..6ac8f2744720 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -4,20 +4,24 @@
 
 pkgname=orbit2
 pkgver=2.14.19
-pkgrel=5
+pkgrel=6
 pkgdesc="Thin/fast CORBA ORB"
 arch=('i686' 'x86_64')
 license=('LGPL' 'GPL')
 depends=('libidl2')
 makedepends=('gtk-doc')
-options=('staticlibs')
+options=('!makeflags' 'staticlibs')
 url="https://projects.gnome.org/ORBit2/"
 source=(https://download.gnome.org/sources/ORBit2/2.14/ORBit2-${pkgver}.tar.bz2
-        git-fixes.patch)
+        git-fixes.patch
+        libname-server-2.a)
+noextract=(libname-server-2.a)
 sha256sums=('55c900a905482992730f575f3eef34d50bda717c197c97c08fa5a6eafd857550'
-            '7f145ed715d5a1d7f6ccf1e9bcce6a6a584a6b125845a84a3d69bfe30b0d6e04')
+            '7f145ed715d5a1d7f6ccf1e9bcce6a6a584a6b125845a84a3d69bfe30b0d6e04'
+            '41a7f7b169676a30a3b1a312dc9cd12ead58f1ef9674dc10deb2941cc86a5fb5')
 
 prepare() {
+  cp libname-server-2.a ORBit2-$pkgver/src/services/name/
   cd ORBit2-$pkgver
   patch -Np1 -i ../git-fixes.patch
 }
@@ -31,5 +35,5 @@ build() {
 
 package() {
   cd ORBit2-$pkgver
-  make DESTDIR="${pkgdir}" -j1 install
+  make DESTDIR="${pkgdir}" install
 }
diff --git a/libname-server-2.a b/libname-server-2.a
new file mode 100644
index 000000000000..22a2a4dc949e
--- /dev/null
+++ b/libname-server-2.a