wallenstein/void-packages
1
0
Fork 0
mirror of https://github.com/void-linux/void-packages.git synced 2025-06-08 16:13:50 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

discount: update to 2.2.3.

Browse source
This commit is contained in:
Leah Neukirchen 2018-02-28 13:02:34 +01:00
parent 4f84877502
commit 0e200be7fa
3 changed files with 64 additions and 71 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

110
srcpkgs/discount/patches/cross-configure_inc.patch
View file

@ -1,29 +1,16 @@
Replace the compile time check for the scalar types required Replace the compile time check for the scalar types required
to replace BYTE, WORD and DWORD with stdint.h types. to replace BYTE, WORD and DWORD with stdint.h types.
--- configure.inc 2017-01-19 03:42:06.000000000 +0100 --- configure.inc.orig
+++ configure.inc 2018-01-01 18:49:05.494530670 +0100 +++ configure.inc
@@ -895,86 +895,28 @@ @@ -948,81 +948,27 @@
rc=1 rc=1
LOGN "defining WORD & DWORD scalar types" LOGN "defining WORD & DWORD scalar types"
-
-# --- is this needed anymore? ---
-# if AC_QUIET AC_CHECK_HEADERS WinDef.h; then -# if AC_QUIET AC_CHECK_HEADERS WinDef.h; then
-# # windows machine; BYTE, WORD, DWORD already -# # windows machine; BYTE, WORD, DWORD already
-# # defined -# # defined
-# -# echo "#include <WinDef.h>" >> "$__cwd"/config.h
-# for x in $@; do
-# case "$x" in
-# sub)AC_SUB DWORD DWORD
-# AC_SUB WORD WORD
-# AC_SUB BYTE BYTE
-# ;;
-# *)
-# echo "#include <WinDef.h>" >> "$__cwd"/config.h
-# ;;
-# esac
-# done
-# TLOG " (defined in WinDef.h)" -# TLOG " (defined in WinDef.h)"
-# return 0 -# return 0
-# fi -# fi
@ -41,6 +28,7 @@ to replace BYTE, WORD and DWORD with stdint.h types.
- : "s:@%s@:%s:g\n", w, v); - : "s:@%s@:%s:g\n", w, v);
-} -}
- -
-int
-main(argc, argv) -main(argc, argv)
-char **argv; -char **argv;
-{ -{
@ -56,71 +44,77 @@ to replace BYTE, WORD and DWORD with stdint.h types.
- else if (sizeof v_int == 4) - else if (sizeof v_int == 4)
- say("DWORD", "unsigned int"); - say("DWORD", "unsigned int");
- else - else
- exit(1); - return 1;
- -
- if (sizeof v_int == 2) - if (sizeof v_int == 2)
- say("WORD", "unsigned int"); - say("WORD", "unsigned int");
- else if (sizeof v_short == 2) - else if (sizeof v_short == 2)
- say("WORD", "unsigned short"); - say("WORD", "unsigned short");
- else - else
- exit(2); - return 2;
-
- say("BYTE", "unsigned char"); - say("BYTE", "unsigned char");
- exit(0); - fprintf(stderr, "OK!");
- return 0;
-} -}
-EOF -EOF
-
- if $AC_CC ngc$$.c -o ngc$$; then - if $AC_CC ngc$$.c -o ngc$$; then
- while [ "$1" ]; do - if [ $# -gt 0 ]; then
- case "$1" in - while [ "$1" ]; do
- sub)if ./ngc$$ sub >> "$__cwd"/config.sub; then - case "$1" in
- rc=0 - sub)if ./ngc$$ sub >> "$__cwd"/config.sub; then
- fi;; - rc=0
- *) if ./ngc$$ >> "$__cwd"/config.h; then - fi;;
- rc=0 - *) if ./ngc$$ >> "$__cwd"/config.h; then
- fi ;; - rc=0
- esac - fi ;;
- shift - esac
- done - shift
- done
- elif ./ngc$$ >> "$__cwd"/config.h; then
- rc=0
- fi
- if [ "$rc" != 0 ]; then - if [ "$rc" != 0 ]; then
- if ./ngc$$ >> "$__cwd"/config.h; then - if ./ngc$$ >> "$__cwd"/config.h; then
- rc=1 - rc=0
- fi - fi
- fi - fi
- fi - fi
- __remove ngc$$ ngc$$.c - __remove ngc$$ ngc$$.c
+ + while [ "$1" ]; do
+ while [ "$1" ]; do + case "$1" in
+ case "$1" in + sub) # substitution strings for BYTE, WORD, DWORD
+ sub) # substitution strings for BYTE, WORD, DWORD + echo "s:@DWORD@:uint32_t:g" >> "$__cwd"/config.sub
+ echo "s:@DWORD@:uint32_t:g" >> "$__cwd"/config.sub + echo "s:@WORD@:uint16_t:g" >> "$__cwd"/config.sub
+ echo "s:@WORD@:uint16_t:g" >> "$__cwd"/config.sub + echo "s:@BYTE@:uint8_t:g" >> "$__cwd"/config.sub
+ echo "s:@BYTE@:uint8_t:g" >> "$__cwd"/config.sub + rc=0
+ rc=0
+ ;; + ;;
+ hdr) # config.h definitions for BYTE, WORD, DWORD + hdr) # config.h definitions for BYTE, WORD, DWORD
+ echo "#include <stdint.h>" >> "$__cwd"/config.h + echo "#include <stdint.h>" >> "$__cwd"/config.h
+ echo "#define BYTE uint8_t" >> "$__cwd"/config.h + echo "#define BYTE uint8_t" >> "$__cwd"/config.h
+ echo "#define WORD uint16_t" >> "$__cwd"/config.h + echo "#define WORD uint16_t" >> "$__cwd"/config.h
+ echo "#define DWORD uint32_t" >> "$__cwd"/config.h + echo "#define DWORD uint32_t" >> "$__cwd"/config.h
+ rc=0 + rc=0
+ ;; + ;;
+ *) # unknown parameter + *) # unknown parameter
+ LOGN "(unknown: $1)" + LOGN "(unknown: $1)"
+ ;; + ;;
+ esac + esac
+ shift + shift
+ done + done
case "$rc" in case "$rc" in
0) TLOG "" ;; 0) TLOG "" ;;
*) AC_FAIL " ** FAILED **" ;; *) AC_FAIL " ** FAILED **" ;;
@@ -1548,7 +1548,7 @@ @@ -1703,7 +1649,7 @@
} }
EOF EOF
- $AC_CC -o config.sed ngc$$.c - if $AC_CC -o config.sed ngc$$.c; then
+ cc -o config.sed ngc$$.c + if cc -o config.sed ngc$$.c; then
status=$? rm -f ngc$$.c
rm -f ngc$$.c __config_files="$__config_files config.sed"
else
--- mkdio.h.in 2017-01-19 03:42:06.000000000 +0100 --- mkdio.h.in 2017-01-19 03:42:06.000000000 +0100
+++ mkdio.h.in 2018-01-01 18:52:22.871544747 +0100 +++ mkdio.h.in 2018-01-01 18:52:22.871544747 +0100
@@ -2,6 +2,7 @@ @@ -2,6 +2,7 @@

19
srcpkgs/discount/patches/cross-makefile_in.patch
View file

@ -1,9 +1,5 @@
Compile tools to be run on the host using cc instead of $(CC). --- Makefile.in.orig
Ideally the patch would introduce $(CC_FOR_BUILD) instead while +++ Makefile.in
for Void we know that cc is going to work.
--- Makefile.in 2017-01-19 03:42:06.000000000 +0100
+++ Makefile.in 2018-01-01 19:33:18.233719865 +0100
@@ -1,5 +1,5 @@ @@ -1,5 +1,5 @@
CC=@CC@ -I. CC=@CC@ -I.
-LFLAGS=-L. -LFLAGS=-L.
@ -11,7 +7,7 @@ for Void we know that cc is going to work.
CFLAGS=@CFLAGS@ CFLAGS=@CFLAGS@
AR=@AR@ AR=@AR@
RANLIB=@RANLIB@ RANLIB=@RANLIB@
@@ -83,6 +83,9 @@ @@ -85,6 +85,9 @@
blocktags: mktags blocktags: mktags
./mktags > blocktags ./mktags > blocktags
@ -19,11 +15,14 @@ for Void we know that cc is going to work.
+ cc -o $@ $< + cc -o $@ $<
+ +
# example programs # example programs
@THEME@theme: theme.o $(MKDLIB) mkdio.h @THEME@theme: theme.o $(COMMON) $(MKDLIB) mkdio.h
@THEME@ $(CC) $(CFLAGS) $(LFLAGS) -o theme theme.o pgm_options.o -lmarkdown @LIBS@ @THEME@ $(CC) $(CFLAGS) $(LFLAGS) -o theme theme.o $(COMMON) -lmarkdown @LIBS@
@@ -115,9 +118,9 @@ @@ -123,11 +126,11 @@
done done
branch: tools/branch.c config.h
- $(CC) -o branch tools/branch.c
+ cc -I. -o branch tools/branch.c
cols: tools/cols.c config.h cols: tools/cols.c config.h
- $(CC) -o cols tools/cols.c - $(CC) -o cols tools/cols.c
+ cc -o cols tools/cols.c + cc -o cols tools/cols.c

6
srcpkgs/discount/template
View file

@ -1,7 +1,7 @@
# Template file for 'discount' # Template file for 'discount'
pkgname=discount pkgname=discount
version=2.2.2 version=2.2.3
revision=2 revision=1
build_style=configure build_style=configure
configure_script="./configure.sh" configure_script="./configure.sh"
configure_args="--prefix=/usr --shared --pkg-config" configure_args="--prefix=/usr --shared --pkg-config"
@ -10,7 +10,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
license="3-clause-BSD" license="3-clause-BSD"
homepage="http://www.pell.portland.or.us/~orc/Code/discount" homepage="http://www.pell.portland.or.us/~orc/Code/discount"
distfiles="${homepage}/${pkgname}-${version}.tar.bz2" distfiles="${homepage}/${pkgname}-${version}.tar.bz2"
checksum=ec7916731e3ef8516336333f8b7aa9e2af51e57c0017b1e03fa43f1ba6978f64 checksum=a8ffbcdaf03923fa6878dcd2373a0a2592975f6a3b137945097302ac623fe99c
do_install() { do_install() {
make DESTDIR=${DESTDIR} install install.man make DESTDIR=${DESTDIR} install install.man