01/01: gnu: ripperX: Update to 2.8.0.

[Andreas Enge]

andreas pushed a commit to branch master
in repository guix.

commit d0dfc06683c868e48ee85213909e4013db94e221
Author: Andreas Enge <address@hidden>
Date:   Fri Jul 24 21:16:29 2015 +0200

    gnu: ripperX: Update to 2.8.0.
    
    * gnu/packages/mp3.scm (ripperx): Update to 2.8.0. Drop one patch and
      add another one.
    * gnu/packages/patches/ripperx-libm.patch: Remove file.
    * gnu/packages/patches/ripperx-missing-file.patch: New file.
    * gnu-system.am (dist_patch_DATA): Register one patch and unregister the
      other.
---
 gnu-system.am                                   |    2 +-
 gnu/packages/mp3.scm                            |   14 +++---
 gnu/packages/patches/ripperx-libm.patch         |   12 ------
 gnu/packages/patches/ripperx-missing-file.patch |   46 +++++++++++++++++++++++
 4 files changed, 54 insertions(+), 20 deletions(-)

diff --git a/gnu-system.am b/gnu-system.am
index 128e64f..fdceedc 100644
--- a/gnu-system.am
+++ b/gnu-system.am
@@ -604,7 +604,7 @@ dist_patch_DATA =                                           
\
   gnu/packages/patches/qt5-runpath.patch                       \
   gnu/packages/patches/ratpoison-shell.patch                   \
   gnu/packages/patches/readline-link-ncurses.patch             \
-  gnu/packages/patches/ripperx-libm.patch                      \
+  gnu/packages/patches/ripperx-missing-file.patch              \
   gnu/packages/patches/sed-hurd-path-max.patch                 \
   gnu/packages/patches/scheme48-tests.patch                    \
   gnu/packages/patches/scotch-test-threading.patch             \
diff --git a/gnu/packages/mp3.scm b/gnu/packages/mp3.scm
index 77eae65..ddd90fb 100644
--- a/gnu/packages/mp3.scm
+++ b/gnu/packages/mp3.scm
@@ -355,18 +355,17 @@ use with CD-recording software).")
 (define-public ripperx
   (package
    (name "ripperx")
-   (version "2.7.3")
+   (version "2.8.0")
    (source (origin
             (method url-fetch)
             (uri (string-append "mirror://sourceforge/ripperx/ripperx/"
-                                version "/ripperX-"
-                                version ".tar.gz"))
+                                version "/ripperx-"
+                                version ".tar.bz2"))
             (sha256
              (base32
-              "130rsb2ly0l6hz728m9qr605ir4073xfl2acvf83id63kxfzjn3x"))
+              "1ss3c1a5hx6c99q1cryxg0jhbnbdj6ga9xyz0dzlz9qhzg5qswfs"))
             (patches
-             ;; see http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=713684
-             (list (search-patch "ripperx-libm.patch")))))
+             (list (search-patch "ripperx-missing-file.patch")))))
    (build-system gnu-build-system)
    (propagated-inputs
     `(("gs-fonts" ,gs-fonts)
@@ -377,7 +376,8 @@ use with CD-recording software).")
    (inputs
     `(("glib" ,glib)
       ("gtk+" ,gtk+-2)
-      ("id3lib" ,id3lib)))
+      ("id3lib" ,id3lib)
+      ("taglib" ,taglib)))
    (native-inputs
     `(("pkg-config" ,pkg-config)))
    (synopsis "GTK program to rip and encode CD audio tracks")
diff --git a/gnu/packages/patches/ripperx-libm.patch 
b/gnu/packages/patches/ripperx-libm.patch
deleted file mode 100644
index 4827707..0000000
--- a/gnu/packages/patches/ripperx-libm.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -r -u ripperX-2.7.3.old/src/Makefile.in ripperX-2.7.3.new/src/Makefile.in
---- ripperX-2.7.3.old/src/Makefile.in  2008-01-25 10:53:50.000000000 +0100
-+++ ripperX-2.7.3.new/src/Makefile.in  2013-08-07 16:14:21.000000000 +0200
-@@ -43,7 +43,7 @@
- 
- ripperX_LDADD = \
-       $(INTLLIBS) \
--      $(GTK_LIBS)
-+      $(GTK_LIBS) -lm
- 
- AM_CPPFLAGS = \
-       -DG_LOG_DOMAIN=\"ripperX\" \
diff --git a/gnu/packages/patches/ripperx-missing-file.patch 
b/gnu/packages/patches/ripperx-missing-file.patch
new file mode 100644
index 0000000..6eb197f
--- /dev/null
+++ b/gnu/packages/patches/ripperx-missing-file.patch
@@ -0,0 +1,46 @@
+This patch adds a header file that is present in the ripperx git and needed
+for inclusion, but missing in the distribution tarball.
+
+diff -u -r -N ripperx-2.8.0.orig/src/gtk_cpp_workaround.h 
ripperx-2.8.0/src/gtk_cpp_workaround.h
+--- ripperx-2.8.0.orig/src/gtk_cpp_workaround.h        1970-01-01 
01:00:00.000000000 +0100
++++ ripperx-2.8.0/src/gtk_cpp_workaround.h     2015-07-24 21:09:16.548476337 
+0200
+@@ -0,0 +1,39 @@
++#ifndef gtk_cpp_workaround_h
++#define gtk_cpp_workaround_h
++#ifdef __cplusplus
++//proto is wrong, override here for C++
++namespace 
++{
++  
++inline void gtk_table_attach (GtkTable *table,
++                     GtkWidget *child,
++                     guint left_attach,
++                     guint right_attach,
++                     guint top_attach,
++                     guint bottom_attach,
++                     //GtkAttachOptions xoptions,
++                     //GtkAttachOptions yoptions,
++                     guint xoptions, guint yoptions,
++                     guint xpadding,
++                     guint ypadding
++                     ) 
++{
++  gtk_table_attach(table,
++                 child,
++                 left_attach,
++                 right_attach,
++                 top_attach,
++                 bottom_attach,
++                 (GtkAttachOptions)xoptions, 
++                 (GtkAttachOptions)yoptions,
++                 xpadding,
++                 ypadding
++                 );
++  
++    };
++
++
++}
++
++#endif
++#endif