commit: 696f9e562286dd080ea0591ee4ae4d4aae2f4de0 Author: Gilles Dartiguelongue <eva <AT> gentoo <DOT> org> AuthorDate: Fri Jan 4 10:47:24 2019 +0000 Commit: Mart Raudsepp <leio <AT> gentoo <DOT> org> CommitDate: Mon Feb 11 17:14:54 2019 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=696f9e56
dev-lang/vala: 0.36.17 → 0.40.12 Includes valadoc. Package-Manager: Portage-2.3.53, Repoman-2.3.12 Signed-off-by: Gilles Dartiguelongue <eva <AT> gentoo.org> Signed-off-by: Mart Raudsepp <leio <AT> gentoo.org> dev-lang/vala/Manifest | 1 + ...0.40-Allow-disabling-the-build-of-valadoc.patch | 184 ++++++++++++++++++ ...valadoc-doclets-data-parallel-installable.patch | 212 +++++++++++++++++++++ dev-lang/vala/metadata.xml | 11 +- dev-lang/vala/vala-0.40.12.ebuild | 56 ++++++ 5 files changed, 460 insertions(+), 4 deletions(-) diff --git a/dev-lang/vala/Manifest b/dev-lang/vala/Manifest index 5862496b973..8691b0b8736 100644 --- a/dev-lang/vala/Manifest +++ b/dev-lang/vala/Manifest @@ -2,3 +2,4 @@ DIST vala-0.32.1.tar.xz 2759528 BLAKE2B cce23844ee5769216ef5cccb20476f4bdd2cb809 DIST vala-0.34.16.tar.xz 2795676 BLAKE2B 64428099c209e13a6aad09233af650f412efa191ff4873fae1dbfb9bcc252e13d4e152733c9f199cd23323872fd912807a685980f651c1f784bfaffae7bf4162 SHA512 6411d55524a6c717c2eaf5cc1231ac931400e3f66d151a8b8856910258eb5bd7affe3a90946de34feb51aabfafce721b8d57f61e0475095b275d20b73cc4bbec DIST vala-0.36.15.tar.xz 2880300 BLAKE2B ea83bde6396f3be1c96038d63ae30b18fa070a6f7a06b75569bfed9d7792c898201a1f24d000f5b6415bb890cf975758341a97f22db74da02fcbeb3f283e546f SHA512 1c8f888832b2dd4248737a5a27f00f42d8bab2fe0a0790a7df5c426f4e3e1d0919ed0f6f6fd905be758ed477ba840e18f608e67811389c811ba65710094abe61 DIST vala-0.36.17.tar.xz 2898524 BLAKE2B 4a5a373bacd4e4a392350c7819e0498054e38f50dce89658412d7aeb5642892ef9f32a7689ebd45f53c41f064e0b6d2f52fb441be67a1dd48e67311a1e764637 SHA512 93d4fa600cd0ef62b71ed056b837f2c0a42c3aba25b021b2bbd2045428550307727827b250dae546926ea3fe2e33a5ac80c9b24b5100f02550ec584dd5da5e92 +DIST vala-0.40.12.tar.xz 3390368 BLAKE2B b11eef3687b3c6cd5c7a3b0ffdaa29e20c0c00ea1cb457c6d7cc02f2fd0a842a27f65091b842846f606f80c62fc89cd2e5b620af635ebe0b9cd55d8c35251c47 SHA512 3bc28fe2ad7c05f4de00c593bde1def0c8d8e496fecd11009d6a4e987f4aeae0a31be995efdda2ba339b9aa540610c6f2f8f9295f1b0d4be6dd7ee841c08598d diff --git a/dev-lang/vala/files/0.40-Allow-disabling-the-build-of-valadoc.patch b/dev-lang/vala/files/0.40-Allow-disabling-the-build-of-valadoc.patch new file mode 100644 index 00000000000..55bcb7d63b0 --- /dev/null +++ b/dev-lang/vala/files/0.40-Allow-disabling-the-build-of-valadoc.patch @@ -0,0 +1,184 @@ +From 1dae711f17473e12c822a657ffca02abee27b3a2 Mon Sep 17 00:00:00 2001 +From: Rico Tzschichholz <[email protected]> +Date: Sun, 27 Aug 2017 16:03:03 +0200 +Subject: [PATCH] build: Allow disabling the build of valadoc + +Allow disabling build of valadoc with configure option --disable-valadoc + +Fixes https://gitlab.gnome.org/GNOME/vala/issues/596 +--- + Makefile.am | 10 +++++++++ + configure.ac | 59 ++++++++++++++++++++++++++----------------------- + doc/Makefile.am | 17 +++++++++++++- + 3 files changed, 57 insertions(+), 29 deletions(-) + +diff --git a/Makefile.am b/Makefile.am +index 88bef90ed..e4d46741f 100644 +--- a/Makefile.am ++++ b/Makefile.am +@@ -13,9 +13,19 @@ SUBDIRS = \ + doc \ + gobject-introspection \ + vapigen \ ++ $(NULL) ++ ++if ENABLE_VALADOC ++SUBDIRS += \ + libvaladoc \ + valadoc \ + $(NULL) ++endif ++ ++DISTCHECK_CONFIGURE_FLAGS = \ ++ --enable-valadoc \ ++ --enable-unversioned \ ++ $(NULL) + + if ENABLE_UNVERSIONED + aclocaldir = $(datadir)/aclocal +diff --git a/configure.ac b/configure.ac +index 88ca0f94b..9d1c97417 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -119,35 +119,38 @@ PKG_CHECK_MODULES(GMODULE, gmodule-2.0 >= $GLIB_REQUIRED) + AC_SUBST(GMODULE_CFLAGS) + AC_SUBST(GMODULE_LIBS) + +-PKG_CHECK_MODULES(LIBGVC, libgvc >= $LIBGVC_REQUIRED) +-AC_MSG_CHECKING([for CGRAPH]) +-cgraph_tmp_LIBADD="$LIBADD" +-cgraph_tmp_CFLAGS="$CFLAGS" +-LIBADD="$LIBADD $LIBGVC_LIBS" +-CFLAGS="$CFLAGS $LIBGVC_CFLAGS" +-AC_RUN_IFELSE( +- [AC_LANG_SOURCE([ +- #include <gvc.h> +- +- int main(void) { +- #ifdef WITH_CGRAPH +- return 0; +- #else +- return -1; +- #endif +- } +- ])], [ +- AC_MSG_RESULT([yes]) +- VALAFLAGS="$VALAFLAGS -D WITH_CGRAPH" +- have_cgraph=yes +- ], [ +- AC_MSG_RESULT([no]) +- have_cgraph=no +- ] +-) +-LIBADD="$cgraph_tmp_LIBADD" +-CFLAGS="$cgraph_tmp_CFLAGS" ++AC_ARG_ENABLE(valadoc, AS_HELP_STRING([--disable-valadoc], [Disable valadoc]), enable_valadoc=$enableval, enable_valadoc=yes) ++if test x$enable_valadoc = xyes; then ++ PKG_CHECK_MODULES(LIBGVC, libgvc >= $LIBGVC_REQUIRED) ++ AC_MSG_CHECKING([for CGRAPH]) ++ cgraph_tmp_LIBADD="$LIBADD" ++ cgraph_tmp_CFLAGS="$CFLAGS" ++ LIBADD="$LIBADD $LIBGVC_LIBS" ++ CFLAGS="$CFLAGS $LIBGVC_CFLAGS" ++ AC_RUN_IFELSE( ++ [AC_LANG_SOURCE([ ++ #include <gvc.h> ++ int main(void) { ++ #ifdef WITH_CGRAPH ++ return 0; ++ #else ++ return -1; ++ #endif ++ } ++ ])], [ ++ AC_MSG_RESULT([yes]) ++ VALAFLAGS="$VALAFLAGS -D WITH_CGRAPH" ++ have_cgraph=yes ++ ], [ ++ AC_MSG_RESULT([no]) ++ have_cgraph=no ++ ] ++ ) ++ LIBADD="$cgraph_tmp_LIBADD" ++ CFLAGS="$cgraph_tmp_CFLAGS" ++fi + AM_CONDITIONAL(HAVE_CGRAPH, test "$have_cgraph" = "yes") ++AM_CONDITIONAL(ENABLE_VALADOC, test x$enable_valadoc = xyes) + + AC_PATH_PROG([XSLTPROC], [xsltproc], :) + AM_CONDITIONAL(HAVE_XSLTPROC, test "$XSLTPROC" != :) +diff --git a/doc/Makefile.am b/doc/Makefile.am +index 758ad733a..b79f229c4 100644 +--- a/doc/Makefile.am ++++ b/doc/Makefile.am +@@ -6,11 +6,16 @@ SUBDIRS = \ + + dist_man_MANS = \ + valac.1 \ +- valadoc.1 \ + vala-gen-introspect.1 \ + vapigen.1 \ + $(NULL) + ++if ENABLE_VALADOC ++dist_man_MANS += \ ++ valadoc.1 \ ++ $(NULL) ++endif ++ + EXTRA_DIST = \ + valac.h2m \ + valadoc.h2m \ +@@ -19,7 +24,11 @@ EXTRA_DIST = \ + $(NULL) + + if HAVE_HELP2MAN ++if ENABLE_VALADOC + manpages: valac.1 valadoc.1 vala-gen-introspect.1 vapigen.1 ++else ++manpages: valac.1 vala-gen-introspect.1 vapigen.1 ++endif + @rm $^ + $(MAKE) $(AM_MAKEFLAGS) $^ + +@@ -28,11 +37,13 @@ valac.1: + --include $(srcdir)/valac.h2m \ + --libtool --no-info \ + --output=$@ ++if ENABLE_VALADOC + valadoc.1: + $(HELP2MAN) $(top_builddir)/valadoc/valadoc \ + --include $(srcdir)/valadoc.h2m \ + --libtool --no-info \ + --output=$@ ++endif + vala-gen-introspect.1: + $(HELP2MAN) $(top_builddir)/gobject-introspection/gen-introspect \ + --include $(srcdir)/vala-gen-introspect.h2m \ +@@ -49,12 +60,15 @@ endif + if ENABLE_UNVERSIONED + install-data-hook: + cd $(DESTDIR)$(man1dir) && $(LN_S) -f valac@[email protected] valac.1 ++if ENABLE_VALADOC + cd $(DESTDIR)$(man1dir) && $(LN_S) -f valadoc@[email protected] valadoc.1 ++endif + cd $(DESTDIR)$(man1dir) && $(LN_S) -f vala-gen-introspect@[email protected] vala-gen-introspect.1 + cd $(DESTDIR)$(man1dir) && $(LN_S) -f vapigen@[email protected] vapigen.1 + endif + + ++if ENABLE_VALADOC + COMMON_VALADOCFLAGS = \ + --force \ + --verbose \ +@@ -130,6 +144,7 @@ internal-apis/valadoc: $(valadoc_VALASOURCES) internal-apis/codegen + @touch $@ + + internal-api-docs: internal-apis/gee internal-apis/vala internal-apis/ccode internal-apis/codegen internal-apis/valadoc ++endif + + clean-local: + rm -rf $(builddir)/internal-apis +-- +2.20.1 + diff --git a/dev-lang/vala/files/0.40-valadoc-doclets-data-parallel-installable.patch b/dev-lang/vala/files/0.40-valadoc-doclets-data-parallel-installable.patch new file mode 100644 index 00000000000..1c9b44677e1 --- /dev/null +++ b/dev-lang/vala/files/0.40-valadoc-doclets-data-parallel-installable.patch @@ -0,0 +1,212 @@ +From 3dc5768c045c400ff522b8a510b789001aa93df4 Mon Sep 17 00:00:00 2001 +From: Gilles Dartiguelongue <[email protected]> +Date: Fri, 4 Jan 2019 11:31:14 +0100 +Subject: [PATCH 2/2] Make valadoc doclets & data parallel installable + +--- + libvaladoc/Makefile.am | 12 ++++++++++-- + valadoc/Makefile.am | 7 ++++++- + valadoc/doclets/devhelp/Makefile.am | 11 ++++++++--- + valadoc/doclets/gtkdoc/Makefile.am | 11 ++++++++--- + valadoc/doclets/html/Makefile.am | 11 ++++++++--- + valadoc/icons/Makefile.am | 4 ++++ + valadoc/tests/Makefile.am | 7 ++++++- + 7 files changed, 50 insertions(+), 13 deletions(-) + +diff --git a/libvaladoc/Makefile.am b/libvaladoc/Makefile.am +index f3f790e76..86875631b 100644 +--- a/libvaladoc/Makefile.am ++++ b/libvaladoc/Makefile.am +@@ -3,8 +3,6 @@ include $(top_srcdir)/Makefile.common + NULL = + + AM_CFLAGS = \ +- -DPACKAGE_ICONDIR=\"$(datadir)/valadoc/icons/\" \ +- -DPACKAGE_DATADIR=\"$(libdir)/valadoc\" \ + -DPACKAGE_VERSION=\"$(VERSION)\" \ + $(COVERAGE_CFLAGS) \ + $(LIBGVC_CFLAGS) \ +@@ -16,6 +14,16 @@ AM_CFLAGS = \ + -I$(top_srcdir)/codegen \ + $(NULL) + ++if ENABLE_UNVERSIONED ++AM_CFLAGS += \ ++ -DPACKAGE_ICONDIR=\"$(datadir)/valadoc/icons/\" \ ++ -DPACKAGE_DATADIR=\"$(libdir)/valadoc\" ++else ++AM_CFLAGS += \ ++ -DPACKAGE_ICONDIR=\"$(datadir)/valadoc@PACKAGE_SUFFIX@/icons/\" \ ++ -DPACKAGE_DATADIR=\"$(libdir)/valadoc@PACKAGE_SUFFIX@\" ++endif ++ + AM_VALAFLAGS = \ + $(NULL) + +diff --git a/valadoc/Makefile.am b/valadoc/Makefile.am +index 33f3a9375..2f3dec848 100644 +--- a/valadoc/Makefile.am ++++ b/valadoc/Makefile.am +@@ -9,7 +9,6 @@ SUBDIRS = \ + $(NULL) + + AM_CFLAGS = \ +- -DPACKAGE_DATADIR=\"$(libdir)/valadoc\" \ + -DPACKAGE_VERSION=\"$(VERSION)\" \ + -I$(top_srcdir)/libvaladoc/ \ + -I$(top_srcdir)/gee \ +@@ -22,6 +21,12 @@ AM_CFLAGS = \ + $(LIBGVC_CFLAGS) \ + $(NULL) + ++if ENABLE_UNVERSIONED ++AM_CFLAGS += -DPACKAGE_DATADIR=\"$(libdir)/valadoc\" ++else ++AM_CFLAGS += -DPACKAGE_DATADIR=\"$(libdir)/valadoc@PACKAGE_SUFFIX@\" ++endif ++ + BUILT_SOURCES = valadoc.vala.stamp + + bin_PROGRAMS = valadoc +diff --git a/valadoc/doclets/devhelp/Makefile.am b/valadoc/doclets/devhelp/Makefile.am +index 5783c0b5a..afbb8f7f9 100644 +--- a/valadoc/doclets/devhelp/Makefile.am ++++ b/valadoc/doclets/devhelp/Makefile.am +@@ -3,7 +3,6 @@ include $(top_srcdir)/Makefile.common + NULL = + + AM_CFLAGS = \ +- -DPACKAGE_ICONDIR=\"$(datadir)/valadoc/icons/\" \ + -I$(top_srcdir)/gee/ \ + -I$(top_srcdir)/vala/ \ + -I$(top_srcdir)/libvaladoc/ \ +@@ -12,12 +11,18 @@ AM_CFLAGS = \ + $(LIBGVC_CFLAGS) \ + $(NULL) + ++if ENABLE_UNVERSIONED ++AM_CFLAGS += -DPACKAGE_ICONDIR=\"$(datadir)/valadoc/icons/\" ++docletdir = $(libdir)/valadoc/doclets/devhelp ++else ++AM_CFLAGS += -DPACKAGE_ICONDIR=\"$(datadir)/valadoc@PACKAGE_SUFFIX@/icons/\" ++docletdir = $(libdir)/valadoc@PACKAGE_SUFFIX@/doclets/devhelp ++endif ++ + BUILT_SOURCES = libdoclet.vala.stamp + + doclet_LTLIBRARIES = libdoclet.la + +-docletdir = $(libdir)/valadoc/doclets/devhelp +- + libdoclet_la_LDFLAGS = -module -avoid-version -no-undefined + + libdoclet_la_VALASOURCES = \ +diff --git a/valadoc/doclets/gtkdoc/Makefile.am b/valadoc/doclets/gtkdoc/Makefile.am +index 763e46932..f689018ce 100644 +--- a/valadoc/doclets/gtkdoc/Makefile.am ++++ b/valadoc/doclets/gtkdoc/Makefile.am +@@ -3,7 +3,6 @@ include $(top_srcdir)/Makefile.common + NULL = + + AM_CFLAGS = \ +- -DPACKAGE_ICONDIR=\"$(datadir)/valadoc/icons/\" \ + -I$(top_srcdir)/gee/ \ + -I$(top_srcdir)/vala/ \ + -I$(top_srcdir)/libvaladoc/ \ +@@ -12,12 +11,18 @@ AM_CFLAGS = \ + $(LIBGVC_CFLAGS) \ + $(NULL) + ++if ENABLE_UNVERSIONED ++AM_CFLAGS += -DPACKAGE_ICONDIR=\"$(datadir)/valadoc/icons/\" ++docletdir = $(libdir)/valadoc/doclets/gtkdoc ++else ++AM_CFLAGS += -DPACKAGE_ICONDIR=\"$(datadir)/valadoc@PACKAGE_SUFFIX@/icons/\" ++docletdir = $(libdir)/valadoc@PACKAGE_SUFFIX@/doclets/gtkdoc ++endif ++ + BUILT_SOURCES = libdoclet.vala.stamp + + doclet_LTLIBRARIES = libdoclet.la + +-docletdir = $(libdir)/valadoc/doclets/gtkdoc +- + libdoclet_la_LDFLAGS = -module -avoid-version -no-undefined + + libdoclet_la_VALASOURCES = \ +diff --git a/valadoc/doclets/html/Makefile.am b/valadoc/doclets/html/Makefile.am +index 885fbfbab..855184020 100644 +--- a/valadoc/doclets/html/Makefile.am ++++ b/valadoc/doclets/html/Makefile.am +@@ -3,7 +3,6 @@ include $(top_srcdir)/Makefile.common + NULL = + + AM_CFLAGS = \ +- -DPACKAGE_ICONDIR=\"$(datadir)/valadoc/icons/\" \ + -I$(top_srcdir)/gee/ \ + -I$(top_srcdir)/vala/ \ + -I$(top_srcdir)/libvaladoc/ \ +@@ -12,12 +11,18 @@ AM_CFLAGS = \ + $(LIBGVC_CFLAGS) \ + $(NULL) + ++if ENABLE_UNVERSIONED ++AM_CFLAGS += -DPACKAGE_ICONDIR=\"$(datadir)/valadoc/icons/\" ++docletdir = $(libdir)/valadoc/doclets/html ++else ++AM_CFLAGS += -DPACKAGE_ICONDIR=\"$(datadir)/valadoc@PACKAGE_SUFFIX@/icons/\" ++docletdir = $(libdir)/valadoc@PACKAGE_SUFFIX@/doclets/html ++endif ++ + BUILT_SOURCES = libdoclet.vala.stamp + + doclet_LTLIBRARIES = libdoclet.la + +-docletdir = $(libdir)/valadoc/doclets/html +- + libdoclet_la_LDFLAGS = -module -avoid-version -no-undefined + + libdoclet_la_VALASOURCES = \ +diff --git a/valadoc/icons/Makefile.am b/valadoc/icons/Makefile.am +index 454bdba7c..668956f3b 100644 +--- a/valadoc/icons/Makefile.am ++++ b/valadoc/icons/Makefile.am +@@ -1,6 +1,10 @@ + NULL = + ++if ENABLE_UNVERSIONED + iconsdir = $(datadir)/valadoc/icons ++else ++iconsdir = $(datadir)/valadoc@PACKAGE_SUFFIX@/icons ++endif + + dist_icons_DATA = \ + abstractclass.png \ +diff --git a/valadoc/tests/Makefile.am b/valadoc/tests/Makefile.am +index e40cc1ca3..2bca58128 100644 +--- a/valadoc/tests/Makefile.am ++++ b/valadoc/tests/Makefile.am +@@ -22,7 +22,6 @@ check-TESTS: $(TESTS) + G_DEBUG=fatal_warnings $(builddir)/driver + + AM_CFLAGS = \ +- -DPACKAGE_DATADIR=\"$(libdir)/valadoc\" \ + -DPACKAGE_VERSION=\"$(VERSION)\" \ + -DTOP_SRC_DIR=\"$(abs_top_srcdir)\" \ + -I$(top_srcdir)/libvaladoc/ \ +@@ -36,6 +35,12 @@ AM_CFLAGS = \ + $(LIBGVC_CFLAGS) \ + $(NULL) + ++if ENABLE_UNVERSIONED ++AM_CFLAGS += -DPACKAGE_DATADIR=\"$(libdir)/valadoc\" ++else ++AM_CFLAGS += -DPACKAGE_DATADIR=\"$(libdir)/valadoc@PACKAGE_SUFFIX@\" ++endif ++ + BUILT_SOURCES = driver.vala.stamp + + check_PROGRAMS = driver +-- +2.20.1 + diff --git a/dev-lang/vala/metadata.xml b/dev-lang/vala/metadata.xml index 5f429420cb7..a6cf4ba175a 100644 --- a/dev-lang/vala/metadata.xml +++ b/dev-lang/vala/metadata.xml @@ -1,8 +1,11 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd";> <pkgmetadata> - <maintainer type="project"> - <email>[email protected]</email> - <name>Gentoo GNOME Desktop</name> - </maintainer> + <maintainer type="project"> + <email>[email protected]</email> + <name>Gentoo GNOME Desktop</name> + </maintainer> + <use> + <flag name="valadoc">Installs valadoc documentation generation tool</flag> + </use> </pkgmetadata> diff --git a/dev-lang/vala/vala-0.40.12.ebuild b/dev-lang/vala/vala-0.40.12.ebuild new file mode 100644 index 00000000000..bebbf410293 --- /dev/null +++ b/dev-lang/vala/vala-0.40.12.ebuild @@ -0,0 +1,56 @@ +# Copyright 1999-2019 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 +GNOME2_EAUTORECONF="yes" + +inherit gnome2 + +DESCRIPTION="Compiler for the GObject type system" +HOMEPAGE="https://wiki.gnome.org/Projects/Vala"; + +LICENSE="LGPL-2.1" +SLOT="0.40" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-linux" +IUSE="test valadoc" + +RDEPEND=" + >=dev-libs/glib-2.40.0:2 + >=dev-libs/vala-common-${PV} + valadoc? ( >=media-gfx/graphviz-2.16 ) +" +DEPEND="${RDEPEND} + !${CATEGORY}/${PN}:0 + dev-libs/libxslt + sys-devel/flex + virtual/pkgconfig + virtual/yacc + test? ( + dev-libs/dbus-glib + >=dev-libs/glib-2.26:2 + dev-libs/gobject-introspection ) +" + +PATCHES=( + # From master + "${FILESDIR}"/0.40-Allow-disabling-the-build-of-valadoc.patch + # Add missing bits to make valadoc parallel installable + "${FILESDIR}"/0.40-valadoc-doclets-data-parallel-installable.patch +) + +src_configure() { + # https://bugs.gentoo.org/483134 + export GIT_CEILING_DIRECTORIES="${WORKDIR}" + + # weasyprint enables generation of PDF from HTML + gnome2_src_configure \ + --disable-unversioned \ + $(use_enable valadoc) \ + VALAC=: \ + WEASYPRINT=: +} + +src_install() { + default + find "${D}" -name "*.la" -delete || die +}
