From 94f7efd4bc93610e880fbffad23b94462d2fc449 Mon Sep 17 00:00:00 2001 From: Stanislav Brabec Date: Sun, 6 Apr 2008 23:36:07 +0000 Subject: Update of libpcre to version 7.6: * new major branch, new features * required for new goffice * uses automake, native-rpath-link.patch is no more needed * enabled UTF-8 for target build (required for new goffice) --- packages/libpcre/files/native-rpath-link.patch | 19 ----------- packages/libpcre/files/pcre-cross.patch | 25 ++++++++++++++ packages/libpcre/libpcre-native_4.4.bb | 19 ----------- packages/libpcre/libpcre-native_7.6.bb | 17 ++++++++++ packages/libpcre/libpcre_4.4.bb | 45 ------------------------- packages/libpcre/libpcre_7.6.bb | 46 ++++++++++++++++++++++++++ 6 files changed, 88 insertions(+), 83 deletions(-) delete mode 100644 packages/libpcre/files/native-rpath-link.patch create mode 100644 packages/libpcre/files/pcre-cross.patch delete mode 100644 packages/libpcre/libpcre-native_4.4.bb create mode 100644 packages/libpcre/libpcre-native_7.6.bb delete mode 100644 packages/libpcre/libpcre_4.4.bb create mode 100644 packages/libpcre/libpcre_7.6.bb diff --git a/packages/libpcre/files/native-rpath-link.patch b/packages/libpcre/files/native-rpath-link.patch deleted file mode 100644 index 69de2bea64..0000000000 --- a/packages/libpcre/files/native-rpath-link.patch +++ /dev/null @@ -1,19 +0,0 @@ -Index: pcre-4.4/Makefile.in -=================================================================== ---- pcre-4.4.orig/Makefile.in 2003-08-21 11:43:07.000000000 +0100 -+++ pcre-4.4/Makefile.in 2008-03-19 10:34:08.000000000 +0000 -@@ -107,12 +107,12 @@ - - libpcre.la: $(OBJ) - -rm -f libpcre.la -- $(LINKLIB) -rpath $(LIBDIR) -version-info \ -+ $(LINKLIB) -rpath $(LIBDIR) -L$(LIBDIR) -version-info \ - '$(PCRELIBVERSION)' -o libpcre.la $(LOBJ) - - libpcreposix.la: pcreposix.@OBJEXT@ - -rm -f libpcreposix.la -- $(LINKLIB) -rpath $(LIBDIR) libpcre.la -version-info \ -+ $(LINKLIB) -rpath $(LIBDIR) -L$(LIBDIR) libpcre.la -version-info \ - '$(PCREPOSIXLIBVERSION)' -o libpcreposix.la pcreposix.lo - - pcre.@OBJEXT@: $(top_srcdir)/chartables.c $(top_srcdir)/pcre.c \ diff --git a/packages/libpcre/files/pcre-cross.patch b/packages/libpcre/files/pcre-cross.patch new file mode 100644 index 0000000000..0626fb347a --- /dev/null +++ b/packages/libpcre/files/pcre-cross.patch @@ -0,0 +1,25 @@ +To be upstreamable, this patch requires check for *_FOR_BUILD, otherwise +it needs to pass special variables. + +It would be nice to implement per-target compiler specification to +automake, as it is done for linker. + +Even better it would be nice to implement native build time targets in +automake. + +Index: pcre-7.6/Makefile.am +=================================================================== +--- pcre-7.6.orig/Makefile.am 2008-01-23 17:58:28.000000000 +0000 ++++ pcre-7.6/Makefile.am 2008-04-03 22:32:00.000000000 +0000 +@@ -147,6 +147,11 @@ + + noinst_PROGRAMS += dftables + dftables_SOURCES = dftables.c ++dftables_LINK = $(LINK_FOR_BUILD) -o $@ ++dftables_LDFLAGS = $(LDFLAGS_FOR_BUILD) ++ ++dftables.o: $(srcdir)/dftables.c ++ $(CC_FOR_BUILD) -c $(CFLAGS_FOR_BUILD) -o $@ $(srcdir)/dftables.c + + pcre_chartables.c: dftables$(EXEEXT) + ./dftables$(EXEEXT) $@ diff --git a/packages/libpcre/libpcre-native_4.4.bb b/packages/libpcre/libpcre-native_4.4.bb deleted file mode 100644 index 1bbfde7f0a..0000000000 --- a/packages/libpcre/libpcre-native_4.4.bb +++ /dev/null @@ -1,19 +0,0 @@ -SECTION = "unknown" -require libpcre_${PV}.bb -inherit native -FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/libpcre-${PV}" - -# NOTE: multiple providers are available (libpcre, libpcre-native); -# NOTE: consider defining PREFERRED_PROVIDER_pcre -PROVIDES = "" - -SRC_URI += "file://native-rpath-link.patch;patch=1" - -do_compile () { - # The generation of dftables can lead to timestamp problems with ccache - # because the generated config.h seems newer. It is sufficient to ensure that the - # attempt to build dftables inside make will actually work (foo_FOR_BUILD is - # only used for this). - oe_runmake CC_FOR_BUILD="${BUILD_CC}" CFLAGS_FOR_BUILD="-DLINK_SIZE=2 -I${S}/include" LINK_FOR_BUILD="${BUILD_CC}" -} - diff --git a/packages/libpcre/libpcre-native_7.6.bb b/packages/libpcre/libpcre-native_7.6.bb new file mode 100644 index 0000000000..20a4bdb978 --- /dev/null +++ b/packages/libpcre/libpcre-native_7.6.bb @@ -0,0 +1,17 @@ +SECTION = "unknown" +require libpcre_${PV}.bb +inherit native +FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/libpcre-${PV}" + +# NOTE: multiple providers are available (libpcre, libpcre-native); +# NOTE: consider defining PREFERRED_PROVIDER_pcre +PROVIDES = "" + +do_compile () { + # The generation of dftables can lead to timestamp problems with ccache + # because the generated config.h seems newer. It is sufficient to ensure that the + # attempt to build dftables inside make will actually work (foo_FOR_BUILD is + # only used for this). + oe_runmake CC_FOR_BUILD="${BUILD_CC}" CFLAGS_FOR_BUILD="-DLINK_SIZE=2 -I${S}/include" LINK_FOR_BUILD="${BUILD_CC}" +} + diff --git a/packages/libpcre/libpcre_4.4.bb b/packages/libpcre/libpcre_4.4.bb deleted file mode 100644 index 517256a0ff..0000000000 --- a/packages/libpcre/libpcre_4.4.bb +++ /dev/null @@ -1,45 +0,0 @@ -DESCRIPTION = "Perl-compatible regular expression library. PCRE has its own native \ -API, but a set of 'wrapper' functions that are based on the POSIX API \ -are also supplied in the library libpcreposix. Note that this just \ -provides a POSIX calling interface to PCRE; the regular expressions \ -themselves still follow Perl syntax and semantics. The header file for \ -the POSIX-style functions is called pcreposix.h." -SECTION = "devel" -PR = "r8" -LICENSE = "BSD" -SRC_URI = "${SOURCEFORGE_MIRROR}/pcre/pcre-${PV}.tar.bz2" -S = "${WORKDIR}/pcre-${PV}" - -PROVIDES = "pcre" - -inherit autotools binconfig - -PARALLEL_MAKE = "" - -LEAD_SONAME = "libpcre.so" -CFLAGS_append = " -D_REENTRANT" -EXTRA_OECONF = " --with-link-size=2 --enable-newline-is-lf --with-match-limit=10000000" - -do_compile () { - # stop libtool from trying to link with host libraries - fix from #33 - # this resolve build problem on amd64 - #1015 - sed -i 's:-L\$:-L${STAGING_LIBDIR} -L\$:' ${S}/${TARGET_SYS}-libtool - - # The generation of dftables can lead to timestamp problems with ccache - # because the generated config.h seems newer. It is sufficient to ensure that the - # attempt to build dftables inside make will actually work (foo_FOR_BUILD is - # only used for this). - oe_runmake CC_FOR_BUILD="${BUILD_CC}" CFLAGS_FOR_BUILD="-DLINK_SIZE=2 -I${S}/include" LINK_FOR_BUILD="${BUILD_CC}" -} - -do_stage () { - oe_libinstall -a -so libpcre ${STAGING_LIBDIR} - oe_libinstall -a -so libpcreposix ${STAGING_LIBDIR} - install -m 0644 pcre.h ${STAGING_INCDIR}/ - install -m 0644 pcreposix.h ${STAGING_INCDIR}/ - install -d ${STAGING_BINDIR_NATIVE} - install -m 0755 ${S}/dftables ${STAGING_BINDIR_NATIVE}/ -} - -FILES_${PN} = "${libdir}/lib*.so.*" -FILES_${PN}-dev += "${bindir}/*" diff --git a/packages/libpcre/libpcre_7.6.bb b/packages/libpcre/libpcre_7.6.bb new file mode 100644 index 0000000000..3171e10e68 --- /dev/null +++ b/packages/libpcre/libpcre_7.6.bb @@ -0,0 +1,46 @@ +DESCRIPTION = "Perl-compatible regular expression library. PCRE has its own native \ +API, but a set of 'wrapper' functions that are based on the POSIX API \ +are also supplied in the library libpcreposix. Note that this just \ +provides a POSIX calling interface to PCRE; the regular expressions \ +themselves still follow Perl syntax and semantics. The header file for \ +the POSIX-style functions is called pcreposix.h." +SECTION = "devel" +PR = "r1" +LICENSE = "BSD" +SRC_URI = "${SOURCEFORGE_MIRROR}/pcre/pcre-${PV}.tar.bz2 \ + file://pcre-cross.patch;patch=1" +S = "${WORKDIR}/pcre-${PV}" + +PROVIDES = "pcre" + +inherit autotools binconfig + +PARALLEL_MAKE = "" + +LEAD_SONAME = "libpcre.so" +CFLAGS_append = " -D_REENTRANT" +EXTRA_OECONF = " --with-link-size=2 --enable-newline-is-lf --with-match-limit=10000000 --enable-rebuild-chartables --enable-utf8" + +do_compile () { + # stop libtool from trying to link with host libraries - fix from #33 + # this resolve build problem on amd64 - #1015 + sed -i 's:-L\$:-L${STAGING_LIBDIR} -L\$:' ${S}/${TARGET_SYS}-libtool + + # The generation of dftables can lead to timestamp problems with ccache + # because the generated config.h seems newer. It is sufficient to ensure that the + # attempt to build dftables inside make will actually work (foo_FOR_BUILD is + # only used for this). + oe_runmake CC_FOR_BUILD="${BUILD_CC}" CFLAGS_FOR_BUILD="-DLINK_SIZE=2 -I${S}/include" LINK_FOR_BUILD="${BUILD_CC} -L${S}/lib" +} + +do_stage () { + oe_libinstall -a -so libpcre ${STAGING_LIBDIR} + oe_libinstall -a -so libpcreposix ${STAGING_LIBDIR} + install -m 0644 pcre.h ${STAGING_INCDIR}/ + install -m 0644 pcreposix.h ${STAGING_INCDIR}/ + install -d ${STAGING_BINDIR_NATIVE} + install -m 0755 ${S}/dftables ${STAGING_BINDIR_NATIVE}/ +} + +FILES_${PN} = "${libdir}/lib*.so.*" +FILES_${PN}-dev += "${bindir}/*" -- cgit v1.2.3 From eb161ad2ccefa39f24c692c77b818c7117ea4938 Mon Sep 17 00:00:00 2001 From: Stanislav Brabec Date: Sun, 6 Apr 2008 23:39:25 +0000 Subject: goffice updated to version 0.6.2: * new stable branch * required by newer gnumeric * builds correctly in current OE * dropped obsolete versions --- packages/gnome/goffice_0.2.1.bb | 23 ----------------------- packages/gnome/goffice_0.3.2.bb | 25 ------------------------- packages/gnome/goffice_0.6.2.bb | 25 +++++++++++++++++++++++++ 3 files changed, 25 insertions(+), 48 deletions(-) delete mode 100644 packages/gnome/goffice_0.2.1.bb delete mode 100644 packages/gnome/goffice_0.3.2.bb create mode 100644 packages/gnome/goffice_0.6.2.bb diff --git a/packages/gnome/goffice_0.2.1.bb b/packages/gnome/goffice_0.2.1.bb deleted file mode 100644 index 2048cdd34d..0000000000 --- a/packages/gnome/goffice_0.2.1.bb +++ /dev/null @@ -1,23 +0,0 @@ -DESCRIPTION="Gnome Office Library" -LICENSE="GPLv2" -PR="r1" - -DEPENDS="glib-2.0 gtk+ pango libgnomeprint libgsf libglade libxml2 libart-lgpl" - -FILES_${PN}-dbg += "${libdir}/goffice/${PV}/plugins/*/.debug" - -inherit gnome pkgconfig - -do_stage() { - gnome_stage_includes - oe_libinstall -so -C goffice libgoffice-1 ${STAGING_LIBDIR} -} - -PACKAGES_DYNAMIC = "goffice-plugin-*" - -python populate_packages_prepend () { - goffice_libdir = bb.data.expand('${libdir}/goffice/${PV}/plugins', d) - - do_split_packages(d, goffice_libdir, '(.*)', 'goffice-plugin-%s', 'Goffice plugin for %s', allow_dirs=True) -} - diff --git a/packages/gnome/goffice_0.3.2.bb b/packages/gnome/goffice_0.3.2.bb deleted file mode 100644 index a81f96910c..0000000000 --- a/packages/gnome/goffice_0.3.2.bb +++ /dev/null @@ -1,25 +0,0 @@ -DESCRIPTION="Gnome Office Library" -LICENSE="GPLv2" -PR="r1" - -DEFAULT_PREFERENCE = "-1" - -DEPENDS="glib-2.0 gtk+ pango cairo libgnomeprint libgsf libglade libxml2 libart-lgpl" - -FILES_${PN}-dbg += "${libdir}/goffice/${PV}/plugins/*/.debug" - -inherit gnome pkgconfig - -do_stage() { - gnome_stage_includes - oe_libinstall -so -C goffice libgoffice-0 ${STAGING_LIBDIR} -} - -PACKAGES_DYNAMIC = "goffice-plugin-*" - -python populate_packages_prepend () { - goffice_libdir = bb.data.expand('${libdir}/goffice/${PV}/plugins', d) - - do_split_packages(d, goffice_libdir, '(.*)', 'goffice-plugin-%s', 'Goffice plugin for %s', allow_dirs=True) -} - diff --git a/packages/gnome/goffice_0.6.2.bb b/packages/gnome/goffice_0.6.2.bb new file mode 100644 index 0000000000..95e64a508e --- /dev/null +++ b/packages/gnome/goffice_0.6.2.bb @@ -0,0 +1,25 @@ +DESCRIPTION="Gnome Office Library" +LICENSE="GPLv2" +PR="r1" + +DEFAULT_PREFERENCE = "-1" + +DEPENDS="glib-2.0 gtk+ pango cairo libgnomeprint libgsf libglade libpcre libxml2 libart-lgpl" + +FILES_${PN}-dbg += "${libdir}/goffice/${PV}/plugins/*/.debug" + +inherit gnome pkgconfig + +do_stage() { + gnome_stage_includes + oe_libinstall -so -C goffice libgoffice-0.6 ${STAGING_LIBDIR} +} + +PACKAGES_DYNAMIC = "goffice-plugin-*" + +python populate_packages_prepend () { + goffice_libdir = bb.data.expand('${libdir}/goffice/${PV}/plugins', d) + + do_split_packages(d, goffice_libdir, '(.*)', 'goffice-plugin-%s', 'Goffice plugin for %s', allow_dirs=True) +} + -- cgit v1.2.3 From 9a2b1732487162c1e1e717a371e45fbd73ae492a Mon Sep 17 00:00:00 2001 From: Stanislav Brabec Date: Sun, 6 Apr 2008 23:41:39 +0000 Subject: gnumeric updated to version 1.8.2: * new stable branch --- packages/gnumeric/files/remove-docs.patch | 16 +++++++++------- packages/gnumeric/gnumeric_1.6.3.bb | 24 ------------------------ packages/gnumeric/gnumeric_1.8.2.bb | 29 +++++++++++++++++++++++++++++ 3 files changed, 38 insertions(+), 31 deletions(-) delete mode 100644 packages/gnumeric/gnumeric_1.6.3.bb create mode 100644 packages/gnumeric/gnumeric_1.8.2.bb diff --git a/packages/gnumeric/files/remove-docs.patch b/packages/gnumeric/files/remove-docs.patch index 4a9108bd4e..650ad6f4fa 100644 --- a/packages/gnumeric/files/remove-docs.patch +++ b/packages/gnumeric/files/remove-docs.patch @@ -1,8 +1,10 @@ ---- gnumeric-1.5.2/Makefile.am.orig 2005-08-01 11:32:36.119921544 +0000 -+++ gnumeric-1.5.2/Makefile.am 2005-08-01 11:32:44.689618752 +0000 +Index: gnumeric-1.8.2/Makefile.am +=================================================================== +--- gnumeric-1.8.2.orig/Makefile.am 2008-01-15 02:53:04.000000000 +0000 ++++ gnumeric-1.8.2/Makefile.am 2008-04-01 22:44:44.000000000 +0000 @@ -1,4 +1,4 @@ --SUBDIRS = . po po-functions src plugins icons templates doc schemas -+SUBDIRS = . po po-functions src plugins icons templates schemas - if WITH_WIN32 - SUBDIRS += tools - endif +-SUBDIRS = . po po-functions src plugins icons templates doc tools schemas test ++SUBDIRS = . po po-functions src plugins icons templates tools schemas test + + XML_I18N_XML_KIND = --pass-through + diff --git a/packages/gnumeric/gnumeric_1.6.3.bb b/packages/gnumeric/gnumeric_1.6.3.bb deleted file mode 100644 index 9c757fb7ff..0000000000 --- a/packages/gnumeric/gnumeric_1.6.3.bb +++ /dev/null @@ -1,24 +0,0 @@ -LICENSE = "GPL" -SECTION = "x11/utils" -S = "${WORKDIR}/gnumeric-${PV}" -DEPENDS = "libgsf gtk+ libxml2 goffice libglade libart-lgpl intltool-native libgnomecanvas libgnomeprint libgnomeprintui libbonoboui" -DESCRIPTION = "Gnumeric spreadsheet for GNOME" - -PR = "r1" - -inherit gnome flow-lossage - -SRC_URI += "file://remove-docs.patch;patch=1" - -EXTRA_OECONF=" --without-perl " - -PACKAGES_DYNAMIC = "gnumeric-plugin-*" - -FILES_${PN}-dbg += "${libdir}/gnumeric/1.6.3/plugins/*/.debug" -FILES_gnumeric_append = " /usr/lib/libspreadsheet-${PV}.so " - -python populate_packages_prepend () { - gnumeric_libdir = bb.data.expand('${libdir}/gnumeric/${PV}/plugins', d) - - do_split_packages(d, gnumeric_libdir, '(.*)', 'gnumeric-plugin-%s', 'Gnumeric plugin for %s', allow_dirs=True) -} diff --git a/packages/gnumeric/gnumeric_1.8.2.bb b/packages/gnumeric/gnumeric_1.8.2.bb new file mode 100644 index 0000000000..f7654117d7 --- /dev/null +++ b/packages/gnumeric/gnumeric_1.8.2.bb @@ -0,0 +1,29 @@ +LICENSE = "GPL" +SECTION = "x11/utils" +S = "${WORKDIR}/gnumeric-${PV}" +DEPENDS = "libgsf gtk+ libxml2 goffice libglade libart-lgpl intltool-native libgnomecanvas libgnomeprint libgnomeprintui libbonoboui orbit2-native" +DESCRIPTION = "Gnumeric spreadsheet for GNOME" + +PR = "r1" + +inherit gnome flow-lossage + +SRC_URI += "file://remove-docs.patch;patch=1" + +EXTRA_OECONF=" --without-perl " + +PACKAGES_DYNAMIC = "gnumeric-plugin-*" + +FILES_${PN}-dbg += "${libdir}/gnumeric/1.8.2/plugins/*/.debug" +FILES_gnumeric_append = " /usr/lib/libspreadsheet-${PV}.so " + +# We need native orbit-idl with target idl files. No way to say it in a clean way: +do_configure_append () { + find -name Makefile -exec sed -i '/\/usr\/bin\/orbit-idl-2/{s:/usr/bin:${STAGING_BINDIR_NATIVE}:;s:/usr/share:${STAGING_DATADIR}:g}' {} \; +} + +python populate_packages_prepend () { + gnumeric_libdir = bb.data.expand('${libdir}/gnumeric/${PV}/plugins', d) + + do_split_packages(d, gnumeric_libdir, '(.*)', 'gnumeric-plugin-%s', 'Gnumeric plugin for %s', allow_dirs=True) +} -- cgit v1.2.3 From e6de8a447dc94e80138ee405299a90765cd35871 Mon Sep 17 00:00:00 2001 From: Stanislav Brabec Date: Sun, 6 Apr 2008 23:44:31 +0000 Subject: libgsf updated to version 1.14.8: * required for latest gnumeric --- packages/libgsf/libgsf_1.14.2.bb | 23 ----------------------- packages/libgsf/libgsf_1.14.8.bb | 23 +++++++++++++++++++++++ 2 files changed, 23 insertions(+), 23 deletions(-) delete mode 100644 packages/libgsf/libgsf_1.14.2.bb create mode 100644 packages/libgsf/libgsf_1.14.8.bb diff --git a/packages/libgsf/libgsf_1.14.2.bb b/packages/libgsf/libgsf_1.14.2.bb deleted file mode 100644 index 43fd3ab9c7..0000000000 --- a/packages/libgsf/libgsf_1.14.2.bb +++ /dev/null @@ -1,23 +0,0 @@ -LICENSE = "GPL" -SECTION = "libs" -PR = "r0" - -DEPENDS= "libxml2 bzip2 glib-2.0 zlib gtk-doc libbonobo gnome-vfs" -RDEPENDS = "gconf gnome-vfs" - - -PACKAGES =+ "${PN}-gnome ${PN}-gnome-dev " - -FILES_${PN}-gnome = "${libdir}/libgsf-gnome-1.so.*" -FILES_${PN}-gnome-dev = "${libdir}/libgsf-gnome-1.* ${includedir}/libgsf-1/gsf-gnome" - -inherit autotools pkgconfig gnome gconf - -EXTRA_OECONF = "\ - --without-python \ - --with-gnome \ - --with-bz2" - -do_stage() { -autotools_stage_all -} diff --git a/packages/libgsf/libgsf_1.14.8.bb b/packages/libgsf/libgsf_1.14.8.bb new file mode 100644 index 0000000000..43fd3ab9c7 --- /dev/null +++ b/packages/libgsf/libgsf_1.14.8.bb @@ -0,0 +1,23 @@ +LICENSE = "GPL" +SECTION = "libs" +PR = "r0" + +DEPENDS= "libxml2 bzip2 glib-2.0 zlib gtk-doc libbonobo gnome-vfs" +RDEPENDS = "gconf gnome-vfs" + + +PACKAGES =+ "${PN}-gnome ${PN}-gnome-dev " + +FILES_${PN}-gnome = "${libdir}/libgsf-gnome-1.so.*" +FILES_${PN}-gnome-dev = "${libdir}/libgsf-gnome-1.* ${includedir}/libgsf-1/gsf-gnome" + +inherit autotools pkgconfig gnome gconf + +EXTRA_OECONF = "\ + --without-python \ + --with-gnome \ + --with-bz2" + +do_stage() { +autotools_stage_all +} -- cgit v1.2.3