From 3218f470ea077f9b7a19f5dbec8ddcbaf34ed694 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Apitzsch?= Date: Sun, 5 Dec 2021 00:10:36 +0100 Subject: Flatpak: Update plugins --- flatpak/modules/dbus-glib/dbus-glib-0.110.json | 23 - flatpak/modules/intltool/intltool-0.51.json | 11 - ...-fix-crash-from-incorrect-signal-emission.patch | 74 -- ...indicator-fix-crash-iterating-icon-themes.patch | 11 - .../libappindicator/libappindicator-ftbfs.patch | 20 - .../libappindicator-gtk3-introspection-12.10.json | 129 --- .../libappindicator-no-python.patch | 888 --------------------- flatpak/modules/python3-pillow.yaml | 8 - flatpak/org.gajim.Gajim.Plugin.appindicator.yaml | 31 - flatpak/org.gajim.Gajim.Plugin.omemo.yaml | 16 +- flatpak/org.gajim.Gajim.Plugin.openpgp.yaml | 4 +- flatpak/org.gajim.Gajim.Plugin.pgp.yaml | 10 +- .../org.gajim.Gajim.Plugin.syntax_highlight.yaml | 44 - .../org.gajim.Gajim.Plugin.url_image_preview.yaml | 28 - 14 files changed, 14 insertions(+), 1283 deletions(-) delete mode 100644 flatpak/modules/dbus-glib/dbus-glib-0.110.json delete mode 100644 flatpak/modules/intltool/intltool-0.51.json delete mode 100644 flatpak/modules/libappindicator/libappindicator-fix-crash-from-incorrect-signal-emission.patch delete mode 100644 flatpak/modules/libappindicator/libappindicator-fix-crash-iterating-icon-themes.patch delete mode 100644 flatpak/modules/libappindicator/libappindicator-ftbfs.patch delete mode 100644 flatpak/modules/libappindicator/libappindicator-gtk3-introspection-12.10.json delete mode 100644 flatpak/modules/libappindicator/libappindicator-no-python.patch delete mode 100644 flatpak/modules/python3-pillow.yaml delete mode 100644 flatpak/org.gajim.Gajim.Plugin.appindicator.yaml delete mode 100644 flatpak/org.gajim.Gajim.Plugin.syntax_highlight.yaml delete mode 100644 flatpak/org.gajim.Gajim.Plugin.url_image_preview.yaml (limited to 'flatpak') diff --git a/flatpak/modules/dbus-glib/dbus-glib-0.110.json b/flatpak/modules/dbus-glib/dbus-glib-0.110.json deleted file mode 100644 index 73ffd08..0000000 --- a/flatpak/modules/dbus-glib/dbus-glib-0.110.json +++ /dev/null @@ -1,23 +0,0 @@ -{ - "name": "dbus-glib", - "cleanup": [ - "*.la", - "/bin", - "/etc", - "/include", - "/libexec", - "/share/gtk-doc", - "/share/man" - ], - "config-opts": [ - "--disable-static", - "--disable-gtk-doc" - ], - "sources": [ - { - "type": "archive", - "url": "https://dbus.freedesktop.org/releases/dbus-glib/dbus-glib-0.110.tar.gz", - "sha256": "7ce4760cf66c69148f6bd6c92feaabb8812dee30846b24cd0f7395c436d7e825" - } - ] -} diff --git a/flatpak/modules/intltool/intltool-0.51.json b/flatpak/modules/intltool/intltool-0.51.json deleted file mode 100644 index 3a09224..0000000 --- a/flatpak/modules/intltool/intltool-0.51.json +++ /dev/null @@ -1,11 +0,0 @@ -{ - "name": "intltool", - "cleanup": [ "*" ], - "sources": [ - { - "type": "archive", - "url": "https://launchpad.net/intltool/trunk/0.51.0/+download/intltool-0.51.0.tar.gz", - "sha256": "67c74d94196b153b774ab9f89b2fa6c6ba79352407037c8c14d5aeb334e959cd" - } - ] -} diff --git a/flatpak/modules/libappindicator/libappindicator-fix-crash-from-incorrect-signal-emission.patch b/flatpak/modules/libappindicator/libappindicator-fix-crash-from-incorrect-signal-emission.patch deleted file mode 100644 index 28927a3..0000000 --- a/flatpak/modules/libappindicator/libappindicator-fix-crash-from-incorrect-signal-emission.patch +++ /dev/null @@ -1,74 +0,0 @@ ---- libappindicator-12.10.0/src/app-indicator.c 2012-07-11 13:28:34.415113869 -0400 -+++ wrk/src/app-indicator.c 2020-03-19 12:14:47.813191652 -0400 -@@ -443,7 +443,7 @@ - G_STRUCT_OFFSET (AppIndicatorClass, new_icon), - NULL, NULL, - g_cclosure_marshal_VOID__VOID, -- G_TYPE_NONE, 0, G_TYPE_NONE); -+ G_TYPE_NONE, 0); - - /** - * AppIndicator::new-attention-icon: -@@ -457,7 +457,7 @@ - G_STRUCT_OFFSET (AppIndicatorClass, new_attention_icon), - NULL, NULL, - g_cclosure_marshal_VOID__VOID, -- G_TYPE_NONE, 0, G_TYPE_NONE); -+ G_TYPE_NONE, 0); - - /** - * AppIndicator::new-status: -@@ -505,7 +505,7 @@ - G_STRUCT_OFFSET (AppIndicatorClass, connection_changed), - NULL, NULL, - g_cclosure_marshal_VOID__BOOLEAN, -- G_TYPE_NONE, 1, G_TYPE_BOOLEAN, G_TYPE_NONE); -+ G_TYPE_NONE, 1, G_TYPE_BOOLEAN); - - /** - * AppIndicator::new-icon-theme-path: -@@ -1175,7 +1175,7 @@ - gchar * guide = priv->label_guide != NULL ? priv->label_guide : ""; - - g_signal_emit(G_OBJECT(self), signals[NEW_LABEL], 0, -- label, guide, TRUE); -+ label, guide); - if (priv->dbus_registration != 0 && priv->connection != NULL) { - GError * error = NULL; - -@@ -1490,7 +1490,7 @@ - static void - theme_changed_cb (GtkIconTheme * theme, gpointer user_data) - { -- g_signal_emit (user_data, signals[NEW_ICON], 0, TRUE); -+ g_signal_emit (user_data, signals[NEW_ICON], 0); - - AppIndicator * self = (AppIndicator *)user_data; - AppIndicatorPrivate *priv = self->priv; -@@ -1904,7 +1904,7 @@ - } - - if (changed) { -- g_signal_emit (self, signals[NEW_ATTENTION_ICON], 0, TRUE); -+ g_signal_emit (self, signals[NEW_ATTENTION_ICON], 0); - - if (self->priv->dbus_registration != 0 && self->priv->connection != NULL) { - GError * error = NULL; -@@ -1982,7 +1982,7 @@ - } - - if (changed) { -- g_signal_emit (self, signals[NEW_ICON], 0, TRUE); -+ g_signal_emit (self, signals[NEW_ICON], 0); - - if (self->priv->dbus_registration != 0 && self->priv->connection != NULL) { - GError * error = NULL; -@@ -2048,7 +2048,7 @@ - - self->priv->icon_theme_path = g_strdup(icon_theme_path); - -- g_signal_emit (self, signals[NEW_ICON_THEME_PATH], 0, self->priv->icon_theme_path, TRUE); -+ g_signal_emit (self, signals[NEW_ICON_THEME_PATH], 0, self->priv->icon_theme_path); - - if (self->priv->dbus_registration != 0 && self->priv->connection != NULL) { - GError * error = NULL; diff --git a/flatpak/modules/libappindicator/libappindicator-fix-crash-iterating-icon-themes.patch b/flatpak/modules/libappindicator/libappindicator-fix-crash-iterating-icon-themes.patch deleted file mode 100644 index 44f6fe4..0000000 --- a/flatpak/modules/libappindicator/libappindicator-fix-crash-iterating-icon-themes.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- libappindicator-12.10.0/src/app-indicator.c -+++ libappindicator-12.10.0/src/app-indicator.c -@@ -1606,7 +1606,7 @@ status_icon_changes (AppIndicator * self, gpointer data) - gint n_elements, i; - gboolean found=FALSE; - gtk_icon_theme_get_search_path(icon_theme, &path, &n_elements); -- for (i=0; i< n_elements || path[i] == NULL; i++) { -+ for (i=0; i< n_elements; i++) { - if(g_strcmp0(path[i], self->priv->icon_theme_path) == 0) { - found=TRUE; - break; diff --git a/flatpak/modules/libappindicator/libappindicator-ftbfs.patch b/flatpak/modules/libappindicator/libappindicator-ftbfs.patch deleted file mode 100644 index 93d31af..0000000 --- a/flatpak/modules/libappindicator/libappindicator-ftbfs.patch +++ /dev/null @@ -1,20 +0,0 @@ -From: Olivier Tilloy -Date: Tue 2018-03-20 12:47:56 +0000 -Subject: [PATCH] libappindicator FTBFS on bionic - -Fix build failures on bionic, -and update Vcs-* fields in debian/control. (LP: #1757121) - -Approved by: Marco Trevisan (Treviño) ---- ---- libappindicator-12.10.0/src/app-indicator.c 2017-02-15 14:10:41 +0000 -+++ libappindicator-12.10.0/src/app-indicator.c 2018-03-20 12:38:59 +0000 -@@ -2196,7 +2196,7 @@ app_indicator_set_secondary_activate_tar - - g_return_if_fail (GTK_IS_WIDGET (menuitem)); - -- priv->sec_activate_target = g_object_ref(G_OBJECT(menuitem)); -+ priv->sec_activate_target = g_object_ref(menuitem); - priv->sec_activate_enabled = widget_is_menu_child(self, menuitem); - g_signal_connect(menuitem, "parent-set", G_CALLBACK(sec_activate_target_parent_changed), self); - } diff --git a/flatpak/modules/libappindicator/libappindicator-gtk3-introspection-12.10.json b/flatpak/modules/libappindicator/libappindicator-gtk3-introspection-12.10.json deleted file mode 100644 index cbe10be..0000000 --- a/flatpak/modules/libappindicator/libappindicator-gtk3-introspection-12.10.json +++ /dev/null @@ -1,129 +0,0 @@ -{ - "name": "libappindicator", - "build-options": { - "cflags": "-Wno-error" - }, - "rm-configure": true, - "config-opts": [ - "--disable-static", - "--disable-gtk-doc", - "--disable-tests", - "--disable-mono-tests", - "--enable-introspection=yes", - "--with-gtk=3" - ], - "cleanup": [ - "/include", - "/lib/pkgconfig", - "/lib/*.la", - "/share/gtk-doc", - "/share/gir-1.0" - ], - "sources": [ - { - "type": "archive", - "url": "https://launchpad.net/libappindicator/12.10/12.10.0/+download/libappindicator-12.10.0.tar.gz", - "sha256": "d5907c1f98084acf28fd19593cb70672caa0ca1cf82d747ba6f4830d4cc3b49f" - }, - { - "type": "patch", - "path": "libappindicator-ftbfs.patch" - }, - { - "type": "patch", - "path": "libappindicator-no-python.patch" - }, - { - "type": "patch", - "path": "libappindicator-fix-crash-from-incorrect-signal-emission.patch" - }, - { - "type": "patch", - "path": "libappindicator-fix-crash-iterating-icon-themes.patch" - }, - { - "type": "script", - "commands": ["autoreconf -sfi"], - "dest-filename": "autogen.sh" - } - ], - "modules": [ - "../intltool/intltool-0.51.json", - "../dbus-glib/dbus-glib-0.110.json", - { - "name": "libdbusmenu", - "build-options": { - "cflags": "-Wno-error", - "env": { - "HAVE_VALGRIND_FALSE": "#", - "HAVE_VALGRIND_TRUE": "" - } - }, - "cleanup": [ - "/include", - "/libexec", - "/lib/pkgconfig", - "/lib/*.la", - "/share/doc", - "/share/libdbusmenu", - "/share/gtk-doc", - "/share/gir-1.0" - ], - "config-opts": [ - "--disable-static", - "--disable-gtk-doc", - "--enable-introspection=yes", - "--disable-vala", - "--disable-dumper", - "--disable-tests", - "--with-gtk=3" - ], - "sources": [ - { - "type": "archive", - "url": "https://launchpad.net/libdbusmenu/16.04/16.04.0/+download/libdbusmenu-16.04.0.tar.gz", - "sha256": "b9cc4a2acd74509435892823607d966d424bd9ad5d0b00938f27240a1bfa878a" - } - ] - }, - { - "name": "libindicator", - "build-options": { - "cflags": "-Wno-error" - }, - "cleanup": [ - "/include", - "/libexec", - "/lib/pkgconfig", - "/lib/*.la", - "/share/libindicator", - "/share/gtk-doc", - "/share/gir-1.0" - ], - "config-opts": [ - "--disable-static", - "--disable-tests", - "--with-gtk=3" - ], - "sources": [ - { - "type": "archive", - "url": "https://launchpad.net/libindicator/12.10/12.10.1/+download/libindicator-12.10.1.tar.gz", - "sha256": "b2d2e44c10313d5c9cd60db455d520f80b36dc39562df079a3f29495e8f9447f" - }, - { - "type": "shell", - "commands": [ - "# FTBFS fix", - "sed -e '/LIBINDICATOR_LIBS/ s/\\$LIBM/ $LIBM/' -i configure.ac" - ] - }, - { - "type": "script", - "commands": ["autoreconf -sfi"], - "dest-filename": "autogen.sh" - } - ] - } - ] -} diff --git a/flatpak/modules/libappindicator/libappindicator-no-python.patch b/flatpak/modules/libappindicator/libappindicator-no-python.patch deleted file mode 100644 index 587cdde..0000000 --- a/flatpak/modules/libappindicator/libappindicator-no-python.patch +++ /dev/null @@ -1,888 +0,0 @@ -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/flatpak/modules/python3-pillow.yaml b/flatpak/modules/python3-pillow.yaml deleted file mode 100644 index f7caabb..0000000 --- a/flatpak/modules/python3-pillow.yaml +++ /dev/null @@ -1,8 +0,0 @@ -name: python3-pillow -buildsystem: simple -build-commands: - - pip3 install . -sources: - - type: archive - url: https://files.pythonhosted.org/packages/source/p/pillow/Pillow-8.3.2.tar.gz - sha256: dde3f3ed8d00c72631bc19cbfff8ad3b6215062a5eed402381ad365f82f0c18c diff --git a/flatpak/org.gajim.Gajim.Plugin.appindicator.yaml b/flatpak/org.gajim.Gajim.Plugin.appindicator.yaml deleted file mode 100644 index 71aac6a..0000000 --- a/flatpak/org.gajim.Gajim.Plugin.appindicator.yaml +++ /dev/null @@ -1,31 +0,0 @@ -id: org.gajim.Gajim.Devel.Plugin.appindicator -runtime: org.gajim.Gajim.Devel -sdk: org.gnome.Sdk//41 -build-extension: true -separate-locales: false -appstream-compose: false - -build-options: - env: - PIP_TARGET: /app/plugins/appindicator/site-packages - prefix: /app/plugins/appindicator - prepend-pkg-config-path: /app/plugins/appindicator/lib/pkgconfig - prepend-path: /app/plugins/appindicator/bin - -modules: - - modules/libappindicator/libappindicator-gtk3-introspection-12.10.json - - - name: gajim-appindicator - buildsystem: simple - build-commands: - - 'cp -R -t ${FLATPAK_DEST} *' - post-install: - - install -Dm644 --target-directory=${FLATPAK_DEST}/share/metainfo org.gajim.Gajim.Plugin.appindicator.metainfo.xml - - appstream-compose --basename=org.gajim.Gajim.Devel.Plugin.appindicator --prefix=${FLATPAK_DEST} --origin=flatpak org.gajim.Gajim.Plugin.appindicator - sources: - - type: archive - url: https://ftp.gajim.org/plugins_releases/appindicator_integration_1.4.0.zip - sha256: 3f8d3338ccb09da1dce4e542c1470c4a4eb7a506171f800a92b4654f5f0649d9 - - type: shell - commands: - - sed -i "s+org.gajim.Gajim+org.gajim.Gajim.Devel+" org.gajim.Gajim.Plugin.*.metainfo.xml diff --git a/flatpak/org.gajim.Gajim.Plugin.omemo.yaml b/flatpak/org.gajim.Gajim.Plugin.omemo.yaml index e276ed6..9c79dc0 100644 --- a/flatpak/org.gajim.Gajim.Plugin.omemo.yaml +++ b/flatpak/org.gajim.Gajim.Plugin.omemo.yaml @@ -10,16 +10,14 @@ build-options: PIP_TARGET: /app/plugins/omemo/site-packages modules: - - modules/python3-pillow.yaml - - name: protobuf buildsystem: simple build-commands: - - pip3 install --no-deps protobuf-3.18.0-py2.py3-none-any.whl + - pip3 install --no-deps protobuf-3.19.1-py2.py3-none-any.whl sources: - type: file - url: https://files.pythonhosted.org/packages/py2.py3/p/protobuf/protobuf-3.18.0-py2.py3-none-any.whl - sha256: 615099e52e9fbc9fde00177267a94ca820ecf4e80093e390753568b7d8cb3c1a + url: https://files.pythonhosted.org/packages/py2.py3/p/protobuf/protobuf-3.19.1-py2.py3-none-any.whl + sha256: e813b1c9006b6399308e917ac5d298f345d95bb31f46f02b60cd92970a9afa17 - name: python3-axolotl-curve25519 buildsystem: simple @@ -45,8 +43,8 @@ modules: - pip3 install . sources: - type: archive - url: https://files.pythonhosted.org/packages/source/q/qrcode/qrcode-7.3.tar.gz - sha256: d72861b65e26b611609f0547f0febe58aed8ae229d6bf4e675834f40742915b3 + url: https://files.pythonhosted.org/packages/source/q/qrcode/qrcode-7.3.1.tar.gz + sha256: 375a6ff240ca9bd41adc070428b5dfc1dcfbb0f2507f1ac848f6cded38956578 - name: gajim-omemo buildsystem: simple @@ -57,8 +55,8 @@ modules: - appstream-compose --basename=org.gajim.Gajim.Devel.Plugin.omemo --prefix=${FLATPAK_DEST} --origin=flatpak org.gajim.Gajim.Plugin.omemo sources: - type: archive - url: https://ftp.gajim.org/plugins_releases/omemo_2.8.7.zip - sha256: f5fc91d2359446c69d0d92272d9237ce1c45689d48551430f5508ca896255e44 + url: https://ftp.gajim.org/plugins_releases/omemo_2.8.8.zip + sha256: 3a68314ee12f0098bbc1e8c76d62e80703d65a7a5ee3671fd465f546a895c7bd - type: shell commands: - sed -i "s+org.gajim.Gajim+org.gajim.Gajim.Devel+" org.gajim.Gajim.Plugin.*.metainfo.xml diff --git a/flatpak/org.gajim.Gajim.Plugin.openpgp.yaml b/flatpak/org.gajim.Gajim.Plugin.openpgp.yaml index 51266de..5299a9c 100644 --- a/flatpak/org.gajim.Gajim.Plugin.openpgp.yaml +++ b/flatpak/org.gajim.Gajim.Plugin.openpgp.yaml @@ -50,8 +50,8 @@ modules: - appstream-compose --basename=org.gajim.Gajim.Devel.Plugin.openpgp --prefix=${FLATPAK_DEST} --origin=flatpak org.gajim.Gajim.Plugin.openpgp sources: - type: archive - url: https://ftp.gajim.org/plugins_releases/openpgp_1.4.2.zip - sha256: ebe0432fd3c37267440cae7e95a942fa81b43d4dedcb5f2d3ac28cc27d3f9375 + url: https://ftp.gajim.org/plugins_releases/openpgp_1.4.3.zip + sha256: 421d11be0c32d758270d268e1f88239826b7cd0ab0f4470562b0e1017fe87f38 - type: shell commands: - sed -i "s+org.gajim.Gajim+org.gajim.Gajim.Devel+" org.gajim.Gajim.Plugin.*.metainfo.xml diff --git a/flatpak/org.gajim.Gajim.Plugin.pgp.yaml b/flatpak/org.gajim.Gajim.Plugin.pgp.yaml index e8d810f..daf12fa 100644 --- a/flatpak/org.gajim.Gajim.Plugin.pgp.yaml +++ b/flatpak/org.gajim.Gajim.Plugin.pgp.yaml @@ -13,11 +13,11 @@ modules: - name: python3-python-gnupg buildsystem: simple build-commands: - - pip3 install python_gnupg-0.4.7-py2.py3-none-any.whl + - pip3 install python_gnupg-0.4.8-py2.py3-none-any.whl sources: - type: file - url: https://files.pythonhosted.org/packages/py2.py3/p/python_gnupg/python_gnupg-0.4.7-py2.py3-none-any.whl - sha256: 3ff5b1bf5e397de6e1fe41a7c0f403dad4e242ac92b345f440eaecfb72a7ebae + url: https://files.pythonhosted.org/packages/py2.py3/p/python_gnupg/python_gnupg-0.4.8-py2.py3-none-any.whl + sha256: 93a521501d6c2785d96b190aec7125ba89c1c2fe708b0c98af3fb32b59026ab8 - name: gajim-pgp buildsystem: simple @@ -28,8 +28,8 @@ modules: - appstream-compose --basename=org.gajim.Gajim.Devel.Plugin.pgp --prefix=${FLATPAK_DEST} --origin=flatpak org.gajim.Gajim.Plugin.pgp sources: - type: archive - url: https://ftp.gajim.org/plugins_releases/pgp_1.4.2.zip - sha256: 2bd991fd5b77a9e9508667c7ab7f3c5a9952cd49df7acda089c9c0a11878b0ea + url: https://ftp.gajim.org/plugins_releases/pgp_1.4.3.zip + sha256: eaa38cbee5cd891b795ceac9910266f7d068009e7707c2aa50bf1262bac4af81 - type: shell commands: - sed -i "s+org.gajim.Gajim+org.gajim.Gajim.Devel+" org.gajim.Gajim.Plugin.*.metainfo.xml diff --git a/flatpak/org.gajim.Gajim.Plugin.syntax_highlight.yaml b/flatpak/org.gajim.Gajim.Plugin.syntax_highlight.yaml deleted file mode 100644 index af8e30d..0000000 --- a/flatpak/org.gajim.Gajim.Plugin.syntax_highlight.yaml +++ /dev/null @@ -1,44 +0,0 @@ -id: org.gajim.Gajim.Devel.Plugin.syntax_highlight -runtime: org.gajim.Gajim.Devel -sdk: org.gnome.Sdk//41 -build-extension: true -separate-locales: false -appstream-compose: false - -build-options: - env: - PIP_TARGET: /app/plugins/syntax_highlight/site-packages - -modules: - - name: python3-pygments - buildsystem: simple - build-commands: - - pip3 install --ignore-installed Pygments-2.10.0-py3-none-any.whl - sources: - - type: file - url: https://files.pythonhosted.org/packages/py3/p/pygments/Pygments-2.10.0-py3-none-any.whl - sha256: b8e67fe6af78f492b3c4b3e2970c0624cbf08beb1e493b2c99b9fa1b67a20380 - - - name: python3-MarkupSafe - buildsystem: simple - build-commands: - - pip3 install . - sources: - - type: archive - url: https://files.pythonhosted.org/packages/source/m/markupsafe/MarkupSafe-2.0.1.tar.gz - sha256: 594c67807fb16238b30c44bdf74f36c02cdf22d1c8cda91ef8a0ed8dabf5620a - - - name: gajim-syntax_highlight - buildsystem: simple - build-commands: - - 'cp -R -t ${FLATPAK_DEST} *' - post-install: - - install -Dm644 --target-directory=${FLATPAK_DEST}/share/metainfo org.gajim.Gajim.Plugin.syntax_highlight.metainfo.xml - - appstream-compose --basename=org.gajim.Gajim.Devel.Plugin.syntax_highlight --prefix=${FLATPAK_DEST} --origin=flatpak org.gajim.Gajim.Plugin.syntax_highlight - sources: - - type: archive - url: https://ftp.gajim.org/plugins_releases/syntax_highlight_1.4.0.zip - sha256: 2191670f9d3a480bd274af416a3f4572f347af7a93cea498208e1a3e135b9eb2 - - type: shell - commands: - - sed -i "s+org.gajim.Gajim+org.gajim.Gajim.Devel+" org.gajim.Gajim.Plugin.*.metainfo.xml diff --git a/flatpak/org.gajim.Gajim.Plugin.url_image_preview.yaml b/flatpak/org.gajim.Gajim.Plugin.url_image_preview.yaml deleted file mode 100644 index 09e11fc..0000000 --- a/flatpak/org.gajim.Gajim.Plugin.url_image_preview.yaml +++ /dev/null @@ -1,28 +0,0 @@ -id: org.gajim.Gajim.Devel.Plugin.url_image_preview -runtime: org.gajim.Gajim.Devel -sdk: org.gnome.Sdk//41 -build-extension: true -separate-locales: false -appstream-compose: false - -build-options: - env: - PIP_TARGET: /app/plugins/url_image_preview/site-packages - -modules: - - modules/python3-pillow.yaml - - - name: gajim-url_image_preview - buildsystem: simple - build-commands: - - 'cp -R -t ${FLATPAK_DEST} *' - post-install: - - install -Dm644 --target-directory=${FLATPAK_DEST}/share/metainfo org.gajim.Gajim.Plugin.url_image_preview.metainfo.xml - - appstream-compose --basename=org.gajim.Gajim.Devel.Plugin.url_image_preview --prefix=${FLATPAK_DEST} --origin=flatpak org.gajim.Gajim.Plugin.url_image_preview - sources: - - type: archive - url: https://ftp.gajim.org/plugins_releases/url_image_preview_2.6.8.zip - sha256: b9e7afe8ec911f4be2c37d5ce0393c8e7130e12d3d5470480c6b2265bb436ead - - type: shell - commands: - - sed -i "s+org.gajim.Gajim+org.gajim.Gajim.Devel+" org.gajim.Gajim.Plugin.*.metainfo.xml -- cgit v1.2.3