Ubuntu
gecko-mediaplayer package

Merge lp:~noskcaj/ubuntu/saucy/gecko-mediaplayer/1.0.8-4u1 into lp:ubuntu/saucy/gecko-mediaplayer

  1. Saucy (13.10)
  2. 1.0.8-4u1
  3. Merge into saucy
Proposed by Jackson Doak
Status: Needs review
Proposed branch: lp:~noskcaj/ubuntu/saucy/gecko-mediaplayer/1.0.8-4u1
Merge into: lp:ubuntu/saucy/gecko-mediaplayer
Diff against target: 600 lines (+70/-463)
9 files modified
.pc/0001-nomozalloc.patch/configure.in (+0/-228)
.pc/0002-require-nspr.patch/configure.in (+0/-228)
.pc/applied-patches (+0/-2)
configure.in (+2/-3)
debian/changelog (+33/-0)
debian/gbp.conf (+1/-1)
debian/install (+0/-1)
debian/patches/functable-check.patch (+33/-0)
debian/patches/series (+1/-0)
To merge this branch: bzr merge lp:~noskcaj/ubuntu/saucy/gecko-mediaplayer/1.0.8-4u1
Reviewer Review Type Date Requested Status
Daniel Holbach (community) Approve
Review via email: mp+183036@code.launchpad.net

Description of the change

Merge from debian testing, closes 2 of 3 complete bugs, maybe all of them

To post a comment you must log in.
Revision history for this message
Daniel Holbach (dholbach) wrote :

Thanks. Uploaded.

review: Approve
Reply

Unmerged revisions

32. By Jackson Doak

* Merge from Debian testing, remaining ubuntu changes:
  - debian/rules: Drop --with-xulrunner-sdk flag, it's empty and cause FTBFS.
  - debian/control: Build depend on libnspr4-dev
  - debian/patches/0002-require-nspr.patch:
    firefox-dev now only provides npapi headers so require nspr to build

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== removed directory '.pc/0001-nomozalloc.patch'
=== removed file '.pc/0001-nomozalloc.patch/configure.in'
--- .pc/0001-nomozalloc.patch/configure.in 2013-03-07 11:00:21 +0000
+++ .pc/0001-nomozalloc.patch/configure.in 1970-01-01 00:00:00 +0000
@@ -1,228 +0,0 @@
1dnl Process this file with autoconf to produce a configure script.
2dnl Created by Anjuta application wizard.
3
4AC_INIT(configure.in)
5AM_INIT_AUTOMAKE(gecko-mediaplayer, 1.0.8)
6AM_CONFIG_HEADER(config.h)
7AM_MAINTAINER_MODE([enable])
8m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
9
10AC_ISC_POSIX
11AC_PROG_CC
12AM_PROG_CC_STDC
13AC_HEADER_STDC
14
15
16AC_PROG_CPP
17AC_PROG_CXX
18AM_PROG_CC_C_O
19AC_PROG_RANLIB
20
21dnl Set gettext package name
22GETTEXT_PACKAGE=gecko-mediaplayer
23AC_SUBST(GETTEXT_PACKAGE)
24AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE,"$GETTEXT_PACKAGE", [GETTEXT package name])
25
26dnl Add the languages which your application supports here.
27ALL_LINGUAS="cs de es fr ja it nl pl pt pt_BR tr"
28AM_GLIB_GNU_GETTEXT
29
30PKG_CHECK_MODULES(GLIB, [glib-2.0])
31AC_SUBST(GLIB_CFLAGS)
32AC_SUBST(GLIB_LIBS)
33
34PKG_CHECK_MODULES(GMLIB, [gmlib >= 1.0.7])
35AC_SUBST(GMLIB_CFLAGS)
36AC_SUBST(GMLIB_LIBS)
37
38
39AC_ARG_WITH([xulrunner-sdk],
40 [AS_HELP_STRING([--with-xulrunner-sdk=path_to_sdk],
41 [Path to xulrunner SDK for build --with-xulrunner-sdk=/path/to/sdk])],
42 [
43 XULRUNNER_SDK_PREFIX=$with_xulrunner_sdk
44 GECKO_CFLAGS="-I$XULRUNNER_SDK_PREFIX/include -I$XULRUNNER_SDK_PREFIX/include/plugin -I$XULRUNNER_SDK_PREFIX/include/nspr -I$XULRUNNER_SDK_PREFIX/include/xpcom -I$XULRUNNER_SDK_PREFIX/include/string -I$XULRUNNER_SDK_PREFIX/include/java"
45 GECKO_LIBS="-L$XULRUNNER_SDK_PREFIX/lib -lxpcomglue_s -lxul -lxpcom -lplds4 -lplc4 -lnspr4 -lpthread -ldl"
46 ],
47 [])
48
49if test "$GECKO_CFLAGS" = ""; then
50PKG_CHECK_MODULES(GECKO, [libxul >= 2],[GECKO_CFLAGS="$GECKO_CFLAGS -DMOZ_NO_MOZALLOC"
51 AC_MSG_NOTICE([Using libxul >= 2.0 ])
52 ],[AC_MSG_NOTICE([libxul >= 2 not found, trying another])])
53fi
54
55if test "$GECKO_CFLAGS" = ""; then
56PKG_CHECK_MODULES(GECKO, [libxul >= 1.9.2],[ AC_MSG_NOTICE([Using libxul >= 1.9.2])
57 ],[AC_MSG_NOTICE([libxul >= 1.9.2 not found, trying another])])
58fi
59
60if test "$GECKO_CFLAGS" = ""; then
61PKG_CHECK_MODULES(GECKO, [libxul < 1.9.2],[ AC_MSG_NOTICE([Using libxul < 1.9.2])
62 ],[AC_MSG_WARN([libxul < 1.9.2 not found, trying another])])
63fi
64
65if test "$GECKO_CFLAGS" = ""; then
66PKG_CHECK_MODULES(GECKO, [libxul-unstable],[ AC_MSG_NOTICE([Using libxul-unstable])
67 ],[AC_MSG_WARN([libxul-unstable not found, trying another])])
68fi
69
70if test "$GECKO_CFLAGS" = ""; then
71PKG_CHECK_MODULES(GECKO, [mozilla-plugin mozilla-xpcom],[ AC_MSG_NOTICE([Using mozilla])
72 ],[AC_MSG_WARN([mozilla-plugin not found, trying another])])
73fi
74
75if test "$GECKO_CFLAGS" = ""; then
76PKG_CHECK_MODULES(GECKO, [firefox-plugin firefox-xpcom],[ AC_MSG_NOTICE([Using firefox])
77 ],[AC_MSG_WARN([firefox-plugin not found, trying another])])
78fi
79
80if test "$GECKO_CFLAGS" = ""; then
81PKG_CHECK_MODULES(GECKO, [seamonkey-plugin seamonkey-xpcom],[ AC_MSG_NOTICE([Using seamonkey])
82 ],[AC_MSG_WARN([seamonkey-plugin not found, trying another])])
83fi
84
85if test "$GECKO_CFLAGS" = ""; then
86PKG_CHECK_MODULES(GECKO, [xulrunner-plugin xulrunner-xpcom],[ AC_MSG_NOTICE([Using xulrunner])
87 ],[AC_MSG_WARN([xulrunner-plugin not found, trying another])])
88fi
89
90if test "$GECKO_CFLAGS" = ""; then
91PKG_CHECK_MODULES(GECKO, [iceape-plugin iceape-xpcom],[ AC_MSG_NOTICE([Using iceape])
92 ],[AC_MSG_WARN([iceape-plugin not found, trying another])])
93fi
94
95if test "$GECKO_CFLAGS" = ""; then
96PKG_CHECK_MODULES(GECKO, [npapi-sdk],[ AC_MSG_NOTICE([Using npapi-sdk])
97 ],[AC_MSG_ERROR([npapi-sdk not found, all out of tries])])
98 require_nspr="yes"
99fi
100
101AC_MSG_CHECKING([for const return value of NPP_GetMIMEDescription])
102oCFLAGS=$CFLAGS
103CFLAGS="$GECKO_CFLAGS"
104AC_LANG_PUSH([C])
105AC_COMPILE_IFELSE([AC_LANG_PROGRAM([
106#ifndef XP_UNIX
107#define XP_UNIX 1
108#endif
109#include <npapi.h>
110#if NP_VERSION_MAJOR == 0 && NP_VERSION_MINOR < 27
111#error
112#else
113const char*NPP_GetMIMEDescription(void) {
114 return "test";
115}
116#endif
117],[
118const char *f=NPP_GetMIMEDescription();
119])],[
120 AC_MSG_RESULT([yes])
121 AC_DEFINE([NPAPI_USE_CONSTCHARS],[1],[Define if NPAPI declares NPP_GetMIMEDescription as a const char*])
122],[
123 AC_MSG_RESULT([no])
124])
125AC_LANG_POP([C])
126CFLAGS=$oCFLAGS
127
128AC_MSG_CHECKING([for usage of UTF8Characters])
129oCFLAGS=$CFLAGS
130CFLAGS="$GECKO_CFLAGS"
131AC_LANG_PUSH([C])
132AC_COMPILE_IFELSE([AC_LANG_PROGRAM([
133#ifndef XP_UNIX
134#define XP_UNIX 1
135#endif
136#include <npapi.h>
137#include <npruntime.h>
138],[
139NPString s;
140s.UTF8Characters = "Testing";
141])],[
142 AC_MSG_RESULT([yes])
143 AC_DEFINE([NPAPI_USE_UPPERCASE_UTF8],[1],[Define if NPAPI declares NPString with an uppercase UTF8])
144],[
145 AC_MSG_RESULT([no])
146])
147AC_LANG_POP([C])
148CFLAGS=$oCFLAGS
149
150
151dnl Locate where the plugins should go
152PKG_CHECK_MODULES(NSPR, [nspr],[
153 libdir=`$PKG_CONFIG --variable=libdir nspr`
154 AC_SUBST(libdir)
155 if test "$require_nspr" = "yes"; then
156 AC_DEFINE([HAVE_NSPR],[1],[Define to 1 if using nspr])
157 GECKO_CFLAGS="$GECKO_CFLAGS $NSPR_CFLAGS"
158 fi],[if test "$require_nspr" = "yes"; then
159 AC_MSG_ERROR([nspr not found, required by detected gecko])
160 else
161 AC_MSG_WARN([nspr not found, may not be needed])
162 fi])
163
164
165AC_SUBST(GECKO_CFLAGS)
166AC_SUBST(GECKO_LIBS)
167
168PKG_CHECK_MODULES(DBUS, [dbus-1 >= 0.95 dbus-glib-1 >= 0.70])
169AC_SUBST(DBUS_CFLAGS)
170AC_SUBST(DBUS_LIBS)
171
172AC_ARG_WITH([plugin_dir],
173 [AS_HELP_STRING([--with-plugin-dir=dir],
174 [Directory where plugins are stored])],
175 [plugindir=$withval],
176 [plugindir='$(libdir)/mozilla/plugins'])
177AC_SUBST(plugindir)
178
179AC_ARG_ENABLE(caching,
180 AC_HELP_STRING([--disable-caching],[Disable caching of remote media to local storage]),
181 [usecache=$enableval],[usecache=yes])
182
183if test $usecache != yes; then
184 GECKO_CFLAGS="$GECKO_CFLAGS -DDISABLE_CACHE"
185fi
186
187AC_ARG_WITH([libcurl],
188 [AS_HELP_STRING([--with-libcurl],
189 [Add support for libcurl])],
190 [],
191 [with_libcurl=check])
192AS_IF([test "x$with_libcurl" != xno],
193 [PKG_CHECK_MODULES(CURL,[libcurl],[CURL_DEFINES="-DHAVE_CURL" AC_DEFINE([CURL_ENABLED],[1],[Define to 1 if you have curl support])],AC_MSG_NOTICE([Compiling without curl support. May disable apple.com sites]))
194 AC_SUBST(CURL_DEFINES)
195 AC_SUBST(CURL_CFLAGS)
196 AC_SUBST(CURL_LIBS)
197 ])
198
199
200BACKEND=`pkg-config --variable=preference_backend gmlib`
201
202if test ${BACKEND} = "gsettings"; then
203 AC_MSG_NOTICE([gmlib is using ${BACKEND} for preference storage])
204 dnl GLIB_GSETTINGS
205 AM_CONDITIONAL([GCONF_SCHEMAS_INSTALL],[false])
206 USE_GSETTINGS=1
207 AC_SUBST(USE_GSETTINGS)
208elif test ${BACKEND} = "gconf"; then
209 AC_MSG_NOTICE([gmlib is using ${BACKEND} for preference storage])
210 GSETTINGS_RULES=""
211 AC_SUBST(GSETTINGS_RULES)
212 AM_GCONF_SOURCE_2
213 USE_GCONF=1
214 AC_SUBST(USE_GCONF)
215elif test ${BACKEND} = "keystore"; then
216 GSETTINGS_RULES=""
217 AC_SUBST(GSETTINGS_RULES)
218 AM_CONDITIONAL([GCONF_SCHEMAS_INSTALL],[false])
219fi
220
221
222AC_OUTPUT([
223Makefile
224gecko-mediaplayer.spec
225src/Makefile
226po/Makefile.in
227])
228
2290
=== removed directory '.pc/0002-require-nspr.patch'
=== removed file '.pc/0002-require-nspr.patch/configure.in'
--- .pc/0002-require-nspr.patch/configure.in 2013-03-07 11:00:21 +0000
+++ .pc/0002-require-nspr.patch/configure.in 1970-01-01 00:00:00 +0000
@@ -1,228 +0,0 @@
1dnl Process this file with autoconf to produce a configure script.
2dnl Created by Anjuta application wizard.
3
4AC_INIT(configure.in)
5AM_INIT_AUTOMAKE(gecko-mediaplayer, 1.0.8)
6AM_CONFIG_HEADER(config.h)
7AM_MAINTAINER_MODE([enable])
8m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
9
10AC_ISC_POSIX
11AC_PROG_CC
12AM_PROG_CC_STDC
13AC_HEADER_STDC
14
15
16AC_PROG_CPP
17AC_PROG_CXX
18AM_PROG_CC_C_O
19AC_PROG_RANLIB
20
21dnl Set gettext package name
22GETTEXT_PACKAGE=gecko-mediaplayer
23AC_SUBST(GETTEXT_PACKAGE)
24AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE,"$GETTEXT_PACKAGE", [GETTEXT package name])
25
26dnl Add the languages which your application supports here.
27ALL_LINGUAS="cs de es fr ja it nl pl pt pt_BR tr"
28AM_GLIB_GNU_GETTEXT
29
30PKG_CHECK_MODULES(GLIB, [glib-2.0])
31AC_SUBST(GLIB_CFLAGS)
32AC_SUBST(GLIB_LIBS)
33
34PKG_CHECK_MODULES(GMLIB, [gmlib >= 1.0.7])
35AC_SUBST(GMLIB_CFLAGS)
36AC_SUBST(GMLIB_LIBS)
37
38
39AC_ARG_WITH([xulrunner-sdk],
40 [AS_HELP_STRING([--with-xulrunner-sdk=path_to_sdk],
41 [Path to xulrunner SDK for build --with-xulrunner-sdk=/path/to/sdk])],
42 [
43 XULRUNNER_SDK_PREFIX=$with_xulrunner_sdk
44 GECKO_CFLAGS="-I$XULRUNNER_SDK_PREFIX/include -I$XULRUNNER_SDK_PREFIX/include/plugin -I$XULRUNNER_SDK_PREFIX/include/nspr -I$XULRUNNER_SDK_PREFIX/include/xpcom -I$XULRUNNER_SDK_PREFIX/include/string -I$XULRUNNER_SDK_PREFIX/include/java"
45 GECKO_LIBS="-L$XULRUNNER_SDK_PREFIX/lib -lxpcomglue_s_nomozalloc -lxul -lxpcom -lplds4 -lplc4 -lnspr4 -lpthread -ldl"
46 ],
47 [])
48
49if test "$GECKO_CFLAGS" = ""; then
50PKG_CHECK_MODULES(GECKO, [libxul >= 2],[GECKO_CFLAGS="$GECKO_CFLAGS -DMOZ_NO_MOZALLOC"
51 AC_MSG_NOTICE([Using libxul >= 2.0 ])
52 ],[AC_MSG_NOTICE([libxul >= 2 not found, trying another])])
53fi
54
55if test "$GECKO_CFLAGS" = ""; then
56PKG_CHECK_MODULES(GECKO, [libxul >= 1.9.2],[ AC_MSG_NOTICE([Using libxul >= 1.9.2])
57 ],[AC_MSG_NOTICE([libxul >= 1.9.2 not found, trying another])])
58fi
59
60if test "$GECKO_CFLAGS" = ""; then
61PKG_CHECK_MODULES(GECKO, [libxul < 1.9.2],[ AC_MSG_NOTICE([Using libxul < 1.9.2])
62 ],[AC_MSG_WARN([libxul < 1.9.2 not found, trying another])])
63fi
64
65if test "$GECKO_CFLAGS" = ""; then
66PKG_CHECK_MODULES(GECKO, [libxul-unstable],[ AC_MSG_NOTICE([Using libxul-unstable])
67 ],[AC_MSG_WARN([libxul-unstable not found, trying another])])
68fi
69
70if test "$GECKO_CFLAGS" = ""; then
71PKG_CHECK_MODULES(GECKO, [mozilla-plugin mozilla-xpcom],[ AC_MSG_NOTICE([Using mozilla])
72 ],[AC_MSG_WARN([mozilla-plugin not found, trying another])])
73fi
74
75if test "$GECKO_CFLAGS" = ""; then
76PKG_CHECK_MODULES(GECKO, [firefox-plugin firefox-xpcom],[ AC_MSG_NOTICE([Using firefox])
77 ],[AC_MSG_WARN([firefox-plugin not found, trying another])])
78fi
79
80if test "$GECKO_CFLAGS" = ""; then
81PKG_CHECK_MODULES(GECKO, [seamonkey-plugin seamonkey-xpcom],[ AC_MSG_NOTICE([Using seamonkey])
82 ],[AC_MSG_WARN([seamonkey-plugin not found, trying another])])
83fi
84
85if test "$GECKO_CFLAGS" = ""; then
86PKG_CHECK_MODULES(GECKO, [xulrunner-plugin xulrunner-xpcom],[ AC_MSG_NOTICE([Using xulrunner])
87 ],[AC_MSG_WARN([xulrunner-plugin not found, trying another])])
88fi
89
90if test "$GECKO_CFLAGS" = ""; then
91PKG_CHECK_MODULES(GECKO, [iceape-plugin iceape-xpcom],[ AC_MSG_NOTICE([Using iceape])
92 ],[AC_MSG_WARN([iceape-plugin not found, trying another])])
93fi
94
95if test "$GECKO_CFLAGS" = ""; then
96PKG_CHECK_MODULES(GECKO, [npapi-sdk],[ AC_MSG_NOTICE([Using npapi-sdk])
97 ],[AC_MSG_ERROR([npapi-sdk not found, all out of tries])])
98 require_nspr="yes"
99fi
100
101AC_MSG_CHECKING([for const return value of NPP_GetMIMEDescription])
102oCFLAGS=$CFLAGS
103CFLAGS="$GECKO_CFLAGS"
104AC_LANG_PUSH([C])
105AC_COMPILE_IFELSE([AC_LANG_PROGRAM([
106#ifndef XP_UNIX
107#define XP_UNIX 1
108#endif
109#include <npapi.h>
110#if NP_VERSION_MAJOR == 0 && NP_VERSION_MINOR < 27
111#error
112#else
113const char*NPP_GetMIMEDescription(void) {
114 return "test";
115}
116#endif
117],[
118const char *f=NPP_GetMIMEDescription();
119])],[
120 AC_MSG_RESULT([yes])
121 AC_DEFINE([NPAPI_USE_CONSTCHARS],[1],[Define if NPAPI declares NPP_GetMIMEDescription as a const char*])
122],[
123 AC_MSG_RESULT([no])
124])
125AC_LANG_POP([C])
126CFLAGS=$oCFLAGS
127
128AC_MSG_CHECKING([for usage of UTF8Characters])
129oCFLAGS=$CFLAGS
130CFLAGS="$GECKO_CFLAGS"
131AC_LANG_PUSH([C])
132AC_COMPILE_IFELSE([AC_LANG_PROGRAM([
133#ifndef XP_UNIX
134#define XP_UNIX 1
135#endif
136#include <npapi.h>
137#include <npruntime.h>
138],[
139NPString s;
140s.UTF8Characters = "Testing";
141])],[
142 AC_MSG_RESULT([yes])
143 AC_DEFINE([NPAPI_USE_UPPERCASE_UTF8],[1],[Define if NPAPI declares NPString with an uppercase UTF8])
144],[
145 AC_MSG_RESULT([no])
146])
147AC_LANG_POP([C])
148CFLAGS=$oCFLAGS
149
150
151dnl Locate where the plugins should go
152PKG_CHECK_MODULES(NSPR, [nspr],[
153 libdir=`$PKG_CONFIG --variable=libdir nspr`
154 AC_SUBST(libdir)
155 if test "$require_nspr" = "yes"; then
156 AC_DEFINE([HAVE_NSPR],[1],[Define to 1 if using nspr])
157 GECKO_CFLAGS="$GECKO_CFLAGS $NSPR_CFLAGS"
158 fi],[if test "$require_nspr" = "yes"; then
159 AC_MSG_ERROR([nspr not found, required by detected gecko])
160 else
161 AC_MSG_WARN([nspr not found, may not be needed])
162 fi])
163
164
165AC_SUBST(GECKO_CFLAGS)
166AC_SUBST(GECKO_LIBS)
167
168PKG_CHECK_MODULES(DBUS, [dbus-1 >= 0.95 dbus-glib-1 >= 0.70])
169AC_SUBST(DBUS_CFLAGS)
170AC_SUBST(DBUS_LIBS)
171
172AC_ARG_WITH([plugin_dir],
173 [AS_HELP_STRING([--with-plugin-dir=dir],
174 [Directory where plugins are stored])],
175 [plugindir=$withval],
176 [plugindir='$(libdir)/mozilla/plugins'])
177AC_SUBST(plugindir)
178
179AC_ARG_ENABLE(caching,
180 AC_HELP_STRING([--disable-caching],[Disable caching of remote media to local storage]),
181 [usecache=$enableval],[usecache=yes])
182
183if test $usecache != yes; then
184 GECKO_CFLAGS="$GECKO_CFLAGS -DDISABLE_CACHE"
185fi
186
187AC_ARG_WITH([libcurl],
188 [AS_HELP_STRING([--with-libcurl],
189 [Add support for libcurl])],
190 [],
191 [with_libcurl=check])
192AS_IF([test "x$with_libcurl" != xno],
193 [PKG_CHECK_MODULES(CURL,[libcurl],[CURL_DEFINES="-DHAVE_CURL" AC_DEFINE([CURL_ENABLED],[1],[Define to 1 if you have curl support])],AC_MSG_NOTICE([Compiling without curl support. May disable apple.com sites]))
194 AC_SUBST(CURL_DEFINES)
195 AC_SUBST(CURL_CFLAGS)
196 AC_SUBST(CURL_LIBS)
197 ])
198
199
200BACKEND=`pkg-config --variable=preference_backend gmlib`
201
202if test ${BACKEND} = "gsettings"; then
203 AC_MSG_NOTICE([gmlib is using ${BACKEND} for preference storage])
204 dnl GLIB_GSETTINGS
205 AM_CONDITIONAL([GCONF_SCHEMAS_INSTALL],[false])
206 USE_GSETTINGS=1
207 AC_SUBST(USE_GSETTINGS)
208elif test ${BACKEND} = "gconf"; then
209 AC_MSG_NOTICE([gmlib is using ${BACKEND} for preference storage])
210 GSETTINGS_RULES=""
211 AC_SUBST(GSETTINGS_RULES)
212 AM_GCONF_SOURCE_2
213 USE_GCONF=1
214 AC_SUBST(USE_GCONF)
215elif test ${BACKEND} = "keystore"; then
216 GSETTINGS_RULES=""
217 AC_SUBST(GSETTINGS_RULES)
218 AM_CONDITIONAL([GCONF_SCHEMAS_INSTALL],[false])
219fi
220
221
222AC_OUTPUT([
223Makefile
224gecko-mediaplayer.spec
225src/Makefile
226po/Makefile.in
227])
228
2290
=== removed file '.pc/applied-patches'
--- .pc/applied-patches 2012-09-24 12:57:53 +0000
+++ .pc/applied-patches 1970-01-01 00:00:00 +0000
@@ -1,2 +0,0 @@
10001-nomozalloc.patch
20002-require-nspr.patch
30
=== modified file 'configure.in'
--- configure.in 2013-03-07 11:00:21 +0000
+++ configure.in 2013-08-29 21:48:20 +0000
@@ -42,7 +42,7 @@
42 [42 [
43 XULRUNNER_SDK_PREFIX=$with_xulrunner_sdk43 XULRUNNER_SDK_PREFIX=$with_xulrunner_sdk
44 GECKO_CFLAGS="-I$XULRUNNER_SDK_PREFIX/include -I$XULRUNNER_SDK_PREFIX/include/plugin -I$XULRUNNER_SDK_PREFIX/include/nspr -I$XULRUNNER_SDK_PREFIX/include/xpcom -I$XULRUNNER_SDK_PREFIX/include/string -I$XULRUNNER_SDK_PREFIX/include/java"44 GECKO_CFLAGS="-I$XULRUNNER_SDK_PREFIX/include -I$XULRUNNER_SDK_PREFIX/include/plugin -I$XULRUNNER_SDK_PREFIX/include/nspr -I$XULRUNNER_SDK_PREFIX/include/xpcom -I$XULRUNNER_SDK_PREFIX/include/string -I$XULRUNNER_SDK_PREFIX/include/java"
45 GECKO_LIBS="-L$XULRUNNER_SDK_PREFIX/lib -lxpcomglue_s_nomozalloc -lxul -lxpcom -lplds4 -lplc4 -lnspr4 -lpthread -ldl"45 GECKO_LIBS="-L$XULRUNNER_SDK_PREFIX/lib -lxpcomglue_s -lxul -lxpcom -lplds4 -lplc4 -lnspr4 -lpthread -ldl"
46 ],46 ],
47 [])47 [])
4848
@@ -68,9 +68,8 @@
68fi68fi
6969
70if test "$GECKO_CFLAGS" = ""; then70if test "$GECKO_CFLAGS" = ""; then
71PKG_CHECK_MODULES(GECKO, [mozilla-plugin],[ AC_MSG_NOTICE([Using mozilla])71PKG_CHECK_MODULES(GECKO, [mozilla-plugin mozilla-xpcom],[ AC_MSG_NOTICE([Using mozilla])
72 ],[AC_MSG_WARN([mozilla-plugin not found, trying another])])72 ],[AC_MSG_WARN([mozilla-plugin not found, trying another])])
73 require_nspr="yes"
74fi73fi
7574
76if test "$GECKO_CFLAGS" = ""; then75if test "$GECKO_CFLAGS" = ""; then
7776
=== modified file 'debian/changelog'
--- debian/changelog 2013-03-07 11:00:21 +0000
+++ debian/changelog 2013-08-29 21:48:20 +0000
@@ -1,3 +1,36 @@
1gecko-mediaplayer (1.0.8-4ubuntu1) UNRELEASED; urgency=low
2
3 * Merge from Debian testing, remaining ubuntu changes:
4 - debian/rules: Drop --with-xulrunner-sdk flag, it's empty and cause FTBFS.
5 - debian/control: Build depend on libnspr4-dev
6 - debian/patches/0002-require-nspr.patch:
7 firefox-dev now only provides npapi headers so require nspr to build
8
9 -- Jackson Doak <noskcaj@ubuntu.com> Fri, 30 Aug 2013 07:26:44 +1000
10
11gecko-mediaplayer (1.0.8-4) unstable; urgency=low
12
13 * debian/patches/functable-check.patch: Actually check the correct function
14 table. This should now cover all cases correctly.
15
16 -- Sebastian Ramacher <sramacher@debian.org> Mon, 24 Jun 2013 12:51:09 +0200
17
18gecko-mediaplayer (1.0.8-3) unstable; urgency=low
19
20 * debian/patches/functable-check.patch: Fix function table check. This
21 improves the compatibility with browser other than iceweasel and with
22 older versions of iceweasel if built against a newer one. (LP: #870115,
23 #1069635)
24
25 -- Sebastian Ramacher <sramacher@debian.org> Sun, 23 Jun 2013 17:44:51 +0200
26
27gecko-mediaplayer (1.0.8-2) unstable; urgency=low
28
29 * Upload to unstable.
30 * debian/install: Don't install obsolete gconf2 scheme.
31
32 -- Sebastian Ramacher <sramacher@debian.org> Thu, 06 Jun 2013 22:42:00 +0200
33
1gecko-mediaplayer (1.0.8-1ubuntu1) raring; urgency=low34gecko-mediaplayer (1.0.8-1ubuntu1) raring; urgency=low
235
3 * Merge from Debian experimental, Ubuntu remaining changes :36 * Merge from Debian experimental, Ubuntu remaining changes :
437
=== modified file 'debian/gbp.conf'
--- debian/gbp.conf 2012-11-18 11:33:04 +0000
+++ debian/gbp.conf 2013-08-29 21:48:20 +0000
@@ -1,3 +1,3 @@
1[DEFAULT]1[DEFAULT]
2pristine-tar = True2pristine-tar = True
3debian-branch = experimental3debian-branch = master
44
=== removed file 'debian/install'
--- debian/install 2008-11-25 21:39:54 +0000
+++ debian/install 1970-01-01 00:00:00 +0000
@@ -1,1 +0,0 @@
1gecko-mediaplayer.schemas /usr/share/gconf/schemas
20
=== added file 'debian/patches/functable-check.patch'
--- debian/patches/functable-check.patch 1970-01-01 00:00:00 +0000
+++ debian/patches/functable-check.patch 2013-08-29 21:48:20 +0000
@@ -0,0 +1,33 @@
1Description: Fix function table check
2 We only need to know if we have access to all the values we need. Everything
3 else is not necessary.
4Author: Sebastian Ramacher <sramacher@debian.org>
5Last-Update: 2013-06-24
6Forwarded: https://code.google.com/p/gecko-mediaplayer/issues/detail?id=184
7
8--- a/src/np_entry.cpp
9+++ b/src/np_entry.cpp
10@@ -42,6 +42,7 @@
11 #include <npapi.h>
12 #include <npfunctions.h>
13 #include "npupp.h"
14+#include <cstddef>
15
16 #ifdef HAVE_CONFIG_H
17 #include <config.h>
18@@ -117,9 +118,14 @@
19 if (HIBYTE(pFuncs->version) > NP_VERSION_MAJOR)
20 return NPERR_INCOMPATIBLE_VERSION_ERROR;
21
22- if (pFuncs->size < sizeof(NPNetscapeFuncs))
23+ if (pFuncs->size < offsetof(NPNetscapeFuncs, setexception) + sizeof(NPN_SetExceptionProcPtr))
24 return NPERR_INVALID_FUNCTABLE_ERROR;
25
26+#ifdef XP_UNIX
27+ if (pluginFuncs->size < offsetof(NPPluginFuncs, getvalue) + sizeof(NPP_GetValueProcPtr))
28+ return NPERR_INVALID_FUNCTABLE_ERROR;
29+#endif
30+
31 NPNFuncs.size = pFuncs->size;
32 NPNFuncs.version = pFuncs->version;
33 NPNFuncs.geturlnotify = pFuncs->geturlnotify;
034
=== modified file 'debian/patches/series'
--- debian/patches/series 2012-09-24 12:57:53 +0000
+++ debian/patches/series 2013-08-29 21:48:20 +0000
@@ -1,2 +1,3 @@
10001-nomozalloc.patch10001-nomozalloc.patch
20002-require-nspr.patch20002-require-nspr.patch
3functable-check.patch

Subscribers

People subscribed via source and target branches

to all changes: