14 files changed, 0 insertions, 332 deletions
diff --git a/contrib/win32/patches/fluidsynth.diff b/contrib/win32/patches/fluidsynth.diff
deleted file mode 100644
index 898fe37..0000000
--- a/contrib/win32/patches/fluidsynth.diff
+++ /dev/null
@@ -1,36 +0,0 @@
-diff -ur fluidsynth-1.1.6.0/configure.ac fluidsynth-1.1.6/configure.ac
---- fluidsynth-1.1.6.0/configure.ac	2012-08-16 00:01:13 -0400
-+++ fluidsynth-1.1.6/configure.ac	2013-11-01 13:19:31 -0400
-@@ -68,7 +68,7 @@
-   AC_DEFINE(DARWIN, 1, [Define if building for Mac OS X Darwin])
-   ;;
- mingw*)
--  mingw32_support="yes"
-+  mingw32_support="no"
-   CFLAGS="$CFLAGS -mms-bitfields"
-   AC_DEFINE(MINGW32, 1, [Define if using the MinGW32 environment])
-   LIBFLUID_LIBS="-ldsound -lwinmm -lws2_32"
-diff -ur fluidsynth-1.1.6.0/src/config_win32.h.in fluidsynth-1.1.6/src/config_win32.h.in
---- fluidsynth-1.1.6.0/src/config_win32.h.in	2012-08-16 00:01:13 -0400
-+++ fluidsynth-1.1.6/src/config_win32.h.in	2013-11-01 13:26:42 -0400
-@@ -10,8 +10,6 @@
- #define HAVE_IO_H 1
- #define HAVE_WINDOWS_H 1
- 
--#define DSOUND_SUPPORT 1
--#define WINMIDI_SUPPORT 1
- #define WITH_FLOAT 1
- 
- #define snprintf _snprintf
-diff -ur fluidsynth-1.1.6.0/src/utils/fluidsynth_priv.h fluidsynth-1.1.6/src/utils/fluidsynth_priv.h
---- fluidsynth-1.1.6.0/src/utils/fluidsynth_priv.h	2012-08-16 00:01:13 -0400
-+++ fluidsynth-1.1.6/src/utils/fluidsynth_priv.h	2013-11-01 13:31:12 -0400
-@@ -125,8 +125,6 @@
- #define snprintf _snprintf
- #define vsnprintf _vsnprintf
- 
--#define DSOUND_SUPPORT 1
--#define WINMIDI_SUPPORT 1
- #define STDIN_FILENO 0
- #define STDOUT_FILENO 1
- #define STDERR_FILENO 2
diff --git a/contrib/win32/patches/gcontenttype-win32.c.diff b/contrib/win32/patches/gcontenttype-win32.c.diff
deleted file mode 100644
index b0606d7..0000000
--- a/contrib/win32/patches/gcontenttype-win32.c.diff
+++ /dev/null
@@ -1,32 +0,0 @@
-From 5f0665cbbc1d8b2fafeeb1fba7569612832b7541 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?=D0=A0=D1=83=D1=81=D0=BB=D0=B0=D0=BD=20=D0=98=D0=B6=D0=B1?=
- =?UTF-8?q?=D1=83=D0=BB=D0=B0=D1=82=D0=BE=D0=B2?= <lrn1986@gmail.com>
-Date: Thu, 30 Apr 2015 23:09:30 +0000
-Subject: W32: Special treatment for inode/directory mime/type
-
-This is a hack for GLocalFileInfo to correctly get icons for directories.
-Without this change content type for any W32 directory is NULL
-(because there's no registry entry for "inode/directory" by default,
-and in any way there's no file extension that means "directory" to put there),
-and GLocalFileInfo uses content type to grab icons.
-
-https://bugzilla.gnome.org/show_bug.cgi?id=748727
-
-diff --git a/gio/gcontenttype-win32.c b/gio/gcontenttype-win32.c
-index cc8bd82..2db8bd7 100644
---- a/gio/gcontenttype-win32.c
-+++ b/gio/gcontenttype-win32.c
-@@ -299,6 +299,10 @@ g_content_type_from_mime_type (const gchar *mime_type)
- 
-   g_return_val_if_fail (mime_type != NULL, NULL);
- 
-+  /* This is a hack to allow directories to have icons in filechooser */
-+  if (strcmp ("inode/directory", mime_type) == 0)
-+    return g_strdup (mime_type);
-+
-   key = g_strconcat ("MIME\\DataBase\\Content Type\\", mime_type, NULL);
-   content_type = get_registry_classes_key (key, L"Extension");
-   g_free (key);
--- 
-cgit v0.10.2
-
diff --git a/contrib/win32/patches/gdkwindow-win32.c.diff b/contrib/win32/patches/gdkwindow-win32.c.diff
deleted file mode 100644
index 1919095..0000000
--- a/contrib/win32/patches/gdkwindow-win32.c.diff
+++ /dev/null
@@ -1,15 +0,0 @@
---- gdkwindow-win32.c.0	2014-09-29 16:02:16 -0400
-+++ gdkwindow-win32.c	2015-12-24 06:08:41 -0500
-@@ -3202,6 +3202,12 @@
- 		SWP_FRAMECHANGED | SWP_NOACTIVATE | 
- 		SWP_NOREPOSITION | SWP_NOZORDER);
- 
-+  /* For reasons not clearly understood, the first call to SetWindowPos will
-+   * sometimes ignore/adjust the window size we requested.  The second call
-+   * below works around this bug/feature. */
-+  SetWindowPos (GDK_WINDOW_HWND (window), NULL,
-+		0, 0, rect.right - rect.left, rect.bottom - rect.top,
-+		SWP_NOACTIVATE | SWP_NOMOVE | SWP_NOZORDER);
- }
- 
- static void
diff --git a/contrib/win32/patches/ggettext.c.diff b/contrib/win32/patches/ggettext.c.diff
deleted file mode 100644
index 7bb8ae8..0000000
--- a/contrib/win32/patches/ggettext.c.diff
+++ /dev/null
@@ -1,66 +0,0 @@
---- ggettext.c.0	2013-10-25 11:58:38 -0400
-+++ ggettext.c	2014-03-23 22:07:29 -0400
-@@ -94,17 +94,32 @@
- #endif /* G_OS_WIN32 */
- 
- 
--static void
-+static gboolean
- ensure_gettext_initialized (void)
- {
-   static gsize initialised;
- 
-+#ifdef G_OS_WIN32
-+  static GThread * init_thread_atomic;
-+  GThread * init_thread = g_atomic_pointer_get (& init_thread_atomic);
-+
-+  /* avoid deadlock if _glib_get_locale_dir() calls back into gettext */
-+  if (G_UNLIKELY (init_thread && init_thread == g_thread_self ()))
-+    return FALSE;
-+#endif
-+
-   if (g_once_init_enter (&initialised))
-     {
- #ifdef G_OS_WIN32
--      gchar *tmp = _glib_get_locale_dir ();
-+      gchar *tmp;
-+
-+      g_atomic_pointer_set (&init_thread_atomic, g_thread_self ());
-+
-+      tmp = _glib_get_locale_dir ();
-       bindtextdomain (GETTEXT_PACKAGE, tmp);
-       g_free (tmp);
-+
-+      g_atomic_pointer_set (&init_thread_atomic, NULL);
- #else
-       bindtextdomain (GETTEXT_PACKAGE, GLIB_LOCALE_DIR);
- #endif
-@@ -113,6 +128,8 @@
- #    endif
-       g_once_init_leave (&initialised, TRUE);
-     }
-+
-+  return TRUE;
- }
- 
- /**
-@@ -128,7 +145,8 @@
- const gchar *
- glib_gettext (const gchar *str)
- {
--  ensure_gettext_initialized ();
-+  if (G_UNLIKELY (!ensure_gettext_initialized ()))
-+    return str;
- 
-   return g_dgettext (GETTEXT_PACKAGE, str);
- }
-@@ -152,7 +170,8 @@
- glib_pgettext (const gchar *msgctxtid,
-                gsize        msgidoffset)
- {
--  ensure_gettext_initialized ();
-+  if (G_UNLIKELY (!ensure_gettext_initialized ()))
-+    return msgctxtid;
- 
-   return g_dpgettext (GETTEXT_PACKAGE, msgctxtid, msgidoffset);
- }
diff --git a/contrib/win32/patches/gwin32appinfo.c.diff b/contrib/win32/patches/gwin32appinfo.c.diff
deleted file mode 100644
index 54082e2..0000000
--- a/contrib/win32/patches/gwin32appinfo.c.diff
+++ /dev/null
@@ -1,35 +0,0 @@
---- gwin32appinfo.c.0	2015-02-26 07:57:09 -0500
-+++ gwin32appinfo.c	2015-07-18 11:39:10 -0400
-@@ -287,7 +287,11 @@
- 
-   for (l = locations; l != NULL; l = l->next)
-     {
--      wchar_t *wloc = g_utf8_to_utf16 (l->data, -1, NULL, NULL, NULL);
-+      /* Some Windows apps (at least explorer.exe) don't know how to handle
-+       * file:// URIs, so try to convert them to a local filename. */
-+      gchar *fname = g_filename_from_uri (l->data, NULL, NULL);
-+      wchar_t *wloc = g_utf8_to_utf16 (fname != NULL ? fname : l->data, -1,
-+                                       NULL, NULL, NULL);
-       
-       memset (&exec_info, 0, sizeof (exec_info));
-       exec_info.cbSize = sizeof (exec_info);
-@@ -308,6 +312,7 @@
- 	  return FALSE;
- 	}
-       
-+      g_free (fname);
-       g_free (wloc);
-     }
-   
-@@ -642,6 +647,11 @@
-   wchar_t buffer[1024];
-   DWORD buffer_size;
- 
-+  /* the GIO content type for a directory is "inode/directory";
-+   * the corresponding Windows registry entry is "Folder" */
-+  if (g_strcmp0 (association, "inode/directory") == 0)
-+    association = "Folder";
-+
-   wtype = g_utf8_to_utf16 (association, -1, NULL, NULL, NULL);
- 
-   /* Verify that we have some sort of app registered for this type */
diff --git a/contrib/win32/patches/gwin32networking.h.diff b/contrib/win32/patches/gwin32networking.h.diff
deleted file mode 100644
index 10eb20f..0000000
--- a/contrib/win32/patches/gwin32networking.h.diff
+++ /dev/null
@@ -1,23 +0,0 @@
---- gwin32networking.h.0	2015-05-16 15:55:46 -0400
-+++ gwin32networking.h	2015-05-16 16:16:48 -0400
-@@ -19,14 +19,17 @@
- #ifndef __G_WIN32_NETWORKING_H__
- #define __G_WIN32_NETWORKING_H__
- 
-+#include <windef.h>
-+#include <winsock2.h>
-+
- G_BEGIN_DECLS
- 
- /* Check if more ANSI-compliant Winsock2 functions are provided */
- /* For run-time compatibility with Windows XP, remove when XP support dropped */
- 
--typedef INT (WSAAPI *PFN_InetPton) (INT, PCTSTR, PVOID);
--typedef PCTSTR (WSAAPI *PFN_InetNtop) (INT, PVOID, PTSTR, size_t);
--typedef NET_IFINDEX (WINAPI *PFN_IfNameToIndex) (PCSTR);
-+typedef INT (WSAAPI *PFN_InetPton) (INT, PCSTR, PVOID);
-+typedef PCSTR (WSAAPI *PFN_InetNtop) (INT, PVOID, PSTR, size_t);
-+typedef ULONG (WINAPI *PFN_IfNameToIndex) (PCSTR);
- 
- typedef struct _GWin32WinsockFuncs
- {
diff --git a/contrib/win32/patches/libbs2b-makefile.am.diff b/contrib/win32/patches/libbs2b-makefile.am.diff
deleted file mode 100644
index 8292c29..0000000
--- a/contrib/win32/patches/libbs2b-makefile.am.diff
+++ /dev/null
@@ -1,11 +0,0 @@
---- Makefile.am.0	2009-03-20 10:13:53 -0400
-+++ Makefile.am	2013-09-13 21:12:22 -0400
-@@ -18,7 +18,7 @@
-     $(bs2b_HEADERS)
- 
- libbs2b_la_LDFLAGS = \
--	-lm -version-info 0:0:0
-+	-lm -version-info 0:0:0 -no-undefined
- 
- libbs2b_la_SOURCES = \
- 	bs2b.c \
diff --git a/contrib/win32/patches/libcdio-util.c.diff b/contrib/win32/patches/libcdio-util.c.diff
deleted file mode 100644
index 1ade0d1..0000000
--- a/contrib/win32/patches/libcdio-util.c.diff
+++ /dev/null
@@ -1,21 +0,0 @@
---- util.c.0	2009-07-12 19:21:30 -0400
-+++ util.c	2011-04-01 20:22:00 -0500
-@@ -503,6 +503,7 @@
- 	     (unsigned int) p_statbuf->size );
-   }
- 
-+#ifdef HAVE_ROCK
-   if (yep == p_statbuf->rr.b3_rock && b_rock) {
-     struct tm tm;
- 
-@@ -524,7 +525,9 @@
-       report(stdout, " -> %s", p_statbuf->rr.psz_symlink);
-     }
- 
--  } else {
-+  } else
-+#endif
-+  {
-     strftime(date_str, sizeof(date_str), "%b %d %Y %H:%M:%S ", &p_statbuf->tm);
-     report (stdout," %s %s", date_str, psz_name_translated);
-   }
diff --git a/contrib/win32/patches/libcue-makefile.am.diff b/contrib/win32/patches/libcue-makefile.am.diff
deleted file mode 100644
index a90623c..0000000
--- a/contrib/win32/patches/libcue-makefile.am.diff
+++ /dev/null
@@ -1,9 +0,0 @@
---- Makefile.am.0	2010-05-01 03:33:40 -0400
-+++ Makefile.am	2013-09-13 21:17:47 -0400
-@@ -27,5 +27,5 @@
- 
- lib_LTLIBRARIES		= libcue.la
- 
--libcue_la_LDFLAGS	= -version-info @LIBCUE_LIBTOOL_VERSION@
-+libcue_la_LDFLAGS	= -version-info @LIBCUE_LIBTOOL_VERSION@ -no-undefined
- libcueincludedir	= $(includedir)/@LIBCUE_LIBRARY_NAME@-@LIBCUE_API_VERSION@/@LIBCUE_LIBRARY_NAME@
diff --git a/contrib/win32/patches/libfaad-main.c.diff b/contrib/win32/patches/libfaad-main.c.diff
deleted file mode 100644
index 1241e34..0000000
--- a/contrib/win32/patches/libfaad-main.c.diff
+++ /dev/null
@@ -1,10 +0,0 @@
---- main.c.0	2008-09-22 13:55:09 -0400
-+++ main.c	2011-04-01 19:00:33 -0500
-@@ -31,7 +31,6 @@
- #ifdef _WIN32
- #define WIN32_LEAN_AND_MEAN
- #include <windows.h>
--#define off_t __int64
- #else
- #include <time.h>
- #endif
diff --git a/contrib/win32/patches/libfaad-makefile.am.diff b/contrib/win32/patches/libfaad-makefile.am.diff
deleted file mode 100644
index 8512846..0000000
--- a/contrib/win32/patches/libfaad-makefile.am.diff
+++ /dev/null
@@ -1,11 +0,0 @@
---- Makefile.am.0	2013-09-13 21:02:30 -0400
-+++ Makefile.am	2013-09-13 21:02:44 -0400
-@@ -4,7 +4,7 @@
- include_HEADERS = $(top_srcdir)/include/faad.h \
- 		  $(top_srcdir)/include/neaacdec.h
- 
--libfaad_la_LDFLAGS = -version-info 2:0:0
-+libfaad_la_LDFLAGS = -version-info 2:0:0 -no-undefined
- libfaad_la_LIBADD = -lm
- 
- libfaad_la_SOURCES = bits.c cfft.c decoder.c drc.c \
diff --git a/contrib/win32/patches/libmms-strndup.diff b/contrib/win32/patches/libmms-strndup.diff
deleted file mode 100644
index 3c875ee..0000000
--- a/contrib/win32/patches/libmms-strndup.diff
+++ /dev/null
@@ -1,44 +0,0 @@
-diff -ur libmms-0.6.4-orig/configure.in libmms-0.6.4/configure.in
---- libmms-0.6.4-orig/configure.in	2014-04-08 23:15:23 -0400
-+++ libmms-0.6.4/configure.in	2015-01-02 13:03:49 -0500
-@@ -14,6 +14,7 @@
- 
- dnl Checks for header files.
- AC_CHECK_HEADERS([sys/socket.h netinet/in.h netdb.h windows.h winsock2.h])
-+AC_CHECK_FUNCS([strndup])
- 
- case $host in
-     *beos*)
-diff -ur libmms-0.6.4-orig/src/uri.c libmms-0.6.4/src/uri.c
---- libmms-0.6.4-orig/src/uri.c	2014-04-02 10:22:58 -0400
-+++ libmms-0.6.4/src/uri.c	2015-01-02 13:07:13 -0500
-@@ -125,6 +125,29 @@
- #define ISSPACE(C) (((C) >= 9 && (C) <= 13) || (C) == ' ')
- 
- 
-+/* Implement the strndup function.
-+   Copyright (C) 2005 Free Software Foundation, Inc.
-+   Written by Kaveh R. Ghazi <ghazi@caip.rutgers.edu>. */
-+#ifndef HAVE_STRNDUP
-+char *
-+strndup (const char *s, size_t n)
-+{
-+  char *result;
-+  size_t len = strlen (s);
-+
-+  if (n < len)
-+    len = n;
-+
-+  result = (char *) malloc (len + 1);
-+  if (!result)
-+    return 0;
-+
-+  result[len] = '\0';
-+  return (char *) memcpy (result, s, len);
-+}
-+#endif
-+
-+
- static int split_user_passwd(const char* in, char** user, char** passwd)
- {
-   char *pass, *tmp = g_strdup(in);
diff --git a/contrib/win32/patches/libwavpack-utils.c.diff b/contrib/win32/patches/libwavpack-utils.c.diff
deleted file mode 100644
index eeeb80a..0000000
--- a/contrib/win32/patches/libwavpack-utils.c.diff
+++ /dev/null
@@ -1,11 +0,0 @@
---- utils.c.0	2009-11-30 23:24:52 -0500
-+++ utils.c	2011-04-01 23:38:52 -0500
-@@ -657,7 +657,7 @@
-     return !ferror (hFile);
- }
- 
--#ifdef WIN32
-+#if 0
- 
- int64_t DoGetFileSize (FILE *hFile)
- {
diff --git a/contrib/win32/patches/wavpack.pc.in.diff b/contrib/win32/patches/wavpack.pc.in.diff
deleted file mode 100644
index 455a01e..0000000
--- a/contrib/win32/patches/wavpack.pc.in.diff
+++ /dev/null
@@ -1,8 +0,0 @@
---- wavpack.pc.in.0	2013-09-29 17:30:14 -0400
-+++ wavpack.pc.in	2014-01-25 16:47:55 -0500
-@@ -1,4 +1,5 @@
- prefix=@prefix@
-+exec_prefix=@exec_prefix@
- libdir=@libdir@
- includedir=${prefix}/include
-