Merge branch 'pureos-3-36-1' into 'pureos/sloppy'

Disable some useless options

See merge request !6

debian/control

@@ -55,7 +55,6 @@ Depends: appstream,
          gsettings-desktop-schemas (>= 3.18),
          libgtk3-perl,
          packagekit (>= 1.1.11),
-         software-properties-gtk,
          ${misc:Depends},
          ${shlibs:Depends}
 Conflicts: sessioninstaller

debian/control.in

@@ -51,7 +51,6 @@ Depends: appstream,
          gsettings-desktop-schemas (>= 3.18),
          libgtk3-perl,
          packagekit (>= 1.1.11),
-         software-properties-gtk,
          ${misc:Depends},
          ${shlibs:Depends}
 Conflicts: sessioninstaller

debian/rules

@@ -7,6 +7,7 @@ export DEB_LDFLAGS_MAINT_APPEND = -Wl,-O1 -Wl,--as-needed
 export DEB_LDFLAGS_MAINT_STRIP := -Wl,-Bsymbolic-functions
 
 GS_CONFIGURE_FLAGS = \
+	-Dfwupd=false \
 	-Dgnome_desktop=true \
 	-Dmalcontent=false \
 	-Dodrs=true \
@@ -14,11 +15,11 @@ GS_CONFIGURE_FLAGS = \
 	-Dpackagekit=true \
 	-Dpackagekit_autoremove=true \
 	-Drpm_ostree=false \
+	-Dshell_extensions=false \
 	-Dubuntu_reviews=false \
 
 # these are conditionally re-enabled later
 GS_CONFIGURE_FLAGS += \
-	-Dfwupd=false \
 	-Dflatpak=false \
 	-Dgudev=false \
 	-Dvalgrind=false
@@ -31,9 +32,6 @@ ifeq ($(DEB_HOST_ARCH_OS), linux)
 
 	# Enable GUdev support on Linux
 	GS_CONFIGURE_FLAGS += -Dgudev=true
-	
-	# Enable fwupd support on Linux
-	GS_CONFIGURE_FLAGS += -Dfwupd=true
 
 	# Enable valgrind support on supported architectures
 	ifneq (,$(filter $(DEB_HOST_ARCH), amd64 arm64 armhf i386 mips mips64 mips64el mipsel powerpc ppc64el s390x))

gitlab-ci.yml

+include:
+ - 'https://source.puri.sm/Librem5/librem5-ci/raw/master/librem5-pipeline-definitions.yml'
+
+stages:
+ - package
+ - test-package
+
+variables:
+  DEPS: build-essential git wget lcov
+  WANT_BUILD_DEPS: "true"
+  XVFB_RUN: xvfb-run -a -s -noreset
+  COMMON_BUILD_OPTS: -Db_coverage=true --werror
+
+.buster_vars: &buster_vars
+  variables:
+    CI_REPO: "deb http://ci.puri.sm/ scratch librem5"
+    DIST: buster
+    BUILD_OPTS: -Dphoc_tests=disabled -Dgtk_doc=false ${COMMON_BUILD_OPTS}
+
+.bullseye_vars: &bullseye_vars
+  variables:
+    CI_REPO: "deb http://ci.puri.sm/ bullseyeci main"
+    DIST: bullseye
+    BUILD_OPTS: -Dphoc_tests=enabled -Dgtk_doc=true ${COMMON_BUILD_OPTS}
+
+before_script:
+  - export DEBIAN_FRONTEND=noninteractive
+  - apt-get -y update
+  - apt-get -y install wget ca-certificates gnupg eatmydata
+  - echo "Using CI repo ${CI_REPO}"
+  - echo "$CI_REPO" > /etc/apt/sources.list.d/ci.list
+  - wget -O- https://ci.puri.sm/ci-repo.key | apt-key add -
+  - echo "deb http://debug.mirrors.debian.org/debian-debug/ ${DIST}-debug main" > /etc/apt/sources.list.d/debug.list
+  - eatmydata apt-get -y update
+  - '[ "$WANT_BUILD_DEPS" != "true" ] || eatmydata apt-get -y build-dep .'
+  - eatmydata apt-get -y install $DEPS
+  - ulimit -c unlimited
+
+.tags: &tags
+  tags:
+    - librem5
+
+package:deb-debian-buster:
+  extends: .l5-build-debian-package
+
+package:deb-debian-buster:arm64:
+  tags:
+    - librem5:arm64
+  extends: .l5-build-debian-package
+
+package:deb-pureos-amber:
+  variables:
+    L5_DOCKER_IMAGE: pureos/amber
+    L5_ADD_SCRATCH_CI: 'false'
+  before_script:
+    - export DEBIAN_FRONTEND=noninteractive
+    - echo "man-db man-db/auto-update boolean false" | debconf-set-selections
+    - echo "deb https://repo.pureos.net/pureos amber-phone-staging main" > /etc/apt/sources.list.d/staging.list
+    - echo "deb https://repo.pureos.net/pureos amber-proposed-updates main" >> /etc/apt/sources.list.d/staging.list
+    - apt-get -y update
+    - apt-get -y build-dep .
+    - apt-get -y install build-essential git devscripts
+    - git submodule update --recursive
+  extends: .l5-build-debian-package
+  allow_failure: true
+
+autopkgtest-debian-buster-package:
+  dependencies:
+    - package:deb-debian-buster
+  extends: .l5-autopkgtest-debian-package
+
+lintian-debian-buster-package:
+  dependencies:
+    - package:deb-debian-buster
+  extends: .l5-lintian-debian-package
+

src/gs-shell.c

@@ -2303,10 +2303,6 @@ gs_shell_show_sources (GsShell *shell)
 	GsShellPrivate *priv = gs_shell_get_instance_private (shell);
 	GtkWidget *dialog;
 
-	/* use if available */
-	if (g_spawn_command_line_async ("software-properties-gtk", NULL))
-		return;
-
 	dialog = gs_repos_dialog_new (priv->main_window, priv->plugin_loader);
 	gs_shell_modal_dialog_present (shell, GTK_DIALOG (dialog));