From 4f2d7949f03e1c198bc888f2d05f421d35c57e21 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Mon, 9 Oct 2017 18:53:29 +0100 Subject: reinit the tree, so we can have metadata --- dev-libs/qof/Manifest | 9 ++++ dev-libs/qof/files/qof-0.8.8-cflags.patch | 36 +++++++++++++ dev-libs/qof/files/qof-0.8.8-unistd-define.patch | 58 ++++++++++++++++++++ dev-libs/qof/files/qof-0.8.8-unittest.patch | 44 +++++++++++++++ dev-libs/qof/files/qof-0.8.8-yacc-build.patch | 69 ++++++++++++++++++++++++ dev-libs/qof/metadata.xml | 8 +++ dev-libs/qof/qof-0.8.8-r1.ebuild | 60 +++++++++++++++++++++ 7 files changed, 284 insertions(+) create mode 100644 dev-libs/qof/Manifest create mode 100644 dev-libs/qof/files/qof-0.8.8-cflags.patch create mode 100644 dev-libs/qof/files/qof-0.8.8-unistd-define.patch create mode 100644 dev-libs/qof/files/qof-0.8.8-unittest.patch create mode 100644 dev-libs/qof/files/qof-0.8.8-yacc-build.patch create mode 100644 dev-libs/qof/metadata.xml create mode 100644 dev-libs/qof/qof-0.8.8-r1.ebuild (limited to 'dev-libs/qof') diff --git a/dev-libs/qof/Manifest b/dev-libs/qof/Manifest new file mode 100644 index 000000000000..7dfd927c396c --- /dev/null +++ b/dev-libs/qof/Manifest @@ -0,0 +1,9 @@ +AUX qof-0.8.8-cflags.patch 1349 SHA256 753cb6110bb702e636d66acef767f51a30e5b394f357f1b6cde47dc8506a91c5 SHA512 30b3fe8f7845f4b04e893c1b3ef94cce7c5aae7654632683db9fabfb5a61a4e7def9267fcf2475000238393fc872316e1ae7453aea7384d122222035e978019f WHIRLPOOL 9845a368f6ac1aacad4f2c2ebc48b7e82d3ff57f7e8377af677f6f50a950987cf60063943ed0981676eb366da17bc1651859157b73b87529bb35cfc8d167b2c3 +AUX qof-0.8.8-unistd-define.patch 1570 SHA256 07a8c8267f2b83590e274e9b7da4b4b2bae245c6c4f90bd7aa03a232ea84d690 SHA512 be05119e2fde0ee3c464007a7e49171de3ab934505a7318ca037650f9e9a2b54d48ba1033578ce1085cdaa2f9bc08d13f69b8bd564d16dcd7936f0f9e6936729 WHIRLPOOL 8b7abd673d4fde6f8864b7af41c11e7e92af71b55b001e56ec2153a1204b383e5979fe97eb69ac7a69e5e0cd9837a84428bf9e3413bcac92ee2ea919970c2e53 +AUX qof-0.8.8-unittest.patch 1223 SHA256 d140bcf3273413d2c8e89078fa1cef0cc43854fb6895191f33f3eab3968184f1 SHA512 a37959a50d7684d073c88ca465960c9bb920e614d6015a8870db54983222318f8b1b34d7b9cc26e5bf4a860876216b6781b45b2d40ee9d7fe04ada09185c143c WHIRLPOOL 7dffc3445a89e71edfa1ee0a632c83ef75a0c8253cc791e3abfb3fdcf1872181d967a1a0e502ea39e953bd6056f91991138917c203392930832c90da526b13d4 +AUX qof-0.8.8-yacc-build.patch 1667 SHA256 a2d03867f5964f382e36a06d18a79132664357733665e7a1a7fdb6120c46159a SHA512 225deb1652de4e2383599454bd765a3feea2169d4a7fc4b80538ab68d3984a6ff9da66938e97727ff6a64995c4780c3c21b91de35f3cc3ec2f4591f8a0b92af3 WHIRLPOOL b23ae868f1573fa6062286141d408fbd217645e929cd18797464e4be42a15d5bb89a5f8ee99f21739ef37fc0c1a1048dbd709041f5a150e2c97a3b651bc67f56 +DIST qof_0.8.8.orig.tar.gz 962548 SHA256 2cecb942bb42fc77c42417cf9118512c73911c16ccea6e72ab28b8bdf60a4e2e SHA512 f62597180f614067d72b5c6dcf4175aa9241e33d2437d6f18215a8c7389c67dd25ccd48dcdfd4c31794e0273e979e72aa0d4e66bb6d832c6f2da644889f848c4 WHIRLPOOL 337bb87354f6c2618f388e5247756d884eedd8c61f9fca0336ae090ba97713c5ca30715cfbc54a01e5b7b04bdc9850a873fb6a48183ac0a046b30e907a5878ba +EBUILD qof-0.8.8-r1.ebuild 1309 SHA256 99a67a4c7b7fd4a320bc599a7303fdfff099439f975b342fd99728ef1960c4e3 SHA512 e9920e8ad856a0e5db857e1847d43e570a8054b62523cb7cc7ba9a45c76aa11268faad114eb9caceca84caa2b385f35c760010a78a4916902b0fc65700680dbf WHIRLPOOL 2bcc2c8cf56234b411079fcabaf689455b8160cd8e306e36219f726c29ac5dc837c4a1e1803ef92ceb9692c2b09d1d3f914a7d8bf65381189a2bbb9b8f48c214 +MISC ChangeLog 2990 SHA256 aae85ff4ca5f54ce8018a5c5839a464d8a494de802727df6c0eb48b66132abb6 SHA512 7a51c9ef687601082a631e0eaf681e11db03f0df8b91d307975f2c43aed7ce12da12621810cd86f759a5edf24390d82ed4179d497c16bdd20d59b2e20fe6ed1c WHIRLPOOL 5aaf7f68e9a4ab402643a573d75006df9b3f3b3b84f11a4c07f59e6f000609b2528d458a49b0991d67e13cb49a00dbe15442155dfc055dc4665082a7680b6aa0 +MISC ChangeLog-2015 6863 SHA256 5264be0476b3e9eaf3c4cd1d1b06106a8e0f3f4b03abb92eb979a7e35c3402f8 SHA512 2b63be92263ad62103c968f3f655b5d5a7fcc6f9f86ee8edc75faf0bdb1624c9027e06781359d5fc96bdbac457d70b8757b3cac171e0cfb065d38207f286b6cf WHIRLPOOL 074b5459bb0050e4b715c5bf1c58ea849543b73e35d5ff9152878b6a523f18e2265ac8dad8e45df7c01069509b37dc4fbb7aaf0e41e197fd4c092c734a327aec +MISC metadata.xml 249 SHA256 4505b0bfeadff287958620b7dc7b7209699065a8f17139a237a5dd409a726a97 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506 WHIRLPOOL 333a938ee1d2124595596c572697bf5ebad523a92ba12005cfb12e6bb6270881a94a911f0cc9c1cf2bb571559e8271e07dfd307dabe50058236dbe7103562b92 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 +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 +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 ++ + #include + #include + #include +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 +-#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 +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 +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 @@ + + + + + gnome@gentoo.org + Gentoo GNOME Desktop + + 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) +} -- cgit v1.2.3