[Python-modules-commits] r25127 - in packages/tagpy/trunk/debian (3 files)

[nijel at users.alioth.debian.org]

    Date: Wednesday, July 10, 2013 @ 08:53:58
  Author: nijel
Revision: 25127

Fixed compilation with taglib 1.8 (Closes: #713707).

Added:
  packages/tagpy/trunk/debian/patches/taglib-1.8.patch
Modified:
  packages/tagpy/trunk/debian/changelog
  packages/tagpy/trunk/debian/patches/series

Modified: packages/tagpy/trunk/debian/changelog
===================================================================
--- packages/tagpy/trunk/debian/changelog	2013-07-10 08:48:14 UTC (rev 25126)
+++ packages/tagpy/trunk/debian/changelog	2013-07-10 08:53:58 UTC (rev 25127)
@@ -8,6 +8,7 @@
   * Updated patches.
   * Bump standards to 3.9.4.
   * Use debhelper 9.
+  * Fixed compilation with taglib 1.8 (Closes: #713707).
 
  -- Michal ÄŒihaÅ™ <nijel at debian.org>  Thu, 06 Jun 2013 12:14:55 +0200
 

Modified: packages/tagpy/trunk/debian/patches/series
===================================================================
--- packages/tagpy/trunk/debian/patches/series	2013-07-10 08:48:14 UTC (rev 25126)
+++ packages/tagpy/trunk/debian/patches/series	2013-07-10 08:53:58 UTC (rev 25127)
@@ -1 +1,2 @@
+taglib-1.8.patch
 optional-siteconf.patch

Added: packages/tagpy/trunk/debian/patches/taglib-1.8.patch
===================================================================
--- packages/tagpy/trunk/debian/patches/taglib-1.8.patch	                        (rev 0)
+++ packages/tagpy/trunk/debian/patches/taglib-1.8.patch	2013-07-10 08:53:58 UTC (rev 25127)
@@ -0,0 +1,17 @@
+From: Michal ÄŒihaÅ™ <nijel at debian.org>
+Subject: Hardcode taglib version
+Bug: https://github.com/inducer/tagpy/issues/1
+--- a/src/wrapper/common.hpp
++++ b/src/wrapper/common.hpp
+@@ -50,10 +50,7 @@
+ 
+ 
+ 
+-#define TAGPY_TAGLIB_HEX_VERSION \
+-  (TAGLIB_MAJOR_VERSION << 16) + \
+-  (TAGLIB_MINOR_VERSION << 8) + \
+-  (TAGLIB_PATCH_VERSION << 0)
++#define TAGPY_TAGLIB_HEX_VERSION  0x10800
+ 
+ #if (TAGPY_TAGLIB_HEX_VERSION < 0x10400)
+ #warning !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!