Re: Small improvement to use uninstalled GLib
[email protected] Fri, 9 Oct 2009 12:32:37 +0900
| Newsgroups | gmane.comp.gnome.lib.librsvg.devel,gmane.spam.detected |
|---|---|
| Message-ID | <[email protected]> |
Dear Dominic, Thank you for quick reply. Just I've filed my patch on gnome bugzilla. https://bugzilla.gnome.org/show_bug.cgi?id=597873 It's slightly shorter than my post in this list. Checking existing bugs, I found that a request to disable gtk+ support: https://bugzilla.gnome.org/show_bug.cgi?id=396722 I removed GTK+ related part from my patch. I will check if I can provide some patch to help Hubert. Regards, mpsuzuki On Thu, 8 Oct 2009 14:30:16 -0400 Dominic Lachowicz <[email protected]> wrote: >Thank you very much for the patch. If you can, please file a bug @ >http://bugzilla.gnome.org and include this patch. > >Thanks again, >Dom > >On Thu, Oct 8, 2009 at 1:49 PM, <[email protected]> wrote: >> Dear Librsvg maintainer, >> >> Recently I'm trying to build Gtk+ related softwares with >> built-but-not-installed-yet (uninstalled) libraries. >> I find that librsvg/Makefile.am uses glib-mkenums >> that cannot be found in PATH when GLib is not installed. >> Following is the patch (for git head) to invoke it by >> GLIB_MKENUMS, which is configured by AM_PATH_GLIB_2_0() >> and useful to invoke the command before installation. >> Please check. >> >> diff --git a/Makefile.am b/Makefile.am >> index 82dd543..5a90404 100644 >> --- a/Makefile.am >> +++ b/Makefile.am >> @@ -153,7 +153,7 @@ librsvg-enum-types.h: s-enum-types-h >> __ __ __ __@true >> >> __s-enum-types-h: $(headers) Makefile >> - __ __ __ ( cd $(srcdir) && glib-mkenums \ >> + __ __ __ ( cd $(srcdir) && $(GLIB_MKENUMS) \ >> __ __ __ __ __ __ __ __ __ __ __ __--fhead "#ifndef __LIBRSVG_ENUM_TYPES_H__\n#define __LIBRSVG_ENUM_TYPES_H__\n\n#include <glib-object.h>\n\nG_BEGIN_DECLS\n" \ >> __ __ __ __ __ __ __ __ __ __ __ __--fprod "/* enumerations from \"@filename@\" */\n" \ >> __ __ __ __ __ __ __ __ __ __ __ __--vhead "GType @enum_name@_get_type (void);\n#define RSVG_TYPE_@ENUMSHORT@ (@enum_name@_get_type())\n" __\ >> @@ -167,7 +167,7 @@ librsvg-enum-types.c: s-enum-types-c librsvg-enum-types.h >> __ __ __ __@true >> >> __s-enum-types-c: $(headers) Makefile >> - __ __ __ ( cd $(srcdir) && glib-mkenums \ >> + __ __ __ ( cd $(srcdir) && $(GLIB_MKENUMS) \ >> __ __ __ __ __ __ __ __ __ __ __ __--fhead "#include \"librsvg-enum-types.h\"\n#include \"rsvg.h\"" \ >> __ __ __ __ __ __ __ __ __ __ __ __--fprod "\n/* enumerations from \"@filename@\" */" \ >> __ __ __ __ __ __ __ __ __ __ __ __--vhead "GType\n@enum_name@_get_type (void)\n{\n __static GType etype = 0;\n __if (etype == 0) {\n __ __static const G@Type@Value values[] = {" __ __ \ >> diff --git a/configure.in b/configure.in >> index dd64a2b..af0fd39 100644 >> --- a/configure.in >> +++ b/configure.in >> @@ -10,6 +10,7 @@ LIBXML_REQUIRED=2.4.7 >> __CAIRO_REQUIRED=1.2.0 >> __PANGOFT2_REQUIRED=1.2.0 >> __PANGOCAIRO_REQUIRED=1.10.0 >> +GTK_REQUIRED=2.6.0 __ __ __ __ __ __ dnl Required to build test-display >> >> __AC_SUBST(GDK_PIXBUF_REQUIRED) >> __AC_SUBST(GLIB_REQUIRED) >> @@ -17,6 +18,7 @@ AC_SUBST(GIO_REQUIRED) >> __AC_SUBST(CAIRO_REQUIRED) >> __AC_SUBST(LIBXML_REQUIRED) >> __AC_SUBST(PANGOFT2_REQUIRED) >> +AC_SUBST(GTK_REQUIRED) >> >> __dnl =========================================================================== >> >> @@ -80,20 +82,19 @@ AM_CONDITIONAL(OS_WIN32, test "$native_win32" = "yes") >> >> __dnl =========================================================================== >> >> -PKG_CHECK_MODULES(GLIB, \ >> - __ __ __ __ __ __ __ glib-2.0 >= $GLIB_REQUIRED \ >> - __ __ __ __ __ __ __ gthread-2.0 >= $GLIB_REQUIRED) >> -AC_SUBST(GLIB_LIBS) >> -AC_SUBST(GLIB_CFLAGS) >> - >> -PKG_CHECK_MODULES(LIBRSVG, \ >> - __ __ __ gdk-pixbuf-2.0 >= $GDK_PIXBUF_REQUIRED \ >> - __ __ __ glib-2.0 >= $GLIB_REQUIRED \ >> - __ __ __ libxml-2.0 >= $LIBXML_REQUIRED \ >> - __ __ __ pangoft2 >= $PANGOFT2_REQUIRED \ >> - __ __ __ pangocairo >= $PANGOCAIRO_REQUIRED \ >> - __ __ __ cairo >= $CAIRO_REQUIRED \ >> - __ __ __ cairo-png >= $CAIRO_REQUIRED \ >> +dnl setup GLIB_MKENUM >> +AM_PATH_GLIB_2_0($GLIB_REQUIRED, [have_glib=yes], [have_glib=no], [glib gio gthread]) >> + >> + >> +PKG_CHECK_MODULES(LIBRSVG, >> + __ __ __ gtk+-2.0 >= $GTK_REQUIRED >> + __ __ __ gdk-pixbuf-2.0 >= $GDK_PIXBUF_REQUIRED >> + __ __ __ glib-2.0 >= $GLIB_REQUIRED >> + __ __ __ libxml-2.0 >= $LIBXML_REQUIRED >> + __ __ __ pangoft2 >= $PANGOFT2_REQUIRED >> + __ __ __ pangocairo >= $PANGOCAIRO_REQUIRED >> + __ __ __ cairo >= $CAIRO_REQUIRED >> + __ __ __ cairo-png >= $CAIRO_REQUIRED >> __ __ __ __fontconfig >= $FONTCONFIG_REQUIRED >> __ __ __ __freetype2) >> >> >> However, the header file structure of installed Gtk+ is >> incompatible with that of uninstalled Gtk+ working directory, >> so now it is impossible to build librsvg with uninstalled >> Gtk+. I've posted a patch to hide the incompatibility >> to gtk-devel list. >> >> http://mail.gnome.org/archives/gtk-devel-list/2009-October/msg00055.html >> >> Next, I'm thinking of freetype2-uninstalled.pc for FreeType2. >> I wish it can help Tom Dalton. >> >> Regards, >> mpsuzuki >> > > > >-- >"I like to pay taxes. With them, I buy civilization." -- Oliver Wendell Holmes ------------------------------------------------------------------------------ Come build with us! The BlackBerry(R) Developer Conference in SF, CA is the only developer event you need to attend this year. Jumpstart your developing skills, take BlackBerry mobile applications to market and stay ahead of the curve. Join us from November 9 - 12, 2009. Register now! http://p.sf.net/sfu/devconference