summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--meta/packages/eds/eds-dbus/parallelmake.patch202
-rw-r--r--meta/packages/eds/eds-dbus_git.bb2
2 files changed, 192 insertions, 12 deletions
diff --git a/meta/packages/eds/eds-dbus/parallelmake.patch b/meta/packages/eds/eds-dbus/parallelmake.patch
index 4cf6b1a356..08cfac0d83 100644
--- a/meta/packages/eds/eds-dbus/parallelmake.patch
+++ b/meta/packages/eds/eds-dbus/parallelmake.patch
@@ -1,21 +1,201 @@
+Update git.mk to the version from Pango which has parallel make fixes.
+http://git.gnome.org/browse/pango/log/git.mk
+commit 6118d5891fee776a087855c335a73c79fdaf036c
+
+RP 16/3/10
+
Index: git/git.mk
===================================================================
--- git.orig/git.mk 2010-02-05 14:57:15.000000000 +0000
-+++ git/git.mk 2010-03-03 09:31:43.000000000 +0000
-@@ -166,11 +166,11 @@
++++ git/git.mk 2010-03-16 11:30:23.000000000 +0000
+@@ -82,97 +82,106 @@
+ ### .gitignore generation
- all: $(srcdir)/.gitignore gitignore-recurse
- gitignore-recurse:
-- @if test "x$(SUBDIRS)" = "x$(DIST_SUBDIRS)"; then :; else \
+ $(srcdir)/.gitignore: Makefile.am $(top_srcdir)/git.mk
+- @echo Generating $@; \
+- GTKDOCGITIGNOREFILES=; \
+- test "x$(DOC_MODULE)" = x -o "x$(DOC_MAIN_SGML_FILE)" = x || \
+- GTKDOCGITIGNOREFILES=" \
+- $(DOC_MODULE)-decl-list.txt \
+- $(DOC_MODULE)-decl.txt \
+- tmpl/$(DOC_MODULE)-unused.sgml \
+- tmpl/*.bak \
+- xml html \
+- "; \
+- GNOMEDOCUTILSGITIGNOREFILES=; \
+- test "x$(DOC_MODULE)" = x -o "x$(DOC_LINGUAS)" = x || \
+- GNOMEDOCUTILSGITIGNOREFILES=" \
+- $(_DOC_C_DOCS) \
+- $(_DOC_LC_DOCS) \
+- $(_DOC_OMF_ALL) \
+- $(_DOC_DSK_ALL) \
+- $(_DOC_HTML_ALL) \
+- $(_DOC_POFILES) \
+- */.xml2po.mo \
+- */*.omf.out \
+- "; \
+- INTLTOOLGITIGNOREFILES=; test -f $(srcdir)/po/Makefile.in.in && \
+- INTLTOOLGITIGNOREFILES=" \
+- po/Makefile.in.in \
+- po/Makefile.in \
+- po/Makefile \
+- po/*.gmo \
+- po/*.mo \
+- po/POTFILES \
+- po/stamp-it \
+- po/.intltool-merge-cache \
+- intltool-extract.in \
+- intltool-merge.in \
+- intltool-update.in \
+- "; \
+- AUTOCONFGITIGNOREFILES=; test -f $(srcdir)/configure && \
+- AUTOCONFGITIGNOREFILES=" \
+- autom4te.cache \
+- configure \
+- config.h \
+- stamp-h1 \
+- libtool \
+- config.lt \
+- "; \
+- for x in \
+- .gitignore \
+- $$GTKDOCGITIGNOREFILES \
+- $$GNOMEDOCUTILSGITIGNOREFILES \
+- $$INTLTOOLGITIGNOREFILES \
+- $$AUTOCONFGITIGNOREFILES \
+- $(GITIGNOREFILES) \
+- $(CLEANFILES) \
+- $(PROGRAMS) \
+- $(EXTRA_PROGRAMS) \
+- $(LTLIBRARIES) \
+- so_locations \
+- .libs _libs \
+- $(MOSTLYCLEANFILES) \
+- "*.$(OBJEXT)" \
+- "*.lo" \
+- $(DISTCLEANFILES) \
+- $(am__CONFIG_DISTCLEAN_FILES) \
+- $(CONFIG_CLEAN_FILES) \
+- TAGS ID GTAGS GRTAGS GSYMS GPATH tags \
+- "*.tab.c" \
+- $(MAINTAINERCLEANFILES) \
+- $(BUILT_SOURCES) \
+- $(DEPDIR) \
+- Makefile \
+- Makefile.in \
+- "*.orig" \
+- "*.rej" \
+- "*.bak" \
+- "*~" \
+- ".*.sw[nop]" \
+- ; do echo /$$x; done | \
++ $(AM_V_GEN) \
++ { \
++ if test "x$(DOC_MODULE)" = x -o "x$(DOC_MAIN_SGML_FILE)" = x; then :; else \
++ for x in \
++ $(DOC_MODULE)-decl-list.txt \
++ $(DOC_MODULE)-decl.txt \
++ tmpl/$(DOC_MODULE)-unused.sgml \
++ "tmpl/*.bak" \
++ xml html \
++ ; do echo /$$x; done; \
++ fi; \
++ if test "x$(DOC_MODULE)" = x -o "x$(DOC_LINGUAS)" = x; then :; else \
++ for x in \
++ $(_DOC_C_DOCS) \
++ $(_DOC_LC_DOCS) \
++ $(_DOC_OMF_ALL) \
++ $(_DOC_DSK_ALL) \
++ $(_DOC_HTML_ALL) \
++ $(_DOC_POFILES) \
++ "*/.xml2po.mo" \
++ "*/*.omf.out" \
++ ; do echo /$$x; done; \
++ fi; \
++ if test -f $(srcdir)/po/Makefile.in.in; then \
++ for x in \
++ po/Makefile.in.in \
++ po/Makefile.in \
++ po/Makefile \
++ po/POTFILES \
++ po/stamp-it \
++ po/.intltool-merge-cache \
++ "po/*.gmo" \
++ "po/*.mo" \
++ po/$(GETTEXT_PACKAGE).pot \
++ intltool-extract.in \
++ intltool-merge.in \
++ intltool-update.in \
++ ; do echo /$$x; done; \
++ fi; \
++ if test -f $(srcdir)/configure; then \
++ for x in \
++ autom4te.cache \
++ configure \
++ config.h \
++ stamp-h1 \
++ libtool \
++ config.lt \
++ ; do echo /$$x; done; \
++ fi; \
++ for x in \
++ .gitignore \
++ $(GITIGNOREFILES) \
++ $(CLEANFILES) \
++ $(PROGRAMS) \
++ $(check_PROGRAMS) \
++ $(EXTRA_PROGRAMS) \
++ $(LTLIBRARIES) \
++ so_locations \
++ .libs _libs \
++ $(MOSTLYCLEANFILES) \
++ "*.$(OBJEXT)" \
++ "*.lo" \
++ $(DISTCLEANFILES) \
++ $(am__CONFIG_DISTCLEAN_FILES) \
++ $(CONFIG_CLEAN_FILES) \
++ TAGS ID GTAGS GRTAGS GSYMS GPATH tags \
++ "*.tab.c" \
++ $(MAINTAINERCLEANFILES) \
++ $(BUILT_SOURCES) \
++ $(DEPDIR) \
++ Makefile \
++ Makefile.in \
++ "*.orig" \
++ "*.rej" \
++ "*.bak" \
++ "*~" \
++ ".*.sw[nop]" \
++ ; do echo /$$x; done; \
++ } | \
+ sed "s@^/`echo "$(srcdir)" | sed 's/\(.\)/[\1]/g'`/@/@" | \
+ sed 's@/[.]/@/@g' | \
+- LANG=C sort | uniq > $@.tmp && \
++ LC_ALL=C sort | uniq > $@.tmp && \
+ mv $@.tmp $@;
+
+-all: $(srcdir)/.gitignore gitignore-recurse
+-gitignore-recurse:
++all: $(srcdir)/.gitignore gitignore-recurse-maybe
++gitignore-recurse-maybe:
+ @if test "x$(SUBDIRS)" = "x$(DIST_SUBDIRS)"; then :; else \
- list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
- test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) .gitignore); \
- done; \
-- fi;
-+ #@if test "x$(SUBDIRS)" = "x$(DIST_SUBDIRS)"; then :; else \
-+ # list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
-+ # test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) .gitignore); \
-+ # done; \
-+ #fi;
++ $(MAKE) $(AM_MAKEFLAGS) gitignore-recurse; \
+ fi;
++gitignore-recurse:
++ @for subdir in $(DIST_SUBDIRS); do \
++ case " $(SUBDIRS) " in \
++ *" $$subdir "*) :;; \
++ *) test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) .gitignore gitignore-recurse || echo "Skipping $$subdir");; \
++ esac; \
++ done
++gitignore: $(srcdir)/.gitignore gitignore-recurse
++
maintainer-clean: gitignore-clean
gitignore-clean:
-rm -f $(srcdir)/.gitignore
+-.PHONY: gitignore-clean gitignore-recurse
+
++.PHONY: gitignore-clean gitignore gitignore-recurse gitignore-recurse-maybe
diff --git a/meta/packages/eds/eds-dbus_git.bb b/meta/packages/eds/eds-dbus_git.bb
index 033fa889ce..ac6af7c1fc 100644
--- a/meta/packages/eds/eds-dbus_git.bb
+++ b/meta/packages/eds/eds-dbus_git.bb
@@ -3,7 +3,7 @@ LICENSE = "LGPL"
DEPENDS = "intltool-native glib-2.0 gtk+ gconf dbus db gnome-common virtual/libiconv zlib libsoup-2.4 libglade libical gnome-keyring"
PV = "2.29+git${SRCPV}"
-PR = "r4"
+PR = "r5"
SRC_URI = "git://git.gnome.org/evolution-data-server;protocol=git \
file://oh-contact.patch;patch=1;pnum=0 \
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-22 18:16:33 +0000