diff options
author | Johan Dahlin <jdahlin@async.com.br> | 2009-01-15 23:08:10 +0000 |
---|---|---|
committer | Johan Dahlin <johan@src.gnome.org> | 2009-01-15 23:08:10 +0000 |
commit | 2b085f4bd15974628bec19ff1b730c07fe8ac4f0 (patch) | |
tree | c81f68158ff5583043b11c3919627c27d1a785fd | |
parent | 63cd2160c4782a2d419ceeb08c51d7d9955c21f6 (diff) | |
download | gobject-introspection-2b085f4bd15974628bec19ff1b730c07fe8ac4f0.tar.gz |
Move over the hand-written girs from gir-repository so upstream libraries
2009-01-15 Johan Dahlin <jdahlin@async.com.br>
* gir/GL-1.0.gir:
* gir/Makefile.am:
* gir/cairo-1.0.gir:
* gir/fontconfig-2.0.gir:
* gir/freetype2-2.0.gir:
* gir/libxml2-2.0.gir:
* gir/xfixes-4.0.gir:
* gir/xft-2.0.gir:
* gir/xlib-2.0.gir:
Move over the hand-written girs from gir-repository
so upstream libraries depending on these can avoid
a gir-repository dependency.
svn path=/trunk/; revision=1047
-rw-r--r-- | ChangeLog | 16 | ||||
-rw-r--r-- | gir/GL-1.0.gir | 24 | ||||
-rw-r--r-- | gir/Makefile.am | 42 | ||||
-rw-r--r-- | gir/cairo-1.0.gir | 47 | ||||
-rw-r--r-- | gir/fontconfig-2.0.gir | 16 | ||||
-rw-r--r-- | gir/freetype2-2.0.gir | 16 | ||||
-rw-r--r-- | gir/libxml2-2.0.gir | 20 | ||||
-rw-r--r-- | gir/xfixes-4.0.gir | 8 | ||||
-rw-r--r-- | gir/xft-2.0.gir | 18 | ||||
-rw-r--r-- | gir/xlib-2.0.gir | 32 |
10 files changed, 224 insertions, 15 deletions
@@ -1,5 +1,21 @@ 2009-01-15 Johan Dahlin <jdahlin@async.com.br> + * gir/GL-1.0.gir: + * gir/Makefile.am: + * gir/cairo-1.0.gir: + * gir/fontconfig-2.0.gir: + * gir/freetype2-2.0.gir: + * gir/libxml2-2.0.gir: + * gir/xfixes-4.0.gir: + * gir/xft-2.0.gir: + * gir/xlib-2.0.gir: + + Move over the hand-written girs from gir-repository + so upstream libraries depending on these can avoid + a gir-repository dependency. + +2009-01-15 Johan Dahlin <jdahlin@async.com.br> + Bug 567813 – Everything should be versioned * gir/Makefile.am: diff --git a/gir/GL-1.0.gir b/gir/GL-1.0.gir new file mode 100644 index 00000000..2359e3bb --- /dev/null +++ b/gir/GL-1.0.gir @@ -0,0 +1,24 @@ +<?xml version="1.0"?> +<repository version="1.0" + xmlns="http://www.gtk.org/introspection/core/1.0" + xmlns:c="http://www.gtk.org/introspection/c/1.0"> + <namespace name="GL" version="1.0" shared-library="GL"> + <record name="bitfield" c:type="GLbitfield"/> + <record name="charARB" c:type="GLcharARB"/> + <record name="enum" c:type="GLenum"/> + <record name="float" c:type="GLfloat"/> + <record name="handleARB" c:type="GLhandleARB"/> + <record name="int" c:type="GLint"/> + <record name="sizei" c:type="GLsizei"/> + <record name="uint" c:type="GLuint"/> + + <function name="InitNames" c:identifier="glInitNames"> + <return-value transfer-ownership="none"> + <type name="none" c:type="void"/> + </return-value> + <parameters> + </parameters> + </function> + + </namespace> +</repository> diff --git a/gir/Makefile.am b/gir/Makefile.am index 1cc5a6a4..1a25e3d9 100644 --- a/gir/Makefile.am +++ b/gir/Makefile.am @@ -1,8 +1,20 @@ include $(top_srcdir)/common.mk -BUILT_SOURCES = +BUILT_GIRSOURCES = +CLEANFILES = EXTRA_DIST = +BASE_GIRSOURCES = \ + cairo-1.0.gir \ + fontconfig-2.0.gir \ + freetype2-2.0.gir \ + GL-1.0.gir \ + libxml2-2.0.gir \ + xft-2.0.gir \ + xlib-2.0.gir \ + xfixes-4.0.gir +EXTRA_DIST += $(BASE_GIRSOURCES) + # glib GLIB_INCLUDEDIR=`pkg-config --variable=includedir glib-2.0`/glib-2.0 GLIB_LIBDIR=`pkg-config --variable=libdir glib-2.0` @@ -31,7 +43,7 @@ GLib-2.0.gir: $(SCANNER_BIN) $(SCANNER_LIBS) Makefile glib-2.0.c $(GLIB_INCLUDEDIR)/glib/*.h $(SCANNER) $(SCANNER_ARGS) \ --xpath-assertions=$(srcdir)/GLib-2.0.xpath GLib-2.0.gir -BUILT_SOURCES += GLib-2.0.gir +BUILT_GIRSOURCES += GLib-2.0.gir EXTRA_DIST += glib-2.0.c GLib-2.0.xpath # gobject @@ -58,7 +70,7 @@ GObject-2.0.gir: GLib-2.0.gir $(SCANNER_BIN) $(SCANNER_LIBS) Makefile -DGOBJECT_COMPILATION \ --pkg glib-2.0 \ $(GLIB_INCLUDEDIR)/gobject/*.h -BUILT_SOURCES += GObject-2.0.gir +BUILT_GIRSOURCES += GObject-2.0.gir # gmodule GMODULE_INCLUDEDIR=`pkg-config --variable=includedir gmodule-2.0`/glib-2.0 @@ -84,7 +96,7 @@ GModule-2.0.gir: GLib-2.0.gir $(SCANNER_BIN) $(SCANNER_LIBS) -I$(GMODULE_LIBDIR)/glib-2.0/include \ --pkg glib-2.0 \ $(GLIB_INCLUDEDIR)/gmodule.h -BUILT_SOURCES += GModule-2.0.gir +BUILT_GIRSOURCES += GModule-2.0.gir # gio GIO_INCLUDEDIR=`pkg-config --variable=includedir gio-2.0`/glib-2.0 @@ -120,7 +132,7 @@ Gio-2.0.gir: GObject-2.0.gir $(SCANNER_BIN) $(SCANNER_LIBS) Makefile $(srcdir)/g $(srcdir)/gio-2.0.c \ $(GLIB_INCLUDEDIR)/gio/*.h \ $(GIO_UNIX_HDRS) -BUILT_SOURCES += Gio-2.0.gir +BUILT_GIRSOURCES += Gio-2.0.gir EXTRA_DIST += gio-2.0.c # girepository @@ -141,23 +153,23 @@ GIRepository-2.0.gir: GObject-2.0.gir $(SCANNER_BIN) $(SCANNER_LIBS) $(GIREPOSIT --pkg glib-2.0 \ --pkg gobject-2.0 \ $(GIREPOSITORY_FILES) -BUILT_SOURCES += GIRepository-2.0.gir +BUILT_GIRSOURCES += GIRepository-2.0.gir # Generic rules -CLEANFILES = $(BUILT_SOURCES) -girdir=$(datadir)/gir-1.0 -dist_gir_DATA = $(BUILT_SOURCES) +CLEANFILES += $(BUILT_GIRSOURCES) + +GIRSOURCES = \ + $(BASE_GIRSOURCES) \ + $(BUILT_GIRSOURCES) + +girdir = $(datadir)/gir-1.0 +dist_gir_DATA = $(GIRSOURCES) %.typelib: %.gir $(top_builddir)/tools/g-ir-compiler$(EXEEXT) $(DEBUG) $(top_builddir)/tools/g-ir-compiler$(EXEEXT) --includedir=. $(G_IR_COMPILER_OPTS) $< -o $@ typelibsdir = $(libdir)/girepository-1.0 -typelibs_DATA = \ - GLib-2.0.typelib \ - GModule-2.0.typelib \ - GObject-2.0.typelib \ - Gio-2.0.typelib \ - GIRepository-2.0.typelib +typelibs_DATA = $(GIRSOURCES:.gir=.typelib) $(GIRSOURCES:.gir=.typelib) CLEANFILES += $(typelibs_DATA) diff --git a/gir/cairo-1.0.gir b/gir/cairo-1.0.gir new file mode 100644 index 00000000..feeefc17 --- /dev/null +++ b/gir/cairo-1.0.gir @@ -0,0 +1,47 @@ +<?xml version="1.0"?> +<repository version="1.0" + xmlns="http://www.gtk.org/introspection/core/1.0" + xmlns:c="http://www.gtk.org/introspection/c/1.0" + xmlns:glib="http://www.gtk.org/introspection/glib/1.0"> + <namespace name="cairo" version="1.0" shared-library="cairo"> + <record name="Context" c:type="cairo_t" + glib:type-name="CairoContext" + glib:get-type="cairo_get_g_type"/> + <record name="Surface" c:type="cairo_surface_t" + glib:type-name="CairoSurface" + glib:get-type="cairo_surface_get_glib_type"/> + <record name="Matrix" c:type="cairo_matrix_t" + glib:type-name="CairoMatrix" + glib:get-type="cairo_matrix_get_glib_type"/> + <record name="Pattern" c:type="cairo_pattern_t" + glib:type-name="CairoPattern" + glib:get-type="cairo_pattern_get_glib_type"/> + <enumeration name="Content" c:type="cairo_content_t"> + <member name="COLOR" + value="4096" + c:identifier="CAIRO_CONTENT_COLOR"/> + <member name="ALPHA" + value="8192" + c:identifier="CAIRO_CONTENT_ALPHA"/> + <member name="COLOR_ALPHA" + value="12288" + c:identifier="CAIRO_CONTENT_COLOR_ALPHA"/> + </enumeration> + <record name="FontOptions" c:type="cairo_font_options_t" + glib:type-name="CairoFontOptions" + glib:get-type="cairo_font_options_get_glib_type"/> + <record name="FontType" c:type="cairo_font_type_t" + glib:type-name="CairoFontType" + glib:get-type="cairo_font_type_get_glib_type"/> + <record name="ScaledFont" c:type="cairo_scaled_font_t" + glib:type-name="CairoScaledFont" + glib:get-type="cairo_scaled_font_get_glib_type"/> + <function name="image_surface_create" c:identifier="cairo_image_surface_create"> + <return-value transfer-ownership="none"> + <type name="none" c:type="void"/> + </return-value> + <parameters> + </parameters> + </function> + </namespace> +</repository> diff --git a/gir/fontconfig-2.0.gir b/gir/fontconfig-2.0.gir new file mode 100644 index 00000000..42ebbdea --- /dev/null +++ b/gir/fontconfig-2.0.gir @@ -0,0 +1,16 @@ +<?xml version="1.0"?> +<repository version="1.0" + xmlns="http://www.gtk.org/introspection/core/1.0" + xmlns:c="http://www.gtk.org/introspection/c/1.0"> + <namespace name="fontconfig" version="2.0" shared-library="fontconfig"> + <record name="Pattern" c:type="FcPattern"/> + <record name="CharSet" c:type="FcCharSet"/> + <function name="init" c:identifier="FcInit"> + <return-value transfer-ownership="none"> + <type name="none" c:type="void"/> + </return-value> + <parameters> + </parameters> + </function> + </namespace> +</repository> diff --git a/gir/freetype2-2.0.gir b/gir/freetype2-2.0.gir new file mode 100644 index 00000000..608b08a6 --- /dev/null +++ b/gir/freetype2-2.0.gir @@ -0,0 +1,16 @@ +<?xml version="1.0"?> +<repository version="1.0" + xmlns="http://www.gtk.org/introspection/core/1.0" + xmlns:c="http://www.gtk.org/introspection/c/1.0"> + <namespace name="freetype2" version="2.0" shared-library="freetype"> + <record name="Bitmap" c:type="FT_Bitmap"/> + <record name="Face" c:type="FT_Face"/> + <function name="library_version" c:identifier="FT_Library_Version"> + <return-value transfer-ownership="none"> + <type name="none" c:type="void"/> + </return-value> + <parameters> + </parameters> + </function> + </namespace> +</repository> diff --git a/gir/libxml2-2.0.gir b/gir/libxml2-2.0.gir new file mode 100644 index 00000000..bd994be2 --- /dev/null +++ b/gir/libxml2-2.0.gir @@ -0,0 +1,20 @@ +<?xml version="1.0"?> +<repository version="1.0" + xmlns="http://www.gtk.org/introspection/core/1.0" + xmlns:c="http://www.gtk.org/introspection/c/1.0"> + <namespace name="libxml2" version="2.0" shared-library="libxml2"> + <record name="Node" c:type="xmlNode"/> + <record name="NodePtr" c:type="xmlNodePtr"/> + <record name="Doc" c:type="xmlDoc"/> + <record name="DocPtr" c:type="xmlDocPtr"/> + <record name="NsPtr" c:type="xmlNsPtr"/> + <record name="Char" c:type="xmlChar"/> + <function name="dummy" c:identifier="dummy"> + <return-value transfer-ownership="none"> + <type name="none" c:type="void"/> + </return-value> + <parameters> + </parameters> + </function> + </namespace> +</repository> diff --git a/gir/xfixes-4.0.gir b/gir/xfixes-4.0.gir new file mode 100644 index 00000000..e2ca90f3 --- /dev/null +++ b/gir/xfixes-4.0.gir @@ -0,0 +1,8 @@ +<?xml version="1.0"?> +<repository version="1.0" + xmlns="http://www.gtk.org/introspection/core/1.0" + xmlns:c="http://www.gtk.org/introspection/c/1.0"> + <namespace name="xfixes" version="4.0" shared-library="Xfixes"> + <record name="XserverRegion" c:type="XserverRegion"/> + </namespace> +</repository> diff --git a/gir/xft-2.0.gir b/gir/xft-2.0.gir new file mode 100644 index 00000000..b89e66c9 --- /dev/null +++ b/gir/xft-2.0.gir @@ -0,0 +1,18 @@ +<?xml version="1.0"?> +<repository version="1.0" + xmlns="http://www.gtk.org/introspection/core/1.0" + xmlns:c="http://www.gtk.org/introspection/c/1.0"> + <namespace name="xft" version="2.0" shared-library="Xft"> + <record name="Color" c:type="XftColor"/> + <record name="Draw" c:type="XftDraw"/> + + <function name="init" c:identifier="XftInit"> + <return-value transfer-ownership="none"> + <type name="none" c:type="void"/> + </return-value> + <parameters> + </parameters> + </function> + + </namespace> +</repository> diff --git a/gir/xlib-2.0.gir b/gir/xlib-2.0.gir new file mode 100644 index 00000000..52368856 --- /dev/null +++ b/gir/xlib-2.0.gir @@ -0,0 +1,32 @@ +<?xml version="1.0"?> +<repository version="1.0" + xmlns="http://www.gtk.org/introspection/core/1.0" + xmlns:c="http://www.gtk.org/introspection/c/1.0"> + <namespace name="xlib" version="2.0" shared-library="X11"> + <record name="Atom" c:type="Atom"/> + <record name="Display" c:type="Display"/> + <record name="Drawable" c:type="Drawable"/> + <record name="GC" c:type="GC"/> + <record name="Picture" c:type="Picture"/> + <record name="Screen" c:type="Screen"/> + <record name="VisualID" c:type="VisualID"/> + <record name="Window" c:type="Window"/> + <record name="XEvent" c:type="XEvent"/> + <record name="XConfigureEvent" c:type="XConfigureEvent"/> + <record name="XID" c:type="XID"/> + <record name="Pixmap" c:type="Pixmap"/> + <record name="XImage" c:type="XImage"/> + <record name="XFontStruct" c:type="XFontStruct"/> + <record name="XVisualInfo" c:type="XVisualInfo"/> + <record name="XWindowAttributes" c:type="XWindowAttributes"/> + + <function name="open_display" c:identifier="XOpenDisplay"> + <return-value transfer-ownership="none"> + <type name="none" c:type="void"/> + </return-value> + <parameters> + </parameters> + </function> + + </namespace> +</repository> |