Commits

commits@gajim.org

17632 discussions

[Git][gajim/gajim][master] ci: Update pyrightconfig.json
by Philipp Hörist (＠lovetox) 02 Apr '22

02 Apr '22

Philipp Hörist pushed to branch master at gajim / gajim Commits: 11d09cc4 by lovetox at 2022-04-02T19:43:13+02:00 ci: Update pyrightconfig.json - - - - - 1 changed file: - pyrightconfig.json Changes: ===================================== pyrightconfig.json ===================================== @@ -4,6 +4,7 @@ "typeCheckingMode": "strict", "reportImportCycles": "none", "reportImplicitStringConcatenation": "none", + "reportMissingModuleSource": "none", "exclude": [ "**/__pycache__", ".git" View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/11d09cc4a178cabcea0c102b538f17fb… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/11d09cc4a178cabcea0c102b538f17fb… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/python-nbxmpp][master] 3 commits: ci: Move pylint check into own script
by Philipp Hörist (＠lovetox) 02 Apr '22

02 Apr '22

Philipp Hörist pushed to branch master at gajim / python-nbxmpp Commits: f2189e13 by lovetox at 2022-04-02T16:24:58+02:00 ci: Move pylint check into own script - - - - - a55e844c by lovetox at 2022-04-02T16:59:11+02:00 refactor: Remove unused attribute - - - - - e80c9325 by lovetox at 2022-04-02T17:04:48+02:00 ci: Fix Pylint errors - - - - - 18 changed files: - + .ci/pylint-test.py - .gitlab-ci.yml - nbxmpp/auth.py - nbxmpp/client.py - nbxmpp/errors.py - nbxmpp/idlequeue.py - nbxmpp/modules/blocking.py - nbxmpp/modules/discovery.py - nbxmpp/modules/muc/muc.py - nbxmpp/modules/omemo.py - nbxmpp/modules/ping.py - nbxmpp/modules/security_labels.py - nbxmpp/modules/user_avatar.py - nbxmpp/modules/vcard4.py - nbxmpp/old_dispatcher.py - nbxmpp/simplexml.py - nbxmpp/structs.py - nbxmpp/task.py Changes: ===================================== .ci/pylint-test.py ===================================== @@ -0,0 +1,44 @@ +#!/usr/bin/env python3 + +import sys +import subprocess + +DISABLED_CHECKS = [ + 'C0103', # invalid-name + 'C0201', # consider-iterating-dictionary + 'C0206', # consider-using-f-string + 'C0209', # consider-using-dict-items + 'C0301', # line-too-long + 'C0326', # bad-whitespace + 'C0330', # bad-continuation + 'W0201', # attribute-defined-outside-init + 'W0212', # protected-access + 'W0221', # arguments-differ + 'W0231', # super-init-not-called + 'W0233', # non-parent-init-called + 'W0621', # redefined-outer-name + 'W0622', # redefined-builtin + 'W0707', # raise-missing-from + 'R0201', # no-self-use + 'R0801', # duplicate-code + 'E1101', # no-member + 'E1135', # unsupported-membership-test +] + + +def run_pylint_test(): + + cmd = [ + 'pylint', + 'nbxmpp', + f'--disable={",".join(DISABLED_CHECKS)}' + ] + + try: + subprocess.run(cmd, check=True) + except subprocess.CalledProcessError: + sys.exit('pylint test failed') + + +if __name__ == '__main__': + run_pylint_test() ===================================== .gitlab-ci.yml ===================================== @@ -7,7 +7,7 @@ stages: run-test: stage: test script: - - python3 -m pylint nbxmpp --disable=C0103,C0201,C0209,C0301,C0326,C0330,W0201,W0212,W0221,W0231,W0233,W0621,W0622,W0707,R0201,R0801,E1101,E1135 + - python3 .ci/pylint-test.py - coverage run --source=nbxmpp -m unittest discover -v - coverage report -mi - coverage xml -i @@ -16,25 +16,6 @@ run-test: reports: cobertura: coverage.xml -# C0103 invalid-name -# C0201 consider-iterating-dictionary -# C0209 consider-using-f-string -# C0301 line-too-long -# C0326 bad-whitespace -# C0330 bad-continuation -# W0201 attribute-defined-outside-init -# W0212 protected-access -# W0221 arguments-differ -# W0231 super-init-not-called -# W0233 non-parent-init-called -# W0621 redefined-outer-name -# W0622 redefined-builtin -# W0707 raise-missing-from -# R0201 no-self-use -# R0801 duplicate-code -# E1101 no-member -# E1135 unsupported-membership-test - run-build: stage: build script: ===================================== nbxmpp/auth.py ===================================== @@ -155,7 +155,7 @@ class SASL: elif chosen_mechanism == 'ANONYMOUS': self._method = ANONYMOUS(self._client) - self._method.initiate() + self._method.initiate() # pylint: disable=E1120 elif chosen_mechanism == 'EXTERNAL': self._method = EXTERNAL(self._client) @@ -168,7 +168,7 @@ class SASL: else: hostname = self._client.domain try: - self._method.initiate(hostname) + self._method.initiate(hostname) # pylint: disable=E1120 except AuthFail as error: self._log.error(error) self._abort_auth() @@ -300,7 +300,7 @@ class GSSAPI: if not self.ctx.complete: output_token = self.ctx.step(server_message) else: - result = self.ctx.unwrap(server_message) + _result = self.ctx.unwrap(server_message) # TODO(jelmer): Log result.message data = b'\x00\x00\x00\x00' + bytes(self.ctx.initiator_name) output_token = self.ctx.wrap(data, False).message ===================================== nbxmpp/client.py ===================================== @@ -479,8 +479,8 @@ class Client(Observable): else: self._set_error(StreamError.CONNECTION_FAILED, 'connection-failed', - (f'Unable to connect to last ' - 'successful address: {self._current_address}')) + ('Unable to connect to last ' + f'successful address: {self._current_address}')) self.notify('connection-failed') def _disconnect_with_error(self, error_domain, error, text=None): ===================================== nbxmpp/errors.py ===================================== @@ -36,7 +36,7 @@ class BaseError(Exception): def __str__(self) -> str: return self.text - def get_text(self, pref_lang: Optional[str] = None) -> str: + def get_text(self, _pref_lang: Optional[str] = None) -> str: return self.text ===================================== nbxmpp/idlequeue.py ===================================== @@ -170,6 +170,8 @@ class IdleCommand(IdleObject): def _start_nt(self): # if program is started from noninteraactive shells stdin is closed and # cannot be forwarded, so we have to keep it open + + # pylint: disable=consider-using-with self.pipe = subprocess.Popen(self._compose_command_args(), stdout=subprocess.PIPE, bufsize=1024, ===================================== nbxmpp/modules/blocking.py ===================================== @@ -17,8 +17,7 @@ from __future__ import annotations -from typing import Literal, Optional -from typing import Union +from typing import Optional from typing import Set from typing import TYPE_CHECKING ===================================== nbxmpp/modules/discovery.py ===================================== @@ -57,7 +57,7 @@ class Discovery(BaseModule): ] @staticmethod - def _process_disco_info(client, stanza, properties): + def _process_disco_info(client, stanza, _properties): iq = stanza.buildReply('error') iq.addChild(node=ErrorNode(ERR_ITEM_NOT_FOUND)) client.send_stanza(iq) ===================================== nbxmpp/modules/muc/muc.py ===================================== @@ -208,7 +208,7 @@ class MUC(BaseModule): if address is not None: properties.muc_ofrom = JID.from_string(address.getAttr('jid')) - def _process_message_after_decryption(self, _client, stanza, properties): + def _process_message_after_decryption(self, _client, _stanza, properties): if properties.body is None and properties.subject: properties.muc_subject = MucSubject( text=properties.subject, @@ -444,7 +444,7 @@ class MUC(BaseModule): @iq_request_task def request_config(self, room_jid): - task = yield + _task = yield response = yield make_config_request(room_jid) if response.isError(): ===================================== nbxmpp/modules/omemo.py ===================================== @@ -189,7 +189,7 @@ def _parse_omemo_message(stanza): try: sid = int(header.getAttr('sid')) - except Exception as error: + except Exception: raise MalformedStanzaError('sid attr not found', stanza) iv_node = header.getTag('iv') ===================================== nbxmpp/modules/ping.py ===================================== @@ -37,7 +37,7 @@ class Ping(BaseModule): priority=15), ] - def _process_ping(self, _client, stanza, properties): + def _process_ping(self, _client, stanza, _properties): self._log.info('Send pong to %s', stanza.getFrom()) iq = stanza.buildSimpleReply('result') self._client.send_stanza(iq) ===================================== nbxmpp/modules/security_labels.py ===================================== @@ -63,7 +63,7 @@ class SecurityLabels(BaseModule): catalog_node = response.getTag('catalog', namespace=Namespace.SECLABEL_CATALOG) - to = catalog_node.getAttr('to') + items = catalog_node.getTags('item') labels = {} ===================================== nbxmpp/modules/user_avatar.py ===================================== @@ -226,7 +226,7 @@ def _get_avatar_data(item, id_): avatar_sha = hashlib.sha1(avatar).hexdigest() if avatar_sha != id_: - raise MalformedStanzaError(f'avatar does not match sha', item) + raise MalformedStanzaError('avatar does not match sha', item) return AvatarData(data=avatar, sha=avatar_sha) ===================================== nbxmpp/modules/vcard4.py ===================================== @@ -15,6 +15,8 @@ # You should have received a copy of the GNU General Public License # along with this program; If not, see <http://www.gnu.org/licenses/>. +# pylint: disable=E1120 + import logging from typing import List ===================================== nbxmpp/old_dispatcher.py ===================================== @@ -290,7 +290,7 @@ class XMPPDispatcher(PlugIn): self._owner.send("%s%s>" % (XML_DECLARATION, str(self._metastream)[:-2])) - def _check_stream_start(self, ns, tag, attrs): + def _check_stream_start(self, ns, tag, _attrs): if ns != Namespace.STREAMS or tag != 'stream': raise ValueError('Incorrect stream start: ' '(%s,%s). Terminating.' % (tag, ns)) ===================================== nbxmpp/simplexml.py ===================================== @@ -592,7 +592,6 @@ class NodeBuilder: _parser: Any Parse: Callable[[str, bool], None] __depth: int - __last_depth: int __max_depth: int _dispatch_depth: int _document_attrs: Optional[Attrs] @@ -634,7 +633,6 @@ class NodeBuilder: self.Parse = self._parser.Parse self.__depth = 0 - self.__last_depth = 0 self.__max_depth = 0 self._dispatch_depth = dispatch_depth self._document_attrs = None @@ -799,12 +797,10 @@ class NodeBuilder: return self.__depth <= level < self.__max_depth def _inc_depth(self) -> None: - self.__last_depth = self.__depth self.__depth += 1 self.__max_depth = max(self.__depth, self.__max_depth) def _dec_depth(self) -> None: - self.__last_depth = self.__depth self.__depth -= 1 def XML2Node(xml_str: str) -> Optional[Node]: ===================================== nbxmpp/structs.py ===================================== @@ -434,6 +434,8 @@ class DiscoInfo(NamedTuple): except Exception: continue + return None + def supports(self, feature: str) -> bool: return feature in self.features ===================================== nbxmpp/task.py ===================================== @@ -322,6 +322,7 @@ class IqRequestTask(Task): self._iq_id = None def _run_async(self, stanza: Node): + # pylint: disable=arguments-renamed self._iq_id = self._client.send_stanza(stanza, callback=self._async_finished, timeout=self._timeout) @@ -358,6 +359,7 @@ class HTTPRequestTask(Task): self._session = session def _run_async(self, message): + # pylint: disable=arguments-renamed self._session.queue_message(message, self._async_finished, None) def _async_finished(self, _session, message, _user_data): View it on GitLab: https://dev.gajim.org/gajim/python-nbxmpp/-/compare/5f0e1da08f2809f1197c543… -- View it on GitLab: https://dev.gajim.org/gajim/python-nbxmpp/-/compare/5f0e1da08f2809f1197c543… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] ci: Windows: Build and deploy in one job
by Philipp Hörist (＠lovetox) 02 Apr '22

