New release, bug #114109.

(Portage version: 2.0.53)

3 files changed, 130 insertions, 0 deletions

diff --git a/media-sound/bmpx/files/bmpx-0.12.9-libtoolize-static-libs.patch b/media-sound/bmpx/files/bmpx-0.12.9-libtoolize-static-libs.patch
new file mode 100644
index 000000000000..d1196aa60718
--- /dev/null
+++ b/media-sound/bmpx/files/bmpx-0.12.9-libtoolize-static-libs.patch
@@ -0,0 +1,66 @@
+diff -urN bmpx-0.12.9/configure.ac bmpx-0.12.9.az/configure.ac
+--- bmpx-0.12.9/configure.ac	2005-11-23 00:41:07.000000000 +0200
++++ bmpx-0.12.9.az/configure.ac	2005-12-02 13:13:26.000000000 +0200
+@@ -404,13 +404,13 @@
+ 
+ dnl XCS
+ XCS_CFLAGS='-I$(top_builddir)/xcs'
+-XCS_LIBS='$(top_builddir)/xcs/libxcs.a'
++XCS_LIBS='$(top_builddir)/xcs/libxcs.la'
+ AC_SUBST([XCS_CFLAGS])
+ AC_SUBST([XCS_LIBS])
+ 
+ dnl GOA
+ GOA_CFLAGS='-I$(top_builddir)/goa'
+-GOA_LIBS='$(top_builddir)/goa/libgoa.a'
++GOA_LIBS='$(top_builddir)/goa/libgoa.la'
+ AC_SUBST([GOA_CFLAGS])
+ AC_SUBST([GOA_LIBS])
+ 
+diff -urN bmpx-0.12.9/goa/Makefile.am bmpx-0.12.9.az/goa/Makefile.am
+--- bmpx-0.12.9/goa/Makefile.am	2005-11-23 00:41:20.000000000 +0200
++++ bmpx-0.12.9.az/goa/Makefile.am	2005-12-02 13:12:01.000000000 +0200
+@@ -1,16 +1,15 @@
+-lib_LIBRARIES = libgoa.a
++lib_LTLIBRARIES = libgoa.la
+ 
+ INCLUDES = \
+ 	$(GLIB_CFLAGS)
+ 
+-AM_LDFLAGS = -all-static
+-LIBADD = $(GLIB_LIBS)
++libgoa_la_LIBADD = $(GLIB_LIBS)
+ 
+ BUILT_SOURCES = \
+         libgoa.c \
+         libgoa.h
+ 
+-nodist_libgoa_a_SOURCES = \
++nodist_libgoa_la_SOURCES = \
+ 	libgoa.c \
+ 	libgoa.h
+ 
+diff -urN bmpx-0.12.9/xcs/Makefile.am bmpx-0.12.9.az/xcs/Makefile.am
+--- bmpx-0.12.9/xcs/Makefile.am	2005-11-23 00:41:22.000000000 +0200
++++ bmpx-0.12.9.az/xcs/Makefile.am	2005-12-02 13:12:01.000000000 +0200
+@@ -1,16 +1,15 @@
+-lib_LIBRARIES = libxcs.a
++noinst_LTLIBRARIES = libxcs.la
+ 
+ INCLUDES = \
+ 	$(GLIB_CFLAGS) $(XML_CFLAGS) $(GTK_CFLAGS) $(XCS_DEFINES)
+ 
+-AM_LDFLAGS = -all-static
+-LIBADD = $(GLIB_LIBS) $(XML_LIBS)
++libxcs_la_LIBADD = $(GLIB_LIBS) $(XML_LIBS)
+ 
+ if HAVE_GUI
+-LIBADD += $(GTK_LIBS)
++libxcs_la_LIBADD += $(GTK_LIBS)
+ endif
+ 
+-libxcs_a_SOURCES = \
++libxcs_la_SOURCES = \
+         xcs.c \
+         xcs.h \
+ 	xml.c \
diff --git a/media-sound/bmpx/files/bmpx-0.12.9-old-config-crash.patch b/media-sound/bmpx/files/bmpx-0.12.9-old-config-crash.patch
new file mode 100644
index 000000000000..c63091a2bddf
--- /dev/null
+++ b/media-sound/bmpx/files/bmpx-0.12.9-old-config-crash.patch
@@ -0,0 +1,62 @@
+Index: xcs.c
+===================================================================
+--- 1/xcs/xcs.c	(revision 76)
++++ 2/xcs/xcs.c	(revision 78)
+@@ -230,12 +230,30 @@
+     filename = g_build_filename (g_get_home_dir(), XCS_RCPATH, "config.xml", NULL);
+ 
+     if (g_file_test (filename, G_FILE_TEST_EXISTS))
+-    {
+-         configuration->private->xmlconfig =
+-         xmlParseFile (filename);
+-    }
+-    else
+-    {
++      {
++	xmlXPathObjectPtr xpathobj;
++	xmlDocPtr xmldoc;
++
++	xmldoc = xmlParseFile (filename);
++	new_configuration = FALSE;
++
++	xpathobj = xml_execute_xpath_expression (xmldoc, "/" XCS_ROOT_NODE_NAME, NULL); 
++	
++	if ((!xpathobj) || (!xpathobj->nodesetval) || (!xpathobj->nodesetval->nodeNr))
++	  {
++	    new_configuration = TRUE;
++	    xmlFreeDoc (xmldoc);
++	  }
++	else
++	  {
++	      configuration->private->xmlconfig = xmldoc;
++	  }
++
++	xmlXPathFreeObject (xpathobj);
++      }
++
++    if (new_configuration)
++      {
+          configuration->private->xmlconfig = xmlNewDoc ((unsigned char*)"1.0");
+ 
+          node = xmlNewNode (NULL, (unsigned char*)XCS_ROOT_NODE_NAME);
+@@ -245,10 +263,8 @@
+ 
+          xmlDocSetRootElement (configuration->private->
+                                xmlconfig, node);
++      }
+ 
+-	 new_configuration = TRUE;
+-    }
+-
+     g_free (filename);
+ 
+     g_message("running: %s", G_OBJECT_TYPE_NAME(configuration));
+@@ -256,7 +272,7 @@
+ 
+ static xmlXPathObjectPtr
+ xcs_get_from_xpath (Xcs *configuration,
+-                                  const gchar * xpath_expr)
++		    const gchar * xpath_expr)
+ {
+     xmlXPathObjectPtr xpathObj = NULL;
+ 
diff --git a/media-sound/bmpx/files/digest-bmpx-0.12.9 b/media-sound/bmpx/files/digest-bmpx-0.12.9
new file mode 100644
index 000000000000..52d9678e7377
--- /dev/null
+++ b/media-sound/bmpx/files/digest-bmpx-0.12.9
@@ -0,0 +1,2 @@
+MD5 4449eb429dc7bfb9c2ec3feb9e8c7e56 bmpx-0.12.9.tar.bz2 1619487
+MD5 41eababfa8bad11e9e34e467cdfb86be gentoo_ice-xmms-0.2.tar.bz2 51839