diff options
author | Richard Purdie <rpurdie@linux.intel.com> | 2010-09-30 22:15:13 +0100 |
---|---|---|
committer | Richard Purdie <rpurdie@linux.intel.com> | 2010-09-30 22:16:10 +0100 |
commit | c0c657bd92911788b96d9670620eabf024453752 (patch) | |
tree | 774a5e2d966d6ee87da17cd063580d5970564d00 /meta-extras/packages/gnome | |
parent | e71a306f9cac8e30e689d607e2092e11a756ef5d (diff) | |
download | poky-c0c657bd92911788b96d9670620eabf024453752.tar.gz |
Split meta-extras and meta-moblin out of the main repository
Signed-off-by: Richard Purdie <rpurdie@linux.intel.com>
Diffstat (limited to 'meta-extras/packages/gnome')
-rw-r--r-- | meta-extras/packages/gnome/libbonobo.inc | 36 | ||||
-rw-r--r-- | meta-extras/packages/gnome/libbonobo/configure-gthread.patch | 11 | ||||
-rw-r--r-- | meta-extras/packages/gnome/libbonobo/gtk-doc.m4 | 53 | ||||
-rw-r--r-- | meta-extras/packages/gnome/libbonobo/gtk-doc.make | 148 | ||||
-rw-r--r-- | meta-extras/packages/gnome/libbonobo_2.22.0.bb | 6 | ||||
-rw-r--r-- | meta-extras/packages/gnome/libbonoboui_2.18.0.bb | 15 | ||||
-rw-r--r-- | meta-extras/packages/gnome/orbit2-native_2.14.12.bb | 22 | ||||
-rw-r--r-- | meta-extras/packages/gnome/orbit2/configure-lossage.patch | 35 | ||||
-rw-r--r-- | meta-extras/packages/gnome/orbit2/gtk-doc.m4 | 53 | ||||
-rw-r--r-- | meta-extras/packages/gnome/orbit2/gtk-doc.make | 148 | ||||
-rw-r--r-- | meta-extras/packages/gnome/orbit2/pkgconfig-fix.patch | 12 | ||||
-rw-r--r-- | meta-extras/packages/gnome/orbit2_2.14.16.bb | 30 |
12 files changed, 0 insertions, 569 deletions
diff --git a/meta-extras/packages/gnome/libbonobo.inc b/meta-extras/packages/gnome/libbonobo.inc deleted file mode 100644 index db5c58a51e..0000000000 --- a/meta-extras/packages/gnome/libbonobo.inc +++ /dev/null | |||
@@ -1,36 +0,0 @@ | |||
1 | DESCRIPTION = "Bonobo CORBA interfaces library" | ||
2 | LICENSE = "GPL" | ||
3 | SECTION = "x11/gnome/libs" | ||
4 | DEPENDS = "glib-2.0 orbit2 intltool-native libxml2" | ||
5 | |||
6 | inherit gnome | ||
7 | |||
8 | SRC_URI += "file://gtk-doc.m4 \ | ||
9 | file://gtk-doc.make \ | ||
10 | " | ||
11 | |||
12 | ORBIT_IDL_SRC = "${STAGING_BINDIR_NATIVE}/orbit-idl-2" | ||
13 | |||
14 | FILES_${PN} += "${libdir}/orbit-2.0/*.so ${libdir}/bonobo/monikers/*.so" | ||
15 | FILES_${PN}-dbg += "${libdir}/bonobo/monikers/.debug \ | ||
16 | ${libdir}/bonobo-2.0/samples/.debug ${libdir}/orbit-2.0/.debug" | ||
17 | FILES_${PN}-dev += "${libdir}/orbit-2.0/* ${libdir}/bonobo/monikers/* \ | ||
18 | ${libdir}/bonobo-2.0/samples" | ||
19 | |||
20 | LEAD_SONAME = "libbonobo-2.so" | ||
21 | |||
22 | PARALLEL_MAKE = "" | ||
23 | |||
24 | do_configure_prepend() { | ||
25 | install -d m4 | ||
26 | install ${WORKDIR}/gtk-doc.m4 m4/ | ||
27 | install ${WORKDIR}/gtk-doc.make ./ | ||
28 | } | ||
29 | |||
30 | do_compile() { | ||
31 | oe_runmake ORBIT_IDL="${ORBIT_IDL_SRC}" | ||
32 | } | ||
33 | |||
34 | do_install() { | ||
35 | oe_runmake ORBIT_IDL="${ORBIT_IDL_SRC}" DESTDIR="${D}" install | ||
36 | } | ||
diff --git a/meta-extras/packages/gnome/libbonobo/configure-gthread.patch b/meta-extras/packages/gnome/libbonobo/configure-gthread.patch deleted file mode 100644 index 005fa6760a..0000000000 --- a/meta-extras/packages/gnome/libbonobo/configure-gthread.patch +++ /dev/null | |||
@@ -1,11 +0,0 @@ | |||
1 | --- libbonobo-2.14.0/configure.in.orig 2006-09-04 09:21:54.000000000 +0100 | ||
2 | +++ libbonobo-2.14.0/configure.in 2006-09-04 09:22:58.000000000 +0100 | ||
3 | @@ -166,7 +166,7 @@ | ||
4 | AC_MSG_RESULT(no) | ||
5 | AC_MSG_ERROR( | ||
6 | [No working gthread-2.0 support found, using --disable-threads IS DISCOURAGED]) | ||
7 | - ] | ||
8 | + ],[AC_MSG_RESULT(yes)] | ||
9 | ) | ||
10 | CFLAGS=$libbonobo_save_CFLAGS | ||
11 | LIBS=$libbonobo_save_LIBS | ||
diff --git a/meta-extras/packages/gnome/libbonobo/gtk-doc.m4 b/meta-extras/packages/gnome/libbonobo/gtk-doc.m4 deleted file mode 100644 index 3ec41666b2..0000000000 --- a/meta-extras/packages/gnome/libbonobo/gtk-doc.m4 +++ /dev/null | |||
@@ -1,53 +0,0 @@ | |||
1 | dnl -*- mode: autoconf -*- | ||
2 | |||
3 | # serial 1 | ||
4 | |||
5 | dnl Usage: | ||
6 | dnl GTK_DOC_CHECK([minimum-gtk-doc-version]) | ||
7 | AC_DEFUN([GTK_DOC_CHECK], | ||
8 | [ | ||
9 | AC_BEFORE([AC_PROG_LIBTOOL],[$0])dnl setup libtool first | ||
10 | AC_BEFORE([AM_PROG_LIBTOOL],[$0])dnl setup libtool first | ||
11 | dnl for overriding the documentation installation directory | ||
12 | AC_ARG_WITH(html-dir, | ||
13 | AC_HELP_STRING([--with-html-dir=PATH], [path to installed docs]),, | ||
14 | [with_html_dir='${datadir}/gtk-doc/html']) | ||
15 | HTML_DIR="$with_html_dir" | ||
16 | AC_SUBST(HTML_DIR) | ||
17 | |||
18 | dnl enable/disable documentation building | ||
19 | AC_ARG_ENABLE(gtk-doc, | ||
20 | AC_HELP_STRING([--enable-gtk-doc], | ||
21 | [use gtk-doc to build documentation [default=no]]),, | ||
22 | enable_gtk_doc=no) | ||
23 | |||
24 | have_gtk_doc=no | ||
25 | if test -z "$PKG_CONFIG"; then | ||
26 | AC_PATH_PROG(PKG_CONFIG, pkg-config, no) | ||
27 | fi | ||
28 | if test "$PKG_CONFIG" != "no" && $PKG_CONFIG --exists gtk-doc; then | ||
29 | have_gtk_doc=yes | ||
30 | fi | ||
31 | |||
32 | dnl do we want to do a version check? | ||
33 | ifelse([$1],[],, | ||
34 | [gtk_doc_min_version=$1 | ||
35 | if test "$have_gtk_doc" = yes; then | ||
36 | AC_MSG_CHECKING([gtk-doc version >= $gtk_doc_min_version]) | ||
37 | if $PKG_CONFIG --atleast-version $gtk_doc_min_version gtk-doc; then | ||
38 | AC_MSG_RESULT(yes) | ||
39 | else | ||
40 | AC_MSG_RESULT(no) | ||
41 | have_gtk_doc=no | ||
42 | fi | ||
43 | fi | ||
44 | ]) | ||
45 | if test x$enable_gtk_doc = xyes; then | ||
46 | if test "$have_gtk_doc" != yes; then | ||
47 | enable_gtk_doc=no | ||
48 | fi | ||
49 | fi | ||
50 | |||
51 | AM_CONDITIONAL(ENABLE_GTK_DOC, test x$enable_gtk_doc = xyes) | ||
52 | AM_CONDITIONAL(GTK_DOC_USE_LIBTOOL, test -n "$LIBTOOL") | ||
53 | ]) | ||
diff --git a/meta-extras/packages/gnome/libbonobo/gtk-doc.make b/meta-extras/packages/gnome/libbonobo/gtk-doc.make deleted file mode 100644 index c319e7ad7c..0000000000 --- a/meta-extras/packages/gnome/libbonobo/gtk-doc.make +++ /dev/null | |||
@@ -1,148 +0,0 @@ | |||
1 | # -*- mode: makefile -*- | ||
2 | |||
3 | #################################### | ||
4 | # Everything below here is generic # | ||
5 | #################################### | ||
6 | |||
7 | if GTK_DOC_USE_LIBTOOL | ||
8 | GTKDOC_CC = $(LIBTOOL) --mode=compile $(CC) $(INCLUDES) $(AM_CFLAGS) $(CFLAGS) | ||
9 | GTKDOC_LD = $(LIBTOOL) --mode=link $(CC) $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS) | ||
10 | else | ||
11 | GTKDOC_CC = $(CC) $(INCLUDES) $(AM_CFLAGS) $(CFLAGS) | ||
12 | GTKDOC_LD = $(CC) $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS) | ||
13 | endif | ||
14 | |||
15 | # We set GPATH here; this gives us semantics for GNU make | ||
16 | # which are more like other make's VPATH, when it comes to | ||
17 | # whether a source that is a target of one rule is then | ||
18 | # searched for in VPATH/GPATH. | ||
19 | # | ||
20 | GPATH = $(srcdir) | ||
21 | |||
22 | TARGET_DIR=$(HTML_DIR)/$(DOC_MODULE) | ||
23 | |||
24 | EXTRA_DIST = \ | ||
25 | $(content_files) \ | ||
26 | $(HTML_IMAGES) \ | ||
27 | $(DOC_MAIN_SGML_FILE) \ | ||
28 | $(DOC_MODULE).types \ | ||
29 | $(DOC_MODULE)-sections.txt \ | ||
30 | $(DOC_MODULE)-overrides.txt | ||
31 | |||
32 | DOC_STAMPS=scan-build.stamp tmpl-build.stamp sgml-build.stamp html-build.stamp \ | ||
33 | $(srcdir)/tmpl.stamp $(srcdir)/sgml.stamp $(srcdir)/html.stamp | ||
34 | |||
35 | SCANOBJ_FILES = \ | ||
36 | $(DOC_MODULE).args \ | ||
37 | $(DOC_MODULE).hierarchy \ | ||
38 | $(DOC_MODULE).interfaces \ | ||
39 | $(DOC_MODULE).prerequisites \ | ||
40 | $(DOC_MODULE).signals | ||
41 | |||
42 | CLEANFILES = $(SCANOBJ_FILES) $(DOC_MODULE)-scan.o $(DOC_MODULE)-unused.txt $(DOC_STAMPS) | ||
43 | |||
44 | if ENABLE_GTK_DOC | ||
45 | all-local: html-build.stamp | ||
46 | |||
47 | #### scan #### | ||
48 | |||
49 | scan-build.stamp: $(HFILE_GLOB) | ||
50 | @echo '*** Scanning header files ***' | ||
51 | @-chmod -R u+w $(srcdir) | ||
52 | if grep -l '^..*$$' $(srcdir)/$(DOC_MODULE).types > /dev/null ; then \ | ||
53 | CC="$(GTKDOC_CC)" LD="$(GTKDOC_LD)" CFLAGS="$(GTKDOC_CFLAGS)" LDFLAGS="$(GTKDOC_LIBS)" gtkdoc-scangobj $(SCANGOBJ_OPTIONS) --module=$(DOC_MODULE) --output-dir=$(srcdir) ; \ | ||
54 | else \ | ||
55 | cd $(srcdir) ; \ | ||
56 | for i in $(SCANOBJ_FILES) ; do \ | ||
57 | test -f $$i || touch $$i ; \ | ||
58 | done \ | ||
59 | fi | ||
60 | cd $(srcdir) && \ | ||
61 | gtkdoc-scan --module=$(DOC_MODULE) --source-dir=$(DOC_SOURCE_DIR) --ignore-headers="$(IGNORE_HFILES)" $(SCAN_OPTIONS) $(EXTRA_HFILES) | ||
62 | touch scan-build.stamp | ||
63 | |||
64 | $(DOC_MODULE)-decl.txt $(SCANOBJ_FILES): scan-build.stamp | ||
65 | @true | ||
66 | |||
67 | #### templates #### | ||
68 | |||
69 | tmpl-build.stamp: $(DOC_MODULE)-decl.txt $(SCANOBJ_FILES) $(DOC_MODULE)-sections.txt $(DOC_MODULE)-overrides.txt | ||
70 | @echo '*** Rebuilding template files ***' | ||
71 | @-chmod -R u+w $(srcdir) | ||
72 | cd $(srcdir) && gtkdoc-mktmpl --module=$(DOC_MODULE) | ||
73 | touch tmpl-build.stamp | ||
74 | |||
75 | tmpl.stamp: tmpl-build.stamp | ||
76 | @true | ||
77 | |||
78 | #### xml #### | ||
79 | |||
80 | sgml-build.stamp: tmpl.stamp $(CFILE_GLOB) $(srcdir)/tmpl/*.sgml | ||
81 | @echo '*** Building XML ***' | ||
82 | @-chmod -R u+w $(srcdir) | ||
83 | cd $(srcdir) && \ | ||
84 | gtkdoc-mkdb --module=$(DOC_MODULE) --source-dir=$(DOC_SOURCE_DIR) --output-format=xml $(MKDB_OPTIONS) | ||
85 | touch sgml-build.stamp | ||
86 | |||
87 | sgml.stamp: sgml-build.stamp | ||
88 | @true | ||
89 | |||
90 | #### html #### | ||
91 | |||
92 | html-build.stamp: sgml.stamp $(DOC_MAIN_SGML_FILE) $(content_files) | ||
93 | @echo '*** Building HTML ***' | ||
94 | @-chmod -R u+w $(srcdir) | ||
95 | rm -rf $(srcdir)/html | ||
96 | mkdir $(srcdir)/html | ||
97 | cd $(srcdir)/html && gtkdoc-mkhtml $(DOC_MODULE) ../$(DOC_MAIN_SGML_FILE) | ||
98 | test "x$(HTML_IMAGES)" = "x" || ( cd $(srcdir) && cp $(HTML_IMAGES) html ) | ||
99 | @echo '-- Fixing Crossreferences' | ||
100 | cd $(srcdir) && gtkdoc-fixxref --module-dir=html --html-dir=$(HTML_DIR) $(FIXXREF_OPTIONS) | ||
101 | touch html-build.stamp | ||
102 | endif | ||
103 | |||
104 | ############## | ||
105 | |||
106 | clean-local: | ||
107 | rm -f *~ *.bak | ||
108 | |||
109 | maintainer-clean-local: clean | ||
110 | cd $(srcdir) && rm -rf xml html $(DOC_MODULE)-decl-list.txt $(DOC_MODULE)-decl.txt | ||
111 | |||
112 | install-data-local: | ||
113 | $(mkinstalldirs) $(DESTDIR)$(TARGET_DIR) | ||
114 | (installfiles=`echo $(srcdir)/html/*`; \ | ||
115 | if test "$$installfiles" = '$(srcdir)/html/*'; \ | ||
116 | then echo '-- Nothing to install' ; \ | ||
117 | else \ | ||
118 | for i in $$installfiles; do \ | ||
119 | echo '-- Installing '$$i ; \ | ||
120 | $(INSTALL_DATA) $$i $(DESTDIR)$(TARGET_DIR); \ | ||
121 | done; \ | ||
122 | echo '-- Installing $(srcdir)/html/index.sgml' ; \ | ||
123 | $(INSTALL_DATA) $(srcdir)/html/index.sgml $(DESTDIR)$(TARGET_DIR) || :; \ | ||
124 | fi) | ||
125 | |||
126 | uninstall-local: | ||
127 | rm -f $(DESTDIR)$(TARGET_DIR)/* | ||
128 | |||
129 | # | ||
130 | # Require gtk-doc when making dist | ||
131 | # | ||
132 | if ENABLE_GTK_DOC | ||
133 | dist-check-gtkdoc: | ||
134 | else | ||
135 | dist-check-gtkdoc: | ||
136 | @echo "*** gtk-doc must be installed and enabled in order to make dist" | ||
137 | @false | ||
138 | endif | ||
139 | |||
140 | dist-hook: dist-check-gtkdoc dist-hook-local | ||
141 | mkdir $(distdir)/tmpl | ||
142 | mkdir $(distdir)/xml | ||
143 | mkdir $(distdir)/html | ||
144 | -cp $(srcdir)/tmpl/*.sgml $(distdir)/tmpl | ||
145 | -cp $(srcdir)/xml/*.xml $(distdir)/xml | ||
146 | -cp $(srcdir)/html/* $(distdir)/html | ||
147 | |||
148 | .PHONY : dist-hook-local | ||
diff --git a/meta-extras/packages/gnome/libbonobo_2.22.0.bb b/meta-extras/packages/gnome/libbonobo_2.22.0.bb deleted file mode 100644 index feecaf590a..0000000000 --- a/meta-extras/packages/gnome/libbonobo_2.22.0.bb +++ /dev/null | |||
@@ -1,6 +0,0 @@ | |||
1 | require libbonobo.inc | ||
2 | |||
3 | PR = "r0" | ||
4 | |||
5 | SRC_URI += "file://configure-gthread.patch;patch=1" | ||
6 | |||
diff --git a/meta-extras/packages/gnome/libbonoboui_2.18.0.bb b/meta-extras/packages/gnome/libbonoboui_2.18.0.bb deleted file mode 100644 index 85840f705c..0000000000 --- a/meta-extras/packages/gnome/libbonoboui_2.18.0.bb +++ /dev/null | |||
@@ -1,15 +0,0 @@ | |||
1 | LICENSE = "GPL" | ||
2 | SECTION = "x11/gnome/libs" | ||
3 | PR = "r1" | ||
4 | |||
5 | inherit gnome pkgconfig | ||
6 | |||
7 | FILES_${PN} += "${libdir}/libglade/2.0/*.so" | ||
8 | FILES_${PN}-dev += "${libdir}/libglade/2.0/* ${datadir}/gnome-2.0/ui \ | ||
9 | ${libdir}/bonobo-2.0/samples" | ||
10 | FILES_${PN}-dbg += "${libdir}/bonobo-2.0/samples/.debug \ | ||
11 | ${libdir}/libglade/2.0/.debug" | ||
12 | |||
13 | DEPENDS = "libgnomecanvas libbonobo libgnome glib-2.0 gtk-doc gconf libxml2 libglade" | ||
14 | |||
15 | EXTRA_OECONF = "--disable-gtk-doc" | ||
diff --git a/meta-extras/packages/gnome/orbit2-native_2.14.12.bb b/meta-extras/packages/gnome/orbit2-native_2.14.12.bb deleted file mode 100644 index c4d3132f40..0000000000 --- a/meta-extras/packages/gnome/orbit2-native_2.14.12.bb +++ /dev/null | |||
@@ -1,22 +0,0 @@ | |||
1 | DESCRIPTION = "CORBA ORB" | ||
2 | PR = "r0" | ||
3 | LICENSE = "LGPL GPL" | ||
4 | SECTION = "x11/gnome/libs" | ||
5 | SRC_URI = "http://ftp.gnome.org/pub/GNOME/sources/ORBit2/2.14/ORBit2-${PV}.tar.bz2 \ | ||
6 | file://configure-lossage.patch;patch=1;pnum=1 \ | ||
7 | file://gtk-doc.m4 \ | ||
8 | file://gtk-doc.make" | ||
9 | DEPENDS = "libidl-native popt-native gtk-doc" | ||
10 | |||
11 | S = "${WORKDIR}/ORBit2-${PV}" | ||
12 | |||
13 | PARALLEL_MAKE = "" | ||
14 | inherit autotools native pkgconfig | ||
15 | |||
16 | EXTRA_OECONF = "--disable-gtk-doc" | ||
17 | |||
18 | do_configure_prepend() { | ||
19 | mkdir -p m4 | ||
20 | install ${WORKDIR}/gtk-doc.m4 ./m4/ | ||
21 | install ${WORKDIR}/gtk-doc.make ./ | ||
22 | } | ||
diff --git a/meta-extras/packages/gnome/orbit2/configure-lossage.patch b/meta-extras/packages/gnome/orbit2/configure-lossage.patch deleted file mode 100644 index 7485a0ce0c..0000000000 --- a/meta-extras/packages/gnome/orbit2/configure-lossage.patch +++ /dev/null | |||
@@ -1,35 +0,0 @@ | |||
1 | --- orbit/configure.in~ 2004-05-07 09:31:32.000000000 +0100 | ||
2 | +++ orbit/configure.in 2004-05-08 19:27:35.000000000 +0100 | ||
3 | @@ -193,19 +193,19 @@ | ||
4 | dnl So many people with broken linking setups asked about this | ||
5 | dnl it turned out to be necessary to check for this. | ||
6 | dnl | ||
7 | -dofus_save_libs="$LIBS" | ||
8 | -LIBS="$ORBIT_LIBS $LIBS" | ||
9 | -AC_TRY_RUN([ #include <stdio.h> | ||
10 | - main () | ||
11 | - { | ||
12 | - return 0; | ||
13 | - } ],, | ||
14 | - AC_MSG_ERROR([ | ||
15 | -Linking is badly borked on your system. Please ensure your library path is correct | ||
16 | -Check config.log for details - check near the end of the log above 'failed program was' | ||
17 | -Alternatively ensure that your /etc/ld.so.conf (and/or LD_LIBRARY_PATH) includes the | ||
18 | -prefix you're compiling on: '${prefix}' ])) | ||
19 | -LIBS="$dofus_save_libs" | ||
20 | +dnl dofus_save_libs="$LIBS" | ||
21 | +dnl LIBS="$ORBIT_LIBS $LIBS" | ||
22 | +dnl AC_TRY_RUN([ #include <stdio.h> | ||
23 | +dnl main () | ||
24 | +dnl { | ||
25 | +dnl return 0; | ||
26 | +dnl } ],, | ||
27 | +dnl AC_MSG_ERROR([ | ||
28 | +dnl Linking is badly borked on your system. Please ensure your library path is correct | ||
29 | +dnl Check config.log for details - check near the end of the log above 'failed program was' | ||
30 | +dnl Alternatively ensure that your /etc/ld.so.conf (and/or LD_LIBRARY_PATH) includes the | ||
31 | +dnl prefix you're compiling on: '${prefix}' ])) | ||
32 | +dnl LIBS="$dofus_save_libs" | ||
33 | |||
34 | orig_CPPFLAGS=$CPPFLAGS | ||
35 | CPPFLAGS="$CPPFLAGS $ORBIT_CFLAGS" | ||
diff --git a/meta-extras/packages/gnome/orbit2/gtk-doc.m4 b/meta-extras/packages/gnome/orbit2/gtk-doc.m4 deleted file mode 100644 index 3ec41666b2..0000000000 --- a/meta-extras/packages/gnome/orbit2/gtk-doc.m4 +++ /dev/null | |||
@@ -1,53 +0,0 @@ | |||
1 | dnl -*- mode: autoconf -*- | ||
2 | |||
3 | # serial 1 | ||
4 | |||
5 | dnl Usage: | ||
6 | dnl GTK_DOC_CHECK([minimum-gtk-doc-version]) | ||
7 | AC_DEFUN([GTK_DOC_CHECK], | ||
8 | [ | ||
9 | AC_BEFORE([AC_PROG_LIBTOOL],[$0])dnl setup libtool first | ||
10 | AC_BEFORE([AM_PROG_LIBTOOL],[$0])dnl setup libtool first | ||
11 | dnl for overriding the documentation installation directory | ||
12 | AC_ARG_WITH(html-dir, | ||
13 | AC_HELP_STRING([--with-html-dir=PATH], [path to installed docs]),, | ||
14 | [with_html_dir='${datadir}/gtk-doc/html']) | ||
15 | HTML_DIR="$with_html_dir" | ||
16 | AC_SUBST(HTML_DIR) | ||
17 | |||
18 | dnl enable/disable documentation building | ||
19 | AC_ARG_ENABLE(gtk-doc, | ||
20 | AC_HELP_STRING([--enable-gtk-doc], | ||
21 | [use gtk-doc to build documentation [default=no]]),, | ||
22 | enable_gtk_doc=no) | ||
23 | |||
24 | have_gtk_doc=no | ||
25 | if test -z "$PKG_CONFIG"; then | ||
26 | AC_PATH_PROG(PKG_CONFIG, pkg-config, no) | ||
27 | fi | ||
28 | if test "$PKG_CONFIG" != "no" && $PKG_CONFIG --exists gtk-doc; then | ||
29 | have_gtk_doc=yes | ||
30 | fi | ||
31 | |||
32 | dnl do we want to do a version check? | ||
33 | ifelse([$1],[],, | ||
34 | [gtk_doc_min_version=$1 | ||
35 | if test "$have_gtk_doc" = yes; then | ||
36 | AC_MSG_CHECKING([gtk-doc version >= $gtk_doc_min_version]) | ||
37 | if $PKG_CONFIG --atleast-version $gtk_doc_min_version gtk-doc; then | ||
38 | AC_MSG_RESULT(yes) | ||
39 | else | ||
40 | AC_MSG_RESULT(no) | ||
41 | have_gtk_doc=no | ||
42 | fi | ||
43 | fi | ||
44 | ]) | ||
45 | if test x$enable_gtk_doc = xyes; then | ||
46 | if test "$have_gtk_doc" != yes; then | ||
47 | enable_gtk_doc=no | ||
48 | fi | ||
49 | fi | ||
50 | |||
51 | AM_CONDITIONAL(ENABLE_GTK_DOC, test x$enable_gtk_doc = xyes) | ||
52 | AM_CONDITIONAL(GTK_DOC_USE_LIBTOOL, test -n "$LIBTOOL") | ||
53 | ]) | ||
diff --git a/meta-extras/packages/gnome/orbit2/gtk-doc.make b/meta-extras/packages/gnome/orbit2/gtk-doc.make deleted file mode 100644 index c319e7ad7c..0000000000 --- a/meta-extras/packages/gnome/orbit2/gtk-doc.make +++ /dev/null | |||
@@ -1,148 +0,0 @@ | |||
1 | # -*- mode: makefile -*- | ||
2 | |||
3 | #################################### | ||
4 | # Everything below here is generic # | ||
5 | #################################### | ||
6 | |||
7 | if GTK_DOC_USE_LIBTOOL | ||
8 | GTKDOC_CC = $(LIBTOOL) --mode=compile $(CC) $(INCLUDES) $(AM_CFLAGS) $(CFLAGS) | ||
9 | GTKDOC_LD = $(LIBTOOL) --mode=link $(CC) $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS) | ||
10 | else | ||
11 | GTKDOC_CC = $(CC) $(INCLUDES) $(AM_CFLAGS) $(CFLAGS) | ||
12 | GTKDOC_LD = $(CC) $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS) | ||
13 | endif | ||
14 | |||
15 | # We set GPATH here; this gives us semantics for GNU make | ||
16 | # which are more like other make's VPATH, when it comes to | ||
17 | # whether a source that is a target of one rule is then | ||
18 | # searched for in VPATH/GPATH. | ||
19 | # | ||
20 | GPATH = $(srcdir) | ||
21 | |||
22 | TARGET_DIR=$(HTML_DIR)/$(DOC_MODULE) | ||
23 | |||
24 | EXTRA_DIST = \ | ||
25 | $(content_files) \ | ||
26 | $(HTML_IMAGES) \ | ||
27 | $(DOC_MAIN_SGML_FILE) \ | ||
28 | $(DOC_MODULE).types \ | ||
29 | $(DOC_MODULE)-sections.txt \ | ||
30 | $(DOC_MODULE)-overrides.txt | ||
31 | |||
32 | DOC_STAMPS=scan-build.stamp tmpl-build.stamp sgml-build.stamp html-build.stamp \ | ||
33 | $(srcdir)/tmpl.stamp $(srcdir)/sgml.stamp $(srcdir)/html.stamp | ||
34 | |||
35 | SCANOBJ_FILES = \ | ||
36 | $(DOC_MODULE).args \ | ||
37 | $(DOC_MODULE).hierarchy \ | ||
38 | $(DOC_MODULE).interfaces \ | ||
39 | $(DOC_MODULE).prerequisites \ | ||
40 | $(DOC_MODULE).signals | ||
41 | |||
42 | CLEANFILES = $(SCANOBJ_FILES) $(DOC_MODULE)-scan.o $(DOC_MODULE)-unused.txt $(DOC_STAMPS) | ||
43 | |||
44 | if ENABLE_GTK_DOC | ||
45 | all-local: html-build.stamp | ||
46 | |||
47 | #### scan #### | ||
48 | |||
49 | scan-build.stamp: $(HFILE_GLOB) | ||
50 | @echo '*** Scanning header files ***' | ||
51 | @-chmod -R u+w $(srcdir) | ||
52 | if grep -l '^..*$$' $(srcdir)/$(DOC_MODULE).types > /dev/null ; then \ | ||
53 | CC="$(GTKDOC_CC)" LD="$(GTKDOC_LD)" CFLAGS="$(GTKDOC_CFLAGS)" LDFLAGS="$(GTKDOC_LIBS)" gtkdoc-scangobj $(SCANGOBJ_OPTIONS) --module=$(DOC_MODULE) --output-dir=$(srcdir) ; \ | ||
54 | else \ | ||
55 | cd $(srcdir) ; \ | ||
56 | for i in $(SCANOBJ_FILES) ; do \ | ||
57 | test -f $$i || touch $$i ; \ | ||
58 | done \ | ||
59 | fi | ||
60 | cd $(srcdir) && \ | ||
61 | gtkdoc-scan --module=$(DOC_MODULE) --source-dir=$(DOC_SOURCE_DIR) --ignore-headers="$(IGNORE_HFILES)" $(SCAN_OPTIONS) $(EXTRA_HFILES) | ||
62 | touch scan-build.stamp | ||
63 | |||
64 | $(DOC_MODULE)-decl.txt $(SCANOBJ_FILES): scan-build.stamp | ||
65 | @true | ||
66 | |||
67 | #### templates #### | ||
68 | |||
69 | tmpl-build.stamp: $(DOC_MODULE)-decl.txt $(SCANOBJ_FILES) $(DOC_MODULE)-sections.txt $(DOC_MODULE)-overrides.txt | ||
70 | @echo '*** Rebuilding template files ***' | ||
71 | @-chmod -R u+w $(srcdir) | ||
72 | cd $(srcdir) && gtkdoc-mktmpl --module=$(DOC_MODULE) | ||
73 | touch tmpl-build.stamp | ||
74 | |||
75 | tmpl.stamp: tmpl-build.stamp | ||
76 | @true | ||
77 | |||
78 | #### xml #### | ||
79 | |||
80 | sgml-build.stamp: tmpl.stamp $(CFILE_GLOB) $(srcdir)/tmpl/*.sgml | ||
81 | @echo '*** Building XML ***' | ||
82 | @-chmod -R u+w $(srcdir) | ||
83 | cd $(srcdir) && \ | ||
84 | gtkdoc-mkdb --module=$(DOC_MODULE) --source-dir=$(DOC_SOURCE_DIR) --output-format=xml $(MKDB_OPTIONS) | ||
85 | touch sgml-build.stamp | ||
86 | |||
87 | sgml.stamp: sgml-build.stamp | ||
88 | @true | ||
89 | |||
90 | #### html #### | ||
91 | |||
92 | html-build.stamp: sgml.stamp $(DOC_MAIN_SGML_FILE) $(content_files) | ||
93 | @echo '*** Building HTML ***' | ||
94 | @-chmod -R u+w $(srcdir) | ||
95 | rm -rf $(srcdir)/html | ||
96 | mkdir $(srcdir)/html | ||
97 | cd $(srcdir)/html && gtkdoc-mkhtml $(DOC_MODULE) ../$(DOC_MAIN_SGML_FILE) | ||
98 | test "x$(HTML_IMAGES)" = "x" || ( cd $(srcdir) && cp $(HTML_IMAGES) html ) | ||
99 | @echo '-- Fixing Crossreferences' | ||
100 | cd $(srcdir) && gtkdoc-fixxref --module-dir=html --html-dir=$(HTML_DIR) $(FIXXREF_OPTIONS) | ||
101 | touch html-build.stamp | ||
102 | endif | ||
103 | |||
104 | ############## | ||
105 | |||
106 | clean-local: | ||
107 | rm -f *~ *.bak | ||
108 | |||
109 | maintainer-clean-local: clean | ||
110 | cd $(srcdir) && rm -rf xml html $(DOC_MODULE)-decl-list.txt $(DOC_MODULE)-decl.txt | ||
111 | |||
112 | install-data-local: | ||
113 | $(mkinstalldirs) $(DESTDIR)$(TARGET_DIR) | ||
114 | (installfiles=`echo $(srcdir)/html/*`; \ | ||
115 | if test "$$installfiles" = '$(srcdir)/html/*'; \ | ||
116 | then echo '-- Nothing to install' ; \ | ||
117 | else \ | ||
118 | for i in $$installfiles; do \ | ||
119 | echo '-- Installing '$$i ; \ | ||
120 | $(INSTALL_DATA) $$i $(DESTDIR)$(TARGET_DIR); \ | ||
121 | done; \ | ||
122 | echo '-- Installing $(srcdir)/html/index.sgml' ; \ | ||
123 | $(INSTALL_DATA) $(srcdir)/html/index.sgml $(DESTDIR)$(TARGET_DIR) || :; \ | ||
124 | fi) | ||
125 | |||
126 | uninstall-local: | ||
127 | rm -f $(DESTDIR)$(TARGET_DIR)/* | ||
128 | |||
129 | # | ||
130 | # Require gtk-doc when making dist | ||
131 | # | ||
132 | if ENABLE_GTK_DOC | ||
133 | dist-check-gtkdoc: | ||
134 | else | ||
135 | dist-check-gtkdoc: | ||
136 | @echo "*** gtk-doc must be installed and enabled in order to make dist" | ||
137 | @false | ||
138 | endif | ||
139 | |||
140 | dist-hook: dist-check-gtkdoc dist-hook-local | ||
141 | mkdir $(distdir)/tmpl | ||
142 | mkdir $(distdir)/xml | ||
143 | mkdir $(distdir)/html | ||
144 | -cp $(srcdir)/tmpl/*.sgml $(distdir)/tmpl | ||
145 | -cp $(srcdir)/xml/*.xml $(distdir)/xml | ||
146 | -cp $(srcdir)/html/* $(distdir)/html | ||
147 | |||
148 | .PHONY : dist-hook-local | ||
diff --git a/meta-extras/packages/gnome/orbit2/pkgconfig-fix.patch b/meta-extras/packages/gnome/orbit2/pkgconfig-fix.patch deleted file mode 100644 index f629e506dd..0000000000 --- a/meta-extras/packages/gnome/orbit2/pkgconfig-fix.patch +++ /dev/null | |||
@@ -1,12 +0,0 @@ | |||
1 | diff -urN ORBit2-2.14.12.orig/ORBit-2.0.pc.in ORBit2-2.14.12/ORBit-2.0.pc.in | ||
2 | --- ORBit2-2.14.12.orig/ORBit-2.0.pc.in 2008-01-29 13:45:22.000000000 +0100 | ||
3 | +++ ORBit2-2.14.12/ORBit-2.0.pc.in 2008-09-23 20:13:07.000000000 +0200 | ||
4 | @@ -2,7 +2,7 @@ | ||
5 | exec_prefix=@exec_prefix@ | ||
6 | libdir=@libdir@ | ||
7 | includedir=@includedir@ | ||
8 | -orbit_idl=@bindir@/orbit-idl-2@EXEEXT@ | ||
9 | +orbit_idl=@exec_prefix@/bin/orbit-idl-2@EXEEXT@ | ||
10 | |||
11 | |||
12 | Name: ORBit-2.0 | ||
diff --git a/meta-extras/packages/gnome/orbit2_2.14.16.bb b/meta-extras/packages/gnome/orbit2_2.14.16.bb deleted file mode 100644 index 42ade84d1f..0000000000 --- a/meta-extras/packages/gnome/orbit2_2.14.16.bb +++ /dev/null | |||
@@ -1,30 +0,0 @@ | |||
1 | LICENSE = "GPL" | ||
2 | DESCRIPTION = "CORBA ORB" | ||
3 | SECTION = "x11/gnome/libs" | ||
4 | SRC_URI = "http://ftp.gnome.org/pub/GNOME/sources/ORBit2/2.14/ORBit2-${PV}.tar.bz2 \ | ||
5 | file://configure-lossage.patch;patch=1;pnum=1 \ | ||
6 | file://pkgconfig-fix.patch;patch=1 \ | ||
7 | file://gtk-doc.m4 \ | ||
8 | file://gtk-doc.make" | ||
9 | DEPENDS = "libidl popt orbit2-native gtk-doc" | ||
10 | PARALLEL_MAKE = "" | ||
11 | |||
12 | FILES_${PN} += "${libdir}/orbit-2.0/*.so" | ||
13 | FILES_${PN}-dev += "${libdir}/orbit-2.0/*.a ${libdir}/orbit-2.0/*.la" | ||
14 | FILES_${PN}-dbg += "${libdir}/orbit-2.0/.debug" | ||
15 | |||
16 | S = "${WORKDIR}/ORBit2-${PV}" | ||
17 | |||
18 | LEAD_SONAME = "libORBit-2.so" | ||
19 | |||
20 | inherit autotools pkgconfig | ||
21 | |||
22 | EXTRA_OECONF = "--disable-gtk-doc" | ||
23 | EXTRA_OEMAKE = "IDL_COMPILER='${STAGING_BINDIR_NATIVE}/orbit-idl-2'" | ||
24 | |||
25 | do_configure_prepend() { | ||
26 | mkdir -p m4 | ||
27 | install ${WORKDIR}/gtk-doc.m4 ./m4/ | ||
28 | install ${WORKDIR}/gtk-doc.make ./ | ||
29 | } | ||
30 | |||