From 39a8adca970ad295e4fdf79a26b1e9103b82b2f3 Mon Sep 17 00:00:00 2001 From: "Ward Nakchbandi (CosmicFusion)" Date: Tue, 27 Aug 2024 00:05:47 +0200 Subject: [PATCH] Update patches/change-vendor-logo.diff --- patches/change-vendor-logo.diff | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/patches/change-vendor-logo.diff b/patches/change-vendor-logo.diff index a37f9d6..addf61b 100644 --- a/patches/change-vendor-logo.diff +++ b/patches/change-vendor-logo.diff @@ -1,9 +1,16 @@ diff '--color=auto' -ruN a/debian/rules b/debian/rules --- a/debian/rules 2024-08-27 00:55:44.974455211 +0300 -+++ b/debian/rules 2024-08-27 00:57:59.629632715 +0300 -@@ -4,20 +4,14 @@ ++++ b/debian/rules 2024-08-27 01:04:52.498346665 +0300 +@@ -1,23 +1,16 @@ + #!/usr/bin/make -f + +-export DEB_BUILD_MAINT_OPTIONS = hardening=+all export DEB_CPPFLAGS_MAINT_APPEND = -DSSHD_SERVICE=\"ssh.service\" - export DEB_LDFLAGS_MAINT_APPEND = -Wl,-O1 -Wl,-z,defs +-export DEB_LDFLAGS_MAINT_APPEND = -Wl,-O1 -Wl,-z,defs ++export DEB_CFLAGS_MAINT_APPEND = -Wno-error -Wno-incompatible-pointer-types -w ++ ++DISTRIBUTOR_LOGO := /usr/share/pixmaps/pika-logo-text.svg ++DISTRIBUTOR_LOGO_DARK := /usr/share/pixmaps/pika-logo-text-dark.svg -# Not in Ubuntu main yet https://launchpad.net/bugs/1892456 -ifeq ($(shell dpkg-vendor --is Ubuntu && echo yes),yes) @@ -13,9 +20,6 @@ diff '--color=auto' -ruN a/debian/rules b/debian/rules -else -DISTRIBUTOR_LOGO := /usr/share/icons/vendor/scalable/emblems/emblem-vendor.svg -DISTRIBUTOR_LOGO_DARK := /usr/share/icons/vendor/scalable/emblems/emblem-vendor.svg -+DISTRIBUTOR_LOGO := /usr/share/pixmaps/pika-logo-text.svg -+DISTRIBUTOR_LOGO_DARK := /usr/share/pixmaps/pika-logo-text-dark.svg -+ ifneq (,$(filter $(DEB_HOST_ARCH), amd64 arm64 armel armhf i386 mips64el ppc64el riscv64 s390x hppa powerpc ppc64 x32)) MALCONTENT := -Dmalcontent=true else