Philipp Hörist pushed to branch master at gajim / gajim

Commits:

14 changed files:

Changes:

  • .gitmodules
    1
    +[submodule "flatpak/shared-modules"]
    
    2
    +	path = flatpak/shared-modules
    
    3
    +	url = https://github.com/flathub/shared-modules.git

  • flatpak/README.md
    ... ... @@ -64,7 +64,7 @@ ### Download Gajim's sources
    64 64
     Alternatively, you can also download the sources from our Gitlab via web browser.
    
    65 65
     
    
    66 66
     ```bash
    
    67
    -git clone https://dev.gajim.org/gajim/gajim.git ~/Gajim
    
    67
    +git clone --recurse-submodules https://dev.gajim.org/gajim/gajim.git ~/Gajim
    
    68 68
     cd ~/Gajim
    
    69 69
     ```
    
    70 70
     
    

  • flatpak/modules/dbus-glib/dbus-glib.json deleted
    1
    -{
    
    2
    -    "name": "dbus-glib",
    
    3
    -    "cleanup": [
    
    4
    -        "*.la",
    
    5
    -        "/bin",
    
    6
    -        "/etc",
    
    7
    -        "/include",
    
    8
    -        "/libexec",
    
    9
    -        "/share/gtk-doc",
    
    10
    -        "/share/man"
    
    11
    -    ],
    
    12
    -    "config-opts": [
    
    13
    -        "--disable-static",
    
    14
    -        "--disable-gtk-doc"
    
    15
    -    ],
    
    16
    -    "sources": [
    
    17
    -        {
    
    18
    -            "type": "archive",
    
    19
    -            "url": "https://dbus.freedesktop.org/releases/dbus-glib/dbus-glib-0.112.tar.gz",
    
    20
    -            "sha256": "7d550dccdfcd286e33895501829ed971eeb65c614e73aadb4a08aeef719b143a"
    
    21
    -        }
    
    22
    -    ]
    
    23
    -}

  • flatpak/modules/intltool/intltool-0.51.json deleted
    1
    -{
    
    2
    -  "name": "intltool",
    
    3
    -  "cleanup": [ "*" ],
    
    4
    -  "sources": [
    
    5
    -    {
    
    6
    -      "type": "archive",
    
    7
    -      "url": "https://launchpad.net/intltool/trunk/0.51.0/+download/intltool-0.51.0.tar.gz",
    
    8
    -      "sha256": "67c74d94196b153b774ab9f89b2fa6c6ba79352407037c8c14d5aeb334e959cd"
    
    9
    -    },
    
    10
    -    {
    
    11
    -      "type": "patch",
    
    12
    -      "path": "intltool-perl5.26-regex-fixes.patch"
    
    13
    -    }
    
    14
    -  ]
    
    15
    -}

  • flatpak/modules/intltool/intltool-perl5.26-regex-fixes.patch deleted
    1
    -Description: Escape "{", to prevent complaints from perl 5.22 and 5.26
    
    2
    -Author: Roderich Schupp <roderich.schupp@gmail.com>
    
    3
    -Author: gregor herrmann <gregoa@debian.org>
    
    4
    -Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=788705
    
    5
    -Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=826471
    
    6
    -Bug-Upstream: https://bugs.launchpad.net/intltool/+bug/1490906
    
    7
    -
    
    8
    -Index: intltool-0.51.0/intltool-update.in
    
    9
    -===================================================================
    
    10
    ---- intltool-0.51.0.orig/intltool-update.in	2017-07-23 17:24:35.113169465 +0200
    
    11
    -+++ intltool-0.51.0/intltool-update.in	2017-07-23 17:24:35.109169052 +0200
    
    12
    -@@ -1062,13 +1062,13 @@
    
    13
    - 	}
    
    14
    -     }
    
    15
    - 
    
    16
    --    if ($str =~ /^(.*)\${?([A-Z_]+)}?(.*)$/)
    
    17
    -+    if ($str =~ /^(.*)\$\{?([A-Z_]+)}?(.*)$/)
    
    18
    -     {
    
    19
    - 	my $rest = $3;
    
    20
    - 	my $untouched = $1;
    
    21
    - 	my $sub = "";
    
    22
    -         # Ignore recursive definitions of variables
    
    23
    --        $sub = $varhash{$2} if defined $varhash{$2} and $varhash{$2} !~ /\${?$2}?/;
    
    24
    -+        $sub = $varhash{$2} if defined $varhash{$2} and $varhash{$2} !~ /\$\{?$2}?/;
    
    25
    - 
    
    26
    - 	return SubstituteVariable ("$untouched$sub$rest");
    
    27
    -     }
    
    28
    -@@ -1190,10 +1190,10 @@
    
    29
    - 	$name    =~ s/\(+$//g;
    
    30
    - 	$version =~ s/\(+$//g;
    
    31
    - 
    
    32
    --	$varhash{"PACKAGE_NAME"} = $name if (not $name =~ /\${?AC_PACKAGE_NAME}?/);
    
    33
    --	$varhash{"PACKAGE"} = $name if (not $name =~ /\${?PACKAGE}?/);
    
    34
    --	$varhash{"PACKAGE_VERSION"} = $version if (not $name =~ /\${?AC_PACKAGE_VERSION}?/);
    
    35
    --	$varhash{"VERSION"} = $version if (not $name =~ /\${?VERSION}?/);
    
    36
    -+	$varhash{"PACKAGE_NAME"} = $name if (not $name =~ /\$\{?AC_PACKAGE_NAME}?/);
    
    37
    -+	$varhash{"PACKAGE"} = $name if (not $name =~ /\$\{?PACKAGE}?/);
    
    38
    -+	$varhash{"PACKAGE_VERSION"} = $version if (not $name =~ /\$\{?AC_PACKAGE_VERSION}?/);
    
    39
    -+	$varhash{"VERSION"} = $version if (not $name =~ /\$\{?VERSION}?/);
    
    40
    -     }
    
    41
    - 
    
    42
    -     if ($conf_source =~ /^AC_INIT\(([^,\)]+),([^,\)]+)[,]?([^,\)]+)?/m)
    
    43
    -@@ -1219,11 +1219,11 @@
    
    44
    - 	$version =~ s/\(+$//g;
    
    45
    -         $bugurl  =~ s/\(+$//g if (defined $bugurl);
    
    46
    - 
    
    47
    --	$varhash{"PACKAGE_NAME"} = $name if (not $name =~ /\${?AC_PACKAGE_NAME}?/);
    
    48
    --	$varhash{"PACKAGE"} = $name if (not $name =~ /\${?PACKAGE}?/);
    
    49
    --	$varhash{"PACKAGE_VERSION"} = $version if (not $name =~ /\${?AC_PACKAGE_VERSION}?/);
    
    50
    --	$varhash{"VERSION"} = $version if (not $name =~ /\${?VERSION}?/);
    
    51
    --        $varhash{"PACKAGE_BUGREPORT"} = $bugurl if (defined $bugurl and not $bugurl =~ /\${?\w+}?/);
    
    52
    -+	$varhash{"PACKAGE_NAME"} = $name if (not $name =~ /\$\{?AC_PACKAGE_NAME}?/);
    
    53
    -+	$varhash{"PACKAGE"} = $name if (not $name =~ /\$\{?PACKAGE}?/);
    
    54
    -+	$varhash{"PACKAGE_VERSION"} = $version if (not $name =~ /\$\{?AC_PACKAGE_VERSION}?/);
    
    55
    -+	$varhash{"VERSION"} = $version if (not $name =~ /\$\{?VERSION}?/);
    
    56
    -+        $varhash{"PACKAGE_BUGREPORT"} = $bugurl if (defined $bugurl and not $bugurl =~ /\$\{?\w+}?/);
    
    57
    -     }
    
    58
    - 
    
    59
    -     # \s makes this not work, why?

  • flatpak/modules/libappindicator/libappindicator-fix-crash-from-incorrect-signal-emission.patch deleted
    1
    ---- libappindicator-12.10.0/src/app-indicator.c	2012-07-11 13:28:34.415113869 -0400
    
    2
    -+++ wrk/src/app-indicator.c	2020-03-19 12:14:47.813191652 -0400
    
    3
    -@@ -443,7 +443,7 @@
    
    4
    - 	                                  G_STRUCT_OFFSET (AppIndicatorClass, new_icon),
    
    5
    - 	                                  NULL, NULL,
    
    6
    - 	                                  g_cclosure_marshal_VOID__VOID,
    
    7
    --	                                  G_TYPE_NONE, 0, G_TYPE_NONE);
    
    8
    -+	                                  G_TYPE_NONE, 0);
    
    9
    - 
    
    10
    - 	/**
    
    11
    - 	 * AppIndicator::new-attention-icon:
    
    12
    -@@ -457,7 +457,7 @@
    
    13
    - 	                                            G_STRUCT_OFFSET (AppIndicatorClass, new_attention_icon),
    
    14
    - 	                                            NULL, NULL,
    
    15
    - 	                                            g_cclosure_marshal_VOID__VOID,
    
    16
    --	                                            G_TYPE_NONE, 0, G_TYPE_NONE);
    
    17
    -+	                                            G_TYPE_NONE, 0);
    
    18
    - 
    
    19
    - 	/**
    
    20
    - 	 * AppIndicator::new-status:
    
    21
    -@@ -505,7 +505,7 @@
    
    22
    - 	                                            G_STRUCT_OFFSET (AppIndicatorClass, connection_changed),
    
    23
    - 	                                            NULL, NULL,
    
    24
    - 	                                            g_cclosure_marshal_VOID__BOOLEAN,
    
    25
    --	                                            G_TYPE_NONE, 1, G_TYPE_BOOLEAN, G_TYPE_NONE);
    
    26
    -+	                                            G_TYPE_NONE, 1, G_TYPE_BOOLEAN);
    
    27
    - 
    
    28
    - 	/**
    
    29
    - 	 * AppIndicator::new-icon-theme-path:
    
    30
    -@@ -1175,7 +1175,7 @@
    
    31
    - 	gchar * guide = priv->label_guide != NULL ? priv->label_guide : "";
    
    32
    - 
    
    33
    - 	g_signal_emit(G_OBJECT(self), signals[NEW_LABEL], 0,
    
    34
    --	              label, guide, TRUE);
    
    35
    -+	              label, guide);
    
    36
    - 	if (priv->dbus_registration != 0 && priv->connection != NULL) {
    
    37
    - 		GError * error = NULL;
    
    38
    - 
    
    39
    -@@ -1490,7 +1490,7 @@
    
    40
    - static void
    
    41
    - theme_changed_cb (GtkIconTheme * theme, gpointer user_data)
    
    42
    - {
    
    43
    --	g_signal_emit (user_data, signals[NEW_ICON], 0, TRUE);
    
    44
    -+	g_signal_emit (user_data, signals[NEW_ICON], 0);
    
    45
    - 
    
    46
    - 	AppIndicator * self = (AppIndicator *)user_data;
    
    47
    - 	AppIndicatorPrivate *priv = self->priv;
    
    48
    -@@ -1904,7 +1904,7 @@
    
    49
    - 	}
    
    50
    - 
    
    51
    - 	if (changed) {
    
    52
    --		g_signal_emit (self, signals[NEW_ATTENTION_ICON], 0, TRUE);
    
    53
    -+		g_signal_emit (self, signals[NEW_ATTENTION_ICON], 0);
    
    54
    - 
    
    55
    - 		if (self->priv->dbus_registration != 0 && self->priv->connection != NULL) {
    
    56
    - 			GError * error = NULL;
    
    57
    -@@ -1982,7 +1982,7 @@
    
    58
    - 	}
    
    59
    - 
    
    60
    - 	if (changed) {
    
    61
    --		g_signal_emit (self, signals[NEW_ICON], 0, TRUE);
    
    62
    -+		g_signal_emit (self, signals[NEW_ICON], 0);
    
    63
    - 
    
    64
    - 		if (self->priv->dbus_registration != 0 && self->priv->connection != NULL) {
    
    65
    - 			GError * error = NULL;
    
    66
    -@@ -2048,7 +2048,7 @@
    
    67
    - 
    
    68
    - 		self->priv->icon_theme_path = g_strdup(icon_theme_path);
    
    69
    - 
    
    70
    --		g_signal_emit (self, signals[NEW_ICON_THEME_PATH], 0, self->priv->icon_theme_path, TRUE);
    
    71
    -+		g_signal_emit (self, signals[NEW_ICON_THEME_PATH], 0, self->priv->icon_theme_path);
    
    72
    - 
    
    73
    - 		if (self->priv->dbus_registration != 0 && self->priv->connection != NULL) {
    
    74
    - 			GError * error = NULL;

  • flatpak/modules/libappindicator/libappindicator-fix-crash-iterating-icon-themes.patch deleted
    1
    ---- libappindicator-12.10.0/src/app-indicator.c
    
    2
    -+++ libappindicator-12.10.0/src/app-indicator.c
    
    3
    -@@ -1606,7 +1606,7 @@ status_icon_changes (AppIndicator * self, gpointer data)
    
    4
    - 		gint n_elements, i;
    
    5
    - 		gboolean found=FALSE;
    
    6
    - 		gtk_icon_theme_get_search_path(icon_theme, &path, &n_elements);
    
    7
    --		for (i=0; i< n_elements || path[i] == NULL; i++) {
    
    8
    -+		for (i=0; i< n_elements; i++) {
    
    9
    - 			if(g_strcmp0(path[i], self->priv->icon_theme_path) == 0) {
    
    10
    - 				found=TRUE;
    
    11
    - 				break;

  • flatpak/modules/libappindicator/libappindicator-ftbfs.patch deleted
    1
    -From: Olivier Tilloy <olivier.tilloy@canonical.com>
    
    2
    -Date: Tue 2018-03-20 12:47:56 +0000
    
    3
    -Subject: [PATCH] libappindicator FTBFS on bionic
    
    4
    -
    
    5
    -Fix build failures on bionic,
    
    6
    -and update Vcs-* fields in debian/control. (LP: #1757121)
    
    7
    -
    
    8
    -Approved by: Marco Trevisan (Treviño)
    
    9
    ----
    
    10
    ---- libappindicator-12.10.0/src/app-indicator.c	2017-02-15 14:10:41 +0000
    
    11
    -+++ libappindicator-12.10.0/src/app-indicator.c	2018-03-20 12:38:59 +0000
    
    12
    -@@ -2196,7 +2196,7 @@ app_indicator_set_secondary_activate_tar
    
    13
    - 
    
    14
    - 	g_return_if_fail (GTK_IS_WIDGET (menuitem));
    
    15
    - 
    
    16
    --	priv->sec_activate_target = g_object_ref(G_OBJECT(menuitem));
    
    17
    -+	priv->sec_activate_target = g_object_ref(menuitem);
    
    18
    - 	priv->sec_activate_enabled = widget_is_menu_child(self, menuitem);
    
    19
    - 	g_signal_connect(menuitem, "parent-set", G_CALLBACK(sec_activate_target_parent_changed), self);
    
    20
    - }

  • flatpak/modules/libappindicator/libappindicator-gtk3-introspection-12.10.json deleted
    1
    -{
    
    2
    -  "name": "libappindicator",
    
    3
    -  "build-options": {
    
    4
    -    "cflags": "-Wno-error",
    
    5
    -    "make-args": [ "-j1" ]
    
    6
    -  },
    
    7
    -  "rm-configure": true,
    
    8
    -  "config-opts": [
    
    9
    -    "--disable-static",
    
    10
    -    "--disable-gtk-doc",
    
    11
    -    "--disable-tests",
    
    12
    -    "--disable-mono-tests",
    
    13
    -    "--enable-introspection=yes",
    
    14
    -    "--with-gtk=3"
    
    15
    -  ],
    
    16
    -  "cleanup": [
    
    17
    -    "/include",
    
    18
    -    "/lib/pkgconfig",
    
    19
    -    "/lib/*.la",
    
    20
    -    "/share/gtk-doc",
    
    21
    -    "/share/gir-1.0"
    
    22
    -  ],
    
    23
    -  "sources": [
    
    24
    -    {
    
    25
    -      "type": "archive",
    
    26
    -      "url": "https://launchpad.net/libappindicator/12.10/12.10.0/+download/libappindicator-12.10.0.tar.gz",
    
    27
    -      "sha256": "d5907c1f98084acf28fd19593cb70672caa0ca1cf82d747ba6f4830d4cc3b49f"
    
    28
    -    },
    
    29
    -    {
    
    30
    -      "type": "patch",
    
    31
    -      "path": "libappindicator-ftbfs.patch"
    
    32
    -    },
    
    33
    -    {
    
    34
    -      "type": "patch",
    
    35
    -      "path": "libappindicator-no-python.patch"
    
    36
    -    },
    
    37
    -    {
    
    38
    -      "type": "patch",
    
    39
    -      "path": "libappindicator-fix-crash-from-incorrect-signal-emission.patch"
    
    40
    -    },
    
    41
    -    {
    
    42
    -      "type": "patch",
    
    43
    -      "path": "libappindicator-fix-crash-iterating-icon-themes.patch"
    
    44
    -    },
    
    45
    -    {
    
    46
    -      "type": "script",
    
    47
    -      "commands": ["autoreconf -sfi"],
    
    48
    -      "dest-filename": "autogen.sh"
    
    49
    -    }
    
    50
    -  ],
    
    51
    -  "modules": [
    
    52
    -    "../intltool/intltool-0.51.json",
    
    53
    -    "../dbus-glib/dbus-glib.json",
    
    54
    -    {
    
    55
    -      "name": "libdbusmenu",
    
    56
    -      "build-options": {
    
    57
    -        "cflags": "-Wno-error",
    
    58
    -        "env": {
    
    59
    -          "HAVE_VALGRIND_FALSE": "#",
    
    60
    -          "HAVE_VALGRIND_TRUE": ""
    
    61
    -        }
    
    62
    -      },
    
    63
    -      "cleanup": [
    
    64
    -        "/include",
    
    65
    -        "/libexec",
    
    66
    -        "/lib/pkgconfig",
    
    67
    -        "/lib/*.la",
    
    68
    -        "/share/doc",
    
    69
    -        "/share/libdbusmenu",
    
    70
    -        "/share/gtk-doc",
    
    71
    -        "/share/gir-1.0"
    
    72
    -      ],
    
    73
    -      "config-opts": [
    
    74
    -        "--disable-static",
    
    75
    -        "--disable-gtk-doc",
    
    76
    -        "--enable-introspection=yes",
    
    77
    -        "--disable-vala",
    
    78
    -        "--disable-dumper",
    
    79
    -        "--disable-tests",
    
    80
    -        "--with-gtk=3"
    
    81
    -      ],
    
    82
    -      "sources": [
    
    83
    -        {
    
    84
    -          "type": "archive",
    
    85
    -          "url": "https://launchpad.net/libdbusmenu/16.04/16.04.0/+download/libdbusmenu-16.04.0.tar.gz",
    
    86
    -          "sha256": "b9cc4a2acd74509435892823607d966d424bd9ad5d0b00938f27240a1bfa878a"
    
    87
    -        }
    
    88
    -      ]
    
    89
    -    },
    
    90
    -    {
    
    91
    -      "name": "libindicator",
    
    92
    -      "build-options": {
    
    93
    -        "cflags": "-Wno-error"
    
    94
    -      },
    
    95
    -      "cleanup": [
    
    96
    -        "/include",
    
    97
    -        "/libexec",
    
    98
    -        "/lib/pkgconfig",
    
    99
    -        "/lib/*.la",
    
    100
    -        "/share/libindicator",
    
    101
    -        "/share/gtk-doc",
    
    102
    -        "/share/gir-1.0"
    
    103
    -      ],
    
    104
    -      "config-opts": [
    
    105
    -        "--disable-static",
    
    106
    -        "--disable-tests",
    
    107
    -        "--with-gtk=3"
    
    108
    -      ],
    
    109
    -      "sources": [
    
    110
    -        {
    
    111
    -          "type": "archive",
    
    112
    -          "url": "https://launchpad.net/libindicator/12.10/12.10.1/+download/libindicator-12.10.1.tar.gz",
    
    113
    -          "sha256": "b2d2e44c10313d5c9cd60db455d520f80b36dc39562df079a3f29495e8f9447f"
    
    114
    -        },
    
    115
    -        {
    
    116
    -          "type": "shell",
    
    117
    -          "commands": [
    
    118
    -            "# FTBFS fix",
    
    119
    -            "sed -e '/LIBINDICATOR_LIBS/ s/\\$LIBM/ $LIBM/' -i configure.ac"
    
    120
    -          ]
    
    121
    -        },
    
    122
    -        {
    
    123
    -          "type": "script",
    
    124
    -          "commands": ["autoreconf -sfi"],
    
    125
    -          "dest-filename": "autogen.sh"
    
    126
    -        }
    
    127
    -      ]
    
    128
    -    }
    
    129
    -  ]
    
    130
    -}

  • flatpak/modules/libappindicator/libappindicator-no-python.patch deleted
    1
    -diff --git a/bindings/Makefile.am b/bindings/Makefile.am
    
    2
    -index d1f6d73..dccca6c 100644
    
    3
    ---- a/bindings/Makefile.am
    
    4
    -+++ b/bindings/Makefile.am
    
    5
    -@@ -3,7 +3,6 @@ SUBDIRS =	\
    
    6
    - 	vala
    
    7
    - else
    
    8
    - SUBDIRS =		\
    
    9
    --	python		\
    
    10
    - 	vala
    
    11
    - endif
    
    12
    - 
    
    13
    -diff --git a/bindings/python/Makefile.am b/bindings/python/Makefile.am
    
    14
    -deleted file mode 100644
    
    15
    -index fe95c02..0000000
    
    16
    ---- a/bindings/python/Makefile.am
    
    17
    -+++ /dev/null
    
    18
    -@@ -1,39 +0,0 @@
    
    19
    --defsdir = $(datadir)/pygtk/2.0/defs
    
    20
    --defs_DATA = appindicator.defs
    
    21
    --
    
    22
    --#CFLAGS = -Wall -Werror
    
    23
    --INCLUDES = \
    
    24
    --		-I$(top_srcdir)/src \
    
    25
    --        -DG_LOG_DOMAIN=\"appindicator-python\" \
    
    26
    --        -DDATADIR=\"$(datadir)\" \
    
    27
    --        -DLIBDIR=\"$(libdir)\" \
    
    28
    --        $(APPINDICATOR_PYTHON_CFLAGS) \
    
    29
    --        $(PYTHON_INCLUDES)
    
    30
    --
    
    31
    --pkgpythondir = $(pyexecdir)
    
    32
    --pkgpyexecdir = $(pyexecdir)
    
    33
    --
    
    34
    --pkgappindicatordir = $(pkgpythondir)/appindicator
    
    35
    --pkgappindicator_PYTHON = __init__.py
    
    36
    --
    
    37
    --appindicatordir = $(pkgpyexecdir)/appindicator
    
    38
    --appindicator_LTLIBRARIES = _appindicator.la
    
    39
    --
    
    40
    --_appindicator_la_LDFLAGS = -module -avoid-version -export-symbols-regex init_appindicator
    
    41
    --_appindicator_la_LIBADD = $(APPINDICATOR_PYTHON_LIBS) -L$(top_builddir)/src/.libs -lappindicator
    
    42
    --_appindicator_la_SOURCES = appindicatormodule.c
    
    43
    --nodist__appindicator_la_SOURCES = appindicator.c
    
    44
    --
    
    45
    --CLEANFILES = appindicator.c
    
    46
    --EXTRA_DIST = appindicator.override.in appindicator-arg-types.py $(defs_DATA)
    
    47
    --appindicator.c: $(defs_DATA) appindicator.override
    
    48
    --
    
    49
    --%.c: %.defs
    
    50
    --	($(PYGTK_CODEGEN) \
    
    51
    --		--register $(PYGTK_DEFSDIR)/gtk-types.defs \
    
    52
    --		--register $(PYGTK_DEFSDIR)/gdk-types.defs \
    
    53
    --		--load-types $(srcdir)/appindicator-arg-types.py \
    
    54
    --	    --override $*.override \
    
    55
    --	    --prefix py$* $(srcdir)/$*.defs) > gen-$*.c \
    
    56
    --	 && cp gen-$*.c $*.c \
    
    57
    --	 && rm -f gen-$*.c
    
    58
    -diff --git a/bindings/python/__init__.py b/bindings/python/__init__.py
    
    59
    -deleted file mode 100644
    
    60
    -index 20e2140..0000000
    
    61
    ---- a/bindings/python/__init__.py
    
    62
    -+++ /dev/null
    
    63
    -@@ -1,27 +0,0 @@
    
    64
    --# Python bindings for libappindicator.
    
    65
    --# 
    
    66
    --# Copyright 2009 Canonical Ltd.
    
    67
    --# 
    
    68
    --# Authors:
    
    69
    --#     Eitan Isaacson <eitan@ascender.com>
    
    70
    --#     Neil Jagdish Patel <neil.patel@canonical.com>
    
    71
    --# 
    
    72
    --# This program is free software: you can redistribute it and/or modify it 
    
    73
    --# under the terms of either or both of the following licenses:
    
    74
    --# 
    
    75
    --# 1) the GNU Lesser General Public License version 3, as published by the 
    
    76
    --# Free Software Foundation; and/or
    
    77
    --# 2) the GNU Lesser General Public License version 2.1, as published by 
    
    78
    --# the Free Software Foundation.
    
    79
    --# 
    
    80
    --# This program is distributed in the hope that it will be useful, but 
    
    81
    --# WITHOUT ANY WARRANTY; without even the implied warranties of 
    
    82
    --# MERCHANTABILITY, SATISFACTORY QUALITY or FITNESS FOR A PARTICULAR 
    
    83
    --# PURPOSE.  See the applicable version of the GNU Lesser General Public 
    
    84
    --# License for more details.
    
    85
    --# 
    
    86
    --# You should have received a copy of both the GNU Lesser General Public 
    
    87
    --# License version 3 and version 2.1 along with this program.  If not, see 
    
    88
    --# <http://www.gnu.org/licenses/>
    
    89
    --
    
    90
    --from _appindicator import *
    
    91
    -diff --git a/bindings/python/appindicator-arg-types.py b/bindings/python/appindicator-arg-types.py
    
    92
    -deleted file mode 100644
    
    93
    -index 9d74aa0..0000000
    
    94
    ---- a/bindings/python/appindicator-arg-types.py
    
    95
    -+++ /dev/null
    
    96
    -@@ -1,27 +0,0 @@
    
    97
    --# Python bindings for libappindicator.
    
    98
    --# 
    
    99
    --# Copyright 2009 Canonical Ltd.
    
    100
    --# 
    
    101
    --# Authors:
    
    102
    --#     Eitan Isaacson <eitan@ascender.com>
    
    103
    --# 
    
    104
    --# This program is free software: you can redistribute it and/or modify it 
    
    105
    --# under the terms of either or both of the following licenses:
    
    106
    --# 
    
    107
    --# 1) the GNU Lesser General Public License version 3, as published by the 
    
    108
    --# Free Software Foundation; and/or
    
    109
    --# 2) the GNU Lesser General Public License version 2.1, as published by 
    
    110
    --# the Free Software Foundation.
    
    111
    --# 
    
    112
    --# This program is distributed in the hope that it will be useful, but 
    
    113
    --# WITHOUT ANY WARRANTY; without even the implied warranties of 
    
    114
    --# MERCHANTABILITY, SATISFACTORY QUALITY or FITNESS FOR A PARTICULAR 
    
    115
    --# PURPOSE.  See the applicable version of the GNU Lesser General Public 
    
    116
    --# License for more details.
    
    117
    --# 
    
    118
    --# You should have received a copy of both the GNU Lesser General Public 
    
    119
    --# License version 3 and version 2.1 along with this program.  If not, see 
    
    120
    --# <http://www.gnu.org/licenses/>
    
    121
    --
    
    122
    --import argtypes
    
    123
    --
    
    124
    -diff --git a/bindings/python/appindicator.defs b/bindings/python/appindicator.defs
    
    125
    -deleted file mode 100644
    
    126
    -index 4fcc2d5..0000000
    
    127
    ---- a/bindings/python/appindicator.defs
    
    128
    -+++ /dev/null
    
    129
    -@@ -1,200 +0,0 @@
    
    130
    --;; -*- scheme -*-
    
    131
    --; object definitions ...
    
    132
    --(define-object Indicator
    
    133
    --  (in-module "App")
    
    134
    --  (parent "GObject")
    
    135
    --  (c-name "AppIndicator")
    
    136
    --  (gtype-id "APP_TYPE_INDICATOR")
    
    137
    --)
    
    138
    --
    
    139
    --;; Enumerations and flags ...
    
    140
    --
    
    141
    --(define-enum IndicatorCategory
    
    142
    --  (in-module "App")
    
    143
    --  (c-name "AppIndicatorCategory")
    
    144
    --  (gtype-id "APP_INDICATOR_TYPE_INDICATOR_CATEGORY")
    
    145
    --  (values
    
    146
    --    '("ApplicationStatus" "APP_INDICATOR_CATEGORY_APPLICATION_STATUS")
    
    147
    --    '("Communications" "APP_INDICATOR_CATEGORY_COMMUNICATIONS")
    
    148
    --    '("SystemServices" "APP_INDICATOR_CATEGORY_SYSTEM_SERVICES")
    
    149
    --    '("Hardware" "APP_INDICATOR_CATEGORY_HARDWARE")
    
    150
    --    '("Other" "APP_INDICATOR_CATEGORY_OTHER")
    
    151
    --  )
    
    152
    --)
    
    153
    --
    
    154
    --(define-enum IndicatorStatus
    
    155
    --  (in-module "App")
    
    156
    --  (c-name "AppIndicatorStatus")
    
    157
    --  (gtype-id "APP_INDICATOR_TYPE_INDICATOR_STATUS")
    
    158
    --  (values
    
    159
    --    '("Passive" "APP_INDICATOR_STATUS_PASSIVE")
    
    160
    --    '("Active" "APP_INDICATOR_STATUS_ACTIVE")
    
    161
    --    '("NeedsAttention" "APP_INDICATOR_STATUS_ATTENTION")
    
    162
    --  )
    
    163
    --)
    
    164
    --
    
    165
    --;; From app-indicator.h
    
    166
    --
    
    167
    --(define-function app_indicator_get_type
    
    168
    --  (c-name "app_indicator_get_type")
    
    169
    --  (return-type "GType")
    
    170
    --)
    
    171
    --
    
    172
    --(define-function app_indicator_new_with_path
    
    173
    --  (c-name "app_indicator_new_with_path")
    
    174
    --  (is-constructor-of "AppIndicator")
    
    175
    --  (return-type "AppIndicator*")
    
    176
    --  (parameters
    
    177
    --    '("const-gchar*" "id")
    
    178
    --    '("const-gchar*" "icon_name")
    
    179
    --    '("AppIndicatorCategory" "category")
    
    180
    --    '("const-gchar*" "icon_theme_path" (null-ok) (default "NULL"))
    
    181
    --  )
    
    182
    --)
    
    183
    --
    
    184
    --(define-method set_status
    
    185
    --  (of-object "AppIndicator")
    
    186
    --  (c-name "app_indicator_set_status")
    
    187
    --  (return-type "none")
    
    188
    --  (parameters
    
    189
    --    '("AppIndicatorStatus" "status")
    
    190
    --  )
    
    191
    --)
    
    192
    --
    
    193
    --(define-method set_attention_icon
    
    194
    --  (of-object "AppIndicator")
    
    195
    --  (c-name "app_indicator_set_attention_icon_full")
    
    196
    --  (return-type "none")
    
    197
    --  (parameters
    
    198
    --    '("const-gchar*" "icon_name")
    
    199
    --    '("const-gchar*" "icon_desc" (null-ok) (default "NULL"))
    
    200
    --  )
    
    201
    --)
    
    202
    --
    
    203
    --(define-method set_menu
    
    204
    --  (of-object "AppIndicator")
    
    205
    --  (c-name "app_indicator_set_menu")
    
    206
    --  (return-type "none")
    
    207
    --  (parameters
    
    208
    --    '("GtkMenu*" "menu")
    
    209
    --  )
    
    210
    --)
    
    211
    --
    
    212
    --(define-method set_icon
    
    213
    --  (of-object "AppIndicator")
    
    214
    --  (c-name "app_indicator_set_icon_full")
    
    215
    --  (return-type "none")
    
    216
    --  (parameters
    
    217
    --    '("const-gchar*" "icon_name")
    
    218
    --    '("const-gchar*" "icon_desc" (null-ok) (default "NULL"))
    
    219
    --  )
    
    220
    --)
    
    221
    --
    
    222
    --(define-method set_label
    
    223
    --  (of-object "AppIndicator")
    
    224
    --  (c-name "app_indicator_set_label")
    
    225
    --  (return-type "none")
    
    226
    --  (parameters
    
    227
    --    '("const-gchar*" "label" (null-ok))
    
    228
    --    '("const-gchar*" "guide" (null-ok) (default "NULL"))
    
    229
    --  )
    
    230
    --)
    
    231
    --
    
    232
    --(define-method set_ordering_index
    
    233
    --  (of-object "AppIndicator")
    
    234
    --  (c-name "app_indicator_set_ordering_index")
    
    235
    --  (parameters
    
    236
    --    '("guint32" "ordering_index")
    
    237
    --  )
    
    238
    --)
    
    239
    --
    
    240
    --(define-method set_icon_theme_path
    
    241
    --  (of-object "AppIndicator")
    
    242
    --  (c-name "app_indicator_set_icon_theme_path")
    
    243
    --  (return-type "none")
    
    244
    --  (parameters
    
    245
    --    '("const-gchar*" "icon_theme_path" (null-ok))
    
    246
    --  )
    
    247
    --)
    
    248
    --
    
    249
    --(define-method get_id
    
    250
    --  (of-object "AppIndicator")
    
    251
    --  (c-name "app_indicator_get_id")
    
    252
    --  (return-type "const-gchar*")
    
    253
    --)
    
    254
    --
    
    255
    --(define-method get_category
    
    256
    --  (of-object "AppIndicator")
    
    257
    --  (c-name "app_indicator_get_category")
    
    258
    --  (return-type "AppIndicatorCategory")
    
    259
    --)
    
    260
    --
    
    261
    --(define-method get_status
    
    262
    --  (of-object "AppIndicator")
    
    263
    --  (c-name "app_indicator_get_status")
    
    264
    --  (return-type "AppIndicatorStatus")
    
    265
    --)
    
    266
    --
    
    267
    --(define-method get_icon
    
    268
    --  (of-object "AppIndicator")
    
    269
    --  (c-name "app_indicator_get_icon")
    
    270
    --  (return-type "const-gchar*")
    
    271
    --)
    
    272
    --
    
    273
    --(define-method get_icon_desc
    
    274
    --  (of-object "AppIndicator")
    
    275
    --  (c-name "app_indicator_get_icon_desc")
    
    276
    --  (return-type "const-gchar*")
    
    277
    --)
    
    278
    --
    
    279
    --(define-method get_icon_theme_path
    
    280
    --  (of-object "AppIndicator")
    
    281
    --  (c-name "app_indicator_get_icon_theme_path")
    
    282
    --  (return-type "const-gchar*")
    
    283
    --)
    
    284
    --
    
    285
    --(define-method get_attention_icon
    
    286
    --  (of-object "AppIndicator")
    
    287
    --  (c-name "app_indicator_get_attention_icon")
    
    288
    --  (return-type "const-gchar*")
    
    289
    --)
    
    290
    --
    
    291
    --(define-method get_attention_icon_desc
    
    292
    --  (of-object "AppIndicator")
    
    293
    --  (c-name "app_indicator_get_attention_icon_desc")
    
    294
    --  (return-type "const-gchar*")
    
    295
    --)
    
    296
    --
    
    297
    --(define-method get_menu
    
    298
    --  (of-object "AppIndicator")
    
    299
    --  (c-name "app_indicator_get_menu")
    
    300
    --  (return-type "GtkMenu*")
    
    301
    --)
    
    302
    --
    
    303
    --(define-method get_label
    
    304
    --  (of-object "AppIndicator")
    
    305
    --  (c-name "app_indicator_get_label")
    
    306
    --  (return-type "const-gchar*")
    
    307
    --)
    
    308
    --
    
    309
    --(define-method get_label_guide
    
    310
    --  (of-object "AppIndicator")
    
    311
    --  (c-name "app_indicator_get_label_guide")
    
    312
    --  (return-type "const-gchar*")
    
    313
    --)
    
    314
    --
    
    315
    --(define-method get_ordering_index
    
    316
    --  (of-object "AppIndicator")
    
    317
    --  (c-name "app_indicator_get_ordering_index")
    
    318
    --  (return-type "guint32")
    
    319
    --)
    
    320
    --
    
    321
    --(define-method build_menu_from_desktop
    
    322
    --  (of-object "AppIndicator")
    
    323
    --  (c-name "app_indicator_build_menu_from_desktop")
    
    324
    --  (return-type "none")
    
    325
    --  (parameters
    
    326
    --    '("const-gchar*" "desktop_file")
    
    327
    --    '("const-gchar*" "desktop_profile")
    
    328
    --  )
    
    329
    --)
    
    330
    -diff --git a/bindings/python/appindicator.override.in b/bindings/python/appindicator.override.in
    
    331
    -deleted file mode 100644
    
    332
    -index 84d3159..0000000
    
    333
    ---- a/bindings/python/appindicator.override.in
    
    334
    -+++ /dev/null
    
    335
    -@@ -1,65 +0,0 @@
    
    336
    --/*
    
    337
    --Python bindings for libappindicator.
    
    338
    --
    
    339
    --Copyright 2009 Canonical Ltd.
    
    340
    --
    
    341
    --Authors:
    
    342
    --    Eitan Isaacson <eitan@ascender.com> (original)
    
    343
    --    Neil Jagdish Patel <neil.patel@canonical.com>
    
    344
    --
    
    345
    --This program is free software: you can redistribute it and/or modify it 
    
    346
    --under the terms of either or both of the following licenses:
    
    347
    --
    
    348
    --1) the GNU Lesser General Public License version 3, as published by the 
    
    349
    --Free Software Foundation; and/or
    
    350
    --2) the GNU Lesser General Public License version 2.1, as published by 
    
    351
    --the Free Software Foundation.
    
    352
    --
    
    353
    --This program is distributed in the hope that it will be useful, but 
    
    354
    --WITHOUT ANY WARRANTY; without even the implied warranties of 
    
    355
    --MERCHANTABILITY, SATISFACTORY QUALITY or FITNESS FOR A PARTICULAR 
    
    356
    --PURPOSE.  See the applicable version of the GNU Lesser General Public 
    
    357
    --License for more details.
    
    358
    --
    
    359
    --You should have received a copy of both the GNU Lesser General Public 
    
    360
    --License version 3 and version 2.1 along with this program.  If not, see 
    
    361
    --<http://www.gnu.org/licenses/>
    
    362
    --*/
    
    363
    --%%
    
    364
    --headers
    
    365
    --#include <Python.h>
    
    366
    --#include "@top_srcdir@/src/app-indicator.h"
    
    367
    --#include "@top_builddir@/src/app-indicator-enum-types.h"
    
    368
    --#include <glib.h>
    
    369
    --#include "pygobject.h"
    
    370
    --#include "pyglib.h"
    
    371
    --#include <pygtk/pygtk.h>
    
    372
    --
    
    373
    --typedef PyObject* (*to_pyobject_func) (gpointer data);
    
    374
    --
    
    375
    --#define APP_TYPE_INDICATOR APP_INDICATOR_TYPE
    
    376
    --
    
    377
    --void
    
    378
    --_appindicator_add_constants(PyObject *module, const gchar *strip_prefix)
    
    379
    --{
    
    380
    --#ifdef VERSION
    
    381
    --        PyModule_AddStringConstant(module, "__version__", VERSION);
    
    382
    --#endif
    
    383
    --        pyg_enum_add(module,
    
    384
    --                     "IndicatorCategory", 
    
    385
    --                     strip_prefix,
    
    386
    --                     APP_INDICATOR_TYPE_INDICATOR_CATEGORY);
    
    387
    --
    
    388
    --        pyg_enum_add(module,
    
    389
    --                     "IndicatorStatus", 
    
    390
    --                     strip_prefix,
    
    391
    --                     APP_INDICATOR_TYPE_INDICATOR_STATUS);
    
    392
    --
    
    393
    --        if (PyErr_Occurred())
    
    394
    --                PyErr_Print();
    
    395
    --}
    
    396
    --%%
    
    397
    --modulename appindicator
    
    398
    --%%
    
    399
    --import gobject.GObject as PyGObject_Type
    
    400
    --import gtk.Menu as PyGtkMenu_Type
    
    401
    -diff --git a/bindings/python/appindicatormodule.c b/bindings/python/appindicatormodule.c
    
    402
    -deleted file mode 100644
    
    403
    -index b66639c..0000000
    
    404
    ---- a/bindings/python/appindicatormodule.c
    
    405
    -+++ /dev/null
    
    406
    -@@ -1,49 +0,0 @@
    
    407
    --/*
    
    408
    --Python bindings for libappindicator.
    
    409
    --
    
    410
    --Copyright 2009 Canonical Ltd.
    
    411
    --
    
    412
    --Authors:
    
    413
    --    Eitan Isaacson <eitan@ascender.com>
    
    414
    --    Neil Jagdish Patel <neil.patel@canonical.com>
    
    415
    --
    
    416
    --This program is free software: you can redistribute it and/or modify it 
    
    417
    --under the terms of either or both of the following licenses:
    
    418
    --
    
    419
    --1) the GNU Lesser General Public License version 3, as published by the 
    
    420
    --Free Software Foundation; and/or
    
    421
    --2) the GNU Lesser General Public License version 2.1, as published by 
    
    422
    --the Free Software Foundation.
    
    423
    --
    
    424
    --This program is distributed in the hope that it will be useful, but 
    
    425
    --WITHOUT ANY WARRANTY; without even the implied warranties of 
    
    426
    --MERCHANTABILITY, SATISFACTORY QUALITY or FITNESS FOR A PARTICULAR 
    
    427
    --PURPOSE.  See the applicable version of the GNU Lesser General Public 
    
    428
    --License for more details.
    
    429
    --
    
    430
    --You should have received a copy of both the GNU Lesser General Public 
    
    431
    --License version 3 and version 2.1 along with this program.  If not, see 
    
    432
    --<http://www.gnu.org/licenses/>
    
    433
    --*/
    
    434
    --#include <pygobject.h>
    
    435
    -- 
    
    436
    --void pyappindicator_register_classes (PyObject *d); 
    
    437
    --extern PyMethodDef pyappindicator_functions[];
    
    438
    --
    
    439
    --DL_EXPORT(void)
    
    440
    --init_appindicator(void)
    
    441
    --{
    
    442
    --		PyObject *m, *d;
    
    443
    --		
    
    444
    --		init_pygobject ();
    
    445
    --		
    
    446
    --		m = Py_InitModule ("_appindicator", pyappindicator_functions);
    
    447
    --		d = PyModule_GetDict (m);
    
    448
    --		
    
    449
    --		pyappindicator_register_classes (d);
    
    450
    --
    
    451
    --		_appindicator_add_constants (m, "APP_INDICATOR_");
    
    452
    --		if (PyErr_Occurred ()) {
    
    453
    --				Py_FatalError ("can't initialise module appindicator");
    
    454
    --		}
    
    455
    --}
    
    456
    -diff --git a/configure b/configure
    
    457
    -index 5174b3f..8ff732c 100755
    
    458
    ---- a/configure
    
    459
    -+++ b/configure
    
    460
    -@@ -13703,363 +13703,6 @@ else
    
    461
    - fi
    
    462
    - 
    
    463
    - 
    
    464
    --###########################
    
    465
    --# Python
    
    466
    --###########################
    
    467
    --
    
    468
    --PYGTK_REQUIRED=2.14.0
    
    469
    --PYGOBJECT_REQUIRED=0.22
    
    470
    --
    
    471
    --
    
    472
    --
    
    473
    --
    
    474
    --
    
    475
    --        if test -n "$PYTHON"; then
    
    476
    --      # If the user set $PYTHON, use it and don't search something else.
    
    477
    --      { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $PYTHON version >= 2.3.5" >&5
    
    478
    --$as_echo_n "checking whether $PYTHON version >= 2.3.5... " >&6; }
    
    479
    --      prog="import sys, string
    
    480
    --# split strings by '.' and convert to numeric.  Append some zeros
    
    481
    --# because we need at least 4 digits for the hex conversion.
    
    482
    --minver = map(int, string.split('2.3.5', '.')) + [0, 0, 0]
    
    483
    --minverhex = 0
    
    484
    --for i in xrange(0, 4): minverhex = (minverhex << 8) + minver[i]
    
    485
    --sys.exit(sys.hexversion < minverhex)"
    
    486
    --  if { echo "$as_me:$LINENO: $PYTHON -c "$prog"" >&5
    
    487
    --   ($PYTHON -c "$prog") >&5 2>&5
    
    488
    --   ac_status=$?
    
    489
    --   echo "$as_me:$LINENO: \$? = $ac_status" >&5
    
    490
    --   (exit $ac_status); }; then :
    
    491
    --  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
    
    492
    --$as_echo "yes" >&6; }
    
    493
    --else
    
    494
    --  as_fn_error $? "too old" "$LINENO" 5
    
    495
    --fi
    
    496
    --      am_display_PYTHON=$PYTHON
    
    497
    --    else
    
    498
    --      # Otherwise, try each interpreter until we find one that satisfies
    
    499
    --      # VERSION.
    
    500
    --      { $as_echo "$as_me:${as_lineno-$LINENO}: checking for a Python interpreter with version >= 2.3.5" >&5
    
    501
    --$as_echo_n "checking for a Python interpreter with version >= 2.3.5... " >&6; }
    
    502
    --if ${am_cv_pathless_PYTHON+:} false; then :
    
    503
    --  $as_echo_n "(cached) " >&6
    
    504
    --else
    
    505
    --
    
    506
    --	for am_cv_pathless_PYTHON in python python2 python2.4 python2.3 python2.2 python2.1 python2.0 python1.6 python1.5 none; do
    
    507
    --	  test "$am_cv_pathless_PYTHON" = none && break
    
    508
    --	  prog="import sys, string
    
    509
    --# split strings by '.' and convert to numeric.  Append some zeros
    
    510
    --# because we need at least 4 digits for the hex conversion.
    
    511
    --minver = map(int, string.split('2.3.5', '.')) + [0, 0, 0]
    
    512
    --minverhex = 0
    
    513
    --for i in xrange(0, 4): minverhex = (minverhex << 8) + minver[i]
    
    514
    --sys.exit(sys.hexversion < minverhex)"
    
    515
    --  if { echo "$as_me:$LINENO: $am_cv_pathless_PYTHON -c "$prog"" >&5
    
    516
    --   ($am_cv_pathless_PYTHON -c "$prog") >&5 2>&5
    
    517
    --   ac_status=$?
    
    518
    --   echo "$as_me:$LINENO: \$? = $ac_status" >&5
    
    519
    --   (exit $ac_status); }; then :
    
    520
    --  break
    
    521
    --fi
    
    522
    --	done
    
    523
    --fi
    
    524
    --{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_pathless_PYTHON" >&5
    
    525
    --$as_echo "$am_cv_pathless_PYTHON" >&6; }
    
    526
    --      # Set $PYTHON to the absolute path of $am_cv_pathless_PYTHON.
    
    527
    --      if test "$am_cv_pathless_PYTHON" = none; then
    
    528
    --	PYTHON=:
    
    529
    --      else
    
    530
    --        # Extract the first word of "$am_cv_pathless_PYTHON", so it can be a program name with args.
    
    531
    --set dummy $am_cv_pathless_PYTHON; ac_word=$2
    
    532
    --{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
    
    533
    --$as_echo_n "checking for $ac_word... " >&6; }
    
    534
    --if ${ac_cv_path_PYTHON+:} false; then :
    
    535
    --  $as_echo_n "(cached) " >&6
    
    536
    --else
    
    537
    --  case $PYTHON in
    
    538
    --  [\\/]* | ?:[\\/]*)
    
    539
    --  ac_cv_path_PYTHON="$PYTHON" # Let the user override the test with a path.
    
    540
    --  ;;
    
    541
    --  *)
    
    542
    --  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
    
    543
    --for as_dir in $PATH
    
    544
    --do
    
    545
    --  IFS=$as_save_IFS
    
    546
    --  test -z "$as_dir" && as_dir=.
    
    547
    --    for ac_exec_ext in '' $ac_executable_extensions; do
    
    548
    --  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
    
    549
    --    ac_cv_path_PYTHON="$as_dir/$ac_word$ac_exec_ext"
    
    550
    --    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
    
    551
    --    break 2
    
    552
    --  fi
    
    553
    --done
    
    554
    --  done
    
    555
    --IFS=$as_save_IFS
    
    556
    --
    
    557
    --  ;;
    
    558
    --esac
    
    559
    --fi
    
    560
    --PYTHON=$ac_cv_path_PYTHON
    
    561
    --if test -n "$PYTHON"; then
    
    562
    --  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PYTHON" >&5
    
    563
    --$as_echo "$PYTHON" >&6; }
    
    564
    --else
    
    565
    --  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
    
    566
    --$as_echo "no" >&6; }
    
    567
    --fi
    
    568
    --
    
    569
    --
    
    570
    --      fi
    
    571
    --      am_display_PYTHON=$am_cv_pathless_PYTHON
    
    572
    --    fi
    
    573
    --
    
    574
    --
    
    575
    --  if test "$PYTHON" = :; then
    
    576
    --      as_fn_error $? "no suitable Python interpreter found" "$LINENO" 5
    
    577
    --  else
    
    578
    --
    
    579
    --
    
    580
    --  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $am_display_PYTHON version" >&5
    
    581
    --$as_echo_n "checking for $am_display_PYTHON version... " >&6; }
    
    582
    --if ${am_cv_python_version+:} false; then :
    
    583
    --  $as_echo_n "(cached) " >&6
    
    584
    --else
    
    585
    --  am_cv_python_version=`$PYTHON -c "import sys; print sys.version[:3]"`
    
    586
    --fi
    
    587
    --{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_python_version" >&5
    
    588
    --$as_echo "$am_cv_python_version" >&6; }
    
    589
    --  PYTHON_VERSION=$am_cv_python_version
    
    590
    --
    
    591
    --
    
    592
    --
    
    593
    --  PYTHON_PREFIX='${prefix}'
    
    594
    --
    
    595
    --  PYTHON_EXEC_PREFIX='${exec_prefix}'
    
    596
    --
    
    597
    --
    
    598
    --
    
    599
    --  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $am_display_PYTHON platform" >&5
    
    600
    --$as_echo_n "checking for $am_display_PYTHON platform... " >&6; }
    
    601
    --if ${am_cv_python_platform+:} false; then :
    
    602
    --  $as_echo_n "(cached) " >&6
    
    603
    --else
    
    604
    --  am_cv_python_platform=`$PYTHON -c "import sys; print sys.platform"`
    
    605
    --fi
    
    606
    --{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_python_platform" >&5
    
    607
    --$as_echo "$am_cv_python_platform" >&6; }
    
    608
    --  PYTHON_PLATFORM=$am_cv_python_platform
    
    609
    --
    
    610
    --
    
    611
    --
    
    612
    --
    
    613
    --                { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $am_display_PYTHON script directory" >&5
    
    614
    --$as_echo_n "checking for $am_display_PYTHON script directory... " >&6; }
    
    615
    --if ${am_cv_python_pythondir+:} false; then :
    
    616
    --  $as_echo_n "(cached) " >&6
    
    617
    --else
    
    618
    --  am_cv_python_pythondir=`$PYTHON -c "from distutils import sysconfig; print sysconfig.get_python_lib(0,0,prefix='$PYTHON_PREFIX')" 2>/dev/null ||
    
    619
    --     echo "$PYTHON_PREFIX/lib/python$PYTHON_VERSION/site-packages"`
    
    620
    --fi
    
    621
    --{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_python_pythondir" >&5
    
    622
    --$as_echo "$am_cv_python_pythondir" >&6; }
    
    623
    --  pythondir=$am_cv_python_pythondir
    
    624
    --
    
    625
    --
    
    626
    --
    
    627
    --  pkgpythondir=\${pythondir}/$PACKAGE
    
    628
    --
    
    629
    --
    
    630
    --            { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $am_display_PYTHON extension module directory" >&5
    
    631
    --$as_echo_n "checking for $am_display_PYTHON extension module directory... " >&6; }
    
    632
    --if ${am_cv_python_pyexecdir+:} false; then :
    
    633
    --  $as_echo_n "(cached) " >&6
    
    634
    --else
    
    635
    --  am_cv_python_pyexecdir=`$PYTHON -c "from distutils import sysconfig; print sysconfig.get_python_lib(1,0,prefix='$PYTHON_EXEC_PREFIX')" 2>/dev/null ||
    
    636
    --     echo "${PYTHON_EXEC_PREFIX}/lib/python${PYTHON_VERSION}/site-packages"`
    
    637
    --fi
    
    638
    --{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_python_pyexecdir" >&5
    
    639
    --$as_echo "$am_cv_python_pyexecdir" >&6; }
    
    640
    --  pyexecdir=$am_cv_python_pyexecdir
    
    641
    --
    
    642
    --
    
    643
    --
    
    644
    --  pkgpyexecdir=\${pyexecdir}/$PACKAGE
    
    645
    --
    
    646
    --
    
    647
    --
    
    648
    --  fi
    
    649
    --
    
    650
    --
    
    651
    --
    
    652
    --{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for headers required to compile python extensions" >&5
    
    653
    --$as_echo_n "checking for headers required to compile python extensions... " >&6; }
    
    654
    --py_prefix=`$PYTHON -c "import sys; print sys.prefix"`
    
    655
    --py_exec_prefix=`$PYTHON -c "import sys; print sys.exec_prefix"`
    
    656
    --PYTHON_INCLUDES="-I${py_prefix}/include/python${PYTHON_VERSION}"
    
    657
    --if test "$py_prefix" != "$py_exec_prefix"; then
    
    658
    --  PYTHON_INCLUDES="$PYTHON_INCLUDES -I${py_exec_prefix}/include/python${PYTHON_VERSION}"
    
    659
    --fi
    
    660
    --
    
    661
    --save_CPPFLAGS="$CPPFLAGS"
    
    662
    --CPPFLAGS="$CPPFLAGS $PYTHON_INCLUDES"
    
    663
    --cat confdefs.h - <<_ACEOF >conftest.$ac_ext
    
    664
    --/* end confdefs.h.  */
    
    665
    --#include <Python.h>
    
    666
    --_ACEOF
    
    667
    --if ac_fn_c_try_cpp "$LINENO"; then :
    
    668
    --  { $as_echo "$as_me:${as_lineno-$LINENO}: result: found" >&5
    
    669
    --$as_echo "found" >&6; }
    
    670
    --
    
    671
    --else
    
    672
    --  { $as_echo "$as_me:${as_lineno-$LINENO}: result: not found" >&5
    
    673
    --$as_echo "not found" >&6; }
    
    674
    --as_fn_error $? "could not find Python headers" "$LINENO" 5
    
    675
    --fi
    
    676
    --rm -f conftest.err conftest.i conftest.$ac_ext
    
    677
    --CPPFLAGS="$save_CPPFLAGS"
    
    678
    --
    
    679
    --
    
    680
    --
    
    681
    --pkg_failed=no
    
    682
    --{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for APPINDICATOR_PYTHON" >&5
    
    683
    --$as_echo_n "checking for APPINDICATOR_PYTHON... " >&6; }
    
    684
    --
    
    685
    --if test -n "$APPINDICATOR_PYTHON_CFLAGS"; then
    
    686
    --    pkg_cv_APPINDICATOR_PYTHON_CFLAGS="$APPINDICATOR_PYTHON_CFLAGS"
    
    687
    -- elif test -n "$PKG_CONFIG"; then
    
    688
    --    if test -n "$PKG_CONFIG" && \
    
    689
    --    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"
    
    690
    --					pygtk-2.0 >= \$PYGTK_REQUIRED
    
    691
    --					gtk+-2.0 >= \$GTK_REQUIRED_VERSION
    
    692
    --					pygobject-2.0 >= \$PYGOBJECT_REQUIRED
    
    693
    --                  \""; } >&5
    
    694
    --  ($PKG_CONFIG --exists --print-errors "
    
    695
    --					pygtk-2.0 >= $PYGTK_REQUIRED
    
    696
    --					gtk+-2.0 >= $GTK_REQUIRED_VERSION
    
    697
    --					pygobject-2.0 >= $PYGOBJECT_REQUIRED
    
    698
    --                  ") 2>&5
    
    699
    --  ac_status=$?
    
    700
    --  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
    
    701
    --  test $ac_status = 0; }; then
    
    702
    --  pkg_cv_APPINDICATOR_PYTHON_CFLAGS=`$PKG_CONFIG --cflags "
    
    703
    --					pygtk-2.0 >= $PYGTK_REQUIRED
    
    704
    --					gtk+-2.0 >= $GTK_REQUIRED_VERSION
    
    705
    --					pygobject-2.0 >= $PYGOBJECT_REQUIRED
    
    706
    --                  " 2>/dev/null`
    
    707
    --		      test "x$?" != "x0" && pkg_failed=yes
    
    708
    --else
    
    709
    --  pkg_failed=yes
    
    710
    --fi
    
    711
    -- else
    
    712
    --    pkg_failed=untried
    
    713
    --fi
    
    714
    --if test -n "$APPINDICATOR_PYTHON_LIBS"; then
    
    715
    --    pkg_cv_APPINDICATOR_PYTHON_LIBS="$APPINDICATOR_PYTHON_LIBS"
    
    716
    -- elif test -n "$PKG_CONFIG"; then
    
    717
    --    if test -n "$PKG_CONFIG" && \
    
    718
    --    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"
    
    719
    --					pygtk-2.0 >= \$PYGTK_REQUIRED
    
    720
    --					gtk+-2.0 >= \$GTK_REQUIRED_VERSION
    
    721
    --					pygobject-2.0 >= \$PYGOBJECT_REQUIRED
    
    722
    --                  \""; } >&5
    
    723
    --  ($PKG_CONFIG --exists --print-errors "
    
    724
    --					pygtk-2.0 >= $PYGTK_REQUIRED
    
    725
    --					gtk+-2.0 >= $GTK_REQUIRED_VERSION
    
    726
    --					pygobject-2.0 >= $PYGOBJECT_REQUIRED
    
    727
    --                  ") 2>&5
    
    728
    --  ac_status=$?
    
    729
    --  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
    
    730
    --  test $ac_status = 0; }; then
    
    731
    --  pkg_cv_APPINDICATOR_PYTHON_LIBS=`$PKG_CONFIG --libs "
    
    732
    --					pygtk-2.0 >= $PYGTK_REQUIRED
    
    733
    --					gtk+-2.0 >= $GTK_REQUIRED_VERSION
    
    734
    --					pygobject-2.0 >= $PYGOBJECT_REQUIRED
    
    735
    --                  " 2>/dev/null`
    
    736
    --		      test "x$?" != "x0" && pkg_failed=yes
    
    737
    --else
    
    738
    --  pkg_failed=yes
    
    739
    --fi
    
    740
    -- else
    
    741
    --    pkg_failed=untried
    
    742
    --fi
    
    743
    --
    
    744
    --
    
    745
    --
    
    746
    --if test $pkg_failed = yes; then
    
    747
    --   	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
    
    748
    --$as_echo "no" >&6; }
    
    749
    --
    
    750
    --if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
    
    751
    --        _pkg_short_errors_supported=yes
    
    752
    --else
    
    753
    --        _pkg_short_errors_supported=no
    
    754
    --fi
    
    755
    --        if test $_pkg_short_errors_supported = yes; then
    
    756
    --	        APPINDICATOR_PYTHON_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "
    
    757
    --					pygtk-2.0 >= $PYGTK_REQUIRED
    
    758
    --					gtk+-2.0 >= $GTK_REQUIRED_VERSION
    
    759
    --					pygobject-2.0 >= $PYGOBJECT_REQUIRED
    
    760
    --                  " 2>&1`
    
    761
    --        else
    
    762
    --	        APPINDICATOR_PYTHON_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "
    
    763
    --					pygtk-2.0 >= $PYGTK_REQUIRED
    
    764
    --					gtk+-2.0 >= $GTK_REQUIRED_VERSION
    
    765
    --					pygobject-2.0 >= $PYGOBJECT_REQUIRED
    
    766
    --                  " 2>&1`
    
    767
    --        fi
    
    768
    --	# Put the nasty error message in config.log where it belongs
    
    769
    --	echo "$APPINDICATOR_PYTHON_PKG_ERRORS" >&5
    
    770
    --
    
    771
    --	as_fn_error $? "Package requirements (
    
    772
    --					pygtk-2.0 >= $PYGTK_REQUIRED
    
    773
    --					gtk+-2.0 >= $GTK_REQUIRED_VERSION
    
    774
    --					pygobject-2.0 >= $PYGOBJECT_REQUIRED
    
    775
    --                  ) were not met:
    
    776
    --
    
    777
    --$APPINDICATOR_PYTHON_PKG_ERRORS
    
    778
    --
    
    779
    --Consider adjusting the PKG_CONFIG_PATH environment variable if you
    
    780
    --installed software in a non-standard prefix.
    
    781
    --
    
    782
    --Alternatively, you may set the environment variables APPINDICATOR_PYTHON_CFLAGS
    
    783
    --and APPINDICATOR_PYTHON_LIBS to avoid the need to call pkg-config.
    
    784
    --See the pkg-config man page for more details." "$LINENO" 5
    
    785
    --elif test $pkg_failed = untried; then
    
    786
    --     	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
    
    787
    --$as_echo "no" >&6; }
    
    788
    --	{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
    
    789
    --$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
    
    790
    --as_fn_error $? "The pkg-config script could not be found or is too old.  Make sure it
    
    791
    --is in your PATH or set the PKG_CONFIG environment variable to the full
    
    792
    --path to pkg-config.
    
    793
    --
    
    794
    --Alternatively, you may set the environment variables APPINDICATOR_PYTHON_CFLAGS
    
    795
    --and APPINDICATOR_PYTHON_LIBS to avoid the need to call pkg-config.
    
    796
    --See the pkg-config man page for more details.
    
    797
    --
    
    798
    --To get pkg-config, see <http://pkg-config.freedesktop.org/>.
    
    799
    --See \`config.log' for more details" "$LINENO" 5; }
    
    800
    --else
    
    801
    --	APPINDICATOR_PYTHON_CFLAGS=$pkg_cv_APPINDICATOR_PYTHON_CFLAGS
    
    802
    --	APPINDICATOR_PYTHON_LIBS=$pkg_cv_APPINDICATOR_PYTHON_LIBS
    
    803
    --        { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
    
    804
    --$as_echo "yes" >&6; }
    
    805
    --
    
    806
    --fi
    
    807
    --
    
    808
    --{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for pygtk defs" >&5
    
    809
    --$as_echo_n "checking for pygtk defs... " >&6; }
    
    810
    --PYGTK_DEFSDIR=`$PKG_CONFIG --variable=defsdir pygtk-2.0`
    
    811
    --
    
    812
    --{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $PYGTK_DEFSDIR" >&5
    
    813
    --$as_echo "$PYGTK_DEFSDIR" >&6; }
    
    814
    --
    
    815
    --{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for pygtk codegen" >&5
    
    816
    --$as_echo_n "checking for pygtk codegen... " >&6; }
    
    817
    --PYGTK_CODEGEN="$PYTHON `$PKG_CONFIG --variable=codegendir pygtk-2.0`/codegen.py"
    
    818
    --
    
    819
    --{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $PYGTK_CODEGEN" >&5
    
    820
    --$as_echo "$PYGTK_CODEGEN" >&6; }
    
    821
    - 
    
    822
    - #########################
    
    823
    - # Check if build tests
    
    824
    -@@ -14358,7 +14001,7 @@ fi
    
    825
    - # Files
    
    826
    - ###########################
    
    827
    - 
    
    828
    --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"
    
    829
    -+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"
    
    830
    - 
    
    831
    - 
    
    832
    - if test "x$has_mono" = "xtrue" ; then
    
    833
    -@@ -15437,8 +15080,6 @@ do
    
    834
    -     "src/appindicator-0.1.pc") CONFIG_FILES="$CONFIG_FILES src/appindicator-0.1.pc" ;;
    
    835
    -     "src/appindicator3-0.1.pc") CONFIG_FILES="$CONFIG_FILES src/appindicator3-0.1.pc" ;;
    
    836
    -     "bindings/Makefile") CONFIG_FILES="$CONFIG_FILES bindings/Makefile" ;;
    
    837
    --    "bindings/python/Makefile") CONFIG_FILES="$CONFIG_FILES bindings/python/Makefile" ;;
    
    838
    --    "bindings/python/appindicator.override") CONFIG_FILES="$CONFIG_FILES bindings/python/appindicator.override" ;;
    
    839
    -     "bindings/vala/Makefile") CONFIG_FILES="$CONFIG_FILES bindings/vala/Makefile" ;;
    
    840
    -     "bindings/vala/examples/Makefile") CONFIG_FILES="$CONFIG_FILES bindings/vala/examples/Makefile" ;;
    
    841
    -     "tests/Makefile") CONFIG_FILES="$CONFIG_FILES tests/Makefile" ;;
    
    842
    -diff --git a/configure.ac b/configure.ac
    
    843
    -index ee03390..4713b22 100644
    
    844
    ---- a/configure.ac
    
    845
    -+++ b/configure.ac
    
    846
    -@@ -181,33 +181,6 @@ AM_CONDITIONAL(BUILD_MONO_TEST, test x${have_nunit} = xyes)
    
    847
    - with_localinstall="no"
    
    848
    - 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)
    
    849
    - 
    
    850
    --###########################
    
    851
    --# Python
    
    852
    --###########################
    
    853
    --
    
    854
    --PYGTK_REQUIRED=2.14.0
    
    855
    --PYGOBJECT_REQUIRED=0.22
    
    856
    --
    
    857
    --AM_PATH_PYTHON(2.3.5)
    
    858
    --AM_CHECK_PYTHON_HEADERS(,[AC_MSG_ERROR(could not find Python headers)])
    
    859
    --
    
    860
    --PKG_CHECK_MODULES(APPINDICATOR_PYTHON,
    
    861
    --                  [
    
    862
    --					pygtk-2.0 >= $PYGTK_REQUIRED
    
    863
    --					gtk+-2.0 >= $GTK_REQUIRED_VERSION
    
    864
    --					pygobject-2.0 >= $PYGOBJECT_REQUIRED
    
    865
    --                  ])
    
    866
    --
    
    867
    --AC_MSG_CHECKING(for pygtk defs)
    
    868
    --PYGTK_DEFSDIR=`$PKG_CONFIG --variable=defsdir pygtk-2.0`
    
    869
    --AC_SUBST(PYGTK_DEFSDIR)
    
    870
    --AC_MSG_RESULT($PYGTK_DEFSDIR)
    
    871
    --
    
    872
    --AC_MSG_CHECKING(for pygtk codegen)
    
    873
    --PYGTK_CODEGEN="$PYTHON `$PKG_CONFIG --variable=codegendir pygtk-2.0`/codegen.py"
    
    874
    --AC_SUBST(PYGTK_CODEGEN)
    
    875
    --AC_MSG_RESULT($PYGTK_CODEGEN)
    
    876
    --
    
    877
    - #########################
    
    878
    - # Check if build tests
    
    879
    - #########################
    
    880
    -@@ -239,8 +212,6 @@ src/Makefile
    
    881
    - src/appindicator-0.1.pc
    
    882
    - src/appindicator3-0.1.pc
    
    883
    - bindings/Makefile
    
    884
    --bindings/python/Makefile
    
    885
    --bindings/python/appindicator.override
    
    886
    - bindings/vala/Makefile
    
    887
    - bindings/vala/examples/Makefile
    
    888
    - tests/Makefile
    \ No newline at end of file

  • flatpak/org.gajim.Gajim.Devel.yaml
    1
    +app-id: org.gajim.Gajim.Devel
    
    2
    +runtime: org.gnome.Platform
    
    3
    +runtime-version: '42'
    
    4
    +sdk: org.gnome.Sdk
    
    5
    +command: gajim-devel
    
    6
    +tags:
    
    7
    +  - devel
    
    8
    +  - development
    
    9
    +  - nightly
    
    10
    +rename-icon: org.gajim.Gajim
    
    11
    +rename-desktop-file: org.gajim.Gajim.desktop
    
    12
    +rename-appdata-file: org.gajim.Gajim.appdata.xml
    
    13
    +finish-args:
    
    14
    +  - --share=ipc
    
    15
    +  - --share=network
    
    16
    +  - --socket=fallback-x11
    
    17
    +  - --socket=wayland
    
    18
    +  - --socket=pulseaudio
    
    19
    +  - --system-talk-name=org.freedesktop.GeoClue2
    
    20
    +  - --system-talk-name=org.freedesktop.login1
    
    21
    +  - --talk-name=org.mpris.MediaPlayer2.*
    
    22
    +  # Automatic status
    
    23
    +  - --talk-name=org.freedesktop.ScreenSaver
    
    24
    +  - --talk-name=org.gnome.Mutter.IdleMonitor
    
    25
    +  # Keyring
    
    26
    +  - --talk-name=org.freedesktop.secrets
    
    27
    +  - --talk-name=org.kde.kwalletd5
    
    28
    +  # GnuPG
    
    29
    +  - --filesystem=~/.gnupg
    
    30
    +  # camera access
    
    31
    +  - --device=all
    
    32
    +  # extensions
    
    33
    +  - --env=PYTHONPATH=/app/plugins/site-packages
    
    34
    +  - --env=GI_TYPELIB_PATH=/app/lib/girepository-1.0:/app/plugins/lib/girepository-1.0
    
    35
    +
    
    36
    +add-extensions:
    
    37
    +  org.gajim.Gajim.Devel.Plugin:
    
    38
    +    directory: plugins
    
    39
    +    merge-dirs: lib;site-packages
    
    40
    +    add-ld-path: lib
    
    41
    +    subdirectories: true
    
    42
    +    no-autodownload: true
    
    43
    +    autodelete: true
    
    44
    +
    
    45
    +build-options:
    
    46
    +  env:
    
    47
    +    PIP_PREFIX: /app
    
    48
    +
    
    49
    +cleanup:
    
    50
    +  - /include
    
    51
    +  - /lib/debug
    
    52
    +  - /lib/pkgconfig
    
    53
    +  - /share/gtk-doc
    
    54
    +  - /share/man
    
    55
    +  - '*.a'
    
    56
    +  - '*.la'
    
    57
    +
    
    58
    +modules:
    
    59
    +  - shared-modules/libappindicator/libappindicator-gtk3-introspection-12.10.json
    
    60
    +
    
    61
    +  - name: python3-pyparsing
    
    62
    +    buildsystem: simple
    
    63
    +    build-commands:
    
    64
    +      - pip3 install pyparsing-3.0.7-py3-none-any.whl
    
    65
    +    sources:
    
    66
    +      - type: file
    
    67
    +        url: https://files.pythonhosted.org/packages/py3/p/pyparsing/pyparsing-3.0.7-py3-none-any.whl
    
    68
    +        sha256: a6c06a88f252e6c322f65faf8f418b16213b51bdfaece0524c1c1bc30c63c484
    
    69
    +
    
    70
    +  - name: python3-packaging
    
    71
    +    buildsystem: simple
    
    72
    +    build-commands:
    
    73
    +      - pip3 install packaging-21.3-py3-none-any.whl
    
    74
    +    sources:
    
    75
    +      - type: file
    
    76
    +        url: https://files.pythonhosted.org/packages/py3/p/packaging/packaging-21.3-py3-none-any.whl
    
    77
    +        sha256: ef103e05f519cdc783ae24ea4e2e0f508a9c99b2d4969652eed6a2e1ea5bd522
    
    78
    +
    
    79
    +  - name: python3-pycparser
    
    80
    +    buildsystem: simple
    
    81
    +    build-commands:
    
    82
    +      - pip3 install pycparser-2.21-py2.py3-none-any.whl
    
    83
    +    sources:
    
    84
    +      - type: file
    
    85
    +        url: https://files.pythonhosted.org/packages/py2.py3/p/pycparser/pycparser-2.21-py2.py3-none-any.whl
    
    86
    +        sha256: 8ee45429555515e1f6b185e78100aea234072576aa43ab53aefcae078162fca9
    
    87
    +
    
    88
    +  - name: python3-cffi
    
    89
    +    buildsystem: simple
    
    90
    +    build-commands:
    
    91
    +      - pip3 install .
    
    92
    +    sources:
    
    93
    +      - type: archive
    
    94
    +        url: https://files.pythonhosted.org/packages/source/c/cffi/cffi-1.15.0.tar.gz
    
    95
    +        sha256: 920f0d66a896c2d99f0adbb391f990a84091179542c205fa53ce5787aff87954
    
    96
    +
    
    97
    +  - name: python3-asn1crypto
    
    98
    +    buildsystem: simple
    
    99
    +    build-commands:
    
    100
    +      - pip3 install asn1crypto-1.5.1-py2.py3-none-any.whl
    
    101
    +    sources:
    
    102
    +      - type: file
    
    103
    +        url: https://files.pythonhosted.org/packages/py2.py3/a/asn1crypto/asn1crypto-1.5.1-py2.py3-none-any.whl
    
    104
    +        sha256: db4e40728b728508912cbb3d44f19ce188f218e9eba635821bb4b68564f8fd67
    
    105
    +
    
    106
    +  - name: python3-idna
    
    107
    +    buildsystem: simple
    
    108
    +    build-commands:
    
    109
    +      - pip3 install idna-3.3-py3-none-any.whl
    
    110
    +    sources:
    
    111
    +      - type: file
    
    112
    +        url: https://files.pythonhosted.org/packages/py3/i/idna/idna-3.3-py3-none-any.whl
    
    113
    +        sha256: 84d9dd047ffa80596e0f246e2eab0b391788b0503584e8945f2368256d2735ff
    
    114
    +
    
    115
    +  - name: python3-cryptography
    
    116
    +    buildsystem: simple
    
    117
    +    only-arches:
    
    118
    +      - aarch64
    
    119
    +    build-commands:
    
    120
    +      - pip3 install cryptography-36.0.2-cp36-abi3-manylinux_2_17_aarch64.manylinux2014_aarch64.whl
    
    121
    +    sources:
    
    122
    +      - type: file
    
    123
    +        url: https://files.pythonhosted.org/packages/cp36/c/cryptography/cryptography-36.0.2-cp36-abi3-manylinux_2_17_aarch64.manylinux2014_aarch64.whl
    
    124
    +        sha256: 8241cac0aae90b82d6b5c443b853723bcc66963970c67e56e71a2609dc4b5eaf
    
    125
    +
    
    126
    +  - name: python3-cryptography
    
    127
    +    buildsystem: simple
    
    128
    +    only-arches:
    
    129
    +      - x86_64
    
    130
    +    build-commands:
    
    131
    +      - pip3 install cryptography-36.0.2-cp36-abi3-manylinux_2_17_x86_64.manylinux2014_x86_64.whl
    
    132
    +    sources:
    
    133
    +      - type: file
    
    134
    +        url: https://files.pythonhosted.org/packages/cp36/c/cryptography/cryptography-36.0.2-cp36-abi3-manylinux_2_17_x86_64.manylinux2014_x86_64.whl
    
    135
    +        sha256: 7b2d54e787a884ffc6e187262823b6feb06c338084bbe80d45166a1cb1c6c5bf
    
    136
    +
    
    137
    +  - name: python3-pyopenssl
    
    138
    +    buildsystem: simple
    
    139
    +    build-commands:
    
    140
    +      - pip3 install pyOpenSSL-22.0.0-py2.py3-none-any.whl
    
    141
    +    sources:
    
    142
    +      - type: file
    
    143
    +        url: https://files.pythonhosted.org/packages/py2.py3/p/pyOpenSSL/pyOpenSSL-22.0.0-py2.py3-none-any.whl
    
    144
    +        sha256: ea252b38c87425b64116f808355e8da644ef9b07e429398bfece610f893ee2e0
    
    145
    +
    
    146
    +  - name: python3-dbus-python
    
    147
    +    build-options:
    
    148
    +      env:
    
    149
    +        PYTHON_VERSION: '3'
    
    150
    +    sources:
    
    151
    +      - type: archive
    
    152
    +        url: https://files.pythonhosted.org/packages/source/d/dbus-python/dbus-python-1.2.18.tar.gz
    
    153
    +        sha256: 92bdd1e68b45596c833307a5ff4b217ee6929a1502f5341bae28fd120acf7260
    
    154
    +
    
    155
    +  - name: python3-jeepney
    
    156
    +    buildsystem: simple
    
    157
    +    build-commands:
    
    158
    +      - pip3 install jeepney-0.7.1-py3-none-any.whl
    
    159
    +    sources:
    
    160
    +      - type: file
    
    161
    +        url: https://files.pythonhosted.org/packages/py3/j/jeepney/jeepney-0.7.1-py3-none-any.whl
    
    162
    +        sha256: 1b5a0ea5c0e7b166b2f5895b91a08c14de8915afda4407fb5022a195224958ac
    
    163
    +
    
    164
    +  - name: python3-secretstorage
    
    165
    +    buildsystem: simple
    
    166
    +    build-commands:
    
    167
    +      - pip3 install SecretStorage-3.3.1-py3-none-any.whl
    
    168
    +    sources:
    
    169
    +      - type: file
    
    170
    +        url: https://files.pythonhosted.org/packages/py3/S/SecretStorage/SecretStorage-3.3.1-py3-none-any.whl
    
    171
    +        sha256: 422d82c36172d88d6a0ed5afdec956514b189ddbfb72fefab0c8a1cee4eaf71f
    
    172
    +
    
    173
    +  - name: python3-zipp
    
    174
    +    buildsystem: simple
    
    175
    +    build-commands:
    
    176
    +      - pip3 install zipp-3.7.0-py3-none-any.whl
    
    177
    +    sources:
    
    178
    +      - type: file
    
    179
    +        url: https://files.pythonhosted.org/packages/py3/z/zipp/zipp-3.7.0-py3-none-any.whl
    
    180
    +        sha256: b47250dd24f92b7dd6a0a8fc5244da14608f3ca90a5efcd37a3b1642fac9a375
    
    181
    +
    
    182
    +  # keyring dependency
    
    183
    +  - name: python3-importlib-metadata
    
    184
    +    buildsystem: simple
    
    185
    +    build-commands:
    
    186
    +      - pip3 install importlib_metadata-4.11.3-py3-none-any.whl
    
    187
    +    cleanup:
    
    188
    +      - /bin
    
    189
    +    sources:
    
    190
    +      - type: file
    
    191
    +        url: https://files.pythonhosted.org/packages/py3/i/importlib_metadata/importlib_metadata-4.11.3-py3-none-any.whl
    
    192
    +        sha256: 1208431ca90a8cca1a6b8af391bb53c1a2db74e5d1cef6ddced95d4b2062edc6
    
    193
    +
    
    194
    +  - name: python3-keyring
    
    195
    +    buildsystem: simple
    
    196
    +    build-commands:
    
    197
    +      - pip3 install keyring-23.5.0-py3-none-any.whl
    
    198
    +    cleanup:
    
    199
    +      - /bin
    
    200
    +    sources:
    
    201
    +      - type: file
    
    202
    +        url: https://files.pythonhosted.org/packages/py3/k/keyring/keyring-23.5.0-py3-none-any.whl
    
    203
    +        sha256: b0d28928ac3ec8e42ef4cc227822647a19f1d544f21f96457965dc01cf555261
    
    204
    +
    
    205
    +  - name: python3-css-parser
    
    206
    +    buildsystem: simple
    
    207
    +    build-commands:
    
    208
    +      - pip3 install css_parser-1.0.7-py2.py3-none-any.whl
    
    209
    +    sources:
    
    210
    +      - type: file
    
    211
    +        url: https://files.pythonhosted.org/packages/py2.py3/c/css_parser/css_parser-1.0.7-py2.py3-none-any.whl
    
    212
    +        sha256: de7018ec9d3f20f7d692973c37f22ae9a22123c60c77b11849363f47ef6f3387
    
    213
    +
    
    214
    +  - name: python3-precis_i18n
    
    215
    +    buildsystem: simple
    
    216
    +    build-commands:
    
    217
    +      - pip3 install precis_i18n-1.0.4-py3-none-any.whl
    
    218
    +    sources:
    
    219
    +      - type: file
    
    220
    +        url: https://files.pythonhosted.org/packages/py3/p/precis_i18n/precis_i18n-1.0.4-py3-none-any.whl
    
    221
    +        sha256: 8b4f6100c2f5e44db61081d53c9c07ff92e50d0a7b36eedd2f4fb7d40c48576d
    
    222
    +
    
    223
    +  # gssapi dependency
    
    224
    +  - name: python3-decorator
    
    225
    +    buildsystem: simple
    
    226
    +    build-commands:
    
    227
    +      - pip3 install decorator-5.1.1-py3-none-any.whl
    
    228
    +    sources:
    
    229
    +      - type: file
    
    230
    +        url: https://files.pythonhosted.org/packages/py3/d/decorator/decorator-5.1.1-py3-none-any.whl
    
    231
    +        sha256: b8c3f85900b9dc423225913c5aace94729fe1fa9763b38939a95226f02d37186
    
    232
    +
    
    233
    +  - name: python3-gssapi
    
    234
    +    buildsystem: simple
    
    235
    +    build-commands:
    
    236
    +      - pip3 install .
    
    237
    +    sources:
    
    238
    +      - type: archive
    
    239
    +        url: https://files.pythonhosted.org/packages/source/g/gssapi/gssapi-1.7.3.tar.gz
    
    240
    +        sha256: c69b9f633a0c03c1b84ba14c73b0ec132f6323056e675702c1a5f75f316e06fb
    
    241
    +
    
    242
    +  # GSound dependency
    
    243
    +  - shared-modules/libcanberra/libcanberra.json
    
    244
    +
    
    245
    +  - name: gsound
    
    246
    +    buildsystem: meson
    
    247
    +    sources:
    
    248
    +      - type: archive
    
    249
    +        url: https://download.gnome.org/sources/gsound/1.0/gsound-1.0.3.tar.xz
    
    250
    +        sha256: ca2d039e1ebd148647017a7f548862350bc9af01986d39f10cfdc8e95f07881a
    
    251
    +
    
    252
    +  - name: gspell
    
    253
    +    cleanup:
    
    254
    +      - /bin
    
    255
    +    sources:
    
    256
    +      - type: archive
    
    257
    +        url: https://download.gnome.org/sources/gspell/1.8/gspell-1.8.4.tar.xz
    
    258
    +        sha256: cf4d16a716e813449bd631405dc1001ea89537b8cdae2b8abfb3999212bd43b4
    
    259
    +
    
    260
    +  - name: farstream
    
    261
    +    rm-configure: true
    
    262
    +    sources:
    
    263
    +      - type: archive
    
    264
    +        url: https://freedesktop.org/software/farstream/releases/farstream/farstream-0.2.9.tar.gz
    
    265
    +        sha256: cb7d112433cf7c2e37a8ec918fb24f0ea5cb293cfa1002488e431de26482f47b
    
    266
    +      - type: patch
    
    267
    +        path: farstream-make-4.3.patch
    
    268
    +
    
    269
    +  - name: python3-pillow
    
    270
    +    buildsystem: simple
    
    271
    +    build-commands:
    
    272
    +      - pip3 install .
    
    273
    +    sources:
    
    274
    +      - type: archive
    
    275
    +        url: https://files.pythonhosted.org/packages/source/p/pillow/Pillow-9.0.1.tar.gz
    
    276
    +        sha256: 6c8bc8238a7dfdaf7a75f5ec5a663f4173f8c367e5a39f87e720495e1eed75fa
    
    277
    +
    
    278
    +  # sentry-sdk dependency
    
    279
    +  - name: python3-urllib3
    
    280
    +    buildsystem: simple
    
    281
    +    build-commands:
    
    282
    +      - pip3 install urllib3-1.26.9-py2.py3-none-any.whl
    
    283
    +    sources:
    
    284
    +      - type: file
    
    285
    +        url: https://files.pythonhosted.org/packages/py2.py3/u/urllib3/urllib3-1.26.9-py2.py3-none-any.whl
    
    286
    +        sha256: 44ece4d53fb1706f667c9bd1c648f5469a2ec925fcf3a776667042d645472c14
    
    287
    +
    
    288
    +  - name: python3-certifi
    
    289
    +    buildsystem: simple
    
    290
    +    build-commands:
    
    291
    +      - pip3 install certifi-2021.10.8-py2.py3-none-any.whl
    
    292
    +    sources:
    
    293
    +      - type: file
    
    294
    +        url: https://files.pythonhosted.org/packages/py2.py3/c/certifi/certifi-2021.10.8-py2.py3-none-any.whl
    
    295
    +        sha256: d62a0163eb4c2344ac042ab2bdf75399a71a2d8c7d47eac2e2ee91b9d6339569
    
    296
    +
    
    297
    +  - name: python3-sentry-sdk
    
    298
    +    buildsystem: simple
    
    299
    +    build-commands:
    
    300
    +      - pip3 install sentry_sdk-1.5.8-py2.py3-none-any.whl
    
    301
    +    sources:
    
    302
    +      - type: file
    
    303
    +        url: https://files.pythonhosted.org/packages/py2.py3/s/sentry_sdk/sentry_sdk-1.5.8-py2.py3-none-any.whl
    
    304
    +        sha256: 32af1a57954576709242beb8c373b3dbde346ac6bd616921def29d68846fb8c3
    
    305
    +
    
    306
    +  - name: python3-nbxmpp
    
    307
    +    buildsystem: simple
    
    308
    +    build-commands:
    
    309
    +      - pip3 install .
    
    310
    +    sources:
    
    311
    +      - type: git
    
    312
    +        url: https://dev.gajim.org/gajim/python-nbxmpp.git
    
    313
    +
    
    314
    +  - name: gajim
    
    315
    +    buildsystem: simple
    
    316
    +    build-commands:
    
    317
    +      - pip3 install .
    
    318
    +      - touch /app/share/run-as-flatpak
    
    319
    +      - echo -e '#!/bin/sh\ngajim --gapplication-app-id=org.gajim.Gajim.Devel "$@"' > /app/bin/gajim-devel
    
    320
    +      - chmod 755 /app/bin/gajim-devel
    
    321
    +    sources:
    
    322
    +      - type: git
    
    323
    +        url: https://dev.gajim.org/gajim/gajim.git
    
    324
    +      - type: shell
    
    325
    +        commands:
    
    326
    +          - sed -i "s+<id>org.gajim.Gajim</id>+<id>org.gajim.Gajim.Devel</id>+" data/org.gajim.Gajim.appdata.xml.in
    
    327
    +          - sed -i "s+<name>Gajim</name>+<name>Gajim (Nightly)</name>+" data/org.gajim.Gajim.appdata.xml.in
    
    328
    +          - sed -i "s+Exec=gajim+Exec=gajim-devel+" data/org.gajim.Gajim.desktop.in
    
    329
    +          - mv gajim/data/icons/hicolor/scalable/apps/org.gajim.Gajim{.Devel,}.svg
    
    330
    +    post-install:
    
    331
    +      - install -d /app/plugins

  • flatpak/org.gajim.Gajim.yaml
    1
    -app-id: org.gajim.Gajim.Devel
    
    1
    +app-id: org.gajim.Gajim
    
    2 2
     runtime: org.gnome.Platform
    
    3 3
     runtime-version: '42'
    
    4 4
     sdk: org.gnome.Sdk
    
    5
    -command: gajim-devel
    
    6
    -tags:
    
    7
    -  - devel
    
    8
    -  - development
    
    9
    -  - nightly
    
    10
    -rename-icon: org.gajim.Gajim
    
    11
    -rename-desktop-file: org.gajim.Gajim.desktop
    
    12
    -rename-appdata-file: org.gajim.Gajim.appdata.xml
    
    5
    +command: gajim
    
    13 6
     finish-args:
    
    14 7
       - --share=ipc
    
    15 8
       - --share=network
    
    ... ... @@ -34,7 +27,7 @@ finish-args:
    34 27
       - --env=GI_TYPELIB_PATH=/app/lib/girepository-1.0:/app/plugins/lib/girepository-1.0
    
    35 28
     
    
    36 29
     add-extensions:
    
    37
    -  org.gajim.Gajim.Devel.Plugin:
    
    30
    +  org.gajim.Gajim.Plugin:
    
    38 31
         directory: plugins
    
    39 32
         merge-dirs: lib;site-packages
    
    40 33
         add-ld-path: lib
    
    ... ... @@ -56,7 +49,7 @@ cleanup:
    56 49
       - '*.la'
    
    57 50
     
    
    58 51
     modules:
    
    59
    -  - modules/libappindicator/libappindicator-gtk3-introspection-12.10.json
    
    52
    +  - shared-modules/libappindicator/libappindicator-gtk3-introspection-12.10.json
    
    60 53
     
    
    61 54
       - name: python3-pyparsing
    
    62 55
         buildsystem: simple
    
    ... ... @@ -240,15 +233,7 @@ modules:
    240 233
             sha256: c69b9f633a0c03c1b84ba14c73b0ec132f6323056e675702c1a5f75f316e06fb
    
    241 234
     
    
    242 235
       # GSound dependency
    
    243
    -  - name: libcanberra
    
    244
    -    sources:
    
    245
    -      - type: archive
    
    246
    -        url: http://0pointer.de/lennart/projects/libcanberra/libcanberra-0.30.tar.xz
    
    247
    -        sha256: c2b671e67e0c288a69fc33dc1b6f1b534d07882c2aceed37004bf48c601afa72
    
    248
    -    config-opts:
    
    249
    -      - "--disable-alsa"
    
    250
    -      - "--disable-null"
    
    251
    -      - "--disable-oss"
    
    236
    +  - shared-modules/libcanberra/libcanberra.json
    
    252 237
     
    
    253 238
       - name: gsound
    
    254 239
         buildsystem: meson
    
    ... ... @@ -266,11 +251,11 @@ modules:
    266 251
             sha256: cf4d16a716e813449bd631405dc1001ea89537b8cdae2b8abfb3999212bd43b4
    
    267 252
     
    
    268 253
       - name: farstream
    
    254
    +    rm-configure: true
    
    269 255
         sources:
    
    270
    -      - type: git
    
    271
    -        url: https://gitlab.freedesktop.org/farstream/farstream.git
    
    272
    -        tag: 0.2.9
    
    273
    -        commit: 1e42278d11730f8409878e3b4904fdd47e360e6f
    
    256
    +      - type: archive
    
    257
    +        url: https://freedesktop.org/software/farstream/releases/farstream/farstream-0.2.9.tar.gz
    
    258
    +        sha256: cb7d112433cf7c2e37a8ec918fb24f0ea5cb293cfa1002488e431de26482f47b
    
    274 259
           - type: patch
    
    275 260
             path: farstream-make-4.3.patch
    
    276 261
     
    
    ... ... @@ -314,26 +299,21 @@ modules:
    314 299
       - name: python3-nbxmpp
    
    315 300
         buildsystem: simple
    
    316 301
         build-commands:
    
    317
    -      - pip3 install .
    
    302
    +      - pip3 install nbxmpp-2.0.6-py3-none-any.whl
    
    318 303
         sources:
    
    319
    -      - type: git
    
    320
    -        url: https://dev.gajim.org/gajim/python-nbxmpp.git
    
    304
    +      - type: file
    
    305
    +        url: https://files.pythonhosted.org/packages/py3/n/nbxmpp/nbxmpp-2.0.6-py3-none-any.whl
    
    306
    +        sha256: 6abbd51538d44bf6b004f140e1453f9a21f1fb53dfeed498a31519d2167e6b92
    
    321 307
     
    
    322 308
       - name: gajim
    
    323 309
         buildsystem: simple
    
    324 310
         build-commands:
    
    325 311
           - pip3 install .
    
    326 312
           - touch /app/share/run-as-flatpak
    
    327
    -      - echo -e '#!/bin/sh\ngajim --gapplication-app-id=org.gajim.Gajim.Devel "$@"' > /app/bin/gajim-devel
    
    328
    -      - chmod 755 /app/bin/gajim-devel
    
    329 313
         sources:
    
    330 314
           - type: git
    
    331 315
             url: https://dev.gajim.org/gajim/gajim.git
    
    332
    -      - type: shell
    
    333
    -        commands:
    
    334
    -          - sed -i "s+<id>org.gajim.Gajim</id>+<id>org.gajim.Gajim.Devel</id>+" data/org.gajim.Gajim.appdata.xml.in
    
    335
    -          - sed -i "s+<name>Gajim</name>+<name>Gajim (Nightly)</name>+" data/org.gajim.Gajim.appdata.xml.in
    
    336
    -          - sed -i "s+Exec=gajim+Exec=gajim-devel+" data/org.gajim.Gajim.desktop.in
    
    337
    -          - mv gajim/data/icons/hicolor/scalable/apps/org.gajim.Gajim{.Devel,}.svg
    
    316
    +        tag: gajim-1.3.3
    
    317
    +        commit: b5b2ad4aee92074184b181ec97fbf1f900d5f4fb
    
    338 318
         post-install:
    
    339 319
           - install -d /app/plugins

  • flatpak/shared-modules
    1
    +Subproject commit 39152375ffaa13de4d1e5d0fe97120ddcb1e30c6

  • flatpak/update_flatpak_repo.sh
    ... ... @@ -9,7 +9,7 @@ flatpak-builder \
    9 9
         --disable-rofiles-fuse \
    
    10 10
         --force-clean gajim-fp \
    
    11 11
         --gpg-sign=9FDE1F4FA30E8019342B36279A569BF2B79EE905 \
    
    12
    -    --repo=/home/ftp/flatpak/ flatpak/org.gajim.Gajim.yaml &> /tmp/flatpak_build
    
    12
    +    --repo=/home/ftp/flatpak/ flatpak/org.gajim.Gajim.Devel.yaml &> /tmp/flatpak_build
    
    13 13
     
    
    14 14
     cd ../gajim-plugins
    
    15 15