[Pkg-xfce-commits] r742 - in goodies/xfmedia/debian: . patches

[Yves-Alexis Perez]

Author: corsac-guest
Date: 2006-07-13 08:39:41 +0000 (Thu, 13 Jul 2006)
New Revision: 742

Added:
   goodies/xfmedia/debian/patches/02_fix-libutil-crap.patch
Modified:
   goodies/xfmedia/debian/changelog
   goodies/xfmedia/debian/control
Log:
added a patch to build against 4.4Beta2.


Modified: goodies/xfmedia/debian/changelog
===================================================================
--- goodies/xfmedia/debian/changelog	2006-07-12 21:16:57 UTC (rev 741)
+++ goodies/xfmedia/debian/changelog	2006-07-13 08:39:41 UTC (rev 742)
@@ -1,3 +1,10 @@
+xfmedia (0.9.1-6) UNRELEASED; urgency=low
+
+  * Updated build-deps to 4.3.90.2 (Xfce 4.4 Beta2).
+  * Added patch to build agains libxfce4util4 4.3.90.2.
+
+ -- Yves-Alexis Perez <corsac at corsac.net>  Thu, 13 Jul 2006 10:37:44 +0200
+
 xfmedia (0.9.1-5) unstable; urgency=low
 
   * Bumped standard version

Modified: goodies/xfmedia/debian/control
===================================================================
--- goodies/xfmedia/debian/control	2006-07-12 21:16:57 UTC (rev 741)
+++ goodies/xfmedia/debian/control	2006-07-13 08:39:41 UTC (rev 742)
@@ -3,7 +3,7 @@
 Priority: optional
 Maintainer: Debian Xfce Maintainers <pkg-xfce-devel at lists.alioth.debian.org>
 Uploaders: Emanuele Rocca <ema at debian.org>, Simon Huggins <huggie at earth.li>, Rudy Godoy <rudy at kernel-panik.org>, Martin Loschwitz <madkiss at debian.org>, Yves-Alexis Perez <corsac at corsac.net>, Jani Monoses <jani at ubuntu.com>
-Build-Depends: debhelper (>= 4.1.0), libxfcegui4-dev (>= 4.3.90.1-1), libxine-dev, libexo-0.3-dev (>= 0.3.1.6beta1-1), libdbus-glib-1-dev (>= 0.60), libxml-perl, libstartup-notification0-dev, cdbs, libtagc0-dev
+Build-Depends: debhelper (>= 4.1.0), libxfcegui4-dev (>= 4.3.90.2), libxine-dev, libexo-0.3-dev (>= 0.3.1.8beta2), libdbus-glib-1-dev (>= 0.60), libxml-perl, libstartup-notification0-dev, cdbs, libtagc0-dev
 Standards-Version: 3.7.2
 
 Package: xfmedia

Added: goodies/xfmedia/debian/patches/02_fix-libutil-crap.patch
===================================================================
--- goodies/xfmedia/debian/patches/02_fix-libutil-crap.patch	2006-07-12 21:16:57 UTC (rev 741)
+++ goodies/xfmedia/debian/patches/02_fix-libutil-crap.patch	2006-07-13 08:39:41 UTC (rev 742)
@@ -0,0 +1,82 @@
+Index: src/xfmedia-remote.c
+===================================================================
+--- src/xfmedia-remote.c	(revision 19403)
++++ src/xfmedia-remote.c	(working copy)
+@@ -40,17 +40,26 @@
+ #include <getopt.h>
+ #endif
+ 
+-#ifdef HAVE_LOCALE_H
++#include <glib.h>
++
++#if defined(HAVE_LOCALE_H) && defined(ENABLE_NLS)
+ #include <locale.h>
++#include <glib/gi18n.h>
+ #endif
+ 
+-#include <glib.h>
+ 
+-/* for _() only; no need to link in the actual library */
+-#include <libxfce4util/libxfce4util.h>
+-
+ #include <xfmedia/xfmedia-remote-client.h>
+ 
++#ifdef BDEBUG
++#define DBG(...)                G_STMT_START{                               \
++    fprintf(stderr, "DBG[%s:%d] %s(): ", __FILE__, __LINE__, __DBG_FUNC__); \
++    fprintf(stderr, __VA_ARGS__);                                           \
++    fprintf(stderr, "\n");                                                  \
++}G_STMT_END
++#else
++#define DBG(...)   G_STMT_START{ (void)0; }G_STMT_END
++#endif
++
+ enum {
+     OPT_SESSION = 1000,
+     OPT_PING,
+@@ -145,9 +154,15 @@
+     gboolean possibly_play_too = FALSE;
+     XfmediaRemoteStatus ret;
+     
+-    xfce_textdomain(GETTEXT_PACKAGE, LOCALEDIR, "UTF-8");
++#ifdef ENABLE_NLS
++    bindtextdomain(GETTEXT_PACKAGE, LOCALEDIR);
++# ifdef HAVE_BIND_TEXTDOMAIN_CODESET
++    bind_textdomain_codeset(GETTEXT_PACKAGE, "UTF-8");
++# endif
++    textdomain(GETTEXT_PACKAGE);
+     if(!setlocale(LC_ALL, ""))
+         g_warning("Locale not supported; using 'C'.");
++#endif
+     
+     if(argc == 1) {
+         xfmedia_remote_print_usage(argv[0]);
+Index: src/Makefile.am
+===================================================================
+--- src/Makefile.am	(revision 19403)
++++ src/Makefile.am	(working copy)
+@@ -87,8 +87,7 @@
+ 	-DLOCALEDIR=\"$(localedir)\" \
+ 	-DBINDIR=\"$(bindir)\" \
+ 	@GLIB_CFLAGS@ \
+-	@DBUS_CFLAGS@ \
+-	@LIBXFCE4UTIL_CFLAGS@
++	@DBUS_CFLAGS@
+ 
+ xfmedia_remote_LDADD = \
+ 	$(top_builddir)/xfmedia/libxfmedia-remote-client.la \
+Index: src/remote.c
+===================================================================
+--- src/remote.c	(revision 19403)
++++ src/remote.c	(working copy)
+@@ -55,6 +55,10 @@
+ #define DBUS_REQUEST_NAME_REPLY_PRIMARY_OWNER DBUS_SERVICE_REPLY_PRIMARY_OWNER
+ #endif
+ 
++#ifndef DBUS_NAME_FLAG_PROHIBIT_REPLACEMENT
++#define DBUS_NAME_FLAG_PROHIBIT_REPLACEMENT DBUS_NAME_FLAG_DO_NOT_QUEUE
++#endif
++
+ #endif  /* HAVE_DBUS */
+ 
+ #include <libxfce4util/libxfce4util.h>