02 Apr '22

Philipp Hörist pushed to branch master at gajim / gajim Commits: c535bd4d by lovetox at 2022-04-02T15:31:48+02:00 ci: Windows: Build and deploy in one job Passing the artifacts does not work for unknown reasons - - - - - 1 changed file: - .gitlab-ci.yml Changes: ===================================== .gitlab-ci.yml ===================================== @@ -69,18 +69,19 @@ build-linux: paths: - dist/gajim-*.tar.gz -build-windows: +build-and-deploy-windows: stage: build rules: - if: '$GAJIM_NIGHTLY_BUILD' - if: '$CI_COMMIT_TAG' script: - python3 .ci/appveyor_build.py + - python3 .ci/deploy.py build - artifacts: - expire_in: 1 day - paths: - - build/Gajim-*.exe + # artifacts: + # expire_in: 1 day + # paths: + # - build/Gajim-*.exe deploy-linux: stage: deploy @@ -94,17 +95,17 @@ deploy-linux: script: - python3 .ci/deploy.py dist -deploy-windows: - stage: deploy - needs: ['build-windows'] - rules: - - if: '$GAJIM_NIGHTLY_BUILD' - - if: '$CI_COMMIT_TAG' - when: manual - variables: - DEPLOY_TYPE: "windows" - script: - - python3 .ci/deploy.py build +# deploy-windows: +# stage: deploy +# needs: ['build-windows'] +# rules: +# - if: '$GAJIM_NIGHTLY_BUILD' +# - if: '$CI_COMMIT_TAG' +# when: manual +# variables: +# DEPLOY_TYPE: "windows" +# script: +# - python3 .ci/deploy.py build deploy-flatpak: stage: deploy View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/c535bd4dca36f2b4f1a0eed1d09ed502… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/c535bd4dca36f2b4f1a0eed1d09ed502… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] 2 commits: refactor: Setup.py
by Philipp Hörist (＠lovetox) 30 Mar '22

30 Mar '22

Philipp Hörist pushed to branch master at gajim / gajim Commits: 4f45863e by lovetox at 2022-03-31T00:04:08+02:00 refactor: Setup.py - Rework translation updates - Add type annotations - - - - - dff34744 by lovetox at 2022-03-31T00:04:18+02:00 chore: Harmonize translation files - Harmonize header - sort output / remove location so we have less updates in the future - - - - - 30 changed files: - po/be.po - po/be(a)latin.po - po/bg.po - po/br.po - po/ca.po - po/cs.po - po/da.po - po/de.po - po/el.po - po/en_GB.po - po/eo.po - po/es.po - po/eu.po - po/fr.po - po/gl.po - po/he.po - po/hr.po - po/hu.po - po/it.po - po/ja.po - po/kk.po - po/lt.po - po/nb_NO.po - po/nl.po - po/pl.po - po/pt.po - po/pt_BR.po - po/ru.po - po/sk.po - po/sr.po The diff was not included because it is too large. View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/3c32b571fbd4ee6ad26fdc03ec6d19c… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/3c32b571fbd4ee6ad26fdc03ec6d19c… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/python-nbxmpp][master] feat: Implement SCRAM-SHA-512
by Philipp Hörist (＠lovetox) 30 Mar '22

30 Mar '22

Philipp Hörist pushed to branch master at gajim / python-nbxmpp Commits: 5f0e1da0 by lovetox at 2022-03-30T19:41:48+02:00 feat: Implement SCRAM-SHA-512 - - - - - 3 changed files: - nbxmpp/auth.py - nbxmpp/client.py - nbxmpp/protocol.py Changes: ===================================== nbxmpp/auth.py ===================================== @@ -119,7 +119,10 @@ class SASL: self._log.info('Chosen auth mechanism: %s', chosen_mechanism) - if chosen_mechanism in ('SCRAM-SHA-256', 'SCRAM-SHA-1', 'PLAIN'): + if chosen_mechanism in ('SCRAM-SHA-512', + 'SCRAM-SHA-256', + 'SCRAM-SHA-1', + 'PLAIN'): if not self._password: self._on_sasl_finished(False, 'no-password') return @@ -134,7 +137,11 @@ class SASL: # channel_binding_data) # self._method.initiate(self._client.username, self._password) - if chosen_mechanism == 'SCRAM-SHA-256': + if chosen_mechanism == 'SCRAM-SHA-512': + self._method = SCRAM_SHA_512(self._client, None) + self._method.initiate(self._client.username, self._password) + + elif chosen_mechanism == 'SCRAM-SHA-256': self._method = SCRAM_SHA_256(self._client, None) self._method.initiate(self._client.username, self._password) @@ -442,5 +449,12 @@ class SCRAM_SHA_256_PLUS(SCRAM_SHA_256): _channel_binding = 'p=tls-unique,,' +class SCRAM_SHA_512(SCRAM): + + _mechanism = 'SCRAM-SHA-512' + _channel_binding = 'n,,' + _hash_method = 'sha512' + + class AuthFail(Exception): pass ===================================== nbxmpp/client.py ===================================== @@ -284,7 +284,8 @@ class Client(Observable): @property def mechs(self): - return set(self._allowed_mechs or set(['SCRAM-SHA-256', + return set(self._allowed_mechs or set(['SCRAM-SHA-512', + 'SCRAM-SHA-256', 'SCRAM-SHA-1', 'PLAIN'])) ===================================== nbxmpp/protocol.py ===================================== @@ -44,6 +44,7 @@ def ascii_upper(s): return s.upper() SASL_AUTH_MECHS = [ + 'SCRAM-SHA-512', 'SCRAM-SHA-256-PLUS', 'SCRAM-SHA-256', 'SCRAM-SHA-1-PLUS', View it on GitLab: https://dev.gajim.org/gajim/python-nbxmpp/-/commit/5f0e1da08f2809f1197c543d… -- View it on GitLab: https://dev.gajim.org/gajim/python-nbxmpp/-/commit/5f0e1da08f2809f1197c543d… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] chore: Sort LINGUAS file
by Philipp Hörist (＠lovetox) 29 Mar '22

29 Mar '22

Philipp Hörist pushed to branch master at gajim / gajim Commits: 3c32b571 by lovetox at 2022-03-29T21:37:14+02:00 chore: Sort LINGUAS file - - - - - 1 changed file: - po/LINGUAS Changes: ===================================== po/LINGUAS ===================================== @@ -1,36 +1,36 @@ # available languages -fr -pt -el -pl -es -ru +be +be@latin bg +br +cs +da de +el +en_GB +eo +es +eu +fr +gl +he +hr +hu +it +ja +kk +lt nb_NO -cs nl +pl +pt pt_BR -sv -it -eu +ru sk -zh_CN -br -eo -hr -en_GB -be -be@latin sr sr@Latn -gl -lt -da +sv +tr uk -ja -kk -he +zh_CN zh_TW -hu -tr View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/3c32b571fbd4ee6ad26fdc03ec6d19c2… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/3c32b571fbd4ee6ad26fdc03ec6d19c2… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] ci: Create build folder
by Philipp Hörist (＠lovetox) 28 Mar '22

28 Mar '22

Philipp Hörist pushed to branch master at gajim / gajim Commits: 8f049c69 by lovetox at 2022-03-28T21:24:48+02:00 ci: Create build folder - - - - - 1 changed file: - .ci/appveyor_build.py Changes: ===================================== .ci/appveyor_build.py ===================================== @@ -85,27 +85,28 @@ def get_artifacts(build_id: str) -> None: console.print('Build status:', build['status']) + build_folder = Path.cwd() / 'build' + build_folder.mkdir() + for job in build['jobs']: - download_job_artifacts(job['jobId']) + download_job_artifacts(job['jobId'], build_folder) console.print('All artifacts downloaded!') -def download_job_artifacts(job_id: str) -> None: +def download_job_artifacts(job_id: str, target_folder: Path) -> None: artifacts_api_url = f'{BASE_URL}/buildjobs/{job_id}/artifacts' req = requests.get(artifacts_api_url, headers=HEADERS) req.raise_for_status() response = req.json() - build_folder = Path.cwd() / 'build' - for artifact in response: filename = artifact['fileName'] console.print('Download', filename, '...') file_url = f'{artifacts_api_url}/{filename}' req = requests.get(file_url, headers=HEADERS) req.raise_for_status() - with open(build_folder / filename, 'wb') as file: + with open(target_folder / filename, 'wb') as file: file.write(req.content) View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/8f049c699a065269f6a50836c4a43167… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/8f049c699a065269f6a50836c4a43167… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] ci: Use real name for tarballs
by Philipp Hörist (＠lovetox) 27 Mar '22

27 Mar '22

Philipp Hörist pushed to branch master at gajim / gajim Commits: f199469b by lovetox at 2022-03-28T01:11:31+02:00 ci: Use real name for tarballs - - - - - 1 changed file: - .ci/deploy.py Changes: ===================================== .ci/deploy.py ===================================== @@ -109,7 +109,7 @@ def deploy_windows_release(ftp: FTP_TLS, filedir: Path) -> None: def deploy_linux_nightly(ftp: FTP_TLS, filedir: Path) -> None: ftp.cwd(LINUX_NIGHTLY_FOLDER) filepath = find_linux_tarball(filedir) - filename = f'gajim-{date.today().isoformat()}-test.tar.gz' + filename = f'gajim-{date.today().isoformat()}.tar.gz' upload_file(ftp, filepath, name=filename) View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/f199469b655324b60268bd5b6bb94328… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/f199469b655324b60268bd5b6bb94328… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] ci: Disable Windows 32bit build
by Philipp Hörist (＠lovetox) 27 Mar '22

