Go to:
Gentoo Home
Documentation
Forums
Lists
Bugs
Planet
Store
Wiki
Get Gentoo!
Gentoo's Bugzilla – Attachment 189267 Details for
Bug 267279
[PATCH][gnome-overlay]net-misc/vinagre-2.26.1 Fix gnome-applet optional
Home
|
New
–
[Ex]
|
Browse
|
Search
|
Privacy Policy
|
[?]
|
Reports
|
Requests
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
the patch which solves the problem
0001-net-misc-vinagre-Fix-gnome-applet-optional.patch (text/plain), 5.45 KB, created by
Romain Perier (RETIRED)
on 2009-04-23 22:35:01 UTC
(
hide
)
Description:
the patch which solves the problem
Filename:
MIME Type:
Creator:
Romain Perier (RETIRED)
Created:
2009-04-23 22:35:01 UTC
Size:
5.45 KB
patch
obsolete
>From 63b024ef3b70574ddeec71334e53d65fa3b98b7e Mon Sep 17 00:00:00 2001 >From: Romain PERIER <mrpouet@tuxfamily.org> >Date: Fri, 24 Apr 2009 00:25:25 +0200 >Subject: [PATCH] net-misc/vinagre: Fix gnome-applet optional > modified: net-misc/vinagre/Manifest > new file: net-misc/vinagre/files/vinagre-2.26.1-optional-applet.patch > modified: net-misc/vinagre/vinagre-2.26.1.ebuild > >--- > net-misc/vinagre/Manifest | 3 +- > .../files/vinagre-2.26.1-optional-applet.patch | 68 ++++++++++++++++++++ > net-misc/vinagre/vinagre-2.26.1.ebuild | 22 ++++-- > 3 files changed, 85 insertions(+), 8 deletions(-) > create mode 100644 net-misc/vinagre/files/vinagre-2.26.1-optional-applet.patch > >diff --git a/net-misc/vinagre/Manifest b/net-misc/vinagre/Manifest >index f951c7d..65fda38 100644 >--- a/net-misc/vinagre/Manifest >+++ b/net-misc/vinagre/Manifest >@@ -1,2 +1,3 @@ >+AUX vinagre-2.26.1-optional-applet.patch 2088 RMD160 a6be652bd6e3e8358511840182fca90e676ec32d SHA1 21393c17ee4a2c63df249f4a1588b377f427058a SHA256 ee9350f4651c6b16b217be091b5eed751cc89d508557205145537386b8fed4fb > DIST vinagre-2.26.1.tar.bz2 1453150 RMD160 298ede9406ffde74fbcfb5491bcb5d481dd35d84 SHA1 7670dd1c9bc9b213539f10addfee4983a5ee9422 SHA256 d5a9fc5940d23f7a0209846576a81d4fc62f9fb038f945693b1be77c4e50f09c >-EBUILD vinagre-2.26.1.ebuild 1226 RMD160 8cc3e97da8929979399552e937e2ca7ec16c1dc5 SHA1 91c6400652222d3dcb818ab414d5457439480920 SHA256 dc8ed39c66d230dbfaa98e5f7f1385caea2b090b6042f889af3d0719d894622f >+EBUILD vinagre-2.26.1.ebuild 1367 RMD160 2e475183c0266fbead6c615016889bba33954252 SHA1 a833645eeee2f857d86114f9b089385bfb165d76 SHA256 edfc0e4600466a03164367e1919a1391d88b959b99fc2fedc438f274b0940447 >diff --git a/net-misc/vinagre/files/vinagre-2.26.1-optional-applet.patch b/net-misc/vinagre/files/vinagre-2.26.1-optional-applet.patch >new file mode 100644 >index 0000000..28624bc >--- /dev/null >+++ b/net-misc/vinagre/files/vinagre-2.26.1-optional-applet.patch >@@ -0,0 +1,68 @@ >+ configure.ac | 18 ++++++++++++++---- >+ src/Makefile.am | 3 ++- >+ 2 files changed, 16 insertions(+), 5 deletions(-) >+ >+diff --git a/configure.ac b/configure.ac >+index 345140b..faa76db 100644 >+--- a/configure.ac >++++ b/configure.ac >+@@ -46,7 +46,7 @@ PANEL_REQUIRED_VERSION=2.0.0 >+ # Check for avahi >+ AC_ARG_ENABLE(avahi, >+ AC_HELP_STRING([--disable-avahi], >+- [Do not use avahi for auto-discover machines [default=no]]), >++ [Do not use avahi for auto-discover machines @<:@default=yes@:>@]), >+ enable_avahi=${enableval}, >+ enable_avahi=yes) >+ >+@@ -72,10 +72,19 @@ PKG_CHECK_MODULES(VINAGRE, \ >+ AC_SUBST(VINAGRE_CFLAGS) >+ AC_SUBST(VINAGRE_LIBS) >+ >+-PKG_CHECK_MODULES(APPLET, \ >+- libpanelapplet-2.0 >= $PANEL_REQUIRED_VERSION) >++AC_ARG_ENABLE(applet, >++ AC_HELP_STRING([--disable-applet], [Disable vinagre applet @<:@default=yes@:>@]), >++ enable_applet=$enableval, >++ enable_applet=yes) >++ >++if test "x$enable_applet" = "xyes";then >++ PKG_CHECK_MODULES(APPLET, \ >++ libpanelapplet-2.0 >= $PANEL_REQUIRED_VERSION) >+ AC_SUBST(APPLET_CFLAGS) >+ AC_SUBST(APPLET_LIBS) >++fi >++ >++AM_CONDITIONAL(APPLET, test "x$enable_applet" = "xyes") >+ >+ dnl ================================================================ >+ dnl GConf related settings >+@@ -124,5 +133,6 @@ Configure summary: >+ Compiler ...................: ${CC} >+ Compiler Flags .............: ${CFLAGS} >+ >+- Avahi enabled ..............: ${enable_avahi} >++ Avahi enabled ..............: ${enable_avahi} >++ Applet enabled ..............: ${enable_applet} >+ " >+diff --git a/src/Makefile.am b/src/Makefile.am >+index 2bcb1ae..749754f 100644 >+--- a/src/Makefile.am >++++ b/src/Makefile.am >+@@ -74,6 +74,7 @@ $(server_in_files): $(server_in_files:.server.in=.server.in.in) >+ # The applet binary >+ ############################## >+ >++if APPLET >+ libexec_PROGRAMS = vinagre-applet >+ >+ vinagre_applet_CFLAGS = \ >+@@ -101,7 +102,7 @@ vinagre_applet_LDADD = \ >+ $(VINAGRE_LIBS) \ >+ $(AVAHI_LIBS) \ >+ $(NULL) >+- >++endif >+ >+ ############################## >+ # Autogenerated stuff >diff --git a/net-misc/vinagre/vinagre-2.26.1.ebuild b/net-misc/vinagre/vinagre-2.26.1.ebuild >index 13d42b9..cc231e9 100644 >--- a/net-misc/vinagre/vinagre-2.26.1.ebuild >+++ b/net-misc/vinagre/vinagre-2.26.1.ebuild >@@ -4,7 +4,7 @@ > > EAPI="2" > >-inherit gnome2 >+inherit gnome2 autotools > > DESCRIPTION="VNC Client for the GNOME Desktop" > HOMEPAGE="http://www.gnome.org/projects/vinagre/" >@@ -12,9 +12,7 @@ HOMEPAGE="http://www.gnome.org/projects/vinagre/" > LICENSE="GPL-2" > SLOT="0" > KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd" >-IUSE="avahi test" >- >-# FIXME: make gnome-panel applet optional ? >+IUSE="applet avahi test" > > RDEPEND=">=dev-libs/glib-2.17.0 > >=x11-libs/gtk+-2.13.1 >@@ -22,8 +20,8 @@ RDEPEND=">=dev-libs/glib-2.17.0 > >=gnome-base/gconf-2.16 > >=net-libs/gtk-vnc-0.3.8 > >=gnome-base/gnome-keyring-1 >- >=gnome-base/gnome-panel-2 >- avahi? ( >=net-dns/avahi-0.6.22[dbus,gtk] )" >+ applet? ( >=gnome-base/gnome-panel-2 ) >+ avahi? ( >=net-dns/avahi-0.6.22[dbus,gtk] )" > > DEPEND="${RDEPEND} > >=dev-lang/perl-5 >@@ -38,7 +36,17 @@ DOCS="AUTHORS ChangeLog MAINTAINERS NEWS README" > pkg_setup() { > G2CONF="${G2CONF} > --disable-scrollkeeper >- $(use_enable avahi)" >+ $(use_enable avahi) >+ $(use_enable applet)" >+} >+ >+src_unpack() >+{ >+ gnome2_src_unpack >+ >+ # Make gnome-applet optional >+ epatch "${FILESDIR}/${P}-optional-applet.patch" >+ eautoreconf > } > > src_install() { >-- >1.6.2.3 >
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
Attachments on
bug 267279
: 189267