diff options
| author | Richard Purdie <richard@openedhand.com> | 2006-09-21 15:01:21 +0000 |
|---|---|---|
| committer | Richard Purdie <richard@openedhand.com> | 2006-09-21 15:01:21 +0000 |
| commit | ecd5296738e37bd5701eaba230fefcf7994f4110 (patch) | |
| tree | 105038d0b74d939b082cabb2758917304aaf965c /meta/packages/libxsettings-client | |
| parent | a48da11acaeec6aa3a21a0a0f30098b26e248ecc (diff) | |
| download | openembedded-core-ecd5296738e37bd5701eaba230fefcf7994f4110.tar.gz openembedded-core-ecd5296738e37bd5701eaba230fefcf7994f4110.tar.bz2 openembedded-core-ecd5296738e37bd5701eaba230fefcf7994f4110.tar.xz openembedded-core-ecd5296738e37bd5701eaba230fefcf7994f4110.zip | |
libxsettings-client: Use version 0.10. Remove libxsettings
git-svn-id: https://svn.o-hand.com/repos/poky/trunk@740 311d38ba-8fff-0310-9ca6-ca027cbcb966
Diffstat (limited to 'meta/packages/libxsettings-client')
3 files changed, 23 insertions, 42 deletions
diff --git a/meta/packages/libxsettings-client/libxsettings-client_0.10.bb b/meta/packages/libxsettings-client/libxsettings-client_0.10.bb new file mode 100644 index 000000000..45b203507 --- /dev/null +++ b/meta/packages/libxsettings-client/libxsettings-client_0.10.bb @@ -0,0 +1,23 @@ +DESCRIPTION = "Common code for XSETTINGS" +SECTION = "x/libs" +LICENSE = "BSD-X" +PRIORITY = "optional" +DEPENDS = "libx11 libxt" +# libxt is required to stop configure breaking builds by +# including system paths to find it if it isn't present. + +headers = "xsettings-common.h xsettings-client.h" + +SRC_URI = "http://projects.o-hand.com/matchbox/sources/optional-dependencies/Xsettings-client-0.10.tar.gz" +S = "${WORKDIR}/Xsettings-client-0.10" + +inherit autotools gettext + +do_stage () { + oe_libinstall -so libXsettings-client ${STAGING_LIBDIR} + + mkdir -p ${STAGING_INCDIR}/gpe + for h in ${headers}; do + install -m 0644 ${S}/$h ${STAGING_INCDIR}/$h + done +} diff --git a/meta/packages/libxsettings-client/libxsettings-client_0.14.bb b/meta/packages/libxsettings-client/libxsettings-client_0.14.bb deleted file mode 100644 index f2e77735f..000000000 --- a/meta/packages/libxsettings-client/libxsettings-client_0.14.bb +++ /dev/null @@ -1,21 +0,0 @@ -SECTION = "gpe/libs" -LICENSE = "BSD-X" -PRIORITY = "optional" -DEPENDS = "libxsettings libx11 libxt" -# libxt is required to stop configure breaking builds by -# including system paths to find it if it isn't present. - -inherit autotools pkgconfig gpe - -SRC_URI = "${GPE_MIRROR}/xsettings-client-${PV}.tar.bz2" -S = ${WORKDIR}/xsettings-client-${PV} - - -headers = "xsettings-client.h xsettings-common.h" -do_stage () { - oe_libinstall -so libXsettings-client ${STAGING_LIBDIR} - mkdir -p ${STAGING_INCDIR} - for h in ${headers}; do - install -m 0644 ${S}/$h ${STAGING_INCDIR}/$h - done -} diff --git a/meta/packages/libxsettings-client/make_pkgconfig_x11.patch b/meta/packages/libxsettings-client/make_pkgconfig_x11.patch deleted file mode 100644 index 3a386672d..000000000 --- a/meta/packages/libxsettings-client/make_pkgconfig_x11.patch +++ /dev/null @@ -1,21 +0,0 @@ ---- libxsettings-client0-0.12/Makefile.old 2004-04-20 16:48:18.000000000 +1000 -+++ libxsettings-client0-0.12/Makefile 2004-04-20 16:58:07.000000000 +1000 -@@ -20,6 +20,9 @@ - CPPFLAGS += -DPACKAGE=\"$(PACKAGE)\" -DPREFIX=\"$(PREFIX)\" -DPACKAGE_LOCALE_DIR=\"$(PREFIX)/share/locale\" - CPPFLAGS += -I../libxsettings - -+CFLAGS += `pkg-config --cflags x11` -+LDFLAGS += `pkg-config --ldflags x11` -+ - XSETTINGS_OBJS = $(patsubst %,%.os,$(XSETTINGS_MEMBERS)) - DEPS = $(patsubst %,%.d,$(MEMBERS) $(XSETTINGS_MEMBERS)) - SOURCES = $(patsubst %,%.c,$(MEMBERS) $(XSETTINGS_MEMBERS)) -@@ -39,7 +42,7 @@ - ln -sf $^ $@ - - $(LIBXSETTINGS_SO): $(XSETTINGS_OBJS) -- $(CC) -o $@ $^ -shared -Wl,-soname -Wl,$(LIBXSETTINGS_SO) -nostartfiles -L/usr/X11R6/lib -lX11 -L../libxsettings -lXsettings -+ $(CC) -o $@ $^ -shared -Wl,-soname -Wl,$(LIBXSETTINGS_SO) -nostartfiles $(LDFLAGS) -L../libxsettings -lXsettings - - install-program: $(LIBXSETTINGS_SO) - install -d $(DESTDIR)$(PREFIX)/lib |