refresh patches

4 files changed, 4 insertions, 247 deletions

diff --git a/debian/changelog b/debian/changelog
index d364000..7ec1b55 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,8 @@ audacious (3.8~beta2-1) UNRELEASED; urgency=medium
 
   * Team upload.
   * New upstream development release.
+  * debian/patches:
+    - Drop use-system-libguess.patch
 
  -- Mateusz Łukasik <mati75@linuxmint.pl>  Wed, 31 Aug 2016 15:54:52 +0200
 
diff --git a/debian/patches/add-keywords.patch b/debian/patches/add-keywords.patch
index a5a9550..17cc87b 100644
--- a/debian/patches/add-keywords.patch
+++ b/debian/patches/add-keywords.patch
@@ -3,8 +3,8 @@ Author: Mateusz Łukasik <mati75@linuxmint.pl>
 
 --- a/audacious.desktop
 +++ b/audacious.desktop
-@@ -10,6 +10,7 @@ Exec=audacious %U
- TryExec=audacious
+@@ -11,6 +11,7 @@ TryExec=audacious
+ StartupNotify=true
  Terminal=false
  MimeType=application/ogg;application/x-cue;application/x-ogg;application/xspf+xml;audio/midi;audio/mp3;audio/mp4;audio/mpeg;audio/mpegurl;audio/ogg;audio/prs.sid;audio/x-flac;audio/x-it;audio/x-mod;audio/x-mp3;audio/x-mpeg;audio/x-mpegurl;audio/x-ms-asx;audio/x-ms-wma;audio/x-musepack;audio/x-s3m;audio/x-scpls;audio/x-stm;audio/x-vorbis+ogg;audio/x-wav;audio/x-xm;inode/directory;x-content/audio-cdda;
 +Keywords=audio;player;audacious;music;gtk;
diff --git a/debian/patches/series b/debian/patches/series
index 1b22314..bb69562 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,2 @@
 add-keywords.patch
 use-system-licenses.patch
