[arch-commits] Commit in xplc/trunk (3 files)

[Andreas Radke]

    Date: Friday, February 4, 2022 @ 22:23:33
  Author: andyrtr
Revision: 1126178

upgpkg: xplc 0.3.13-9: fix build; remove broken symlink

Added:
  xplc/trunk/0001-Fix-narrowing-conversion-error.patch
  xplc/trunk/xplc-0.3.13-as-needed.patch
Modified:
  xplc/trunk/PKGBUILD

-------------------------------------------+
 0001-Fix-narrowing-conversion-error.patch |   11 +++++++++++
 PKGBUILD                                  |   23 ++++++++++++++++-------
 xplc-0.3.13-as-needed.patch               |   22 ++++++++++++++++++++++
 3 files changed, 49 insertions(+), 7 deletions(-)

Added: 0001-Fix-narrowing-conversion-error.patch
===================================================================
--- 0001-Fix-narrowing-conversion-error.patch	                        (rev 0)
+++ 0001-Fix-narrowing-conversion-error.patch	2022-02-04 22:23:33 UTC (rev 1126178)
@@ -0,0 +1,11 @@
+--- xplc-0.3.13/xplc/moduleloader.cpp	2005-04-27 23:38:09.000000000 +0200
++++ xplc-0.3.13/xplc/moduleloader.cpp.new	2022-02-04 23:09:50.554289277 +0100
+@@ -60,7 +60,7 @@
+     return NULL;
+   }
+ 
+-  switch(moduleinfo->version_major) {
++  switch((int)moduleinfo->version_major) {
+ #ifdef UNSTABLE
+   case -1:
+     /* nothing to do */

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2022-02-04 22:22:51 UTC (rev 1126177)
+++ PKGBUILD	2022-02-04 22:23:33 UTC (rev 1126178)
@@ -3,19 +3,27 @@
 
 pkgname=xplc
 pkgver=0.3.13
-pkgrel=8
+pkgrel=9
 pkgdesc="Cross-Platform Lightweight Components"
 arch=('x86_64')
 url="http://xplc.sourceforge.net"
 license=('LGPL')
 depends=('gcc-libs')
-source=("https://downloads.sourceforge.net/${pkgname}/$pkgname-$pkgver.tar.gz")
-md5sums=('39da3270527c8712b8e8fcf03768d29f')
-options=('!buildflags')
+source=("https://downloads.sourceforge.net/${pkgname}/$pkgname-$pkgver.tar.gz"
+        0001-Fix-narrowing-conversion-error.patch
+        xplc-0.3.13-as-needed.patch)
+md5sums=('39da3270527c8712b8e8fcf03768d29f'
+         '049ca1c475703c52b2e11d06bfb676fc'
+         '308e3b8f7d7f6a7df05699bdcaed9b18')
 
+prepare() {
+  cd "$pkgname-$pkgver"
+  patch -Np1 -i ../0001-Fix-narrowing-conversion-error.patch
+  patch -Np0 -i ../xplc-0.3.13-as-needed.patch # Gentoo
+}
+
 build() {
-  cd "$srcdir/$pkgname-$pkgver"
-  
+  cd "$pkgname-$pkgver"
   ./configure --prefix=/usr \
     --mandir=/usr/share/man \
     --without-libuuid
@@ -23,9 +31,10 @@
 }
 
 package() {
-  cd "$srcdir/$pkgname-$pkgver"
+  cd "$pkgname-$pkgver"
   make DESTDIR="$pkgdir" install
 
   mv "$pkgdir/usr/share/man/man1/"{uuidgen.1,uuidcdef.1}
   rm -f "$pkgdir/usr/bin/uuidgen"
+  rm "$pkgdir"/usr/lib/xplc-0.3.13/libxplc_s.a
 }

Added: xplc-0.3.13-as-needed.patch
===================================================================
--- xplc-0.3.13-as-needed.patch	                        (rev 0)
+++ xplc-0.3.13-as-needed.patch	2022-02-04 22:23:33 UTC (rev 1126178)
@@ -0,0 +1,22 @@
+--- config/rules.mk.orig	2006-05-06 19:28:46.000000000 +0200
++++ config/rules.mk	2006-05-06 19:28:53.000000000 +0200
+@@ -44,7 +44,7 @@
+ 	$(RANLIB) $@
+ 
+ %.so:
+-	$(LINK.cc) $(SHARED) $^ -o $@
++	$(LINK.cc) $(SHARED) $^ $(LDLIBS) -o $@
+ 
+ %.dll:
+ 	$(LINK.cc) $(SHARED) $^ -o $@
+--- xplc/vars.mk.orig	2006-05-06 19:32:06.000000000 +0200
++++ xplc/vars.mk	2006-05-06 19:32:12.000000000 +0200
+@@ -32,7 +32,7 @@
+ 
+ ifneq ("$(enable_loader)", "no")
+ ifneq ("$(with_dlopen)", "no")
+-libxplc.so: LDFLAGS+=$(with_dlopen)
++libxplc.so: LDLIBS+=$(with_dlopen)
+ endif
+ endif
+