diff options
| -rw-r--r-- | .gitmodules | 3 | ||||
| -rw-r--r-- | flatpak/org.remmina.Remmina.json | 93 | ||||
| -rw-r--r-- | flatpak/patches/libappindicator-ftbfs-gnome-sdk-3.28.patch | 20 | ||||
| m--------- | flatpak/shared-modules | 0 |
4 files changed, 4 insertions, 112 deletions
diff --git a/.gitmodules b/.gitmodules new file mode 100644 index 000000000..ff138137b --- /dev/null +++ b/.gitmodules @@ -0,0 +1,3 @@ +[submodule "flatpak/shared-modules"] + path = flatpak/shared-modules + url = https://github.com/flathub/shared-modules.git diff --git a/flatpak/org.remmina.Remmina.json b/flatpak/org.remmina.Remmina.json index 883b7625c..2cb2dfa26 100644 --- a/flatpak/org.remmina.Remmina.json +++ b/flatpak/org.remmina.Remmina.json @@ -46,98 +46,7 @@ "--talk-name=ca.desrt.dconf", "--env=DCONF_USER_CONFIG_DIR=.config/dconf" ], "modules": [ - { - "name": "libappindicator", - "build-options" : { - "cflags": "-O2 -g -Wno-error=deprecated-declarations" - }, - "config-opts": [ - "--disable-gtk-doc", - "--disable-introspection", - "--disable-tests", - "--disable-mono-tests", - "--with-gtk=3" - ], - "rm-configure": true, - "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": "patches/libappindicator-ftbfs-gnome-sdk-3.28.patch" - }, - { - "type": "shell", - "commands": [ - "# Disable python bindings", - "sed -e '/APPINDICATOR_PYTHON/,/\\$PYGTK_CODEGEN/ d' -i configure.ac", - "sed -e '/bindings/ d' -e '/example/ d' -i Makefile.am" - ] - } - ], - "modules": [ - { - "name": "libdbusmenu", - "build-options" : { - "env": { - "HAVE_VALGRIND_FALSE": "#", - "HAVE_VALGRIND_TRUE": "" - } - }, - "cleanup": [ - "/libexec", - "/share/doc", - "/share/libdbusmenu" - ], - "config-opts": [ - "--disable-gtk-doc", - "--disable-introspection", - "--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": "-O2 -g -Wno-error=deprecated-declarations" - }, - "cleanup": [ - "/libexec", - "/share/libindicator" - ], - "config-opts": [ - "--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" - ] - } - ] - } - ] - }, + "shared-modules/libappindicator/libappindicator-gtk3-12.10.json", { "name": "avahi", "cleanup": [ diff --git a/flatpak/patches/libappindicator-ftbfs-gnome-sdk-3.28.patch b/flatpak/patches/libappindicator-ftbfs-gnome-sdk-3.28.patch deleted file mode 100644 index 93d31af6f..000000000 --- a/flatpak/patches/libappindicator-ftbfs-gnome-sdk-3.28.patch +++ /dev/null @@ -1,20 +0,0 @@ -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); - } diff --git a/flatpak/shared-modules b/flatpak/shared-modules new file mode 160000 +Subproject e2374d4cde51f312f2c39401d59eb4248fe6044 |