mingw64-i686-glib2.0 2.36.4
authorYaakov Selkowitz <yselkowitz@users.sourceforge.net>
Mon, 18 Nov 2013 18:05:13 +0000 (12:05 -0600)
committerYaakov Selkowitz <yselkowitz@users.sourceforge.net>
Mon, 18 Nov 2013 18:05:13 +0000 (12:05 -0600)
2.34.3-m4macros.patch [new file with mode: 0644]
mingw64-i686-glib2.0.cygport

diff --git a/2.34.3-m4macros.patch b/2.34.3-m4macros.patch
new file mode 100644 (file)
index 0000000..e37706c
--- /dev/null
@@ -0,0 +1,15 @@
+Fix for -Werror=nested-externs
+
+--- origsrc/glib-2.34.3/m4macros/glib-gettext.m4       2012-11-20 08:27:12.000000000 -0600
++++ src/glib-2.34.3/m4macros/glib-gettext.m4   2013-04-15 02:04:25.707401500 -0500
+@@ -222,8 +222,8 @@ msgstr ""
+         AC_PATH_PROG(GMSGFMT, gmsgfmt, $MSGFMT)
+         GLIB_PATH_PROG_WITH_TEST(XGETTEXT, xgettext,
+           [test -z "`$ac_dir/$ac_word -h 2>&1 | grep '(HELP)'`"], :)
+-        AC_TRY_LINK(, [extern int _nl_msg_cat_cntr;
+-                       return _nl_msg_cat_cntr],
++        AC_TRY_LINK([extern int _nl_msg_cat_cntr;],
++                    [return _nl_msg_cat_cntr],
+           [CATOBJEXT=.gmo 
+              DATADIRNAME=share],
+           [case $host in
index 929d43413442d55bad419edc71bfbb5b60279987..9986b30ba4e23e7f69a538963a1147ad4bb9f850 100644 (file)
@@ -3,7 +3,7 @@ ORIG_PN="glib"
 inherit cross gnome2
 
 NAME="mingw64-i686-glib2.0"
-VERSION=2.34.3
+VERSION=2.36.4
 RELEASE=1
 CATEGORY="Devel"
 SUMMARY="GNOME core C function library for Win32 toolchain"
@@ -13,19 +13,35 @@ contains msvcrt-linked binaries (aka 'mingw').  It is for use with the
 mingw64-i686-gcc cross compiler, and installs into the
 /usr/i686-w64-mingw32/sys-root/mingw/{lib,include} directories."
 
-PATCH_URI="
-       http://git.gnome.org/browse/glib/patch/gio/tests/gdbus-proxy.c?id=d9e8fea
-"
+PATCH_URI="2.34.3-m4macros.patch"
 
 DIFF_EXCLUDES="config.py"
 
+src_compile() {
+       cd ${S}
+       gnome2_autoreconf
+
+       # static and shared cannot be built simultaneously
+       mkdir -p ${B}/shared
+       cd ${B}/shared
+       gnome2_configure --enable-shared --disable-static
+       cygmake
+
+       mkdir -p ${B}/static
+       cd ${B}/static
+       gnome2_configure --disable-shared --enable-static
+       cygmake
+}
+
 src_install() {
-       cd ${B}
+       cd ${B}/static
+       cyginstall
+       cd ${B}/shared
        cyginstall
 
        rm -f ${D}${CROSS_BINDIR}/gdbus-codegen
        rm -f ${D}${CROSS_BINDIR}/glib-{compile-resources,genmarshal,gettextize,mkenums}*
-       rm -fr ${D}${CROSS_LIBDIR}/{charset.alias,gdbus-2.0/}
+       rm -fr ${D}${CROSS_LIBDIR}/charset.alias
        rm -fr ${D}${CROSS_DATADIR}/{bash-completion,gdb,man}/
-       rm -fr ${D}${CROSS_DATADIR}/glib-2.0/{gdb,gettext}
+       rm -fr ${D}${CROSS_DATADIR}/glib-2.0/{codegen,gdb,gettext}
 }
This page took 0.043543 seconds and 5 git commands to generate.