André pushed to branch master at gajim / gajim
Commits: dd54d955 by André Apitzsch at 2021-12-05T13:34:28+01:00 Flatpak: Update dependency dbus-glib - - - - - 4 changed files: - flatpak/modules/dbus-glib/dbus-glib-0.110.json → 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-gtk3-introspection-12.10.json Changes: ===================================== flatpak/modules/dbus-glib/dbus-glib-0.110.json → flatpak/modules/dbus-glib/dbus-glib.json ===================================== @@ -16,8 +16,8 @@ "sources": [ { "type": "archive", - "url": "https://dbus.freedesktop.org/releases/dbus-glib/dbus-glib-0.110.tar.gz", - "sha256": "7ce4760cf66c69148f6bd6c92feaabb8812dee30846b24cd0f7395c436d7e825" + "url": "https://dbus.freedesktop.org/releases/dbus-glib/dbus-glib-0.112.tar.gz", + "sha256": "7d550dccdfcd286e33895501829ed971eeb65c614e73aadb4a08aeef719b143a" } ] } ===================================== flatpak/modules/intltool/intltool-0.51.json ===================================== @@ -6,6 +6,10 @@ "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 ===================================== @@ -0,0 +1,59 @@ +Description: Escape "{", to prevent complaints from perl 5.22 and 5.26 +Author: Roderich Schupp <roderich.sch...@gmail.com> +Author: gregor herrmann <gre...@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-gtk3-introspection-12.10.json ===================================== @@ -1,7 +1,8 @@ { "name": "libappindicator", "build-options": { - "cflags": "-Wno-error" + "cflags": "-Wno-error", + "make-args": [ "-j1" ] }, "rm-configure": true, "config-opts": [ @@ -49,7 +50,7 @@ ], "modules": [ "../intltool/intltool-0.51.json", - "../dbus-glib/dbus-glib-0.110.json", + "../dbus-glib/dbus-glib.json", { "name": "libdbusmenu", "build-options": { View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/dd54d955188969fe1324a55367369580175450e0 -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/dd54d955188969fe1324a55367369580175450e0 You're receiving this email because of your account on dev.gajim.org.
_______________________________________________ Commits mailing list Commits@gajim.org https://lists.gajim.org/cgi-bin/listinfo/commits