From 53cf792021fa0c8666c1a074ee36a1f6b6600114 Mon Sep 17 00:00:00 2001 From: heitbaum Date: Sun, 28 Feb 2021 20:27:07 +0000 Subject: [PATCH 1/4] LibreELEC-settings: remove previous dbus dependancies - pygobject dbus-python --- packages/mediacenter/LibreELEC-settings/package.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/mediacenter/LibreELEC-settings/package.mk b/packages/mediacenter/LibreELEC-settings/package.mk index f911e66e26..030b28dbde 100644 --- a/packages/mediacenter/LibreELEC-settings/package.mk +++ b/packages/mediacenter/LibreELEC-settings/package.mk @@ -8,7 +8,7 @@ PKG_SHA256="6af8122ffef57dab78f5d8dd3c0491bd51dc90616c46a475c559156d51261420" PKG_LICENSE="GPL" PKG_SITE="https://libreelec.tv" PKG_URL="https://github.com/LibreELEC/service.libreelec.settings/archive/${PKG_VERSION}.tar.gz" -PKG_DEPENDS_TARGET="toolchain Python3 connman pygobject dbus-python dbussy" +PKG_DEPENDS_TARGET="toolchain Python3 connman dbussy" PKG_LONGDESC="LibreELEC-settings: is a settings dialog for LibreELEC" PKG_MAKE_OPTS_TARGET="ADDON_VERSION=${OS_VERSION} \ From 6ace0b8d8add0db8cab342802f844caba3628938 Mon Sep 17 00:00:00 2001 From: heitbaum Date: Sun, 28 Feb 2021 13:03:42 +0000 Subject: [PATCH 2/4] dbus-glib: drop unused package (replaced by dbussy) --- packages/devel/dbus-glib/package.mk | 27 ------------- ...us-glib-01-dont-build-tools-examples.patch | 38 ------------------- 2 files changed, 65 deletions(-) delete mode 100644 packages/devel/dbus-glib/package.mk delete mode 100644 packages/devel/dbus-glib/patches/dbus-glib-01-dont-build-tools-examples.patch diff --git a/packages/devel/dbus-glib/package.mk b/packages/devel/dbus-glib/package.mk deleted file mode 100644 index 205973e03e..0000000000 --- a/packages/devel/dbus-glib/package.mk +++ /dev/null @@ -1,27 +0,0 @@ -# SPDX-License-Identifier: GPL-2.0-or-later -# Copyright (C) 2009-2016 Stephan Raue (stephan@openelec.tv) -# Copyright (C) 2020-present Team LibreELEC (https://libreelec.tv) - -PKG_NAME="dbus-glib" -PKG_VERSION="0.110" -PKG_SHA256="7ce4760cf66c69148f6bd6c92feaabb8812dee30846b24cd0f7395c436d7e825" -PKG_LICENSE="GPL" -PKG_SITE="https://freedesktop.org/wiki/Software/dbus" -PKG_URL="https://dbus.freedesktop.org/releases/dbus-glib/${PKG_NAME}-${PKG_VERSION}.tar.gz" -PKG_DEPENDS_TARGET="toolchain dbus glib expat" -PKG_LONGDESC="A message bus, used for sending messages between applications." -PKG_TOOLCHAIN="autotools" -PKG_BUILD_FLAGS="+pic +lto" - -PKG_CONFIGURE_OPTS_TARGET="ac_cv_have_abstract_sockets=yes \ - ac_cv_func_posix_getpwnam_r=yes \ - have_abstract_sockets=yes \ - --enable-static \ - --disable-shared \ - --disable-tests \ - --disable-bash-completion \ - --enable-asserts=no" - -post_makeinstall_target() { - rm -rf ${INSTALL}/usr/bin/dbus-binding-tool -} diff --git a/packages/devel/dbus-glib/patches/dbus-glib-01-dont-build-tools-examples.patch b/packages/devel/dbus-glib/patches/dbus-glib-01-dont-build-tools-examples.patch deleted file mode 100644 index cfe18739de..0000000000 --- a/packages/devel/dbus-glib/patches/dbus-glib-01-dont-build-tools-examples.patch +++ /dev/null @@ -1,38 +0,0 @@ -From a45f914870e923741f3123799bd9e126b5da4aa0 Mon Sep 17 00:00:00 2001 -From: Stefan Saraev -Date: Wed, 20 Aug 2014 22:43:28 +0300 -Subject: [PATCH] dont build tools / examples - ---- - Makefile.am | 4 ++-- - dbus/Makefile.am | 2 +- - 2 files changed, 3 insertions(+), 3 deletions(-) - -diff --git a/Makefile.am b/Makefile.am -index dd76c7e..78cb56f 100644 ---- a/Makefile.am -+++ b/Makefile.am -@@ -1,8 +1,8 @@ - ACLOCAL_AMFLAGS = -I m4 - GLIB_PC=dbus-glib-1.pc - --SUBDIRS = dbus-gmain dbus tools test doc --DIST_SUBDIRS = dbus-gmain dbus tools test doc m4 -+SUBDIRS = dbus-gmain dbus test doc -+DIST_SUBDIRS = dbus-gmain dbus test doc m4 - - pkgconfigdir = $(libdir)/pkgconfig - pkgconfig_DATA = $(GLIB_PC) -diff --git a/dbus/Makefile.am b/dbus/Makefile.am -index 6d885f9..8bc102d 100644 ---- a/dbus/Makefile.am -+++ b/dbus/Makefile.am -@@ -1,4 +1,4 @@ --SUBDIRS = . examples -+SUBDIRS = . - - INCLUDES = \ - -I$(top_srcdir) \ --- -1.7.2.5 - From d1564b52e87483305a3f15154c0ea3b03a87cce2 Mon Sep 17 00:00:00 2001 From: heitbaum Date: Wed, 20 Jan 2021 12:27:29 +0000 Subject: [PATCH 3/4] dbus-python: drop unused package (replaced by dbussy) --- packages/python/system/dbus-python/package.mk | 23 ------------------- 1 file changed, 23 deletions(-) delete mode 100644 packages/python/system/dbus-python/package.mk diff --git a/packages/python/system/dbus-python/package.mk b/packages/python/system/dbus-python/package.mk deleted file mode 100644 index d352edb254..0000000000 --- a/packages/python/system/dbus-python/package.mk +++ /dev/null @@ -1,23 +0,0 @@ -# SPDX-License-Identifier: GPL-2.0-or-later -# Copyright (C) 2009-2016 Stephan Raue (stephan@openelec.tv) -# Copyright (C) 2019-present Team LibreELEC (https://libreelec.tv) - -PKG_NAME="dbus-python" -PKG_VERSION="1.2.16" -PKG_SHA256="11238f1d86c995d8aed2e22f04a1e3779f0d70e587caffeab4857f3c662ed5a4" -PKG_LICENSE="GPL" -PKG_SITE="https://freedesktop.org/wiki/Software/dbus" -PKG_URL="https://dbus.freedesktop.org/releases/dbus-python/${PKG_NAME}-${PKG_VERSION}.tar.gz" -PKG_DEPENDS_TARGET="toolchain Python3 dbus dbus-glib" -PKG_LONGDESC="D-BUS is a message bus, used for sending messages between applications." -PKG_BUILD_FLAGS="+lto" - -pre_configure_target() { - export PYTHON_CONFIG="${SYSROOT_PREFIX}/usr/bin/python3-config" - export PYTHON_INCLUDES="$(${SYSROOT_PREFIX}/usr/bin/python3-config --includes)" - export PYTHON_LIBS="$(${SYSROOT_PREFIX}/usr/bin/python3-config --ldflags --embed)" -} - -post_makeinstall_target() { - python_remove_source -} From 99d8f1aa71aa318c27ed29aee8f53458e4799041 Mon Sep 17 00:00:00 2001 From: heitbaum Date: Wed, 30 Dec 2020 00:40:03 +0000 Subject: [PATCH 4/4] pygobject: drop unused package (replaced by dbussy) --- packages/python/devel/pygobject/package.mk | 26 --------------- ...ct-0001-add-PYTHON_INCLUDES-override.patch | 32 ------------------- .../pygobject-2.28.6-automake-1.13.patch | 20 ------------ 3 files changed, 78 deletions(-) delete mode 100644 packages/python/devel/pygobject/package.mk delete mode 100644 packages/python/devel/pygobject/patches/pygobject-0001-add-PYTHON_INCLUDES-override.patch delete mode 100644 packages/python/devel/pygobject/patches/pygobject-2.28.6-automake-1.13.patch diff --git a/packages/python/devel/pygobject/package.mk b/packages/python/devel/pygobject/package.mk deleted file mode 100644 index 14a258bf6d..0000000000 --- a/packages/python/devel/pygobject/package.mk +++ /dev/null @@ -1,26 +0,0 @@ -# SPDX-License-Identifier: GPL-2.0-or-later -# Copyright (C) 2009-2016 Stephan Raue (stephan@openelec.tv) -# Copyright (C) 2019-present Team LibreELEC (https://libreelec.tv) - -PKG_NAME="pygobject" -PKG_VERSION="2.28.7" -PKG_SHA256="bb9d25a3442ca7511385a7c01b057492095c263784ef31231ffe589d83a96a5a" -PKG_LICENSE="LGPL" -PKG_SITE="http://www.pygtk.org/" -PKG_URL="http://ftp.gnome.org/pub/GNOME/sources/pygobject/$(get_pkg_version_maj_min)/${PKG_NAME}-${PKG_VERSION}.tar.xz" -PKG_DEPENDS_TARGET="toolchain Python3 glib libffi" -PKG_LONGDESC="A convenient wrapper for the GObject+ library for use in Python programs." -PKG_TOOLCHAIN="autotools" - -PKG_CONFIGURE_OPTS_TARGET="--enable-thread --disable-introspection" - -pre_configure_target() { - export PYTHON_INCLUDES="$(${SYSROOT_PREFIX}/usr/bin/python3-config --includes)" -} - -post_makeinstall_target() { - python_remove_source - - rm -rf ${INSTALL}/usr/bin - rm -rf ${INSTALL}/usr/share/pygobject -} diff --git a/packages/python/devel/pygobject/patches/pygobject-0001-add-PYTHON_INCLUDES-override.patch b/packages/python/devel/pygobject/patches/pygobject-0001-add-PYTHON_INCLUDES-override.patch deleted file mode 100644 index d883f60ddf..0000000000 --- a/packages/python/devel/pygobject/patches/pygobject-0001-add-PYTHON_INCLUDES-override.patch +++ /dev/null @@ -1,32 +0,0 @@ -[PATCH] m4/python.m4: add PYTHON_INCLUDES override for cross compilation - -As the configure script mixes up host/target python. Equivalent to the -similar code in dbus-python. - -Signed-off-by: Peter Korsgaard ---- - m4/python.m4 | 4 ++++ - 1 file changed, 4 insertions(+) - -Index: python-gobject-2.28.6/m4/python.m4 -=================================================================== ---- python-gobject-2.28.6.orig/m4/python.m4 -+++ python-gobject-2.28.6/m4/python.m4 -@@ -43,6 +43,9 @@ - [AC_REQUIRE([AM_PATH_PYTHON]) - AC_MSG_CHECKING(for headers required to compile python extensions) - dnl deduce PYTHON_INCLUDES -+if test "${PYTHON_INCLUDES+set}" = set; then -+ AC_MSG_NOTICE([PYTHON_INCLUDES overridden to: $PYTHON_INCLUDES]) -+else - py_prefix=`$PYTHON -c "import sys; sys.stdout.write(sys.prefix)"` - py_exec_prefix=`$PYTHON -c "import sys; sys.stdout.write(sys.exec_prefix)"` - PYTHON_CONFIG=`which $PYTHON`-config -@@ -54,6 +57,7 @@ - PYTHON_INCLUDES="$PYTHON_INCLUDES -I${py_exec_prefix}/include/python${PYTHON_VERSION}" - fi - fi -+fi - AC_SUBST(PYTHON_INCLUDES) - dnl check if the headers exist: - save_CPPFLAGS="$CPPFLAGS" diff --git a/packages/python/devel/pygobject/patches/pygobject-2.28.6-automake-1.13.patch b/packages/python/devel/pygobject/patches/pygobject-2.28.6-automake-1.13.patch deleted file mode 100644 index 5eb12e66e0..0000000000 --- a/packages/python/devel/pygobject/patches/pygobject-2.28.6-automake-1.13.patch +++ /dev/null @@ -1,20 +0,0 @@ -diff -Naur pygobject-2.28.6/configure.ac pygobject-2.28.6.patch/configure.ac ---- pygobject-2.28.6/configure.ac 2011-06-13 18:33:56.000000000 +0200 -+++ pygobject-2.28.6.patch/configure.ac 2013-01-12 01:03:44.085557166 +0100 -@@ -35,7 +35,7 @@ - AC_DEFINE(PYGOBJECT_MICRO_VERSION, pygobject_micro_version, [pygobject micro version]) - AC_SUBST(PYGOBJECT_MICRO_VERSION, pygobject_micro_version) - --AM_CONFIG_HEADER(config.h) -+AC_CONFIG_HEADERS(config.h) - m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES(yes)]) - AM_INIT_AUTOMAKE(foreign) - AM_MAINTAINER_MODE -@@ -82,7 +82,6 @@ - m4_ifdef([LT_OUTPUT], [LT_OUTPUT]) - AC_ISC_POSIX - AC_PROG_CC --AM_PROG_CC_STDC - AM_PROG_CC_C_O - - # check that we have the minimum version of python necisary to build