| 1 |
mgorny 15/07/26 09:09:41 |
| 2 |
|
| 3 |
Added: |
| 4 |
libappindicator-12.10.0-conditional-py-bindings.patch |
| 5 |
Removed: libappindicator-12.10.0-disable-python.patch |
| 6 |
Log: |
| 7 |
Fix the build system in order to properly enable Python support. Fix introspection flag. https://github.com/gentoo/gentoo-portage-rsync-mirror/pull/168 by anyc. |
| 8 |
|
| 9 |
(Portage version: 2.2.20/cvs/Linux x86_64, signed Manifest commit with key EFB4464E!) |
| 10 |
|
| 11 |
Revision Changes Path |
| 12 |
1.1 dev-libs/libappindicator/files/libappindicator-12.10.0-conditional-py-bindings.patch |
| 13 |
|
| 14 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/libappindicator/files/libappindicator-12.10.0-conditional-py-bindings.patch?rev=1.1&view=markup |
| 15 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/libappindicator/files/libappindicator-12.10.0-conditional-py-bindings.patch?rev=1.1&content-type=text/plain |
| 16 |
|
| 17 |
Index: libappindicator-12.10.0-conditional-py-bindings.patch |
| 18 |
=================================================================== |
| 19 |
--- bindings/Makefile.am 2015-07-10 10:04:18.091199191 +0200 |
| 20 |
+++ bindings/Makefile.am 2015-07-10 10:19:47.047974439 +0200 |
| 21 |
@@ -3,8 +3,10 @@ |
| 22 |
vala |
| 23 |
else |
| 24 |
SUBDIRS = \ |
| 25 |
- python \ |
| 26 |
vala |
| 27 |
+if HAS_PYTHON |
| 28 |
+SUBDIRS += python |
| 29 |
+endif |
| 30 |
endif |
| 31 |
|
| 32 |
if HAS_MONO |
| 33 |
--- configure.ac 2015-07-16 13:28:41.007502838 +0200 |
| 34 |
+++ configure.ac_new 2015-07-16 13:53:18.118602877 +0200 |
| 35 |
@@ -188,25 +188,37 @@ |
| 36 |
PYGTK_REQUIRED=2.14.0 |
| 37 |
PYGOBJECT_REQUIRED=0.22 |
| 38 |
|
| 39 |
-AM_PATH_PYTHON(2.3.5) |
| 40 |
-AM_CHECK_PYTHON_HEADERS(,[AC_MSG_ERROR(could not find Python headers)]) |
| 41 |
+AC_ARG_ENABLE([python], |
| 42 |
+ AC_HELP_STRING([--enable-python], [Enable python for GTK2 build]),, |
| 43 |
+ [enable_python=yes]) |
| 44 |
|
| 45 |
-PKG_CHECK_MODULES(APPINDICATOR_PYTHON, |
| 46 |
+if test x"$with_gtk" = x"3" ; then |
| 47 |
+ enable_python=no |
| 48 |
+fi |
| 49 |
+ |
| 50 |
+AM_CONDITIONAL(HAS_PYTHON, test x"${enable_python}" != x"no") |
| 51 |
+ |
| 52 |
+if test x"$enable_python" != x"no" ; then |
| 53 |
+ AM_PATH_PYTHON(2.3.5) |
| 54 |
+ AM_CHECK_PYTHON_HEADERS(,[AC_MSG_ERROR(could not find Python headers)]) |
| 55 |
+ |
| 56 |
+ PKG_CHECK_MODULES(APPINDICATOR_PYTHON, |
| 57 |
[ |
| 58 |
pygtk-2.0 >= $PYGTK_REQUIRED |
| 59 |
gtk+-2.0 >= $GTK_REQUIRED_VERSION |
| 60 |
pygobject-2.0 >= $PYGOBJECT_REQUIRED |
| 61 |
]) |
| 62 |
|
| 63 |
-AC_MSG_CHECKING(for pygtk defs) |
| 64 |
-PYGTK_DEFSDIR=`$PKG_CONFIG --variable=defsdir pygtk-2.0` |
| 65 |
-AC_SUBST(PYGTK_DEFSDIR) |
| 66 |
-AC_MSG_RESULT($PYGTK_DEFSDIR) |
| 67 |
- |
| 68 |
-AC_MSG_CHECKING(for pygtk codegen) |
| 69 |
-PYGTK_CODEGEN="$PYTHON `$PKG_CONFIG --variable=codegendir pygtk-2.0`/codegen.py" |
| 70 |
-AC_SUBST(PYGTK_CODEGEN) |
| 71 |
-AC_MSG_RESULT($PYGTK_CODEGEN) |
| 72 |
+ AC_MSG_CHECKING(for pygtk defs) |
| 73 |
+ PYGTK_DEFSDIR=`$PKG_CONFIG --variable=defsdir pygtk-2.0` |
| 74 |
+ AC_SUBST(PYGTK_DEFSDIR) |
| 75 |
+ AC_MSG_RESULT($PYGTK_DEFSDIR) |
| 76 |
+ |
| 77 |
+ AC_MSG_CHECKING(for pygtk codegen) |
| 78 |
+ PYGTK_CODEGEN="$PYTHON `$PKG_CONFIG --variable=codegendir pygtk-2.0`/codegen.py" |
| 79 |
+ AC_SUBST(PYGTK_CODEGEN) |
| 80 |
+ AC_MSG_RESULT($PYGTK_CODEGEN) |
| 81 |
+fi |
| 82 |
|
| 83 |
######################### |
| 84 |
# Check if build tests |
| 85 |
@@ -278,4 +290,5 @@ |
| 86 |
Tests: $enable_tests |
| 87 |
Mono tests: $have_nunit |
| 88 |
gcov: $use_gcov |
| 89 |
+ Python: $enable_python |
| 90 |
]) |
Archives