[arch-commits] Commit in bmpx/trunk (4 files)

Ionut Biru ibiru at archlinux.org
Sat Nov 7 10:25:42 EST 2009


    Date: Saturday, November 7, 2009 @ 10:25:42
  Author: ibiru
Revision: 58389

upgpkg: bmpx 0.40.14-1
    update to 0.40.14, fixed dependency and adding a patch for compilation issue

Added:
  bmpx/trunk/bmpx-compile.patch
Modified:
  bmpx/trunk/PKGBUILD
  bmpx/trunk/bmpx.install
Deleted:
  bmpx/trunk/bmpx-gcc34.diff

--------------------+
 PKGBUILD           |   23 +++---
 bmpx-compile.patch |   41 +++++++++++
 bmpx-gcc34.diff    |  175 ---------------------------------------------------
 bmpx.install       |    8 +-
 4 files changed, 57 insertions(+), 190 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2009-11-07 14:43:13 UTC (rev 58388)
+++ PKGBUILD	2009-11-07 15:25:42 UTC (rev 58389)
@@ -3,10 +3,10 @@
 # Contributor: alzen <mynick2(at)gmail(dot)com>
 
 pkgname=bmpx
-pkgver=0.40.13
-pkgrel=2
+pkgver=0.40.14
+pkgrel=1
 pkgdesc="A media player and the successor to BMP"
-arch=(i686 x86_64)
+arch=('i686' 'x86_64')
 url="http://bmpx.backtrace.info/site/BMPx_Homepage"
 depends=('boost' 'fam' 'gstreamer0.10-good-plugins' 'gstreamer0.10-base-plugins'
 	 'hal' 'libglademm' 'libofa' 'librsvg' 'libsexymm' 'libsoup>=2.4.0'
@@ -16,24 +16,25 @@
 options=('!libtool' '!makeflags')
 license=('GPL' 'custom')
 install=bmpx.install
-source=( http://files.backtrace.info/releases/${pkgver%.*}/${pkgname}-${pkgver}.tar.bz2 bmpx-libsoup24.patch bmpx-gcc34.diff)
-md5sums=('11da3d4c63e77dc15a53d0c6c25ddadb' 'ef433f8b306b5d9e7d3f71dade83b751'\
-         'ac2032eef21102d078b4b03f99af17a6')
+source=( http://files.backtrace.info/releases/${pkgver%.*}/${pkgname}-${pkgver}.tar.bz2 bmpx-libsoup24.patch bmpx-compile.patch)
+md5sums=('c741e05a82a82b14b6775d44a7c93c15'
+         'ef433f8b306b5d9e7d3f71dade83b751'
+	 'c8a3eb79e54d82bfa7c89d8874ff43dc')
 
 build() {
-  cd ${startdir}/src/${pkgname}-${pkgver}
+  cd ${srcdir}/${pkgname}-${pkgver}
   patch -Np1 < ../bmpx-libsoup24.patch || return 1
-  patch -Np1 < ../bmpx-gcc34.diff || return 1
+  patch -Np1 < ../bmpx-compile.patch || return 1
   ./configure --prefix=/usr --enable-amazon --libexecdir=/usr/lib/bmpx || return 1
   sed -e '/BUILD_BUILDUSER/ s@".*"@"http://www.archlinux.org"@' -i build.h || return 1
   make || return 1
-  make DESTDIR=${startdir}/pkg install || return 1
+  make DESTDIR=${pkgdir} install || return 1
 
   # install license
-  install -D -m644 COPYING ${startdir}/pkg/usr/share/licenses/${pkgname}/LICENSE || return 1
+  install -D -m644 COPYING ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE || return 1
 
   #Fix invalid symlink pointing to builddir
-  cd ${startdir}/pkg/usr/bin
+  cd ${pkgdir}/usr/bin
   rm -f bmp2
   ln -sf beep-media-player-2 bmp2
 }

Added: bmpx-compile.patch
===================================================================
--- bmpx-compile.patch	                        (rev 0)
+++ bmpx-compile.patch	2009-11-07 15:25:42 UTC (rev 58389)
@@ -0,0 +1,41 @@
+--- bmpx-0.40.14.orig/src/uri.cc	2008-04-06 01:49:24.000000000 +0200
++++ bmpx-0.40.14/src/uri.cc	2009-02-23 19:23:56.000000000 +0100
+@@ -35,6 +35,7 @@
+ //  BMPx is covered by.
+ 
+ #include <glib.h>
++#include <stdio.h>
+ #include <string>
+ #include <boost/algorithm/string.hpp>
+ #include <glibmm.h>
+--- bmpx-0.40.14.orig/widgets/popup.cc	2009-03-10 16:01:16.000000000 +0000
++++ bmpx-0.40.14/widgets/popup.cc	2009-03-10 16:01:30.000000000 +0000
+@@ -308,7 +308,7 @@
+ 
+ 		if (m_location == ARROW_TOP)
+ 		{
+-			Cairo::Matrix matrix = { 1, 0, 0, -1, 0, h };
++			Cairo::Matrix matrix(1, 0, 0, -1, 0, h);
+ 			cr->set_matrix (matrix);
+ 		}
+ 
+--- bmpx-0.40.14.orig/src/ui-part-library.cc	2009-03-10 16:31:30.000000000 +0000
++++ bmpx-0.40.14/src/ui-part-library.cc	2009-03-10 16:32:26.000000000 +0000
+@@ -509,8 +509,8 @@
+       if( node != NODE_BRANCH )
+       {
+         // Clone this node as one child row
+-        UID uid (Bmp::AlbumArtist ((*i_toplevel)[mStoreArtistCR.artist]).bmpx_album_artist_id);
+         Bmp::AlbumArtist aa ((*i_toplevel)[mStoreArtistCR.artist]);
++        UID uid (aa.bmpx_album_artist_id);
+ 
+         UidIterMapIter uid_i = mUidIterMap.find (uid);
+         if( uid_i != mUidIterMap.end() )
+--- bmpx-0.40.14.orig/docs/images/Makefile.am	2009-07-14 08:40:53.000000000 +0100
++++ bmpx-0.40.14/docs/images/Makefile.am	2009-07-14 09:57:46.000000000 +0100
+@@ -1,4 +1,4 @@
+-image_DATA=main-window.png bmp.png active-source.png playing-source.png important.png tip.png favicon.ico bmp-logo-small.png gradient.png rect1869.png favicon.ico
++image_DATA=main-window.png bmp.png active-source.png playing-source.png important.png tip.png favicon.ico bmp-logo-small.png gradient.png rect1869.png
+ imagedir=$(prefix)/share/doc/@PACKAGE@/images
+ 
+ EXTRA_DIST=$(image_DATA)

Deleted: bmpx-gcc34.diff
===================================================================
--- bmpx-gcc34.diff	2009-11-07 14:43:13 UTC (rev 58388)
+++ bmpx-gcc34.diff	2009-11-07 15:25:42 UTC (rev 58389)
@@ -1,175 +0,0 @@
-diff -Naur bmpx-0.40.13-orig/json/json_reader.cpp bmpx-0.40.13/json/json_reader.cpp
---- bmpx-0.40.13-orig/json/json_reader.cpp	2007-10-18 13:17:09.000000000 -0400
-+++ bmpx-0.40.13/json/json_reader.cpp	2008-03-17 21:34:10.000000000 -0400
-@@ -5,6 +5,7 @@
- #include <assert.h>
- #include <iostream>
- #include <stdexcept>
-+#include <cstring>
- 
- #if _MSC_VER >= 1400 // VC++ 8.0
- #pragma warning( disable : 4996 )   // disable warning about strdup being deprecated.
-diff -Naur bmpx-0.40.13-orig/json/json_value.cpp bmpx-0.40.13/json/json_value.cpp
---- bmpx-0.40.13-orig/json/json_value.cpp	2007-10-18 13:17:09.000000000 -0400
-+++ bmpx-0.40.13/json/json_value.cpp	2008-03-17 21:35:23.000000000 -0400
-@@ -3,6 +3,7 @@
- #include <json/writer.h>
- #include <utility>
- #include <stdexcept>
-+#include <cstring>
- #include "assert.h"
- #ifdef JSON_USE_CPPTL
- # include <cpptl/conststring.h>
-diff -Naur bmpx-0.40.13-orig/json/json_writer.cpp bmpx-0.40.13/json/json_writer.cpp
---- bmpx-0.40.13-orig/json/json_writer.cpp	2007-10-18 13:17:09.000000000 -0400
-+++ bmpx-0.40.13/json/json_writer.cpp	2008-03-17 21:35:44.000000000 -0400
-@@ -3,6 +3,7 @@
- #include <assert.h>
- #include <stdio.h>
- #include <iostream>
-+#include <cstring>
- 
- #if _MSC_VER >= 1400 // VC++ 8.0
- #pragma warning( disable : 4996 )   // disable warning about strdup being deprecated.
-diff -Naur bmpx-0.40.13-orig/libhal++/util.cc bmpx-0.40.13/libhal++/util.cc
---- bmpx-0.40.13-orig/libhal++/util.cc	2007-10-18 13:17:21.000000000 -0400
-+++ bmpx-0.40.13/libhal++/util.cc	2008-03-17 21:37:01.000000000 -0400
-@@ -1,6 +1,6 @@
- #include <string>
- #include <cstring>
--
-+#include <cstdlib>
- #include "types.hh"
- 
- namespace Hal
-diff -Naur bmpx-0.40.13-orig/plugins/vfs/container/libcontainer_folder.cc bmpx-0.40.13/plugins/vfs/container/libcontainer_folder.cc
---- bmpx-0.40.13-orig/plugins/vfs/container/libcontainer_folder.cc	2007-10-18 13:17:14.000000000 -0400
-+++ bmpx-0.40.13/plugins/vfs/container/libcontainer_folder.cc	2008-03-17 21:38:50.000000000 -0400
-@@ -23,6 +23,7 @@
- //  BMPx is covered by.
- 
- #include <glibmm.h>
-+#include <cstring>
- 
- // BMP Audio
- #include "src/audio/audio.hh"
-diff -Naur bmpx-0.40.13-orig/plugins/vfs/container/libcontainer_m3u.cc bmpx-0.40.13/plugins/vfs/container/libcontainer_m3u.cc
---- bmpx-0.40.13-orig/plugins/vfs/container/libcontainer_m3u.cc	2007-10-18 13:17:14.000000000 -0400
-+++ bmpx-0.40.13/plugins/vfs/container/libcontainer_m3u.cc	2008-03-17 21:39:21.000000000 -0400
-@@ -23,6 +23,7 @@
- 
- #include <glibmm.h>
- #include <glibmm/i18n.h>
-+#include <cstring>
- 
- #include "src/database.hh"
- #include "src/uri.hh"
-diff -Naur bmpx-0.40.13-orig/plugins/vfs/container/libcontainer_xspf.cc bmpx-0.40.13/plugins/vfs/container/libcontainer_xspf.cc
---- bmpx-0.40.13-orig/plugins/vfs/container/libcontainer_xspf.cc	2007-10-18 13:17:14.000000000 -0400
-+++ bmpx-0.40.13/plugins/vfs/container/libcontainer_xspf.cc	2008-03-17 21:41:39.000000000 -0400
-@@ -27,6 +27,7 @@
- 
- #include <glibmm.h>
- #include <glibmm/i18n.h>
-+#include <cstring>
- 
- #include <boost/optional.hpp>
- #include <boost/format.hpp>
-diff -Naur bmpx-0.40.13-orig/src/hal.hh bmpx-0.40.13/src/hal.hh
---- bmpx-0.40.13-orig/src/hal.hh	2007-10-18 13:17:08.000000000 -0400
-+++ bmpx-0.40.13/src/hal.hh	2008-03-18 00:11:05.000000000 -0400
-@@ -32,6 +32,7 @@
- #include <string>
- #include <map>
- #include <vector>
-+#include <ctime>
- 
- #include <glib/gtypes.h>
- #include <glibmm/ustring.h>
-@@ -169,7 +170,7 @@
- 
-         void  device_condition            (std::string const& udi,
-                                            std::string const& cond_name,
--                                           std::string const& cond_name );
-+                                           std::string const& cond_details );
-         void  device_added                (std::string const& udi );
-         void  device_removed              (std::string const& udi );
-         void  device_property             (std::string const& udi,
-diff -Naur bmpx-0.40.13-orig/src/minisoup.cc bmpx-0.40.13/src/minisoup.cc
---- bmpx-0.40.13-orig/src/minisoup.cc	2007-10-18 13:17:08.000000000 -0400
-+++ bmpx-0.40.13/src/minisoup.cc	2008-03-18 01:18:11.000000000 -0400
-@@ -28,6 +28,7 @@
- 
- #include <glib/gstdio.h>
- #include <glibmm/i18n.h>
-+#include <cstring>
- #include <boost/format.hpp>
- #include "debug.hh"
- #include "minisoup.hh"
-diff -Naur bmpx-0.40.13-orig/src/parser/libxml2-sax-base.cc bmpx-0.40.13/src/parser/libxml2-sax-base.cc
---- bmpx-0.40.13-orig/src/parser/libxml2-sax-base.cc	2007-10-18 13:17:06.000000000 -0400
-+++ bmpx-0.40.13/src/parser/libxml2-sax-base.cc	2008-03-17 23:36:34.000000000 -0400
-@@ -28,6 +28,7 @@
- 
- #include <libxml/parser.h>
- #include <glibmm.h>
-+#include <cstring>
- 
- using namespace Glib;
- using namespace std;
-diff -Naur bmpx-0.40.13-orig/src/sanity.cc bmpx-0.40.13/src/sanity.cc
---- bmpx-0.40.13-orig/src/sanity.cc	2007-10-18 13:17:08.000000000 -0400
-+++ bmpx-0.40.13/src/sanity.cc	2008-03-17 23:44:47.000000000 -0400
-@@ -69,7 +69,7 @@
- }
- 
- C_FUNCTION
--gchar *
-+const gchar *
- sanity_check_gtk (void)
- {
-   return gtk_check_version (GTK_REQUIRED_MAJOR_VER,
-diff -Naur bmpx-0.40.13-orig/src/streams-shoutcast.cc bmpx-0.40.13/src/streams-shoutcast.cc
---- bmpx-0.40.13-orig/src/streams-shoutcast.cc	2007-10-18 13:17:08.000000000 -0400
-+++ bmpx-0.40.13/src/streams-shoutcast.cc	2008-03-18 00:03:38.000000000 -0400
-@@ -27,6 +27,7 @@
- 
- #include <iostream>
- #include <sstream>
-+#include <cstring>
- 
- #include <glibmm.h>
- #include <glibmm/markup.h>
-diff -Naur bmpx-0.40.13-orig/src/vfs.hh bmpx-0.40.13/src/vfs.hh
---- bmpx-0.40.13-orig/src/vfs.hh	2007-10-18 13:17:08.000000000 -0400
-+++ bmpx-0.40.13/src/vfs.hh	2008-03-17 23:34:57.000000000 -0400
-@@ -25,6 +25,7 @@
- #define BMP_VFS_HH
- 
- #include <iostream>
-+#include <cstring>
- #include <sstream>
- #include <glibmm.h>
- #include <boost/shared_ptr.hpp>
-diff -Naur bmpx-0.40.13-orig/src/video-widget.cc bmpx-0.40.13/src/video-widget.cc
---- bmpx-0.40.13-orig/src/video-widget.cc	2007-10-18 13:17:08.000000000 -0400
-+++ bmpx-0.40.13/src/video-widget.cc	2008-03-18 00:04:38.000000000 -0400
-@@ -23,6 +23,7 @@
- //  BMPx is covered by.
- 
- #include <gtkmm.h>
-+#include <cstring>
- #include "video-widget.hh"
- #include "audio/play.hh"
- #include <gst/video/video.h>
-diff -Naur bmpx-0.40.13-orig/src/xds.cc bmpx-0.40.13/src/xds.cc
---- bmpx-0.40.13-orig/src/xds.cc	2007-10-18 13:17:08.000000000 -0400
-+++ bmpx-0.40.13/src/xds.cc	2008-03-17 23:59:04.000000000 -0400
-@@ -23,6 +23,7 @@
- //  BMPx is covered by.
- 
- #include <gtkmm.h>
-+#include <cstring>
- #include "xds.hh"
- #define MAX_URI_LEN 4096
- 

Modified: bmpx.install
===================================================================
--- bmpx.install	2009-11-07 14:43:13 UTC (rev 58388)
+++ bmpx.install	2009-11-07 15:25:42 UTC (rev 58389)
@@ -9,13 +9,13 @@
 - Install gstreamer0.10-mad for MP3 support.
 
 EOF
+ gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
 }
 
 post_upgrade() {
   post_install $1
 }
 
-op=$1
-shift
-
-$op $*
+post_remove(){
+ gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
+}



More information about the arch-commits mailing list