diff options
| author | Mark Brand <mabrand@mabrand.nl> | 2010-04-20 12:43:08 (GMT) |
|---|---|---|
| committer | Mark Brand <mabrand@mabrand.nl> | 2010-04-20 12:43:08 (GMT) |
| commit | 908c7b3702807f7490b00f836221584090a90df9 (patch) | |
| tree | fd4c1aa121134cf82c62c0aad4daea31e61e3d25 /src | |
| parent | edf32c4e55b632f5d0fcc37df96c2598cb4d2a4b (diff) | |
| download | mxe-908c7b3702807f7490b00f836221584090a90df9.zip mxe-908c7b3702807f7490b00f836221584090a90df9.tar.gz mxe-908c7b3702807f7490b00f836221584090a90df9.tar.bz2 | |
upgrade patckages glib gtk
Diffstat (limited to 'src')
| -rw-r--r-- | src/glib.mk | 12 | ||||
| -rw-r--r-- | src/gtk.mk | 5 |
2 files changed, 12 insertions, 5 deletions
diff --git a/src/glib.mk b/src/glib.mk index a2eb937..b70509a 100644 --- a/src/glib.mk +++ b/src/glib.mk @@ -4,8 +4,8 @@ # GLib PKG := glib $(PKG)_IGNORE := -$(PKG)_VERSION := 2.24.0 -$(PKG)_CHECKSUM := 32714e64fff52d18db5f077732910215790e0c5b +$(PKG)_VERSION := 2.25.1 +$(PKG)_CHECKSUM := ab8eb0af4ea25622d9b0913dbafb51c4571ec8e3 $(PKG)_SUBDIR := glib-$($(PKG)_VERSION) $(PKG)_FILE := glib-$($(PKG)_VERSION).tar.bz2 $(PKG)_WEBSITE := http://www.gtk.org/ @@ -38,7 +38,7 @@ define $(PKG)_BUILD --disable-shared \ --prefix='$(PREFIX)/$(TARGET)' \ --enable-regex \ - --disable-threads \ + --enable-threads \ --disable-selinux \ --disable-fam \ --disable-xattr \ @@ -49,6 +49,11 @@ define $(PKG)_BUILD $(MAKE) -C '$(1).native/glib' -j '$(JOBS)' $(MAKE) -C '$(1).native/gthread' -j '$(JOBS)' $(MAKE) -C '$(1).native/gobject' -j '$(JOBS)' lib_LTLIBRARIES= install-exec + $(MAKE) -C '$(1).native/gmodule' -j '$(JOBS)' + $(MAKE) -C '$(1).native/gio/xdgmime' -j '$(JOBS)' + $(MAKE) -C '$(1).native/gio/inotify' -j '$(JOBS)' + $(MAKE) -C '$(1).native/gio/libasyncns' -j '$(JOBS)' + $(MAKE) -C '$(1).native/gio' -j '$(JOBS)' # cross build $(SED) -i 's,^\(Libs:.*\),\1 @PCRE_LIBS@ @G_THREAD_LIBS@ @G_LIBS_EXTRA@ -lshlwapi,' '$(1)/glib-2.0.pc.in' @@ -64,6 +69,7 @@ define $(PKG)_BUILD CXX='$(TARGET)-c++' \ PKG_CONFIG='$(PREFIX)/bin/$(TARGET)-pkg-config' \ GLIB_GENMARSHAL='$(PREFIX)/$(TARGET)/bin/glib-genmarshal' + ln -s '$(1).native/gio/gschema-compile' '$(1)/gio/gschema-compile' $(MAKE) -C '$(1)/glib' -j '$(JOBS)' install bin_PROGRAMS= sbin_PROGRAMS= noinst_PROGRAMS= $(MAKE) -C '$(1)/gmodule' -j '$(JOBS)' install bin_PROGRAMS= sbin_PROGRAMS= noinst_PROGRAMS= $(MAKE) -C '$(1)/gthread' -j '$(JOBS)' install bin_PROGRAMS= sbin_PROGRAMS= noinst_PROGRAMS= @@ -4,8 +4,8 @@ # GTK+ PKG := gtk $(PKG)_IGNORE := -$(PKG)_VERSION := 2.19.6 -$(PKG)_CHECKSUM := 0a42eeee67fe2f3022f39fdf1a2a3817e520c0ff +$(PKG)_VERSION := 2.20.0 +$(PKG)_CHECKSUM := db8a8f1040a813fc1a7872d38b675b4805fa0446 $(PKG)_SUBDIR := gtk+-$($(PKG)_VERSION) $(PKG)_FILE := gtk+-$($(PKG)_VERSION).tar.bz2 $(PKG)_WEBSITE := http://www.gtk.org/ @@ -34,6 +34,7 @@ define $(PKG)_BUILD $(SED) -i 's,enable_shared=yes,enable_shared=no,' '$(1)/configure' $(SED) -i 's,\(STATIC_LIB_DEPS="[^"]*\) \$$LIBJASPER,\1 $$LIBJASPER $$LIBJPEG,' '$(1)/configure' $(SED) -i 's/-Wl,-luuid/-luuid/' '$(1)/configure' + $(SED) -i 's/gio-unix/gio-windows/' '$(1)/configure' # wine confuses the cross-compiling detection, so set it explicitly $(SED) -i 's,cross_compiling=no,cross_compiling=yes,' '$(1)/configure' cd '$(1)' && ./configure \ |