← Back to branch summary

~ubuntu-branches/ubuntu/saucy/totem/saucy-proposed

« back to all changes in this revision

Viewing changes to debian/patches/30_kfreebsd_gnu.dpatch

  • Committer: Bazaar Package Importer
  • Author(s): Loic Minier, Sebastien Bacher, Loic Minier
  • Date: 2007-03-08 14:51:55 UTC
  • mfrom: (1.1.1 upstream)
  • Revision ID: james.westby@ubuntu.com-20070308145155-cnu1r0s1z4ffcxza
Tags: 2.16.5-3
[ Sebastien Bacher ]
* debian/patches/30_dlopen_noremove_dbus_glib.dpatch:
  - fix "crash because NPPVpluginKeepLibraryInMemory is broken in gecko",
    patch from Alexander Sack (GNOME bug #415389)

[ Loic Minier ]
* Urgency medium.

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/patches/30_kfreebsd_gnu.dpatch
 
1
#! /bin/sh -e
 
2
## 30_kfreebsd_gnu.dpatch by Joe Marcus Clarke <marcus@marcuscom.com> 
 
3
##                       and Aurelien Jarno <aurel32@debian.org>
 
4
##
 
5
## All lines beginning with `## DP:' are a description of the patch.
 
6
## DP: No description.
 
7
 
 
8
if [ $# -lt 1 ]; then
 
9
    echo "`basename $0`: script expects -patch|-unpatch as argument" >&2
 
10
    exit 1
 
11
fi
 
12
 
 
13
[ -f debian/patches/00patch-opts ] && . debian/patches/00patch-opts
 
14
patch_opts="${patch_opts:--f --no-backup-if-mismatch} ${2:+-d $2}"
 
15
 
 
16
case "$1" in
 
17
    -patch) patch -p1 ${patch_opts} < $0;;
 
18
    -unpatch) patch -R -p1 ${patch_opts} < $0;;
 
19
    *)
 
20
        echo "`basename $0`: script expects -patch|-unpatch as argument" >&2
 
21
        exit 1;;
 
22
esac
 
23
 
 
24
exit 0
 
25
 
 
26
@DPATCH@
 
27
diff -urNad totem-2.16.2~/src/plparse/totem-disc.c totem-2.16.2/src/plparse/totem-disc.c
 
28
--- totem-2.16.2~/src/plparse/totem-disc.c      2006-08-16 20:28:18.000000000 +0200
 
29
+++ totem-2.16.2/src/plparse/totem-disc.c       2006-11-06 18:24:13.000000000 +0100
 
30
@@ -42,6 +42,35 @@
 
31
 #include <glib/gi18n.h>
 
32
 #include <libgnomevfs/gnome-vfs.h>
 
33
 
 
34
+#if defined (__linux__)
 
35
+#include <mntent.h>
 
36
+#include <linux/cdrom.h>
 
37
+#elif defined (__FreeBSD__) || defined (__FreeBSD_kernel__)
 
38
+#include <sys/cdio.h>
 
39
+#include <sys/disklabel.h>
 
40
+#include <sys/cdio.h>
 
41
+#include <sys/disklabel.h>
 
42
+
 
43
+#define CDROM_DRIVE_STATUS      0x5326
 
44
+#define CDROM_DISC_STATUS       0x5327
 
45
+#define CDS_AUDIO               100
 
46
+#define CDS_MIXED               105
 
47
+#define CDS_DATA_1              101
 
48
+#define CDS_DATA_2              102
 
49
+#define CDS_NO_INFO             0       /* if not implemented */
 
50
+#define CDS_NO_DISC             1
 
51
+#define CDS_TRAY_OPEN           2
 
52
+#define CDS_DRIVE_NOT_READY     3
 
53
+#define CDS_DISC_OK             4
 
54
+#define CDS_XA_2_1              103
 
55
+#define CDS_XA_2_2              104
 
56
+#define CDC_DVD                 0x8000
 
57
+#define ENOMEDIUM ENODEV
 
58
+#define CDROM_GET_CAPABILITY CDIOCCLRDEBUG
 
59
+#else
 
60
+# error "Unknown system"
 
61
+#endif
 
62
+
 
63
 #ifdef HAVE_HAL
 
64
 #include <libhal.h>
 
65
 #include <dbus/dbus.h>
 
66
diff -urNad totem-2.16.2~/src/plparse/totem-disc.c.rej totem-2.16.2/src/plparse/totem-disc.c.rej
 
67
--- totem-2.16.2~/src/plparse/totem-disc.c.rej  1970-01-01 01:00:00.000000000 +0100
 
68
+++ totem-2.16.2/src/plparse/totem-disc.c.rej   2006-11-06 18:22:34.000000000 +0100
 
69
@@ -0,0 +1,42 @@
 
70
+***************
 
71
+*** 43,49 ****
 
72
+  #include <glib/gi18n.h>
 
73
+  #include <libgnomevfs/gnome-vfs.h>
 
74
+  
 
75
+  #include <linux/cdrom.h>
 
76
+  
 
77
+  #include "totem-disc.h"
 
78
+  
 
79
+--- 43,74 ----
 
80
+  #include <glib/gi18n.h>
 
81
+  #include <libgnomevfs/gnome-vfs.h>
 
82
+  
 
83
+  #include <linux/cdrom.h>
 
84
+  
 
85
+  #include "totem-disc.h"
 
86
+