Package list virt-viewer / 6152ea0
drop patch applied upstream rm-in-plugindir.diff Guido G√ľnther 12 years ago
4 changed file(s) with 32 addition(s) and 37 deletion(s). Raw diff Collapse all Expand all
0 From: =?utf-8?q?Guido=20G=C3=BCnther?= <agx@sigxcpu.org>
1 Date: Thu, 30 Jul 2009 15:20:30 +0200
2 Subject: [PATCH] iceape-not-mozilla.diff
3
4 ---
5 configure.ac | 4 ++--
6 1 files changed, 2 insertions(+), 2 deletions(-)
7
8 diff --git a/configure.ac b/configure.ac
9 index 79cad96..190c984 100644
10 --- a/configure.ac
11 +++ b/configure.ac
12 @@ -29,7 +29,7 @@ AC_CHECK_FUNCS([fork socketpair])
13 dnl --enable-plugin to enable the browser plugin.
14 NSPR_REQUIRED=4.0.0
15 FIREFOX_PLUGIN_REQUIRED=1.5.0
16 -MOZILLA_PLUGIN_REQUIRED=1.8
17 +MOZILLA_PLUGIN_REQUIRED=1.0
18 AC_ARG_ENABLE(plugin,
19 [ --enable-plugin=[no/yes] enable browser plugin [default=no]],,
20 enable_plugin=no)
21 @@ -40,7 +40,7 @@ if test "x$enable_plugin" = "xyes"; then
22 PKG_CHECK_MODULES(FIREFOX_PLUGIN,
23 firefox-plugin >= $FIREFOX_PLUGIN_REQUIRED, ,[
24 PKG_CHECK_MODULES(MOZILLA_PLUGIN,
25 - mozilla-plugin >= $MOZILLA_PLUGIN_REQUIRED)
26 + iceape-plugin >= $MOZILLA_PLUGIN_REQUIRED)
27 FIREFOX_PLUGIN_CFLAGS="$MOZILLA_PLUGIN_CFLAGS"
28 FIREFOX_PLUGIN_LIBS="$MOZILLA_PLUGIN_LIBS"
29 ])
30 --
+0
-22
debian/patches/iceape-not-mozilla.diff less more
0 diff --git a/configure.ac b/configure.ac
1 index b4676d5..77c8542 100644
2 --- a/configure.ac
3 +++ b/configure.ac
4 @@ -22,7 +22,7 @@ PKG_CHECK_MODULES(GTKVNC, gtk-vnc-1.0 >= 0.0.1)
5 dnl --enable-plugin to enable the browser plugin.
6 NSPR_REQUIRED=4.0.0
7 FIREFOX_PLUGIN_REQUIRED=1.5.0
8 -MOZILLA_PLUGIN_REQUIRED=1.8
9 +MOZILLA_PLUGIN_REQUIRED=1.0
10 AC_ARG_ENABLE(plugin,
11 [ --enable-plugin=[no/yes] enable browser plugin [default=no]],,
12 enable_plugin=no)
13 @@ -33,7 +33,7 @@ if test "x$enable_plugin" = "xyes"; then
14 PKG_CHECK_MODULES(FIREFOX_PLUGIN,
15 firefox-plugin >= $FIREFOX_PLUGIN_REQUIRED, ,[
16 PKG_CHECK_MODULES(MOZILLA_PLUGIN,
17 - mozilla-plugin >= $MOZILLA_PLUGIN_REQUIRED)
18 + iceape-plugin >= $MOZILLA_PLUGIN_REQUIRED)
19 FIREFOX_PLUGIN_CFLAGS="$MOZILLA_PLUGIN_CFLAGS"
20 FIREFOX_PLUGIN_LIBS="$MOZILLA_PLUGIN_LIBS"
21 ])
+0
-13
debian/patches/rm-in-plugindir.diff less more
0 diff --git a/plugin/Makefile.am b/plugin/Makefile.am
1 index ff1536e..2ccffe6 100644
2 --- a/plugin/Makefile.am
3 +++ b/plugin/Makefile.am
4 @@ -26,7 +26,7 @@ virt-viewer-plugin.so: virt-viewer-plugin.la
5
6 # Only leave the .so file in the plugins directory.
7 install-data-hook:
8 - rm -f $(plugindir)/virt-viewer-plugin.a $(plugindir)/virt-viewer-plugin.la
9 + rm -f $(DESTDIR)$(plugindir)/virt-viewer-plugin.a $(DESTDIR)$(plugindir)/virt-viewer-plugin.la
10
11 CLEANFILES = virt-viewer-plugin.so
12
0 iceape-not-mozilla.diff
1 rm-in-plugindir.diff
0 0001-iceape-not-mozilla.diff.patch