From 494d7dee7a6aafc87f218a6b2643a684c1fa097c Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Sat, 3 May 2008 19:09:02 +0000 Subject: libxsettings-client: unbreak every version that isn't 0.16 * please test any refactoring you do, bitbake -c patch -b foo.bb exists for a reason --- packages/libxsettings-client/files/.mtn2git_empty | 0 .../files/make_pkgconfig_x11.patch | 21 +++++++++++++++++++++ .../files/no-host-includes.patch | 13 +++++++++++++ .../libxsettings-client/libxsettings-client.inc | 2 +- .../libxsettings-client/libxsettings-client_0.16.bb | 3 +++ .../libxsettings-client/make_pkgconfig_x11.patch | 21 --------------------- packages/libxsettings-client/no-host-includes.patch | 13 ------------- 7 files changed, 38 insertions(+), 35 deletions(-) create mode 100644 packages/libxsettings-client/files/.mtn2git_empty create mode 100644 packages/libxsettings-client/files/make_pkgconfig_x11.patch create mode 100644 packages/libxsettings-client/files/no-host-includes.patch delete mode 100644 packages/libxsettings-client/make_pkgconfig_x11.patch delete mode 100644 packages/libxsettings-client/no-host-includes.patch diff --git a/packages/libxsettings-client/files/.mtn2git_empty b/packages/libxsettings-client/files/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 diff --git a/packages/libxsettings-client/files/make_pkgconfig_x11.patch b/packages/libxsettings-client/files/make_pkgconfig_x11.patch new file mode 100644 index 0000000000..3a386672d2 --- /dev/null +++ b/packages/libxsettings-client/files/make_pkgconfig_x11.patch @@ -0,0 +1,21 @@ +--- 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 diff --git a/packages/libxsettings-client/files/no-host-includes.patch b/packages/libxsettings-client/files/no-host-includes.patch new file mode 100644 index 0000000000..137c5269f1 --- /dev/null +++ b/packages/libxsettings-client/files/no-host-includes.patch @@ -0,0 +1,13 @@ +Index: libxsettings-client-0.17/Makefile.am +=================================================================== +--- libxsettings-client-0.17.orig/Makefile.am 2006-05-19 23:14:46.557360552 +0200 ++++ libxsettings-client-0.17/Makefile.am 2006-05-19 23:14:56.010923392 +0200 +@@ -3,7 +3,7 @@ + source_h = xsettings-client.h xsettings-common.h + source_c = xsettings-client.c xsettings-common.c + +-INCLUDES = -I $(includedir) $(X_CFLAGS) ++INCLUDES = $(X_CFLAGS) + + libxsincludedir = $(includedir) + diff --git a/packages/libxsettings-client/libxsettings-client.inc b/packages/libxsettings-client/libxsettings-client.inc index 319a4f192d..bfcf1245f6 100644 --- a/packages/libxsettings-client/libxsettings-client.inc +++ b/packages/libxsettings-client/libxsettings-client.inc @@ -9,7 +9,7 @@ GPE_TARBALL_SUFFIX = "bz2" inherit autotools pkgconfig gpe SRC_URI = "${GPE_MIRROR}/libxsettings-client-${PV}.tar.bz2 \ - file://Makefile-am.patch;patch=1" +" headers = "xsettings-client.h xsettings-common.h" do_stage () { diff --git a/packages/libxsettings-client/libxsettings-client_0.16.bb b/packages/libxsettings-client/libxsettings-client_0.16.bb index 725172b944..dff73c3422 100644 --- a/packages/libxsettings-client/libxsettings-client_0.16.bb +++ b/packages/libxsettings-client/libxsettings-client_0.16.bb @@ -1,3 +1,6 @@ require libxsettings-client.inc +SRC_URI += " file://Makefile-am.patch;patch=1" + + PR="r2" diff --git a/packages/libxsettings-client/make_pkgconfig_x11.patch b/packages/libxsettings-client/make_pkgconfig_x11.patch deleted file mode 100644 index 3a386672d2..0000000000 --- a/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 diff --git a/packages/libxsettings-client/no-host-includes.patch b/packages/libxsettings-client/no-host-includes.patch deleted file mode 100644 index 137c5269f1..0000000000 --- a/packages/libxsettings-client/no-host-includes.patch +++ /dev/null @@ -1,13 +0,0 @@ -Index: libxsettings-client-0.17/Makefile.am -=================================================================== ---- libxsettings-client-0.17.orig/Makefile.am 2006-05-19 23:14:46.557360552 +0200 -+++ libxsettings-client-0.17/Makefile.am 2006-05-19 23:14:56.010923392 +0200 -@@ -3,7 +3,7 @@ - source_h = xsettings-client.h xsettings-common.h - source_c = xsettings-client.c xsettings-common.c - --INCLUDES = -I $(includedir) $(X_CFLAGS) -+INCLUDES = $(X_CFLAGS) - - libxsincludedir = $(includedir) - -- cgit v1.2.3