[oe-commits] org.oe.dev packages/gnome: sync with poky, while maintaining OE tweaks like avahi and gnutls
koen commit
openembedded-commits at lists.openembedded.org
Sat Sep 29 08:05:28 UTC 2007
packages/gnome: sync with poky, while maintaining OE tweaks like avahi and gnutls
Author: koen at openembedded.org
Branch: org.openembedded.dev
Revision: cffa4cb444a55ec8127fab7039a3c04733f04177
ViewMTN: http://monotone.openembedded.org/revision/info/cffa4cb444a55ec8127fab7039a3c04733f04177
Files:
1
packages/gnome/gnome-common-2.20.0
packages/gnome/gnome-vfs-2.20.0
packages/gnome/gail_1.20.0.bb
packages/gnome/gnome-common-2.20.0/omf.patch
packages/gnome/gnome-common_2.20.0.bb
packages/gnome/gnome-doc-utils_0.12.0.bb
packages/gnome/gnome-mime-data_2.18.0.bb
packages/gnome/gnome-vfs-2.20.0/gconftool-lossage.patch
packages/gnome/gnome-vfs-2.20.0/gnome-vfs-no-kerberos.patch
packages/gnome/gnome-vfs_2.20.0.bb
packages/gnome/libart-lgpl_2.3.19.bb
packages/gnome/libgnomecanvas_2.14.0.bb
packages/gnome/libgnomecanvas_2.20.0.bb
packages/gnome/gnome-vfs_2.18.1.bb
packages/gnome/libart-lgpl/Makefile.am.patch
packages/gnome/libsoup_2.2.100.bb
Diffs:
#
# mt diff -rcd35c63e2fd9e9d97421e136e3f7b53517317560 -rcffa4cb444a55ec8127fab7039a3c04733f04177
#
#
#
# add_dir "packages/gnome/gnome-common-2.20.0"
#
# add_dir "packages/gnome/gnome-vfs-2.20.0"
#
# add_file "packages/gnome/gail_1.20.0.bb"
# content [645588116b02f1bb0683adcdb8a95f5b2c4163ce]
#
# add_file "packages/gnome/gnome-common-2.20.0/omf.patch"
# content [64482903485c278eb01e08a2f700ca93963875a8]
#
# add_file "packages/gnome/gnome-common_2.20.0.bb"
# content [7f6e44a0209c62cfeb9770d1df72704757bc2ebe]
#
# add_file "packages/gnome/gnome-doc-utils_0.12.0.bb"
# content [20041d84ef0cc9aeae12802d43820966a313b667]
#
# add_file "packages/gnome/gnome-mime-data_2.18.0.bb"
# content [cd0afa69e8cfc835b65e20e2aaab68169f666c74]
#
# add_file "packages/gnome/gnome-vfs-2.20.0/gconftool-lossage.patch"
# content [86cd941ab9eb83fe517a655dd2efc89636d8d97c]
#
# add_file "packages/gnome/gnome-vfs-2.20.0/gnome-vfs-no-kerberos.patch"
# content [860446c945edbfcc96fafaaca0498b642e6a22dc]
#
# add_file "packages/gnome/gnome-vfs_2.20.0.bb"
# content [78332c5bb857504699fd76c7be2ff567d1904dc4]
#
# add_file "packages/gnome/libart-lgpl_2.3.19.bb"
# content [895fd8ffcb463bbaca6c34070af468b8ae846a94]
#
# add_file "packages/gnome/libgnomecanvas_2.14.0.bb"
# content [e4f7f2ca59f2bcf0c49189e4b5ef836958a53654]
#
# add_file "packages/gnome/libgnomecanvas_2.20.0.bb"
# content [fe8196413861eef466b7299bb3339d3ecdc9a82c]
#
# patch "packages/gnome/gnome-vfs_2.18.1.bb"
# from [71ed32902ca195b29624c31b59b3a5f6d80a83d0]
# to [212f57d5bf3b93630b4ba3ddb96591390829c7c7]
#
# patch "packages/gnome/libart-lgpl/Makefile.am.patch"
# from [2cf1541c430f3f842d369d11ac2ad3355f441a76]
# to [2054c91d45d1a5f77c7ebd03c5cc6f6d5898ed5f]
#
# patch "packages/gnome/libsoup_2.2.100.bb"
# from [cbf6cd8728f99799c3c69d03a0083411b5f652f9]
# to [22afb236c2cc359570b54864b80ade06bd669f76]
#
============================================================
--- packages/gnome/gail_1.20.0.bb 645588116b02f1bb0683adcdb8a95f5b2c4163ce
+++ packages/gnome/gail_1.20.0.bb 645588116b02f1bb0683adcdb8a95f5b2c4163ce
@@ -0,0 +1,18 @@
+LICENSE = "LGPL"
+SECTION = "x11/libs"
+PR = "r0"
+DESCRIPTION = "GNOME Accessibility Implementation Library"
+DEPENDS = "gtk+"
+
+inherit gnome
+
+EXTRA_OECONF = "--disable-gtk-doc"
+
+FILES_${PN} += "${libdir}/gtk-2.0/modules/*.so"
+FILES_${PN}-dbg += "${libdir}/gtk-2.0/modules/.debug"
+
+do_stage() {
+ gnome_stage_includes
+ oe_libinstall -C gail -so libgail ${STAGING_LIBDIR}
+ oe_libinstall -C libgail-util -so libgailutil ${STAGING_LIBDIR}
+}
============================================================
--- packages/gnome/gnome-common-2.20.0/omf.patch 64482903485c278eb01e08a2f700ca93963875a8
+++ packages/gnome/gnome-common-2.20.0/omf.patch 64482903485c278eb01e08a2f700ca93963875a8
@@ -0,0 +1,13 @@
+--- gnome-common-2.4.0/doc-build/omf.make 2003-05-24 08:16:25.000000000 -0700
++++ gnome-common-2.4.0.new/doc-build/omf.make 2004-11-15 14:01:12.185155192 -0700
+@@ -43,7 +43,9 @@
+ install-data-hook-omf:
+ $(mkinstalldirs) $(DESTDIR)$(omf_dest_dir)
+ for file in $(omffile); do \
+- $(INSTALL_DATA) $$file.out $(DESTDIR)$(omf_dest_dir)/$$file; \
++ if [ -f $$file.out ]; then \
++ $(INSTALL_DATA) $$file.out $(DESTDIR)$(omf_dest_dir)/$$file; \
++ fi; \
+ done
+ -scrollkeeper-update -p $(DESTDIR)$(scrollkeeper_localstate_dir) -o $(DESTDIR)$(omf_dest_dir)
+
============================================================
--- packages/gnome/gnome-common_2.20.0.bb 7f6e44a0209c62cfeb9770d1df72704757bc2ebe
+++ packages/gnome/gnome-common_2.20.0.bb 7f6e44a0209c62cfeb9770d1df72704757bc2ebe
@@ -0,0 +1,28 @@
+LICENSE = "GPL"
+SECTION = "x11/gnome"
+PR = "r0"
+DESCRIPTION = "Common macros for building GNOME applications"
+inherit gnome
+
+# The omf.make file failed if scrollkeeper doesn't happen to be
+# installed
+
+SRC_URI += "file://omf.patch;patch=1"
+
+EXTRA_AUTORECONF = ""
+DEPENDS = ""
+
+FILES_${PN} += "${datadir}/aclocal"
+FILES_${PN}-dev = ""
+
+do_stage () {
+ rm -rf ${STAGE_TEMP}
+ mkdir -p ${STAGE_TEMP}
+ make DESTDIR="${STAGE_TEMP}" install
+ cp -pPR ${STAGE_TEMP}${bindir}/* ${STAGING_DIR}/${BUILD_SYS}/bin
+ install -d ${STAGING_DATADIR}/gnome-common
+ install -d ${STAGING_DATADIR}/aclocal
+ cp -pPR ${STAGE_TEMP}${datadir}/gnome-common/* ${STAGING_DATADIR}/gnome-common
+ cp -pPR ${STAGE_TEMP}${datadir}/aclocal/* ${STAGING_DATADIR}/aclocal
+ rm -rf ${STAGE_TEMP}
+}
============================================================
--- packages/gnome/gnome-doc-utils_0.12.0.bb 20041d84ef0cc9aeae12802d43820966a313b667
+++ packages/gnome/gnome-doc-utils_0.12.0.bb 20041d84ef0cc9aeae12802d43820966a313b667
@@ -0,0 +1,16 @@
+LICENSE = "GPL/LGPL"
+DEPENDS = "libxml2 libxslt"
+
+PR = "r1"
+
+inherit gnome
+
+EXTRA_OECONF = "--disable-scrollkeeper"
+
+FILES_${PN} += "${datadir}/xml*"
+
+do_stage() {
+ mkdir -p ${STAGING_DATADIR}/xml/gnome/xslt/
+ cp -pPr ${S}/xslt/* ${STAGING_DATADIR}/xml/gnome/xslt/
+ autotools_stage_all
+}
============================================================
--- packages/gnome/gnome-mime-data_2.18.0.bb cd0afa69e8cfc835b65e20e2aaab68169f666c74
+++ packages/gnome/gnome-mime-data_2.18.0.bb cd0afa69e8cfc835b65e20e2aaab68169f666c74
@@ -0,0 +1,7 @@
+LICENSE = "GPL"
+inherit gnome
+
+DEPENDS += "shared-mime-info intltool-native"
+RDEPENDS = "shared-mime-info"
+
+FILES_${PN}-dev += "${datadir}/pkgconfig/*.pc"
============================================================
--- packages/gnome/gnome-vfs-2.20.0/gconftool-lossage.patch 86cd941ab9eb83fe517a655dd2efc89636d8d97c
+++ packages/gnome/gnome-vfs-2.20.0/gconftool-lossage.patch 86cd941ab9eb83fe517a655dd2efc89636d8d97c
@@ -0,0 +1,11 @@
+--- gnome-vfs-2.6.0/configure.in~ 2004-03-22 12:36:23.000000000 +0000
++++ gnome-vfs-2.6.0/configure.in 2004-06-07 16:04:34.000000000 +0100
+@@ -154,7 +154,7 @@
+ AC_PATH_PROG(GCONFTOOL, gconftool-2, no)
+
+ if test x"$GCONFTOOL" = xno; then
+- AC_MSG_ERROR([gconftool-2 executable not found in your path - should be installed with GConf])
++ AC_MSG_WARN([gconftool-2 executable not found in your path - should be installed with GConf])
+ fi
+
+ AM_GCONF_SOURCE_2
============================================================
--- packages/gnome/gnome-vfs-2.20.0/gnome-vfs-no-kerberos.patch 860446c945edbfcc96fafaaca0498b642e6a22dc
+++ packages/gnome/gnome-vfs-2.20.0/gnome-vfs-no-kerberos.patch 860446c945edbfcc96fafaaca0498b642e6a22dc
@@ -0,0 +1,51 @@
+removes kerberos completely to avoid conflicts with installed kerberos
+--- configure.in.orig 2007-01-05 19:42:26.418541610 +0200
++++ configure.in 2007-01-05 19:42:56.604261797 +0200
+@@ -436,47 +436,6 @@
+ ])
+ AM_CONDITIONAL(HAVE_CDDA, test $have_cdda = yes)
+ AC_SUBST(CDDA_LIBS)
+-
+-dnl GSSAPI
+-dnl Check for Kerberos installation
+-have_gssapi=no
+-AC_PATH_PROG([KRB5_CONFIG], krb5-config, none, $PATH:/usr/kerberos/bin)
+-
+-if test "x$KRB5_CONFIG" != "xnone"; then
+- GSSAPI_LIBS="`${KRB5_CONFIG} --libs gssapi`"
+- GSSAPI_CFLAGS="`${KRB5_CONFIG} --cflags gssapi`"
+-
+- saved_CPPFLAGS="$CPPFLAGS"
+- saved_LIBS="$LIBS"
+- LIBS="$LIBS $GSSAPI_LIBS"
+- CPPFLAGS="$CPPFLAGS $GSSAPI_CFLAGS"
+- # MIT and Heimdal put gssapi.h in different places
+- AC_CHECK_HEADERS(gssapi/gssapi.h gssapi.h, [
+- AC_CHECK_FUNCS(gss_init_sec_context, [
+- AC_MSG_NOTICE([GSSAPI authentication support enabled])
+- AC_DEFINE(HAVE_GSSAPI, 1, [Define if GSSAPI support is enabled])
+- AC_CHECK_HEADERS(gssapi/gssapi_generic.h)
+- have_gssapi=yes
+-
+- # MIT Kerberos lacks GSS_C_NT_HOSTBASED_SERVICE
+- AC_CHECK_DECL([GSS_C_NT_HOSTBASED_SERVICE],,
+- [AC_DEFINE([GSS_C_NT_HOSTBASED_SERVICE], gss_nt_service_name,
+- [Define if GSS_C_NT_HOSTBASED_SERVICE is not defined otherwise])
+- ], [
+- #ifdef HAVE_GSSAPI_GSSAPI_H
+- #include <gssapi/gssapi.h>
+- #else
+- #include <gssapi.h>
+- #endif
+- ])
+- ])
+- break
+- ])
+- LIBS="$saved_LIBS"
+- CPPFLAGS="$saved_CPPFLAGS"
+-fi
+-AC_SUBST(GSSAPI_LIBS)
+-AC_SUBST(GSSAPI_CFLAGS)
+
+ dnl ******************************
+ dnl http-method (neon checks)
============================================================
--- packages/gnome/gnome-vfs_2.20.0.bb 78332c5bb857504699fd76c7be2ff567d1904dc4
+++ packages/gnome/gnome-vfs_2.20.0.bb 78332c5bb857504699fd76c7be2ff567d1904dc4
@@ -0,0 +1,42 @@
+LICENSE = "GPL"
+DEPENDS = "libxml2 gconf gnutls avahi dbus bzip2 gnome-mime-data zlib"
+RRECOMMENDS = "gnome-vfs-plugin-file shared-mime-info"
+# Some legacy packages will require gnome-mime-data to be installed, but use of
+# it is deprecated.
+PR = "r0"
+
+inherit gnome
+
+SRC_URI += "file://gconftool-lossage.patch;patch=1;pnum=1 \
+ file://gnome-vfs-no-kerberos.patch;patch=1;pnum=0"
+
+# This is to provide compatibility with the gnome-vfs DBus fork
+PROVIDES = "gnome-vfs-plugin-dbus"
+RREPLACES = "gnome-vfs-dbus"
+
+EXTRA_OECONF = " \
+ --disable-openssl \
+ --enable-gnutls \
+ --enable-avahi \
+ --with-samba-includes=${STAGING_INCDIR} \
+ "
+
+FILES_${PN} += " ${libdir}/vfs ${datadir}/dbus-1/services"
+FILES_${PN}-dbg += " ${libdir}/gnome-vfs-2.0/modules/.debug"
+FILES_${PN}-dev += " ${libdir}/gnome-vfs-2.0/include"
+FILES_${PN}-doc += " ${datadir}/gtk-doc"
+
+do_stage () {
+autotools_stage_all
+}
+
+PACKAGES_DYNAMIC = "gnome-vfs-plugin-*"
+
+python populate_packages_prepend () {
+ print bb.data.getVar('FILES_gnome-vfs', d, 1)
+
+ plugindir = bb.data.expand('${libdir}/gnome-vfs-2.0/modules/', d)
+ do_split_packages(d, plugindir, '^lib(.*)\.so$', 'gnome-vfs-plugin-%s', 'GNOME VFS plugin for %s')
+}
+
+
============================================================
--- packages/gnome/libart-lgpl_2.3.19.bb 895fd8ffcb463bbaca6c34070af468b8ae846a94
+++ packages/gnome/libart-lgpl_2.3.19.bb 895fd8ffcb463bbaca6c34070af468b8ae846a94
@@ -0,0 +1,30 @@
+DESCRIPTION = "Library of functions for 2D graphics"
+SECTION = "x11/gnome"
+LICENSE = "LGPL"
+
+ART_CONFIG = "${HOST_ARCH}/art_config.h"
+
+# can't use gnome.oeclass due to _ in filename
+SRC_URI = "http://ftp.gnome.org/pub/GNOME/sources/libart_lgpl/2.3/libart_lgpl-${PV}.tar.bz2 \
+ file://${ART_CONFIG} \
+ file://Makefile.am.patch;patch=1"
+
+inherit autotools pkgconfig
+
+DEPENDS = ""
+
+FILES_${PN} = "${libdir}/*.so.*"
+FILES_${PN}-dev += "${bindir}/libart2-config"
+
+S = "${WORKDIR}/libart_lgpl-${PV}"
+
+do_configure_prepend() {
+ cp ${WORKDIR}/${ART_CONFIG} ${S}/art_config.h
+}
+
+EXTRA_OECONF = "--disable-gtk-doc"
+
+do_stage() {
+ autotools_stage_includes
+ oe_libinstall -a -so libart_lgpl_2 ${STAGING_LIBDIR}
+}
============================================================
--- packages/gnome/libgnomecanvas_2.14.0.bb e4f7f2ca59f2bcf0c49189e4b5ef836958a53654
+++ packages/gnome/libgnomecanvas_2.14.0.bb e4f7f2ca59f2bcf0c49189e4b5ef836958a53654
@@ -0,0 +1,17 @@
+LICENSE = "GPL"
+SECTION = "x11/gnome/libs"
+DESCRIPTION = "A powerful object-oriented display"
+
+inherit gnome
+
+DEPENDS = "libglade libart-lgpl"
+
+EXTRA_OECONF = "--disable-gtk-doc"
+
+FILES_${PN} += "${libdir}/libglade/*/libcanvas.so"
+FILES_${PN}-dbg += "${libdir}/libglade/*/.debug/"
+FILES_${PN}-dev += "${libdir}/libglade/*/libcanvas.*a"
+
+do_stage() {
+ autotools_stage_all
+}
============================================================
--- packages/gnome/libgnomecanvas_2.20.0.bb fe8196413861eef466b7299bb3339d3ecdc9a82c
+++ packages/gnome/libgnomecanvas_2.20.0.bb fe8196413861eef466b7299bb3339d3ecdc9a82c
@@ -0,0 +1,17 @@
+LICENSE = "GPL"
+SECTION = "x11/gnome/libs"
+DESCRIPTION = "A powerful object-oriented display"
+
+inherit gnome
+
+DEPENDS = "libglade libart-lgpl gail"
+
+EXTRA_OECONF = "--disable-gtk-doc"
+
+FILES_${PN} += "${libdir}/libglade/*/libcanvas.so"
+FILES_${PN}-dbg += "${libdir}/libglade/*/.debug/"
+FILES_${PN}-dev += "${libdir}/libglade/*/libcanvas.*a"
+
+do_stage() {
+ autotools_stage_all
+}
============================================================
--- packages/gnome/gnome-vfs_2.18.1.bb 71ed32902ca195b29624c31b59b3a5f6d80a83d0
+++ packages/gnome/gnome-vfs_2.18.1.bb 212f57d5bf3b93630b4ba3ddb96591390829c7c7
@@ -1,8 +1,8 @@ RRECOMMENDS = "gnome-vfs-plugin-file gno
LICENSE = "GPL"
DEPENDS = "libxml2 gconf gnutls avahi dbus bzip2 gnome-mime-data zlib"
RRECOMMENDS = "gnome-vfs-plugin-file gnome-mime-data shared-mime-info"
-PR = "r0"
+PR = "r1"
inherit gnome
@@ -20,7 +20,7 @@ EXTRA_OECONF = " \
--with-samba-includes=${STAGING_INCDIR} \
"
-FILES_${PN} += " ${libdir}/vfs"
+FILES_${PN} += " ${libdir}/vfs ${datadir}/dbus-1/services"
FILES_${PN}-dev += " ${libdir}/gnome-vfs-2.0/include"
FILES_${PN}-doc += " ${datadir}/gtk-doc"
============================================================
--- packages/gnome/libart-lgpl/Makefile.am.patch 2cf1541c430f3f842d369d11ac2ad3355f441a76
+++ packages/gnome/libart-lgpl/Makefile.am.patch 2054c91d45d1a5f77c7ebd03c5cc6f6d5898ed5f
@@ -1,13 +1,7 @@
--- libart_lgpl-2.3.16/Makefile.am.old 2004-06-26 18:57:07.000000000 +0100
+++ libart_lgpl-2.3.16/Makefile.am 2004-06-26 18:57:12.000000000 +0100
-@@ -5,8 +5,8 @@
-
- BUILT_SOURCES = art_config.h
-
--art_config.h: gen_art_config
+@@ -5,2 +5,2 @@
+-art_config.h: gen_art_config$(EXEEXT)
- ./gen_art_config > art_config.h
-+#art_config.h: gen_art_config
++#art_config.h: gen_art_config$(EXEEXT)
+# ./gen_art_config > art_config.h
-
- EXTRA_DIST = \
- libart-config.in \
============================================================
--- packages/gnome/libsoup_2.2.100.bb cbf6cd8728f99799c3c69d03a0083411b5f652f9
+++ packages/gnome/libsoup_2.2.100.bb 22afb236c2cc359570b54864b80ade06bd669f76
@@ -1,18 +1,19 @@ SECTION = "x11/gnome/libs"
DESCRIPTION = "An HTTP library implementation in C"
LICENSE = "GPL"
SECTION = "x11/gnome/libs"
+
DEPENDS = "glib-2.0 gnutls libxml2"
SRC_URI = "http://ftp.gnome.org/pub/GNOME/sources/${PN}/2.2/${PN}-${PV}.tar.bz2"
inherit autotools pkgconfig
+FILES_${PN} = "${libdir}/lib*.so.*"
+FILES_${PN}-dev = "${includedir}/ ${libdir}/"
+FILES_${PN}-doc = "${datadir}/"
+
do_stage() {
rm -f ${PKG_CONFIG_DIR}/libsoup*
autotools_stage_all
ln -sf ${PKG_CONFIG_DIR}/libsoup.pc ${PKG_CONFIG_DIR}/libsoup-2.2.pc
}
-
-FILES_${PN} = "${libdir}/lib*.so.*"
-FILES_${PN}-dev = "${includedir}/ ${libdir}/"
-FILES_${PN}-doc = "${datadir}/"
More information about the Openembedded-commits
mailing list