[Pkg-cli-apps-commits] [banshee] 01/04: Drop Change-Amazon-redirect-url.patch and reexport
Chow Loong Jin
hyperair at debian.org
Mon Jul 7 02:55:16 UTC 2014
This is an automated email from the git hooks/post-receive script.
hyperair pushed a commit to branch ppa/saucy
in repository banshee.
commit 2fb80ee2f4d35f4407d0bee2e61ae22a1bc2dcfe
Author: Chow Loong Jin <hyperair at debian.org>
Date: Fri Feb 28 02:34:49 2014 +0800
Drop Change-Amazon-redirect-url.patch and reexport
---
debian/patches/Change-Amazon-redirect-url.patch | 21 -----
.../patches/Fix-ambiguity-in-DateTime-class.patch | 41 ---------
.../Use-notify-sharp-3.0-to-match-Gtk-3.0.patch | 21 -----
.../libbnpx11-Don-t-use-non-existent-macros.patch | 98 ----------------------
debian/patches/series | 1 -
5 files changed, 182 deletions(-)
diff --git a/debian/patches/Change-Amazon-redirect-url.patch b/debian/patches/Change-Amazon-redirect-url.patch
deleted file mode 100644
index cdbfafd..0000000
--- a/debian/patches/Change-Amazon-redirect-url.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-From: Rodney Dawes <rodney.dawes at canonical.com>
-Date: Mon, 23 Jan 2012 23:05:21 +0800
-Subject: Change Amazon redirect url
-
----
- .../Banshee.AmazonMp3.Store/Banshee.AmazonMp3.Store/StoreView.cs | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/Extensions/Banshee.AmazonMp3.Store/Banshee.AmazonMp3.Store/StoreView.cs b/src/Extensions/Banshee.AmazonMp3.Store/Banshee.AmazonMp3.Store/StoreView.cs
-index d2ee92c..2f009af 100644
---- a/src/Extensions/Banshee.AmazonMp3.Store/Banshee.AmazonMp3.Store/StoreView.cs
-+++ b/src/Extensions/Banshee.AmazonMp3.Store/Banshee.AmazonMp3.Store/StoreView.cs
-@@ -45,7 +45,7 @@ namespace Banshee.AmazonMp3.Store
- // We ask that no one change this redirect URL. ALL (100%) revenue
- // generated by this Banshee Amazon integration is sent directly to the
- // non-profit GNOME Foundation.
-- public const string REDIRECT_URL = "http://integrated-services.banshee.fm/amz/redirect.do/";
-+ public const string REDIRECT_URL = "https://one.ubuntu.com/music/store/amz/";
-
- private static string [] domains = new [] {
- "com",
diff --git a/debian/patches/Fix-ambiguity-in-DateTime-class.patch b/debian/patches/Fix-ambiguity-in-DateTime-class.patch
deleted file mode 100644
index 6a081aa..0000000
--- a/debian/patches/Fix-ambiguity-in-DateTime-class.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-From: Chow Loong Jin <hyperair at debian.org>
-Date: Sat, 7 Dec 2013 12:32:54 +0800
-Subject: Fix ambiguity in DateTime class
-
-In DateButton.cs, unqualified usage of the DateTime class results in an
-ambiguity between System.DateTime and GLib.DateTime.
----
- src/Core/Banshee.Widgets/Banshee.Widgets/DateButton.cs | 6 +++---
- 1 file changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/src/Core/Banshee.Widgets/Banshee.Widgets/DateButton.cs b/src/Core/Banshee.Widgets/Banshee.Widgets/DateButton.cs
-index 519a54a..095d2d9 100644
---- a/src/Core/Banshee.Widgets/Banshee.Widgets/DateButton.cs
-+++ b/src/Core/Banshee.Widgets/Banshee.Widgets/DateButton.cs
-@@ -36,7 +36,7 @@ namespace Banshee.Widgets
- public class DateButton : ToggleButton
- {
- private Window popup;
-- private DateTime date;
-+ private System.DateTime date;
- private Calendar cal;
- private string displayFormat;
-
-@@ -47,7 +47,7 @@ namespace Banshee.Widgets
- {
- Toggled += OnToggled;
- popup = null;
-- date = DateTime.Now;
-+ date = System.DateTime.Now;
- displayFormat = "yyyy/MM/dd";
- }
-
-@@ -195,7 +195,7 @@ namespace Banshee.Widgets
- set { displayFormat = value; }
- }
-
-- public DateTime Date {
-+ public System.DateTime Date {
- get { return date; }
- }
- }
diff --git a/debian/patches/Use-notify-sharp-3.0-to-match-Gtk-3.0.patch b/debian/patches/Use-notify-sharp-3.0-to-match-Gtk-3.0.patch
deleted file mode 100644
index 2476e55..0000000
--- a/debian/patches/Use-notify-sharp-3.0-to-match-Gtk-3.0.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-From: Chow Loong Jin <hyperair at debian.org>
-Date: Sun, 17 Nov 2013 03:17:27 +0800
-Subject: Use notify-sharp-3.0 to match Gtk# 3.0
-
----
- build/m4/banshee/notify-sharp.m4 | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/build/m4/banshee/notify-sharp.m4 b/build/m4/banshee/notify-sharp.m4
-index 3025b6b..652dfd5 100644
---- a/build/m4/banshee/notify-sharp.m4
-+++ b/build/m4/banshee/notify-sharp.m4
-@@ -5,7 +5,7 @@ AC_DEFUN([BANSHEE_CHECK_NOTIFY_SHARP],
- use_system_notifysharp="yes", use_system_notifysharp="no")
-
- if test "x$use_system_notifysharp" = "xyes"; then
-- PKG_CHECK_MODULES(NOTIFY_SHARP, notify-sharp)
-+ PKG_CHECK_MODULES(NOTIFY_SHARP, notify-sharp-3.0)
- AC_SUBST(NOTIFY_SHARP_LIBS)
- AM_CONDITIONAL(EXTERNAL_NOTIFY_SHARP, true)
- else
diff --git a/debian/patches/libbnpx11-Don-t-use-non-existent-macros.patch b/debian/patches/libbnpx11-Don-t-use-non-existent-macros.patch
deleted file mode 100644
index 5b6fbf8..0000000
--- a/debian/patches/libbnpx11-Don-t-use-non-existent-macros.patch
+++ /dev/null
@@ -1,98 +0,0 @@
-From: =?UTF-8?q?Micha=C5=82=20Sawicz?= <michal at sawicz.net>
-Date: Sat, 19 Oct 2013 15:51:21 +0200
-Subject: libbnpx11: Don't use non-existent macros
-
-Origin: commit:f36812ddb62dd812aae24f4f9b8fce8d8dec5054
-
-The GTK_WIDGET_REALIZED and GDK_WINDOW_XWINDOW macros are gone in GTK+
-3.x, so we use their replacement.
-
-Also enable gcc warnings when building libbnpx11, so that we get
-warnings for such situations in the future.
-
-Signed-off-by: Bertrand Lorentz <bertrand.lorentz at gmail.com>
----
- src/Backends/Banshee.NowPlaying.X11/libbnpx11/Makefile.am | 2 +-
- .../Banshee.NowPlaying.X11/libbnpx11/bacon-resize.c | 14 +++++++-------
- 2 files changed, 8 insertions(+), 8 deletions(-)
-
-diff --git a/src/Backends/Banshee.NowPlaying.X11/libbnpx11/Makefile.am b/src/Backends/Banshee.NowPlaying.X11/libbnpx11/Makefile.am
-index 842ee3f..e28c0b5 100644
---- a/src/Backends/Banshee.NowPlaying.X11/libbnpx11/Makefile.am
-+++ b/src/Backends/Banshee.NowPlaying.X11/libbnpx11/Makefile.am
-@@ -5,7 +5,7 @@ bnpx11dir = $(pkglibdir)/Backends
- bnpx11_LTLIBRARIES = libbnpx11.la
-
- libbnpx11_la_SOURCES = $(SOURCES)
--libbnpx11_la_CFLAGS = $(BNPX_CFLAGS) $(BNPX_GTK_CFLAGS)
-+libbnpx11_la_CFLAGS = $(BNPX_CFLAGS) $(BNPX_GTK_CFLAGS) -Wall
- libbnpx11_la_LIBADD = $(BNPX_LIBS) $(BNPX_GTK_LIBS) -lX11 -lXxf86vm -lXrandr
- libbnpx11_la_LDFLAGS = -avoid-version -module
-
-diff --git a/src/Backends/Banshee.NowPlaying.X11/libbnpx11/bacon-resize.c b/src/Backends/Banshee.NowPlaying.X11/libbnpx11/bacon-resize.c
-index 607b56c..0445ca7 100644
---- a/src/Backends/Banshee.NowPlaying.X11/libbnpx11/bacon-resize.c
-+++ b/src/Backends/Banshee.NowPlaying.X11/libbnpx11/bacon-resize.c
-@@ -165,7 +165,7 @@ set_video_widget (BaconResize *resize, GtkWidget *video_widget)
- int event_basep, error_basep;
- XRRScreenConfiguration *xr_screen_conf;
- #endif
-- g_return_if_fail (GTK_WIDGET_REALIZED (video_widget));
-+ g_return_if_fail (gtk_widget_get_realized (video_widget));
-
- resize->priv->video_widget = video_widget;
-
-@@ -185,7 +185,7 @@ set_video_widget (BaconResize *resize, GtkWidget *video_widget)
- goto bail;
-
- /* We don't use the output here, checking whether XRRGetScreenInfo works */
-- xr_screen_conf = XRRGetScreenInfo (GDK_DISPLAY_XDISPLAY (display), GDK_WINDOW_XWINDOW (gdk_screen_get_root_window (screen)));
-+ xr_screen_conf = XRRGetScreenInfo (GDK_DISPLAY_XDISPLAY (display), GDK_WINDOW_XID (gdk_screen_get_root_window (screen)));
- if (xr_screen_conf == NULL)
- goto bail;
-
-@@ -223,7 +223,7 @@ bacon_resize_resize (BaconResize *resize)
- Display *Display;
-
- g_return_if_fail (GTK_IS_WIDGET (resize->priv->video_widget));
-- g_return_if_fail (GTK_WIDGET_REALIZED (resize->priv->video_widget));
-+ g_return_if_fail (gtk_widget_get_realized (resize->priv->video_widget));
-
- Display = GDK_WINDOW_XDISPLAY (gtk_widget_get_window (resize->priv->video_widget));
- if (Display == NULL)
-@@ -252,7 +252,7 @@ bacon_resize_resize (BaconResize *resize)
- gdk_error_trap_push ();
-
- /* Find the XRandR mode that corresponds to the real size */
-- resize->priv->xr_screen_conf = XRRGetScreenInfo (Display, GDK_WINDOW_XWINDOW (root));
-+ resize->priv->xr_screen_conf = XRRGetScreenInfo (Display, GDK_WINDOW_XID (root));
- xr_sizes = XRRConfigSizes (resize->priv->xr_screen_conf, &xr_nsize);
- resize->priv->xr_original_size = XRRConfigCurrentConfiguration (resize->priv->xr_screen_conf, &(resize->priv->xr_current_rotation));
- if (gdk_error_trap_pop ()) {
-@@ -273,7 +273,7 @@ bacon_resize_resize (BaconResize *resize)
- gdk_error_trap_push ();
- XRRSetScreenConfig (Display,
- resize->priv->xr_screen_conf,
-- GDK_WINDOW_XWINDOW (root),
-+ GDK_WINDOW_XID (root),
- (SizeID) i,
- resize->priv->xr_current_rotation,
- CurrentTime);
-@@ -299,7 +299,7 @@ bacon_resize_restore (BaconResize *resize)
- Display *Display;
-
- g_return_if_fail (GTK_IS_WIDGET (resize->priv->video_widget));
-- g_return_if_fail (GTK_WIDGET_REALIZED (resize->priv->video_widget));
-+ g_return_if_fail (gtk_widget_get_realized (resize->priv->video_widget));
-
- /* We haven't called bacon_resize_resize before, or it exited
- * as we didn't need a resize. */
-@@ -328,7 +328,7 @@ bacon_resize_restore (BaconResize *resize)
- gdk_error_trap_push ();
- XRRSetScreenConfig (Display,
- resize->priv->xr_screen_conf,
-- GDK_WINDOW_XWINDOW (root),
-+ GDK_WINDOW_XID (root),
- resize->priv->xr_original_size,
- resize->priv->xr_current_rotation,
- CurrentTime);
diff --git a/debian/patches/series b/debian/patches/series
index 917c07f..052b9c6 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -14,4 +14,3 @@ Use-new-style-GStreamer-1.0-raw-audio-caps-in-the-WA.patch
Use-dbus-2.patch
Disable-Notification-area-extension-by-default.patch
Enable-sound-menu-extension-by-default.patch
-Change-Amazon-redirect-url.patch
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-cli-apps/packages/banshee.git
More information about the Pkg-cli-apps-commits
mailing list