diff -u glib2.0-2.20.4/debian/changelog glib2.0-2.20.4/debian/changelog --- glib2.0-2.20.4/debian/changelog +++ glib2.0-2.20.4/debian/changelog @@ -1,3 +1,10 @@ +glib2.0 (2.20.4-1+interix.1) unstable; urgency=low + + * Non-maintainer upload. + * patches for interix-i386 + + -- Martin Koeppe Tue, 07 Jul 2009 21:04:03 +0200 + glib2.0 (2.20.4-1) unstable; urgency=low * New upstream bugfix release. reverted: --- glib2.0-2.20.4/debian/libgio-fam.install +++ glib2.0-2.20.4.orig/debian/libgio-fam.install @@ -1 +0,0 @@ -debian/install/deb/usr/lib/gio usr/lib diff -u glib2.0-2.20.4/debian/control.in glib2.0-2.20.4/debian/control.in --- glib2.0-2.20.4/debian/control.in +++ glib2.0-2.20.4/debian/control.in @@ -11,11 +11,7 @@ quilt, dpkg-dev (>= 1.14.13), libpcre3-dev (>= 7.4-1~), - gtk-doc-tools, - type-handling, - libselinux1-dev | not+linux-gnu, - linux-libc-dev | not+linux-gnu, - libgamin-dev | libfam-dev | linux-gnu + type-handling Standards-Version: 3.8.1 Homepage: http://www.gtk.org/ Vcs-Browser: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/glib2.0/ diff -u glib2.0-2.20.4/debian/control glib2.0-2.20.4/debian/control --- glib2.0-2.20.4/debian/control +++ glib2.0-2.20.4/debian/control @@ -11,11 +11,7 @@ quilt, dpkg-dev (>= 1.14.13), libpcre3-dev (>= 7.4-1~), - gtk-doc-tools, - type-handling, - libselinux1-dev | not+linux-gnu, - linux-libc-dev | not+linux-gnu, - libgamin-dev | libfam-dev | linux-gnu + type-handling Standards-Version: 3.8.1 Homepage: http://www.gtk.org/ Vcs-Browser: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/glib2.0/ diff -u glib2.0-2.20.4/debian/rules glib2.0-2.20.4/debian/rules --- glib2.0-2.20.4/debian/rules +++ glib2.0-2.20.4/debian/rules @@ -31,7 +31,7 @@ # Ensure the build aborts when there are still references to undefined # symbols -LDFLAGS += -Wl,-z,defs +#LDFLAGS += -Wl,-z,defs # Make the linker work a bit harder so dynamic loading can be done faster LDFLAGS += -Wl,-O1 @@ -80,6 +80,9 @@ # configure flags common_configure_flags := \ --prefix=/usr \ + --with-libiconv=gnu \ + CPPFLAGS="-D_ALL_SOURCE" \ + ac_cv_func_poll=no ac_cv_func_mmap_fixed_mapped=yes \ --mandir=\$${prefix}/share/man \ --infodir=\$${prefix}/share/info \ --with-html-dir=\$${prefix}/share/doc/$(DOC_PKG) \ @@ -155,6 +158,7 @@ touch $@ install: $(addprefix $(STAMP_DIR)/install-stamp-, $(FLAVORS)) + rm -f $(CURDIR)/debian/libglib$(APIVER)-$(SONAME)/usr/lib/charset.alias debian/control: dh_testdir @@ -225,7 +229,7 @@ dh_fixperms -s dh_makeshlibs -p$(SHARED_PKG) \ -V "$(SHARED_PKG) (>= $(SHVER))" \ - --add-udeb="$(UDEB_PKG)" -- -c4 + --add-udeb="$(UDEB_PKG)" -- -c0 dh_installdeb -s # override shlibs for libraries from this source before computing # dependencies of packages generated from this source; we already have only in patch2: unchanged: --- glib2.0-2.20.4.orig/configure +++ glib2.0-2.20.4/configure @@ -36789,7 +36789,7 @@ # One of them does for most gcc versions and some other platforms/compilers # too and could be considered as the canonical way to go. case $host in - *-*-cygwin*|*-*-darwin*) + *-*-cygwin*|*-*-darwin*|*-*-interix*) # skip cygwin and darwin -pthread or -pthreads test ;; *-solaris*) only in patch2: unchanged: --- glib2.0-2.20.4.orig/configure.in +++ glib2.0-2.20.4/configure.in @@ -1832,7 +1832,7 @@ # One of them does for most gcc versions and some other platforms/compilers # too and could be considered as the canonical way to go. case $host in - *-*-cygwin*|*-*-darwin*) + *-*-cygwin*|*-*-darwin*|*-*-interix*) # skip cygwin and darwin -pthread or -pthreads test ;; *-solaris*) only in patch2: unchanged: --- glib2.0-2.20.4.orig/gio/gunixmounts.c +++ glib2.0-2.20.4/gio/gunixmounts.c @@ -656,6 +656,24 @@ return return_list; } + +#elif defined (__INTERIX) + +/* Simply ignore any mount points. They are at /dev/fs/[A-Z] and at /net/*, + and every existing dir there could be enumerated as mount point. */ + +static char * +get_mtab_monitor_file (void) +{ + return NULL; +} + +static GList * +_g_get_unix_mounts (void) +{ + return NULL; +} + #else #error No _g_get_unix_mounts() implementation for system #endif @@ -1040,6 +1058,15 @@ { return _g_get_unix_mounts (); } + +#elif defined(__INTERIX) + +static GList * +_g_get_unix_mount_points (void) +{ + return NULL; +} + #else #error No g_get_mount_table() implementation for system #endif only in patch2: unchanged: --- glib2.0-2.20.4.orig/gio/Makefile.in +++ glib2.0-2.20.4/gio/Makefile.in @@ -201,7 +201,7 @@ CTAGS = ctags am__tty_colors = \ red=; grn=; lgn=; blu=; std= -DIST_SUBDIRS = xdgmime inotify fen win32 . fam tests +DIST_SUBDIRS = xdgmime inotify fen win32 . fam DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) am__relativize = \ dir0=`pwd`; \ @@ -444,7 +444,7 @@ TEST_PROGS = NULL = SUBDIRS = $(am__append_1) $(am__append_2) $(am__append_6) \ - $(am__append_9) . $(am__append_12) tests + $(am__append_9) . $(am__append_12) @MS_LIB_AVAILABLE_TRUE@@OS_WIN32_AND_DLL_COMPILATION_TRUE@noinst_DATA = gio-2.0.lib @MS_LIB_AVAILABLE_TRUE@@OS_WIN32_AND_DLL_COMPILATION_TRUE@install_ms_lib_cmd = $(INSTALL) gio-2.0.lib $(DESTDIR)$(libdir) @MS_LIB_AVAILABLE_TRUE@@OS_WIN32_AND_DLL_COMPILATION_TRUE@uninstall_ms_lib_cmd = -rm $(DESTDIR)$(libdir)/gio-2.0.lib @@ -584,13 +584,16 @@ libgio_2_0_la_LIBADD = \ $(top_builddir)/glib/libglib-2.0.la \ $(top_builddir)/gobject/libgobject-2.0.la \ - $(top_builddir)/gmodule/libgmodule-2.0.la \ $(platform_libadd) \ $(SELINUX_LIBS) \ $(GLIB_LIBS) \ $(XATTR_LIBS) \ $(NULL) +# remmoved on Interix due to failing linker +# $(top_builddir)/gmodule/libgmodule-2.0.la \ +# + @PLATFORM_WIN32_TRUE@no_undefined = -no-undefined @OS_WIN32_AND_DLL_COMPILATION_FALSE@export_symbols = -export-symbols-regex '^g_.*' @OS_WIN32_AND_DLL_COMPILATION_TRUE@export_symbols = -export-symbols gio.def only in patch2: unchanged: --- glib2.0-2.20.4.orig/gmodule/Makefile.in +++ glib2.0-2.20.4/gmodule/Makefile.in @@ -165,7 +165,8 @@ G_MODULE_BROKEN_RTLD_GLOBAL = @G_MODULE_BROKEN_RTLD_GLOBAL@ G_MODULE_HAVE_DLERROR = @G_MODULE_HAVE_DLERROR@ G_MODULE_IMPL = @G_MODULE_IMPL@ -G_MODULE_LDFLAGS = @G_MODULE_LDFLAGS@ +#G_MODULE_LDFLAGS = @G_MODULE_LDFLAGS@ +G_MODULE_LDFLAGS = G_MODULE_LIBS = @G_MODULE_LIBS@ G_MODULE_LIBS_EXTRA = @G_MODULE_LIBS_EXTRA@ G_MODULE_NEED_USCORE = @G_MODULE_NEED_USCORE@ only in patch2: unchanged: --- glib2.0-2.20.4.orig/tests/refcount/closures.c +++ glib2.0-2.20.4/tests/refcount/closures.c @@ -177,7 +177,7 @@ { static guint count = 0; test_closure (closure); - if (++count % 10000 == 0) + if (++count % 1000 == 0) { g_printerr ("c"); g_thread_yield(); /* force context switch */ @@ -195,7 +195,7 @@ { static guint count = 0; test_closure (closure); - if (++count % 10000 == 0) + if (++count % 1000 == 0) { g_printerr ("C"); g_thread_yield(); /* force context switch */ @@ -257,11 +257,11 @@ thread1 = g_thread_create (thread1_main, closure, TRUE, NULL); thread2 = g_thread_create (thread2_main, closure, TRUE, NULL); - for (i = 0; i < 1000000; i++) + for (i = 0; i < 10000; i++) { static guint count = 0; test_emissions (object); - if (++count % 10000 == 0) + if (++count % 1000 == 0) { g_printerr (".\n"); g_thread_yield(); /* force context switch */