From f1d7665995734964a44314acd34197fdd2112c63 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Luis=20Guzm=C3=A1n?= <ark@switnet.org>
Date: Fri, 8 Apr 2022 22:45:41 +0000
Subject: [PATCH] Fix system config printer 11.0
---
helpers/config | 4 ++++
helpers/make-system-config-printer | 10 ++++++++--
2 files changed, 12 insertions(+), 2 deletions(-)
diff --git a/helpers/config b/helpers/config
index 086548dad..9afecb157 100755
--- a/helpers/config
+++ b/helpers/config
@@ -266,4 +266,8 @@ else
fi
}
+remove_patch(){
+ rm debian/patches/$1
+ sed -i "/$1/d" debian/patches/series
+}
diff --git a/helpers/make-system-config-printer b/helpers/make-system-config-printer
index 95d54047b..6d2bcfdb2 100644
--- a/helpers/make-system-config-printer
+++ b/helpers/make-system-config-printer
@@ -22,8 +22,14 @@ COMPONENT=main
. ./config
-sed 's/;GNOME;/;/' debian/patches/05_menu_entries.patch -i
-cp $DATA/testpage* debian/local/
+sed -i '/+NotShowIn/s|;GNOME;|;|g' debian/patches/Hide-Printers-app-in-GNOME-and-KDE.patch \
+ debian/patches/Do-not-autostart-the-applet-on-LXDE-or-Unity.patch
+
+remove_patch Allow-installing-non-free-drivers-from-OpenPrinting.patch
+remove_patch Allow-installing-packages-from-OpenPrinting.patch
+
+#mkdir debian/local/
+#cp $DATA/testpage* debian/local/
#Recommend trisquel-app-installer over gnome-software
sed 's|gnome-software.*|trisquel-app-install,|g' -i debian/control
--
GitLab