[arch-commits] Commit in lowdown/trunk (PKGBUILD shared.patch)

[George Rawlinson]

    Date: Tuesday, November 16, 2021 @ 01:29:44
  Author: grawlinson
Revision: 1048603

upgpkg: lowdown 0.10.0-2

* Generate shared instead of static library.
* Fix missing link (libmd) in library.

Added:
  lowdown/trunk/shared.patch
Modified:
  lowdown/trunk/PKGBUILD

--------------+
 PKGBUILD     |   23 +++++++++++++++++++----
 shared.patch |   42 ++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 61 insertions(+), 4 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2021-11-16 00:05:56 UTC (rev 1048602)
+++ PKGBUILD	2021-11-16 01:29:44 UTC (rev 1048603)
@@ -5,22 +5,37 @@
 pkgdesc="A simple Markdown translator"
 pkgver=0.10.0
 _pkgver="VERSION_${pkgver//./_}"
-pkgrel=1
+pkgrel=2
 license=('ISC')
 url="https://kristaps.bsd.lv/lowdown"
 arch=('x86_64')
 depends=('glibc' 'libmd')
-source=("$pkgname-$pkgver.tar.gz::https://github.com/kristapsdz/lowdown/archive/$_pkgver.tar.gz")
-sha512sums=('7454e618607628ec0a1649f44f5ec64f8778ecaa151f6aad4984935e297abfe8e84ffc321d3c93cec5d336ff14b6bf9a0ff9054e7363cc58ba708a5b60db9048')
-b2sums=('93d87e3aca2466398a625750b928062fbafd26311899e52ddd8264218675e78d30714c920f3331619fcd510a92cc6046401c946f5bd1465d6fd46f26937318ac')
+source=(
+  "$pkgname-$pkgver.tar.gz::https://github.com/kristapsdz/lowdown/archive/$_pkgver.tar.gz"
+  'shared.patch'
+)
+sha512sums=('7454e618607628ec0a1649f44f5ec64f8778ecaa151f6aad4984935e297abfe8e84ffc321d3c93cec5d336ff14b6bf9a0ff9054e7363cc58ba708a5b60db9048'
+            'ade69503093b22ea392a2a76f0979a89c8f0676532a823250791f33f3bad06dea5d12f314b9c35fed8bea9e031334d591f5a301078cc87ec4cebc759b86bc650')
+b2sums=('93d87e3aca2466398a625750b928062fbafd26311899e52ddd8264218675e78d30714c920f3331619fcd510a92cc6046401c946f5bd1465d6fd46f26937318ac'
+        '746230be62fcc61e2e4850ef1b5989b2b03dbbbdce52edd790e1c5571977172149bf6d25c9be7d80d267bb2f783096d0cbecc92f5957444935b90d633b445351')
 
 prepare() {
   cd "$pkgname-$_pkgver"
+
+  # convert to shared library
+  # NOTE: https://github.com/kristapsdz/lowdown/commit/e33536ae131e31adf77d3258c0cdd3da10868534
+  # NOTE: ensure -lmd is passed to .so after next version
+  patch --forward --strip=1 --input="$srcdir/shared.patch"
 }
 
 build () {
   cd "$pkgname-$_pkgver"
+
 	./configure PREFIX=/usr MANDIR=/usr/share/man
+
+  # ensure LDFLAGS is passed correctly
+  sed -i "s/^LDFLAGS.*/LDFLAGS = $LDFLAGS/" Makefile.configure
+
 	make
 }
 

Added: shared.patch
===================================================================
--- shared.patch	                        (rev 0)
+++ shared.patch	2021-11-16 01:29:44 UTC (rev 1048603)
@@ -0,0 +1,42 @@
+diff --git a/Makefile b/Makefile
+index 955f737..2c9532c 100644
+--- a/Makefile
++++ b/Makefile
+@@ -80,7 +80,7 @@ REGRESS_ARGS	+= "--parse-no-autolink"
+ REGRESS_ARGS	+= "--parse-no-cmark"
+ REGRESS_ARGS	+= "--parse-no-deflists"
+ 
+-all: lowdown lowdown-diff lowdown.pc
++all: lowdown lowdown-diff liblowdown.so lowdown.pc
+ 
+ www: $(HTMLS) $(PDFS) $(THUMBS) lowdown.tar.gz lowdown.tar.gz.sha512
+ 
+@@ -101,6 +101,10 @@ lowdown-diff: lowdown
+ liblowdown.a: $(OBJS) $(COMPAT_OBJS)
+ 	$(AR) rs $@ $(OBJS) $(COMPAT_OBJS)
+ 
++%.o: CFLAGS += -fPIC
++liblowdown.so: $(OBJS) $(COMPAT_OBJS)
++	$(CC) -shared -o $@ $(OBJS) $(COMPAT_OBJS) $(LDFLAGS) $(LDADD_MD5)
++
+ install: all
+ 	mkdir -p $(DESTDIR)$(BINDIR)
+ 	mkdir -p $(DESTDIR)$(LIBDIR)/pkgconfig
+@@ -111,7 +114,7 @@ install: all
+ 	$(INSTALL_DATA) lowdown.pc $(DESTDIR)$(LIBDIR)/pkgconfig
+ 	$(INSTALL_PROGRAM) lowdown $(DESTDIR)$(BINDIR)
+ 	$(INSTALL_PROGRAM) lowdown-diff $(DESTDIR)$(BINDIR)
+-	$(INSTALL_LIB) liblowdown.a $(DESTDIR)$(LIBDIR)
++	$(INSTALL_LIB) liblowdown.so $(DESTDIR)$(LIBDIR)
+ 	$(INSTALL_DATA) lowdown.h $(DESTDIR)$(INCLUDEDIR)
+ 	for f in $(MANS) ; do \
+ 		name=`basename $$f .html` ; \
+@@ -199,7 +202,7 @@ main.o: lowdown.h
+ 
+ clean:
+ 	rm -f $(OBJS) $(COMPAT_OBJS) main.o
+-	rm -f lowdown lowdown-diff liblowdown.a lowdown.pc
++	rm -f lowdown lowdown-diff liblowdown.so lowdown.pc
+ 	rm -f index.xml diff.xml diff.diff.xml README.xml lowdown.tar.gz.sha512 lowdown.tar.gz
+ 	rm -f $(PDFS) $(HTMLS) $(THUMBS)
+