[arch-commits] Commit in banshee (4 files)

Jan de Groot jgc at archlinux.org
Thu May 1 15:48:07 EDT 2008


    Date: Thursday, May 1, 2008 @ 15:48:07
  Author: jgc
Revision: 1195

Resolve conflict, remove unused patch

Modified:
  banshee/repos/extra-x86_64/	(properties)
  banshee/repos/extra-x86_64/PKGBUILD
Deleted:
  banshee/repos/extra-x86_64/gtk-sharp-2.12-compile.patch
  banshee/trunk/gtk-sharp-2.12-compile.patch

-------------------------------------------------+
 repos/extra-x86_64/PKGBUILD                     |   12 +--
 repos/extra-x86_64/gtk-sharp-2.12-compile.patch |   78 ----------------------
 trunk/gtk-sharp-2.12-compile.patch              |   78 ----------------------
 3 files changed, 4 insertions(+), 164 deletions(-)


Property changes on: banshee/repos/extra-x86_64
___________________________________________________________________
Name: svnmerge-integrated
   - /banshee/trunk:1
   + /banshee/trunk:1-1194

Modified: repos/extra-x86_64/PKGBUILD
===================================================================
--- repos/extra-x86_64/PKGBUILD	2008-05-01 19:47:10 UTC (rev 1194)
+++ repos/extra-x86_64/PKGBUILD	2008-05-01 19:48:07 UTC (rev 1195)
@@ -2,25 +2,23 @@
 # Maintainer: Jan de Groot <jgc at archlinux.org>
 
 pkgname=banshee
-pkgver=0.98.1
+pkgver=0.98.3
 pkgrel=1
 pkgdesc="Music management and playback for GNOME"
 arch=('i686' 'x86_64')
 url="http://banshee-project.org/"
 license=('MIT')
-depends=('sqlite3' 'ndesk-dbus-glib>=0.4.1' 'mono-addins>=0.3.1' 'taglib-sharp>=2.0.3.0' 'gstreamer0.10-gconf>=0.10.7' 'gstreamer0.10-gnomevfs>=0.10.18' 'gnome-sharp>=2.20.0')
+depends=('sqlite3' 'ndesk-dbus-glib>=0.4.1' 'mono-addins>=0.3.1' 'taglib-sharp>=2.0.3.0' 'gstreamer0.10-good-plugins' 'gstreamer0.10-base-plugins' 'gnome-sharp>=2.20.1')
 makedepends=('perlxml' 'pkgconfig')
 options=('!libtool' '!makeflags' '!emptydirs')
 install=banshee.install
-source=(http://banshee-project.org/files/${pkgname}/${pkgname}-1-${pkgver}.tar.gz
-	gtk-sharp-2.12-compile.patch)
-md5sums=('a57fa0556557f66db5ce6c754f9b1ef0')
+source=(http://banshee-project.org/files/${pkgname}/${pkgname}-1-${pkgver}.tar.gz)
+md5sums=('ae7ac0bb7c83c24458cf71b1b8589d42')
 
 build() {
   export MONO_SHARED_DIR=${startdir}/src/.wabi
   mkdir -p "${MONO_SHARED_DIR}"
   cd ${startdir}/src/${pkgname}-1-${pkgver}
-  patch -Np2 -i ${startdir}/src/gtk-sharp-2.12-compile.patch || return 1
   LD_PRELOAD="" ./configure --prefix=/usr \
         --sysconfdir=/etc --localstatedir=/var \
 	--disable-helix --enable-ipod --enable-njb --disable-docs \
@@ -34,6 +32,4 @@
   install -d -m755 ${startdir}/pkg/usr/share/gconf/schemas
   gconf-merge-schema ${startdir}/pkg/usr/share/gconf/schemas/${pkgname}.schemas ${startdir}/pkg/etc/gconf/schemas/*.schemas || return 1
   rm -f ${startdir}/pkg/etc/gconf/schemas/*.schemas
-
-  #rm -f ${startdir}/pkg/usr/lib/banshee/Banshee.Dap/libnjbglue.a
 }

Deleted: repos/extra-x86_64/gtk-sharp-2.12-compile.patch
===================================================================
--- repos/extra-x86_64/gtk-sharp-2.12-compile.patch	2008-05-01 19:47:10 UTC (rev 1194)
+++ repos/extra-x86_64/gtk-sharp-2.12-compile.patch	2008-05-01 19:48:07 UTC (rev 1195)
@@ -1,78 +0,0 @@
---- trunk/banshee/src/Core/Banshee.Widgets/Banshee.Widgets/VolumeButton.cs	2007/11/05 22:18:55	2682
-+++ trunk/banshee/src/Core/Banshee.Widgets/Banshee.Widgets/VolumeButton.cs	2008/03/21 05:19:23	3504
-@@ -35,6 +35,8 @@
-  *  DEALINGS IN THE SOFTWARE.
-  */
- 
-+#pragma warning disable 0612
-+
- using System;
- using System.Runtime.InteropServices;
- 
-@@ -693,3 +695,5 @@
-         }
-     }
- }
-+
-+#pragma warning restore 0612
---- trunk/banshee/src/Core/Banshee.ThickClient/Banshee.Gui.Dialogs/TrackEditor.cs	2008/03/20 00:32:14	3488
-+++ trunk/banshee/src/Core/Banshee.ThickClient/Banshee.Gui.Dialogs/TrackEditor.cs	2008/03/21 05:12:40	3503
-@@ -26,6 +26,8 @@
- // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- //
- 
-+#pragma warning disable 0612
-+
- using System;
- using Gtk;
- using Glade;
-@@ -634,3 +636,5 @@
-         }
-     }
- }
-+
-+#pragma warning restore 0612
---- trunk/banshee/src/Core/Banshee.ThickClient/Banshee.Gui.Dialogs/PreferencesDialog.cs	2008/01/31 05:38:19	3114
-+++ trunk/banshee/src/Core/Banshee.ThickClient/Banshee.Gui.Dialogs/PreferencesDialog.cs	2008/03/21 05:12:40	3503
-@@ -26,6 +26,8 @@
- // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- //
- 
-+#pragma warning disable 0612
-+
- using System;
- using System.IO;
- 
-@@ -188,3 +190,5 @@
-         }
-     }
- }
-+
-+#pragma warning restore 0612
---- trunk/banshee/src/Core/Banshee.ThickClient/Banshee.Gui.Dialogs/AboutDialog.cs	2008/03/16 19:42:55	3468
-+++ trunk/banshee/src/Core/Banshee.ThickClient/Banshee.Gui.Dialogs/AboutDialog.cs	2008/03/21 05:12:40	3503
-@@ -25,6 +25,8 @@
- // OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
- // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- //
-+
-+#pragma warning disable 0618
-  
- using System;
- using System.Text;
-@@ -76,6 +78,9 @@
-                 Banshee.Web.Browser.Open (link);
-             });
-             
-+            // TODO: We should really use ProgramName in the future rather
-+            // than plain Name, since it's been depreciated. We can't do that
-+            // yet though since it breaks stuff for other people. 
-             Name = "Banshee";
-             Logo = Gdk.Pixbuf.LoadFromResource ("banshee-logo.png");
-             Version = String.Format ("{0} ({1})", 
-@@ -99,3 +104,5 @@
-         }
-     }
- }
-+
-+#pragma warning restore 0618

