[SCM] kodi/experimental: Refresh patches

[rbalint at users.alioth.debian.org]

The following commit has been merged in the experimental branch:
commit d639a12d672971d1d5b521d1166723988381fbef
Author: Balint Reczey <balint at balintreczey.hu>
Date:   Tue Oct 25 18:04:12 2016 +0200

    Refresh patches

diff --git a/debian/patches/0004-utils-drop-AsyncFileCopy-from-Makefile-too.patch b/debian/patches/0004-utils-drop-AsyncFileCopy-from-Makefile-too.patch
deleted file mode 100644
index cc6d8a3..0000000
--- a/debian/patches/0004-utils-drop-AsyncFileCopy-from-Makefile-too.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-From c52cc733710b343efbc2af808576da573b12b116 Mon Sep 17 00:00:00 2001
-From: Balint Reczey <balint at balintreczey.hu>
-Date: Fri, 7 Oct 2016 09:40:37 +0200
-Subject: [PATCH 4/4] [utils] drop AsyncFileCopy from Makefile, too
-
----
- xbmc/utils/test/Makefile | 1 -
- 1 file changed, 1 deletion(-)
-
-diff --git a/xbmc/utils/test/Makefile b/xbmc/utils/test/Makefile
-index a5e0a5f..496a8fb 100644
---- a/xbmc/utils/test/Makefile
-+++ b/xbmc/utils/test/Makefile
-@@ -2,7 +2,6 @@ SRCS=	\
- 	TestAlarmClock.cpp \
- 	TestAliasShortcutUtils.cpp \
- 	TestArchive.cpp \
--	TestAsyncFileCopy.cpp \
- 	TestBase64.cpp \
- 	TestBitstreamStats.cpp \
- 	TestCharsetConverter.cpp \
--- 
-2.1.4
-
diff --git a/debian/patches/01_reproducible_build.patch b/debian/patches/01_reproducible_build.patch
index 07e13bd..b2c3310 100644
--- a/debian/patches/01_reproducible_build.patch
+++ b/debian/patches/01_reproducible_build.patch
@@ -5,7 +5,7 @@ Forwarded: not-needed
 
 --- a/xbmc/Application.cpp
 +++ b/xbmc/Application.cpp
-@@ -531,7 +531,7 @@
+@@ -526,7 +526,7 @@
  //  specialVersion = " (version for XXXX)";
  #endif
    CLog::Log(LOGNOTICE, "Using %s %s x%d build%s", buildType.c_str(), CSysInfo::GetAppName().c_str(), g_sysinfo.GetXbmcBitness(), specialVersion.c_str());
@@ -16,7 +16,7 @@ Forwarded: not-needed
  
 --- a/xbmc/utils/SystemInfo.cpp
 +++ b/xbmc/utils/SystemInfo.cpp
-@@ -1258,7 +1258,7 @@
+@@ -1249,7 +1249,7 @@
  
  std::string CSysInfo::GetBuildDate()
  {
diff --git a/debian/patches/02_allow_all_arches.patch b/debian/patches/02_allow_all_arches.patch
index 5b9d32b..1507f34 100644
--- a/debian/patches/02_allow_all_arches.patch
+++ b/debian/patches/02_allow_all_arches.patch
@@ -13,7 +13,7 @@ entering uncharted territory.
 
 --- a/configure.ac
 +++ b/configure.ac
-@@ -654,7 +654,8 @@
+@@ -658,7 +658,8 @@
       USE_STATIC_FFMPEG=1
       ;;
    *)
diff --git a/debian/patches/04-differentiate-from-vanilla-Kodi.patch b/debian/patches/04-differentiate-from-vanilla-Kodi.patch
index 3bfa691..3c2e63e 100644
--- a/debian/patches/04-differentiate-from-vanilla-Kodi.patch
+++ b/debian/patches/04-differentiate-from-vanilla-Kodi.patch
@@ -19,7 +19,7 @@
  
    return appName;
  }
-@@ -1095,7 +1098,9 @@
+@@ -1086,7 +1089,9 @@
    if (!result.empty())
      return result;
  
@@ -30,7 +30,7 @@
  #if defined(TARGET_WINDOWS)
    result += GetKernelName() + " " + GetKernelVersion();
    BOOL bIsWow = FALSE;
-@@ -1253,7 +1258,7 @@
+@@ -1244,7 +1249,7 @@
  
  std::string CSysInfo::GetVersion()
  {
@@ -52,7 +52,7 @@
    EXPECT_EQ(g_sysinfo.GetUserAgent().find(' '), g_sysinfo.GetUserAgent().find(" (")) << "Second parameter in 'GetUserAgent()' string must be in brackets";
 --- a/addons/skin.estuary/1080i/Home.xml
 +++ b/addons/skin.estuary/1080i/Home.xml
-@@ -948,6 +948,18 @@
+@@ -950,6 +950,18 @@
  					<height>36</height>
  					<texture>icons/logo-text.png</texture>
  				</control>
diff --git a/debian/patches/06-use-external-libraries.patch b/debian/patches/06-use-external-libraries.patch
index f41a8d2..6e3d0ca 100644
--- a/debian/patches/06-use-external-libraries.patch
+++ b/debian/patches/06-use-external-libraries.patch
@@ -15,7 +15,7 @@ Forwarded: not-needed
  all: $(BOOTSTRAP_TARGETS)
 --- a/configure.ac
 +++ b/configure.ac
-@@ -2384,18 +2384,11 @@
+@@ -2391,18 +2391,11 @@
  ], [0])
  
  XB_CONFIG_MODULE([lib/gtest], [
diff --git a/debian/patches/10-dont-use-omitted-files.patch b/debian/patches/10-dont-use-omitted-files.patch
index 8571996..4b018ac 100644
--- a/debian/patches/10-dont-use-omitted-files.patch
+++ b/debian/patches/10-dont-use-omitted-files.patch
@@ -1,6 +1,6 @@
 --- a/configure.ac
 +++ b/configure.ac
-@@ -2197,7 +2197,6 @@
+@@ -2203,7 +2203,6 @@
      tools/Linux/kodi-standalone.sh \
      tools/Linux/kodi-xsession.desktop \
      tools/EventClients/Makefile \
diff --git a/debian/patches/12-build-cpluff-pic-only.patch b/debian/patches/12-build-cpluff-pic-only.patch
index 4701a2d..2668b4f 100644
--- a/debian/patches/12-build-cpluff-pic-only.patch
+++ b/debian/patches/12-build-cpluff-pic-only.patch
@@ -1,6 +1,6 @@
 --- a/configure.ac
 +++ b/configure.ac
-@@ -2378,7 +2378,7 @@
+@@ -2385,7 +2385,7 @@
      --prefix="${prefix}" --includedir="${includedir}" --libdir="${libdir}" --datadir="${datadir}" \
      --host=$host_alias \
      --build=$build_alias \
diff --git a/debian/patches/series b/debian/patches/series
index eb2209c..59f533f 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,7 +1,6 @@
 0001-c-pluff-Fix-format-string-warnings.patch
 0002-StringUtils-Fix-format-string.patch
 0003-Revert-droid-fix-builds-with-AML-disabled.patch
-0004-utils-drop-AsyncFileCopy-from-Makefile-too.patch
 01_reproducible_build.patch
 02_allow_all_arches.patch
 03-privacy.patch

-- 
kodi packaging