Advertisement
cmsigler

replace_pandoc.patch

Oct 24th, 2020
248
0
Never
Not a member of Pastebin yet? Sign Up, it unlocks many cool features!
text 2.53 KB | None | 0 0
  1. --- src/youtube-dl/Makefile.orig 2020-10-24 08:37:09.765849785 -0400
  2. +++ src/youtube-dl/Makefile 2020-10-24 13:41:17.420533243 -0400
  3. @@ -14,8 +14,8 @@
  4. # set SYSCONFDIR to /etc if PREFIX=/usr or PREFIX=/usr/local
  5. SYSCONFDIR = $(shell if [ $(PREFIX) = /usr -o $(PREFIX) = /usr/local ]; then echo /etc; else echo $(PREFIX)/etc; fi)
  6.  
  7. -# set markdown input format to "markdown-smart" for pandoc version 2 and to "markdown" for pandoc prior to version 2
  8. -MARKDOWN = $(shell if [ `pandoc -v | head -n1 | cut -d" " -f2 | head -c1` = "2" ]; then echo markdown-smart; else echo markdown; fi)
  9. +## set markdown input format to "markdown-smart" for pandoc version 2 and to "markdown" for pandoc prior to version 2
  10. +#MARKDOWN = $(shell if [ `pandoc -v | head -n1 | cut -d" " -f2 | head -c1` = "2" ]; then echo markdown-smart; else echo markdown; fi)
  11.  
  12. install: youtube-dl youtube-dl.1 youtube-dl.bash-completion youtube-dl.zsh youtube-dl.fish
  13. install -d $(DESTDIR)$(BINDIR)
  14. @@ -89,11 +89,11 @@
  15. $(PYTHON) devscripts/make_supportedsites.py docs/supportedsites.md
  16.  
  17. README.txt: README.md
  18. - pandoc -f $(MARKDOWN) -t plain README.md -o README.txt
  19. + markdown README.md | html2text > README.txt
  20.  
  21. youtube-dl.1: README.md
  22. $(PYTHON) devscripts/prepare_manpage.py youtube-dl.1.temp.md
  23. - pandoc -s -f $(MARKDOWN) -t man youtube-dl.1.temp.md -o youtube-dl.1
  24. + marked-man youtube-dl.1.temp.md > youtube-dl.1
  25. rm -f youtube-dl.1.temp.md
  26.  
  27. youtube-dl.bash-completion: youtube_dl/*.py youtube_dl/*/*.py devscripts/bash-completion.in
  28. --- src/youtube-dl/devscripts/release.sh.orig 2020-10-24 08:37:09.769183108 -0400
  29. +++ src/youtube-dl/devscripts/release.sh 2020-10-24 12:53:11.894893478 -0400
  30. @@ -56,7 +56,9 @@
  31. useless_files=$(find youtube_dl -type f -not -name '*.py')
  32. if [ ! -z "$useless_files" ]; then echo "ERROR: Non-.py files in youtube_dl: $useless_files"; exit 1; fi
  33. if [ ! -f "updates_key.pem" ]; then echo 'ERROR: updates_key.pem missing'; exit 1; fi
  34. -if ! type pandoc >/dev/null 2>/dev/null; then echo 'ERROR: pandoc is missing'; exit 1; fi
  35. +if ! type markdown >/dev/null 2>/dev/null; then echo 'ERROR: markdown/discount is missing'; exit 1; fi
  36. +if ! type html2text >/dev/null 2>/dev/null; then echo 'ERROR: html2text/python-html2text is missing'; exit 1; fi
  37. +if ! type marked-man >/dev/null 2>/dev/null; then echo 'ERROR: marked-man is missing'; exit 1; fi
  38. if ! python3 -c 'import rsa' 2>/dev/null; then echo 'ERROR: python3-rsa is missing'; exit 1; fi
  39. if ! python3 -c 'import wheel' 2>/dev/null; then echo 'ERROR: wheel is missing'; exit 1; fi
  40.  
  41.  
Advertisement
Add Comment
Please, Sign In to add comment
Advertisement