-use-system-libguess.patch
diff --git a/debian/patches/use-system-libguess.patch b/debian/patches/use-system-libguess.patch
deleted file mode 100644
index 20f7b83..0000000
--- a/debian/patches/use-system-libguess.patch
+++ /dev/null
@@ -1,244 +0,0 @@
-Description: User system libguess
-Author: Mateusz Łukasik <mati75@linuxmint.pl>
-
---- a/configure.ac
-+++ b/configure.ac
-@@ -70,6 +70,27 @@ if test "x$HAVE_MSWINDOWS" = "xyes" && t
-     LDFLAGS="$LDFLAGS -Wl,-subsystem,windows"
- fi
- 
-+dnl Character set detection
-+dnl =======================
-+
-+AC_ARG_ENABLE(chardet,
-+ AS_HELP_STRING(--enable-chardet, [Disable character set detection (default=auto)]),
-+ USE_CHARDET=$enableval, USE_CHARDET=auto)
-+
-+if test $USE_CHARDET != no ; then
-+    PKG_CHECK_MODULES(LIBGUESS, libguess >= 1.2, have_libguess=yes, have_libguess=no)
-+    if test $have_libguess = yes ; then
-+        USE_CHARDET=yes
-+        AC_DEFINE(USE_CHARDET, 1, [Define if character set detection enabled])
-+    elif test $USE_CHARDET = yes ; then
-+        AC_MSG_ERROR([Character set detection could not be enabled; check config.log])
-+    else
-+        USE_CHARDET=no
-+    fi
-+fi
-+
-+AC_SUBST(USE_CHARDET)
-+
- dnl D-Bus support
- dnl =============
- 
-@@ -140,6 +161,7 @@ echo "Configuration:"
- echo ""
- echo "  Install path:                           $prefix"
- echo ""
-+echo "  Automatic character code detection:     $USE_CHARDET"
- echo "  D-Bus support:                          $USE_DBUS"
- echo "  GTK+ support:                           $USE_GTK"
- echo "  Qt support:                             $USE_QT"
---- a/extra.mk.in
-+++ b/extra.mk.in
-@@ -1,4 +1,5 @@
- HAVE_MSWINDOWS ?= @HAVE_MSWINDOWS@
-+USE_CHARDET ?= @USE_CHARDET@
- USE_DBUS ?= @USE_DBUS@
- USE_GTK ?= @USE_GTK@
- USE_QT ?= @USE_QT@
-@@ -11,6 +12,8 @@ GMODULE_CFLAGS ?= @GMODULE_CFLAGS@
- GMODULE_LIBS ?= @GMODULE_LIBS@
- GTK_CFLAGS ?= @GTK_CFLAGS@
- GTK_LIBS ?= @GTK_LIBS@
-+LIBGUESS_CFLAGS ?= @LIBGUESS_CFLAGS@
-+LIBGUESS_LIBS ?= @LIBGUESS_LIBS@
- QTCORE_CFLAGS ?= @QTCORE_CFLAGS@
- QTCORE_LIBS ?= @QTCORE_LIBS@
- QT_CFLAGS ?= @QT_CFLAGS@
---- a/src/Makefile
-+++ b/src/Makefile
-@@ -1,6 +1,6 @@
- include ../extra.mk
- 
--SUBDIRS := audacious libaudcore libaudtag libguess
-+SUBDIRS := audacious libaudcore libaudtag
- 
- ifeq ($(USE_GTK),yes)
- SUBDIRS += libaudgui
-@@ -17,7 +17,6 @@ endif
- include ../buildsys.mk
- 
- audacious: libaudcore
--libaudcore: libguess
- libaudtag: libaudcore
- 
- ifeq ($(USE_GTK),yes)
---- a/src/libaudcore/Makefile
-+++ b/src/libaudcore/Makefile
-@@ -89,6 +89,7 @@ CPPFLAGS := -I.. -I../.. \
-             ${CPPFLAGS} \
-             ${GLIB_CFLAGS} \
-             ${GMODULE_CFLAGS} \
-+            ${LIBGUESS_CFLAGS} \
-             ${QTCORE_CFLAGS} \
-             -DHARDCODE_BINDIR=\"${bindir}\" \
-             -DHARDCODE_DATADIR=\"${datadir}/audacious\" \
-@@ -99,8 +100,8 @@ CPPFLAGS := -I.. -I../.. \
- 
- CFLAGS += ${LIB_CFLAGS}
- 
--LIBS := ../libguess/libguess.a \
--        ${LIBS} -lm \
-+LIBS += -lm \
-         ${GLIB_LIBS} \
-         ${GMODULE_LIBS} \
-+	${LIBGUESS_LIBS} \
-         ${QTCORE_LIBS}
---- a/src/libaudcore/charset.cc
-+++ b/src/libaudcore/charset.cc
-@@ -28,8 +28,11 @@
- 
- #include <glib.h>
- 
--#include "libguess/libguess.h"
--
-+#ifdef USE_CHARDET
-+extern "C" {
-+#include <libguess/libguess.h>
-+}
-+#endif
- #include "hook.h"
- #include "index.h"
- #include "runtime.h"
-@@ -142,6 +150,7 @@ static StringBuf convert_to_utf8_locked
-     if (len < 0)
-         len = strlen (str);
- 
-+#ifdef USE_CHARDET
-     if (detect_region)
-     {
-         /* prefer libguess-detected charset */
-@@ -161,6 +170,7 @@ static StringBuf convert_to_utf8_locked
-         if (utf8)
-             return utf8;
-     }
-+#endif
- 
-     /* try system locale last (this one will print a warning if it fails) */
-     return str_from_locale (str, len);
---- a/src/libaudgui/Makefile
-+++ b/src/libaudgui/Makefile
-@@ -45,6 +45,7 @@ LD = ${CXX}
- CPPFLAGS := -I.. -I../.. \
-             ${CPPFLAGS} \
-             ${GLIB_CFLAGS} \
-+            ${LIBGUESS_CFLAGS} \
-             ${GTK_CFLAGS}
- 
- CFLAGS += ${LIB_CFLAGS}
---- a/src/libaudgui/prefs-window.cc
-+++ b/src/libaudgui/prefs-window.cc
-@@ -33,12 +33,14 @@
- #include <libaudcore/preferences.h>
- #include <libaudcore/runtime.h>
- 
--#include "libguess/libguess.h"
--
- #include "internal.h"
- #include "libaudgui.h"
- #include "libaudgui-gtk.h"
- 
-+#ifdef USE_CHARDET
-+#include <libguess.h>
-+#endif
-+
- enum CategoryViewCols {
-     CATEGORY_VIEW_COL_ICON,
-     CATEGORY_VIEW_COL_NAME,
-@@ -109,6 +111,7 @@ static const TitleFieldTag title_field_t
-     { N_("Quality")    , "${quality}" }
- };
- 
-+#ifdef USE_CHARDET
- static const ComboItem chardet_detector_presets[] = {
-     ComboItem (N_("None"), ""),
-     ComboItem (N_("Arabic"), GUESS_REGION_AR),
-@@ -123,6 +126,7 @@ static const ComboItem chardet_detector_
-     ComboItem (N_("Taiwanese"), GUESS_REGION_TW),
-     ComboItem (N_("Turkish"), GUESS_REGION_TR)
- };
-+#endif
- 
- static const ComboItem bitdepth_elements[] = {
-     ComboItem ("16", 16),
-@@ -253,9 +257,11 @@ static const PreferencesWidget connectiv
- };
- 
- static const PreferencesWidget chardet_elements[] = {
-+#ifdef USE_CHARDET
-     WidgetCombo (N_("Auto character encoding detector for:"),
-         WidgetString (0, "chardet_detector"),
-         {{chardet_detector_presets}}),
-+#endif
-     WidgetEntry (N_("Fallback character encodings:"),
-         WidgetString (0, "chardet_fallback"))
- };
---- a/src/libaudqt/Makefile
-+++ b/src/libaudqt/Makefile
-@@ -33,7 +33,8 @@ LD = ${CXX}
- 
- CPPFLAGS := -I.. -I../.. \
-             ${CPPFLAGS} \
--            ${QT_CFLAGS}
-+            ${QT_CFLAGS} \
-+            ${LIBGUESS_CFLAGS}
- 
- CFLAGS += ${LIB_CFLAGS}
- 
---- a/src/libaudqt/prefs-window.cc
-+++ b/src/libaudqt/prefs-window.cc
-@@ -48,11 +48,13 @@
- #include <libaudcore/preferences.h>
- #include <libaudcore/runtime.h>
- 
--#include "libguess/libguess.h"
--
- #include "libaudqt.h"
- #include "prefs-pluginlist-model.h"
- 
-+#ifdef USE_CHARDET
-+#include <libguess.h>
-+#endif
-+
- namespace audqt {
- 
- struct Category {
-@@ -113,6 +115,7 @@ static const TitleFieldTag title_field_t
-     { N_("Quality")    , "${quality}" }
- };
- 
-+#ifdef USE_CHARDET
- static const ComboItem chardet_detector_presets[] = {
-     ComboItem (N_("None"), ""),
-     ComboItem (N_("Arabic"), GUESS_REGION_AR),
-@@ -127,6 +130,7 @@ static const ComboItem chardet_detector_
-     ComboItem (N_("Taiwanese"), GUESS_REGION_TW),
-     ComboItem (N_("Turkish"), GUESS_REGION_TR)
- };
-+#endif
- 
- static const ComboItem bitdepth_elements[] = {
-     ComboItem ("16", 16),
-@@ -241,9 +245,11 @@ static const PreferencesWidget connectiv
- };
- 
- static const PreferencesWidget chardet_elements[] = {
-+#ifdef USE_CHARDET
-     WidgetCombo (N_("Auto character encoding detector for:"),
-         WidgetString (0, "chardet_detector"),
-         {{chardet_detector_presets}}),
-+#endif
-     WidgetEntry (N_("Fallback character encodings:"),
-         WidgetString (0, "chardet_fallback"))
- };