misc: 2nd general review of helpers.
This commit is contained in:
parent
df6774d1fe
commit
372a379e8a
36 changed files with 16 additions and 5662 deletions
|
|
@ -1,53 +0,0 @@
|
|||
diff --git a/bin/casper-snapshot b/bin/casper-snapshot
|
||||
index ab075292..33243f63 100755
|
||||
--- a/bin/casper-snapshot
|
||||
+++ b/bin/casper-snapshot
|
||||
@@ -33,7 +33,7 @@ VERSION=0.0.1
|
||||
if [ -e /etc/casper.conf ]; then
|
||||
. /etc/casper.conf
|
||||
else
|
||||
- USERNAME=$(cat /etc/passwd | grep "999" | cut -f1 -d ':')
|
||||
+ USERNAME=$(cat /etc/passwd | grep "1000" | cut -f1 -d ':')
|
||||
HOSTNAME=$(hostname)
|
||||
BUILD_SYSTEM="Debian"
|
||||
fi
|
||||
diff --git a/scripts/casper-bottom/15autologin b/scripts/casper-bottom/15autologin
|
||||
index d6c75e66..c80e2058 100755
|
||||
--- a/scripts/casper-bottom/15autologin
|
||||
+++ b/scripts/casper-bottom/15autologin
|
||||
@@ -90,9 +90,6 @@ if [ -f /root/usr/bin/sddm ]; then
|
||||
sddm_session=QLubuntu.desktop
|
||||
fi
|
||||
cat >>/root/etc/sddm.conf <<EOF
|
||||
-[Users]
|
||||
-MinimumUid=999
|
||||
-
|
||||
[Autologin]
|
||||
User=$USERNAME
|
||||
Session=$sddm_session
|
||||
diff --git a/scripts/casper-bottom/25adduser b/scripts/casper-bottom/25adduser
|
||||
index 8320e710..efbf5677 100755
|
||||
--- a/scripts/casper-bottom/25adduser
|
||||
+++ b/scripts/casper-bottom/25adduser
|
||||
@@ -57,7 +57,8 @@ db_set passwd/root-password-crypted '*'
|
||||
db_set passwd/user-password-crypted U6aMy0wojraho
|
||||
db_set passwd/user-fullname "$USERFULLNAME"
|
||||
db_set passwd/username "$USERNAME"
|
||||
-db_set passwd/user-uid 999
|
||||
+# Per LP: #2004092, systemd uses 995-999
|
||||
+db_set passwd/user-uid 1000
|
||||
|
||||
chroot /root /usr/lib/user-setup/user-setup-apply > /dev/null
|
||||
if [ ! -f /root/usr/bin/sddm ]; then
|
||||
@@ -93,11 +94,6 @@ for file in /usr/share/applications/ubiquity.desktop /usr/share/applications/kde
|
||||
fi
|
||||
done
|
||||
|
||||
-# GDM
|
||||
-if [ -d /root/etc/gdm3 ]; then
|
||||
- sed -i '/^[UG]ID_MIN/s/\<1000$/ 999/' /root/etc/login.defs
|
||||
-fi
|
||||
-
|
||||
# Kubuntu
|
||||
if [ -f "/root/usr/bin/plasma-desktop" ]; then
|
||||
if [ -f "/root/usr/share/kde4/apps/khelpcenter/plugins/kubuntu/a_welcome.desktop" ]; then
|
||||
|
|
@ -1,14 +0,0 @@
|
|||
# Fixes https://gitlab.trisquel.org/trisquel/package-helpers/-/issues/148
|
||||
|
||||
diff --git a/debian/control b/debian/control
|
||||
index 3297b1c..37ff49a 100644
|
||||
--- a/debian/control
|
||||
+++ b/debian/control
|
||||
@@ -28,6 +28,7 @@ Depends: ${shlibs:Depends},
|
||||
accountsservice,
|
||||
group-service,
|
||||
mate-desktop-common,
|
||||
+ cracklib-runtime,
|
||||
Description: MATE User Manager
|
||||
User and group management utility suitable for lightweight desktop
|
||||
environments such as MATE or Xfce.
|
||||
|
|
@ -1,77 +0,0 @@
|
|||
Remove _xmppconnect support
|
||||
|
||||
It has always been vulnerable to MITM attacks when it is not used with DNSSEC,
|
||||
and has been removed from XEP-0156 because of that. We have been issued
|
||||
CVE-2022-26491 for this issue.
|
||||
|
||||
More discussion can be found at
|
||||
https://mail.jabber.org/pipermail/standards/2022-February/038759.html.
|
||||
|
||||
Testing Done:
|
||||
Compiled
|
||||
|
||||
Reviewed at https://reviews.imfreedom.org/r/1357/
|
||||
|
||||
--- a/libpurple/protocols/jabber/jabber.c Sat Apr 23 05:05:54 2022 -0500
|
||||
+++ b/libpurple/protocols/jabber/jabber.c Wed Apr 27 23:41:06 2022 -0500
|
||||
@@ -798,48 +798,6 @@
|
||||
}
|
||||
|
||||
static void
|
||||
-txt_resolved_cb(GList *responses, gpointer data)
|
||||
-{
|
||||
- JabberStream *js = data;
|
||||
- gboolean found = FALSE;
|
||||
-
|
||||
- js->srv_query_data = NULL;
|
||||
-
|
||||
- while (responses) {
|
||||
- PurpleTxtResponse *resp = responses->data;
|
||||
- gchar **token;
|
||||
- token = g_strsplit(purple_txt_response_get_content(resp), "=", 2);
|
||||
- if (purple_strequal(token[0], "_xmpp-client-xbosh")) {
|
||||
- purple_debug_info("jabber","Found alternative connection method using %s at %s.\n", token[0], token[1]);
|
||||
- js->bosh = jabber_bosh_connection_init(js, token[1]);
|
||||
- g_strfreev(token);
|
||||
- break;
|
||||
- }
|
||||
- g_strfreev(token);
|
||||
- purple_txt_response_destroy(resp);
|
||||
- responses = g_list_delete_link(responses, responses);
|
||||
- }
|
||||
-
|
||||
- if (js->bosh) {
|
||||
- found = TRUE;
|
||||
- jabber_bosh_connection_connect(js->bosh);
|
||||
- }
|
||||
-
|
||||
- if (!found) {
|
||||
- purple_debug_warning("jabber", "Unable to find alternative XMPP connection "
|
||||
- "methods after failing to connect directly.\n");
|
||||
- purple_connection_error_reason(js->gc,
|
||||
- PURPLE_CONNECTION_ERROR_NETWORK_ERROR,
|
||||
- _("Unable to connect"));
|
||||
- return;
|
||||
- }
|
||||
-
|
||||
- if (responses) {
|
||||
- g_list_free_full(responses, (GDestroyNotify)purple_txt_response_destroy);
|
||||
- }
|
||||
-}
|
||||
-
|
||||
-static void
|
||||
jabber_login_callback(gpointer data, gint source, const gchar *error)
|
||||
{
|
||||
PurpleConnection *gc = data;
|
||||
@@ -849,11 +807,6 @@
|
||||
if (js->srv_rec != NULL) {
|
||||
purple_debug_error("jabber", "Unable to connect to server: %s. Trying next SRV record or connecting directly.\n", error);
|
||||
try_srv_connect(js);
|
||||
- } else {
|
||||
- purple_debug_info("jabber","Couldn't connect directly to %s. Trying to find alternative connection methods, like BOSH.\n", js->user->domain);
|
||||
- js->srv_query_data = purple_txt_resolve_account(
|
||||
- purple_connection_get_account(gc), "_xmppconnect",
|
||||
- js->user->domain, txt_resolved_cb, js);
|
||||
}
|
||||
return;
|
||||
}
|
||||
|
|
@ -1,32 +0,0 @@
|
|||
diff -Nru psensor-1.1.5/debian/patches/fix-ftbfs.patch psensor-1.1.5/debian/patches/fix-ftbfs.patch
|
||||
--- psensor-1.1.5/debian/patches/fix-ftbfs.patch 1970-01-01 01:00:00.000000000 +0100
|
||||
+++ psensor-1.1.5/debian/patches/fix-ftbfs.patch 2022-09-02 23:32:48.000000000 +0100
|
||||
@@ -0,0 +1,20 @@
|
||||
+Description: Fix FTBFS with gcc-11
|
||||
+ Fix the indentation while keeping the logic same as before.
|
||||
+
|
||||
+Author: Sudip Mukherjee <sudipm.mukherjee@gmail.com>
|
||||
+---
|
||||
+
|
||||
+Bug-Debian: https://bugs.debian.org/984298
|
||||
+Forwarded: no
|
||||
+
|
||||
+--- psensor-1.1.5.orig/src/lib/pudisks2.c
|
||||
++++ psensor-1.1.5/src/lib/pudisks2.c
|
||||
+@@ -83,7 +83,7 @@ static void smart_update(struct psensor
|
||||
+ PROVIDER_NAME,
|
||||
+ data->path);
|
||||
+
|
||||
+- data->last_smart_update = t;
|
||||
++ data->last_smart_update = t;
|
||||
+ }
|
||||
+
|
||||
+ void udisks2_psensor_list_update(struct psensor **sensors)
|
||||
diff -Nru psensor-1.1.5/debian/patches/series psensor-1.1.5/debian/patches/series
|
||||
--- psensor-1.1.5/debian/patches/series 2021-02-06 19:50:55.000000000 +0000
|
||||
+++ psensor-1.1.5/debian/patches/series 2022-09-02 23:33:02.000000000 +0100
|
||||
@@ -1,3 +1,4 @@
|
||||
0001-Update-rsensor.c-drop-is_error-macro-definition.patch
|
||||
14.patch
|
||||
ayatana-appindicator.patch
|
||||
+fix-ftbfs.patch
|
||||
|
|
@ -1,27 +0,0 @@
|
|||
From b7dd425660c420466d951f09e3c67e9d5f9eec90 Mon Sep 17 00:00:00 2001
|
||||
From: Aline Gondim Santos <aline.gondimsantos@savoirfairelinux.com>
|
||||
Date: Wed, 5 Oct 2022 10:19:27 -0300
|
||||
Subject: [PATCH] misc: set frame time_base when decoding
|
||||
|
||||
To properly get the time_base and framerate in the plugins,
|
||||
we need to set the frame properties when decoding.
|
||||
|
||||
GitLab: https://git.jami.net/savoirfairelinux/jami-plugins/-/issues/23
|
||||
|
||||
Change-Id: I69a2235c46b13a15414c4d01821cc1eba5b73987
|
||||
---
|
||||
src/media/media_decoder.cpp | 1 +
|
||||
1 file changed, 1 insertion(+)
|
||||
|
||||
diff --git a/daemon/src/media/media_decoder.cpp b/daemon/src/media/media_decoder.cpp
|
||||
index 7cba58abe63..cd1698a5048 100644
|
||||
--- a/daemon/src/media/media_decoder.cpp
|
||||
+++ b/daemon/src/media/media_decoder.cpp
|
||||
@@ -644,6 +644,7 @@ MediaDecoder::decode(AVPacket& packet)
|
||||
#endif
|
||||
auto frame = f->pointer();
|
||||
ret = avcodec_receive_frame(decoderCtx_, frame);
|
||||
+ frame->time_base = decoderCtx_->time_base;
|
||||
if (resolutionChangedCallback_) {
|
||||
if (decoderCtx_->width != width_ or decoderCtx_->height != height_) {
|
||||
JAMI_DBG("Resolution changed from %dx%d to %dx%d",
|
||||
File diff suppressed because it is too large
Load diff
|
|
@ -25,7 +25,7 @@ VERSION=4
|
|||
cp $DATA/applications.menu menu-data/applications.menu
|
||||
|
||||
# We remove any info about non-free packages
|
||||
egrep -lr 'X-AppInstall-Section=(multiverse|restricted)' . | xargs -r rm
|
||||
grep -lr 'X-AppInstall-Section=(multiverse|restricted)' . | xargs -r rm
|
||||
for i in firefox jockey ndisgtk chromium-browser bughugger testdrive menueditor lp-review-list groundcontrol gstreamer nvidia dell-recovery ubufox thunderbird
|
||||
do
|
||||
find -name *$i*xpm -exec rm {} \;
|
||||
|
|
|
|||
|
|
@ -45,9 +45,6 @@ sed "s/head -n1/sed -n 1p/" -i scripts/casper-functions
|
|||
|
||||
# Set trisquel isos as default suggestion.
|
||||
patch --no-backup-if-mismatch -p1 < $DATA/set_trisquel_iso_suggestion.patch
|
||||
# FIX T11 only: Set live user uid as 1000, which fails due to
|
||||
# systemd taking 999 in later versions (LP: #2004092) remove on T12.
|
||||
patch --no-backup-if-mismatch -p1 < $DATA/set_liveuser_uid_1000.patch
|
||||
|
||||
changelog "Compiled for Trisquel"
|
||||
|
||||
|
|
|
|||
|
|
@ -1,29 +0,0 @@
|
|||
#!/bin/sh
|
||||
#
|
||||
# Copyright (C) 2021 Luis Guzman <ark@switnet.org>
|
||||
#
|
||||
# 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
|
||||
|
||||
. ./config
|
||||
|
||||
sed -i '/libxnvctrl-dev/d' debian/control
|
||||
sed -i 's|DBUILD_NVIDIA=ON|DBUILD_NVIDIA=OFF|g' debian/rules
|
||||
|
||||
changelog "Remove nvidia-settings dependency."
|
||||
|
||||
package
|
||||
|
|
@ -27,11 +27,7 @@ VERSION=2
|
|||
NETINST=true
|
||||
. ./config
|
||||
|
||||
#FIXME:T12
|
||||
# Set version number due to source origin change
|
||||
export FULLVERSION="$(sed 's|ubuntu0.3||' <<< $FULLVERSION)"
|
||||
|
||||
changelog "Fetch and build as udeb dependency for debian-installer."
|
||||
head -n1 debian/changelog | grep -q ubuntu && echo "error: update upstream version" && exit
|
||||
|
||||
package
|
||||
|
|
|
|||
|
|
@ -45,3 +45,4 @@ sed "s#^FAI_DEBOOTSTRAP=.*#FAI_DEBOOTSTRAP=\"$CODENAME http://archive.trisquel.o
|
|||
changelog "Adapted for Trisquel. Fixes #28007"
|
||||
|
||||
package
|
||||
|
||||
|
|
|
|||
|
|
@ -1,28 +0,0 @@
|
|||
#!/bin/sh
|
||||
#
|
||||
# Copyright (C) 2021 Luis Guzman <ark@switnet.org>
|
||||
#
|
||||
# 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
|
||||
|
||||
. ./config
|
||||
|
||||
sed -i '/libxnvctrl-dev/d' debian/control
|
||||
|
||||
changelog "Remove nvidia-settings dependency."
|
||||
|
||||
package
|
||||
|
|
@ -1,28 +0,0 @@
|
|||
#!/bin/sh
|
||||
#
|
||||
# Copyright (C) 2021 Luis Guzman <ark@switnet.org>
|
||||
#
|
||||
# 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
|
||||
|
||||
. ./config
|
||||
|
||||
sed -i '/libxnvctrl-dev/d' debian/control
|
||||
|
||||
changelog "Remove nvidia-settings dependency."
|
||||
|
||||
package
|
||||
|
|
@ -17,23 +17,14 @@
|
|||
# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
|
||||
#
|
||||
|
||||
VERSION=5
|
||||
EXTERNAL='deb-src http://ftp.debian.org/debian bullseye-backports main'
|
||||
REPOKEY=0E98404D386FA1D9
|
||||
VERSION=4
|
||||
EXTERNAL='deb-src http://ftp.debian.org/debian bookworm main'
|
||||
REPOKEY=6ED0E7B82643E131
|
||||
BACKPORT=true
|
||||
|
||||
. ./config
|
||||
|
||||
# Apply patches to use system's libsrtp2
|
||||
for patch in $(ls -v ${DATA}/*.patch)
|
||||
do
|
||||
echo "Applying $patch"
|
||||
patch --no-backup-if-mismatch -Np1 < $patch
|
||||
done
|
||||
|
||||
# Manually remove third_party src
|
||||
rm -r src/third_party/libsrtp
|
||||
|
||||
changelog "Applied libsrtp system usage update to bullseye-backports."
|
||||
changelog "Backported from debian bookworm as a dependency of telegram-desktop"
|
||||
|
||||
package
|
||||
|
|
|
|||
|
|
@ -1,30 +0,0 @@
|
|||
#!/bin/sh
|
||||
#
|
||||
# Copyright (C) 2021 Luis Guzman <ark@switnet.org>
|
||||
#
|
||||
# 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
|
||||
|
||||
. ./config
|
||||
|
||||
sed -i '/libxnvctrl-dev/d' debian/control
|
||||
sed -i '/nvidia/s|yes|no|g' debian/rules
|
||||
rm debian/mate-sensors-applet-nvidia.install
|
||||
|
||||
changelog "Remove nvidia-settings dependency."
|
||||
|
||||
package
|
||||
|
|
@ -1,30 +0,0 @@
|
|||
#!/bin/sh
|
||||
#
|
||||
# Copyright (C) 2023 Luis Guzmán <ark@switnet.org>
|
||||
#
|
||||
# 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://archive.ubuntu.com/ubuntu noble main universe'
|
||||
|
||||
. ./config
|
||||
|
||||
# Add cracklib-runtime dependency to debian/control
|
||||
patch --no-backup-if-mismatch -p1 < $DATA/add-cracklib-runtime-as-dependency.patch
|
||||
|
||||
changelog "Imported into Trisquel Aramo | Added cracklib-runtime dependency."
|
||||
|
||||
package
|
||||
|
|
@ -25,6 +25,6 @@ VERSION=0
|
|||
#Apply path for handle open with, fix LP:#1714264
|
||||
patch --no-backup-if-mismatch -p1 < $DATA/mtpaint-desktop.patch
|
||||
|
||||
changelog "Remove nvidia-settings dependency."
|
||||
changelog "Apply path for handle open with, fix LP:#1714264"
|
||||
|
||||
package
|
||||
|
|
|
|||
|
|
@ -26,4 +26,3 @@ patch --no-backup-if-mismatch -p1 < $DATA/1946.patch
|
|||
changelog "Adding ASC-II trisquel logo update, thanks to @LegoLeprechaun"
|
||||
|
||||
package
|
||||
|
||||
|
|
|
|||
|
|
@ -22,15 +22,10 @@ NETINST=true
|
|||
|
||||
. ./config
|
||||
|
||||
#FIXME:T12
|
||||
# Set version number due to source origin change
|
||||
export FULLVERSION="$(sed 's|ubuntu0.6||' <<< $FULLVERSION)"
|
||||
|
||||
sed 's:Ubuntu:Trisquel\ GNU/Linux:g' -i debian/rules
|
||||
sed "s|^SSH_EXTRAVERSION.*|SSH_EXTRAVERSION := Trisquel_GNU/Linux_$REVISION-$VERSION|" -i debian/rules
|
||||
|
||||
changelog "Rebranded for Trisquel"
|
||||
head -n1 debian/changelog | grep -q ubuntu && echo "error: update upstream version" && exit
|
||||
|
||||
package
|
||||
|
||||
|
|
|
|||
|
|
@ -30,13 +30,6 @@ done
|
|||
|
||||
sed '/PIDGIN_PREFS_ROOT.*conv_focus/s/TRUE/FALSE/' -i pidgin/gtksound.c
|
||||
|
||||
# apply upstream pidgin security fixes / patches not yet in ubuntu.
|
||||
for patch in $(ls -v ${DATA}/cve/*.patch)
|
||||
do
|
||||
echo "Applying $patch"
|
||||
patch --no-backup-if-mismatch -Np1 < $patch
|
||||
done
|
||||
|
||||
changelog "Compiled for Trisquel"
|
||||
|
||||
package
|
||||
|
|
|
|||
|
|
@ -142,4 +142,3 @@ sed s/Ubuntu/Trisquel/ -i debian/plymouth-theme-trisquel-text.postinst
|
|||
changelog "Plymouth themes modified for Trisquel"
|
||||
|
||||
package
|
||||
|
||||
|
|
|
|||
|
|
@ -1,31 +0,0 @@
|
|||
#!/bin/sh
|
||||
#
|
||||
# Copyright (C) 2020 Pablo Correa Gómez <ablocorrea@hotmail.com>
|
||||
#
|
||||
# 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
|
||||
|
||||
. ./config
|
||||
|
||||
sed '/libxnvctrl-dev/d' -i debian/control
|
||||
|
||||
#Apply fix ftbfs patch
|
||||
patch --no-backup-if-mismatch -p1 < $DATA/fix-ftbfs-debian-patch.patch
|
||||
|
||||
changelog "Removed libxnvctrl0 dependency not present in Trisquel"
|
||||
|
||||
package
|
||||
|
|
@ -24,9 +24,6 @@ COMPONENT=main
|
|||
|
||||
. ./config
|
||||
|
||||
# Fix version number due to early release.
|
||||
export FULLVERSION="$(sed 's|ubuntu2||' <<< $FULLVERSION)"
|
||||
|
||||
cat << EOF > data/templates/Trisquel.mirrors
|
||||
#LOC:BR
|
||||
https://trisquel.c3sl.ufpr.br/packages/
|
||||
|
|
@ -109,7 +106,6 @@ EOF
|
|||
export DEB_BUILD_OPTIONS=nocheck
|
||||
|
||||
changelog "Compiled for Trisquel"
|
||||
head -n1 debian/changelog | grep -q ubuntu && echo "error: update FULLVERSION value" && exit
|
||||
|
||||
package
|
||||
|
||||
|
|
|
|||
|
|
@ -22,7 +22,6 @@ VERSION=3
|
|||
|
||||
. ./config
|
||||
|
||||
sed '/libxnvctrl-dev/d' -i debian/control
|
||||
echo "gn_args += safe_browsing_mode=0" >> src/core/config/common.pri
|
||||
|
||||
#Increase parallel restriction (it fails at full speed).
|
||||
|
|
|
|||
|
|
@ -1,71 +0,0 @@
|
|||
#!/bin/sh
|
||||
#
|
||||
# Copyright (C) 2023 Luis Guzman <ark@switnet.org>
|
||||
#
|
||||
# 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
|
||||
#
|
||||
|
||||
EXTERNAL='deb-src http://archive.ubuntu.com/ubuntu noble universe'
|
||||
VERSION=2
|
||||
|
||||
. ./config
|
||||
|
||||
# Fix version number due to source origin change.
|
||||
export FULLVERSION="$(sed 's|ubuntu0.1||' <<< $FULLVERSION)"
|
||||
|
||||
# Add trisquel aramo's dependencies
|
||||
sed -i "/# Qt client/i # trisquel's aramo dependencies" debian/control
|
||||
for i in "libgl1-mesa-dev" \
|
||||
"libqt6opengl6-dev" \
|
||||
"libvulkan-dev" \
|
||||
"libxkbcommon-dev"
|
||||
do
|
||||
sed -i "/# Qt client/i \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ $i," debian/control
|
||||
done
|
||||
|
||||
|
||||
# Add aramo's missing runtime dependencies
|
||||
for i in "libqt6multimediaquick6" \
|
||||
"libqt6quickshapes6" \
|
||||
"libqt6quicktemplates2-6" \
|
||||
"qt6-qpa-plugins"
|
||||
do
|
||||
sed -i "/jami-daemon (=/i \ \ \ \ \ \ \ \ \ $i," debian/control
|
||||
done
|
||||
|
||||
# Remove not available qt libraries at Trisquel 11.0
|
||||
for i in qt6-5compat-dev \
|
||||
qml6-module-qtquick3d-spatialaudio
|
||||
do
|
||||
sed -i "/$i/d" debian/control
|
||||
done
|
||||
|
||||
# Removing ffmpeg time_base feature req. from jami so it builds
|
||||
# against libavutil56 (ffmpeg 4.4). Can be removed on Trisquel 12
|
||||
remove_patch fc975f0cacde4b06c6adde3d7f0c02f71abfb38c.patch
|
||||
patch --no-backup-if-mismatch -R -p1 < $DATA/ffmpeg_time_base_frame.patch
|
||||
|
||||
# Backport latest changes required at experimental - Remove once package
|
||||
# keep up with changes at testing or unstable release.
|
||||
for patch in $(ls -v ${DATA}/debian_backport/*.patch)
|
||||
do
|
||||
echo "Applying $patch"
|
||||
patch --no-backup-if-mismatch -Np1 < $patch
|
||||
done
|
||||
|
||||
changelog "Backport ring/jammi to aramo from LTS noble"
|
||||
head -n1 debian/changelog | grep -q ubuntu && echo "error: update upstream version" && exit
|
||||
|
||||
package
|
||||
|
|
@ -1,27 +0,0 @@
|
|||
#!/bin/sh
|
||||
#
|
||||
# Copyright (C) 2022 Ruben Rodriguez <ruben@trisquel.info>
|
||||
#
|
||||
# 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://archive.ubuntu.com/ubuntu kinetic universe'
|
||||
|
||||
. ./config
|
||||
|
||||
changelog "Backported from kinetic"
|
||||
|
||||
package
|
||||
|
|
@ -1,27 +0,0 @@
|
|||
#!/bin/sh
|
||||
#
|
||||
# Copyright (C) 2022 Ruben Rodriguez <ruben@trisquel.info>
|
||||
#
|
||||
# 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://archive.ubuntu.com/ubuntu kinetic universe'
|
||||
|
||||
. ./config
|
||||
|
||||
changelog "Backported from kinetic"
|
||||
|
||||
package
|
||||
|
|
@ -1,27 +0,0 @@
|
|||
#!/bin/sh
|
||||
#
|
||||
# Copyright (C) 2022 Ruben Rodriguez <ruben@trisquel.info>
|
||||
#
|
||||
# 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://archive.ubuntu.com/ubuntu kinetic universe'
|
||||
|
||||
. ./config
|
||||
|
||||
changelog "Backported from kinetic"
|
||||
|
||||
package
|
||||
|
|
@ -18,17 +18,17 @@
|
|||
#
|
||||
|
||||
VERSION=4
|
||||
EXTERNAL='deb-src http://ftp.debian.org/debian bullseye-backports-sloppy main'
|
||||
REPOKEY=0E98404D386FA1D9
|
||||
EXTERNAL='deb-src http://ftp.debian.org/debian bookworm-backports main'
|
||||
REPOKEY=6ED0E7B82643E131
|
||||
BACKPORT=true
|
||||
|
||||
. ./config
|
||||
|
||||
#Remove stable backport workaround to keep using libmsgsl-dev 3.0
|
||||
sed -i 's|\-I\$(CURDIR)/debian||' debian/rules
|
||||
#sed -i 's|\-I\$(CURDIR)/debian||' debian/rules
|
||||
|
||||
# Bump VERSION=4 to rebuild against newer libtgowt with openssl 3.0 support.
|
||||
|
||||
changelog "Backported from debian bullseye-backports-sloppy | * Bump VERSION=4 to rebuild against libtgowt (0~git20230105.5098730+dfsg-1~bpo11+1+11.0trisquel5) with openssl 3.0 support."
|
||||
changelog "Backported from debian bookworm-backports"
|
||||
|
||||
package
|
||||
|
|
|
|||
|
|
@ -28,6 +28,7 @@ BACKPORT=true
|
|||
. ./config
|
||||
|
||||
sed -i 's|kdevplatform-dev|kdevelop-dev|' debian/control
|
||||
sed -i 's|llvm-13-dev|llvm-14-dev|' debian/control
|
||||
|
||||
changelog "Backport latest release from kde neon archive."
|
||||
|
||||
|
|
|
|||
|
|
@ -24,8 +24,8 @@ BACKPORTS=true
|
|||
. ./config
|
||||
|
||||
# Set on a supported python version
|
||||
sed -i "s|python3.11|python3.10|" debian/control
|
||||
sed -i "/PYBUILD_INTERPRETERS/s|python3.11|python3.10|" debian/rules
|
||||
sed -i "s|python3.11|python3.12|" debian/control
|
||||
sed -i "/PYBUILD_INTERPRETERS/s|python3.11|python3.12|" debian/rules
|
||||
|
||||
changelog "Imported into Trisquel"
|
||||
package
|
||||
|
|
|
|||
|
|
@ -1,29 +0,0 @@
|
|||
#!/bin/sh
|
||||
#
|
||||
# Copyright (C) 2021 Luis Guzman <ark@switnet.org>
|
||||
#
|
||||
# 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
|
||||
|
||||
. ./config
|
||||
|
||||
sed -i '/libxnvctrl-dev/d' debian/control
|
||||
sed -i '/enable-xnvctrl/d' debian/rules
|
||||
|
||||
changelog "Remove nvidia-settings dependency."
|
||||
|
||||
package
|
||||
|
|
@ -1,36 +0,0 @@
|
|||
#!/bin/sh
|
||||
#
|
||||
# Copyright (C) 2011 Rubén Rodríguez <ruben@trisquel.info>
|
||||
# Copyright (C) 2021 Luis Guzman <ark@switnet.net>
|
||||
#
|
||||
# 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=4
|
||||
EXTERNAL='deb-src http://ftp.debian.org/debian bookworm main'
|
||||
REPOKEY=6ED0E7B82643E131
|
||||
. ./config
|
||||
|
||||
SUPPORTED_SITES="https://ytdl-org.github.io/youtube-dl/supportedsites.html"
|
||||
LAST_SUPPORTED="$(tail -n1 debian/control|sed 's|^ ||')"
|
||||
|
||||
sed -i "/Currently supported/s|are:|are at:|" debian/control
|
||||
/bin/sed -n -i '/Currently supported/{p;:a;N;/'$LAST_SUPPORTED'/!ba;s| .*| '$SUPPORTED_SITES'\n|};p' -i debian/control
|
||||
# Make sure it fails if we don't get the wanted output.
|
||||
[ "$SUPPORTED_SITES" != "$(tail -n2 debian/control|awk NF|sed 's|^ ||')" ] && echo -e ">>>Site replacement needs fixing, exiting...<<<\n" && exit
|
||||
|
||||
changelog "Imported into Trisquel"
|
||||
|
||||
package
|
||||
Loading…
Add table
Add a link
Reference in a new issue