Initial add discount 2.2.7b - a dependeny fo okular

Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
2022-10-09 16:46:09 +02:00
parent 5e19de12d0
commit 5c33aae970
7 changed files with 224 additions and 0 deletions
--- a/recipes-support/discount/discount.bb
+++ b/recipes-support/discount/discount.bb
@@ -0,0 +1,44 @@
+SUMMARY = "A C implementation of John Gruber’s Markdown text to html language"
+HOMEPAGE = "https://www.pell.portland.or.us/~orc/Code/discount/"
+LICENSE = "BSD-3-Clause"
+LIC_FILES_CHKSUM = "file://COPYRIGHT;md5=4fce0411d71254cfa33e28dba1458f18"
+
+SRC_URI = " \
+    https://www.pell.portland.or.us/~orc/Code/${BPN}/${BPN}-${PV}.tar.bz2 \
+    file://0001-Do-not-run-ldconfig.patch \
+    file://0002-Avoid-stripping-during-install.patch \
+    file://0003-fixldflags.patch \
+"
+SRC_URI:append:class-target = " \
+    file://0004-Do-not-build-use-cross-config.sed.patch \
+    file://0005-Use-native-mktags.patch \
+    file://0006-Use-native-branch.patch \
+"
+PV = "2.2.7b"
+SRC_URI[sha256sum] = "b9368cc2063831635f9e790d0c4c338c2b4b72658cdc244323241bfcddf6ffd5"
+
+inherit autotools-brokensep pkgconfig
+
+DEPENDS += " \
+    ${BPN}-native \
+"
+
+do_configure() {
+    ./configure.sh \
+        --shared \
+        --prefix=${prefix} \
+        --execdir=${bindir} \
+        --libdir=${libdir} \
+        --mandir=${mandir} \
+        --enable-all-features \
+        --with-fenced-code \
+        --pkg-config
+}
+
+do_install:append:class-native() {
+    for exec in branch cols config.sed echo mktags; do
+        install ${B}/$exec ${D}${bindir}
+    done
+}
+
+BBCLASSEXTEND = "native"
--- a/recipes-support/discount/files/0001-Do-not-run-ldconfig.patch
+++ b/recipes-support/discount/files/0001-Do-not-run-ldconfig.patch
@@ -0,0 +1,30 @@
+From 830a839db0786cfb627c8531e4f41d1823b0cc60 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com>
+Date: Sun, 9 Oct 2022 15:46:25 +0200
+Subject: [PATCH] Do not run ldconfig
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
+---
+ configure.inc | 3 ---
+ 1 file changed, 3 deletions(-)
+
+diff --git a/configure.inc b/configure.inc
+index fd0c9ba..a5520da 100755
+--- a/configure.inc
+++ b/configure.inc
+@@ -1500,9 +1500,6 @@ files)  echo "\$FULLNAME" "\$LIBNAME" "\$LIBNAME.\$MAJOR"
+ install)$PROG_INSTALL -c \$FULLNAME "\$1"
+ 	$PROG_LN_S -f \$FULLNAME \$1/\$LIBNAME.\$MAJOR
+ 	$PROG_LN_S -f \$FULLNAME \$1/\$LIBNAME
+-EOF
+-    test "$LDCONFIG" && echo '	'$LDCONFIG '"$1"' >> librarian.sh
+-    cat >> librarian.sh << EOF
+ 	;;
+ esac
+ EOF
+-- 
+2.35.3
+
--- a/recipes-support/discount/files/0002-Avoid-stripping-during-install.patch
+++ b/recipes-support/discount/files/0002-Avoid-stripping-during-install.patch
@@ -0,0 +1,29 @@
+From ca994b375cb6cd8857fb824162d508320af94711 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com>
+Date: Sun, 9 Oct 2022 15:58:53 +0200
+Subject: [PATCH] Avoid stripping during install
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
+---
+ configure.inc | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/configure.inc b/configure.inc
+index a5520da..fb462d4 100755
+--- a/configure.inc
+++ b/configure.inc
+@@ -1603,7 +1603,7 @@ AC_PROG_INSTALL () {
+     rm -f ngc$$ ngc$$.c
+ 
+     AC_SUB 'INSTALL' "$PROG_INSTALL"
+-    AC_SUB 'INSTALL_PROGRAM' "$PROG_INSTALL $_strip -m 755"
+    AC_SUB 'INSTALL_PROGRAM' "$PROG_INSTALL -m 755"
+     AC_SUB 'INSTALL_DATA' "$PROG_INSTALL -m 444"
+ 
+     # finally build a little directory installer
+-- 
+2.35.3
+
--- a/recipes-support/discount/files/0003-fixldflags.patch
+++ b/recipes-support/discount/files/0003-fixldflags.patch
@@ -0,0 +1,33 @@
+From 55cea9c59fb35999f186f44af40f512d7f23871b Mon Sep 17 00:00:00 2001
+From: Balint Reczey <balint.reczey@canonical.com>
+Date: Sat, 10 Oct 2020 21:21:48 +0200
+Subject: [PATCH] Honor system's LDFLAGS in librarian.sh
+
+Fixes #228.
+---
+ configure.inc | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/configure.inc b/configure.inc
+index 97ff6b94..ac0f973f 100755
+--- a/configure.inc
+++ b/configure.inc
+@@ -1428,7 +1428,7 @@ LIBNAME=\$LIBRARY.dylib
+ FULLNAME=\$LIBNAME
+ 
+ case "\$ACTION" in
+-make)   FLAGS="$AC_CFLAGS -dynamiclib"
+make)   FLAGS="$AC_CFLAGS $AC_LDFLAGS -dynamiclib"
+ 	VFLAGS="-current_version \$VERSION -compatibility_version \$MAJOR"
+ 
+ 	rm -f \$LIBRARY
+@@ -1483,7 +1483,7 @@ LIBNAME=\$LIBRARY.so
+ FULLNAME=\$LIBNAME.\$VERSION
+ 
+ case "\$ACTION" in
+-make)   FLAGS="$AC_CFLAGS -shared"
+make)   FLAGS="$AC_CFLAGS $AC_LDFLAGS -shared"
+ 	unset VFLAGS
+ 	test "$USE_SONAME" && VFLAGS="-Wl,-soname,\$LIBNAME.\$MAJOR"
+ 
+
--- a/recipes-support/discount/files/0004-Do-not-build-use-cross-config.sed.patch
+++ b/recipes-support/discount/files/0004-Do-not-build-use-cross-config.sed.patch
@@ -0,0 +1,30 @@
+From dfdc4e9f37ed077d5ab0a098568b81c37f11d3f2 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com>
+Date: Sun, 9 Oct 2022 16:04:17 +0200
+Subject: [PATCH] Do not build/use cross config.sed
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
+---
+ configure.inc | 3 +--
+ 1 file changed, 1 insertion(+), 2 deletions(-)
+
+diff --git a/configure.inc b/configure.inc
+index fb462d4..b55c9f1 100755
+--- a/configure.inc
+++ b/configure.inc
+@@ -1785,8 +1785,7 @@ AC_SUB() {
+ 
+     echo "target=$_target, rest=$*"
+     
+-    __ac_config_sed
+-    ./config.sed "$_target" "$*" >> "$__cwd"/config.sub
+    config.sed "$_target" "$*" >> "$__cwd"/config.sub
+ }
+ #
+ # AC_TEXT writes arbitrary text into config.h
+-- 
+2.35.3
+
--- a/recipes-support/discount/files/0005-Use-native-mktags.patch
+++ b/recipes-support/discount/files/0005-Use-native-mktags.patch
@@ -0,0 +1,29 @@
+From 7e2344053441647b6ece33fb6076b6ab302ba144 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com>
+Date: Sun, 9 Oct 2022 16:11:25 +0200
+Subject: [PATCH] Use native mktags
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
+---
+ Makefile.in | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/Makefile.in b/Makefile.in
+index 085fbd5..b73f301 100644
+--- a/Makefile.in
+++ b/Makefile.in
+@@ -93,7 +93,7 @@ VERSION:
+ tags.o: tags.c cstring.h tags.h blocktags
+ 
+ blocktags: mktags
+-	./mktags > blocktags
+	mktags > blocktags
+ 
+ mktags: mktags.o
+ 	$(LINK) -o mktags mktags.o
+-- 
+2.35.3
+
--- a/recipes-support/discount/files/0006-Use-native-branch.patch
+++ b/recipes-support/discount/files/0006-Use-native-branch.patch
@@ -0,0 +1,29 @@
+From a674c42d51c4b1f3818e939d6b275e35e74d6802 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com>
+Date: Sun, 9 Oct 2022 16:19:09 +0200
+Subject: [PATCH] Use native 'branch'
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
+---
+ Makefile.in | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/Makefile.in b/Makefile.in
+index b73f301..e24040a 100644
+--- a/Makefile.in
+++ b/Makefile.in
+@@ -85,7 +85,7 @@ $(DESTDIR)$(LIBDIR):
+ @MK_PKGCONFIG@	$(INSTALL_DIR) $(DESTDIR)$(PKGDIR)
+ 
+ version.o: version.c VERSION branch
+-	$(BUILD) -DBRANCH=`./branch` -DVERSION=\"`cat VERSION`\" -c version.c
+	$(BUILD) -DBRANCH=`branch` -DVERSION=\"`cat VERSION`\" -c version.c
+ 
+ VERSION:
+ 	@true
+-- 
+2.35.3
+