diff options
| author | V3n3RiX <venerix@redcorelinux.org> | 2018-07-14 20:57:42 +0100 |
|---|---|---|
| committer | V3n3RiX <venerix@redcorelinux.org> | 2018-07-14 20:57:42 +0100 |
| commit | 1798c4aeca70ac8d0a243684d6a798fbc65735f8 (patch) | |
| tree | e48e19cb6fa03de18e1c63e1a93371b7ebc4eb56 /dev-libs/libappindicator/files | |
| parent | d87262dd706fec50cd150aab3e93883b6337466d (diff) | |
gentoo resync : 14.07.2018
Diffstat (limited to 'dev-libs/libappindicator/files')
| -rw-r--r-- | dev-libs/libappindicator/files/libappindicator-12.10.0-conditional-py-bindings.patch | 72 | ||||
| -rw-r--r-- | dev-libs/libappindicator/files/libappindicator-12.10.0-vala-inherit.patch | 14 |
2 files changed, 0 insertions, 86 deletions
diff --git a/dev-libs/libappindicator/files/libappindicator-12.10.0-conditional-py-bindings.patch b/dev-libs/libappindicator/files/libappindicator-12.10.0-conditional-py-bindings.patch deleted file mode 100644 index c916d9ba2cf6..000000000000 --- a/dev-libs/libappindicator/files/libappindicator-12.10.0-conditional-py-bindings.patch +++ /dev/null @@ -1,72 +0,0 @@ ---- a/bindings/Makefile.am 2015-07-10 10:04:18.091199191 +0200 -+++ b/bindings/Makefile.am 2015-07-10 10:19:47.047974439 +0200 -@@ -3,8 +3,10 @@ - vala - else - SUBDIRS = \ -- python \ - vala -+if HAS_PYTHON -+SUBDIRS += python -+endif - endif - - if HAS_MONO ---- a/configure.ac 2015-07-16 13:28:41.007502838 +0200 -+++ b/configure.ac_new 2015-07-16 13:53:18.118602877 +0200 -@@ -188,25 +188,37 @@ - PYGTK_REQUIRED=2.14.0 - PYGOBJECT_REQUIRED=0.22 - --AM_PATH_PYTHON(2.3.5) --AM_CHECK_PYTHON_HEADERS(,[AC_MSG_ERROR(could not find Python headers)]) -+AC_ARG_ENABLE([python], -+ AC_HELP_STRING([--enable-python], [Enable python for GTK2 build]),, -+ [enable_python=yes]) - --PKG_CHECK_MODULES(APPINDICATOR_PYTHON, -+if test x"$with_gtk" = x"3" ; then -+ enable_python=no -+fi -+ -+AM_CONDITIONAL(HAS_PYTHON, test x"${enable_python}" != x"no") -+ -+if test x"$enable_python" != x"no" ; then -+ AM_PATH_PYTHON(2.3.5) -+ AM_CHECK_PYTHON_HEADERS(,[AC_MSG_ERROR(could not find Python headers)]) -+ -+ PKG_CHECK_MODULES(APPINDICATOR_PYTHON, - [ - pygtk-2.0 >= $PYGTK_REQUIRED - gtk+-2.0 >= $GTK_REQUIRED_VERSION - pygobject-2.0 >= $PYGOBJECT_REQUIRED - ]) - --AC_MSG_CHECKING(for pygtk defs) --PYGTK_DEFSDIR=`$PKG_CONFIG --variable=defsdir pygtk-2.0` --AC_SUBST(PYGTK_DEFSDIR) --AC_MSG_RESULT($PYGTK_DEFSDIR) -- --AC_MSG_CHECKING(for pygtk codegen) --PYGTK_CODEGEN="$PYTHON `$PKG_CONFIG --variable=codegendir pygtk-2.0`/codegen.py" --AC_SUBST(PYGTK_CODEGEN) --AC_MSG_RESULT($PYGTK_CODEGEN) -+ AC_MSG_CHECKING(for pygtk defs) -+ PYGTK_DEFSDIR=`$PKG_CONFIG --variable=defsdir pygtk-2.0` -+ AC_SUBST(PYGTK_DEFSDIR) -+ AC_MSG_RESULT($PYGTK_DEFSDIR) -+ -+ AC_MSG_CHECKING(for pygtk codegen) -+ PYGTK_CODEGEN="$PYTHON `$PKG_CONFIG --variable=codegendir pygtk-2.0`/codegen.py" -+ AC_SUBST(PYGTK_CODEGEN) -+ AC_MSG_RESULT($PYGTK_CODEGEN) -+fi - - ######################### - # Check if build tests -@@ -278,4 +290,5 @@ - Tests: $enable_tests - Mono tests: $have_nunit - gcov: $use_gcov -+ Python: $enable_python - ]) diff --git a/dev-libs/libappindicator/files/libappindicator-12.10.0-vala-inherit.patch b/dev-libs/libappindicator/files/libappindicator-12.10.0-vala-inherit.patch deleted file mode 100644 index e71cb690c15e..000000000000 --- a/dev-libs/libappindicator/files/libappindicator-12.10.0-vala-inherit.patch +++ /dev/null @@ -1,14 +0,0 @@ -# http://bazaar.launchpad.net/~indicator-applet-developers/libappindicator/trunk.12.10/revision/244 -=== modified file 'bindings/vala/appindicator-0.1-custom.vala' ---- a/bindings/vala/appindicator-0.1-custom.vala 2011-09-23 15:46:27 +0000 -+++ b/bindings/vala/appindicator-0.1-custom.vala 2012-10-10 23:33:35 +0000 -@@ -23,7 +23,7 @@ - */ - - namespace AppIndicator { -- [CCode (type_check_function = "IS_APP_INDICATOR")] -+ [CCode (type_check_function = "IS_APP_INDICATOR", type_id = "app_indicator_get_type ()")] - public class Indicator : GLib.Object { - } - } - |