Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package pommed for openSUSE:Factory checked in at 2024-04-23 18:55:50 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/pommed (Old) and /work/SRC/openSUSE:Factory/.pommed.new.27645 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "pommed" Tue Apr 23 18:55:50 2024 rev:34 rq:1169622 version:1.39 Changes: -------- --- /work/SRC/openSUSE:Factory/pommed/pommed.changes 2024-03-01 23:38:50.812491948 +0100 +++ /work/SRC/openSUSE:Factory/.pommed.new.27645/pommed.changes 2024-04-23 18:56:11.734727356 +0200 @@ -1,0 +2,8 @@ +Wed Apr 10 07:47:05 UTC 2024 - Bernhard Wiedemann <[email protected]> + +- Add reproducible.patch to produce deterministic build results + independent of the number of cores/parallelism (boo#1102408) +- Update pommed-dbus_policy.patch pommed-desktop.patch + to allow using %autopatch + +------------------------------------------------------------------- New: ---- reproducible.patch BETA DEBUG BEGIN: New: - Add reproducible.patch to produce deterministic build results independent of the number of cores/parallelism (boo#1102408) BETA DEBUG END: ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ pommed.spec ++++++ --- /var/tmp/diff_new_pack.dCb2lq/_old 2024-04-23 18:56:12.518755593 +0200 +++ /var/tmp/diff_new_pack.dCb2lq/_new 2024-04-23 18:56:12.522755736 +0200 @@ -37,6 +37,8 @@ # PATCH-FIX-UPSTREAM pommed-dbus_policy.patch [email protected] -- bnc#469771 Patch4: pommed-dbus_policy.patch Patch5: pommed-1.39-multiple-def-lcd_bck_info.patch +# PATCH-FIX-UPSTREAM https://salsa.debian.org/mactel-team/pommed/-/merge_requests/2 +Patch6: reproducible.patch BuildRequires: fdupes BuildRequires: pkgconfig BuildRequires: pkgconfig(alsa) @@ -97,11 +99,7 @@ %prep %setup -q -%patch -P 1 -%patch -P 2 -p1 -%patch -P 3 -p1 -%patch -P 4 -%patch -P 5 -p1 +%autopatch -p1 %build make %{?_smp_mflags} ++++++ pommed-dbus_policy.patch ++++++ --- /var/tmp/diff_new_pack.dCb2lq/_old 2024-04-23 18:56:12.558757034 +0200 +++ /var/tmp/diff_new_pack.dCb2lq/_new 2024-04-23 18:56:12.562757178 +0200 @@ -1,7 +1,7 @@ Index: dbus-policy.conf =================================================================== ---- dbus-policy.conf.orig -+++ dbus-policy.conf +--- a/dbus-policy.conf.orig ++++ b/dbus-policy.conf @@ -15,5 +15,7 @@ <policy context="default"> <allow send_destination="org.pommed"/> ++++++ pommed-desktop.patch ++++++ --- /var/tmp/diff_new_pack.dCb2lq/_old 2024-04-23 18:56:12.574757610 +0200 +++ /var/tmp/diff_new_pack.dCb2lq/_new 2024-04-23 18:56:12.574757610 +0200 @@ -1,7 +1,7 @@ Index: gpomme/gpomme-c.desktop =================================================================== ---- gpomme/gpomme-c.desktop.orig -+++ gpomme/gpomme-c.desktop +--- a/gpomme/gpomme-c.desktop.orig ++++ b/gpomme/gpomme-c.desktop @@ -6,4 +6,4 @@ Icon=gpomme Exec=gpomme -c StartupNotify=true @@ -10,8 +10,8 @@ +Categories=System;Settings;HardwareSettings; Index: gpomme/gpomme.desktop =================================================================== ---- gpomme/gpomme.desktop.orig -+++ gpomme/gpomme.desktop +--- a/gpomme/gpomme.desktop.orig ++++ b/gpomme/gpomme.desktop @@ -6,4 +6,4 @@ Icon=gpomme Exec=gpomme StartupNotify=true ++++++ reproducible.patch ++++++ https://salsa.debian.org/mactel-team/pommed/-/merge_requests/2 Author: Bernhard M. Wiedemann Date: 2023-12-20 Compile client-common with consistent CFLAGS - otherwise debuginfo will vary across builds depending on how parallel make scheduled compilations. See https://reproducible-builds.org/ for why this matters. This patch was done while working on reproducible builds for openSUSE. Q: should we drop the duplicated rules from gpomme/Makefile wmpomme/Makefile ? diff --git a/Makefile b/Makefile index bf51b4e..5849c46 100644 --- a/Makefile +++ b/Makefile @@ -7,10 +7,13 @@ all: pommed gpomme wmpomme pommed: $(MAKE) -C pommed OFLIB=$(OFLIB) -gpomme: +client-common: + $(MAKE) -C client-common + +gpomme: client-common $(MAKE) -C gpomme -wmpomme: +wmpomme: client-common $(MAKE) -C wmpomme clean: @@ -19,4 +22,4 @@ clean: $(MAKE) -C wmpomme clean rm -f *~ -.PHONY: pommed gpomme wmpomme +.PHONY: pommed gpomme wmpomme client-common diff --git a/client-common/Makefile b/client-common/Makefile new file mode 100644 index 0000000..b0a4770 --- /dev/null +++ b/client-common/Makefile @@ -0,0 +1,10 @@ +DBUS_CFLAGS = $(shell pkg-config dbus-1 --cflags) -DDBUS_API_SUBJECT_TO_CHANGE +CFLAGS = -g -O2 -Wall $(DBUS_CFLAGS) +SOURCES = dbus-client.c \ + video-client.c + +OBJS = $(SOURCES:%.c=%.o) + +all: $(OBJS) +dbus-client.o: dbus-client.c dbus-client.h +video-client.o: video-client.c video-client.h diff --git a/wmpomme/Makefile b/wmpomme/Makefile index cc7a438..0679273 100644 --- a/wmpomme/Makefile +++ b/wmpomme/Makefile @@ -22,7 +22,7 @@ wmgeneral.o: wmgeneral.c wmgeneral.h ../client-common/dbus-client.o: ../client-common/dbus-client.c ../client-common/dbus-client.h -../client-common/dbus-video.o: ../client-common/video-client.c ../client-common/video-client.h +../client-common/video-client.o: ../client-common/video-client.c ../client-common/video-client.h clean: rm -f wmpomme $(OBJS)
