diff --git a/helpers/DATA/ayatana-indicator-sound/fix_volume_change_notification.patch b/helpers/DATA/ayatana-indicator-sound/fix_volume_change_notification.patch deleted file mode 100644 index 92b6259..0000000 --- a/helpers/DATA/ayatana-indicator-sound/fix_volume_change_notification.patch +++ /dev/null @@ -1,214 +0,0 @@ -Patch based on https://github.com/AyatanaIndicators/ayatana-indicator-sound/pull/92 -For Trisquel 11.0, Aramo - ayatana-indicator-sound - 22.2.0-2 - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index ac370b2..095c953 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -1,5 +1,5 @@ --project(ayatana-indicator-sound C CXX) --cmake_minimum_required(VERSION 3.13) -+cmake_minimum_required (VERSION 3.13) -+project (ayatana-indicator-sound VERSION 22.2.0 LANGUAGES C CXX) - - if(CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT) - SET(CMAKE_INSTALL_PREFIX "/usr" CACHE PATH "..." FORCE) -@@ -7,8 +7,6 @@ endif(CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT) - - set(CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/cmake" "${CMAKE_MODULE_PATH}") - --set(PACKAGE ${CMAKE_PROJECT_NAME}) --set(PROJECT_VERSION 22.2.0) - find_package(PkgConfig REQUIRED) - include(GNUInstallDirs) - include(UseVala) -diff --git a/src/info-notification.vala b/src/info-notification.vala -index ce92a2a..3a36e52 100644 ---- a/src/info-notification.vala -+++ b/src/info-notification.vala -@@ -1,6 +1,6 @@ - /* - * Copyright 2015 Canonical Ltd. -- * Copyright 2021 Robert Tari -+ * Copyright 2021-2023 Robert Tari - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by -@@ -30,22 +30,26 @@ public class IndicatorSound.InfoNotification: Notification - public void show (VolumeControl.ActiveOutput active_output, - double volume, - bool is_high_volume) { -- if (!notify_server_supports ("x-canonical-private-synchronous")) -- return; - - /* Determine Label */ -- unowned string volume_label = get_notification_label (active_output); -+ string volume_label = get_notification_label (active_output); - - /* Choose an icon */ - unowned string icon = get_volume_notification_icon (active_output, volume, is_high_volume); - - /* Reset the notification */ - var n = _notification; -+ -+ uint nChars = ((int32)((volume * 20) + 0.5)).clamp(0, 20); -+ volume_label += "\n"; -+ -+ for (uint nChar = 0; nChar < nChars; nChar++) -+ { -+ volume_label += "◼"; -+ } -+ - n.update (_("Volume"), volume_label, icon); - n.clear_hints(); -- n.set_hint ("x-lomiri-non-shaped-icon", "true"); -- n.set_hint ("x-canonical-private-synchronous", "true"); -- n.set_hint ("x-lomiri-value-bar-tint", is_high_volume ? "true" : "false"); - n.set_hint ("value", ((int32)((volume * 100.0) + 0.5)).clamp(0, 100)); - show_notification (); - } -diff --git a/src/warn-notification.vala b/src/warn-notification.vala -index 6a08431..203758e 100644 ---- a/src/warn-notification.vala -+++ b/src/warn-notification.vala -@@ -1,5 +1,6 @@ - /* - * Copyright 2015 Canonical Ltd. -+ * Copyright 2021-2023 Robert Tari - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by -@@ -15,6 +16,7 @@ - * - * Authors: - * Charles Kerr -+ * Robert Tari - */ - - public class IndicatorSound.WarnNotification: Notification -@@ -31,9 +33,6 @@ public class IndicatorSound.WarnNotification: Notification - _("Volume"), - _("Allow volume above safe level?\nHigh volume can damage your hearing."), - "audio-volume-high"); -- n.set_hint ("x-lomiri-non-shaped-icon", "true"); -- n.set_hint ("x-lomiri-snap-decisions", "true"); -- n.set_hint ("x-lomiri-private-affirmative-tint", "true"); - n.closed.connect ((n) => { - n.clear_actions (); - }); -diff --git a/tests/integration/indicator-sound-test-base.cpp b/tests/integration/indicator-sound-test-base.cpp -index 3ecd856..eb4ee8c 100644 ---- a/tests/integration/indicator-sound-test-base.cpp -+++ b/tests/integration/indicator-sound-test-base.cpp -@@ -1,6 +1,6 @@ - /* - * Copyright 2015 Canonical Ltd. -- * Copyright 2021 Robert Tari -+ * Copyright 2021-2023 Robert Tari - * - * This program is free software: you can redistribute it and/or modify it - * under the terms of the GNU General Public License version 3, as published -@@ -72,7 +72,7 @@ void IndicatorSoundTestBase::SetUp() - "GetCapabilities", - "", - "as", -- "ret = ['actions', 'body', 'body-markup', 'icon-static', 'image/svg+xml', 'x-canonical-private-synchronous', 'x-canonical-append', 'x-canonical-private-icon-only', 'x-canonical-truncation', 'private-synchronous', 'append', 'private-icon-only', 'truncation']" -+ "ret = ['actions', 'body', 'body-markup', 'icon-static', 'image/svg+xml', 'private-synchronous', 'append', 'private-icon-only', 'truncation']" - ).waitForFinished(); - - int waitedTime = 0; -@@ -647,14 +647,8 @@ void IndicatorSoundTestBase::checkVolumeNotification(double volume, QString cons - QVariantMap hints; - ASSERT_TRUE(qDBusArgumentToMap(args.at(6), hints)); - ASSERT_TRUE(hints.contains("value")); -- ASSERT_TRUE(hints.contains("x-lomiri-non-shaped-icon")); -- ASSERT_TRUE(hints.contains("x-lomiri-value-bar-tint")); -- ASSERT_TRUE(hints.contains("x-canonical-private-synchronous")); - - EXPECT_EQ(volume*100, hints["value"]); -- EXPECT_EQ(true, hints["x-lomiri-non-shaped-icon"]); -- EXPECT_EQ(isLoud, hints["x-lomiri-value-bar-tint"]); -- EXPECT_EQ(true, hints["x-canonical-private-synchronous"]); - } - - void IndicatorSoundTestBase::checkHighVolumeNotification(QVariantList call) -diff --git a/tests/notifications-mock.h b/tests/notifications-mock.h -index 49b2e66..3ae8da5 100644 ---- a/tests/notifications-mock.h -+++ b/tests/notifications-mock.h -@@ -1,6 +1,6 @@ - /* - * Copyright 2015 Canonical Ltd. -- * Copyright 2021 Robert Tari -+ * Copyright 2021-2023 Robert Tari - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by -@@ -31,7 +31,7 @@ class NotificationsMock - DbusTestDbusMockObject * baseobj = nullptr; - - public: -- NotificationsMock (const std::vector& capabilities = {"actions", "body", "body-markup", "icon-static", "image/svg+xml", "x-canonical-private-synchronous", "x-canonical-append", "x-canonical-private-icon-only", "x-canonical-truncation", "private-synchronous", "append", "private-icon-only", "truncation"}) { -+ NotificationsMock (const std::vector& capabilities = {"actions", "body", "body-markup", "icon-static", "image/svg+xml", "private-synchronous", "append", "private-icon-only", "truncation"}) { - mock = dbus_test_dbus_mock_new("org.freedesktop.Notifications"); - dbus_test_task_set_bus(DBUS_TEST_TASK(mock), DBUS_TEST_SERVICE_BUS_SESSION); - dbus_test_task_set_name(DBUS_TEST_TASK(mock), "Notify"); -diff --git a/tests/notifications-test.cc b/tests/notifications-test.cc -index a9fa55d..92f4672 100644 ---- a/tests/notifications-test.cc -+++ b/tests/notifications-test.cc -@@ -1,6 +1,6 @@ - /* - * Copyright 2015-2016 Canonical Ltd. -- * Copyright 2021 Robert Tari -+ * Copyright 2021-2023 Robert Tari - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by -@@ -259,7 +259,6 @@ TEST_F(NotificationsTest, VolumeChanges) { - EXPECT_EQ("ayatana-indicator-sound", notev[0].app_name); - EXPECT_EQ("Volume", notev[0].summary); - EXPECT_EQ(0, notev[0].actions.size()); -- EXPECT_GVARIANT_EQ("@s 'true'", notev[0].hints["x-canonical-private-synchronous"]); - EXPECT_GVARIANT_EQ("@i 50", notev[0].hints["value"]); - - /* Set a different volume */ -@@ -432,7 +431,6 @@ TEST_F(NotificationsTest, DISABLED_HighVolume) { - ASSERT_EQ(1, notev.size()); - EXPECT_EQ("Volume", notev[0].summary); - EXPECT_EQ("Speakers", notev[0].body); -- EXPECT_GVARIANT_EQ("@s 'false'", notev[0].hints["x-lomiri-value-bar-tint"]); - - /* Set high volume with volume change */ - notifications->clearNotifications(); -@@ -443,7 +441,6 @@ TEST_F(NotificationsTest, DISABLED_HighVolume) { - ASSERT_LT(0, notev.size()); /* This passes with one or two since it would just be an update to the first if a second was sent */ - EXPECT_EQ("Volume", notev[0].summary); - EXPECT_EQ("Speakers", notev[0].body); -- EXPECT_GVARIANT_EQ("@s 'true'", notev[0].hints["x-lomiri-value-bar-tint"]); - - /* Move it back */ - volume_warning_mock_set_high_volume(VOLUME_WARNING_MOCK(volumeWarning.get()), false); -@@ -513,7 +510,6 @@ TEST_F(NotificationsTest, DISABLED_ExtendendVolumeNotification) { - EXPECT_EQ("ayatana-indicator-sound", notev[0].app_name); - EXPECT_EQ("Volume", notev[0].summary); - EXPECT_EQ(0, notev[0].actions.size()); -- EXPECT_GVARIANT_EQ("@s 'true'", notev[0].hints["x-canonical-private-synchronous"]); - EXPECT_GVARIANT_EQ("@i 50", notev[0].hints["value"]); - - /* Allow an amplified volume */ -@@ -628,14 +624,10 @@ TEST_F(NotificationsTest, DISABLED_TriggerWarning) { - if (warning_expected) { - EXPECT_TRUE(volume_warning_get_active(volumeWarning.get())); - ASSERT_EQ(1, notev.size()); -- EXPECT_GVARIANT_EQ("@s 'true'", notev[0].hints["x-lomiri-snap-decisions"]); -- EXPECT_GVARIANT_EQ(nullptr, notev[0].hints["x-canonical-private-synchronous"]); - } - else { - EXPECT_FALSE(volume_warning_get_active(volumeWarning.get())); - ASSERT_EQ(1, notev.size()); -- EXPECT_GVARIANT_EQ(nullptr, notev[0].hints["x-lomiri-snap-decisions"]); -- EXPECT_GVARIANT_EQ("@s 'true'", notev[0].hints["x-canonical-private-synchronous"]); - } - - } // multimedia_active diff --git a/helpers/DATA/cwidget/0002-Fix-cwidget-and-aptitude-FTBFS.patch b/helpers/DATA/cwidget/0002-Fix-cwidget-and-aptitude-FTBFS.patch deleted file mode 100644 index 7614cb8..0000000 --- a/helpers/DATA/cwidget/0002-Fix-cwidget-and-aptitude-FTBFS.patch +++ /dev/null @@ -1,16 +0,0 @@ -Description: Fix FTBFS in cwidget as well as in aptitude due to missing #include -Author: Paul Wise -Reviewed-By: Axel Beckert -Bug-Debian: https://bugs.debian.org/1015925 -Bug: https://bugs.debian.org/1015925 - ---- a/src/cwidget/generic/threads/threads.h -+++ b/src/cwidget/generic/threads/threads.h -@@ -26,6 +26,7 @@ - #define THREADS_H - - #include -+#include - #include - - namespace cwidget diff --git a/helpers/DATA/gnome-shell/drop_gnome-shell-overrides-migration.patch b/helpers/DATA/gnome-shell/drop_gnome-shell-overrides-migration.patch deleted file mode 100644 index 7188f72..0000000 --- a/helpers/DATA/gnome-shell/drop_gnome-shell-overrides-migration.patch +++ /dev/null @@ -1,127 +0,0 @@ -From a9e6e44ef898671229388938cc3ed511fa394dfc Mon Sep 17 00:00:00 2001 -From: Philip Withnall -Date: Mon, 23 Jan 2023 16:38:36 +0000 -Subject: [PATCH] tools: Drop gnome-shell-overrides-migration.sh -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -The tool was added in 2018 to migrate to per-desktop overrides from the -old overrides system. - -5 years later, everyone who’s going to migrate probably has migrated, so -we can delete the script and remove a process running on every login. - -Signed-off-by: Philip Withnall -Part-of: ---- - ...gnome-shell-overrides-migration.desktop.in | 5 --- - data/meson.build | 9 ----- - meson.build | 1 - - tools/gnome-shell-overrides-migration.sh | 38 ------------------- - tools/meson.build | 4 -- - 5 files changed, 57 deletions(-) - delete mode 100644 data/gnome-shell-overrides-migration.desktop.in - delete mode 100755 tools/gnome-shell-overrides-migration.sh - delete mode 100644 tools/meson.build - -diff --git a/data/gnome-shell-overrides-migration.desktop.in b/data/gnome-shell-overrides-migration.desktop.in -deleted file mode 100644 -index 99452e6ec1..0000000000 ---- a/data/gnome-shell-overrides-migration.desktop.in -+++ /dev/null -@@ -1,5 +0,0 @@ --[Desktop Entry] --Type=Application --Name=GNOME settings overrides migration --NoDisplay=true --Exec=@libexecdir@/gnome-shell-overrides-migration.sh -diff --git a/data/meson.build b/data/meson.build -index 7fa7f15ffb..a31efcc794 100644 ---- a/data/meson.build -+++ b/data/meson.build -@@ -99,15 +99,6 @@ schema = configure_file( - ) - install_data('00_org.gnome.shell.gschema.override', install_dir: schemadir) - --overrides_migration_conf = configuration_data() --overrides_migration_conf.set('libexecdir', libexecdir) --overrides_migration = configure_file( -- input: 'gnome-shell-overrides-migration.desktop.in', -- output: 'gnome-shell-overrides-migration.desktop', -- configuration: overrides_migration_conf, -- install_dir: autostartdir --) -- - if have_systemd - unitconf = configuration_data() - unitconf.set('bindir', bindir) -diff --git a/meson.build b/meson.build -index 791ec2e64e..6cd40cefa8 100644 ---- a/meson.build -+++ b/meson.build -@@ -283,7 +283,6 @@ subdir('js') - subdir('src') - subdir('po') - subdir('data') --subdir('tools') - - if get_option('tests') - subdir('tests') -diff --git a/tools/gnome-shell-overrides-migration.sh b/tools/gnome-shell-overrides-migration.sh -deleted file mode 100755 -index a1b4cb6331..0000000000 ---- a/tools/gnome-shell-overrides-migration.sh -+++ /dev/null -@@ -1,38 +0,0 @@ --#!/bin/sh -- --PKG_DATA_DIR=${XDG_DATA_HOME:-$HOME/.local/share}/gnome-shell -- --MIGRATION_GUARD=$PKG_DATA_DIR/gnome-overrides-migrated --OVERRIDE_SCHEMA= -- --if [ -f $MIGRATION_GUARD ]; then -- exit # already migrated --fi -- --# Find the right session --if echo $XDG_CURRENT_DESKTOP | grep -q -v GNOME; then -- exit # not a GNOME session --fi -- --if echo $XDG_CURRENT_DESKTOP | grep -q Classic; then -- OVERRIDE_SCHEMA=org.gnome.shell.extensions.classic-overrides --else -- OVERRIDE_SCHEMA=org.gnome.shell.overrides --fi -- --mkdir -p $PKG_DATA_DIR -- --for k in `gsettings list-keys $OVERRIDE_SCHEMA` --do -- if [ $k = button-layout ]; then -- orig_schema=org.gnome.desktop.wm.preferences -- else -- orig_schema=org.gnome.mutter -- fi -- -- oldValue=`gsettings get $OVERRIDE_SCHEMA $k` -- curValue=`gsettings get $orig_schema $k` -- if [ $oldValue != $curValue ]; then -- gsettings set $orig_schema $k $oldValue -- fi --done && touch $MIGRATION_GUARD -diff --git a/tools/meson.build b/tools/meson.build -deleted file mode 100644 -index d8e217cc44..0000000000 ---- a/tools/meson.build -+++ /dev/null -@@ -1,4 +0,0 @@ --install_data('gnome-shell-overrides-migration.sh', -- install_dir: libexecdir, -- install_mode: 'rwxr-xr-x' --) --- -GitLab - diff --git a/helpers/DATA/ibus/denylist.txt b/helpers/DATA/ibus/denylist.txt deleted file mode 100644 index 00b7d77..0000000 --- a/helpers/DATA/ibus/denylist.txt +++ /dev/null @@ -1,27 +0,0 @@ -# vim:set fileencoding=utf-8 et sts=4 sw=4: -# -# ibus - Intelligent Input Bus for Linux / Unix OS -# -# Copyright © 2020-2022 Takao Fujiwara -# -# This library is free software; you can redistribute it and/or -# modify it under the terms of the GNU Lesser General Public -# License as published by the Free Software Foundation; either -# version 2.1 of the License, or (at your option) any later version. -# -# This library is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -# Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this library. If not, see . - -# This file is a deny list (black list) and used by gensimple.py. -# gensimple.py generates the engine list with evdev.xml and if an engine name -# is matched with any entries in this file, the engine is excluded from the -# engine list. -# Asterisk(*) character can be used to match any engines. -# E.g. xkb:cn:*:* excludes xkb:cn::zho and xkb:cn:mon_trad:mvf -xkb:cn:*:* -xkb:nec_vndr/jp:*:* diff --git a/helpers/DATA/ibus/fix_latam_spanish_blacklist.patch b/helpers/DATA/ibus/fix_latam_spanish_blacklist.patch deleted file mode 100644 index d9c7ff5..0000000 --- a/helpers/DATA/ibus/fix_latam_spanish_blacklist.patch +++ /dev/null @@ -1,28 +0,0 @@ -From 82e38d9e1c06e7fdc0816fe08f4021b8c1cdff10 Mon Sep 17 00:00:00 2001 -From: fujiwarat -Date: Wed, 20 Jul 2022 11:25:26 +0900 -Subject: [PATCH] engine: Delete xkb:latam:*:* in denylist.txt - -BUG=https://github.com/ibus/ibus/issues/2412 - -diff --git a/engine/Makefile.am b/engine/Makefile.am -index 03867f52f..7256fbc82 100644 ---- a/engine/Makefile.am -+++ b/engine/Makefile.am -@@ -4,7 +4,7 @@ - # - # Copyright (c) 2010-2016, Google Inc. All rights reserved. - # Copyright (c) 2007-2016 Peng Huang --# Copyright (c) 2013-2020 Takao Fujiwara -+# Copyright (c) 2013-2021 Takao Fujiwara - # - # This library is free software; you can redistribute it and/or - # modify it under the terms of the GNU Lesser General Public -@@ -88,6 +88,7 @@ CLEANFILES = \ - $(NULL) - - EXTRA_DIST = \ -+ denylist.txt \ - gensimple.py \ - iso639converter.py \ - simple.xml.in \ diff --git a/helpers/DATA/ibus/simple.xml.in_1.5.27.patch b/helpers/DATA/ibus/simple.xml.in_1.5.27.patch deleted file mode 100644 index ee0cf78..0000000 --- a/helpers/DATA/ibus/simple.xml.in_1.5.27.patch +++ /dev/null @@ -1,1093 +0,0 @@ -From ef9bd3b1c8e2ed122b064abb59fc6e121e23bb59 Mon Sep 17 00:00:00 2001 -From: fujiwarat -Date: Tue, 23 Aug 2022 00:26:57 +0900 -Subject: [PATCH] engine: Update simple.xml with xkeyboard-config 2.36 - ---- - engine/simple.xml.in | 875 ++++++++++++++++++++++++++++++++++++++----- - 1 file changed, 780 insertions(+), 95 deletions(-) - -diff --git a/engine/simple.xml.in b/engine/simple.xml.in -index 1152b5934..914895e76 100644 ---- a/engine/simple.xml.in -+++ b/engine/simple.xml.in -@@ -3,7 +3,7 @@ - org.freedesktop.IBus.Simple - A table based simple engine - @libexecdir@/ibus-engine-simple -- 1.5.26.20220314 -+ 1.5.27.20220823 - Peng Huang <shawn.p.huang@gmail.com> - GPL - https://github.com/ibus/ibus/wiki -@@ -781,8 +781,8 @@ - 1 - - -- xkb:by:ru:bel -- be -+ xkb:by:ru:rus -+ ru - GPL - Peng Huang <shawn.p.huang@gmail.com> - by -@@ -4289,14 +4289,14 @@ - 1 - - -- xkb:fr:bre:fra -- fr -+ xkb:fr:bre:bre -+ br - GPL - Peng Huang <shawn.p.huang@gmail.com> - fr - bre -- French (Breton) -- French (Breton) -+ Breton (France) -+ Breton (France) - ibus-keyboard - 1 - -@@ -5570,6 +5570,77 @@ - ibus-keyboard - 1 - -+ -+ xkb:latam::spa -+ es -+ GPL -+ Peng Huang <shawn.p.huang@gmail.com> -+ latam -+ Spanish (Latin American) -+ Spanish (Latin American) -+ ibus-keyboard -+ 50 -+ -+ -+ xkb:latam:nodeadkeys:spa -+ es -+ GPL -+ Peng Huang <shawn.p.huang@gmail.com> -+ latam -+ nodeadkeys -+ Spanish (Latin American, no dead keys) -+ Spanish (Latin American, no dead keys) -+ ibus-keyboard -+ 1 -+ -+ -+ xkb:latam:deadtilde:spa -+ es -+ GPL -+ Peng Huang <shawn.p.huang@gmail.com> -+ latam -+ deadtilde -+ Spanish (Latin American, dead tilde) -+ Spanish (Latin American, dead tilde) -+ ibus-keyboard -+ 1 -+ -+ -+ xkb:latam:dvorak:spa -+ es -+ GPL -+ Peng Huang <shawn.p.huang@gmail.com> -+ latam -+ dvorak -+ Spanish (Latin American, Dvorak) -+ Spanish (Latin American, Dvorak) -+ ibus-keyboard -+ 1 -+ -+ -+ xkb:latam:colemak:spa -+ es -+ GPL -+ Peng Huang <shawn.p.huang@gmail.com> -+ latam -+ colemak -+ Spanish (Latin American, Colemak) -+ Spanish (Latin American, Colemak) -+ ibus-keyboard -+ 1 -+ -+ -+ xkb:latam:colemak-gaming:spa -+ es -+ GPL -+ Peng Huang <shawn.p.huang@gmail.com> -+ latam -+ colemak-gaming -+ Spanish (Latin American, Colemak for gaming) -+ Spanish (Latin American, Colemak for gaming) -+ ibus-keyboard -+ 1 -+ - - xkb:lt::lit - lt -@@ -6744,6 +6815,18 @@ - ibus-keyboard - 1 - -+ -+ xkb:ru:ab:abk -+ ab -+ GPL -+ Peng Huang <shawn.p.huang@gmail.com> -+ ru -+ ab -+ Abkhazian (Russia) -+ Abkhazian (Russia) -+ ibus-keyboard -+ 1 -+ - - xkb:rs::srp - sr -@@ -7488,6 +7571,18 @@ - ibus-keyboard - 1 - -+ -+ xkb:tr:e:tur -+ tr -+ GPL -+ Peng Huang <shawn.p.huang@gmail.com> -+ tr -+ e -+ Turkish (E) -+ Turkish (E) -+ ibus-keyboard -+ 1 -+ - - xkb:tr:alt:tur - tr -@@ -7895,8 +7990,8 @@ - 1 - - -- xkb:ua:rstu_ru:ukr -- uk -+ xkb:ua:rstu_ru:rus -+ ru - GPL - Peng Huang <shawn.p.huang@gmail.com> - ua -@@ -8150,8 +8245,8 @@ - Peng Huang <shawn.p.huang@gmail.com> - vn - fr -- Vietnamese (French) -- Vietnamese (French) -+ Vietnamese (France) -+ Vietnamese (France) - ibus-keyboard - 1 - -@@ -10029,8 +10124,8 @@ - 50 - - -- xkb:id::msa -- ms -+ xkb:id::ace -+ ace - GPL - Peng Huang <shawn.p.huang@gmail.com> - id -@@ -10040,8 +10135,8 @@ - 50 - - -- xkb:id::min -- min -+ xkb:id::ban -+ ban - GPL - Peng Huang <shawn.p.huang@gmail.com> - id -@@ -10051,8 +10146,19 @@ - 50 - - -- xkb:id::ace -- ace -+ xkb:id::bbc -+ bbc -+ GPL -+ Peng Huang <shawn.p.huang@gmail.com> -+ id -+ Indonesian (Latin) -+ Indonesian (Latin) -+ ibus-keyboard -+ 50 -+ -+ -+ xkb:id::bew -+ bew - GPL - Peng Huang <shawn.p.huang@gmail.com> - id -@@ -10073,8 +10179,8 @@ - 50 - - -- xkb:id::tsg -- tsg -+ xkb:id::btm -+ btm - GPL - Peng Huang <shawn.p.huang@gmail.com> - id -@@ -10084,8 +10190,8 @@ - 50 - - -- xkb:id::mfa -- mfa -+ xkb:id::bts -+ bts - GPL - Peng Huang <shawn.p.huang@gmail.com> - id -@@ -10095,183 +10201,762 @@ - 50 - - -- xkb:id:phonetic:ind -+ xkb:id::bug -+ bug -+ GPL -+ Peng Huang <shawn.p.huang@gmail.com> -+ id -+ Indonesian (Latin) -+ Indonesian (Latin) -+ ibus-keyboard -+ 50 -+ -+ -+ xkb:id::gor -+ gor -+ GPL -+ Peng Huang <shawn.p.huang@gmail.com> -+ id -+ Indonesian (Latin) -+ Indonesian (Latin) -+ ibus-keyboard -+ 50 -+ -+ -+ xkb:id::jav -+ jv -+ GPL -+ Peng Huang <shawn.p.huang@gmail.com> -+ id -+ Indonesian (Latin) -+ Indonesian (Latin) -+ ibus-keyboard -+ 50 -+ -+ -+ xkb:id::jax -+ jax -+ GPL -+ Peng Huang <shawn.p.huang@gmail.com> -+ id -+ Indonesian (Latin) -+ Indonesian (Latin) -+ ibus-keyboard -+ 50 -+ -+ -+ xkb:id::mad -+ mad -+ GPL -+ Peng Huang <shawn.p.huang@gmail.com> -+ id -+ Indonesian (Latin) -+ Indonesian (Latin) -+ ibus-keyboard -+ 50 -+ -+ -+ xkb:id::mak -+ mak -+ GPL -+ Peng Huang <shawn.p.huang@gmail.com> -+ id -+ Indonesian (Latin) -+ Indonesian (Latin) -+ ibus-keyboard -+ 50 -+ -+ -+ xkb:id::min -+ min -+ GPL -+ Peng Huang <shawn.p.huang@gmail.com> -+ id -+ Indonesian (Latin) -+ Indonesian (Latin) -+ ibus-keyboard -+ 50 -+ -+ -+ xkb:id::mui -+ mui -+ GPL -+ Peng Huang <shawn.p.huang@gmail.com> -+ id -+ Indonesian (Latin) -+ Indonesian (Latin) -+ ibus-keyboard -+ 50 -+ -+ -+ xkb:id::sas -+ sas -+ GPL -+ Peng Huang <shawn.p.huang@gmail.com> -+ id -+ Indonesian (Latin) -+ Indonesian (Latin) -+ ibus-keyboard -+ 50 -+ -+ -+ xkb:id::sun -+ su -+ GPL -+ Peng Huang <shawn.p.huang@gmail.com> -+ id -+ Indonesian (Latin) -+ Indonesian (Latin) -+ ibus-keyboard -+ 50 -+ -+ -+ xkb:id:javanese:ind - id - GPL - Peng Huang <shawn.p.huang@gmail.com> - id -- phonetic -- Indonesian (Arab Pegon, phonetic) -- Indonesian (Arab Pegon, phonetic) -+ javanese -+ Javanese -+ Javanese - ibus-keyboard - 1 - - -- xkb:id:phonetic:msa -- ms -+ xkb:id:javanese:ace -+ ace - GPL - Peng Huang <shawn.p.huang@gmail.com> - id -- phonetic -- Indonesian (Arab Pegon, phonetic) -- Indonesian (Arab Pegon, phonetic) -+ javanese -+ Javanese -+ Javanese - ibus-keyboard - 1 - - -- xkb:id:phonetic:min -- min -+ xkb:id:javanese:ban -+ ban - GPL - Peng Huang <shawn.p.huang@gmail.com> - id -- phonetic -- Indonesian (Arab Pegon, phonetic) -- Indonesian (Arab Pegon, phonetic) -+ javanese -+ Javanese -+ Javanese - ibus-keyboard - 1 - - -- xkb:id:phonetic:ace -- ace -+ xkb:id:javanese:bbc -+ bbc - GPL - Peng Huang <shawn.p.huang@gmail.com> - id -- phonetic -- Indonesian (Arab Pegon, phonetic) -- Indonesian (Arab Pegon, phonetic) -+ javanese -+ Javanese -+ Javanese - ibus-keyboard - 1 - - -- xkb:id:phonetic:bjn -+ xkb:id:javanese:bew -+ bew -+ GPL -+ Peng Huang <shawn.p.huang@gmail.com> -+ id -+ javanese -+ Javanese -+ Javanese -+ ibus-keyboard -+ 1 -+ -+ -+ xkb:id:javanese:bjn - bjn - GPL - Peng Huang <shawn.p.huang@gmail.com> - id -- phonetic -- Indonesian (Arab Pegon, phonetic) -- Indonesian (Arab Pegon, phonetic) -+ javanese -+ Javanese -+ Javanese - ibus-keyboard - 1 - - -- xkb:id:phonetic:tsg -- tsg -+ xkb:id:javanese:btm -+ btm - GPL - Peng Huang <shawn.p.huang@gmail.com> - id -- phonetic -- Indonesian (Arab Pegon, phonetic) -- Indonesian (Arab Pegon, phonetic) -+ javanese -+ Javanese -+ Javanese - ibus-keyboard - 1 - - -- xkb:id:phonetic:mfa -- mfa -+ xkb:id:javanese:bts -+ bts - GPL - Peng Huang <shawn.p.huang@gmail.com> - id -- phonetic -- Indonesian (Arab Pegon, phonetic) -- Indonesian (Arab Pegon, phonetic) -+ javanese -+ Javanese -+ Javanese - ibus-keyboard - 1 - - -- xkb:id:phoneticx:ind -- id -+ xkb:id:javanese:bug -+ bug - GPL - Peng Huang <shawn.p.huang@gmail.com> - id -- phoneticx -- Indonesian (Arab Pegon, extended phonetic) -- Indonesian (Arab Pegon, extended phonetic) -+ javanese -+ Javanese -+ Javanese - ibus-keyboard - 1 - - -- xkb:id:phoneticx:msa -- ms -+ xkb:id:javanese:gor -+ gor - GPL - Peng Huang <shawn.p.huang@gmail.com> - id -- phoneticx -- Indonesian (Arab Pegon, extended phonetic) -- Indonesian (Arab Pegon, extended phonetic) -+ javanese -+ Javanese -+ Javanese - ibus-keyboard - 1 - - -- xkb:id:phoneticx:min -- min -+ xkb:id:javanese:jav -+ jv - GPL - Peng Huang <shawn.p.huang@gmail.com> - id -- phoneticx -- Indonesian (Arab Pegon, extended phonetic) -- Indonesian (Arab Pegon, extended phonetic) -+ javanese -+ Javanese -+ Javanese - ibus-keyboard - 1 - - -- xkb:id:phoneticx:ace -- ace -+ xkb:id:javanese:jax -+ jax - GPL - Peng Huang <shawn.p.huang@gmail.com> - id -- phoneticx -- Indonesian (Arab Pegon, extended phonetic) -- Indonesian (Arab Pegon, extended phonetic) -+ javanese -+ Javanese -+ Javanese - ibus-keyboard - 1 - - -- xkb:id:phoneticx:bjn -- bjn -+ xkb:id:javanese:mad -+ mad - GPL - Peng Huang <shawn.p.huang@gmail.com> - id -- phoneticx -- Indonesian (Arab Pegon, extended phonetic) -- Indonesian (Arab Pegon, extended phonetic) -+ javanese -+ Javanese -+ Javanese - ibus-keyboard - 1 - - -- xkb:id:phoneticx:tsg -- tsg -+ xkb:id:javanese:mak -+ mak - GPL - Peng Huang <shawn.p.huang@gmail.com> - id -- phoneticx -- Indonesian (Arab Pegon, extended phonetic) -- Indonesian (Arab Pegon, extended phonetic) -+ javanese -+ Javanese -+ Javanese - ibus-keyboard - 1 - - -- xkb:id:phoneticx:mfa -- mfa -+ xkb:id:javanese:min -+ min - GPL - Peng Huang <shawn.p.huang@gmail.com> - id -- phoneticx -- Indonesian (Arab Pegon, extended phonetic) -- Indonesian (Arab Pegon, extended phonetic) -+ javanese -+ Javanese -+ Javanese - ibus-keyboard - 1 - - -- xkb:jv::jav -- jv -+ xkb:id:javanese:mui -+ mui - GPL - Peng Huang <shawn.p.huang@gmail.com> -- jv -- Indonesian (Javanese) -- Indonesian (Javanese) -+ id -+ javanese -+ Javanese -+ Javanese - ibus-keyboard -- 50 -+ 1 -+ -+ -+ xkb:id:javanese:sas -+ sas -+ GPL -+ Peng Huang <shawn.p.huang@gmail.com> -+ id -+ javanese -+ Javanese -+ Javanese -+ ibus-keyboard -+ 1 -+ -+ -+ xkb:id:javanese:sun -+ su -+ GPL -+ Peng Huang <shawn.p.huang@gmail.com> -+ id -+ javanese -+ Javanese -+ Javanese -+ ibus-keyboard -+ 1 -+ -+ -+ xkb:id:phonetic:ind -+ id -+ GPL -+ Peng Huang <shawn.p.huang@gmail.com> -+ id -+ phonetic -+ Indonesian (Arab Pegon, phonetic) -+ Indonesian (Arab Pegon, phonetic) -+ ibus-keyboard -+ 1 -+ -+ -+ xkb:id:phonetic:ace -+ ace -+ GPL -+ Peng Huang <shawn.p.huang@gmail.com> -+ id -+ phonetic -+ Indonesian (Arab Pegon, phonetic) -+ Indonesian (Arab Pegon, phonetic) -+ ibus-keyboard -+ 1 -+ -+ -+ xkb:id:phonetic:ban -+ ban -+ GPL -+ Peng Huang <shawn.p.huang@gmail.com> -+ id -+ phonetic -+ Indonesian (Arab Pegon, phonetic) -+ Indonesian (Arab Pegon, phonetic) -+ ibus-keyboard -+ 1 -+ -+ -+ xkb:id:phonetic:bbc -+ bbc -+ GPL -+ Peng Huang <shawn.p.huang@gmail.com> -+ id -+ phonetic -+ Indonesian (Arab Pegon, phonetic) -+ Indonesian (Arab Pegon, phonetic) -+ ibus-keyboard -+ 1 -+ -+ -+ xkb:id:phonetic:bew -+ bew -+ GPL -+ Peng Huang <shawn.p.huang@gmail.com> -+ id -+ phonetic -+ Indonesian (Arab Pegon, phonetic) -+ Indonesian (Arab Pegon, phonetic) -+ ibus-keyboard -+ 1 -+ -+ -+ xkb:id:phonetic:bjn -+ bjn -+ GPL -+ Peng Huang <shawn.p.huang@gmail.com> -+ id -+ phonetic -+ Indonesian (Arab Pegon, phonetic) -+ Indonesian (Arab Pegon, phonetic) -+ ibus-keyboard -+ 1 -+ -+ -+ xkb:id:phonetic:btm -+ btm -+ GPL -+ Peng Huang <shawn.p.huang@gmail.com> -+ id -+ phonetic -+ Indonesian (Arab Pegon, phonetic) -+ Indonesian (Arab Pegon, phonetic) -+ ibus-keyboard -+ 1 -+ -+ -+ xkb:id:phonetic:bts -+ bts -+ GPL -+ Peng Huang <shawn.p.huang@gmail.com> -+ id -+ phonetic -+ Indonesian (Arab Pegon, phonetic) -+ Indonesian (Arab Pegon, phonetic) -+ ibus-keyboard -+ 1 -+ -+ -+ xkb:id:phonetic:bug -+ bug -+ GPL -+ Peng Huang <shawn.p.huang@gmail.com> -+ id -+ phonetic -+ Indonesian (Arab Pegon, phonetic) -+ Indonesian (Arab Pegon, phonetic) -+ ibus-keyboard -+ 1 -+ -+ -+ xkb:id:phonetic:gor -+ gor -+ GPL -+ Peng Huang <shawn.p.huang@gmail.com> -+ id -+ phonetic -+ Indonesian (Arab Pegon, phonetic) -+ Indonesian (Arab Pegon, phonetic) -+ ibus-keyboard -+ 1 -+ -+ -+ xkb:id:phonetic:jav -+ jv -+ GPL -+ Peng Huang <shawn.p.huang@gmail.com> -+ id -+ phonetic -+ Indonesian (Arab Pegon, phonetic) -+ Indonesian (Arab Pegon, phonetic) -+ ibus-keyboard -+ 1 -+ -+ -+ xkb:id:phonetic:jax -+ jax -+ GPL -+ Peng Huang <shawn.p.huang@gmail.com> -+ id -+ phonetic -+ Indonesian (Arab Pegon, phonetic) -+ Indonesian (Arab Pegon, phonetic) -+ ibus-keyboard -+ 1 -+ -+ -+ xkb:id:phonetic:mad -+ mad -+ GPL -+ Peng Huang <shawn.p.huang@gmail.com> -+ id -+ phonetic -+ Indonesian (Arab Pegon, phonetic) -+ Indonesian (Arab Pegon, phonetic) -+ ibus-keyboard -+ 1 -+ -+ -+ xkb:id:phonetic:mak -+ mak -+ GPL -+ Peng Huang <shawn.p.huang@gmail.com> -+ id -+ phonetic -+ Indonesian (Arab Pegon, phonetic) -+ Indonesian (Arab Pegon, phonetic) -+ ibus-keyboard -+ 1 -+ -+ -+ xkb:id:phonetic:min -+ min -+ GPL -+ Peng Huang <shawn.p.huang@gmail.com> -+ id -+ phonetic -+ Indonesian (Arab Pegon, phonetic) -+ Indonesian (Arab Pegon, phonetic) -+ ibus-keyboard -+ 1 -+ -+ -+ xkb:id:phonetic:mui -+ mui -+ GPL -+ Peng Huang <shawn.p.huang@gmail.com> -+ id -+ phonetic -+ Indonesian (Arab Pegon, phonetic) -+ Indonesian (Arab Pegon, phonetic) -+ ibus-keyboard -+ 1 -+ -+ -+ xkb:id:phonetic:sas -+ sas -+ GPL -+ Peng Huang <shawn.p.huang@gmail.com> -+ id -+ phonetic -+ Indonesian (Arab Pegon, phonetic) -+ Indonesian (Arab Pegon, phonetic) -+ ibus-keyboard -+ 1 -+ -+ -+ xkb:id:phonetic:sun -+ su -+ GPL -+ Peng Huang <shawn.p.huang@gmail.com> -+ id -+ phonetic -+ Indonesian (Arab Pegon, phonetic) -+ Indonesian (Arab Pegon, phonetic) -+ ibus-keyboard -+ 1 -+ -+ -+ xkb:id:phoneticx:ind -+ id -+ GPL -+ Peng Huang <shawn.p.huang@gmail.com> -+ id -+ phoneticx -+ Indonesian (Arab Pegon, extended phonetic) -+ Indonesian (Arab Pegon, extended phonetic) -+ ibus-keyboard -+ 1 -+ -+ -+ xkb:id:phoneticx:ace -+ ace -+ GPL -+ Peng Huang <shawn.p.huang@gmail.com> -+ id -+ phoneticx -+ Indonesian (Arab Pegon, extended phonetic) -+ Indonesian (Arab Pegon, extended phonetic) -+ ibus-keyboard -+ 1 -+ -+ -+ xkb:id:phoneticx:ban -+ ban -+ GPL -+ Peng Huang <shawn.p.huang@gmail.com> -+ id -+ phoneticx -+ Indonesian (Arab Pegon, extended phonetic) -+ Indonesian (Arab Pegon, extended phonetic) -+ ibus-keyboard -+ 1 -+ -+ -+ xkb:id:phoneticx:bbc -+ bbc -+ GPL -+ Peng Huang <shawn.p.huang@gmail.com> -+ id -+ phoneticx -+ Indonesian (Arab Pegon, extended phonetic) -+ Indonesian (Arab Pegon, extended phonetic) -+ ibus-keyboard -+ 1 -+ -+ -+ xkb:id:phoneticx:bew -+ bew -+ GPL -+ Peng Huang <shawn.p.huang@gmail.com> -+ id -+ phoneticx -+ Indonesian (Arab Pegon, extended phonetic) -+ Indonesian (Arab Pegon, extended phonetic) -+ ibus-keyboard -+ 1 -+ -+ -+ xkb:id:phoneticx:bjn -+ bjn -+ GPL -+ Peng Huang <shawn.p.huang@gmail.com> -+ id -+ phoneticx -+ Indonesian (Arab Pegon, extended phonetic) -+ Indonesian (Arab Pegon, extended phonetic) -+ ibus-keyboard -+ 1 -+ -+ -+ xkb:id:phoneticx:btm -+ btm -+ GPL -+ Peng Huang <shawn.p.huang@gmail.com> -+ id -+ phoneticx -+ Indonesian (Arab Pegon, extended phonetic) -+ Indonesian (Arab Pegon, extended phonetic) -+ ibus-keyboard -+ 1 -+ -+ -+ xkb:id:phoneticx:bts -+ bts -+ GPL -+ Peng Huang <shawn.p.huang@gmail.com> -+ id -+ phoneticx -+ Indonesian (Arab Pegon, extended phonetic) -+ Indonesian (Arab Pegon, extended phonetic) -+ ibus-keyboard -+ 1 -+ -+ -+ xkb:id:phoneticx:bug -+ bug -+ GPL -+ Peng Huang <shawn.p.huang@gmail.com> -+ id -+ phoneticx -+ Indonesian (Arab Pegon, extended phonetic) -+ Indonesian (Arab Pegon, extended phonetic) -+ ibus-keyboard -+ 1 -+ -+ -+ xkb:id:phoneticx:gor -+ gor -+ GPL -+ Peng Huang <shawn.p.huang@gmail.com> -+ id -+ phoneticx -+ Indonesian (Arab Pegon, extended phonetic) -+ Indonesian (Arab Pegon, extended phonetic) -+ ibus-keyboard -+ 1 -+ -+ -+ xkb:id:phoneticx:jav -+ jv -+ GPL -+ Peng Huang <shawn.p.huang@gmail.com> -+ id -+ phoneticx -+ Indonesian (Arab Pegon, extended phonetic) -+ Indonesian (Arab Pegon, extended phonetic) -+ ibus-keyboard -+ 1 -+ -+ -+ xkb:id:phoneticx:jax -+ jax -+ GPL -+ Peng Huang <shawn.p.huang@gmail.com> -+ id -+ phoneticx -+ Indonesian (Arab Pegon, extended phonetic) -+ Indonesian (Arab Pegon, extended phonetic) -+ ibus-keyboard -+ 1 -+ -+ -+ xkb:id:phoneticx:mad -+ mad -+ GPL -+ Peng Huang <shawn.p.huang@gmail.com> -+ id -+ phoneticx -+ Indonesian (Arab Pegon, extended phonetic) -+ Indonesian (Arab Pegon, extended phonetic) -+ ibus-keyboard -+ 1 -+ -+ -+ xkb:id:phoneticx:mak -+ mak -+ GPL -+ Peng Huang <shawn.p.huang@gmail.com> -+ id -+ phoneticx -+ Indonesian (Arab Pegon, extended phonetic) -+ Indonesian (Arab Pegon, extended phonetic) -+ ibus-keyboard -+ 1 -+ -+ -+ xkb:id:phoneticx:min -+ min -+ GPL -+ Peng Huang <shawn.p.huang@gmail.com> -+ id -+ phoneticx -+ Indonesian (Arab Pegon, extended phonetic) -+ Indonesian (Arab Pegon, extended phonetic) -+ ibus-keyboard -+ 1 -+ -+ -+ xkb:id:phoneticx:mui -+ mui -+ GPL -+ Peng Huang <shawn.p.huang@gmail.com> -+ id -+ phoneticx -+ Indonesian (Arab Pegon, extended phonetic) -+ Indonesian (Arab Pegon, extended phonetic) -+ ibus-keyboard -+ 1 -+ -+ -+ xkb:id:phoneticx:sas -+ sas -+ GPL -+ Peng Huang <shawn.p.huang@gmail.com> -+ id -+ phoneticx -+ Indonesian (Arab Pegon, extended phonetic) -+ Indonesian (Arab Pegon, extended phonetic) -+ ibus-keyboard -+ 1 -+ -+ -+ xkb:id:phoneticx:sun -+ su -+ GPL -+ Peng Huang <shawn.p.huang@gmail.com> -+ id -+ phoneticx -+ Indonesian (Arab Pegon, extended phonetic) -+ Indonesian (Arab Pegon, extended phonetic) -+ ibus-keyboard -+ 1 - - - xkb:my::ind diff --git a/helpers/DATA/libmateweather/0cc07f7e5163870bcc2fb7281c28e8e39c9cbc54.patch b/helpers/DATA/libmateweather/0cc07f7e5163870bcc2fb7281c28e8e39c9cbc54.patch deleted file mode 100644 index 8596e63..0000000 --- a/helpers/DATA/libmateweather/0cc07f7e5163870bcc2fb7281c28e8e39c9cbc54.patch +++ /dev/null @@ -1,22 +0,0 @@ -From 0cc07f7e5163870bcc2fb7281c28e8e39c9cbc54 Mon Sep 17 00:00:00 2001 -From: Mike Ovchinnikov -Date: Wed, 18 Oct 2023 14:59:53 +0400 -Subject: [PATCH] Dataserver url changed - ---- - libmateweather/weather-metar.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/libmateweather/weather-metar.c b/libmateweather/weather-metar.c -index a9f3c84d..0ae2cbb9 100644 ---- a/libmateweather/weather-metar.c -+++ b/libmateweather/weather-metar.c -@@ -550,7 +550,7 @@ metar_start_open (WeatherInfo *info) - } - - msg = soup_form_request_new ( -- "GET", "https://www.aviationweather.gov/adds/dataserver_current/httpparam", -+ "GET", "https://www.aviationweather.gov/cgi-bin/data/dataserver.php", - "dataSource", "metars", - "requestType", "retrieve", - "format", "xml", diff --git a/helpers/DATA/libmateweather/a61542ffc2d3807dbc3163d1727cc5d8c2118838.patch b/helpers/DATA/libmateweather/a61542ffc2d3807dbc3163d1727cc5d8c2118838.patch deleted file mode 100644 index 5da2035..0000000 --- a/helpers/DATA/libmateweather/a61542ffc2d3807dbc3163d1727cc5d8c2118838.patch +++ /dev/null @@ -1,42 +0,0 @@ -From a61542ffc2d3807dbc3163d1727cc5d8c2118838 Mon Sep 17 00:00:00 2001 -From: mbkma -Date: Wed, 11 Jan 2023 20:53:29 +0100 -Subject: [PATCH] rename Europe/Kiev to Europe/Kyiv - ---- - data/Locations.xml.in | 9 ++++----- - 1 file changed, 4 insertions(+), 5 deletions(-) - -diff --git a/data/Locations.xml.in b/data/Locations.xml.in -index 8bf9bad..ea75673 100644 ---- a/data/Locations.xml.in -+++ b/data/Locations.xml.in -@@ -20627,13 +20627,12 @@ - UA - UP - -- -- Europe/Simferopol -+ - Europe/Uzhgorod - Europe/Zaporozhye - - -- Europe/Kiev -+ Europe/Kyiv - - - Boryspil' -@@ -20706,10 +20705,10 @@ - - - -- Kiev -+ Kyiv - 50.433333 30.516667 - - Kyiv diff --git a/helpers/DATA/pygame/01_update_surface_test.patch b/helpers/DATA/pygame/01_update_surface_test.patch deleted file mode 100644 index a587991..0000000 --- a/helpers/DATA/pygame/01_update_surface_test.patch +++ /dev/null @@ -1,22 +0,0 @@ -diff --git a/test/surface_test.py b/test/surface_test.py -index 4323503..1c161ad 100644 ---- a/test/surface_test.py -+++ b/test/surface_test.py -#@@ -1481,7 +1481,7 @@ class GeneralSurfaceTests(AssertRaisesRegexMixin, unittest.TestCase): -# self.assertEqual(results, results_expected) -# -# @unittest.skipIf( -#- "arm" in platform.machine() or "aarch64" in platform.machine() or "mips" in platform.machine() or "ppc64le" in platform.machine() or "s390x" in platform.machine(), -#+ "arm" in platform.machine() or "aarch64" in platform.machine() or "mips" in platform.machine() or "ppc64le" in platform.machine() or "s390x" in platform.machine() or "riscv64" in platform.machine(), -# "sdl2 blitter produces different results on arm", -# ) -# def test_src_alpha_sdl2_blitter(self): -@@ -2013,7 +2013,7 @@ class GeneralSurfaceTests(AssertRaisesRegexMixin, unittest.TestCase): - mask8 = (224, 28, 3, 0) - mask15 = (31744, 992, 31, 0) - mask16 = (63488, 2016, 31, 0) -- mask24 = (4278190080, 16711680, 65280, 0) -+ mask24 = (16711680, 65280, 255, 0) - mask32 = (4278190080, 16711680, 65280, 255) - - # Surfaces with standard depths and masks diff --git a/helpers/DATA/pygame/02_c105540bb10df5d29a101f593f2a3801c1fa0799.patch b/helpers/DATA/pygame/02_c105540bb10df5d29a101f593f2a3801c1fa0799.patch deleted file mode 100644 index 1c47b70..0000000 --- a/helpers/DATA/pygame/02_c105540bb10df5d29a101f593f2a3801c1fa0799.patch +++ /dev/null @@ -1,26 +0,0 @@ -From c105540bb10df5d29a101f593f2a3801c1fa0799 Mon Sep 17 00:00:00 2001 -From: gernot steinegger -Date: Sun, 9 Jan 2022 13:01:25 +0100 -Subject: [PATCH] "SDL_CreateWindowFrom" in "display" module - -if the environment variable "SDL_WINDOWID" is set, use "SDL_CreateWindowFrom" to create the window in "display.set_mode" ---- - src_c/display.c | 5 ++++- - 1 file changed, 4 insertions(+), 1 deletion(-) - -diff --git a/src_c/display.c b/src_c/display.c -index d37c29765a..26f07f77e9 100644 ---- a/src_c/display.c -+++ b/src_c/display.c -@@ -1096,7 +1096,10 @@ pg_set_mode(PyObject *self, PyObject *arg, PyObject *kwds) - - if (!win) { - /*open window*/ -- win = SDL_CreateWindow(title, x, y, w_1, h_1, sdl_flags); -+ const char *window_handle = SDL_getenv("SDL_WINDOWID"); -+ win = window_handle -+ ? SDL_CreateWindowFrom((const void*)atoll(window_handle)) -+ : SDL_CreateWindow(title, x, y, w_1, h_1, sdl_flags); - if (!win) - return RAISE(pgExc_SDLError, SDL_GetError()); - init_flip = 1; diff --git a/helpers/make-0ad b/helpers/make-0ad deleted file mode 100644 index 0db8f25..0000000 --- a/helpers/make-0ad +++ /dev/null @@ -1,30 +0,0 @@ -#!/bin/sh -# -# Copyright (C) 2022 Luis Guzman -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA -# - -VERSION=1 -EXTERNAL='deb-src http://ppa.launchpadcontent.net/wfg/0ad/ubuntu $UPSTREAM main' -REPOKEY="8CA7A6E8E4FA953A" -BACKPORTS=true -BUILD_UNTIL=11.0 - -. ./config - -changelog "Backported to get latest version into Trisquel" - -package diff --git a/helpers/make-0ad-data b/helpers/make-0ad-data deleted file mode 100644 index 6452270..0000000 --- a/helpers/make-0ad-data +++ /dev/null @@ -1,30 +0,0 @@ -#!/bin/sh -# -# Copyright (C) 2022 Luis Guzman -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA -# - -VERSION=1 -EXTERNAL='deb-src http://ppa.launchpadcontent.net/wfg/0ad/ubuntu $UPSTREAM main' -REPOKEY="8CA7A6E8E4FA953A" -BACKPORTS=true -BUILD_UNTIL=11.0 - -. ./config - -changelog "Backported as companion package for 0ad" - -package diff --git a/helpers/make-aptly b/helpers/make-aptly deleted file mode 100644 index 433e892..0000000 --- a/helpers/make-aptly +++ /dev/null @@ -1,28 +0,0 @@ -#!/bin/sh -# -# Copyright (C) 2023 Luis Guzmán -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA -# - -VERSION=0 -EXTERNAL='deb-src http://ftp.debian.org/debian bullseye-backports main' -REPOKEY=0E98404D386FA1D9 -BUILD_UNTIL=11.0 -. ./config - - -changelog "Backport to get zstd compression support from debian bullseye." -package diff --git a/helpers/make-ayatana-indicator-sound b/helpers/make-ayatana-indicator-sound deleted file mode 100644 index 25d8b6b..0000000 --- a/helpers/make-ayatana-indicator-sound +++ /dev/null @@ -1,32 +0,0 @@ -#!/bin/sh -# -# Copyright (C) 2023 Luis Guzman -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA -# - -VERSION=1 -BUILD_UNTIL=11.0 - -. ./config - -# Remove helper once upstream version is 1.5.27 or later. - -# Apply patch to fix volume change notification -patch --no-backup-if-mismatch -p1 < $DATA/fix_volume_change_notification.patch - -changelog "Fix volume change notification on MATE and XFCE." - -package diff --git a/helpers/make-cups b/helpers/make-cups deleted file mode 100644 index 891e3fa..0000000 --- a/helpers/make-cups +++ /dev/null @@ -1,28 +0,0 @@ -#!/bin/sh -# -# Copyright (C) 2023 Luis Guzmán -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA -# - -VERSION=0 -BUILD_UNTIL=11.0 - -. ./config - - -changelog "Add helper to force rebuild and reindex on i386 repo." - -package diff --git a/helpers/make-cwidget b/helpers/make-cwidget deleted file mode 100644 index 773f80d..0000000 --- a/helpers/make-cwidget +++ /dev/null @@ -1,30 +0,0 @@ -#!/bin/sh -# -# Copyright (C) 2023 Luis Guzmán -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA -# - -VERSION=0 -BUILD_UNTIL=11.0 - -. ./config - -#Apply patch to fix Debian's #1714264 -patch --no-backup-if-mismatch -p1 < $DATA/0002-Fix-cwidget-and-aptitude-FTBFS.patch - -changelog "Apply patch to fix Debian's #1015925 affecting aramo." - -package diff --git a/helpers/make-cython b/helpers/make-cython deleted file mode 100644 index 4c4a468..0000000 --- a/helpers/make-cython +++ /dev/null @@ -1,31 +0,0 @@ -#!/bin/sh -# -# Copyright (C) 2023 Luis Guzman -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA -# - -VERSION=1 -EXTERNAL='deb-src http://ftp.debian.org/debian bookworm main' -REPOKEY=0E98404D386FA1D9 -BACKPORT=true -BUILD_UNTIL=11.0 - -. ./config - - -changelog "Backported from debian bookworm as dependency of opendht 3.0." - -package diff --git a/helpers/make-deluge b/helpers/make-deluge deleted file mode 100644 index 137fc38..0000000 --- a/helpers/make-deluge +++ /dev/null @@ -1,31 +0,0 @@ -#!/bin/sh -# -# Copyright (C) 2020 Luis Guzmán -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA -# - -VERSION=1 -EXTERNAL='deb-src http://ppa.launchpad.net/deluge-team/stable/ubuntu $UPSTREAM main' -REPOKEY="C5E6A5ED249AD24C" -BACKPORT=true -BUILD_UNTIL=11.0 - -. ./config - -changelog "Imported to Trisquel from oficial PPA" - -package - diff --git a/helpers/make-enblend-enfuse b/helpers/make-enblend-enfuse deleted file mode 100644 index 9790bb2..0000000 --- a/helpers/make-enblend-enfuse +++ /dev/null @@ -1,28 +0,0 @@ -#!/bin/sh -# -# Copyright (C) 2023 Luis Guzmán -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA -# - -VERSION=0 -EXTERNAL='deb-src http://ftp.debian.org/debian bullseye main' -REPOKEY=0E98404D386FA1D9 -BUILD_UNTIL=11.0 -. ./config - - -changelog "Build as dependency of hugin." -package diff --git a/helpers/make-gajim b/helpers/make-gajim deleted file mode 100644 index f1b6eab..0000000 --- a/helpers/make-gajim +++ /dev/null @@ -1,30 +0,0 @@ -#!/bin/sh -# -# Copyright (C) 2023 Luis Guzmán -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA -# - -VERSION=0 -EXTERNAL='deb-src http://ftp.debian.org/debian bullseye-backports main' -REPOKEY=0E98404D386FA1D9 -DEPENDS=python-nbxmpp -BACKPORTS=true -BUILD_UNTIL=11.0 -. ./config - - -changelog "Backport from debian to a closer supported state upstream." -package diff --git a/helpers/make-gajim-omemo b/helpers/make-gajim-omemo deleted file mode 100644 index 2de528d..0000000 --- a/helpers/make-gajim-omemo +++ /dev/null @@ -1,29 +0,0 @@ -#!/bin/sh -# -# Copyright (C) 2023 Luis Guzmán -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA -# - -VERSION=0 -EXTERNAL='deb-src http://ftp.debian.org/debian bullseye-backports main' -REPOKEY=0E98404D386FA1D9 -BACKPORTS=true -BUILD_UNTIL=11.0 -. ./config - - -changelog "Backport from debian to a closer supported state upstream." -package diff --git a/helpers/make-gajim-openpgp b/helpers/make-gajim-openpgp deleted file mode 100644 index 2de528d..0000000 --- a/helpers/make-gajim-openpgp +++ /dev/null @@ -1,29 +0,0 @@ -#!/bin/sh -# -# Copyright (C) 2023 Luis Guzmán -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA -# - -VERSION=0 -EXTERNAL='deb-src http://ftp.debian.org/debian bullseye-backports main' -REPOKEY=0E98404D386FA1D9 -BACKPORTS=true -BUILD_UNTIL=11.0 -. ./config - - -changelog "Backport from debian to a closer supported state upstream." -package diff --git a/helpers/make-gajim-pgp b/helpers/make-gajim-pgp deleted file mode 100644 index 2de528d..0000000 --- a/helpers/make-gajim-pgp +++ /dev/null @@ -1,29 +0,0 @@ -#!/bin/sh -# -# Copyright (C) 2023 Luis Guzmán -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA -# - -VERSION=0 -EXTERNAL='deb-src http://ftp.debian.org/debian bullseye-backports main' -REPOKEY=0E98404D386FA1D9 -BACKPORTS=true -BUILD_UNTIL=11.0 -. ./config - - -changelog "Backport from debian to a closer supported state upstream." -package diff --git a/helpers/make-gajim-triggers b/helpers/make-gajim-triggers deleted file mode 100644 index 2de528d..0000000 --- a/helpers/make-gajim-triggers +++ /dev/null @@ -1,29 +0,0 @@ -#!/bin/sh -# -# Copyright (C) 2023 Luis Guzmán -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA -# - -VERSION=0 -EXTERNAL='deb-src http://ftp.debian.org/debian bullseye-backports main' -REPOKEY=0E98404D386FA1D9 -BACKPORTS=true -BUILD_UNTIL=11.0 -. ./config - - -changelog "Backport from debian to a closer supported state upstream." -package diff --git a/helpers/make-gnome-shell b/helpers/make-gnome-shell deleted file mode 100644 index ba020ab..0000000 --- a/helpers/make-gnome-shell +++ /dev/null @@ -1,31 +0,0 @@ -#!/bin/sh -# -# Copyright (C) 2023 Luis Guzmán -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA -# - -VERSION=1 -BUILD_UNTIL=11.0 - -. ./config - -# Apply patch to drop deprecated scripts running on trisquel-mini -patch --no-backup-if-mismatch -p1 < $DATA/drop_gnome-shell-overrides-migration.patch -sed -i "/gnome-shell-overrides-migration.desktop/d" debian/gnome-shell.install - -changelog "Drop deprecated scripts running on trisquel-mini." - -package diff --git a/helpers/make-group-service b/helpers/make-group-service deleted file mode 100644 index 4d40903..0000000 --- a/helpers/make-group-service +++ /dev/null @@ -1,30 +0,0 @@ -#!/bin/sh -# -# Copyright (C) 2023 Luis Guzmán -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA -# - -VERSION=0 -EXTERNAL='deb-src http://ftp.us.debian.org/debian bookworm main' -REPOKEY=6ED0E7B82643E131 -BUILD_UNTIL=11.0 - -. ./config - - -changelog "Imported as dependency of mate-user-admin." - -package diff --git a/helpers/make-hugin b/helpers/make-hugin deleted file mode 100644 index cc70247..0000000 --- a/helpers/make-hugin +++ /dev/null @@ -1,28 +0,0 @@ -#!/bin/sh -# -# Copyright (C) 2023 Luis Guzmán -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA -# - -VERSION=0 -EXTERNAL='deb-src http://ftp.debian.org/debian bullseye main' -REPOKEY=0E98404D386FA1D9 -BUILD_UNTIL=11.0 -. ./config - - -changelog "Build to reintroduce package in aramo repository." -package diff --git a/helpers/make-ibus b/helpers/make-ibus deleted file mode 100644 index 0bde4c7..0000000 --- a/helpers/make-ibus +++ /dev/null @@ -1,35 +0,0 @@ -#!/bin/sh -# -# Copyright (C) 2022 Luis Guzman -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA -# - -VERSION=1 -BUILD_UNTIL=11.0 - -. ./config - -# Remove helper once upstream version is 1.5.27 or later. - -# Add missing file on tarball (1.5.26) -cp $DATA/denylist.txt engine/ -# Apply patch to fix removal of Latin American Spanish -patch --no-backup-if-mismatch -p1 < $DATA/fix_latam_spanish_blacklist.patch -patch --no-backup-if-mismatch -p1 < $DATA/simple.xml.in_1.5.27.patch - -changelog "Fix missing latam keyboard layout." - -package diff --git a/helpers/make-ifupdown b/helpers/make-ifupdown deleted file mode 100644 index 7f1e725..0000000 --- a/helpers/make-ifupdown +++ /dev/null @@ -1,27 +0,0 @@ -#!/bin/sh -# -# Copyright (C) 2022 Luis Guzmán -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA -# - -VERSION=1 -BUILD_UNTIL=11.0 -. ./config - -# Previously fixed LP: #1907878 - -changelog "Clean helper from manually patching previous bugs." -package diff --git a/helpers/make-libmateweather b/helpers/make-libmateweather deleted file mode 100644 index 7274cf7..0000000 --- a/helpers/make-libmateweather +++ /dev/null @@ -1,35 +0,0 @@ -#!/bin/sh -# -# Copyright (C) 2023 Luis Guzmán -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA -# - -VERSION=1 -BUILD_UNTIL=11.0 - -. ./config - -# Apply patches from upstream for URL weather change and FTBFS on current -# aramo release. -for i in $DATA/*.patch; do - echo Applying patch $i -patch --no-backup-if-mismatch -p1 < $i -done - -changelog "Fix dataserver weather url change." - -package - diff --git a/helpers/make-libsdl2 b/helpers/make-libsdl2 deleted file mode 100644 index 00d3b76..0000000 --- a/helpers/make-libsdl2 +++ /dev/null @@ -1,30 +0,0 @@ -#!/bin/sh -# -# Copyright (C) 2024 Luis Guzmán -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA -# - -VERSION=0 -EXTERNAL='deb-src http://ftp.us.debian.org/debian bookworm main' -REPOKEY=6ED0E7B82643E131 -BUILD_UNTIL=11.0 - -. ./config - - -changelog "Backport latest fixes from bookworm to improve/fix SDL support on aramo." - -package diff --git a/helpers/make-libsrtp2 b/helpers/make-libsrtp2 deleted file mode 100644 index 2f4a909..0000000 --- a/helpers/make-libsrtp2 +++ /dev/null @@ -1,31 +0,0 @@ -#!/bin/sh -# -# Copyright (C) 2023 Luis Guzman -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA -# - -VERSION=1 -EXTERNAL='deb-src http://ftp.debian.org/debian bookworm main' -REPOKEY=0E98404D386FA1D9 -BACKPORT=true -BUILD_UNTIL=11.0 - -. ./config - - -changelog "Backported from debian bookworm as dependency of libtgwot for openssl 3.0 support." - -package diff --git a/helpers/make-libstrophe b/helpers/make-libstrophe deleted file mode 100644 index 78adb26..0000000 --- a/helpers/make-libstrophe +++ /dev/null @@ -1,31 +0,0 @@ -#!/bin/sh -# -# Copyright (C) 2023 Luis Guzman -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA -# - -VERSION=1 -EXTERNAL='deb-src http://ftp.debian.org/debian bullseye-backports main' -REPOKEY=0E98404D386FA1D9 -BACKPORT=true -BUILD_UNTIL=11.0 - -. ./config - - -changelog "Backported from debian bullseye as dependency of profanity." - -package diff --git a/helpers/make-libvigraimpex b/helpers/make-libvigraimpex deleted file mode 100644 index 091e39a..0000000 --- a/helpers/make-libvigraimpex +++ /dev/null @@ -1,29 +0,0 @@ -#!/bin/sh -# -# Copyright (C) 2023 Luis Guzmán -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA -# - -VERSION=0 -EXTERNAL='deb-src http://ftp.debian.org/debian bookworm main' -REPOKEY=6ED0E7B82643E131 -BUILD_UNTIL=11.0 -. ./config - - -changelog "Build as dependency of hugin." - -package diff --git a/helpers/make-mate-system-monitor b/helpers/make-mate-system-monitor deleted file mode 100644 index b5fe0d1..0000000 --- a/helpers/make-mate-system-monitor +++ /dev/null @@ -1,56 +0,0 @@ -#!/bin/sh -# -# Copyright (C) 2023 Luis Guzmán -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA -# - -VERSION=1 -BUILD_UNTIL=11.0 - -. ./config - -# Fix Information Fields not being saved - https://github.com/mate-desktop/mate-system-monitor/pull/224 -cat << PATCH | patch --no-backup-if-mismatch -p1 -From ddeb66b5af61a5367c8b72a5e5845317e82b62a4 Mon Sep 17 00:00:00 2001 -From: mbkma -Date: Wed, 8 Sep 2021 21:28:55 +0200 -Subject: [PATCH] Fix Information Fields not being saved - ---- - src/procman.cpp | 4 ---- - 1 file changed, 4 deletions(-) - -diff --git a/src/procman.cpp b/src/procman.cpp -index b8a084dc..12d3d347 100644 ---- a/src/procman.cpp -+++ b/src/procman.cpp -@@ -97,10 +97,6 @@ procman_get_tree_state (GSettings *settings, GtkWidget *tree, const gchar *child - visible = g_settings_get_boolean (pt_settings, key); - g_free (key); - -- column = gtk_tree_view_get_column (GTK_TREE_VIEW (tree), id); -- if (column == NULL) -- continue; -- - gtk_tree_view_column_set_visible (column, visible); - if (visible) { - /* ensure column is really visible */ -PATCH - -changelog "Fix mate-system-monitor bug(s) for Trisquel" - -package - diff --git a/helpers/make-ncurses b/helpers/make-ncurses index 7f494e0..7f5e5e4 100644 --- a/helpers/make-ncurses +++ b/helpers/make-ncurses @@ -25,17 +25,9 @@ VERSION=2 NETINST=true -BUILD_UNTIL=11.0 . ./config -#FIXME:T12 -# Set version number due to source origin change -export FULLVERSION="$(sed 's|ubuntu0.1||' <<< $FULLVERSION)" - -# Apply Debian#1035621: ncurses: FTBFS: dh_autoreconf error on various architectures -patch --no-backup-if-mismatch -p1 < $DATA/bbd46b3955647bf401325951d9f31db054e8d889.patch changelog "Rebuild as udeb dependency for debian-installer and patch dh_autoreconf." -head -n1 debian/changelog | grep -q ubuntu && echo "error: update upstream version" && exit package diff --git a/helpers/make-nodejs b/helpers/make-nodejs deleted file mode 100644 index 20e012c..0000000 --- a/helpers/make-nodejs +++ /dev/null @@ -1,30 +0,0 @@ -#!/bin/sh -# -# Copyright (C) 2022 Luis Guzmán -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA -# - - -VERSION=0 -EXTERNAL='deb-src http://ppa.launchpadcontent.net/mozillateam/build-support/ubuntu $UPSTREAM main' -REPOKEY=9BDB3D89CE49EC21 -BACKPORTS=true -BUILD_UNTIL=11.0 -. ./config - - -changelog "Import as dependency of newer abrowser (deb) dependencies." -package diff --git a/helpers/make-opendht b/helpers/make-opendht deleted file mode 100644 index a5f0957..0000000 --- a/helpers/make-opendht +++ /dev/null @@ -1,36 +0,0 @@ -#!/bin/sh -# -# Copyright (C) 2023 Luis Guzmán -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA -# - -VERSION=1 -EXTERNAL='deb-src http://ftp.us.debian.org/debian bookworm main' -REPOKEY=6ED0E7B82643E131 -BUILD_UNTIL=11.0 -. ./config - -#Remove symbols missing at trisquel -sed -i '/ZNSt12_Vector_baseIhSaIhEED1Ev@Base/d' debian/libopendht-c2.symbols -sed -i '/ZNSt12_Vector_baseIhSaIhEED2Ev@Base/d' debian/libopendht-c2.symbols -sed -i '/ZNSt14_Function_baseD1Ev@Base/d' debian/libopendht-c2.symbols -sed -i '/ZNSt14_Function_baseD2Ev@Base/d' debian/libopendht-c2.symbols -sed -i '/ZNSt16_Sp_counted_baseILN9__gnu_cxx12_Lock_policyE2EE10_M/d' debian/libopendht-c2.symbols -sed -i '/ZNSt16_Sp_counted_baseILN9__gnu_cxx12_Lock_policyE2EE24_M/d' debian/libopendht-c2.symbols - -changelog "Imported into trisquel backports as part of jami dependency." - -package diff --git a/helpers/make-pkg-kde-tools b/helpers/make-pkg-kde-tools deleted file mode 100644 index b361a7c..0000000 --- a/helpers/make-pkg-kde-tools +++ /dev/null @@ -1,34 +0,0 @@ -#!/bin/sh -# -# Copyright (C) 2023 Luis Guzman -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA -# - -VERSION=2 -EXTERNAL='deb-src http://archive.ubuntu.com/ubuntu noble universe' -BACKPORT=true -BUILD_UNTIL=11.0 - -. ./config - -# Fix version number due to early release. -export FULLVERSION="$(sed 's|ubuntu1||' <<< $FULLVERSION)" - - -changelog "Backported from noble as dependency of libsrtp2 for openssl 3.0 support. || Route backport to upstream ubuntu." -head -n1 debian/changelog | grep -q ubuntu && echo "error: update FULLVERSION value" && exit - -package diff --git a/helpers/make-profanity b/helpers/make-profanity deleted file mode 100644 index 7a9b389..0000000 --- a/helpers/make-profanity +++ /dev/null @@ -1,32 +0,0 @@ -#!/bin/sh -# -# Copyright (C) 2023 Luis Guzman -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA -# - -VERSION=1 -EXTERNAL='deb-src http://ftp.debian.org/debian bullseye-backports main' -REPOKEY=0E98404D386FA1D9 -DEPENDS=libstrophe -BACKPORT=true -BUILD_UNTIL=11.0 - -. ./config - - -changelog "Backported from debian bullseye fixing logs issues." - -package diff --git a/helpers/make-pupnp b/helpers/make-pupnp deleted file mode 100644 index 7330308..0000000 --- a/helpers/make-pupnp +++ /dev/null @@ -1,29 +0,0 @@ -#!/bin/sh -# -# Copyright (C) 2023 Luis Guzman -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA -# - -VERSION=1 -EXTERNAL='deb-src http://ftp.debian.org/debian trixie main' -REPOKEY=6ED0E7B82643E131 -BACKPORT=true -BUILD_UNTIL=11.0 -. ./config - -changelog "Imported into trisquel backports as part of jami dependency." - -package diff --git a/helpers/make-pygame b/helpers/make-pygame deleted file mode 100644 index 015dc37..0000000 --- a/helpers/make-pygame +++ /dev/null @@ -1,35 +0,0 @@ -#!/bin/sh -# -# Copyright (C) 2024 Luis Guzmán -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA -# - -VERSION=1 -BUILD_UNTIL=11.0 - -. ./config - -# 01_Rebuild to use the latest SDL support on aramo. -# 02_SDL_CreateWindowFrom in "display" module -for patch in $(ls -v ${DATA}/*.patch) -do - echo "Applying $patch" - patch --no-backup-if-mismatch -Np1 < $patch -done - -changelog "Rebuild to use the latest SDL support on aramo. | Fix 'SDL_CreateWindowFrom' in 'display' module" - -package diff --git a/helpers/make-python-nbxmpp b/helpers/make-python-nbxmpp deleted file mode 100644 index 99a8f56..0000000 --- a/helpers/make-python-nbxmpp +++ /dev/null @@ -1,29 +0,0 @@ -#!/bin/sh -# -# Copyright (C) 2022 Luis Guzmán -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA -# - -VERSION=0 -EXTERNAL='deb-src http://ftp.debian.org/debian bullseye-backports main' -REPOKEY=0E98404D386FA1D9 -BUILD_UNTIL=11.0 -BACKPORTS=true -. ./config - - -changelog "Backport as a dependency for gajim backport from debian." -package diff --git a/helpers/make-restinio b/helpers/make-restinio deleted file mode 100644 index 7330308..0000000 --- a/helpers/make-restinio +++ /dev/null @@ -1,29 +0,0 @@ -#!/bin/sh -# -# Copyright (C) 2023 Luis Guzman -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA -# - -VERSION=1 -EXTERNAL='deb-src http://ftp.debian.org/debian trixie main' -REPOKEY=6ED0E7B82643E131 -BACKPORT=true -BUILD_UNTIL=11.0 -. ./config - -changelog "Imported into trisquel backports as part of jami dependency." - -package diff --git a/helpers/make-tre b/helpers/make-tre deleted file mode 100644 index 2328928..0000000 --- a/helpers/make-tre +++ /dev/null @@ -1,28 +0,0 @@ -#!/bin/sh -# -# Copyright (C) 2023 Luis Guzmán -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA -# - -VERSION=0 -BUILD_UNTIL=11.0 - -. ./config - - -changelog "Add helper to force re-index on i386 repo." - -package diff --git a/helpers/make-unknown-horizons b/helpers/make-unknown-horizons deleted file mode 100644 index e3200dc..0000000 --- a/helpers/make-unknown-horizons +++ /dev/null @@ -1,32 +0,0 @@ -#!/bin/sh -# -# Copyright (C) 2024 Luis Guzmán -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA -# - -VERSION=0 -EXTERNAL='deb-src http://ftp.us.debian.org/debian bookworm main' -REPOKEY=6ED0E7B82643E131 -BUILD_UNTIL=11.0 - -. ./config - -# Restore unifont.ttf usage for T11.0 only. -sed -i 's|/usr/share/fonts/opentype/unifont/unifont.otf|/usr/share/fonts/truetype/unifont/unifont.ttf|' debian/links - -changelog "Backport latest fixes from bookworm, while still using unifont.ttf on aramo." - -package