From 03f193cb0758ee177887292733f7e01d118d63df Mon Sep 17 00:00:00 2001 From: Luis Guzman Date: Wed, 8 Jul 2020 00:48:47 -0500 Subject: [PATCH 1/9] Fix lmms dependencies for i386 build --- helpers/make-khronos-api | 29 +++++++++++++++++++++++++++++ helpers/make-lmms | 1 + helpers/make-unicode-data | 29 +++++++++++++++++++++++++++++ helpers/make-wine | 30 ++++++++++++++++++++++++++++++ 4 files changed, 89 insertions(+) create mode 100644 helpers/make-khronos-api create mode 100644 helpers/make-unicode-data create mode 100644 helpers/make-wine diff --git a/helpers/make-khronos-api b/helpers/make-khronos-api new file mode 100644 index 0000000..bbfa233 --- /dev/null +++ b/helpers/make-khronos-api @@ -0,0 +1,29 @@ +#!/bin/sh +# +# Copyright (C) 2020 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 oldstable-backports main' +REPOKEY=04EE7237B7D453EC +BACKPORT=true + +. ./config + +changelog "Backported from debian old stable backports" + +compile diff --git a/helpers/make-lmms b/helpers/make-lmms index de0dd7f..72f9cb3 100644 --- a/helpers/make-lmms +++ b/helpers/make-lmms @@ -21,6 +21,7 @@ VERSION=1 EXTERNAL='deb-src http://archive.ubuntu.com/ubuntu focal main universe' REPOKEY="3B4FE6ACC0B21F32" BACKPORTS=true +DEPENDS=wine . ./config diff --git a/helpers/make-unicode-data b/helpers/make-unicode-data new file mode 100644 index 0000000..bbfa233 --- /dev/null +++ b/helpers/make-unicode-data @@ -0,0 +1,29 @@ +#!/bin/sh +# +# Copyright (C) 2020 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 oldstable-backports main' +REPOKEY=04EE7237B7D453EC +BACKPORT=true + +. ./config + +changelog "Backported from debian old stable backports" + +compile diff --git a/helpers/make-wine b/helpers/make-wine new file mode 100644 index 0000000..33971c3 --- /dev/null +++ b/helpers/make-wine @@ -0,0 +1,30 @@ +#!/bin/sh +# +# Copyright (C) 2020 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 oldstable-backports main' +REPOKEY=04EE7237B7D453EC +BACKPORT=true +DEPENDS=khronos-api,unicode-data + +. ./config + +changelog "Backported from debian old stable backports" + +compile From 510495eabe73e77a352253bfdf5b328646ddd3bf Mon Sep 17 00:00:00 2001 From: Luis Guzman Date: Sun, 12 Jul 2020 16:59:53 -0500 Subject: [PATCH 2/9] Bump version IOT fix wrong versioning --- helpers/make-handbrake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/helpers/make-handbrake b/helpers/make-handbrake index 04762c7..0a82d47 100644 --- a/helpers/make-handbrake +++ b/helpers/make-handbrake @@ -17,7 +17,7 @@ # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA # -VERSION=1 +VERSION=2 EXTERNAL="deb-src http://ppa.launchpad.net/stebbins/handbrake-releases/ubuntu bionic main" REPOKEY="8771ADB0816950D8" BACKPORT=true From 6a006d3c8f75e4086cccce3c7d51cc4a13a2853e Mon Sep 17 00:00:00 2001 From: Ruben Rodriguez Date: Sun, 12 Jul 2020 23:49:31 -0400 Subject: [PATCH 3/9] Disabled dynamic motd --- helpers/make-base-files | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/helpers/make-base-files b/helpers/make-base-files index b9e6633..69eb70d 100644 --- a/helpers/make-base-files +++ b/helpers/make-base-files @@ -1,6 +1,6 @@ #!/bin/sh # -# Copyright (C) 2008-2016 Rubén Rodríguez +# Copyright (C) 2008-2020 Rubén Rodríguez # # 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 @@ -17,12 +17,16 @@ # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA # -VERSION=1 +VERSION=2 . ./config CODENAMECAPS=$(echo $CODENAME | /bin/sed -e "s/\b\(.\)/\u\1/g") +# Disable dynamic motd +find -name *motd-news* -delete +sed '/motd-news/d' -i debian/rules + cat << EOF > update-motd.d/01-banner #!/bin/sh echo "\ From 02848cff88db64f427899a3a34e0f76f0b1454c1 Mon Sep 17 00:00:00 2001 From: Ruben Rodriguez Date: Sun, 12 Jul 2020 23:58:09 -0400 Subject: [PATCH 4/9] update-manager: fixed hwe-support-status --- helpers/make-update-manager | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/helpers/make-update-manager b/helpers/make-update-manager index 5141c7f..4798e31 100644 --- a/helpers/make-update-manager +++ b/helpers/make-update-manager @@ -1,6 +1,6 @@ #!/bin/sh # -# Copyright (C) 2008-2018 Ruben Rodriguez +# Copyright (C) 2008-2020 Ruben Rodriguez # Copyright (C) 2019 Mason Hock # # This program is free software; you can redistribute it and/or modify @@ -18,13 +18,13 @@ # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA # -VERSION=9 +VERSION=10 . ./config rm UpdateManager/Core/LivePatchSocket.py rm tests/test_livepatch_socket.py -patch -p1 < $DATA/remove-livepatch.patch +patch --no-backup-if-mismatch -p1 < $DATA/remove-livepatch.patch sed -i '/import LivePatchSocket/d' UpdateManager/Dialogs.py sed -i '/self.check_livepatch_status/d' UpdateManager/Dialogs.py @@ -49,10 +49,10 @@ EOF replace internet Internet . replace Ubuntu Trisquel . +replace TrisquelDistroInfo UbuntuDistroInfo . replace "Trisquel-Gettext" "Ubuntu-Gettext" . sed -i 's/Trisquel 16.04 LTS to Trisquel 18.04 LTS/Trisquel 8.0 LTS to Trisquel 9.0 LTS/' HweSupportStatus/consts.py -sed -i 's/TrisquelDistroInfo/UbuntuDistroInfo/' UpdateManager/UpdateManager.py replace ubuntu-desktop trisquel . replace kubuntu-desktop triskel . From a2bd1805dbfc9755fd83096ee00142947f3093a8 Mon Sep 17 00:00:00 2001 From: Ruben Rodriguez Date: Fri, 17 Jul 2020 18:10:11 -0400 Subject: [PATCH 5/9] Added make-linux-meta-hwe --- helpers/make-linux-meta-hwe | 36 ++++++++++++++++++++++++++++++++++++ 1 file changed, 36 insertions(+) create mode 100644 helpers/make-linux-meta-hwe diff --git a/helpers/make-linux-meta-hwe b/helpers/make-linux-meta-hwe new file mode 100644 index 0000000..ecabcc9 --- /dev/null +++ b/helpers/make-linux-meta-hwe @@ -0,0 +1,36 @@ +#!/bin/sh +# +# Copyright (C) 2017-2018 Ruben Rodriguez +# +# 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=5 +. ./config + +rm ./debian/control.d/signed-generic + +sed 's/18.04/9.0/g; s/16.04 to 16.10/8.0/; s/16.04/8.0/; s/Xenial/Flidas/; s/Bionic/Etiona/' -i debian/control +sed 's/linux-firmware/firmware-linux-free/' -i debian/control ./debian/control.d/generic debian/control.d/lowlatency +sed 's/Ubuntu/upstream/' -i debian/control +sed 's/Linux/Linux-libre/g' -i debian/control ./debian/control.d/generic debian/control.d/lowlatency +sed '/signed/,/^$/ d' -i debian/control +sed 's/, intel-microcode \[amd64 i386\]//; s/, amd64-microcode \[amd64 i386\]//;' debian/control debian/control.d/generic debian/control.d/lowlatency -i +find debian/control.d/ -type f | grep -v -e '/generic$' -e '/lowlatency$' -e '/virtual$' |xargs rm + + +changelog "Removed linux-firmware dependency, renamed release for Trisquel" + +compile From 4d0820d9e532e323620386dcf8795706f6849442 Mon Sep 17 00:00:00 2001 From: Ruben Rodriguez Date: Sat, 18 Jul 2020 15:59:27 -0400 Subject: [PATCH 6/9] Added make-libva --- helpers/make-libva | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) create mode 100644 helpers/make-libva diff --git a/helpers/make-libva b/helpers/make-libva new file mode 100644 index 0000000..2b3b34f --- /dev/null +++ b/helpers/make-libva @@ -0,0 +1,28 @@ +#!/bin/sh +# +# Copyright (C) 2020 Ruben Rodriguez +# +# 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 '/nouveau/d' -i va/drm/va_drm_utils.c + +changelog "Disabled nouveau support" + +compile From 32d209cdb309283974f17a3157ec650cdd5e6653 Mon Sep 17 00:00:00 2001 From: Ruben Rodriguez Date: Sat, 18 Jul 2020 16:39:42 -0400 Subject: [PATCH 7/9] Added make-x11-utils --- helpers/make-x11-utils | 29 +++++++++++++++++++++++++++++ 1 file changed, 29 insertions(+) create mode 100644 helpers/make-x11-utils diff --git a/helpers/make-x11-utils b/helpers/make-x11-utils new file mode 100644 index 0000000..7f17a62 --- /dev/null +++ b/helpers/make-x11-utils @@ -0,0 +1,29 @@ +#!/bin/sh +# +# Copyright (C) 2020 Ruben Rodriguez +# +# 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 focal main universe' +REPOKEY="3B4FE6ACC0B21F32" + +. ./config + +changelog "Backported from focal, fixes broken xdriinfo in bionic" + +compile + From 06ffd1032046b37081ee09f2a5cd4c99cb65a70e Mon Sep 17 00:00:00 2001 From: Ruben Rodriguez Date: Sun, 19 Jul 2020 02:12:34 -0400 Subject: [PATCH 8/9] make-kubuntu-settings: custom gtk settings --- helpers/make-kubuntu-settings | 55 ++++++++++++++++++++++++++++++++++- 1 file changed, 54 insertions(+), 1 deletion(-) diff --git a/helpers/make-kubuntu-settings b/helpers/make-kubuntu-settings index ade24ce..86c8672 100644 --- a/helpers/make-kubuntu-settings +++ b/helpers/make-kubuntu-settings @@ -17,7 +17,7 @@ # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA # -VERSION=3 +VERSION=4 COMPONENT=main . ./config @@ -96,6 +96,59 @@ Engine=none Theme=none EOF +cat << EOF1 > debian/triskel-settings-desktop.preinst +#!/bin/sh + +[ -d /etc/gtk-3.0 ] || mkdir /etc/gtk-3.0 && chmod 755 /etc/gtk-3.0 +[ -d /etc/gtk-2.0 ] || mkdir /etc/gtk-2.0 && chmod 755 /etc/gtk-2.0 + +item="/etc/gtk-3.0/settings.ini" + +grep -qi Breeze \$item && exit 0 || true +[ -f "\$item"".ubuntu" ] && exit 0 || true + +dpkg-divert --package trisquel-desktop-common-data --add --rename --divert "\$item"".ubuntu" "\$item" + +cat << EOF > \$item +[Settings] +gtk-theme-name = Breeze +gtk-icon-theme-name = Breeze +gtk-fallback-icon-theme = Trisquel +gtk-sound-theme-name = Trisquel +gtk-font-name=Sans Serif Regular 10 +gtk-menu-images=1 +gtk-button-images=1 +gtk-toolbar-style=GTK_TOOLBAR_BOTH_HORIZ +gtk-icon-sizes = panel-menu-bar=24,24 +EOF + +item="/etc/gtk-2.0/gtkrc" + +grep -qi Breeze \$item && exit 0 || true + +dpkg-divert --package trisquel-desktop-common-data --add --rename --divert "\$item"".ubuntu" "\$item" + +cat << EOF > \$item +include "/usr/share/themes/Breeze/gtk-2.0/gtkrc" +style "user-font" +{ + font_name="Sans Serif Regular" +} +widget_class "*" style "user-font" +gtk-font-name="Sans Serif Regular 10" +gtk-theme-name="Breeze" +gtk-icon-theme-name="breeze" +gtk-fallback-icon-theme="trisquel" +gtk-cursor-theme-name="Breeze_Snow" +gtk-toolbar-style=GTK_TOOLBAR_BOTH_HORIZ +gtk-menu-images=1 +gtk-button-images=1 +gtk-primary-button-warps-slider=0 +EOF + +EOF1 +chmod 755 debian/triskel-settings-desktop.preinst + sed '1s/triskel/kubuntu/' -i debian/control cp $DATA/start.svgz desktop/theme/desktoptheme/triskel/icons/start.svgz From 0790e23a995b76d8b9ffaed6201c0f524c8b8269 Mon Sep 17 00:00:00 2001 From: Ruben Rodriguez Date: Sun, 19 Jul 2020 17:44:24 -0400 Subject: [PATCH 9/9] debian-installer version bump --- helpers/make-debian-installer | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/helpers/make-debian-installer b/helpers/make-debian-installer index e14709e..336b790 100644 --- a/helpers/make-debian-installer +++ b/helpers/make-debian-installer @@ -17,7 +17,7 @@ # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA # -VERSION=6 +VERSION=7 NETINST=true . ./config