[gentoo-commits] proj/gnome:master commit in: dev-util/gdbus-codegen/, dev-util/gdbus-codegen/files/
commit: 5cb773cf137cd5fcef22513441e8c58634ed3632
Author: Rémi Cardona gentoo org>
AuthorDate: Sun Apr 15 00:49:58 2018 +
Commit: Remi Cardona gentoo org>
CommitDate: Sun Apr 15 00:49:58 2018 +
URL:https://gitweb.gentoo.org/proj/gnome.git/commit/?id=5cb773cf
dev-util/gdbus-codegen: fix hashbang for gdbus-codegen
From: Dale Lukas Peterson gmail.com>
Closes: https://bugs.gentoo.org/653170
Package-Manager: Portage-2.3.28, Repoman-2.3.9
Manifest-Sign-Key: 0xE0663D48103108F8
dev-util/gdbus-codegen/files/gdbus-codegen-2.56.1-sitedir.patch| 3 ++-
.../{gdbus-codegen-2.56.1.ebuild => gdbus-codegen-2.56.1-r1.ebuild}| 2 +-
2 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/dev-util/gdbus-codegen/files/gdbus-codegen-2.56.1-sitedir.patch
b/dev-util/gdbus-codegen/files/gdbus-codegen-2.56.1-sitedir.patch
index 5b369798..30f0d7dc 100644
--- a/dev-util/gdbus-codegen/files/gdbus-codegen-2.56.1-sitedir.patch
+++ b/dev-util/gdbus-codegen/files/gdbus-codegen-2.56.1-sitedir.patch
@@ -45,7 +45,8 @@ index 67d367543..190afa28f 100755
-path = os.path.join('@DATADIR@', 'glib-2.0')
-
-sys.path.insert(0, path)
- from codegen import codegen_main
+-from codegen import codegen_main
++from gdbus_codegen import codegen_main
sys.exit(codegen_main.codegen_main())
--
diff --git a/dev-util/gdbus-codegen/gdbus-codegen-2.56.1.ebuild
b/dev-util/gdbus-codegen/gdbus-codegen-2.56.1-r1.ebuild
similarity index 94%
rename from dev-util/gdbus-codegen/gdbus-codegen-2.56.1.ebuild
rename to dev-util/gdbus-codegen/gdbus-codegen-2.56.1-r1.ebuild
index 3f4d065f..943c070c 100644
--- a/dev-util/gdbus-codegen/gdbus-codegen-2.56.1.ebuild
+++ b/dev-util/gdbus-codegen/gdbus-codegen-2.56.1-r1.ebuild
@@ -30,7 +30,7 @@ python_prepare_all() {
)
distutils-r1_python_prepare_all
- cp gdbus-codegen.in gdbus-codegen || die "cp failed"
+ sed -e 's:@PYTHON@:python:' gdbus-codegen.in > gdbus-codegen || die
cp "${FILESDIR}/setup.py-2.32.4" setup.py || die "cp failed"
sed -e "s/@PV@/${PV}/" -i setup.py || die "sed setup.py failed"
}
[gentoo-commits] proj/gnome:master commit in: dev-util/gdbus-codegen/, dev-util/gdbus-codegen/files/
commit: 83a60dca3e675a485ee257c95e69e810ca52b554
Author: Rémi Cardona gentoo org>
AuthorDate: Sat Apr 14 08:48:50 2018 +
Commit: Remi Cardona gentoo org>
CommitDate: Sat Apr 14 08:48:50 2018 +
URL:https://gitweb.gentoo.org/proj/gnome.git/commit/?id=83a60dca
dev-util/gdbus-codegen: bump to 2.56.1
Package-Manager: Portage-2.3.28, Repoman-2.3.9
Manifest-Sign-Key: 0xE0663D48103108F8
.../files/gdbus-codegen-2.56.1-sitedir.patch | 53 ++
dev-util/gdbus-codegen/gdbus-codegen-2.56.1.ebuild | 46 +++
2 files changed, 99 insertions(+)
diff --git a/dev-util/gdbus-codegen/files/gdbus-codegen-2.56.1-sitedir.patch
b/dev-util/gdbus-codegen/files/gdbus-codegen-2.56.1-sitedir.patch
new file mode 100644
index ..5b369798
--- /dev/null
+++ b/dev-util/gdbus-codegen/files/gdbus-codegen-2.56.1-sitedir.patch
@@ -0,0 +1,53 @@
+From 9eaaa76e2e36e46a43dbd419724696fd7ff8ea64 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?R=C3=A9mi=20Cardona?=
+Date: Sat, 14 Apr 2018 09:55:22 +0200
+Subject: [PATCH 1/2] gdbus-codegen-2.54.3-sitedir.patch
+
+---
+ gio/gdbus-2.0/codegen/gdbus-codegen.in | 28 --
+ 1 file changed, 28 deletions(-)
+
+diff --git a/gio/gdbus-2.0/codegen/gdbus-codegen.in
b/gio/gdbus-2.0/codegen/gdbus-codegen.in
+index 67d367543..190afa28f 100755
+--- a/gdbus-codegen.in
b/gdbus-codegen.in
+@@ -20,36 +20,8 @@
+ # Author: David Zeuthen
+
+
+-import os
+ import sys
+
+-srcdir = os.getenv('UNINSTALLED_GLIB_SRCDIR', None)
+-filedir = os.path.dirname(__file__)
+-
+-if srcdir is not None:
+-path = os.path.join(srcdir, 'gio', 'gdbus-2.0')
+-elif os.path.basename(filedir) == 'bin':
+-# Make the prefix containing gdbus-codegen 'relocatable' at runtime by
+-# adding /some/prefix/bin/../share/glib-2.0 to the python path
+-path = os.path.join(filedir, '..', 'share', 'glib-2.0')
+-else:
+-# Assume that the modules we need are in the current directory and add the
+-# parent directory to the python path.
+-path = os.path.join(filedir, '..')
+-
+-# Canonicalize, then do further testing
+-path = os.path.abspath(path)
+-
+-# If the above path detection failed, use the hard-coded datadir. This can
+-# happen when, for instance, bindir and datadir are not in the same prefix or
+-# on Windows where we cannot make any guarantees about the directory
structure.
+-#
+-# In these cases our installation cannot be relocatable, but at least we
should
+-# be able to find the codegen module.
+-if not os.path.isfile(os.path.join(path, 'codegen', 'codegen_main.py')):
+-path = os.path.join('@DATADIR@', 'glib-2.0')
+-
+-sys.path.insert(0, path)
+ from codegen import codegen_main
+
+ sys.exit(codegen_main.codegen_main())
+--
+2.17.0
+
diff --git a/dev-util/gdbus-codegen/gdbus-codegen-2.56.1.ebuild
b/dev-util/gdbus-codegen/gdbus-codegen-2.56.1.ebuild
new file mode 100644
index ..3f4d065f
--- /dev/null
+++ b/dev-util/gdbus-codegen/gdbus-codegen-2.56.1.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+GNOME_ORG_MODULE="glib"
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
+PYTHON_REQ_USE="xml"
+
+inherit gnome.org distutils-r1
+
+DESCRIPTION="GDBus code and documentation generator"
+HOMEPAGE="https://www.gtk.org/";
+
+LICENSE="LGPL-2+"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390
~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux
~x64-macos ~x86-macos"
+IUSE=""
+
+RDEPEND="${PYTHON_DEPS}"
+DEPEND="${RDEPEND}"
+
+# To prevent circular dependencies with glib[test]
+PDEPEND=">=dev-libs/glib-${PV}:2"
+
+S="${WORKDIR}/glib-${PV}/gio/gdbus-2.0/codegen"
+
+python_prepare_all() {
+ PATCHES=(
+ "${FILESDIR}/${PN}-2.56.1-sitedir.patch"
+ )
+ distutils-r1_python_prepare_all
+
+ cp gdbus-codegen.in gdbus-codegen || die "cp failed"
+ cp "${FILESDIR}/setup.py-2.32.4" setup.py || die "cp failed"
+ sed -e "s/@PV@/${PV}/" -i setup.py || die "sed setup.py failed"
+}
+
+src_test() {
+ einfo "Skipping tests. This package is tested by dev-libs/glib"
+ einfo "when merged with FEATURES=test"
+}
+
+python_install_all() {
+ distutils-r1_python_install_all # no-op, but prevents QA warning
+ doman "${WORKDIR}/glib-${PV}/docs/reference/gio/gdbus-codegen.1"
+}
[gentoo-commits] proj/gnome:master commit in: dev-util/gdbus-codegen/, dev-util/gdbus-codegen/files/
commit: 2fbb943aebc10b093727e3179b9ac048fcbf4495
Author: Dennis Lamm gentoo org>
AuthorDate: Mon Jan 22 19:07:40 2018 +
Commit: Dennis Lamm gentoo org>
CommitDate: Mon Jan 22 19:07:40 2018 +
URL:https://gitweb.gentoo.org/proj/gnome.git/commit/?id=2fbb943a
dev-util/gdbus-codegen: fixed bug 644610
Package-Manager: Portage-2.3.19, Repoman-2.3.6
.../files/gdbus-codegen-2.54.3-sitedir.patch | 22 ++
dev-util/gdbus-codegen/gdbus-codegen-2.54.3.ebuild | 2 +-
dev-util/gdbus-codegen/metadata.xml| 11 +++
3 files changed, 30 insertions(+), 5 deletions(-)
diff --git a/dev-util/gdbus-codegen/files/gdbus-codegen-2.54.3-sitedir.patch
b/dev-util/gdbus-codegen/files/gdbus-codegen-2.54.3-sitedir.patch
new file mode 100644
index ..f739026d
--- /dev/null
+++ b/dev-util/gdbus-codegen/files/gdbus-codegen-2.54.3-sitedir.patch
@@ -0,0 +1,22 @@
+diff --git a/gio/gdbus-2.0/codegen/gdbus-codegen.in
b/gio/gdbus-2.0/codegen/gdbus-codegen.in
+index 8050981..932410a 100644
+--- a/gdbus-codegen.in
b/gdbus-codegen.in
+@@ -28,16 +28,7 @@ filedir = os.path.dirname(__file__)
+
+ if srcdir is not None:
+ path = os.path.join(srcdir, 'gio', 'gdbus-2.0')
+-elif os.path.basename(filedir) == 'bin':
+-# Make the prefix containing gdbus-codegen 'relocatable' at runtime by
+-# adding /some/prefix/bin/../share/glib-2.0 to the python path
+-path = os.path.join(filedir, '..', 'share', 'glib-2.0')
+ else:
+-# Assume that the modules we need are in the current directory and add the
+-# parent directory to the python path.
+-path = os.path.join(filedir, '..')
+-
+-sys.path.insert(0, os.path.abspath(path))
+-from codegen import codegen_main
++ from gdbus_codegen import codegen_main
+
+ sys.exit(codegen_main.codegen_main())
diff --git a/dev-util/gdbus-codegen/gdbus-codegen-2.54.3.ebuild
b/dev-util/gdbus-codegen/gdbus-codegen-2.54.3.ebuild
index cf8d58e5..340ce0e9 100644
--- a/dev-util/gdbus-codegen/gdbus-codegen-2.54.3.ebuild
+++ b/dev-util/gdbus-codegen/gdbus-codegen-2.54.3.ebuild
@@ -26,7 +26,7 @@ S="${WORKDIR}/glib-${PV}/gio/gdbus-2.0/codegen"
python_prepare_all() {
PATCHES=(
- "${FILESDIR}/${PN}-2.54.2-sitedir.patch"
+ "${FILESDIR}/${PN}-2.54.3-sitedir.patch"
)
distutils-r1_python_prepare_all
diff --git a/dev-util/gdbus-codegen/metadata.xml
b/dev-util/gdbus-codegen/metadata.xml
index 39980802..922faa44 100644
--- a/dev-util/gdbus-codegen/metadata.xml
+++ b/dev-util/gdbus-codegen/metadata.xml
@@ -1,8 +1,11 @@
http://www.gentoo.org/dtd/metadata.dtd";>
-
- gn...@gentoo.org
- Gentoo GNOME Desktop
-
+
+ gn...@gentoo.org
+ Gentoo GNOME Desktop
+
+
+ gdbus-codegen is used to generate code and/or documentation for
one or more D-Bus interfaces. The tool reads D-Bus Introspection XML files and
generates output files.
+
