[arch-commits] Commit in miro/trunk (8 files)

Jan de Groot jgc at archlinux.org
Fri May 8 17:45:12 EDT 2009


    Date: Friday, May 8, 2009 @ 17:45:12
  Author: jgc
Revision: 38532

upgpkg: miro 2.0.4-3
    Clean up patches, fix desktop-file-utils handling

Modified:
  miro/trunk/PKGBUILD
  miro/trunk/miro.install
Deleted:
  miro/trunk/Miro-xulrunner.patch
  miro/trunk/boost_1.36.0_fix.patch
  miro/trunk/miro-xine.patch
  miro/trunk/miro.exec.patch
  miro/trunk/miro_python26.patch
  miro/trunk/missing-headers.patch

------------------------+
 Miro-xulrunner.patch   |   64 -----------------------------------------------
 PKGBUILD               |    5 +--
 boost_1.36.0_fix.patch |   32 -----------------------
 miro-xine.patch        |   12 --------
 miro.exec.patch        |    9 ------
 miro.install           |    2 -
 miro_python26.patch    |   16 -----------
 missing-headers.patch  |   33 ------------------------
 8 files changed, 2 insertions(+), 171 deletions(-)

Deleted: Miro-xulrunner.patch
===================================================================
--- Miro-xulrunner.patch	2009-05-08 21:38:36 UTC (rev 38531)
+++ Miro-xulrunner.patch	2009-05-08 21:45:12 UTC (rev 38532)
@@ -1,64 +0,0 @@
-diff -up Miro-1.2.3/platform/gtk-x11/platform/mozsetup.py.old Miro-1.2.3/platform/gtk-x11/platform/mozsetup.py
---- Miro-1.2.3/platform/gtk-x11/platform/mozsetup.py.old	2008-04-22 17:17:01.000000000 +0200
-+++ Miro-1.2.3/platform/gtk-x11/platform/mozsetup.py	2008-04-28 12:51:46.000000000 +0200
-@@ -106,8 +106,8 @@ def setupMozillaEnvironment():
-         set_profile_path = gtkmozembed.gtk_moz_embed_set_profile_path
-         
-     set_profile_path(config.get(prefs.SUPPORT_DIRECTORY), 'mozilla')
--    if hasattr(gtkmozembed, 'set_comp_path'):
--        set_comp_path = gtkmozembed.set_comp_path
-+    if hasattr(gtkmozembed, 'set_path'):
-+        set_comp_path = gtkmozembed.set_path
-     elif hasattr(gtkmozembed, 'set_path'):
-         set_comp_path = gtkmozembed.set_path
-     else:
-diff -up Miro-1.2.3/platform/gtk-x11/setup.py.old Miro-1.2.3/platform/gtk-x11/setup.py
---- Miro-1.2.3/platform/gtk-x11/setup.py.old	2008-04-22 17:17:01.000000000 +0200
-+++ Miro-1.2.3/platform/gtk-x11/setup.py	2008-04-28 13:14:27.000000000 +0200
-@@ -209,6 +209,7 @@ def parsePkgConfig(command, components, 
-         options_dict = {
-             'include_dirs' : [],
-             'library_dirs' : [],
-+            'runtime_dirs' : [],
-             'libraries' : [],
-             'extra_compile_args' : []
-         }
-@@ -224,6 +225,11 @@ def parsePkgConfig(command, components, 
-             options_dict['libraries'].append(rest)
-         else:
-             options_dict['extra_compile_args'].append(comp)
-+            
-+    commandLine = "%s --variable=libdir %s" % (command, components)
-+    output = getCommandOutput(commandLine).strip()
-+    options_dict['runtime_dirs'].append(output)
-+    
-     return options_dict
- 
- #### The fasttypes extension ####
-@@ -279,6 +285,8 @@ mozilla_browser_options = parsePkgConfig
-         "gtk+-2.0 glib-2.0 pygtk-2.0 --define-variable=includetype=unstable %s %s" % (gtkmozembed, xpcom))
- mozilla_lib_path = parsePkgConfig('pkg-config', 
-         '%s' % gtkmozembed)['library_dirs']
-+runtime_lib_path = parsePkgConfig('pkg-config', 
-+        '%s' % gtkmozembed)['runtime_dirs']
- # Find the base mozilla directory, and add the subdirs we need.
- def allInDir(directory, subdirs):
-     for subdir in subdirs:
-@@ -334,7 +342,7 @@ mozilla_browser_ext = Extension("miro.pl
-           os.path.join(platform_html_frontend_dir,'DragAndDrop.cc'),
-           os.path.join(platform_html_frontend_dir,'XPCOMUtil.cc'),
-         ],
--        runtime_library_dirs=mozilla_lib_path,
-+        runtime_library_dirs=runtime_lib_path,
-         **mozilla_browser_options)
- #### Xlib Extension ####
- xlib_ext = \
-@@ -434,7 +442,7 @@ class install_data (distutils.command.in
-                              BUILD_MACHINE="%s@%s" % (getlogin(),
-                                                       os.uname()[1]),
-                              BUILD_TIME=str(time.time()),
--                             MOZILLA_LIB_PATH=mozilla_lib_path[0])
-+                             MOZILLA_LIB_PATH=runtime_lib_path[0])
-         self.outfiles.append(dest)
- 
-         locale_dir = os.path.join (resource_dir, "locale")

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2009-05-08 21:38:36 UTC (rev 38531)
+++ PKGBUILD	2009-05-08 21:45:12 UTC (rev 38532)
@@ -3,13 +3,12 @@
 
 pkgname=miro
 pkgver=2.0.4
-pkgrel=2
+pkgrel=3
 pkgdesc="The free and open source internet TV platform"
 arch=('i686' 'x86_64')
 url="http://www.getmiro.com"
 license=('GPL2')
-depends=('xine-lib>=1.1.16.1' 'boost>=1.37.0' 'gnome-python-extras>=2.25.3'
-	 'dbus-python>=0.82.4' 'pyrex' 'xulrunner>=1.9.0.1' 'gtk2' 'nspr')
+depends=('xine-lib>=1.1.16.3' 'boost>=1.37.0' 'gnome-python-extras>=2.25.3' 'dbus-python>=0.83.0' 'pyrex' 'xulrunner>=1.9.0.10' 'desktop-file-utils')
 makedepends=('pkgconfig' 'pm-utils' 'qt3')
 optdepends=('gstreamer0.10-python: gstreamer backend (potentially unstable)' 'gstreamer0.10: gstreamer backend (potentially unstable')
 install=miro.install

Deleted: boost_1.36.0_fix.patch
===================================================================
--- boost_1.36.0_fix.patch	2009-05-08 21:38:36 UTC (rev 38531)
+++ boost_1.36.0_fix.patch	2009-05-08 21:45:12 UTC (rev 38532)
@@ -1,32 +0,0 @@
---- Miro-1.2.7/portable/libtorrent/src/torrent_info.cpp.old	2008-09-21 13:47:00.122974031 +0200
-+++ Miro-1.2.7/portable/libtorrent/src/torrent_info.cpp	2008-09-21 13:48:54.812965713 +0200
-@@ -352,7 +352,7 @@
- 		fs::path tmp = m_name;
- 		if (tmp.is_complete()) throw std::runtime_error("torrent contains "
- 			"a file with an absolute path: '" + m_name + "'");
--		if (tmp.has_branch_path()) throw std::runtime_error(
-+		if (!tmp.branch_path().empty()) throw std::runtime_error(
- 			"torrent contains name with directories: '" + m_name + "'");
- 	
- 		// extract file list
-@@ -556,7 +556,7 @@
- 	{
- //		TORRENT_ASSERT(file.begin() != file.end());
- 
--		if (!file.has_branch_path())
-+		if (file.branch_path().empty())
- 		{
- 			// you have already added at least one file with a
- 			// path to the file (branch_path), which means that
-
---- Miro-1.2.7/portable/libtorrent/include/libtorrent/disk_io_thread.hpp.old	2008-09-21 13:57:05.433330334 +0200
-+++ Miro-1.2.7/portable/libtorrent/include/libtorrent/disk_io_thread.hpp	2008-09-21 13:57:29.060304305 +0200
-@@ -41,6 +41,7 @@
- #include <boost/bind.hpp>
- #include <boost/pool/pool.hpp>
- #include <boost/noncopyable.hpp>
-+#include <boost/thread/condition.hpp>
- #include "libtorrent/config.hpp"
- 
- namespace libtorrent
-

Deleted: miro-xine.patch
===================================================================
--- miro-xine.patch	2009-05-08 21:38:36 UTC (rev 38531)
+++ miro-xine.patch	2009-05-08 21:45:12 UTC (rev 38532)
@@ -1,12 +0,0 @@
---- usr/bin/miro.old	2009-02-22 21:49:26.332356738 +0100
-+++ usr/bin/miro	2009-02-22 21:50:39.169010435 +0100
-@@ -21,7 +21,7 @@
-         exit;
-     fi
- 
--    LD_LIBRARY_PATH=/usr/lib/xulrunner-1.9 $GDB -ex 'set breakpoint pending on' -ex 'break gdk_x_error' -ex 'run' --args $PYTHON ./miro.real --sync "$@"
-+    LD_LIBRARY_PATH=/usr/lib/xulrunner-1.9 $GDB -ex 'set breakpoint pending on' -ex 'break gdk_x_error' -ex 'run' --args $PYTHON ./miro.real --set xine-driver=opengl --sync "$@"
- else
--    LD_LIBRARY_PATH=/usr/lib/xulrunner-1.9 miro.real "$@"
-+    LD_LIBRARY_PATH=/usr/lib/xulrunner-1.9 miro.real --set xine-driver=opengl "$@"
- fi

Deleted: miro.exec.patch
===================================================================
--- miro.exec.patch	2009-05-08 21:38:36 UTC (rev 38531)
+++ miro.exec.patch	2009-05-08 21:45:12 UTC (rev 38532)
@@ -1,9 +0,0 @@
---- usr/bin/miro.old	2009-04-14 19:40:09.578785938 +0200
-+++ usr/bin/miro	2009-04-14 19:40:34.445435006 +0200
-@@ -23,5 +23,5 @@
- 
-     LD_LIBRARY_PATH=/usr/lib/xulrunner-1.9 $GDB -ex 'set breakpoint pending on' -ex 'run' --args $PYTHON ./miro.real --sync "$@"
- else
--    LD_LIBRARY_PATH=/usr/lib/xulrunner-1.9 miro.real "$@"
-+    MOZILLA_FIVE_HOME="/usr/lib/xulrunner-1.9/" LD_LIBRARY_PATH=/usr/lib/xulrunner-1.9 miro.real "$@"
- fi

Modified: miro.install
===================================================================
--- miro.install	2009-05-08 21:38:36 UTC (rev 38531)
+++ miro.install	2009-05-08 21:45:12 UTC (rev 38532)
@@ -9,5 +9,3 @@
 post_remove() {
   update-desktop-database -q
 }
-
-

Deleted: miro_python26.patch
===================================================================
--- miro_python26.patch	2009-05-08 21:38:36 UTC (rev 38531)
+++ miro_python26.patch	2009-05-08 21:45:12 UTC (rev 38532)
@@ -1,16 +0,0 @@
---- miro.real	2008-10-24 19:49:17.000000000 +0200
-+++ miro.real.new	2008-11-12 08:51:17.649458321 +0100
-@@ -6,8 +6,12 @@
- if xlibhelper.XInitThreads() == 0:
-     print "WARNING: XInitThreads() failed!"
- 
--import os.path
-+import miro.feedparser
-+import miro.storedatabase
- import sys
-+sys.modules['feedparser'] = miro.feedparser
-+sys.modules['storedatabase'] = miro.storedatabase
-+import os.path
- import optparse
- 
- import pygtk

Deleted: missing-headers.patch
===================================================================
--- missing-headers.patch	2009-05-08 21:38:36 UTC (rev 38531)
+++ missing-headers.patch	2009-05-08 21:45:12 UTC (rev 38532)
@@ -1,33 +0,0 @@
-diff -ur a/portable/libtorrent/include/libtorrent/peer_id.hpp b/portable/libtorrent/include/libtorrent/peer_id.hpp
---- a/portable/libtorrent/include/libtorrent/peer_id.hpp	2008-04-22 10:17:04.000000000 -0500
-+++ b/portable/libtorrent/include/libtorrent/peer_id.hpp	2008-05-07 01:51:09.000000000 -0500
-@@ -38,6 +38,7 @@
- #include <cctype>
- #include <algorithm>
- #include <string>
-+#include <cstring>
- 
- #include "libtorrent/config.hpp"
- #include "libtorrent/assert.hpp"
-diff -ur a/portable/libtorrent/src/entry.cpp b/portable/libtorrent/src/entry.cpp
---- a/portable/libtorrent/src/entry.cpp	2008-04-22 10:17:04.000000000 -0500
-+++ b/portable/libtorrent/src/entry.cpp	2008-05-07 02:16:14.000000000 -0500
-@@ -33,6 +33,7 @@
- #include "libtorrent/pch.hpp"
- 
- #include <algorithm>
-+#include <iostream>
- #include <iomanip>
- #include "libtorrent/entry.hpp"
- #include "libtorrent/config.hpp"
-diff -ur a/portable/libtorrent/src/file.cpp b/portable/libtorrent/src/file.cpp
---- a/portable/libtorrent/src/file.cpp	2008-04-22 10:17:04.000000000 -0500
-+++ b/portable/libtorrent/src/file.cpp	2008-05-07 01:53:04.000000000 -0500
-@@ -68,6 +68,7 @@
- #include <boost/filesystem/operations.hpp>
- #include "libtorrent/file.hpp"
- #include <sstream>
-+#include <cstring>
- 
- #ifndef O_BINARY
- #define O_BINARY 0



More information about the arch-commits mailing list