27 Mar '22

Philipp Hörist pushed to branch master at gajim / gajim Commits: 44669fc7 by lovetox at 2022-03-28T00:24:54+02:00 ci: Disable Windows 32bit build This doesnt work right now for unknown reason. Disable the job or else also the 64bit build is blocked. - - - - - 1 changed file: - .ci/appveyor.yml Changes: ===================================== .ci/appveyor.yml ===================================== @@ -3,14 +3,14 @@ version: 1.1.{build} image: Visual Studio 2019 environment: - matrix: - - MSYSTEM: MINGW64 - MSYS_ARCH: "x86_64" - ARCH: "64bit" - - - MSYSTEM: MINGW32 - MSYS_ARCH: "i686" - ARCH: "32bit" + # matrix: + MSYSTEM: MINGW64 + MSYS_ARCH: "x86_64" + ARCH: "64bit" + + # - MSYSTEM: MINGW32 + # MSYS_ARCH: "i686" + # ARCH: "32bit" branches: only: View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/44669fc7a011d855483461dbefa823b1… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/44669fc7a011d855483461dbefa823b1… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] 4 commits: other: Flatpak: Use shared modules from flathub
by Philipp Hörist (＠lovetox) 27 Mar '22

27 Mar '22

Philipp Hörist pushed to branch master at gajim / gajim Commits: 7ce65f4d by André Apitzsch at 2022-03-28T00:17:00+02:00 other: Flatpak: Use shared modules from flathub https://github.com/flathub/flathub/wiki/App-Requirements#shared-modules - - - - - 95e82680 by André Apitzsch at 2022-03-28T00:17:12+02:00 other: Flatpak: Add yaml file for stable version - - - - - 65ec277f by André Apitzsch at 2022-03-28T00:17:25+02:00 other: Flatpak: Update readme - - - - - d7761700 by lovetox at 2022-03-28T00:17:35+02:00 other: Flatpak: Update nightly script - - - - - 14 changed files: - + .gitmodules - flatpak/README.md - − flatpak/modules/dbus-glib/dbus-glib.json - − flatpak/modules/intltool/intltool-0.51.json - − flatpak/modules/intltool/intltool-perl5.26-regex-fixes.patch - − flatpak/modules/libappindicator/libappindicator-fix-crash-from-incorrect-signal-emission.patch - − flatpak/modules/libappindicator/libappindicator-fix-crash-iterating-icon-themes.patch - − flatpak/modules/libappindicator/libappindicator-ftbfs.patch - − flatpak/modules/libappindicator/libappindicator-gtk3-introspection-12.10.json - − flatpak/modules/libappindicator/libappindicator-no-python.patch - + flatpak/org.gajim.Gajim.Devel.yaml - flatpak/org.gajim.Gajim.yaml - + flatpak/shared-modules - flatpak/update_flatpak_repo.sh Changes: ===================================== .gitmodules ===================================== @@ -0,0 +1,3 @@ +[submodule "flatpak/shared-modules"] + path = flatpak/shared-modules + url = https://github.com/flathub/shared-modules.git ===================================== flatpak/README.md ===================================== @@ -64,7 +64,7 @@ ### Download Gajim's sources Alternatively, you can also download the sources from our Gitlab via web browser. ```bash -git clone https://dev.gajim.org/gajim/gajim.git ~/Gajim +git clone --recurse-submodules https://dev.gajim.org/gajim/gajim.git ~/Gajim cd ~/Gajim ``` ===================================== flatpak/modules/dbus-glib/dbus-glib.json deleted ===================================== @@ -1,23 +0,0 @@ -{ - "name": "dbus-glib", - "cleanup": [ - "*.la", - "/bin", - "/etc", - "/include", - "/libexec", - "/share/gtk-doc", - "/share/man" - ], - "config-opts": [ - "--disable-static", - "--disable-gtk-doc" - ], - "sources": [ - { - "type": "archive", - "url": "https://dbus.freedesktop.org/releases/dbus-glib/dbus-glib-0.112.tar.gz", - "sha256": "7d550dccdfcd286e33895501829ed971eeb65c614e73aadb4a08aeef719b143a" - } - ] -} ===================================== flatpak/modules/intltool/intltool-0.51.json deleted ===================================== @@ -1,15 +0,0 @@ -{ - "name": "intltool", - "cleanup": [ "*" ], - "sources": [ - { - "type": "archive", - "url": "https://launchpad.net/intltool/trunk/0.51.0/+download/intltool-0.51.0.tar.gz", - "sha256": "67c74d94196b153b774ab9f89b2fa6c6ba79352407037c8c14d5aeb334e959cd" - }, - { - "type": "patch", - "path": "intltool-perl5.26-regex-fixes.patch" - } - ] -} ===================================== flatpak/modules/intltool/intltool-perl5.26-regex-fixes.patch deleted ===================================== @@ -1,59 +0,0 @@ -Description: Escape "{", to prevent complaints from perl 5.22 and 5.26 -Author: Roderich Schupp <roderich.schupp(a)gmail.com> -Author: gregor herrmann <gregoa(a)debian.org> -Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=788705 -Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=826471 -Bug-Upstream: https://bugs.launchpad.net/intltool/+bug/1490906 - -Index: intltool-0.51.0/intltool-update.in -=================================================================== ---- intltool-0.51.0.orig/intltool-update.in 2017-07-23 17:24:35.113169465 +0200 -+++ intltool-0.51.0/intltool-update.in 2017-07-23 17:24:35.109169052 +0200 -@@ -1062,13 +1062,13 @@ - } - } - -- if ($str =~ /^(.*)\${?([A-Z_]+)}?(.*)$/) -+ if ($str =~ /^(.*)\$\{?([A-Z_]+)}?(.*)$/) - { - my $rest = $3; - my $untouched = $1; - my $sub = ""; - # Ignore recursive definitions of variables -- $sub = $varhash{$2} if defined $varhash{$2} and $varhash{$2} !~ /\${?$2}?/; -+ $sub = $varhash{$2} if defined $varhash{$2} and $varhash{$2} !~ /\$\{?$2}?/; - - return SubstituteVariable ("$untouched$sub$rest"); - } -@@ -1190,10 +1190,10 @@ - $name =~ s/$+$//g; - $version =~ s/\(+$//g; - -- $varhash{"PACKAGE_NAME"} = $name if (not $name =~ /\${?AC_PACKAGE_NAME}?/); -- $varhash{"PACKAGE"} = $name if (not $name =~ /\${?PACKAGE}?/); -- $varhash{"PACKAGE_VERSION"} = $version if (not $name =~ /\${?AC_PACKAGE_VERSION}?/); -- $varhash{"VERSION"} = $version if (not $name =~ /\${?VERSION}?/); -+ $varhash{"PACKAGE_NAME"} = $name if (not $name =~ /\$\{?AC_PACKAGE_NAME}?/); -+ $varhash{"PACKAGE"} = $name if (not $name =~ /\$\{?PACKAGE}?/); -+ $varhash{"PACKAGE_VERSION"} = $version if (not $name =~ /\$\{?AC_PACKAGE_VERSION}?/); -+ $varhash{"VERSION"} = $version if (not $name =~ /\$\{?VERSION}?/); - } - - if ($conf_source =~ /^AC_INIT\(([^,$]+),([^,\)]+)[,]?([^,\)]+)?/m) -@@ -1219,11 +1219,11 @@ - $version =~ s/\(+$//g; - $bugurl =~ s/\(+$//g if (defined $bugurl); - -- $varhash{"PACKAGE_NAME"} = $name if (not $name =~ /\${?AC_PACKAGE_NAME}?/); -- $varhash{"PACKAGE"} = $name if (not $name =~ /\${?PACKAGE}?/); -- $varhash{"PACKAGE_VERSION"} = $version if (not $name =~ /\${?AC_PACKAGE_VERSION}?/); -- $varhash{"VERSION"} = $version if (not $name =~ /\${?VERSION}?/); -- $varhash{"PACKAGE_BUGREPORT"} = $bugurl if (defined $bugurl and not $bugurl =~ /\${?\w+}?/); -+ $varhash{"PACKAGE_NAME"} = $name if (not $name =~ /\$\{?AC_PACKAGE_NAME}?/); -+ $varhash{"PACKAGE"} = $name if (not $name =~ /\$\{?PACKAGE}?/); -+ $varhash{"PACKAGE_VERSION"} = $version if (not $name =~ /\$\{?AC_PACKAGE_VERSION}?/); -+ $varhash{"VERSION"} = $version if (not $name =~ /\$\{?VERSION}?/); -+ $varhash{"PACKAGE_BUGREPORT"} = $bugurl if (defined $bugurl and not $bugurl =~ /\$\{?\w+}?/); - } - - # \s makes this not work, why? ===================================== flatpak/modules/libappindicator/libappindicator-fix-crash-from-incorrect-signal-emission.patch deleted ===================================== @@ -1,74 +0,0 @@ ---- libappindicator-12.10.0/src/app-indicator.c 2012-07-11 13:28:34.415113869 -0400 -+++ wrk/src/app-indicator.c 2020-03-19 12:14:47.813191652 -0400 -@@ -443,7 +443,7 @@ - G_STRUCT_OFFSET (AppIndicatorClass, new_icon), - NULL, NULL, - g_cclosure_marshal_VOID__VOID, -- G_TYPE_NONE, 0, G_TYPE_NONE); -+ G_TYPE_NONE, 0); - - /** - * AppIndicator::new-attention-icon: -@@ -457,7 +457,7 @@ - G_STRUCT_OFFSET (AppIndicatorClass, new_attention_icon), - NULL, NULL, - g_cclosure_marshal_VOID__VOID, -- G_TYPE_NONE, 0, G_TYPE_NONE); -+ G_TYPE_NONE, 0); - - /** - * AppIndicator::new-status: -@@ -505,7 +505,7 @@ - G_STRUCT_OFFSET (AppIndicatorClass, connection_changed), - NULL, NULL, - g_cclosure_marshal_VOID__BOOLEAN, -- G_TYPE_NONE, 1, G_TYPE_BOOLEAN, G_TYPE_NONE); -+ G_TYPE_NONE, 1, G_TYPE_BOOLEAN); - - /** - * AppIndicator::new-icon-theme-path: -@@ -1175,7 +1175,7 @@ - gchar * guide = priv->label_guide != NULL ? priv->label_guide : ""; - - g_signal_emit(G_OBJECT(self), signals[NEW_LABEL], 0, -- label, guide, TRUE); -+ label, guide); - if (priv->dbus_registration != 0 && priv->connection != NULL) { - GError * error = NULL; - -@@ -1490,7 +1490,7 @@ - static void - theme_changed_cb (GtkIconTheme * theme, gpointer user_data) - { -- g_signal_emit (user_data, signals[NEW_ICON], 0, TRUE); -+ g_signal_emit (user_data, signals[NEW_ICON], 0); - - AppIndicator * self = (AppIndicator *)user_data; - AppIndicatorPrivate *priv = self->priv; -@@ -1904,7 +1904,7 @@ - } - - if (changed) { -- g_signal_emit (self, signals[NEW_ATTENTION_ICON], 0, TRUE); -+ g_signal_emit (self, signals[NEW_ATTENTION_ICON], 0); - - if (self->priv->dbus_registration != 0 && self->priv->connection != NULL) { - GError * error = NULL; -@@ -1982,7 +1982,7 @@ - } - - if (changed) { -- g_signal_emit (self, signals[NEW_ICON], 0, TRUE); -+ g_signal_emit (self, signals[NEW_ICON], 0); - - if (self->priv->dbus_registration != 0 && self->priv->connection != NULL) { - GError * error = NULL; -@@ -2048,7 +2048,7 @@ - - self->priv->icon_theme_path = g_strdup(icon_theme_path); - -- g_signal_emit (self, signals[NEW_ICON_THEME_PATH], 0, self->priv->icon_theme_path, TRUE); -+ g_signal_emit (self, signals[NEW_ICON_THEME_PATH], 0, self->priv->icon_theme_path); - - if (self->priv->dbus_registration != 0 && self->priv->connection != NULL) { - GError * error = NULL; ===================================== flatpak/modules/libappindicator/libappindicator-fix-crash-iterating-icon-themes.patch deleted ===================================== @@ -1,11 +0,0 @@ ---- libappindicator-12.10.0/src/app-indicator.c -+++ libappindicator-12.10.0/src/app-indicator.c -@@ -1606,7 +1606,7 @@ status_icon_changes (AppIndicator * self, gpointer data) - gint n_elements, i; - gboolean found=FALSE; - gtk_icon_theme_get_search_path(icon_theme, &path, &n_elements); -- for (i=0; i< n_elements || path[i] == NULL; i++) { -+ for (i=0; i< n_elements; i++) { - if(g_strcmp0(path[i], self->priv->icon_theme_path) == 0) { - found=TRUE; - break; ===================================== flatpak/modules/libappindicator/libappindicator-ftbfs.patch deleted ===================================== @@ -1,20 +0,0 @@ -From: Olivier Tilloy <olivier.tilloy(a)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 ===================================== @@ -1,130 +0,0 @@ -{ - "name": "libappindicator", - "build-options": { - "cflags": "-Wno-error", - "make-args": [ "-j1" ] - }, - "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/libappindicat…", - "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.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…", - "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.…", - "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 ===================================== @@ -1,888 +0,0 @@ -diff --git a/bindings/Makefile.am b/bindings/Makefile.am -index d1f6d73..dccca6c 100644 ---- a/bindings/Makefile.am -+++ b/bindings/Makefile.am -@@ -3,7 +3,6 @@ SUBDIRS = \ - vala - else - SUBDIRS = \ -- python \ - vala - endif - -diff --git a/bindings/python/Makefile.am b/bindings/python/Makefile.am -deleted file mode 100644 -index fe95c02..0000000 ---- a/bindings/python/Makefile.am -+++ /dev/null -@@ -1,39 +0,0 @@ --defsdir = $(datadir)/pygtk/2.0/defs --defs_DATA = appindicator.defs -- --#CFLAGS = -Wall -Werror --INCLUDES = \ -- -I$(top_srcdir)/src \ -- -DG_LOG_DOMAIN=\"appindicator-python\" \ -- -DDATADIR=\"$(datadir)\" \ -- -DLIBDIR=\"$(libdir)\" \ -- $(APPINDICATOR_PYTHON_CFLAGS) \ -- $(PYTHON_INCLUDES) -- --pkgpythondir = $(pyexecdir) --pkgpyexecdir = $(pyexecdir) -- --pkgappindicatordir = $(pkgpythondir)/appindicator --pkgappindicator_PYTHON = __init__.py -- --appindicatordir = $(pkgpyexecdir)/appindicator --appindicator_LTLIBRARIES = _appindicator.la -- --_appindicator_la_LDFLAGS = -module -avoid-version -export-symbols-regex init_appindicator --_appindicator_la_LIBADD = $(APPINDICATOR_PYTHON_LIBS) -L$(top_builddir)/src/.libs -lappindicator --_appindicator_la_SOURCES = appindicatormodule.c --nodist__appindicator_la_SOURCES = appindicator.c -- --CLEANFILES = appindicator.c --EXTRA_DIST = appindicator.override.in appindicator-arg-types.py $(defs_DATA) --appindicator.c: $(defs_DATA) appindicator.override -- --%.c: %.defs -- ($(PYGTK_CODEGEN) \ -- --register $(PYGTK_DEFSDIR)/gtk-types.defs \ -- --register $(PYGTK_DEFSDIR)/gdk-types.defs \ -- --load-types $(srcdir)/appindicator-arg-types.py \ -- --override $*.override \ -- --prefix py$* $(srcdir)/$*.defs) > gen-$*.c \ -- && cp gen-$*.c $*.c \ -- && rm -f gen-$*.c -diff --git a/bindings/python/__init__.py b/bindings/python/__init__.py -deleted file mode 100644 -index 20e2140..0000000 ---- a/bindings/python/__init__.py -+++ /dev/null -@@ -1,27 +0,0 @@ --# Python bindings for libappindicator. --# --# Copyright 2009 Canonical Ltd. --# --# Authors: --# Eitan Isaacson <eitan(a)ascender.com> --# Neil Jagdish Patel <neil.patel(a)canonical.com> --# --# This program is free software: you can redistribute it and/or modify it --# under the terms of either or both of the following licenses: --# --# 1) the GNU Lesser General Public License version 3, as published by the --# Free Software Foundation; and/or --# 2) the GNU Lesser General Public License version 2.1, as published by --# the Free Software Foundation. --# --# This program is distributed in the hope that it will be useful, but --# WITHOUT ANY WARRANTY; without even the implied warranties of --# MERCHANTABILITY, SATISFACTORY QUALITY or FITNESS FOR A PARTICULAR --# PURPOSE. See the applicable version of the GNU Lesser General Public --# License for more details. --# --# You should have received a copy of both the GNU Lesser General Public --# License version 3 and version 2.1 along with this program. If not, see --# <http://www.gnu.org/licenses/> -- --from _appindicator import * -diff --git a/bindings/python/appindicator-arg-types.py b/bindings/python/appindicator-arg-types.py -deleted file mode 100644 -index 9d74aa0..0000000 ---- a/bindings/python/appindicator-arg-types.py -+++ /dev/null -@@ -1,27 +0,0 @@ --# Python bindings for libappindicator. --# --# Copyright 2009 Canonical Ltd. --# --# Authors: --# Eitan Isaacson <eitan(a)ascender.com> --# --# This program is free software: you can redistribute it and/or modify it --# under the terms of either or both of the following licenses: --# --# 1) the GNU Lesser General Public License version 3, as published by the --# Free Software Foundation; and/or --# 2) the GNU Lesser General Public License version 2.1, as published by --# the Free Software Foundation. --# --# This program is distributed in the hope that it will be useful, but --# WITHOUT ANY WARRANTY; without even the implied warranties of --# MERCHANTABILITY, SATISFACTORY QUALITY or FITNESS FOR A PARTICULAR --# PURPOSE. See the applicable version of the GNU Lesser General Public --# License for more details. --# --# You should have received a copy of both the GNU Lesser General Public --# License version 3 and version 2.1 along with this program. If not, see --# <http://www.gnu.org/licenses/> -- --import argtypes -- -diff --git a/bindings/python/appindicator.defs b/bindings/python/appindicator.defs -deleted file mode 100644 -index 4fcc2d5..0000000 ---- a/bindings/python/appindicator.defs -+++ /dev/null -@@ -1,200 +0,0 @@ --;; -*- scheme -*- --; object definitions ... --(define-object Indicator -- (in-module "App") -- (parent "GObject") -- (c-name "AppIndicator") -- (gtype-id "APP_TYPE_INDICATOR") --) -- --;; Enumerations and flags ... -- --(define-enum IndicatorCategory -- (in-module "App") -- (c-name "AppIndicatorCategory") -- (gtype-id "APP_INDICATOR_TYPE_INDICATOR_CATEGORY") -- (values -- '("ApplicationStatus" "APP_INDICATOR_CATEGORY_APPLICATION_STATUS") -- '("Communications" "APP_INDICATOR_CATEGORY_COMMUNICATIONS") -- '("SystemServices" "APP_INDICATOR_CATEGORY_SYSTEM_SERVICES") -- '("Hardware" "APP_INDICATOR_CATEGORY_HARDWARE") -- '("Other" "APP_INDICATOR_CATEGORY_OTHER") -- ) --) -- --(define-enum IndicatorStatus -- (in-module "App") -- (c-name "AppIndicatorStatus") -- (gtype-id "APP_INDICATOR_TYPE_INDICATOR_STATUS") -- (values -- '("Passive" "APP_INDICATOR_STATUS_PASSIVE") -- '("Active" "APP_INDICATOR_STATUS_ACTIVE") -- '("NeedsAttention" "APP_INDICATOR_STATUS_ATTENTION") -- ) --) -- --;; From app-indicator.h -- --(define-function app_indicator_get_type -- (c-name "app_indicator_get_type") -- (return-type "GType") --) -- --(define-function app_indicator_new_with_path -- (c-name "app_indicator_new_with_path") -- (is-constructor-of "AppIndicator") -- (return-type "AppIndicator*") -- (parameters -- '("const-gchar*" "id") -- '("const-gchar*" "icon_name") -- '("AppIndicatorCategory" "category") -- '("const-gchar*" "icon_theme_path" (null-ok) (default "NULL")) -- ) --) -- --(define-method set_status -- (of-object "AppIndicator") -- (c-name "app_indicator_set_status") -- (return-type "none") -- (parameters -- '("AppIndicatorStatus" "status") -- ) --) -- --(define-method set_attention_icon -- (of-object "AppIndicator") -- (c-name "app_indicator_set_attention_icon_full") -- (return-type "none") -- (parameters -- '("const-gchar*" "icon_name") -- '("const-gchar*" "icon_desc" (null-ok) (default "NULL")) -- ) --) -- --(define-method set_menu -- (of-object "AppIndicator") -- (c-name "app_indicator_set_menu") -- (return-type "none") -- (parameters -- '("GtkMenu*" "menu") -- ) --) -- --(define-method set_icon -- (of-object "AppIndicator") -- (c-name "app_indicator_set_icon_full") -- (return-type "none") -- (parameters -- '("const-gchar*" "icon_name") -- '("const-gchar*" "icon_desc" (null-ok) (default "NULL")) -- ) --) -- --(define-method set_label -- (of-object "AppIndicator") -- (c-name "app_indicator_set_label") -- (return-type "none") -- (parameters -- '("const-gchar*" "label" (null-ok)) -- '("const-gchar*" "guide" (null-ok) (default "NULL")) -- ) --) -- --(define-method set_ordering_index -- (of-object "AppIndicator") -- (c-name "app_indicator_set_ordering_index") -- (parameters -- '("guint32" "ordering_index") -- ) --) -- --(define-method set_icon_theme_path -- (of-object "AppIndicator") -- (c-name "app_indicator_set_icon_theme_path") -- (return-type "none") -- (parameters -- '("const-gchar*" "icon_theme_path" (null-ok)) -- ) --) -- --(define-method get_id -- (of-object "AppIndicator") -- (c-name "app_indicator_get_id") -- (return-type "const-gchar*") --) -- --(define-method get_category -- (of-object "AppIndicator") -- (c-name "app_indicator_get_category") -- (return-type "AppIndicatorCategory") --) -- --(define-method get_status -- (of-object "AppIndicator") -- (c-name "app_indicator_get_status") -- (return-type "AppIndicatorStatus") --) -- --(define-method get_icon -- (of-object "AppIndicator") -- (c-name "app_indicator_get_icon") -- (return-type "const-gchar*") --) -- --(define-method get_icon_desc -- (of-object "AppIndicator") -- (c-name "app_indicator_get_icon_desc") -- (return-type "const-gchar*") --) -- --(define-method get_icon_theme_path -- (of-object "AppIndicator") -- (c-name "app_indicator_get_icon_theme_path") -- (return-type "const-gchar*") --) -- --(define-method get_attention_icon -- (of-object "AppIndicator") -- (c-name "app_indicator_get_attention_icon") -- (return-type "const-gchar*") --) -- --(define-method get_attention_icon_desc -- (of-object "AppIndicator") -- (c-name "app_indicator_get_attention_icon_desc") -- (return-type "const-gchar*") --) -- --(define-method get_menu -- (of-object "AppIndicator") -- (c-name "app_indicator_get_menu") -- (return-type "GtkMenu*") --) -- --(define-method get_label -- (of-object "AppIndicator") -- (c-name "app_indicator_get_label") -- (return-type "const-gchar*") --) -- --(define-method get_label_guide -- (of-object "AppIndicator") -- (c-name "app_indicator_get_label_guide") -- (return-type "const-gchar*") --) -- --(define-method get_ordering_index -- (of-object "AppIndicator") -- (c-name "app_indicator_get_ordering_index") -- (return-type "guint32") --) -- --(define-method build_menu_from_desktop -- (of-object "AppIndicator") -- (c-name "app_indicator_build_menu_from_desktop") -- (return-type "none") -- (parameters -- '("const-gchar*" "desktop_file") -- '("const-gchar*" "desktop_profile") -- ) --) -diff --git a/bindings/python/appindicator.override.in b/bindings/python/appindicator.override.in -deleted file mode 100644 -index 84d3159..0000000 ---- a/bindings/python/appindicator.override.in -+++ /dev/null -@@ -1,65 +0,0 @@ --/* --Python bindings for libappindicator. -- --Copyright 2009 Canonical Ltd. -- --Authors: -- Eitan Isaacson <eitan(a)ascender.com> (original) -- Neil Jagdish Patel <neil.patel(a)canonical.com> -- --This program is free software: you can redistribute it and/or modify it --under the terms of either or both of the following licenses: -- --1) the GNU Lesser General Public License version 3, as published by the --Free Software Foundation; and/or --2) the GNU Lesser General Public License version 2.1, as published by --the Free Software Foundation. -- --This program is distributed in the hope that it will be useful, but --WITHOUT ANY WARRANTY; without even the implied warranties of --MERCHANTABILITY, SATISFACTORY QUALITY or FITNESS FOR A PARTICULAR --PURPOSE. See the applicable version of the GNU Lesser General Public --License for more details. -- --You should have received a copy of both the GNU Lesser General Public --License version 3 and version 2.1 along with this program. If not, see --<http://www.gnu.org/licenses/> --*/ --%% --headers --#include <Python.h> --#include "@top_srcdir@/src/app-indicator.h" --#include "@top_builddir@/src/app-indicator-enum-types.h" --#include <glib.h> --#include "pygobject.h" --#include "pyglib.h" --#include <pygtk/pygtk.h> -- --typedef PyObject* (*to_pyobject_func) (gpointer data); -- --#define APP_TYPE_INDICATOR APP_INDICATOR_TYPE -- --void --_appindicator_add_constants(PyObject *module, const gchar *strip_prefix) --{ --#ifdef VERSION -- PyModule_AddStringConstant(module, "__version__", VERSION); --#endif -- pyg_enum_add(module, -- "IndicatorCategory", -- strip_prefix, -- APP_INDICATOR_TYPE_INDICATOR_CATEGORY); -- -- pyg_enum_add(module, -- "IndicatorStatus", -- strip_prefix, -- APP_INDICATOR_TYPE_INDICATOR_STATUS); -- -- if (PyErr_Occurred()) -- PyErr_Print(); --} --%% --modulename appindicator --%% --import gobject.GObject as PyGObject_Type --import gtk.Menu as PyGtkMenu_Type -diff --git a/bindings/python/appindicatormodule.c b/bindings/python/appindicatormodule.c -deleted file mode 100644 -index b66639c..0000000 ---- a/bindings/python/appindicatormodule.c -+++ /dev/null -@@ -1,49 +0,0 @@ --/* --Python bindings for libappindicator. -- --Copyright 2009 Canonical Ltd. -- --Authors: -- Eitan Isaacson <eitan(a)ascender.com> -- Neil Jagdish Patel <neil.patel(a)canonical.com> -- --This program is free software: you can redistribute it and/or modify it --under the terms of either or both of the following licenses: -- --1) the GNU Lesser General Public License version 3, as published by the --Free Software Foundation; and/or --2) the GNU Lesser General Public License version 2.1, as published by --the Free Software Foundation. -- --This program is distributed in the hope that it will be useful, but --WITHOUT ANY WARRANTY; without even the implied warranties of --MERCHANTABILITY, SATISFACTORY QUALITY or FITNESS FOR A PARTICULAR --PURPOSE. See the applicable version of the GNU Lesser General Public --License for more details. -- --You should have received a copy of both the GNU Lesser General Public --License version 3 and version 2.1 along with this program. If not, see --<http://www.gnu.org/licenses/> --*/ --#include <pygobject.h> -- --void pyappindicator_register_classes (PyObject *d); --extern PyMethodDef pyappindicator_functions[]; -- --DL_EXPORT(void) --init_appindicator(void) --{ -- PyObject *m, *d; -- -- init_pygobject (); -- -- m = Py_InitModule ("_appindicator", pyappindicator_functions); -- d = PyModule_GetDict (m); -- -- pyappindicator_register_classes (d); -- -- _appindicator_add_constants (m, "APP_INDICATOR_"); -- if (PyErr_Occurred ()) { -- Py_FatalError ("can't initialise module appindicator"); -- } --} -diff --git a/configure b/configure -index 5174b3f..8ff732c 100755 ---- a/configure -+++ b/configure -@@ -13703,363 +13703,6 @@ else - fi - - --########################### --# Python --########################### -- --PYGTK_REQUIRED=2.14.0 --PYGOBJECT_REQUIRED=0.22 -- -- -- -- -- -- if test -n "$PYTHON"; then -- # If the user set $PYTHON, use it and don't search something else. -- { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $PYTHON version >= 2.3.5" >&5 --$as_echo_n "checking whether $PYTHON version >= 2.3.5... " >&6; } -- prog="import sys, string --# split strings by '.' and convert to numeric. Append some zeros --# because we need at least 4 digits for the hex conversion. --minver = map(int, string.split('2.3.5', '.')) + [0, 0, 0] --minverhex = 0 --for i in xrange(0, 4): minverhex = (minverhex << 8) + minver[i] --sys.exit(sys.hexversion < minverhex)" -- if { echo "$as_me:$LINENO: $PYTHON -c "$prog"" >&5 -- ($PYTHON -c "$prog") >&5 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; then : -- { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 --$as_echo "yes" >&6; } --else -- as_fn_error $? "too old" "$LINENO" 5 --fi -- am_display_PYTHON=$PYTHON -- else -- # Otherwise, try each interpreter until we find one that satisfies -- # VERSION. -- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for a Python interpreter with version >= 2.3.5" >&5 --$as_echo_n "checking for a Python interpreter with version >= 2.3.5... " >&6; } --if ${am_cv_pathless_PYTHON+:} false; then : -- $as_echo_n "(cached) " >&6 --else -- -- for am_cv_pathless_PYTHON in python python2 python2.4 python2.3 python2.2 python2.1 python2.0 python1.6 python1.5 none; do -- test "$am_cv_pathless_PYTHON" = none && break -- prog="import sys, string --# split strings by '.' and convert to numeric. Append some zeros --# because we need at least 4 digits for the hex conversion. --minver = map(int, string.split('2.3.5', '.')) + [0, 0, 0] --minverhex = 0 --for i in xrange(0, 4): minverhex = (minverhex << 8) + minver[i] --sys.exit(sys.hexversion < minverhex)" -- if { echo "$as_me:$LINENO: $am_cv_pathless_PYTHON -c "$prog"" >&5 -- ($am_cv_pathless_PYTHON -c "$prog") >&5 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; then : -- break --fi -- done --fi --{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_pathless_PYTHON" >&5 --$as_echo "$am_cv_pathless_PYTHON" >&6; } -- # Set $PYTHON to the absolute path of $am_cv_pathless_PYTHON. -- if test "$am_cv_pathless_PYTHON" = none; then -- PYTHON=: -- else -- # Extract the first word of "$am_cv_pathless_PYTHON", so it can be a program name with args. --set dummy $am_cv_pathless_PYTHON; ac_word=$2 --{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 --$as_echo_n "checking for $ac_word... " >&6; } --if ${ac_cv_path_PYTHON+:} false; then : -- $as_echo_n "(cached) " >&6 --else -- case $PYTHON in -- [\\/]* | ?:[\\/]*) -- ac_cv_path_PYTHON="$PYTHON" # Let the user override the test with a path. -- ;; -- *) -- as_save_IFS=$IFS; IFS=$PATH_SEPARATOR --for as_dir in $PATH --do -- IFS=$as_save_IFS -- test -z "$as_dir" && as_dir=. -- for ac_exec_ext in '' $ac_executable_extensions; do -- if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then -- ac_cv_path_PYTHON="$as_dir/$ac_word$ac_exec_ext" -- $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 -- break 2 -- fi --done -- done --IFS=$as_save_IFS -- -- ;; --esac --fi --PYTHON=$ac_cv_path_PYTHON --if test -n "$PYTHON"; then -- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PYTHON" >&5 --$as_echo "$PYTHON" >&6; } --else -- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 --$as_echo "no" >&6; } --fi -- -- -- fi -- am_display_PYTHON=$am_cv_pathless_PYTHON -- fi -- -- -- if test "$PYTHON" = :; then -- as_fn_error $? "no suitable Python interpreter found" "$LINENO" 5 -- else -- -- -- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $am_display_PYTHON version" >&5 --$as_echo_n "checking for $am_display_PYTHON version... " >&6; } --if ${am_cv_python_version+:} false; then : -- $as_echo_n "(cached) " >&6 --else -- am_cv_python_version=`$PYTHON -c "import sys; print sys.version[:3]"` --fi --{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_python_version" >&5 --$as_echo "$am_cv_python_version" >&6; } -- PYTHON_VERSION=$am_cv_python_version -- -- -- -- PYTHON_PREFIX='${prefix}' -- -- PYTHON_EXEC_PREFIX='${exec_prefix}' -- -- -- -- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $am_display_PYTHON platform" >&5 --$as_echo_n "checking for $am_display_PYTHON platform... " >&6; } --if ${am_cv_python_platform+:} false; then : -- $as_echo_n "(cached) " >&6 --else -- am_cv_python_platform=`$PYTHON -c "import sys; print sys.platform"` --fi --{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_python_platform" >&5 --$as_echo "$am_cv_python_platform" >&6; } -- PYTHON_PLATFORM=$am_cv_python_platform -- -- -- -- -- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $am_display_PYTHON script directory" >&5 --$as_echo_n "checking for $am_display_PYTHON script directory... " >&6; } --if ${am_cv_python_pythondir+:} false; then : -- $as_echo_n "(cached) " >&6 --else -- am_cv_python_pythondir=`$PYTHON -c "from distutils import sysconfig; print sysconfig.get_python_lib(0,0,prefix='$PYTHON_PREFIX')" 2>/dev/null || -- echo "$PYTHON_PREFIX/lib/python$PYTHON_VERSION/site-packages"` --fi --{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_python_pythondir" >&5 --$as_echo "$am_cv_python_pythondir" >&6; } -- pythondir=$am_cv_python_pythondir -- -- -- -- pkgpythondir=\${pythondir}/$PACKAGE -- -- -- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $am_display_PYTHON extension module directory" >&5 --$as_echo_n "checking for $am_display_PYTHON extension module directory... " >&6; } --if ${am_cv_python_pyexecdir+:} false; then : -- $as_echo_n "(cached) " >&6 --else -- am_cv_python_pyexecdir=`$PYTHON -c "from distutils import sysconfig; print sysconfig.get_python_lib(1,0,prefix='$PYTHON_EXEC_PREFIX')" 2>/dev/null || -- echo "${PYTHON_EXEC_PREFIX}/lib/python${PYTHON_VERSION}/site-packages"` --fi --{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_python_pyexecdir" >&5 --$as_echo "$am_cv_python_pyexecdir" >&6; } -- pyexecdir=$am_cv_python_pyexecdir -- -- -- -- pkgpyexecdir=\${pyexecdir}/$PACKAGE -- -- -- -- fi -- -- -- --{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for headers required to compile python extensions" >&5 --$as_echo_n "checking for headers required to compile python extensions... " >&6; } --py_prefix=`$PYTHON -c "import sys; print sys.prefix"` --py_exec_prefix=`$PYTHON -c "import sys; print sys.exec_prefix"` --PYTHON_INCLUDES="-I${py_prefix}/include/python${PYTHON_VERSION}" --if test "$py_prefix" != "$py_exec_prefix"; then -- PYTHON_INCLUDES="$PYTHON_INCLUDES -I${py_exec_prefix}/include/python${PYTHON_VERSION}" --fi -- --save_CPPFLAGS="$CPPFLAGS" --CPPFLAGS="$CPPFLAGS $PYTHON_INCLUDES" --cat confdefs.h - <<_ACEOF >conftest.$ac_ext --/* end confdefs.h. */ --#include <Python.h> --_ACEOF --if ac_fn_c_try_cpp "$LINENO"; then : -- { $as_echo "$as_me:${as_lineno-$LINENO}: result: found" >&5 --$as_echo "found" >&6; } -- --else -- { $as_echo "$as_me:${as_lineno-$LINENO}: result: not found" >&5 --$as_echo "not found" >&6; } --as_fn_error $? "could not find Python headers" "$LINENO" 5 --fi --rm -f conftest.err conftest.i conftest.$ac_ext --CPPFLAGS="$save_CPPFLAGS" -- -- -- --pkg_failed=no --{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for APPINDICATOR_PYTHON" >&5 --$as_echo_n "checking for APPINDICATOR_PYTHON... " >&6; } -- --if test -n "$APPINDICATOR_PYTHON_CFLAGS"; then -- pkg_cv_APPINDICATOR_PYTHON_CFLAGS="$APPINDICATOR_PYTHON_CFLAGS" -- elif test -n "$PKG_CONFIG"; then -- if test -n "$PKG_CONFIG" && \ -- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \" -- pygtk-2.0 >= \$PYGTK_REQUIRED -- gtk+-2.0 >= \$GTK_REQUIRED_VERSION -- pygobject-2.0 >= \$PYGOBJECT_REQUIRED -- \""; } >&5 -- ($PKG_CONFIG --exists --print-errors " -- pygtk-2.0 >= $PYGTK_REQUIRED -- gtk+-2.0 >= $GTK_REQUIRED_VERSION -- pygobject-2.0 >= $PYGOBJECT_REQUIRED -- ") 2>&5 -- ac_status=$? -- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 -- test $ac_status = 0; }; then -- pkg_cv_APPINDICATOR_PYTHON_CFLAGS=`$PKG_CONFIG --cflags " -- pygtk-2.0 >= $PYGTK_REQUIRED -- gtk+-2.0 >= $GTK_REQUIRED_VERSION -- pygobject-2.0 >= $PYGOBJECT_REQUIRED -- " 2>/dev/null` -- test "x$?" != "x0" && pkg_failed=yes --else -- pkg_failed=yes --fi -- else -- pkg_failed=untried --fi --if test -n "$APPINDICATOR_PYTHON_LIBS"; then -- pkg_cv_APPINDICATOR_PYTHON_LIBS="$APPINDICATOR_PYTHON_LIBS" -- elif test -n "$PKG_CONFIG"; then -- if test -n "$PKG_CONFIG" && \ -- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \" -- pygtk-2.0 >= \$PYGTK_REQUIRED -- gtk+-2.0 >= \$GTK_REQUIRED_VERSION -- pygobject-2.0 >= \$PYGOBJECT_REQUIRED -- \""; } >&5 -- ($PKG_CONFIG --exists --print-errors " -- pygtk-2.0 >= $PYGTK_REQUIRED -- gtk+-2.0 >= $GTK_REQUIRED_VERSION -- pygobject-2.0 >= $PYGOBJECT_REQUIRED -- ") 2>&5 -- ac_status=$? -- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 -- test $ac_status = 0; }; then -- pkg_cv_APPINDICATOR_PYTHON_LIBS=`$PKG_CONFIG --libs " -- pygtk-2.0 >= $PYGTK_REQUIRED -- gtk+-2.0 >= $GTK_REQUIRED_VERSION -- pygobject-2.0 >= $PYGOBJECT_REQUIRED -- " 2>/dev/null` -- test "x$?" != "x0" && pkg_failed=yes --else -- pkg_failed=yes --fi -- else -- pkg_failed=untried --fi -- -- -- --if test $pkg_failed = yes; then -- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 --$as_echo "no" >&6; } -- --if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then -- _pkg_short_errors_supported=yes --else -- _pkg_short_errors_supported=no --fi -- if test $_pkg_short_errors_supported = yes; then -- APPINDICATOR_PYTHON_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs " -- pygtk-2.0 >= $PYGTK_REQUIRED -- gtk+-2.0 >= $GTK_REQUIRED_VERSION -- pygobject-2.0 >= $PYGOBJECT_REQUIRED -- " 2>&1` -- else -- APPINDICATOR_PYTHON_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs " -- pygtk-2.0 >= $PYGTK_REQUIRED -- gtk+-2.0 >= $GTK_REQUIRED_VERSION -- pygobject-2.0 >= $PYGOBJECT_REQUIRED -- " 2>&1` -- fi -- # Put the nasty error message in config.log where it belongs -- echo "$APPINDICATOR_PYTHON_PKG_ERRORS" >&5 -- -- as_fn_error $? "Package requirements ( -- pygtk-2.0 >= $PYGTK_REQUIRED -- gtk+-2.0 >= $GTK_REQUIRED_VERSION -- pygobject-2.0 >= $PYGOBJECT_REQUIRED -- ) were not met: -- --$APPINDICATOR_PYTHON_PKG_ERRORS -- --Consider adjusting the PKG_CONFIG_PATH environment variable if you --installed software in a non-standard prefix. -- --Alternatively, you may set the environment variables APPINDICATOR_PYTHON_CFLAGS --and APPINDICATOR_PYTHON_LIBS to avoid the need to call pkg-config. --See the pkg-config man page for more details." "$LINENO" 5 --elif test $pkg_failed = untried; then -- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 --$as_echo "no" >&6; } -- { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 --$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} --as_fn_error $? "The pkg-config script could not be found or is too old. Make sure it --is in your PATH or set the PKG_CONFIG environment variable to the full --path to pkg-config. -- --Alternatively, you may set the environment variables APPINDICATOR_PYTHON_CFLAGS --and APPINDICATOR_PYTHON_LIBS to avoid the need to call pkg-config. --See the pkg-config man page for more details. -- --To get pkg-config, see <http://pkg-config.freedesktop.org/>. --See \`config.log' for more details" "$LINENO" 5; } --else -- APPINDICATOR_PYTHON_CFLAGS=$pkg_cv_APPINDICATOR_PYTHON_CFLAGS -- APPINDICATOR_PYTHON_LIBS=$pkg_cv_APPINDICATOR_PYTHON_LIBS -- { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 --$as_echo "yes" >&6; } -- --fi -- --{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for pygtk defs" >&5 --$as_echo_n "checking for pygtk defs... " >&6; } --PYGTK_DEFSDIR=`$PKG_CONFIG --variable=defsdir pygtk-2.0` -- --{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $PYGTK_DEFSDIR" >&5 --$as_echo "$PYGTK_DEFSDIR" >&6; } -- --{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for pygtk codegen" >&5 --$as_echo_n "checking for pygtk codegen... " >&6; } --PYGTK_CODEGEN="$PYTHON `$PKG_CONFIG --variable=codegendir pygtk-2.0`/codegen.py" -- --{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $PYGTK_CODEGEN" >&5 --$as_echo "$PYGTK_CODEGEN" >&6; } - - ######################### - # Check if build tests -@@ -14358,7 +14001,7 @@ fi - # Files - ########################### - --ac_config_files="$ac_config_files Makefile src/Makefile src/appindicator-0.1.pc src/appindicator3-0.1.pc bindings/Makefile bindings/python/Makefile bindings/python/appindicator.override bindings/vala/Makefile bindings/vala/examples/Makefile tests/Makefile example/Makefile docs/Makefile docs/reference/Makefile docs/reference/version.xml docs/reference/libappindicator-docs.sgml" -+ac_config_files="$ac_config_files Makefile src/Makefile src/appindicator-0.1.pc src/appindicator3-0.1.pc bindings/Makefile bindings/vala/Makefile bindings/vala/examples/Makefile tests/Makefile example/Makefile docs/Makefile docs/reference/Makefile docs/reference/version.xml docs/reference/libappindicator-docs.sgml" - - - if test "x$has_mono" = "xtrue" ; then -@@ -15437,8 +15080,6 @@ do - "src/appindicator-0.1.pc") CONFIG_FILES="$CONFIG_FILES src/appindicator-0.1.pc" ;; - "src/appindicator3-0.1.pc") CONFIG_FILES="$CONFIG_FILES src/appindicator3-0.1.pc" ;; - "bindings/Makefile") CONFIG_FILES="$CONFIG_FILES bindings/Makefile" ;; -- "bindings/python/Makefile") CONFIG_FILES="$CONFIG_FILES bindings/python/Makefile" ;; -- "bindings/python/appindicator.override") CONFIG_FILES="$CONFIG_FILES bindings/python/appindicator.override" ;; - "bindings/vala/Makefile") CONFIG_FILES="$CONFIG_FILES bindings/vala/Makefile" ;; - "bindings/vala/examples/Makefile") CONFIG_FILES="$CONFIG_FILES bindings/vala/examples/Makefile" ;; - "tests/Makefile") CONFIG_FILES="$CONFIG_FILES tests/Makefile" ;; -diff --git a/configure.ac b/configure.ac -index ee03390..4713b22 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -181,33 +181,6 @@ AM_CONDITIONAL(BUILD_MONO_TEST, test x${have_nunit} = xyes) - with_localinstall="no" - AC_ARG_ENABLE(localinstall, AS_HELP_STRING([--enable-localinstall], [install all of the files localy instead of system directories (for distcheck)]), with_localinstall=$enableval, with_localinstall=no) - --########################### --# Python --########################### -- --PYGTK_REQUIRED=2.14.0 --PYGOBJECT_REQUIRED=0.22 -- --AM_PATH_PYTHON(2.3.5) --AM_CHECK_PYTHON_HEADERS(,[AC_MSG_ERROR(could not find Python headers)]) -- --PKG_CHECK_MODULES(APPINDICATOR_PYTHON, -- [ -- pygtk-2.0 >= $PYGTK_REQUIRED -- gtk+-2.0 >= $GTK_REQUIRED_VERSION -- pygobject-2.0 >= $PYGOBJECT_REQUIRED -- ]) -- --AC_MSG_CHECKING(for pygtk defs) --PYGTK_DEFSDIR=`$PKG_CONFIG --variable=defsdir pygtk-2.0` --AC_SUBST(PYGTK_DEFSDIR) --AC_MSG_RESULT($PYGTK_DEFSDIR) -- --AC_MSG_CHECKING(for pygtk codegen) --PYGTK_CODEGEN="$PYTHON `$PKG_CONFIG --variable=codegendir pygtk-2.0`/codegen.py" --AC_SUBST(PYGTK_CODEGEN) --AC_MSG_RESULT($PYGTK_CODEGEN) -- - ######################### - # Check if build tests - ######################### -@@ -239,8 +212,6 @@ src/Makefile - src/appindicator-0.1.pc - src/appindicator3-0.1.pc - bindings/Makefile --bindings/python/Makefile --bindings/python/appindicator.override - bindings/vala/Makefile - bindings/vala/examples/Makefile - tests/Makefile \ No newline at end of file ===================================== flatpak/org.gajim.Gajim.Devel.yaml ===================================== @@ -0,0 +1,331 @@ +app-id: org.gajim.Gajim.Devel +runtime: org.gnome.Platform +runtime-version: '42' +sdk: org.gnome.Sdk +command: gajim-devel +tags: + - devel + - development + - nightly +rename-icon: org.gajim.Gajim +rename-desktop-file: org.gajim.Gajim.desktop +rename-appdata-file: org.gajim.Gajim.appdata.xml +finish-args: + - --share=ipc + - --share=network + - --socket=fallback-x11 + - --socket=wayland + - --socket=pulseaudio + - --system-talk-name=org.freedesktop.GeoClue2 + - --system-talk-name=org.freedesktop.login1 + - --talk-name=org.mpris.MediaPlayer2.* + # Automatic status + - --talk-name=org.freedesktop.ScreenSaver + - --talk-name=org.gnome.Mutter.IdleMonitor + # Keyring + - --talk-name=org.freedesktop.secrets + - --talk-name=org.kde.kwalletd5 + # GnuPG + - --filesystem=~/.gnupg + # camera access + - --device=all + # extensions + - --env=PYTHONPATH=/app/plugins/site-packages + - --env=GI_TYPELIB_PATH=/app/lib/girepository-1.0:/app/plugins/lib/girepository-1.0 + +add-extensions: + org.gajim.Gajim.Devel.Plugin: + directory: plugins + merge-dirs: lib;site-packages + add-ld-path: lib + subdirectories: true + no-autodownload: true + autodelete: true + +build-options: + env: + PIP_PREFIX: /app + +cleanup: + - /include + - /lib/debug + - /lib/pkgconfig + - /share/gtk-doc + - /share/man + - '*.a' + - '*.la' + +modules: + - shared-modules/libappindicator/libappindicator-gtk3-introspection-12.10.json + + - name: python3-pyparsing + buildsystem: simple + build-commands: + - pip3 install pyparsing-3.0.7-py3-none-any.whl + sources: + - type: file + url: https://files.pythonhosted.org/packages/py3/p/pyparsing/pyparsing-3.0.7-py3… + sha256: a6c06a88f252e6c322f65faf8f418b16213b51bdfaece0524c1c1bc30c63c484 + + - name: python3-packaging + buildsystem: simple + build-commands: + - pip3 install packaging-21.3-py3-none-any.whl + sources: + - type: file + url: https://files.pythonhosted.org/packages/py3/p/packaging/packaging-21.3-py3-… + sha256: ef103e05f519cdc783ae24ea4e2e0f508a9c99b2d4969652eed6a2e1ea5bd522 + + - name: python3-pycparser + buildsystem: simple + build-commands: + - pip3 install pycparser-2.21-py2.py3-none-any.whl + sources: + - type: file + url: https://files.pythonhosted.org/packages/py2.py3/p/pycparser/pycparser-2.21-… + sha256: 8ee45429555515e1f6b185e78100aea234072576aa43ab53aefcae078162fca9 + + - name: python3-cffi + buildsystem: simple + build-commands: + - pip3 install . + sources: + - type: archive + url: https://files.pythonhosted.org/packages/source/c/cffi/cffi-1.15.0.tar.gz + sha256: 920f0d66a896c2d99f0adbb391f990a84091179542c205fa53ce5787aff87954 + + - name: python3-asn1crypto + buildsystem: simple + build-commands: + - pip3 install asn1crypto-1.5.1-py2.py3-none-any.whl + sources: + - type: file + url: https://files.pythonhosted.org/packages/py2.py3/a/asn1crypto/asn1crypto-1.5… + sha256: db4e40728b728508912cbb3d44f19ce188f218e9eba635821bb4b68564f8fd67 + + - name: python3-idna + buildsystem: simple + build-commands: + - pip3 install idna-3.3-py3-none-any.whl + sources: + - type: file + url: https://files.pythonhosted.org/packages/py3/i/idna/idna-3.3-py3-none-any.whl + sha256: 84d9dd047ffa80596e0f246e2eab0b391788b0503584e8945f2368256d2735ff + + - name: python3-cryptography + buildsystem: simple + only-arches: + - aarch64 + build-commands: + - pip3 install cryptography-36.0.2-cp36-abi3-manylinux_2_17_aarch64.manylinux2014_aarch64.whl + sources: + - type: file + url: https://files.pythonhosted.org/packages/cp36/c/cryptography/cryptography-36… + sha256: 8241cac0aae90b82d6b5c443b853723bcc66963970c67e56e71a2609dc4b5eaf + + - name: python3-cryptography + buildsystem: simple + only-arches: + - x86_64 + build-commands: + - pip3 install cryptography-36.0.2-cp36-abi3-manylinux_2_17_x86_64.manylinux2014_x86_64.whl + sources: + - type: file + url: https://files.pythonhosted.org/packages/cp36/c/cryptography/cryptography-36… + sha256: 7b2d54e787a884ffc6e187262823b6feb06c338084bbe80d45166a1cb1c6c5bf + + - name: python3-pyopenssl + buildsystem: simple + build-commands: + - pip3 install pyOpenSSL-22.0.0-py2.py3-none-any.whl + sources: + - type: file + url: https://files.pythonhosted.org/packages/py2.py3/p/pyOpenSSL/pyOpenSSL-22.0.… + sha256: ea252b38c87425b64116f808355e8da644ef9b07e429398bfece610f893ee2e0 + + - name: python3-dbus-python + build-options: + env: + PYTHON_VERSION: '3' + sources: + - type: archive + url: https://files.pythonhosted.org/packages/source/d/dbus-python/dbus-python-1.… + sha256: 92bdd1e68b45596c833307a5ff4b217ee6929a1502f5341bae28fd120acf7260 + + - name: python3-jeepney + buildsystem: simple + build-commands: + - pip3 install jeepney-0.7.1-py3-none-any.whl + sources: + - type: file + url: https://files.pythonhosted.org/packages/py3/j/jeepney/jeepney-0.7.1-py3-non… + sha256: 1b5a0ea5c0e7b166b2f5895b91a08c14de8915afda4407fb5022a195224958ac + + - name: python3-secretstorage + buildsystem: simple + build-commands: + - pip3 install SecretStorage-3.3.1-py3-none-any.whl + sources: + - type: file + url: https://files.pythonhosted.org/packages/py3/S/SecretStorage/SecretStorage-3… + sha256: 422d82c36172d88d6a0ed5afdec956514b189ddbfb72fefab0c8a1cee4eaf71f + + - name: python3-zipp + buildsystem: simple + build-commands: + - pip3 install zipp-3.7.0-py3-none-any.whl + sources: + - type: file + url: https://files.pythonhosted.org/packages/py3/z/zipp/zipp-3.7.0-py3-none-any.… + sha256: b47250dd24f92b7dd6a0a8fc5244da14608f3ca90a5efcd37a3b1642fac9a375 + + # keyring dependency + - name: python3-importlib-metadata + buildsystem: simple + build-commands: + - pip3 install importlib_metadata-4.11.3-py3-none-any.whl + cleanup: + - /bin + sources: + - type: file + url: https://files.pythonhosted.org/packages/py3/i/importlib_metadata/importlib_… + sha256: 1208431ca90a8cca1a6b8af391bb53c1a2db74e5d1cef6ddced95d4b2062edc6 + + - name: python3-keyring + buildsystem: simple + build-commands: + - pip3 install keyring-23.5.0-py3-none-any.whl + cleanup: + - /bin + sources: + - type: file + url: https://files.pythonhosted.org/packages/py3/k/keyring/keyring-23.5.0-py3-no… + sha256: b0d28928ac3ec8e42ef4cc227822647a19f1d544f21f96457965dc01cf555261 + + - name: python3-css-parser + buildsystem: simple + build-commands: + - pip3 install css_parser-1.0.7-py2.py3-none-any.whl + sources: + - type: file + url: https://files.pythonhosted.org/packages/py2.py3/c/css_parser/css_parser-1.0… + sha256: de7018ec9d3f20f7d692973c37f22ae9a22123c60c77b11849363f47ef6f3387 + + - name: python3-precis_i18n + buildsystem: simple + build-commands: + - pip3 install precis_i18n-1.0.4-py3-none-any.whl + sources: + - type: file + url: https://files.pythonhosted.org/packages/py3/p/precis_i18n/precis_i18n-1.0.4… + sha256: 8b4f6100c2f5e44db61081d53c9c07ff92e50d0a7b36eedd2f4fb7d40c48576d + + # gssapi dependency + - name: python3-decorator + buildsystem: simple + build-commands: + - pip3 install decorator-5.1.1-py3-none-any.whl + sources: + - type: file + url: https://files.pythonhosted.org/packages/py3/d/decorator/decorator-5.1.1-py3… + sha256: b8c3f85900b9dc423225913c5aace94729fe1fa9763b38939a95226f02d37186 + + - name: python3-gssapi + buildsystem: simple + build-commands: + - pip3 install . + sources: + - type: archive + url: https://files.pythonhosted.org/packages/source/g/gssapi/gssapi-1.7.3.tar.gz + sha256: c69b9f633a0c03c1b84ba14c73b0ec132f6323056e675702c1a5f75f316e06fb + + # GSound dependency + - shared-modules/libcanberra/libcanberra.json + + - name: gsound + buildsystem: meson + sources: + - type: archive + url: https://download.gnome.org/sources/gsound/1.0/gsound-1.0.3.tar.xz + sha256: ca2d039e1ebd148647017a7f548862350bc9af01986d39f10cfdc8e95f07881a + + - name: gspell + cleanup: + - /bin + sources: + - type: archive + url: https://download.gnome.org/sources/gspell/1.8/gspell-1.8.4.tar.xz + sha256: cf4d16a716e813449bd631405dc1001ea89537b8cdae2b8abfb3999212bd43b4 + + - name: farstream + rm-configure: true + sources: + - type: archive + url: https://freedesktop.org/software/farstream/releases/farstream/farstream-0.2… + sha256: cb7d112433cf7c2e37a8ec918fb24f0ea5cb293cfa1002488e431de26482f47b + - type: patch + path: farstream-make-4.3.patch + + - name: python3-pillow + buildsystem: simple + build-commands: + - pip3 install . + sources: + - type: archive + url: https://files.pythonhosted.org/packages/source/p/pillow/Pillow-9.0.1.tar.gz + sha256: 6c8bc8238a7dfdaf7a75f5ec5a663f4173f8c367e5a39f87e720495e1eed75fa + + # sentry-sdk dependency + - name: python3-urllib3 + buildsystem: simple + build-commands: + - pip3 install urllib3-1.26.9-py2.py3-none-any.whl + sources: + - type: file + url: https://files.pythonhosted.org/packages/py2.py3/u/urllib3/urllib3-1.26.9-py… + sha256: 44ece4d53fb1706f667c9bd1c648f5469a2ec925fcf3a776667042d645472c14 + + - name: python3-certifi + buildsystem: simple + build-commands: + - pip3 install certifi-2021.10.8-py2.py3-none-any.whl + sources: + - type: file + url: https://files.pythonhosted.org/packages/py2.py3/c/certifi/certifi-2021.10.8… + sha256: d62a0163eb4c2344ac042ab2bdf75399a71a2d8c7d47eac2e2ee91b9d6339569 + + - name: python3-sentry-sdk + buildsystem: simple + build-commands: + - pip3 install sentry_sdk-1.5.8-py2.py3-none-any.whl + sources: + - type: file + url: https://files.pythonhosted.org/packages/py2.py3/s/sentry_sdk/sentry_sdk-1.5… + sha256: 32af1a57954576709242beb8c373b3dbde346ac6bd616921def29d68846fb8c3 + + - name: python3-nbxmpp + buildsystem: simple + build-commands: + - pip3 install . + sources: + - type: git + url: https://dev.gajim.org/gajim/python-nbxmpp.git + + - name: gajim + buildsystem: simple + build-commands: + - pip3 install . + - touch /app/share/run-as-flatpak + - echo -e '#!/bin/sh\ngajim --gapplication-app-id=org.gajim.Gajim.Devel "$@"' > /app/bin/gajim-devel + - chmod 755 /app/bin/gajim-devel + sources: + - type: git + url: https://dev.gajim.org/gajim/gajim.git + - type: shell + commands: + - sed -i "s+<id>org.gajim.Gajim</id>+<id>org.gajim.Gajim.Devel</id>+" data/org.gajim.Gajim.appdata.xml.in + - sed -i "s+<name>Gajim</name>+<name>Gajim (Nightly)</name>+" data/org.gajim.Gajim.appdata.xml.in + - sed -i "s+Exec=gajim+Exec=gajim-devel+" data/org.gajim.Gajim.desktop.in + - mv gajim/data/icons/hicolor/scalable/apps/org.gajim.Gajim{.Devel,}.svg + post-install: + - install -d /app/plugins ===================================== flatpak/org.gajim.Gajim.yaml ===================================== @@ -1,15 +1,8 @@ -app-id: org.gajim.Gajim.Devel +app-id: org.gajim.Gajim runtime: org.gnome.Platform runtime-version: '42' sdk: org.gnome.Sdk -command: gajim-devel -tags: - - devel - - development - - nightly -rename-icon: org.gajim.Gajim -rename-desktop-file: org.gajim.Gajim.desktop -rename-appdata-file: org.gajim.Gajim.appdata.xml +command: gajim finish-args: - --share=ipc - --share=network @@ -34,7 +27,7 @@ finish-args: - --env=GI_TYPELIB_PATH=/app/lib/girepository-1.0:/app/plugins/lib/girepository-1.0 add-extensions: - org.gajim.Gajim.Devel.Plugin: + org.gajim.Gajim.Plugin: directory: plugins merge-dirs: lib;site-packages add-ld-path: lib @@ -56,7 +49,7 @@ cleanup: - '*.la' modules: - - modules/libappindicator/libappindicator-gtk3-introspection-12.10.json + - shared-modules/libappindicator/libappindicator-gtk3-introspection-12.10.json - name: python3-pyparsing buildsystem: simple @@ -240,15 +233,7 @@ modules: sha256: c69b9f633a0c03c1b84ba14c73b0ec132f6323056e675702c1a5f75f316e06fb # GSound dependency - - name: libcanberra - sources: - - type: archive - url: http://0pointer.de/lennart/projects/libcanberra/libcanberra-0.30.tar.xz - sha256: c2b671e67e0c288a69fc33dc1b6f1b534d07882c2aceed37004bf48c601afa72 - config-opts: - - "--disable-alsa" - - "--disable-null" - - "--disable-oss" + - shared-modules/libcanberra/libcanberra.json - name: gsound buildsystem: meson @@ -266,11 +251,11 @@ modules: sha256: cf4d16a716e813449bd631405dc1001ea89537b8cdae2b8abfb3999212bd43b4 - name: farstream + rm-configure: true sources: - - type: git - url: https://gitlab.freedesktop.org/farstream/farstream.git - tag: 0.2.9 - commit: 1e42278d11730f8409878e3b4904fdd47e360e6f + - type: archive + url: https://freedesktop.org/software/farstream/releases/farstream/farstream-0.2… + sha256: cb7d112433cf7c2e37a8ec918fb24f0ea5cb293cfa1002488e431de26482f47b - type: patch path: farstream-make-4.3.patch @@ -314,26 +299,21 @@ modules: - name: python3-nbxmpp buildsystem: simple build-commands: - - pip3 install . + - pip3 install nbxmpp-2.0.6-py3-none-any.whl sources: - - type: git - url: https://dev.gajim.org/gajim/python-nbxmpp.git + - type: file + url: https://files.pythonhosted.org/packages/py3/n/nbxmpp/nbxmpp-2.0.6-py3-none-… + sha256: 6abbd51538d44bf6b004f140e1453f9a21f1fb53dfeed498a31519d2167e6b92 - name: gajim buildsystem: simple build-commands: - pip3 install . - touch /app/share/run-as-flatpak - - echo -e '#!/bin/sh\ngajim --gapplication-app-id=org.gajim.Gajim.Devel "$@"' > /app/bin/gajim-devel - - chmod 755 /app/bin/gajim-devel sources: - type: git url: https://dev.gajim.org/gajim/gajim.git - - type: shell - commands: - - sed -i "s+<id>org.gajim.Gajim</id>+<id>org.gajim.Gajim.Devel</id>+" data/org.gajim.Gajim.appdata.xml.in - - sed -i "s+<name>Gajim</name>+<name>Gajim (Nightly)</name>+" data/org.gajim.Gajim.appdata.xml.in - - sed -i "s+Exec=gajim+Exec=gajim-devel+" data/org.gajim.Gajim.desktop.in - - mv gajim/data/icons/hicolor/scalable/apps/org.gajim.Gajim{.Devel,}.svg + tag: gajim-1.3.3 + commit: b5b2ad4aee92074184b181ec97fbf1f900d5f4fb post-install: - install -d /app/plugins ===================================== flatpak/shared-modules ===================================== @@ -0,0 +1 @@ +Subproject commit 39152375ffaa13de4d1e5d0fe97120ddcb1e30c6 ===================================== flatpak/update_flatpak_repo.sh ===================================== @@ -9,7 +9,7 @@ flatpak-builder \ --disable-rofiles-fuse \ --force-clean gajim-fp \ --gpg-sign=9FDE1F4FA30E8019342B36279A569BF2B79EE905 \ - --repo=/home/ftp/flatpak/ flatpak/org.gajim.Gajim.yaml &> /tmp/flatpak_build + --repo=/home/ftp/flatpak/ flatpak/org.gajim.Gajim.Devel.yaml &> /tmp/flatpak_build cd ../gajim-plugins View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/e4890d1c4e27d01ce672245611138cd… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/e4890d1c4e27d01ce672245611138cd… You're receiving this email because of your account on dev.gajim.org.

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

Commits