diff options
author | Zhai Edwin <edwin.zhai@intel.com> | 2010-07-08 10:11:14 +0800 |
---|---|---|
committer | Richard Purdie <rpurdie@linux.intel.com> | 2010-07-13 15:21:44 +0100 |
commit | 0e7e3ae68a40cddf708a46236db85c120865ca64 (patch) | |
tree | 7c3c10827486bcb5e95c29bfabcb0fdbb791477b /meta/packages/gtk+/gtk+-2.18.5/configurefix.patch | |
parent | b64111f53ba83c6b591bf39ffe9ccc1fa96625a4 (diff) | |
download | openembedded-core-0e7e3ae68a40cddf708a46236db85c120865ca64.tar.gz openembedded-core-0e7e3ae68a40cddf708a46236db85c120865ca64.tar.bz2 openembedded-core-0e7e3ae68a40cddf708a46236db85c120865ca64.tar.xz openembedded-core-0e7e3ae68a40cddf708a46236db85c120865ca64.zip |
gtk+: Update to 2.20.1
gtk+ previously has 2 versions: 2.14.2(preferred), and 2.18.5(latest). This
upgrade is from 2.18.5 to 2.20.1, so some patch(like entry-cairo.patch) in
2.14.2 is abandoned.
Signed-off-by: Zhai Edwin <edwin.zhai@intel.com>
Diffstat (limited to 'meta/packages/gtk+/gtk+-2.18.5/configurefix.patch')
-rw-r--r-- | meta/packages/gtk+/gtk+-2.18.5/configurefix.patch | 98 |
1 files changed, 0 insertions, 98 deletions
diff --git a/meta/packages/gtk+/gtk+-2.18.5/configurefix.patch b/meta/packages/gtk+/gtk+-2.18.5/configurefix.patch deleted file mode 100644 index ba85f17c0..000000000 --- a/meta/packages/gtk+/gtk+-2.18.5/configurefix.patch +++ /dev/null @@ -1,98 +0,0 @@ -Index: gtk+-2.18.5/docs/faq/Makefile.am -=================================================================== ---- gtk+-2.18.5.orig/docs/faq/Makefile.am 2009-12-10 17:38:18.000000000 +0000 -+++ gtk+-2.18.5/docs/faq/Makefile.am 2009-12-10 17:39:27.000000000 +0000 -@@ -3,34 +3,36 @@ - EXTRA_DIST += \ - gtk-faq.sgml - --if HAVE_DOCBOOK -+ - html: -+if HAVE_DOCBOOK - if test -w $(srcdir); then \ - (cd $(srcdir); \ - db2html gtk-faq.sgml; \ - test -d html && rm -r html; \ - mv gtk-faq html); \ - fi -- --pdf: -- if test -w $(srcdir); then \ -- (cd $(srcdir); db2pdf gtk-faq.sgml); \ -- fi -- --dist-hook: html -- cp -Rp $(srcdir)/html $(distdir) - else --html: - echo "***" - echo "*** Warning: FAQ not built" - echo "***" -+endif - - pdf: -+if HAVE_DOCBOOK -+ if test -w $(srcdir); then \ -+ (cd $(srcdir); db2pdf gtk-faq.sgml); \ -+ fi -+else - echo "***" - echo "*** Warning: FAQ not built" - echo "***" -+endif - --dist-hook: -+dist-hook: html -+if HAVE_DOCBOOK -+ cp -Rp $(srcdir)/html $(distdir) -+else - echo "***" - echo "*** Warning: FAQ not built" - echo "*** DISTRIBUTION IS INCOMPLETE" -Index: gtk+-2.18.5/gtk-doc.make -=================================================================== ---- gtk+-2.18.5.orig/gtk-doc.make 2009-12-10 17:47:54.000000000 +0000 -+++ gtk+-2.18.5/gtk-doc.make 2009-12-10 17:48:01.000000000 +0000 -@@ -23,7 +23,7 @@ - - TARGET_DIR=$(HTML_DIR)/$(DOC_MODULE) - --EXTRA_DIST = \ -+EXTRA_DIST += \ - $(content_files) \ - $(HTML_IMAGES) \ - $(DOC_MAIN_SGML_FILE) \ -Index: gtk+-2.18.5/gtk/tests/Makefile.am -=================================================================== ---- gtk+-2.18.5.orig/gtk/tests/Makefile.am 2009-12-10 17:43:16.000000000 +0000 -+++ gtk+-2.18.5/gtk/tests/Makefile.am 2009-12-10 18:11:40.000000000 +0000 -@@ -57,13 +57,13 @@ - # this doesn't work in make distcheck, since running - # on a naked X server creates slightly different event - # sequences than running on a normal desktop --# TEST_PROGS += crossingevents -+#TEST_PROGS += crossingevents - crossingevents_SOURCES = crossingevents.c - crossingevents_LDADD = $(progs_ldadd) - - # this doesn't work in make distcheck, since it doesn't - # find file-chooser-test-dir --# TEST_PROGS += filechooser -+#TEST_PROGS += filechooser - filechooser_SOURCES = filechooser.c pixbuf-init.c - filechooser_LDADD = $(progs_ldadd) - -Index: gtk+-2.18.5/tests/Makefile.am -=================================================================== ---- gtk+-2.18.5.orig/tests/Makefile.am 2009-12-10 17:41:49.000000000 +0000 -+++ gtk+-2.18.5/tests/Makefile.am 2009-12-10 17:45:33.000000000 +0000 -@@ -339,7 +339,7 @@ - gtkoffscreenbox.h \ - testoffscreen.c - --testwindow_SOURCES = \ -+testwindows_SOURCES = \ - testwindows.c - - EXTRA_DIST += \ |