summaryrefslogtreecommitdiffstats
path: root/meta-gnome/recipes-gnome/gnumeric
diff options
context:
space:
mode:
Diffstat (limited to 'meta-gnome/recipes-gnome/gnumeric')
-rw-r--r--meta-gnome/recipes-gnome/gnumeric/gnumeric/0001-configure.in-drop-introspection-macros-replace-them-.patch84
-rw-r--r--meta-gnome/recipes-gnome/gnumeric/gnumeric/do-not-use-srcdir.patch15
-rw-r--r--meta-gnome/recipes-gnome/gnumeric/gnumeric_1.12.0.bb49
3 files changed, 0 insertions, 148 deletions
diff --git a/meta-gnome/recipes-gnome/gnumeric/gnumeric/0001-configure.in-drop-introspection-macros-replace-them-.patch b/meta-gnome/recipes-gnome/gnumeric/gnumeric/0001-configure.in-drop-introspection-macros-replace-them-.patch
deleted file mode 100644
index 914d2ccf9..000000000
--- a/meta-gnome/recipes-gnome/gnumeric/gnumeric/0001-configure.in-drop-introspection-macros-replace-them-.patch
+++ /dev/null
@@ -1,84 +0,0 @@
1From de5f0a535d6ea1932d2c7de53bd33510c8682ee7 Mon Sep 17 00:00:00 2001
2From: Alexander Kanavin <alex.kanavin@gmail.com>
3Date: Mon, 22 Feb 2016 16:34:03 +0200
4Subject: [PATCH] configure.in: drop introspection macros, replace them with a
5 standard one
6
7Upstream-Status: Pending
8Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
9---
10 configure.in | 57 +--------------------------------------------------------
11 1 file changed, 1 insertion(+), 56 deletions(-)
12
13diff --git a/configure.in b/configure.in
14index 8e1aa37..3086503 100644
15--- a/configure.in
16+++ b/configure.in
17@@ -934,63 +934,8 @@ AC_SUBST(MONO_CFLAGS)
18 AC_SUBST(MONO_LIBS)
19 ])
20
21-# GObject Introspection
22-GIR_REQ=1.0.0
23-AC_ARG_ENABLE(introspection,
24- AS_HELP_STRING([--enable-introspection[=@<:@no/auto/yes@:>@]],
25- [Enable introspection for this build]),,
26- [enable_introspection=no])
27-
28-AC_MSG_CHECKING([for gobject-introspection])
29-
30-dnl presence/version checking
31-AS_CASE([$enable_introspection],
32-[no], [
33- found_introspection="no (disabled, use --enable-introspection to enable)"
34-],
35-[yes],[
36- PKG_CHECK_EXISTS([gobject-introspection-1.0],,
37- AC_MSG_ERROR([gobject-introspection-1.0 is not installed]))
38- PKG_CHECK_EXISTS([gobject-introspection-1.0 >= $GIR_REQ],
39- found_introspection=yes,
40- AC_MSG_ERROR([You need to have gobject-introspection >= $1 installed to build AC_PACKAGE_NAME]))
41-],
42-[auto],[
43- PKG_CHECK_EXISTS([gobject-introspection-1.0 >= $GIR_REQ], found_introspection=yes, found_introspection=no)
44-dnl Canonicalize enable_introspection
45-enable_introspection=$found_introspection
46-],
47-[
48- AC_MSG_ERROR([invalid argument passed to --enable-introspection, should be one of @<:@no/auto/yes@:>@])
49-])
50+GOBJECT_INTROSPECTION_CHECK([1.46.0])
51
52-AC_MSG_RESULT([$found_introspection])
53-
54-INTROSPECTION_SCANNER=
55-INTROSPECTION_COMPILER=
56-INTROSPECTION_GENERATE=
57-INTROSPECTION_GIRDIR=
58-INTROSPECTION_TYPELIBDIR=
59-if test "x$found_introspection" = "xyes"; then
60- INTROSPECTION_SCANNER=`$PKG_CONFIG --variable=g_ir_scanner gobject-introspection-1.0`
61- INTROSPECTION_COMPILER=`$PKG_CONFIG --variable=g_ir_compiler gobject-introspection-1.0`
62- INTROSPECTION_GENERATE=`$PKG_CONFIG --variable=g_ir_generate gobject-introspection-1.0`
63- INTROSPECTION_GIRDIR=`$PKG_CONFIG --variable=girdir gobject-introspection-1.0`
64- INTROSPECTION_TYPELIBDIR="$($PKG_CONFIG --variable=typelibdir gobject-introspection-1.0)"
65- INTROSPECTION_CFLAGS=`$PKG_CONFIG --cflags gobject-introspection-1.0`
66- INTROSPECTION_LIBS=`$PKG_CONFIG --libs gobject-introspection-1.0`
67- INTROSPECTION_MAKEFILE=`$PKG_CONFIG --variable=datadir gobject-introspection-1.0`/gobject-introspection-1.0/Makefile.introspection
68-fi
69-AC_SUBST(INTROSPECTION_SCANNER)
70-AC_SUBST(INTROSPECTION_COMPILER)
71-AC_SUBST(INTROSPECTION_GENERATE)
72-AC_SUBST(INTROSPECTION_GIRDIR)
73-AC_SUBST(INTROSPECTION_TYPELIBDIR)
74-AC_SUBST(INTROSPECTION_CFLAGS)
75-AC_SUBST(INTROSPECTION_LIBS)
76-AC_SUBST(INTROSPECTION_MAKEFILE)
77-
78-AM_CONDITIONAL(HAVE_INTROSPECTION, test "x$found_introspection" = "xyes")
79 dnl we need to change the install directories for distcheck
80 AC_ARG_WITH([gir-dir],
81 AS_HELP_STRING(
82--
832.7.0
84
diff --git a/meta-gnome/recipes-gnome/gnumeric/gnumeric/do-not-use-srcdir.patch b/meta-gnome/recipes-gnome/gnumeric/gnumeric/do-not-use-srcdir.patch
deleted file mode 100644
index cc81b1fc0..000000000
--- a/meta-gnome/recipes-gnome/gnumeric/gnumeric/do-not-use-srcdir.patch
+++ /dev/null
@@ -1,15 +0,0 @@
1Index: gnumeric-1.12.0/test/Makefile.am
2===================================================================
3--- gnumeric-1.12.0.orig/test/Makefile.am 2011-05-17 17:54:24.000000000 -0700
4+++ gnumeric-1.12.0/test/Makefile.am 2013-10-17 20:28:19.920618596 -0700
5@@ -25,7 +25,9 @@
6 #
7 # 90xx: Misc stuff.
8
9-TESTS = $(sort $(wildcard $(srcdir)/t[0-9][0-9][0-9][0-9]-*.pl))
10+TESTS_EXTENSIONS=.pl
11+TESTS = @auto_find_tests@
12+
13 SUPPS = common.supp commondots.supp gui.supp t8003-valgrind-pdf.supp
14
15 import-db:
diff --git a/meta-gnome/recipes-gnome/gnumeric/gnumeric_1.12.0.bb b/meta-gnome/recipes-gnome/gnumeric/gnumeric_1.12.0.bb
deleted file mode 100644
index 49d0fe9d4..000000000
--- a/meta-gnome/recipes-gnome/gnumeric/gnumeric_1.12.0.bb
+++ /dev/null
@@ -1,49 +0,0 @@
1LICENSE = "GPLv2 | GPLv3"
2LIC_FILES_CHKSUM = "file://COPYING;md5=be0de417af78dd340558810d1ced52e6"
3SECTION = "x11/utils"
4S = "${WORKDIR}/gnumeric-${PV}"
5DEPENDS = "gdk-pixbuf libgsf gtk+3 libxml2 libglade libart-lgpl intltool-native libgnomecanvas libgnomeprint libbonoboui orbit2-native goffice"
6SUMMARY = "Gnumeric spreadsheet for GNOME"
7
8GNOME_COMPRESS_TYPE = "xz"
9
10inherit gnome pythonnative gobject-introspection
11
12SRC_URI += "file://do-not-use-srcdir.patch \
13 file://0001-configure.in-drop-introspection-macros-replace-them-.patch"
14
15SRC_URI[archive.md5sum] = "3fd87cca95334b5d8ac922989670fe27"
16SRC_URI[archive.sha256sum] = "037b53d909e5d1454b2afda8c4fb1e7838e260343e36d4e36245f4a5d0e04111"
17
18
19EXTRA_OECONF=" --without-perl "
20
21PACKAGES_DYNAMIC += "gnumeric-plugin-*"
22PACKAGES += "libspreadsheet libspreadsheet-dev gnumeric-goffice gnumeric-goffice-dbg"
23
24FILES_${PN}-dbg += "${libdir}/gnumeric/${PV}/plugins/*/.debug"
25FILES_${PN}-dev = "${includedir} ${libdir}/pkgconfig"
26FILES_${PN}-staticdev = "${libdir}/libspreadsheet.la"
27FILES_libspreadsheet = "${libdir}/libspreadsheet-${PV}.so"
28FILES_libspreadsheet-dev = "${libdir}/libspreadsheet.so"
29FILES_gnumeric-goffice-dbg += "${libdir}/goffice/*/plugins/gnumeric/.debug"
30FILES_gnumeric-goffice = "${libdir}/goffice/*/plugins/gnumeric/*"
31
32# This hack works around the problem mentioned here:
33# https://mail.gnome.org/archives/gnumeric-list/2010-February/msg00006.html
34do_install_prepend() {
35 sed -i ${B}/doc/C/Makefile -e 's/\tfor file in $(omffile); do/\t-for file in $(omffile); do/'
36}
37
38python populate_packages_prepend () {
39 gnumeric_libdir = bb.data.expand('${libdir}/gnumeric/${PV}/plugins', d)
40
41 do_split_packages(d, gnumeric_libdir, '^(.*)/.*$',
42 output_pattern='gnumeric-plugin-%s',
43 description='Gnumeric plugin %s',
44 extra_depends='',
45 recursive=True,
46 prepend=True)
47}
48
49PNBLACKLIST[gnumeric] ?= "Depends on broken libgnomeprint - the recipe will be removed on 2017-09-01 unless the issue is fixed"
generated by cgit v1.2.3-54-g00ecf (git 2.39.0) at 2024-11-13 06:32:32 +0000