Commit 271f7f44 authored by Bernd Zeimetz's avatar Bernd Zeimetz

Refreshing patches.

parent 12eb57ac
......@@ -6,12 +6,10 @@ Subject: [PATCH] disable-po-check
po/Makefile.in.in | 8 ++------
1 file changed, 2 insertions(+), 6 deletions(-)
diff --git a/po/Makefile.in.in b/po/Makefile.in.in
index 06a8cfe..ece39a4 100644
--- a/po/Makefile.in.in
+++ b/po/Makefile.in.in
@@ -146,12 +146,8 @@ uninstall:
rm -f $(DESTDIR)$(itlocaledir)/$$lang/LC_MESSAGES/$(GETTEXT_PACKAGE).mo.m; \
@@ -145,12 +145,8 @@ uninstall:
rm -f $(DESTDIR)$(localedir)/$$lang/LC_MESSAGES/$(GETTEXT_PACKAGE).mo.m; \
done
-check: all $(GETTEXT_PACKAGE).pot
......
From: Bernd Zeimetz <bernd@bzed.de>
Date: Wed, 3 Nov 2010 21:10:03 +0100
Subject: [PATCH] Add missing -lz.
---
src/Makefile.am | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/Makefile.am b/src/Makefile.am
index 049cf40..110aa8a 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -218,7 +218,7 @@ endif
viking_SOURCES = main.c
-LDADD = libviking.a $(PACKAGE_LIBS) @EXPAT_LIBS@ @LIBCURL@ icons/libicons.a
+LDADD = libviking.a $(PACKAGE_LIBS) @EXPAT_LIBS@ @LIBCURL@ icons/libicons.a -lz
if WINDOWS
LDADD += \
../win32/installer/pixmaps/viking_icon.o
From: Jeremy Bicha <jbicha@debian.org>
Date: Sun, 21 Oct 2018 17:01:53 -0400
Subject: build without scrollkeeper
---
configure.ac | 3 +--
help/viking.omf.in | 10 ----------
2 files changed, 1 insertion(+), 12 deletions(-)
delete mode 100644 help/viking.omf.in
diff --git a/configure.ac b/configure.ac
index fee2b74..80c0201 100644
--- a/configure.ac
+++ b/configure.ac
@@ -401,8 +401,7 @@ DB2MAN_XSL=/usr/share/sgml/docbook/stylesheet/xsl/nwalsh/manpages/docbook.xsl
AC_SUBST(DB2MAN_XSL)
AC_PATH_PROG(XP,xsltproc)
AM_CONDITIONAL([HAVE_XSLTPROC],[test "x$XP" != "x"])
-AC_CHECK_PROG([HAVE_SCROLLKEEPER],scrollkeeper-config,"yes")
-AM_CONDITIONAL([GEN_MANPAGES],[test "x$XP" != "x" && test -r "$DB2MAN_XSL"] && test "${HAVE_SCROLLKEEPER}" == "yes" )
+AM_CONDITIONAL([GEN_MANPAGES],[test "x$XP" != "x" && test -r "$DB2MAN_XSL"])
ISODATE=`date +%Y-%m-%d`
AC_SUBST(ISODATE)
diff --git a/help/viking.omf.in b/help/viking.omf.in
deleted file mode 100644
index 745d1e5..0000000
--- a/help/viking.omf.in
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" standalone="no"?>
-<omf>
- <resource>
- <subject category="ApplicationsEducationScience"/>
- <type>manual</type>
- <relation seriesid="0a911bb1-720e-7e06-f641-708f94aba4c5e0"/>
- <rights type="GNU FDL" license.version="1.1" holder="Guilhem Bonnefille"/>
- </resource>
-</omf>
-
......@@ -6,8 +6,6 @@ Subject: fix build on hurd
src/metatile.h | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/src/metatile.h b/src/metatile.h
index 0206133..50d5b0c 100644
--- a/src/metatile.h
+++ b/src/metatile.h
@@ -26,3 +26,7 @@
......
From: Hideki Yamane <henrich@debian.or.jp>
Date: Wed, 23 Oct 2013 22:14:47 +0900
Subject: don't try to process doc sub directory
- remove declaration of Makefile inside doc subtree
- GTK_DOC_CHECK cause parse error
Forwarded: no
Last-Update: 2015-08-30
---
Makefile.am | 2 +-
configure.ac | 8 +-------
2 files changed, 2 insertions(+), 8 deletions(-)
diff --git a/Makefile.am b/Makefile.am
index 6882a89..fd7cee1 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,4 +1,4 @@
-SUBDIRS = src test data po win32 help tools doc
+SUBDIRS = src test data po win32 help tools
INTLTOOL = \
intltool-extract.in \
diff --git a/configure.ac b/configure.ac
index c807559..fee2b74 100644
--- a/configure.ac
+++ b/configure.ac
@@ -8,11 +8,7 @@ dnl AC_CONFIG_SRCDIR([src/main.c])
AC_CONFIG_HEADERS([src/config.h])
# check for gtk-doc
-m4_ifdef([GTK_DOC_CHECK], [
-GTK_DOC_CHECK([1.0],[--flavour no-tmpl])
-],[
AM_CONDITIONAL([ENABLE_GTK_DOC], false)
-])
AC_PROG_CC
AC_PROG_CC_STDC
@@ -428,9 +424,7 @@ AC_CONFIG_FILES([
win32/installer/Makefile
win32/installer/pixmaps/Makefile
win32/installer/translations/Makefile
- doc/Makefile
- doc/reference/Makefile
- doc/examples/Makefile])
+ ])
AC_OUTPUT([
viking.spec
0001-disable-po-check.patch
0003-Add-missing-lz.patch
no_doc-dir.patch
#fix-IT_PROG_INTLTOOL-and-AM_GNU_GETTEXT-conflict.patch
fix_build_on_hurd
build-without-scrollkeeper.patch
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment