Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
gajim
gajim-plugins
Commits
3218f470
Verified
Commit
3218f470
authored
Dec 05, 2021
by
André
Browse files
Flatpak: Update plugins
parent
b825260e
Pipeline
#8626
failed with stage
Changes
14
Pipelines
1
Expand all
Hide whitespace changes
Inline
Side-by-side
flatpak/modules/dbus-glib/dbus-glib-0.110.json
deleted
100644 → 0
View file @
b825260e
{
"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"
}
]
}
flatpak/modules/intltool/intltool-0.51.json
deleted
100644 → 0
View file @
b825260e
{
"name"
:
"intltool"
,
"cleanup"
:
[
"*"
],
"sources"
:
[
{
"type"
:
"archive"
,
"url"
:
"https://launchpad.net/intltool/trunk/0.51.0/+download/intltool-0.51.0.tar.gz"
,
"sha256"
:
"67c74d94196b153b774ab9f89b2fa6c6ba79352407037c8c14d5aeb334e959cd"
}
]
}
flatpak/modules/libappindicator/libappindicator-fix-crash-from-incorrect-signal-emission.patch
deleted
100644 → 0
View file @
b825260e
--- 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;
flatpak/modules/libappindicator/libappindicator-fix-crash-iterating-icon-themes.patch
deleted
100644 → 0
View file @
b825260e
--- 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;
flatpak/modules/libappindicator/libappindicator-ftbfs.patch
deleted
100644 → 0
View file @
b825260e
From: Olivier Tilloy <olivier.tilloy@canonical.com>
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);
}
flatpak/modules/libappindicator/libappindicator-gtk3-introspection-12.10.json
deleted
100644 → 0
View file @
b825260e
{
"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"
}
]
}
]
}
flatpak/modules/libappindicator/libappindicator-no-python.patch
deleted
100644 → 0
View file @
b825260e
This diff is collapsed.
Click to expand it.
flatpak/modules/python3-pillow.yaml
deleted
100644 → 0
View file @
b825260e
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
flatpak/org.gajim.Gajim.Plugin.appindicator.yaml
deleted
100644 → 0
View file @
b825260e
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
flatpak/org.gajim.Gajim.Plugin.omemo.yaml
View file @
3218f470
...
...
@@ -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.1
8.0
-py2.py3-none-any.whl
-
pip3 install --no-deps protobuf-3.1
9.1
-py2.py3-none-any.whl
sources
:
-
type
:
file
url
:
https://files.pythonhosted.org/packages/py2.py3/p/protobuf/protobuf-3.1
8.0
-py2.py3-none-any.whl
sha256
:
615099e52e9fbc9fde00177267a94ca820ecf4e80093e390753568b7d8cb3c1a
url
:
https://files.pythonhosted.org/packages/py2.py3/p/protobuf/protobuf-3.1
9.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
flatpak/org.gajim.Gajim.Plugin.openpgp.yaml
View file @
3218f470
...
...
@@ -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
:
e
be0
4
32
fd3c37267440cae7e95a942fa81b43d4dedcb5f2d3ac28cc27d3f9375
url
:
https://ftp.gajim.org/plugins_releases/openpgp_1.4.
3
.zip
sha256
:
421d11
be0
c
32
d758270d268e1f88239826b7cd0ab0f4470562b0e1017fe87f38
-
type
:
shell
commands
:
-
sed -i "s+org.gajim.Gajim+org.gajim.Gajim.Devel+" org.gajim.Gajim.Plugin.*.metainfo.xml
flatpak/org.gajim.Gajim.Plugin.pgp.yaml
View file @
3218f470
...
...
@@ -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
flatpak/org.gajim.Gajim.Plugin.syntax_highlight.yaml
deleted
100644 → 0
View file @
b825260e
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
flatpak/org.gajim.Gajim.Plugin.url_image_preview.yaml
deleted
100644 → 0
View file @
b825260e
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
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment