diff options
| author | OpenEmbedded Project <openembedded-devel@lists.openembedded.org> | 2008-05-05 19:11:03 +0000 |
|---|---|---|
| committer | OpenEmbedded Project <openembedded-devel@lists.openembedded.org> | 2008-05-05 19:11:03 +0000 |
| commit | 66af3461a3fdf3eb7ceb76bb2a04e66be8283b8c (patch) | |
| tree | 78f52aa29ac0f42c4aea59a4da6e8dab0c701ca4 /packages/libxsettings-client/files | |
| parent | 9a1d156623f21d1f66c4314230056c8499d556f5 (diff) | |
| parent | 50468ef124004fb33fa463842b2042de16082159 (diff) | |
merge of '2de318fc2a95854259cdc31038f89dae83fb0121'
and 'f94c84daf04e33f569fffdd3b60be112b594c750'
Diffstat (limited to 'packages/libxsettings-client/files')
3 files changed, 34 insertions, 0 deletions
diff --git a/packages/libxsettings-client/files/.mtn2git_empty b/packages/libxsettings-client/files/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/libxsettings-client/files/.mtn2git_empty 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) + |