Update patches/change-vendor-logo.diff

This commit is contained in:
Ward Nakchbandi (CosmicFusion) 2024-08-27 00:05:47 +02:00
parent df495e4260
commit 39a8adca97

View File

@ -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