From ff3cad8da36c501fccb6a4931bc29dbf81601932 Mon Sep 17 00:00:00 2001 From: Patrick J Volkerding Date: Sun, 17 Mar 2024 21:11:08 +0000 Subject: Sun Mar 17 21:11:08 UTC 2024 La fheile Padraig sona dhaoibh! Pionta Guinness, le do thoil. :-) kde/digikam-8.3.0-x86_64-2.txz: Rebuilt. Fixed internal version number. l/harfbuzz-8.3.1-x86_64-1.txz: Upgraded. l/libappindicator-12.10.0-x86_64-4.txz: Rebuilt. Drop the python bindings. l/mozilla-nss-3.99-x86_64-1.txz: Upgraded. l/python-hatchling-1.22.2-x86_64-1.txz: Upgraded. l/python-markdown-3.6-x86_64-1.txz: Upgraded. l/python-zipp-3.18.1-x86_64-1.txz: Upgraded. l/qt5-5.15.13_20240314_6694e805-x86_64-1.txz: Upgraded. --- source/kde/kde/build/digikam | 2 +- .../libappindicator-no-python.patch | 888 +++++++++++++++++++++ .../l/libappindicator/libappindicator.SlackBuild | 9 +- source/l/mozilla-nss/mozilla-nss.SlackBuild | 2 +- .../l/python-flit-core/python-flit-core.SlackBuild | 2 +- source/l/qt5/fetch_sources.sh | 2 +- 6 files changed, 898 insertions(+), 7 deletions(-) create mode 100644 source/l/libappindicator/libappindicator-no-python.patch (limited to 'source') diff --git a/source/kde/kde/build/digikam b/source/kde/kde/build/digikam index d00491fd7..0cfbf0888 100644 --- a/source/kde/kde/build/digikam +++ b/source/kde/kde/build/digikam @@ -1 +1 @@ -1 +2 diff --git a/source/l/libappindicator/libappindicator-no-python.patch b/source/l/libappindicator/libappindicator-no-python.patch new file mode 100644 index 000000000..587cddec3 --- /dev/null +++ b/source/l/libappindicator/libappindicator-no-python.patch @@ -0,0 +1,888 @@ +diff --git a/bindings/Makefile.am b/bindings/Makefile.am +index d1f6d73..dccca6c 100644 +--- a/bindings/Makefile.am ++++ b/bindings/Makefile.am +@@ -3,7 +3,6 @@ SUBDIRS = \ + vala + else + SUBDIRS = \ +- python \ + vala + endif + +diff --git a/bindings/python/Makefile.am b/bindings/python/Makefile.am +deleted file mode 100644 +index fe95c02..0000000 +--- a/bindings/python/Makefile.am ++++ /dev/null +@@ -1,39 +0,0 @@ +-defsdir = $(datadir)/pygtk/2.0/defs +-defs_DATA = appindicator.defs +- +-#CFLAGS = -Wall -Werror +-INCLUDES = \ +- -I$(top_srcdir)/src \ +- -DG_LOG_DOMAIN=\"appindicator-python\" \ +- -DDATADIR=\"$(datadir)\" \ +- -DLIBDIR=\"$(libdir)\" \ +- $(APPINDICATOR_PYTHON_CFLAGS) \ +- $(PYTHON_INCLUDES) +- +-pkgpythondir = $(pyexecdir) +-pkgpyexecdir = $(pyexecdir) +- +-pkgappindicatordir = $(pkgpythondir)/appindicator +-pkgappindicator_PYTHON = __init__.py +- +-appindicatordir = $(pkgpyexecdir)/appindicator +-appindicator_LTLIBRARIES = _appindicator.la +- +-_appindicator_la_LDFLAGS = -module -avoid-version -export-symbols-regex init_appindicator +-_appindicator_la_LIBADD = $(APPINDICATOR_PYTHON_LIBS) -L$(top_builddir)/src/.libs -lappindicator +-_appindicator_la_SOURCES = appindicatormodule.c +-nodist__appindicator_la_SOURCES = appindicator.c +- +-CLEANFILES = appindicator.c +-EXTRA_DIST = appindicator.override.in appindicator-arg-types.py $(defs_DATA) +-appindicator.c: $(defs_DATA) appindicator.override +- +-%.c: %.defs +- ($(PYGTK_CODEGEN) \ +- --register $(PYGTK_DEFSDIR)/gtk-types.defs \ +- --register $(PYGTK_DEFSDIR)/gdk-types.defs \ +- --load-types $(srcdir)/appindicator-arg-types.py \ +- --override $*.override \ +- --prefix py$* $(srcdir)/$*.defs) > gen-$*.c \ +- && cp gen-$*.c $*.c \ +- && rm -f gen-$*.c +diff --git a/bindings/python/__init__.py b/bindings/python/__init__.py +deleted file mode 100644 +index 20e2140..0000000 +--- a/bindings/python/__init__.py ++++ /dev/null +@@ -1,27 +0,0 @@ +-# Python bindings for libappindicator. +-# +-# Copyright 2009 Canonical Ltd. +-# +-# Authors: +-# Eitan Isaacson +-# Neil Jagdish Patel +-# +-# This program is free software: you can redistribute it and/or modify it +-# under the terms of either or both of the following licenses: +-# +-# 1) the GNU Lesser General Public License version 3, as published by the +-# Free Software Foundation; and/or +-# 2) the GNU Lesser General Public License version 2.1, as published by +-# the Free Software Foundation. +-# +-# This program is distributed in the hope that it will be useful, but +-# WITHOUT ANY WARRANTY; without even the implied warranties of +-# MERCHANTABILITY, SATISFACTORY QUALITY or FITNESS FOR A PARTICULAR +-# PURPOSE. See the applicable version of the GNU Lesser General Public +-# License for more details. +-# +-# You should have received a copy of both the GNU Lesser General Public +-# License version 3 and version 2.1 along with this program. If not, see +-# +- +-from _appindicator import * +diff --git a/bindings/python/appindicator-arg-types.py b/bindings/python/appindicator-arg-types.py +deleted file mode 100644 +index 9d74aa0..0000000 +--- a/bindings/python/appindicator-arg-types.py ++++ /dev/null +@@ -1,27 +0,0 @@ +-# Python bindings for libappindicator. +-# +-# Copyright 2009 Canonical Ltd. +-# +-# Authors: +-# Eitan Isaacson +-# +-# This program is free software: you can redistribute it and/or modify it +-# under the terms of either or both of the following licenses: +-# +-# 1) the GNU Lesser General Public License version 3, as published by the +-# Free Software Foundation; and/or +-# 2) the GNU Lesser General Public License version 2.1, as published by +-# the Free Software Foundation. +-# +-# This program is distributed in the hope that it will be useful, but +-# WITHOUT ANY WARRANTY; without even the implied warranties of +-# MERCHANTABILITY, SATISFACTORY QUALITY or FITNESS FOR A PARTICULAR +-# PURPOSE. See the applicable version of the GNU Lesser General Public +-# License for more details. +-# +-# You should have received a copy of both the GNU Lesser General Public +-# License version 3 and version 2.1 along with this program. If not, see +-# +- +-import argtypes +- +diff --git a/bindings/python/appindicator.defs b/bindings/python/appindicator.defs +deleted file mode 100644 +index 4fcc2d5..0000000 +--- a/bindings/python/appindicator.defs ++++ /dev/null +@@ -1,200 +0,0 @@ +-;; -*- scheme -*- +-; object definitions ... +-(define-object Indicator +- (in-module "App") +- (parent "GObject") +- (c-name "AppIndicator") +- (gtype-id "APP_TYPE_INDICATOR") +-) +- +-;; Enumerations and flags ... +- +-(define-enum IndicatorCategory +- (in-module "App") +- (c-name "AppIndicatorCategory") +- (gtype-id "APP_INDICATOR_TYPE_INDICATOR_CATEGORY") +- (values +- '("ApplicationStatus" "APP_INDICATOR_CATEGORY_APPLICATION_STATUS") +- '("Communications" "APP_INDICATOR_CATEGORY_COMMUNICATIONS") +- '("SystemServices" "APP_INDICATOR_CATEGORY_SYSTEM_SERVICES") +- '("Hardware" "APP_INDICATOR_CATEGORY_HARDWARE") +- '("Other" "APP_INDICATOR_CATEGORY_OTHER") +- ) +-) +- +-(define-enum IndicatorStatus +- (in-module "App") +- (c-name "AppIndicatorStatus") +- (gtype-id "APP_INDICATOR_TYPE_INDICATOR_STATUS") +- (values +- '("Passive" "APP_INDICATOR_STATUS_PASSIVE") +- '("Active" "APP_INDICATOR_STATUS_ACTIVE") +- '("NeedsAttention" "APP_INDICATOR_STATUS_ATTENTION") +- ) +-) +- +-;; From app-indicator.h +- +-(define-function app_indicator_get_type +- (c-name "app_indicator_get_type") +- (return-type "GType") +-) +- +-(define-function app_indicator_new_with_path +- (c-name "app_indicator_new_with_path") +- (is-constructor-of "AppIndicator") +- (return-type "AppIndicator*") +- (parameters +- '("const-gchar*" "id") +- '("const-gchar*" "icon_name") +- '("AppIndicatorCategory" "category") +- '("const-gchar*" "icon_theme_path" (null-ok) (default "NULL")) +- ) +-) +- +-(define-method set_status +- (of-object "AppIndicator") +- (c-name "app_indicator_set_status") +- (return-type "none") +- (parameters +- '("AppIndicatorStatus" "status") +- ) +-) +- +-(define-method set_attention_icon +- (of-object "AppIndicator") +- (c-name "app_indicator_set_attention_icon_full") +- (return-type "none") +- (parameters +- '("const-gchar*" "icon_name") +- '("const-gchar*" "icon_desc" (null-ok) (default "NULL")) +- ) +-) +- +-(define-method set_menu +- (of-object "AppIndicator") +- (c-name "app_indicator_set_menu") +- (return-type "none") +- (parameters +- '("GtkMenu*" "menu") +- ) +-) +- +-(define-method set_icon +- (of-object "AppIndicator") +- (c-name "app_indicator_set_icon_full") +- (return-type "none") +- (parameters +- '("const-gchar*" "icon_name") +- '("const-gchar*" "icon_desc" (null-ok) (default "NULL")) +- ) +-) +- +-(define-method set_label +- (of-object "AppIndicator") +- (c-name "app_indicator_set_label") +- (return-type "none") +- (parameters +- '("const-gchar*" "label" (null-ok)) +- '("const-gchar*" "guide" (null-ok) (default "NULL")) +- ) +-) +- +-(define-method set_ordering_index +- (of-object "AppIndicator") +- (c-name "app_indicator_set_ordering_index") +- (parameters +- '("guint32" "ordering_index") +- ) +-) +- +-(define-method set_icon_theme_path +- (of-object "AppIndicator") +- (c-name "app_indicator_set_icon_theme_path") +- (return-type "none") +- (parameters +- '("const-gchar*" "icon_theme_path" (null-ok)) +- ) +-) +- +-(define-method get_id +- (of-object "AppIndicator") +- (c-name "app_indicator_get_id") +- (return-type "const-gchar*") +-) +- +-(define-method get_category +- (of-object "AppIndicator") +- (c-name "app_indicator_get_category") +- (return-type "AppIndicatorCategory") +-) +- +-(define-method get_status +- (of-object "AppIndicator") +- (c-name "app_indicator_get_status") +- (return-type "AppIndicatorStatus") +-) +- +-(define-method get_icon +- (of-object "AppIndicator") +- (c-name "app_indicator_get_icon") +- (return-type "const-gchar*") +-) +- +-(define-method get_icon_desc +- (of-object "AppIndicator") +- (c-name "app_indicator_get_icon_desc") +- (return-type "const-gchar*") +-) +- +-(define-method get_icon_theme_path +- (of-object "AppIndicator") +- (c-name "app_indicator_get_icon_theme_path") +- (return-type "const-gchar*") +-) +- +-(define-method get_attention_icon +- (of-object "AppIndicator") +- (c-name "app_indicator_get_attention_icon") +- (return-type "const-gchar*") +-) +- +-(define-method get_attention_icon_desc +- (of-object "AppIndicator") +- (c-name "app_indicator_get_attention_icon_desc") +- (return-type "const-gchar*") +-) +- +-(define-method get_menu +- (of-object "AppIndicator") +- (c-name "app_indicator_get_menu") +- (return-type "GtkMenu*") +-) +- +-(define-method get_label +- (of-object "AppIndicator") +- (c-name "app_indicator_get_label") +- (return-type "const-gchar*") +-) +- +-(define-method get_label_guide +- (of-object "AppIndicator") +- (c-name "app_indicator_get_label_guide") +- (return-type "const-gchar*") +-) +- +-(define-method get_ordering_index +- (of-object "AppIndicator") +- (c-name "app_indicator_get_ordering_index") +- (return-type "guint32") +-) +- +-(define-method build_menu_from_desktop +- (of-object "AppIndicator") +- (c-name "app_indicator_build_menu_from_desktop") +- (return-type "none") +- (parameters +- '("const-gchar*" "desktop_file") +- '("const-gchar*" "desktop_profile") +- ) +-) +diff --git a/bindings/python/appindicator.override.in b/bindings/python/appindicator.override.in +deleted file mode 100644 +index 84d3159..0000000 +--- a/bindings/python/appindicator.override.in ++++ /dev/null +@@ -1,65 +0,0 @@ +-/* +-Python bindings for libappindicator. +- +-Copyright 2009 Canonical Ltd. +- +-Authors: +- Eitan Isaacson (original) +- Neil Jagdish Patel +- +-This program is free software: you can redistribute it and/or modify it +-under the terms of either or both of the following licenses: +- +-1) the GNU Lesser General Public License version 3, as published by the +-Free Software Foundation; and/or +-2) the GNU Lesser General Public License version 2.1, as published by +-the Free Software Foundation. +- +-This program is distributed in the hope that it will be useful, but +-WITHOUT ANY WARRANTY; without even the implied warranties of +-MERCHANTABILITY, SATISFACTORY QUALITY or FITNESS FOR A PARTICULAR +-PURPOSE. See the applicable version of the GNU Lesser General Public +-License for more details. +- +-You should have received a copy of both the GNU Lesser General Public +-License version 3 and version 2.1 along with this program. If not, see +- +-*/ +-%% +-headers +-#include +-#include "@top_srcdir@/src/app-indicator.h" +-#include "@top_builddir@/src/app-indicator-enum-types.h" +-#include +-#include "pygobject.h" +-#include "pyglib.h" +-#include +- +-typedef PyObject* (*to_pyobject_func) (gpointer data); +- +-#define APP_TYPE_INDICATOR APP_INDICATOR_TYPE +- +-void +-_appindicator_add_constants(PyObject *module, const gchar *strip_prefix) +-{ +-#ifdef VERSION +- PyModule_AddStringConstant(module, "__version__", VERSION); +-#endif +- pyg_enum_add(module, +- "IndicatorCategory", +- strip_prefix, +- APP_INDICATOR_TYPE_INDICATOR_CATEGORY); +- +- pyg_enum_add(module, +- "IndicatorStatus", +- strip_prefix, +- APP_INDICATOR_TYPE_INDICATOR_STATUS); +- +- if (PyErr_Occurred()) +- PyErr_Print(); +-} +-%% +-modulename appindicator +-%% +-import gobject.GObject as PyGObject_Type +-import gtk.Menu as PyGtkMenu_Type +diff --git a/bindings/python/appindicatormodule.c b/bindings/python/appindicatormodule.c +deleted file mode 100644 +index b66639c..0000000 +--- a/bindings/python/appindicatormodule.c ++++ /dev/null +@@ -1,49 +0,0 @@ +-/* +-Python bindings for libappindicator. +- +-Copyright 2009 Canonical Ltd. +- +-Authors: +- Eitan Isaacson +- Neil Jagdish Patel +- +-This program is free software: you can redistribute it and/or modify it +-under the terms of either or both of the following licenses: +- +-1) the GNU Lesser General Public License version 3, as published by the +-Free Software Foundation; and/or +-2) the GNU Lesser General Public License version 2.1, as published by +-the Free Software Foundation. +- +-This program is distributed in the hope that it will be useful, but +-WITHOUT ANY WARRANTY; without even the implied warranties of +-MERCHANTABILITY, SATISFACTORY QUALITY or FITNESS FOR A PARTICULAR +-PURPOSE. See the applicable version of the GNU Lesser General Public +-License for more details. +- +-You should have received a copy of both the GNU Lesser General Public +-License version 3 and version 2.1 along with this program. If not, see +- +-*/ +-#include +- +-void pyappindicator_register_classes (PyObject *d); +-extern PyMethodDef pyappindicator_functions[]; +- +-DL_EXPORT(void) +-init_appindicator(void) +-{ +- PyObject *m, *d; +- +- init_pygobject (); +- +- m = Py_InitModule ("_appindicator", pyappindicator_functions); +- d = PyModule_GetDict (m); +- +- pyappindicator_register_classes (d); +- +- _appindicator_add_constants (m, "APP_INDICATOR_"); +- if (PyErr_Occurred ()) { +- Py_FatalError ("can't initialise module appindicator"); +- } +-} +diff --git a/configure b/configure +index 5174b3f..8ff732c 100755 +--- a/configure ++++ b/configure +@@ -13703,363 +13703,6 @@ else + fi + + +-########################### +-# Python +-########################### +- +-PYGTK_REQUIRED=2.14.0 +-PYGOBJECT_REQUIRED=0.22 +- +- +- +- +- +- if test -n "$PYTHON"; then +- # If the user set $PYTHON, use it and don't search something else. +- { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $PYTHON version >= 2.3.5" >&5 +-$as_echo_n "checking whether $PYTHON version >= 2.3.5... " >&6; } +- prog="import sys, string +-# split strings by '.' and convert to numeric. Append some zeros +-# because we need at least 4 digits for the hex conversion. +-minver = map(int, string.split('2.3.5', '.')) + [0, 0, 0] +-minverhex = 0 +-for i in xrange(0, 4): minverhex = (minverhex << 8) + minver[i] +-sys.exit(sys.hexversion < minverhex)" +- if { echo "$as_me:$LINENO: $PYTHON -c "$prog"" >&5 +- ($PYTHON -c "$prog") >&5 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; then : +- { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +-$as_echo "yes" >&6; } +-else +- as_fn_error $? "too old" "$LINENO" 5 +-fi +- am_display_PYTHON=$PYTHON +- else +- # Otherwise, try each interpreter until we find one that satisfies +- # VERSION. +- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for a Python interpreter with version >= 2.3.5" >&5 +-$as_echo_n "checking for a Python interpreter with version >= 2.3.5... " >&6; } +-if ${am_cv_pathless_PYTHON+:} false; then : +- $as_echo_n "(cached) " >&6 +-else +- +- for am_cv_pathless_PYTHON in python python2 python2.4 python2.3 python2.2 python2.1 python2.0 python1.6 python1.5 none; do +- test "$am_cv_pathless_PYTHON" = none && break +- prog="import sys, string +-# split strings by '.' and convert to numeric. Append some zeros +-# because we need at least 4 digits for the hex conversion. +-minver = map(int, string.split('2.3.5', '.')) + [0, 0, 0] +-minverhex = 0 +-for i in xrange(0, 4): minverhex = (minverhex << 8) + minver[i] +-sys.exit(sys.hexversion < minverhex)" +- if { echo "$as_me:$LINENO: $am_cv_pathless_PYTHON -c "$prog"" >&5 +- ($am_cv_pathless_PYTHON -c "$prog") >&5 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; then : +- break +-fi +- done +-fi +-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_pathless_PYTHON" >&5 +-$as_echo "$am_cv_pathless_PYTHON" >&6; } +- # Set $PYTHON to the absolute path of $am_cv_pathless_PYTHON. +- if test "$am_cv_pathless_PYTHON" = none; then +- PYTHON=: +- else +- # Extract the first word of "$am_cv_pathless_PYTHON", so it can be a program name with args. +-set dummy $am_cv_pathless_PYTHON; ac_word=$2 +-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +-$as_echo_n "checking for $ac_word... " >&6; } +-if ${ac_cv_path_PYTHON+:} false; then : +- $as_echo_n "(cached) " >&6 +-else +- case $PYTHON in +- [\\/]* | ?:[\\/]*) +- ac_cv_path_PYTHON="$PYTHON" # Let the user override the test with a path. +- ;; +- *) +- as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +-for as_dir in $PATH +-do +- IFS=$as_save_IFS +- test -z "$as_dir" && as_dir=. +- for ac_exec_ext in '' $ac_executable_extensions; do +- if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then +- ac_cv_path_PYTHON="$as_dir/$ac_word$ac_exec_ext" +- $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 +- break 2 +- fi +-done +- done +-IFS=$as_save_IFS +- +- ;; +-esac +-fi +-PYTHON=$ac_cv_path_PYTHON +-if test -n "$PYTHON"; then +- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PYTHON" >&5 +-$as_echo "$PYTHON" >&6; } +-else +- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +-$as_echo "no" >&6; } +-fi +- +- +- fi +- am_display_PYTHON=$am_cv_pathless_PYTHON +- fi +- +- +- if test "$PYTHON" = :; then +- as_fn_error $? "no suitable Python interpreter found" "$LINENO" 5 +- else +- +- +- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $am_display_PYTHON version" >&5 +-$as_echo_n "checking for $am_display_PYTHON version... " >&6; } +-if ${am_cv_python_version+:} false; then : +- $as_echo_n "(cached) " >&6 +-else +- am_cv_python_version=`$PYTHON -c "import sys; print sys.version[:3]"` +-fi +-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_python_version" >&5 +-$as_echo "$am_cv_python_version" >&6; } +- PYTHON_VERSION=$am_cv_python_version +- +- +- +- PYTHON_PREFIX='${prefix}' +- +- PYTHON_EXEC_PREFIX='${exec_prefix}' +- +- +- +- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $am_display_PYTHON platform" >&5 +-$as_echo_n "checking for $am_display_PYTHON platform... " >&6; } +-if ${am_cv_python_platform+:} false; then : +- $as_echo_n "(cached) " >&6 +-else +- am_cv_python_platform=`$PYTHON -c "import sys; print sys.platform"` +-fi +-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_python_platform" >&5 +-$as_echo "$am_cv_python_platform" >&6; } +- PYTHON_PLATFORM=$am_cv_python_platform +- +- +- +- +- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $am_display_PYTHON script directory" >&5 +-$as_echo_n "checking for $am_display_PYTHON script directory... " >&6; } +-if ${am_cv_python_pythondir+:} false; then : +- $as_echo_n "(cached) " >&6 +-else +- am_cv_python_pythondir=`$PYTHON -c "from distutils import sysconfig; print sysconfig.get_python_lib(0,0,prefix='$PYTHON_PREFIX')" 2>/dev/null || +- echo "$PYTHON_PREFIX/lib/python$PYTHON_VERSION/site-packages"` +-fi +-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_python_pythondir" >&5 +-$as_echo "$am_cv_python_pythondir" >&6; } +- pythondir=$am_cv_python_pythondir +- +- +- +- pkgpythondir=\${pythondir}/$PACKAGE +- +- +- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $am_display_PYTHON extension module directory" >&5 +-$as_echo_n "checking for $am_display_PYTHON extension module directory... " >&6; } +-if ${am_cv_python_pyexecdir+:} false; then : +- $as_echo_n "(cached) " >&6 +-else +- am_cv_python_pyexecdir=`$PYTHON -c "from distutils import sysconfig; print sysconfig.get_python_lib(1,0,prefix='$PYTHON_EXEC_PREFIX')" 2>/dev/null || +- echo "${PYTHON_EXEC_PREFIX}/lib/python${PYTHON_VERSION}/site-packages"` +-fi +-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_python_pyexecdir" >&5 +-$as_echo "$am_cv_python_pyexecdir" >&6; } +- pyexecdir=$am_cv_python_pyexecdir +- +- +- +- pkgpyexecdir=\${pyexecdir}/$PACKAGE +- +- +- +- fi +- +- +- +-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for headers required to compile python extensions" >&5 +-$as_echo_n "checking for headers required to compile python extensions... " >&6; } +-py_prefix=`$PYTHON -c "import sys; print sys.prefix"` +-py_exec_prefix=`$PYTHON -c "import sys; print sys.exec_prefix"` +-PYTHON_INCLUDES="-I${py_prefix}/include/python${PYTHON_VERSION}" +-if test "$py_prefix" != "$py_exec_prefix"; then +- PYTHON_INCLUDES="$PYTHON_INCLUDES -I${py_exec_prefix}/include/python${PYTHON_VERSION}" +-fi +- +-save_CPPFLAGS="$CPPFLAGS" +-CPPFLAGS="$CPPFLAGS $PYTHON_INCLUDES" +-cat confdefs.h - <<_ACEOF >conftest.$ac_ext +-/* end confdefs.h. */ +-#include +-_ACEOF +-if ac_fn_c_try_cpp "$LINENO"; then : +- { $as_echo "$as_me:${as_lineno-$LINENO}: result: found" >&5 +-$as_echo "found" >&6; } +- +-else +- { $as_echo "$as_me:${as_lineno-$LINENO}: result: not found" >&5 +-$as_echo "not found" >&6; } +-as_fn_error $? "could not find Python headers" "$LINENO" 5 +-fi +-rm -f conftest.err conftest.i conftest.$ac_ext +-CPPFLAGS="$save_CPPFLAGS" +- +- +- +-pkg_failed=no +-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for APPINDICATOR_PYTHON" >&5 +-$as_echo_n "checking for APPINDICATOR_PYTHON... " >&6; } +- +-if test -n "$APPINDICATOR_PYTHON_CFLAGS"; then +- pkg_cv_APPINDICATOR_PYTHON_CFLAGS="$APPINDICATOR_PYTHON_CFLAGS" +- elif test -n "$PKG_CONFIG"; then +- if test -n "$PKG_CONFIG" && \ +- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \" +- pygtk-2.0 >= \$PYGTK_REQUIRED +- gtk+-2.0 >= \$GTK_REQUIRED_VERSION +- pygobject-2.0 >= \$PYGOBJECT_REQUIRED +- \""; } >&5 +- ($PKG_CONFIG --exists --print-errors " +- pygtk-2.0 >= $PYGTK_REQUIRED +- gtk+-2.0 >= $GTK_REQUIRED_VERSION +- pygobject-2.0 >= $PYGOBJECT_REQUIRED +- ") 2>&5 +- ac_status=$? +- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 +- test $ac_status = 0; }; then +- pkg_cv_APPINDICATOR_PYTHON_CFLAGS=`$PKG_CONFIG --cflags " +- pygtk-2.0 >= $PYGTK_REQUIRED +- gtk+-2.0 >= $GTK_REQUIRED_VERSION +- pygobject-2.0 >= $PYGOBJECT_REQUIRED +- " 2>/dev/null` +- test "x$?" != "x0" && pkg_failed=yes +-else +- pkg_failed=yes +-fi +- else +- pkg_failed=untried +-fi +-if test -n "$APPINDICATOR_PYTHON_LIBS"; then +- pkg_cv_APPINDICATOR_PYTHON_LIBS="$APPINDICATOR_PYTHON_LIBS" +- elif test -n "$PKG_CONFIG"; then +- if test -n "$PKG_CONFIG" && \ +- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \" +- pygtk-2.0 >= \$PYGTK_REQUIRED +- gtk+-2.0 >= \$GTK_REQUIRED_VERSION +- pygobject-2.0 >= \$PYGOBJECT_REQUIRED +- \""; } >&5 +- ($PKG_CONFIG --exists --print-errors " +- pygtk-2.0 >= $PYGTK_REQUIRED +- gtk+-2.0 >= $GTK_REQUIRED_VERSION +- pygobject-2.0 >= $PYGOBJECT_REQUIRED +- ") 2>&5 +- ac_status=$? +- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 +- test $ac_status = 0; }; then +- pkg_cv_APPINDICATOR_PYTHON_LIBS=`$PKG_CONFIG --libs " +- pygtk-2.0 >= $PYGTK_REQUIRED +- gtk+-2.0 >= $GTK_REQUIRED_VERSION +- pygobject-2.0 >= $PYGOBJECT_REQUIRED +- " 2>/dev/null` +- test "x$?" != "x0" && pkg_failed=yes +-else +- pkg_failed=yes +-fi +- else +- pkg_failed=untried +-fi +- +- +- +-if test $pkg_failed = yes; then +- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +-$as_echo "no" >&6; } +- +-if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then +- _pkg_short_errors_supported=yes +-else +- _pkg_short_errors_supported=no +-fi +- if test $_pkg_short_errors_supported = yes; then +- APPINDICATOR_PYTHON_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs " +- pygtk-2.0 >= $PYGTK_REQUIRED +- gtk+-2.0 >= $GTK_REQUIRED_VERSION +- pygobject-2.0 >= $PYGOBJECT_REQUIRED +- " 2>&1` +- else +- APPINDICATOR_PYTHON_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs " +- pygtk-2.0 >= $PYGTK_REQUIRED +- gtk+-2.0 >= $GTK_REQUIRED_VERSION +- pygobject-2.0 >= $PYGOBJECT_REQUIRED +- " 2>&1` +- fi +- # Put the nasty error message in config.log where it belongs +- echo "$APPINDICATOR_PYTHON_PKG_ERRORS" >&5 +- +- as_fn_error $? "Package requirements ( +- pygtk-2.0 >= $PYGTK_REQUIRED +- gtk+-2.0 >= $GTK_REQUIRED_VERSION +- pygobject-2.0 >= $PYGOBJECT_REQUIRED +- ) were not met: +- +-$APPINDICATOR_PYTHON_PKG_ERRORS +- +-Consider adjusting the PKG_CONFIG_PATH environment variable if you +-installed software in a non-standard prefix. +- +-Alternatively, you may set the environment variables APPINDICATOR_PYTHON_CFLAGS +-and APPINDICATOR_PYTHON_LIBS to avoid the need to call pkg-config. +-See the pkg-config man page for more details." "$LINENO" 5 +-elif test $pkg_failed = untried; then +- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +-$as_echo "no" >&6; } +- { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} +-as_fn_error $? "The pkg-config script could not be found or is too old. Make sure it +-is in your PATH or set the PKG_CONFIG environment variable to the full +-path to pkg-config. +- +-Alternatively, you may set the environment variables APPINDICATOR_PYTHON_CFLAGS +-and APPINDICATOR_PYTHON_LIBS to avoid the need to call pkg-config. +-See the pkg-config man page for more details. +- +-To get pkg-config, see . +-See \`config.log' for more details" "$LINENO" 5; } +-else +- APPINDICATOR_PYTHON_CFLAGS=$pkg_cv_APPINDICATOR_PYTHON_CFLAGS +- APPINDICATOR_PYTHON_LIBS=$pkg_cv_APPINDICATOR_PYTHON_LIBS +- { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +-$as_echo "yes" >&6; } +- +-fi +- +-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for pygtk defs" >&5 +-$as_echo_n "checking for pygtk defs... " >&6; } +-PYGTK_DEFSDIR=`$PKG_CONFIG --variable=defsdir pygtk-2.0` +- +-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $PYGTK_DEFSDIR" >&5 +-$as_echo "$PYGTK_DEFSDIR" >&6; } +- +-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for pygtk codegen" >&5 +-$as_echo_n "checking for pygtk codegen... " >&6; } +-PYGTK_CODEGEN="$PYTHON `$PKG_CONFIG --variable=codegendir pygtk-2.0`/codegen.py" +- +-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $PYGTK_CODEGEN" >&5 +-$as_echo "$PYGTK_CODEGEN" >&6; } + + ######################### + # Check if build tests +@@ -14358,7 +14001,7 @@ fi + # Files + ########################### + +-ac_config_files="$ac_config_files Makefile src/Makefile src/appindicator-0.1.pc src/appindicator3-0.1.pc bindings/Makefile bindings/python/Makefile bindings/python/appindicator.override bindings/vala/Makefile bindings/vala/examples/Makefile tests/Makefile example/Makefile docs/Makefile docs/reference/Makefile docs/reference/version.xml docs/reference/libappindicator-docs.sgml" ++ac_config_files="$ac_config_files Makefile src/Makefile src/appindicator-0.1.pc src/appindicator3-0.1.pc bindings/Makefile bindings/vala/Makefile bindings/vala/examples/Makefile tests/Makefile example/Makefile docs/Makefile docs/reference/Makefile docs/reference/version.xml docs/reference/libappindicator-docs.sgml" + + + if test "x$has_mono" = "xtrue" ; then +@@ -15437,8 +15080,6 @@ do + "src/appindicator-0.1.pc") CONFIG_FILES="$CONFIG_FILES src/appindicator-0.1.pc" ;; + "src/appindicator3-0.1.pc") CONFIG_FILES="$CONFIG_FILES src/appindicator3-0.1.pc" ;; + "bindings/Makefile") CONFIG_FILES="$CONFIG_FILES bindings/Makefile" ;; +- "bindings/python/Makefile") CONFIG_FILES="$CONFIG_FILES bindings/python/Makefile" ;; +- "bindings/python/appindicator.override") CONFIG_FILES="$CONFIG_FILES bindings/python/appindicator.override" ;; + "bindings/vala/Makefile") CONFIG_FILES="$CONFIG_FILES bindings/vala/Makefile" ;; + "bindings/vala/examples/Makefile") CONFIG_FILES="$CONFIG_FILES bindings/vala/examples/Makefile" ;; + "tests/Makefile") CONFIG_FILES="$CONFIG_FILES tests/Makefile" ;; +diff --git a/configure.ac b/configure.ac +index ee03390..4713b22 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -181,33 +181,6 @@ AM_CONDITIONAL(BUILD_MONO_TEST, test x${have_nunit} = xyes) + with_localinstall="no" + AC_ARG_ENABLE(localinstall, AS_HELP_STRING([--enable-localinstall], [install all of the files localy instead of system directories (for distcheck)]), with_localinstall=$enableval, with_localinstall=no) + +-########################### +-# Python +-########################### +- +-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)]) +- +-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) +- + ######################### + # Check if build tests + ######################### +@@ -239,8 +212,6 @@ src/Makefile + src/appindicator-0.1.pc + src/appindicator3-0.1.pc + bindings/Makefile +-bindings/python/Makefile +-bindings/python/appindicator.override + bindings/vala/Makefile + bindings/vala/examples/Makefile + tests/Makefile \ No newline at end of file diff --git a/source/l/libappindicator/libappindicator.SlackBuild b/source/l/libappindicator/libappindicator.SlackBuild index 695ea5e8f..649589179 100755 --- a/source/l/libappindicator/libappindicator.SlackBuild +++ b/source/l/libappindicator/libappindicator.SlackBuild @@ -1,7 +1,7 @@ #!/bin/bash # Copyright 2015 Eric Hameleers, Eindhoven, NL -# Copyright 2020 Patrick J. Volkerding, Sebeka, Minnesota, USA +# Copyright 2020, 2024 Patrick J. Volkerding, Sebeka, Minnesota, USA # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -25,7 +25,7 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=libappindicator VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} -BUILD=${BUILD:-3} +BUILD=${BUILD:-4} # Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then @@ -86,7 +86,10 @@ find . \ \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ -exec chmod 644 {} \+ -for file in bindings/python/Makefile.in bindings/python/Makefile.am example/Makefile.in example/Makefile.am src/Makefile.in src/Makefile.am tests/Makefile.in tests/Makefile.am ; do +cat $CWD/libappindicator-no-python.patch | patch -p1 --verbose || exit 1 +autoreconf -vif + +for file in example/Makefile.in example/Makefile.am src/Makefile.in src/Makefile.am tests/Makefile.in tests/Makefile.am ; do sed -i "s/-Werror//g" $file done diff --git a/source/l/mozilla-nss/mozilla-nss.SlackBuild b/source/l/mozilla-nss/mozilla-nss.SlackBuild index 822207cbc..49e0c23e5 100755 --- a/source/l/mozilla-nss/mozilla-nss.SlackBuild +++ b/source/l/mozilla-nss/mozilla-nss.SlackBuild @@ -26,7 +26,7 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=mozilla-nss SRCNAM=nss -VERSION=${VERSION:-3.98} +VERSION=${VERSION:-3.99} NSPR=${NSPR:-4.35} BUILD=${BUILD:-1} diff --git a/source/l/python-flit-core/python-flit-core.SlackBuild b/source/l/python-flit-core/python-flit-core.SlackBuild index 1f512bd33..075bfca06 100755 --- a/source/l/python-flit-core/python-flit-core.SlackBuild +++ b/source/l/python-flit-core/python-flit-core.SlackBuild @@ -76,7 +76,7 @@ find . \ -exec chmod 644 {} \+ # directory for python packages -PYTHONDIR=$(python3 -c "import sys, os; print(os.path.join('/usr/lib${LIBDIRSUFFIX}', 'python%s' % sys.version[:4], 'site-packages'))") +PYTHONDIR=$(python3 -c 'from distutils.sysconfig import get_python_lib; print(get_python_lib())') mkdir -p ${PKG}${PYTHONDIR} diff --git a/source/l/qt5/fetch_sources.sh b/source/l/qt5/fetch_sources.sh index 19b86c1ab..d18d453b7 100755 --- a/source/l/qt5/fetch_sources.sh +++ b/source/l/qt5/fetch_sources.sh @@ -21,7 +21,7 @@ # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -BRANCH="5.15.12" +BRANCH="5.15.13" rm -f qt-everywhere-src-*.tar* -- cgit v1.2.3-80-g2a13