← Back to branch summary

~ubuntu-branches/ubuntu/vivid/qgo/vivid

« back to all changes in this revision

Viewing changes to debian/patches/20_kfreebsd.dpatch

  • Committer: Bazaar Package Importer
  • Author(s): Luke Yelavich
  • Date: 2007-08-16 23:49:49 UTC
  • mfrom: (1.1.9 upstream)
  • mto: This revision was merged to the branch mainline in revision 4.
  • Revision ID: james.westby@ubuntu.com-20070816234949-4dsbhncmvyhoef2y
Tags: 1.5.4-2ubuntu1
* Merge from debian unstable, remaining changes:
  - 50_desktop-catagories.dpatch added to add qgo to Games menu.
  - Modify maintainer value as per spec.

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/patches/20_kfreebsd.dpatch
 
1
#! /bin/sh /usr/share/dpatch/dpatch-run
 
2
## 20_kfreebsd.dpatch by  <cyril.chaboisseau@free.fr>
 
3
##
 
4
## All lines beginning with `## DP:' are a description of the patch.
 
5
## DP: FTBFS on GNU/kFreeBSD
 
6
 
 
7
@DPATCH@
 
8
 
 
9
--- qgo-1.5.3/src/qgo.cpp       2007-03-16 15:07:14.083550000 +0100
 
10
+++ qgo-1.5.3/src/qgo.cpp       2007-03-16 15:09:47.000000000 +0100
 
11
@@ -304,7 +304,7 @@
 
12
 {
 
13
        if (clickSound) //setting->readBoolEntry("SOUND_STONE") && clickSound)
 
14
        {                                                                      //added eb 7
 
15
-#ifdef Q_OS_LINUX
 
16
+#if defined(Q_OS_LINUX) || defined(__GLIBC__)
 
17
                if (!clickSound->isAvailable())
 
18
                        play(clickSound->fileName().latin1());
 
19
                else
 
20
@@ -317,7 +317,7 @@
 
21
 {
 
22
        if (setting->readBoolEntry("SOUND_AUTOPLAY") && clickSound)
 
23
        {                                                                      //added eb 7
 
24
-#ifdef Q_OS_LINUX
 
25
+#if defined(Q_OS_LINUX) || defined(__GLIBC__)
 
26
                if (!clickSound->isAvailable())
 
27
                        play(clickSound->fileName().latin1());
 
28
                else
 
29
@@ -330,7 +330,7 @@
 
30
 {
 
31
        if (setting->readBoolEntry("SOUND_TALK") && talkSound)
 
32
        {                                                                      //added eb 7
 
33
-#ifdef Q_OS_LINUX
 
34
+#if defined(Q_OS_LINUX) || defined(__GLIBC__)
 
35
                if (!talkSound->isAvailable())
 
36
                        play(talkSound->fileName().latin1());
 
37
                else
 
38
@@ -343,7 +343,7 @@
 
39
 {
 
40
        if (setting->readBoolEntry("SOUND_MATCH") && matchSound)
 
41
        {                                                                      //added eb 7
 
42
-#ifdef Q_OS_LINUX
 
43
+#if defined(Q_OS_LINUX) || defined(__GLIBC__)
 
44
                if (!matchSound->isAvailable())
 
45
                        play(matchSound->fileName().latin1());
 
46
                else
 
47
@@ -356,7 +356,7 @@
 
48
 {
 
49
        if (setting->readBoolEntry("SOUND_PASS") && passSound)
 
50
        {                                                                      //added eb 7
 
51
-#ifdef Q_OS_LINUX
 
52
+#if defined(Q_OS_LINUX) || defined(__GLIBC__)
 
53
                if (!passSound->isAvailable())
 
54
                        play(passSound->fileName().latin1());
 
55
                else
 
56
@@ -369,7 +369,7 @@
 
57
 {
 
58
        if (setting->readBoolEntry("SOUND_GAMEEND") && gameEndSound)
 
59
        {                                                                      //added eb 7
 
60
-#ifdef Q_OS_LINUX
 
61
+#if defined(Q_OS_LINUX) || defined(__GLIBC__)
 
62
                if (!gameEndSound->isAvailable())
 
63
                        play(gameEndSound->fileName().latin1());
 
64
                else
 
65
@@ -382,7 +382,7 @@
 
66
 {
 
67
        if (setting->readBoolEntry("SOUND_TIME") && timeSound)
 
68
        {                                                                      //added eb 7
 
69
-#ifdef Q_OS_LINUX
 
70
+#if defined(Q_OS_LINUX) || defined(__GLIBC__)
 
71
                if (!timeSound->isAvailable())
 
72
                        play(timeSound->fileName().latin1());
 
73
                else
 
74
@@ -395,7 +395,7 @@
 
75
 {
 
76
        if (setting->readBoolEntry("SOUND_SAY") && saySound)
 
77
        {                                                                      //added eb 7
 
78
-#ifdef Q_OS_LINUX
 
79
+#if defined(Q_OS_LINUX) || defined(__GLIBC__)
 
80
                if (!saySound->isAvailable())
 
81
                        play(saySound->fileName().latin1());
 
82
                else
 
83
@@ -408,7 +408,7 @@
 
84
 {
 
85
        if (setting->readBoolEntry("SOUND_ENTER") && enterSound)
 
86
        {                                                                      //added eb 7
 
87
-#ifdef Q_OS_LINUX
 
88
+#if defined(Q_OS_LINUX) || defined(__GLIBC__)
 
89
                if (!enterSound->isAvailable())
 
90
                        play(enterSound->fileName().latin1());
 
91
                else
 
92
@@ -421,7 +421,7 @@
 
93
 {
 
94
        if (setting->readBoolEntry("SOUND_LEAVE") && leaveSound)
 
95
        {                                                                      //added eb 7
 
96
-#ifdef Q_OS_LINUX
 
97
+#if defined(Q_OS_LINUX) || defined(__GLIBC__)
 
98
                if (!leaveSound->isAvailable())
 
99
                        play(leaveSound->fileName().latin1());
 
100
                else
 
101
@@ -436,7 +436,7 @@
 
102
 
 
103
        if (setting->readBoolEntry("SOUND_CONNECT") && connectSound)
 
104
        {                                                                      //added eb 7
 
105
-#ifdef Q_OS_LINUX
 
106
+#if defined(Q_OS_LINUX) || defined(__GLIBC__)
 
107
                if (!connectSound->isAvailable())
 
108
                        play(connectSound->fileName().latin1());
 
109
                else
 
110
@@ -449,7 +449,7 @@
 
111
 {
 
112
        if (setting->readBoolEntry("SOUND_DISCONNECT") && connectSound)
 
113
        {                                                                      //added eb 7
 
114
-#ifdef Q_OS_LINUX
 
115
+#if defined(Q_OS_LINUX) || defined(__GLIBC__)
 
116
                if (!connectSound->isAvailable())
 
117
                        play(connectSound->fileName().latin1());
 
118
                else
 
119
--- qgo-1.5.3/src/qgo.h 2007-03-16 15:10:21.965539000 +0100
 
120
+++ qgo-1.5.3/src/qgo.h 2007-03-16 15:10:36.000000000 +0100
 
121
@@ -17,7 +17,7 @@
 
122
 #include <qfiledialog.h>
 
123
 #endif
 
124
 
 
125
-#ifdef Q_OS_LINUX
 
126
+#if defined(Q_OS_LINUX) || defined(__GLIBC__)
 
127
 #include "wavplay.h"
 
128
 #endif
 
129
 
 
130
--- qgo-1.5.3/src/wavfile.c     2007-03-16 15:12:28.494916000 +0100
 
131
+++ qgo-1.5.3/src/wavfile.c     2007-03-16 15:13:17.000000000 +0100
 
132
@@ -41,7 +41,7 @@
 
133
  *     wavplay project.
 
134
  */    
 
135
 
 
136
-#ifdef __linux__
 
137
+#if defined(__linux__) || defined(__GLIBC__)
 
138
 
 
139
 static const char rcsid[] = "@(#)wavfile.c $Revision: 1.8 $";
 
140
 
 
141
@@ -60,8 +60,11 @@
 
142
 #include <sys/ipc.h>
 
143
 #include <sys/ioctl.h>
 
144
 #include <assert.h>
 
145
-#include <linux/soundcard.h>
 
146
-
 
147
+#if defined(__linux__)
 
148
+# include <linux/soundcard.h>
 
149
+#else
 
150
+# include <sys/soundcard.h>
 
151
+#endif
 
152
 
 
153
 
 
154
 
 
155
--- qgo-1.5.3/src/wavplay.c     2007-03-16 15:12:28.570625000 +0100
 
156
+++ qgo-1.5.3/src/wavplay.c     2007-03-16 15:13:57.000000000 +0100
 
157
@@ -54,7 +54,7 @@
 
158
  *
 
159
  */
 
160
 
 
161
-#ifdef __linux__
 
162
+#if defined(__linux__) || defined(__GLIBC__)
 
163
 
 
164
 static const char rcsid[] = "@(#)recplay.c $Revision: 1.8 $";
 
165
 
 
166
@@ -66,7 +66,11 @@
 
167
 #include <fcntl.h>
 
168
 #include <errno.h>
 
169
 #include <sys/stat.h>
 
170
-#include <linux/soundcard.h>
 
171
+#if defined(__linux__)
 
172
+# include <linux/soundcard.h>
 
173
+#else
 
174
+# include <sys/soundcard.h>
 
175
+#endif
 
176
 #include "wavplay.h"
 
177
 /*/#include "server.h"*/
 
178