diff options
| author |   Dennis Lamm <expeditioneer@gentoo.org> | 2018-01-22 20:07:40 +0100 |
|---|---|---|
| committer | Dennis Lamm <expeditioneer@gentoo.org> | 2018-01-22 20:07:40 +0100 |
| commit | 2fbb943aebc10b093727e3179b9ac048fcbf4495 (patch) | |
| tree | fb0fcc0bb783a5efcbfaae0a8ff1a0002c21f3e9 | |
| parent | gnome-extra/gnome-todo: raise GOA min req for Todoist support (diff) | |
| download | gnome-2fbb943aebc10b093727e3179b9ac048fcbf4495.tar.gz gnome-2fbb943aebc10b093727e3179b9ac048fcbf4495.tar.bz2 gnome-2fbb943aebc10b093727e3179b9ac048fcbf4495.zip | |
dev-util/gdbus-codegen: fixed bug 644610
Package-Manager: Portage-2.3.19, Repoman-2.3.6
| -rw-r--r-- | dev-util/gdbus-codegen/files/gdbus-codegen-2.54.3-sitedir.patch | 22 | ||||
| -rw-r--r-- | dev-util/gdbus-codegen/gdbus-codegen-2.54.3.ebuild | 2 | ||||
| -rw-r--r-- | 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 00000000..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 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> -<maintainer type="project"> - <email>gnome@gentoo.org</email> - <name>Gentoo GNOME Desktop</name> -</maintainer> + <maintainer type="project"> + <email>gnome@gentoo.org</email> + <name>Gentoo GNOME Desktop</name> + </maintainer> + <longdescription> + 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. + </longdescription> </pkgmetadata> |