Deleted: trunk/gtk-sharp-2.12-compile.patch
===================================================================
--- trunk/gtk-sharp-2.12-compile.patch	2008-05-01 19:47:10 UTC (rev 1194)
+++ trunk/gtk-sharp-2.12-compile.patch	2008-05-01 19:48:07 UTC (rev 1195)
@@ -1,78 +0,0 @@
---- trunk/banshee/src/Core/Banshee.Widgets/Banshee.Widgets/VolumeButton.cs	2007/11/05 22:18:55	2682
-+++ trunk/banshee/src/Core/Banshee.Widgets/Banshee.Widgets/VolumeButton.cs	2008/03/21 05:19:23	3504
-@@ -35,6 +35,8 @@
-  *  DEALINGS IN THE SOFTWARE.
-  */
- 
-+#pragma warning disable 0612
-+
- using System;
- using System.Runtime.InteropServices;
- 
-@@ -693,3 +695,5 @@
-         }
-     }
- }
-+
-+#pragma warning restore 0612
---- trunk/banshee/src/Core/Banshee.ThickClient/Banshee.Gui.Dialogs/TrackEditor.cs	2008/03/20 00:32:14	3488
-+++ trunk/banshee/src/Core/Banshee.ThickClient/Banshee.Gui.Dialogs/TrackEditor.cs	2008/03/21 05:12:40	3503
-@@ -26,6 +26,8 @@
- // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- //
- 
-+#pragma warning disable 0612
-+
- using System;
- using Gtk;
- using Glade;
-@@ -634,3 +636,5 @@
-         }
-     }
- }
-+
-+#pragma warning restore 0612
---- trunk/banshee/src/Core/Banshee.ThickClient/Banshee.Gui.Dialogs/PreferencesDialog.cs	2008/01/31 05:38:19	3114
-+++ trunk/banshee/src/Core/Banshee.ThickClient/Banshee.Gui.Dialogs/PreferencesDialog.cs	2008/03/21 05:12:40	3503
-@@ -26,6 +26,8 @@
- // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- //
- 
-+#pragma warning disable 0612
-+
- using System;
- using System.IO;
- 
-@@ -188,3 +190,5 @@
-         }
-     }
- }
-+
-+#pragma warning restore 0612
---- trunk/banshee/src/Core/Banshee.ThickClient/Banshee.Gui.Dialogs/AboutDialog.cs	2008/03/16 19:42:55	3468
-+++ trunk/banshee/src/Core/Banshee.ThickClient/Banshee.Gui.Dialogs/AboutDialog.cs	2008/03/21 05:12:40	3503
-@@ -25,6 +25,8 @@
- // OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
- // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- //
-+
-+#pragma warning disable 0618
-  
- using System;
- using System.Text;
-@@ -76,6 +78,9 @@
-                 Banshee.Web.Browser.Open (link);
-             });
-             
-+            // TODO: We should really use ProgramName in the future rather
-+            // than plain Name, since it's been depreciated. We can't do that
-+            // yet though since it breaks stuff for other people. 
-             Name = "Banshee";
-             Logo = Gdk.Pixbuf.LoadFromResource ("banshee-logo.png");
-             Version = String.Format ("{0} ({1})", 
-@@ -99,3 +104,5 @@
-         }
-     }
- }
-+
-+#pragma warning restore 0618





More information about the arch-commits mailing list