Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
P
package-helpers
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Deploy
Releases
Model registry
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
trisquel
package-helpers
Commits
95edfb11
Commit
95edfb11
authored
6 months ago
by
Luis Guzmán
Committed by
Luis Guzmán
6 months ago
Browse files
Options
Downloads
Patches
Plain Diff
gnome-software: remove fwup and snap support from gnome-software.
parent
05320ef1
No related branches found
Branches containing commit
No related tags found
1 merge request
!1491
gnome-software: remove fwup and snap support from gnome-software.
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
helpers/DATA/gnome-software/rm_snap_fwup_support.patch
+87
-0
87 additions, 0 deletions
helpers/DATA/gnome-software/rm_snap_fwup_support.patch
helpers/make-gnome-software
+28
-0
28 additions, 0 deletions
helpers/make-gnome-software
with
115 additions
and
0 deletions
helpers/DATA/gnome-software/rm_snap_fwup_support.patch
0 → 100644
+
87
−
0
View file @
95edfb11
diff --git a/debian/control b/debian/control
index 7262a65c..497779f7 100644
--- a/debian/control
+++ b/debian/control
@@ -60,10 +60,8 @@
Depends: appstream,
${misc:Depends},
${shlibs:Depends}
Conflicts: sessioninstaller
-Recommends: fwupd [linux-any],
- ${plugin:Recommends}
+Recommends: ${plugin:Recommends}
Suggests: apt-config-icons-hidpi,
- gnome-software-plugin-flatpak [amd64 arm64 armel armhf i386 mipsel mips64el ppc64el s390x hppa powerpc ppc64 riscv64 x32],
${plugin:Suggests}
Description: Software Center for GNOME
Software lets you install and update applications and system extensions.
@@ -106,26 +106,6 @@
Description: Flatpak support for GNOME Software
.
This package contains the Flatpak plugin.
-Package: gnome-software-plugin-snap
-Architecture: amd64 arm64 armel armhf i386 ppc64el s390x
-Depends: gnome-software (= ${binary:Version}),
- snapd [amd64 arm64 armel armhf i386 ppc64el],
- ${misc:Depends},
- ${shlibs:Depends}
-Recommends: snapd [s390x]
-Breaks: gnome-software (<< 3.22.3)
-Replaces: gnome-software (<< 3.22.3)
-Description: Snap support for GNOME Software
- Software lets you install and update applications and system extensions.
- .
- Software uses a plugin architecture to separate the frontend from the
- technologies that are used underneath. Currently, a PackageKit plugin provides
- data from a number of traditional packaging systems, such as rpm or apt. An
- appdata plugin provides additional metadata from locally installed data in the
- appdata format.
- .
- This package contains the Snap plugin.
-
Package: gnome-software-dev
Section: libdevel
Architecture: any
diff --git a/debian/rules b/debian/rules
index f0bb2394..58b4bc70 100755
--- a/debian/rules
+++ b/debian/rules
@@ -30,11 +30,11 @@
ifeq ($(DEB_HOST_ARCH_OS), linux)
GS_CONFIGURE_FLAGS += -Dgudev=true
# Enable fwupd support on Linux
- GS_CONFIGURE_FLAGS += -Dfwupd=true
+ GS_CONFIGURE_FLAGS += -Dfwupd=false
# Enable snap support on supported architectures
ifneq (,$(filter $(DEB_HOST_ARCH), amd64 arm64 armel armhf i386 ppc64el s390x))
- GS_CONFIGURE_FLAGS += -Dsnap=true
+ GS_CONFIGURE_FLAGS += -Dsnap=false
endif
endif
@@ -42,9 +42,9 @@
DISTRO_ID = debian
FREE_REPOS = \'@DISTRO@-*-main\'
FREE_URL = https:\/\/www.debian.org\/social_contract\#guidelines
ifeq (yes,$(shell dpkg-vendor --derives-from Ubuntu && echo yes))
- DISTRO_ID = ubuntu
- FREE_REPOS = \'@DISTRO@-*-main\', \'@DISTRO@-*-universe\'
- FREE_URL = https:\/\/www.ubuntu.com\/about\/about-ubuntu\/licensing
+ DISTRO_ID = trisquel
+ FREE_REPOS = \'@DISTRO@-*-main\'
+ FREE_URL = https:\/\/trisquel.info\/legal
else ifeq (yes,$(shell dpkg-vendor --derives-from Tanglu && echo yes))
DISTRO_ID = tanglu
else ifeq (yes,$(shell dpkg-vendor --derives-from PureOS && echo yes))
@@ -87,11 +87,7 @@
override_dh_shlibdeps:
override_dh_auto_test:
override_dh_gencontrol:
-ifeq ($(shell dpkg-vendor --query vendor),Ubuntu)
- dh_gencontrol -- -Vplugin:Recommends='gnome-software-plugin-snap [linux-any]'
-else
- dh_gencontrol -- -Vplugin:Suggests='gnome-software-plugin-snap [linux-any]'
-endif
+ dh_gencontrol
override_dh_clean:
rm -f debian/gnome-software.gsettings-override
This diff is collapsed.
Click to expand it.
helpers/make-gnome-software
0 → 100644
+
28
−
0
View file @
95edfb11
#!/bin/sh
#
# Copyright (C) 2024 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
.
./config
# Remove snap and fwup support
patch_p1
$DATA
/rm_snap_fwup_support.patch
rm
debian/gnome-software-plugin-snap.install
changelog
"Disable snap plugin support in Trisquel"
package
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment