From 619a13fc879712798f39e77a0f196fcd7f67e1dc Mon Sep 17 00:00:00 2001 From: Jo-Philipp Wich Date: Wed, 15 Dec 2010 05:08:41 +0000 Subject: [PATCH] [packages] gphoto2: fix autoreconf, disable docs and translations SVN-Revision: 24586 --- .../gphoto2/patches/001-automake-compat.patch | 10 +++++ .../002-disable-docs-translations.patch | 45 +++++++++++++++++++ 2 files changed, 55 insertions(+) create mode 100644 multimedia/gphoto2/patches/001-automake-compat.patch create mode 100644 multimedia/gphoto2/patches/002-disable-docs-translations.patch diff --git a/multimedia/gphoto2/patches/001-automake-compat.patch b/multimedia/gphoto2/patches/001-automake-compat.patch new file mode 100644 index 0000000000..89cad74765 --- /dev/null +++ b/multimedia/gphoto2/patches/001-automake-compat.patch @@ -0,0 +1,10 @@ +--- a/configure.ac ++++ b/configure.ac +@@ -66,7 +66,6 @@ GP_GETTEXT_HACK([],[Lutz Müller and oth + ALL_LINGUAS="az cs da de en_GB es eu fi fr hu id it ja nl pa pl pt_BR ro ru rw sk sr sv uk vi zh_CN zh_TW" + AM_GNU_GETTEXT_VERSION([0.14.1]) + AM_GNU_GETTEXT([external]) +-AM_PO_SUBDIRS() + AM_ICONV() + GP_GETTEXT_FLAGS() + diff --git a/multimedia/gphoto2/patches/002-disable-docs-translations.patch b/multimedia/gphoto2/patches/002-disable-docs-translations.patch new file mode 100644 index 0000000000..6431b48f13 --- /dev/null +++ b/multimedia/gphoto2/patches/002-disable-docs-translations.patch @@ -0,0 +1,45 @@ +--- a/configure.ac ++++ b/configure.ac +@@ -62,12 +62,7 @@ GP_REFERENCES()dnl + dnl --------------------------------------------------------------------------- + dnl i18n support + dnl --------------------------------------------------------------------------- +-GP_GETTEXT_HACK([],[Lutz Müller and others],[${MAIL_GPHOTO_TRANSLATION}]) +-ALL_LINGUAS="az cs da de en_GB es eu fi fr hu id it ja nl pa pl pt_BR ro ru rw sk sr sv uk vi zh_CN zh_TW" +-AM_GNU_GETTEXT_VERSION([0.14.1]) +-AM_GNU_GETTEXT([external]) + AM_ICONV() +-GP_GETTEXT_FLAGS() + + dnl We cannot use AC_DEFINE_UNQUOTED() for these definitions, as + dnl we require make to do insert the proper $(datadir) value +@@ -352,11 +347,9 @@ AC_SUBST([AM_LDFLAGS]) + # Create output files + # --------------------------------------------------------------------------- + AC_CONFIG_FILES([ +-po/Makefile.in + Makefile + gphoto2/Makefile + m4m/Makefile +-doc/Makefile + contrib/Makefile + packaging/Makefile + packaging/rpm/Makefile +--- a/Makefile.am ++++ b/Makefile.am +@@ -1,3 +1,3 @@ +-SUBDIRS = m4m contrib doc gphoto2 packaging po ++SUBDIRS = m4m contrib gphoto2 packaging + + ACLOCAL_AMFLAGS = -I auto-m4 -I m4m +--- a/Makefile.in ++++ b/Makefile.in +@@ -238,7 +238,7 @@ sysconfdir = @sysconfdir@ + target_alias = @target_alias@ + top_builddir = @top_builddir@ + top_srcdir = @top_srcdir@ +-SUBDIRS = m4m contrib doc gphoto2 packaging po ++SUBDIRS = m4m contrib gphoto2 packaging + ACLOCAL_AMFLAGS = -I auto-m4 -I m4m + all: config.h + $(MAKE) $(AM_MAKEFLAGS) all-recursive -- 2.30.2