* [gentoo-commits] proj/gnome:master commit in: net-libs/gtk-vnc/
@ 2011-02-25 19:42 Nirbheek Chauhan
0 siblings, 0 replies; 6+ messages in thread
From: Nirbheek Chauhan @ 2011-02-25 19:42 UTC (permalink / raw
To: gentoo-commits
commit: 20b32b6891d7a8d3d785b7429b46af5eae986912
Author: Nirbheek Chauhan <nirbheek <AT> gentoo <DOT> org>
AuthorDate: Fri Feb 25 02:44:11 2011 +0000
Commit: Nirbheek Chauhan <nirbheek <AT> gentoo <DOT> org>
CommitDate: Fri Feb 25 19:41:54 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=20b32b68
net-libs/gtk-vnc: distinguish gtk3 version from gtk2 version in-tree
---
...-vnc-0.4.3.ebuild => gtk-vnc-0.4.3-r300.ebuild} | 0
1 files changed, 0 insertions(+), 0 deletions(-)
diff --git a/net-libs/gtk-vnc/gtk-vnc-0.4.3.ebuild b/net-libs/gtk-vnc/gtk-vnc-0.4.3-r300.ebuild
similarity index 100%
rename from net-libs/gtk-vnc/gtk-vnc-0.4.3.ebuild
rename to net-libs/gtk-vnc/gtk-vnc-0.4.3-r300.ebuild
^ permalink raw reply [flat|nested] 6+ messages in thread
* [gentoo-commits] proj/gnome:master commit in: net-libs/gtk-vnc/
@ 2011-03-19 23:22 Nirbheek Chauhan
0 siblings, 0 replies; 6+ messages in thread
From: Nirbheek Chauhan @ 2011-03-19 23:22 UTC (permalink / raw
To: gentoo-commits
commit: f9fe54d4b25a64c6c82019ea1199b1f06d7005f6
Author: Nirbheek Chauhan <nirbheek <AT> gentoo <DOT> org>
AuthorDate: Sat Mar 19 19:54:17 2011 +0000
Commit: Nirbheek Chauhan <nirbheek <AT> gentoo <DOT> org>
CommitDate: Sat Mar 19 20:04:17 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=f9fe54d4
net-libs/gtk-vnc: fix comment about python support
---
net-libs/gtk-vnc/gtk-vnc-0.4.3-r300.ebuild | 3 ++-
1 files changed, 2 insertions(+), 1 deletions(-)
diff --git a/net-libs/gtk-vnc/gtk-vnc-0.4.3-r300.ebuild b/net-libs/gtk-vnc/gtk-vnc-0.4.3-r300.ebuild
index 79bca10..9a6896e 100644
--- a/net-libs/gtk-vnc/gtk-vnc-0.4.3-r300.ebuild
+++ b/net-libs/gtk-vnc/gtk-vnc-0.4.3-r300.ebuild
@@ -33,7 +33,8 @@ DEPEND="${RDEPEND}
>=dev-util/intltool-0.40"
src_configure() {
- # No python support with gtk+:3
+ # Python support is via gobject-introspection
+ # Ex: from gi.repository import GtkVnc
econf \
$(use_with examples) \
$(use_enable introspection) \
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [gentoo-commits] proj/gnome:master commit in: net-libs/gtk-vnc/
@ 2011-04-16 14:39 Gilles Dartiguelongue
0 siblings, 0 replies; 6+ messages in thread
From: Gilles Dartiguelongue @ 2011-04-16 14:39 UTC (permalink / raw
To: gentoo-commits
commit: cf8dbb35f6f09d7a68385b4f5268bb5dfad54de8
Author: Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
AuthorDate: Sat Apr 16 14:39:21 2011 +0000
Commit: Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
CommitDate: Sat Apr 16 14:39:21 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=cf8dbb35
net-libs/gtk-vnc: fix typo with USE=python
---
net-libs/gtk-vnc/gtk-vnc-0.4.3-r301.ebuild | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/net-libs/gtk-vnc/gtk-vnc-0.4.3-r301.ebuild b/net-libs/gtk-vnc/gtk-vnc-0.4.3-r301.ebuild
index 1f148b7..bc548d1 100644
--- a/net-libs/gtk-vnc/gtk-vnc-0.4.3-r301.ebuild
+++ b/net-libs/gtk-vnc/gtk-vnc-0.4.3-r301.ebuild
@@ -64,7 +64,7 @@ src_configure() {
cd ${GTK2_BUILDDIR}
einfo "Running configure in ${GTK2_BUILDDIR}"
ECONF_SOURCE="${S}" econf ${myconf} \
- $(use_enable python) \
+ $(use_with python) \
--with-gtk=2.0
if use gtk3; then
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [gentoo-commits] proj/gnome:master commit in: net-libs/gtk-vnc/
@ 2011-04-30 10:00 Nirbheek Chauhan
0 siblings, 0 replies; 6+ messages in thread
From: Nirbheek Chauhan @ 2011-04-30 10:00 UTC (permalink / raw
To: gentoo-commits
commit: 8e2afa25cef5dc774bb25861c831948eb8f3f302
Author: Nirbheek Chauhan <nirbheek <AT> gentoo <DOT> org>
AuthorDate: Sat Apr 30 09:52:07 2011 +0000
Commit: Nirbheek Chauhan <nirbheek <AT> gentoo <DOT> org>
CommitDate: Sat Apr 30 09:52:07 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=8e2afa25
net-libs/gtk-vnc: fix h2def.py codegendir
* Problem reported by Kobboi on #gentoo-desktop
---
net-libs/gtk-vnc/gtk-vnc-0.4.3-r301.ebuild | 4 ++++
1 files changed, 4 insertions(+), 0 deletions(-)
diff --git a/net-libs/gtk-vnc/gtk-vnc-0.4.3-r301.ebuild b/net-libs/gtk-vnc/gtk-vnc-0.4.3-r301.ebuild
index bc548d1..f0414aa 100644
--- a/net-libs/gtk-vnc/gtk-vnc-0.4.3-r301.ebuild
+++ b/net-libs/gtk-vnc/gtk-vnc-0.4.3-r301.ebuild
@@ -47,6 +47,10 @@ src_prepare() {
# Fix incorrect rules for out of tree build
epatch "${FILESDIR}/${PN}-0.4.3-outoftree-build.patch"
+ # Fix incorrect codegendir check: h2def.py is in pygobject, not pygtk
+ sed -e 's/codegendir pygtk-2.0/codegendir pygobject-2.0/g' \
+ -i src/Makefile.* || die
+
intltoolize --force --copy --automake || die
eautoreconf
}
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [gentoo-commits] proj/gnome:master commit in: net-libs/gtk-vnc/
@ 2012-09-05 15:48 Nirbheek Chauhan
0 siblings, 0 replies; 6+ messages in thread
From: Nirbheek Chauhan @ 2012-09-05 15:48 UTC (permalink / raw
To: gentoo-commits
commit: a01c18ff9a1860deee170998ae61fdcb3d219bdb
Author: Nirbheek Chauhan <nirbheek <AT> gentoo <DOT> org>
AuthorDate: Mon Sep 3 20:37:33 2012 +0000
Commit: Nirbheek Chauhan <nirbheek <AT> gentoo <DOT> org>
CommitDate: Wed Sep 5 15:48:22 2012 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=a01c18ff
gtk-vnc: fix keywords
---
net-libs/gtk-vnc/gtk-vnc-9999.ebuild | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/net-libs/gtk-vnc/gtk-vnc-9999.ebuild b/net-libs/gtk-vnc/gtk-vnc-9999.ebuild
index 6f8ec16..d3a61b6 100644
--- a/net-libs/gtk-vnc/gtk-vnc-9999.ebuild
+++ b/net-libs/gtk-vnc/gtk-vnc-9999.ebuild
@@ -18,7 +18,7 @@ SLOT="0"
if [[ ${PV} = 9999 ]]; then
KEYWORDS=""
else
- KEYWORDS="alpha amd64 ia64 ppc ppc64 sparc x86 ~x86-fbsd"
+ KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
fi
IUSE="examples +gtk3 +introspection python sasl +vala"
REQUIRED_USE="vala? ( introspection )"
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [gentoo-commits] proj/gnome:master commit in: net-libs/gtk-vnc/
@ 2013-12-18 23:08 Gilles Dartiguelongue
0 siblings, 0 replies; 6+ messages in thread
From: Gilles Dartiguelongue @ 2013-12-18 23:08 UTC (permalink / raw
To: gentoo-commits
commit: c9a0ce606f2330f214ee25fd3c48df98f4a21dff
Author: Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
AuthorDate: Wed Dec 18 22:58:04 2013 +0000
Commit: Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
CommitDate: Wed Dec 18 22:58:04 2013 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=c9a0ce60
net-libs/gtk-vnc: sync with gentoo-x86
---
net-libs/gtk-vnc/gtk-vnc-9999.ebuild | 151 +++++++++++++++++++++++------------
net-libs/gtk-vnc/metadata.xml | 12 +++
2 files changed, 111 insertions(+), 52 deletions(-)
diff --git a/net-libs/gtk-vnc/gtk-vnc-9999.ebuild b/net-libs/gtk-vnc/gtk-vnc-9999.ebuild
index d3a61b6..9bb9545 100644
--- a/net-libs/gtk-vnc/gtk-vnc-9999.ebuild
+++ b/net-libs/gtk-vnc/gtk-vnc-9999.ebuild
@@ -1,49 +1,62 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/gtk-vnc/gtk-vnc-0.4.3-r1.ebuild,v 1.6 2011/10/30 17:24:14 armin76 Exp $
+# $Header: $
-EAPI="4"
-GNOME2_LA_PUNT="yes"
+EAPI="5"
+PYTHON_COMPAT=( python2_{6,7} )
+VALA_MIN_API_VERSION="0.16"
+VALA_USE_DEPEND="vapigen"
-inherit autotools eutils base gnome.org python
+inherit eutils gnome.org python-r1 vala
if [[ ${PV} = 9999 ]]; then
inherit gnome2-live
fi
DESCRIPTION="VNC viewer widget for GTK"
-HOMEPAGE="http://live.gnome.org/gtk-vnc"
+HOMEPAGE="https://live.gnome.org/gtk-vnc"
LICENSE="GPL-2"
SLOT="0"
if [[ ${PV} = 9999 ]]; then
KEYWORDS=""
else
- KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+ KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc x86 ~x86-fbsd"
fi
-IUSE="examples +gtk3 +introspection python sasl +vala"
-REQUIRED_USE="vala? ( introspection )"
+IUSE="examples +gtk3 +introspection pulseaudio python sasl vala"
+REQUIRED_USE="
+ python? ( ${PYTHON_REQUIRED_USE} )
+ vala? ( gtk3 introspection )
+"
# libview is used in examples/gvncviewer -- no need
-# TODO: review nsplugin when it will be considered less experimental
-
-COMMON_DEPEND=">=dev-libs/glib-2.10:2
+COMMON_DEPEND="
+ >=dev-libs/glib-2.30.1:2
+ >=dev-libs/libgcrypt-1.4.2
+ dev-libs/libgpg-error
>=net-libs/gnutls-1.4
>=x11-libs/cairo-1.2
>=x11-libs/gtk+-2.18:2
x11-libs/libX11
gtk3? ( >=x11-libs/gtk+-2.91.3:3 )
introspection? ( >=dev-libs/gobject-introspection-0.9.4 )
- python? ( >=dev-python/pygtk-2:2 )
- sasl? ( dev-libs/cyrus-sasl )"
+ pulseaudio? ( media-sound/pulseaudio )
+ python? (
+ ${PYTHON_DEPS}
+ >=dev-python/pygtk-2:2[${PYTHON_USEDEP}] )
+ sasl? ( dev-libs/cyrus-sasl )
+"
RDEPEND="${COMMON_DEPEND}"
+
DEPEND="${COMMON_DEPEND}
>=dev-lang/perl-5
- sys-devel/gettext
>=dev-util/intltool-0.40
+ sys-devel/gettext
virtual/pkgconfig
vala? (
- dev-lang/vala:0.14
- >=dev-libs/gobject-introspection-0.9.4 )"
+ $(vala_depend)
+ >=dev-libs/gobject-introspection-0.9.4 )
+"
+# eautoreconf requires gnome-common
if [[ ${PV} = 9999 ]]; then
# Needed by src/keymap-gen.pl to autogenerate keymap .c/.h files
@@ -55,15 +68,15 @@ fi
GTK2_BUILDDIR="${WORKDIR}/${P}_gtk2"
GTK3_BUILDDIR="${WORKDIR}/${P}_gtk3"
-pkg_setup() {
- python_set_active_version 2
- python_pkg_setup
-}
-
src_prepare() {
- python_convert_shebangs -r 2 .
- mkdir "${GTK2_BUILDDIR}" || die
- mkdir "${GTK3_BUILDDIR}" || die
+ mkdir -p "${GTK2_BUILDDIR}" || die
+ mkdir -p "${GTK3_BUILDDIR}" || die
+ prepare_python() {
+ mkdir -p "${BUILD_DIR}" || die
+ }
+ if use python; then
+ python_foreach_impl prepare_python
+ fi
# Remove a few files that were autogenerated during distcheck.
# Having these around in srcdir breaks out of tree build since they're
@@ -71,11 +84,15 @@ src_prepare() {
# they're generated files, not source files. Funny false dichotomy.
rm -vf "${S}"/src/{vncconnectionenums.[ch],vncdisplayenums.[ch]}
- # Fix incorrect codegendir check: h2def.py is in pygobject, not pygtk
+ # Fix incorrect codegendir check: h2def.py is in pygobject, not pygtk, upstream bug#????
sed -e 's/codegendir pygtk-2.0/codegendir pygobject-2.0/g' \
-i src/Makefile.* || die
- gnome2_src_prepare
+ # libtool seems unable to find this via VPATH so help it
+ sed -r "s:(gtkvnc_la_LIBADD =) libgtk-vnc-.*\.la:\1 ${GTK2_BUILDDIR}/src/libgtk-vnc-1.0.la:" \
+ -i src/Makefile.{am,in} || die
+
+ vala_src_prepare
}
src_configure() {
@@ -83,71 +100,101 @@ src_configure() {
myconf="
$(use_with examples) \
$(use_enable introspection) \
+ $(use_with pulseaudio) \
$(use_with sasl) \
- $(use_enable vala) \
- VAPIGEN=$(type -P vapigen-0.14) \
--with-coroutine=gthread \
--without-libview \
- --disable-static"
+ --disable-static \
+ --disable-vala"
- cd ${GTK2_BUILDDIR}
+ cd "${GTK2_BUILDDIR}" || die
einfo "Running configure in ${GTK2_BUILDDIR}"
ECONF_SOURCE="${S}" econf ${myconf} \
- $(use_with python) \
+ --with-python=no \
--with-gtk=2.0
+ configure_python() {
+ ECONF_SOURCE="${S}" econf ${myconf} \
+ $(use_with python) \
+ --with-gtk=2.0
+ }
+ if use python; then
+ python_foreach_impl run_in_build_dir configure_python
+ fi
+
if use gtk3; then
- cd ${GTK3_BUILDDIR}
+ cd "${GTK3_BUILDDIR}" || die
einfo "Running configure in ${GTK3_BUILDDIR}"
# Python support is via gobject-introspection
# Ex: from gi.repository import GtkVnc
ECONF_SOURCE="${S}" econf ${myconf} \
+ $(use_enable vala) \
--with-python=no \
--with-gtk=3.0
fi
}
src_compile() {
- cd ${GTK2_BUILDDIR}
+ cd "${GTK2_BUILDDIR}" || die
einfo "Running make in ${GTK2_BUILDDIR}"
- emake || die
+ emake
+
+ compile_python() {
+ cd "${BUILD_DIR}"/src || die
+ # CPPFLAGS set to help find includes for gvnc.override
+ emake gtkvnc.la \
+ VPATH="${S}/src:${GTK2_BUILDDIR}/src:${BUILD_DIR}/src" \
+ CPPFLAGS="${CPPFLAGS} -I${GTK2_BUILDDIR}/src"
+ }
+ if use python; then
+ python_foreach_impl run_in_build_dir compile_python
+ fi
if use gtk3; then
- cd ${GTK3_BUILDDIR}
+ cd "${GTK3_BUILDDIR}" || die
einfo "Running make in ${GTK3_BUILDDIR}"
- emake || die
+ emake
fi
}
src_test() {
- cd ${GTK2_BUILDDIR}
+ cd "${GTK2_BUILDDIR}" || die
einfo "Running make check in ${GTK2_BUILDDIR}"
- emake check || die
+ default
if use gtk3; then
- cd ${GTK3_BUILDDIR}
+ cd "${GTK3_BUILDDIR}" || die
einfo "Running make check in ${GTK3_BUILDDIR}"
- emake check || die
+ default
fi
}
src_install() {
- dodoc AUTHORS ChangeLog NEWS README || die
+ # Parallel installation fails sometimes, bug #328273, upstream bug #651923
+ # Upstream is still unable to reproduce, try again to use parallel with this new version
+ dodoc AUTHORS ChangeLog NEWS README
- cd ${GTK2_BUILDDIR}
+ cd "${GTK2_BUILDDIR}" || die
einfo "Running make install in ${GTK2_BUILDDIR}"
- # bug #328273
- MAKEOPTS="${MAKEOPTS} -j1" base_src_install
+# MAKEOPTS="${MAKEOPTS} -j1" default
+ default
+
+ install_python() {
+ cd "${BUILD_DIR}"/src || die
+ emake install-pyexecLTLIBRARIES DESTDIR="${D}" \
+ VPATH="${S}/src:${GTK2_BUILDDIR}/src:${BUILD_DIR}/src" \
+ CPPFLAGS="${CPPFLAGS} -I${GTK2_BUILDDIR}/src"
+ }
+ if use python; then
+ python_foreach_impl run_in_build_dir install_python
+ fi
if use gtk3; then
- cd ${GTK3_BUILDDIR}
+ cd "${GTK3_BUILDDIR}" || die
einfo "Running make install in ${GTK3_BUILDDIR}"
- # bug #328273
- MAKEOPTS="${MAKEOPTS} -j1" base_src_install
+ #MAKEOPTS="${MAKEOPTS} -j1" default
+ default
fi
- python_clean_installation_image
-
- # Remove .la files
- find "${ED}" -name '*.la' -exec rm -f '{}' + || die
+ prune_libtool_files
}
diff --git a/net-libs/gtk-vnc/metadata.xml b/net-libs/gtk-vnc/metadata.xml
new file mode 100644
index 0000000..4cb5547
--- /dev/null
+++ b/net-libs/gtk-vnc/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <herd>gnome</herd>
+ <herd>virtualization</herd>
+ <use>
+ <flag name="gtk3">Build the gtk3 gtk-vnc library and other gtk3 assets</flag>
+ <flag name="introspection">Use <pkg>dev-libs/gobject-introspection</pkg>
+ for introspection</flag>
+ <flag name="vala">Enable bindings for <pkg>dev-lang/vala</pkg></flag>
+ </use>
+</pkgmetadata>
^ permalink raw reply related [flat|nested] 6+ messages in thread
end of thread, other threads:[~2013-12-18 23:08 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2012-09-05 15:48 [gentoo-commits] proj/gnome:master commit in: net-libs/gtk-vnc/ Nirbheek Chauhan
-- strict thread matches above, loose matches on Subject: below --
2013-12-18 23:08 Gilles Dartiguelongue
2011-04-30 10:00 Nirbheek Chauhan
2011-04-16 14:39 Gilles Dartiguelongue
2011-03-19 23:22 Nirbheek Chauhan
2011-02-25 19:42 Nirbheek Chauhan
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox