diff options
author | V3n3RiX <venerix@redcorelinux.org> | 2018-07-14 21:03:06 +0100 |
---|---|---|
committer | V3n3RiX <venerix@redcorelinux.org> | 2018-07-14 21:03:06 +0100 |
commit | 8376ef56580626e9c0f796d5b85b53a0a1c7d5f5 (patch) | |
tree | 7681bbd4e8b05407772df40a4bf04cbbc8afc3fa /dev-libs/qof | |
parent | 30a9caf154332f12ca60756e1b75d2f0e3e1822d (diff) |
gentoo resync : 14.07.2018
Diffstat (limited to 'dev-libs/qof')
-rw-r--r-- | dev-libs/qof/Manifest | 7 | ||||
-rw-r--r-- | dev-libs/qof/files/qof-0.8.8-cflags.patch | 36 | ||||
-rw-r--r-- | dev-libs/qof/files/qof-0.8.8-unistd-define.patch | 58 | ||||
-rw-r--r-- | dev-libs/qof/files/qof-0.8.8-unittest.patch | 44 | ||||
-rw-r--r-- | dev-libs/qof/files/qof-0.8.8-yacc-build.patch | 69 | ||||
-rw-r--r-- | dev-libs/qof/metadata.xml | 8 | ||||
-rw-r--r-- | dev-libs/qof/qof-0.8.8-r1.ebuild | 60 |
7 files changed, 282 insertions, 0 deletions
diff --git a/dev-libs/qof/Manifest b/dev-libs/qof/Manifest new file mode 100644 index 000000000000..ba485a0a742b --- /dev/null +++ b/dev-libs/qof/Manifest @@ -0,0 +1,7 @@ +AUX qof-0.8.8-cflags.patch 1349 BLAKE2B c0a10a55634b2aabbba1d0086befa2c921072f63f417b8e424660955f1462ba4ce4873db4698570df2ab35c42dfdda548afaf584a97206c141a44216ae261715 SHA512 30b3fe8f7845f4b04e893c1b3ef94cce7c5aae7654632683db9fabfb5a61a4e7def9267fcf2475000238393fc872316e1ae7453aea7384d122222035e978019f +AUX qof-0.8.8-unistd-define.patch 1570 BLAKE2B af9198533bb3017a537c7339f8c1166d5c65cab15d1b5385aa1e47bb8e5f591f349c494b976befaba4dde9cfac8f8f3a627f48d4cebe9a3d7244d75f1a482054 SHA512 be05119e2fde0ee3c464007a7e49171de3ab934505a7318ca037650f9e9a2b54d48ba1033578ce1085cdaa2f9bc08d13f69b8bd564d16dcd7936f0f9e6936729 +AUX qof-0.8.8-unittest.patch 1223 BLAKE2B b5fdca146663e9204b183f42473bef0f507d55ef4b543154224877ba5e904eb0fd33ff185cf346e2694aee6f3b205bab3ee76a0d960791f3863cbf1ae0138879 SHA512 a37959a50d7684d073c88ca465960c9bb920e614d6015a8870db54983222318f8b1b34d7b9cc26e5bf4a860876216b6781b45b2d40ee9d7fe04ada09185c143c +AUX qof-0.8.8-yacc-build.patch 1667 BLAKE2B 372ebea03a5967718305ae6de2ccf12fbc288cc2135b7c67acbfee4b1b7dc64f73f93f0198d9f4910218b3869dbdb01cc2ee7ef6ccf4b5416278f240a35b2a25 SHA512 225deb1652de4e2383599454bd765a3feea2169d4a7fc4b80538ab68d3984a6ff9da66938e97727ff6a64995c4780c3c21b91de35f3cc3ec2f4591f8a0b92af3 +DIST qof_0.8.8.orig.tar.gz 962548 BLAKE2B 0d380dd1363ec9b47e48a7dc1e296f4d09ed6e91243857c6f34828816291c42010119a14c554d9ddccc1a8a2ef638989ca6e94801422fda3e1b52508c4a651ae SHA512 f62597180f614067d72b5c6dcf4175aa9241e33d2437d6f18215a8c7389c67dd25ccd48dcdfd4c31794e0273e979e72aa0d4e66bb6d832c6f2da644889f848c4 +EBUILD qof-0.8.8-r1.ebuild 1309 BLAKE2B 33d915bf5dbd57764058a718fe40398c7cb09857a814f13344f7e5a05a44b1e6681782c2131f84ee4be2d6c68dfe2a949b6867ee22a56890625d47659deb9c62 SHA512 e9920e8ad856a0e5db857e1847d43e570a8054b62523cb7cc7ba9a45c76aa11268faad114eb9caceca84caa2b385f35c760010a78a4916902b0fc65700680dbf +MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506 diff --git a/dev-libs/qof/files/qof-0.8.8-cflags.patch b/dev-libs/qof/files/qof-0.8.8-cflags.patch new file mode 100644 index 000000000000..27d2172c7616 --- /dev/null +++ b/dev-libs/qof/files/qof-0.8.8-cflags.patch @@ -0,0 +1,36 @@ +From 1c56fc78f2a04625ae8c3aebd55236556ce28a90 Mon Sep 17 00:00:00 2001 +From: Gilles Dartiguelongue <eva@gentoo.org> +Date: Sun, 2 Nov 2014 12:04:24 +0100 +Subject: [PATCH 1/2] Remove some CFLAGS + +* Debugging level is only useful for debugging. +* Werror is taken care of in error-on-warning configure switch. +--- + configure.ac | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/configure.ac b/configure.ac +index b38da9b..d80e7e5 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -393,7 +393,7 @@ dnl # ************************************* + AC_MSG_CHECKING(what extra warning flags to pass to the C compiler) + if test ${GCC}x = yesx; then + warnFLAGS= +- CFLAGS="${CFLAGS} -g2 -Wall" ++ CFLAGS="${CFLAGS} -Wall" + AC_ARG_ENABLE(error-on-warning, + [ --disable-error-on-warning + disable treating compile warnings as errors], +@@ -431,7 +431,7 @@ AC_ARG_ENABLE(compile-warnings, + + if test "$GCC" = "yes" -a "$set_compile_warnings" != "no"; then + warnFLAGS="$warnFLAGS -Wcast-align -Wsign-compare \ +- -Wmissing-prototypes -Wmissing-declarations -Werror -Wmissing-include-dirs \ ++ -Wmissing-prototypes -Wmissing-declarations -Wmissing-include-dirs \ + -Wstrict-prototypes -Winline -Wnested-externs -Wpointer-arith \ + -Wmissing-field-initializers" + # LDFLAGS="$LDFLAGS -Wl,-z,defs" +-- +2.1.2 + diff --git a/dev-libs/qof/files/qof-0.8.8-unistd-define.patch b/dev-libs/qof/files/qof-0.8.8-unistd-define.patch new file mode 100644 index 000000000000..c76afadb6584 --- /dev/null +++ b/dev-libs/qof/files/qof-0.8.8-unistd-define.patch @@ -0,0 +1,58 @@ +From f2504eacb6d5e42b28df77041ff659fded3fd1a4 Mon Sep 17 00:00:00 2001 +From: Gilles Dartiguelongue <eva@gentoo.org> +Date: Sun, 2 Nov 2014 12:43:31 +0100 +Subject: [PATCH 3/5] Leave yacc defines to configure +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Resulted in: +* QA Notice: Package triggers severe warnings which indicate that it +* may exhibit random runtime failures. +* lexer.c:1942:9: warning: implicit declaration of function ‘isatty’ +* [-Wimplicit-function-declaration] +--- + configure.ac | 2 ++ + lib/libsql/lexer.l | 2 ++ + lib/libsql/sql_parser.h | 1 - + 3 files changed, 4 insertions(+), 1 deletion(-) + +diff --git a/configure.ac b/configure.ac +index d80e7e5..30ea37a 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -52,6 +52,8 @@ AC_PROG_MAKE_SET + AC_FUNC_MKTIME + AC_FUNC_STRTOD + ++AC_CHECK_HEADERS_ONCE([unistd.h]) ++ + dnl # ***************************************** + dnl # pkg-config check time + dnl # ***************************************** +diff --git a/lib/libsql/lexer.l b/lib/libsql/lexer.l +index fa8c5d1..44d65e8 100644 +--- a/lib/libsql/lexer.l ++++ b/lib/libsql/lexer.l +@@ -1,4 +1,6 @@ + %{ ++#include <config.h> ++ + #include <stdio.h> + #include <string.h> + #include <stdlib.h> +diff --git a/lib/libsql/sql_parser.h b/lib/libsql/sql_parser.h +index 2157e5c..0eba93f 100644 +--- a/lib/libsql/sql_parser.h ++++ b/lib/libsql/sql_parser.h +@@ -2,7 +2,6 @@ + #define SQL_PARSER_H + + #include <glib.h> +-#define YY_NO_UNISTD_H + + + typedef struct sql_statement sql_statement; +-- +2.1.2 + diff --git a/dev-libs/qof/files/qof-0.8.8-unittest.patch b/dev-libs/qof/files/qof-0.8.8-unittest.patch new file mode 100644 index 000000000000..070c37ead255 --- /dev/null +++ b/dev-libs/qof/files/qof-0.8.8-unittest.patch @@ -0,0 +1,44 @@ +From 21315eb014eb908ce3472fa75917412e21fcea29 Mon Sep 17 00:00:00 2001 +From: Gilles Dartiguelongue <eva@gentoo.org> +Date: Sun, 2 Nov 2014 12:06:39 +0100 +Subject: [PATCH 2/2] Make unittest build on demand + +Unittests need not be built when not run. +Also, solves a dependency problem where libqofsql would not be built +before sql_backend_test is linked. + +https://bugs.gentoo.org/show_bug.cgi?id=197999 +--- + lib/libsql/Makefile.am | 2 +- + qof/test/Makefile.am | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/lib/libsql/Makefile.am b/lib/libsql/Makefile.am +index b410689..c9534fb 100644 +--- a/lib/libsql/Makefile.am ++++ b/lib/libsql/Makefile.am +@@ -21,7 +21,7 @@ libqofsql_la_LIBADD = ${GLIB_LIBS} + qofsqlincludedir = ${pkgincludedir} + qofsqlinclude_HEADERS = sql_parser.h + +-noinst_PROGRAMS = sql_parse_test ++check_PROGRAMS = sql_parse_test + + EXTRA_DIST = \ + README \ +diff --git a/qof/test/Makefile.am b/qof/test/Makefile.am +index da7f28f..0760f45 100644 +--- a/qof/test/Makefile.am ++++ b/qof/test/Makefile.am +@@ -65,7 +65,7 @@ test_sql_SOURCES = \ + test-stuff.c \ + test-sql.c + +-noinst_PROGRAMS = \ ++check_PROGRAMS = \ + test-book-merge \ + test-date \ + test-guid \ +-- +2.1.2 + diff --git a/dev-libs/qof/files/qof-0.8.8-yacc-build.patch b/dev-libs/qof/files/qof-0.8.8-yacc-build.patch new file mode 100644 index 000000000000..cb4f9a9c0d07 --- /dev/null +++ b/dev-libs/qof/files/qof-0.8.8-yacc-build.patch @@ -0,0 +1,69 @@ +From 118b7287f776b789a7c122f7c7e8a1cc1084e15e Mon Sep 17 00:00:00 2001 +From: Gilles Dartiguelongue <eva@gentoo.org> +Date: Sun, 2 Nov 2014 13:01:36 +0100 +Subject: [PATCH 4/5] Fix use of lex/yacc + +http://www.gnu.org/software/automake/manual/html_node/Yacc-and-Lex.html +--- + configure.ac | 1 + + lib/libsql/Makefile.am | 17 +++++++---------- + 2 files changed, 8 insertions(+), 10 deletions(-) + +diff --git a/configure.ac b/configure.ac +index 30ea37a..23865ea 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -45,6 +45,7 @@ AC_PROG_CXX + AC_PROG_CC + AC_PROG_CPP + AC_HEADER_STDC ++AM_PROG_LEX + AC_PROG_YACC + AC_PROG_INSTALL + AC_PROG_LN_S +diff --git a/lib/libsql/Makefile.am b/lib/libsql/Makefile.am +index c9534fb..78f26cc 100644 +--- a/lib/libsql/Makefile.am ++++ b/lib/libsql/Makefile.am +@@ -5,9 +5,8 @@ lib_LTLIBRARIES = libqofsql.la + libqofsql_la_LDFLAGS= -version-info $(LIBQOFSQL_LIBRARY_VERSION) + + libqofsql_la_SOURCES = \ +- parser.c \ +- parser.h \ +- lexer.c \ ++ parser.y \ ++ lexer.l \ + sql_parser.c \ + sql_parser.h \ + mem.c \ +@@ -24,9 +23,7 @@ qofsqlinclude_HEADERS = sql_parser.h + check_PROGRAMS = sql_parse_test + + EXTRA_DIST = \ +- README \ +- lexer.l \ +- parser.y ++ README + + AM_CFLAGS = -g \ + ${CFLAGS} \ +@@ -35,11 +32,11 @@ AM_CFLAGS = -g \ + #INCLUDES = \ + # -I$(includedir) + +-parser.c: parser.y +- $(YACC) -v -d -o parser.c -p sql parser.y ++AM_YFLAGS = -v -d -p sql ++AM_LFLAGS = -Psql -o$@ + +-lexer.c: lexer.l parser.c +- $(LEX) -olexer.c -Psql lexer.l ++BUILT_SOURCES = parser.h ++CLEANFILES = $(BUILT_SOURCES) + + sql_parse_test_SOURCES=sql_parse_test.c + # sql_parse_test_LDFLAGS = $(LIBGDA_LIBS) +-- +2.1.2 + diff --git a/dev-libs/qof/metadata.xml b/dev-libs/qof/metadata.xml new file mode 100644 index 000000000000..39980802b1da --- /dev/null +++ b/dev-libs/qof/metadata.xml @@ -0,0 +1,8 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<pkgmetadata> +<maintainer type="project"> + <email>gnome@gentoo.org</email> + <name>Gentoo GNOME Desktop</name> +</maintainer> +</pkgmetadata> diff --git a/dev-libs/qof/qof-0.8.8-r1.ebuild b/dev-libs/qof/qof-0.8.8-r1.ebuild new file mode 100644 index 000000000000..0b5e1d2d5ac4 --- /dev/null +++ b/dev-libs/qof/qof-0.8.8-r1.ebuild @@ -0,0 +1,60 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=5 +GCONF_DEBUG="no" +GNOME2_LA_PUNT="yes" + +inherit autotools eutils gnome2 + +DESCRIPTION="A Query Object Framework" +HOMEPAGE="https://alioth.debian.org/projects/qof/" +SRC_URI="mirror://debian//pool/main/q/${PN}/${PN}_${PV}.orig.tar.gz" +LICENSE="GPL-2" + +SLOT="2" +KEYWORDS="amd64 ~ppc ~ppc64 ~sparc x86" +IUSE="doc nls" + +RDEPEND=" + dev-libs/libxml2 + dev-libs/glib:2 +" +DEPEND="${RDEPEND} + virtual/pkgconfig + virtual/yacc + >=sys-devel/gettext-0.19.2 + !dev-libs/qof:0 + doc? ( + app-doc/doxygen + dev-texlive/texlive-latex ) +" + +src_prepare() { + # Remove some CFLAGS + epatch "${FILESDIR}"/${PN}-0.8.8-cflags.patch + + # Delay build of unittests, bug #197999 + epatch "${FILESDIR}"/${PN}-0.8.8-unittest.patch + + # Fix use and build with yacc + epatch "${FILESDIR}"/${PN}-0.8.8-unistd-define.patch + epatch "${FILESDIR}"/${PN}-0.8.8-yacc-build.patch + rm lib/libsql/{lexer.c,parser.c,parser.h} || die + + eautoreconf + gnome2_src_prepare +} + +src_configure() { + gnome2_src_configure \ + --disable-error-on-warning \ + --disable-static \ + --disable-gdasql \ + --disable-gdabackend \ + --disable-sqlite \ + $(use_enable nls) \ + $(use_enable doc doxygen) \ + $(use_enable doc latex-docs) \ + $(use_enable doc html-docs) +} |