update packages file

Cleanup parsing of version from specfile in catchup targets
Make sure we only parse %{version} one time while doing a catchup.
2026-06-16 11:06:15 +00:00 · 2024-12-19 06:03:26 +00:00 · 2024-12-05 17:11:40 -08:00 · 2024-12-05 16:00:31 -08:00 · 2024-12-05 19:57:20 +00:00 · 2024-12-02 16:13:06 -08:00
2 changed files with 82 additions and 1 deletions
@@ -582,6 +582,78 @@ cloc: $(SRPMFILE)
 	@$(MOCK) --clean --scrub=chroot --uniqueext=$(PKG_NAME)
 	cat results/cloc.txt

+#help catchup: Backport the commits from the current version to the upstream HEAD (not release).
+#help Only works if giturl is defined and the current package version can be mapped to a git tag.
+catchup:
+	$(MAKE) catchup-HEAD
+
+#help catchup-<commit|tag>: Backport the commits from the current version to the specified commit or tag.
+#help Only works if giturl is defined and the current package version can be mapped to a git tag.
+catchup-%:
+	@target=$*; \
+	giturl=$$(grep -E '^giturl\s*=\s*\S+' options.conf | sed 's/giturl\s*=\s*//' 2>/dev/null); \
+	if [[ -z "$${giturl}" ]]; then \
+		echo "Error: giturl not defined in options.conf"; \
+		exit 1; \
+	fi; \
+	mkdir -p results; \
+	if [[ -d results/$(PKG_NAME) ]]; then \
+		echo "Reusing existing repository..."; \
+		git -C results/$(PKG_NAME) fetch origin; \
+	else \
+		echo "Cloning upstream repository..."; \
+		git -C results clone "$${giturl}" $(PKG_NAME); \
+	fi; \
+	if ! git -C results/$(PKG_NAME) rev-parse --verify --quiet "$${target}" >/dev/null; then \
+		echo "Error: Target commit/tag $${target} not found"; \
+		exit 1; \
+	fi; \
+	version=$$(rpm -q --qf '%{VERSION}\n' --specfile $(SPECFILE) | head -1); \
+	echo "Version: $${version}"; \
+	current_tag=$$(git -C results/$(PKG_NAME) tag --list | grep -E "^($(PKG_NAME)-)?v?$${version}$$") || { \
+		echo "Error: No tag found for current package version"; \
+		exit 1; \
+	}; \
+	echo "Catching up from $${current_tag} to $${target}"; \
+	for commit in $$(git -C results/$(PKG_NAME) log --reverse --pretty=oneline $${current_tag}..$${target} | cut -d' ' -f1); do \
+		$(MAKE) backport-$${commit}; \
+	done;
+
+
+#help backport-<commit>: Retrieve a commit from the upstream git repository and save it as a backport patch.
+#help The giturl is read from options.conf.
+backport-%:
+	@commit=$*; \
+	echo "Backporting commit: $${commit}"; \
+	giturl=$$(grep -E '^giturl\s*=\s*\S+' options.conf | sed 's/giturl\s*=\s*//' 2>/dev/null); \
+	if [[ -z "$${giturl}" ]]; then \
+		echo "Error: giturl not defined in options.conf"; \
+		exit 1; \
+	fi; \
+	mkdir -p results; \
+	if [[ -d results/$(PKG_NAME) ]]; then \
+		echo "Reusing existing repository..."; \
+		git -C results/$(PKG_NAME) fetch origin; \
+	else \
+		echo "Cloning upstream repository..."; \
+		git -C results clone "$${giturl}" $(PKG_NAME); \
+	fi; \
+	full_commit=$$(git -C results/$(PKG_NAME) show --pretty=oneline $${commit} 2>/dev/null | head -1 | cut -d' ' -f 1); \
+	if [[ -z "$${full_commit}" ]]; then \
+		echo "Error: Commit for $${commit} not found"; \
+		exit 1; \
+	fi; \
+	patch=backport-$${full_commit}.patch; \
+	git -C results/$(PKG_NAME) format-patch -1 --stdout $${full_commit} > $${patch}; \
+	if [[ -s $${patch} ]]; then \
+		echo "$${patch} created"; \
+		grep -qE "^$${patch}$$" series 2>/dev/null || echo "$${patch}" >> series; \
+	else \
+		rm -f $${patch}; \
+		echo "Error: Failed to create backport patch"; \
+		exit 1; \
+	fi \
+
 .PHONY: whatrequires
 #help whatrequires: Output a list of packages that directly depend on this one,
 #help showing the subpackage-level breakdown. Each line of output has the format
@@ -180,6 +180,7 @@ R-Ryacas
 R-SGP
 R-SGPdata
 R-SQUAREM
+R-SimDesign
 R-Sleuth2
 R-SnowballC
 R-SparseM
@@ -232,6 +233,7 @@ R-bayesplot
 R-bazar
 R-bbmle
 R-bdsmatrix
+R-beepr
 R-beeswarm
 R-bench
 R-benchr
@@ -871,6 +873,7 @@ R-rsvg
 R-runjags
 R-rversions
 R-rvest
+R-rworldmap
 R-s2
 R-sampling
 R-sandwich
@@ -1583,6 +1586,7 @@ fsearch
 fuse
 fwupd
 fwupd-efi
+game-music-emu
 garcon
 gawk
 gbinder-python
@@ -1854,6 +1858,7 @@ irrlicht
 irrlichtmt
 irssi
 isa-l
+isl
 iso-codes
 isodate
 isomd5sum
@@ -2260,6 +2265,7 @@ libmbim
 libmediaart
 libmemcached
 libmicrohttpd
+libmikmod
 libmnl
 libmodbus
 libmodplug
@@ -2380,6 +2386,7 @@ libva
 libva-intel-driver
 libva-utils
 libvdpau
+libversion
 libvirt
 libvirt-dbus
 libvirt-glib
@@ -3915,6 +3922,7 @@ pypi-decorator
 pypi-deepmerge
 pypi-deepspeed
 pypi-dep_logic
+pypi-dependency_groups
 pypi-deprecated
 pypi-deprecation
 pypi-devpi_client
@@ -4985,6 +4993,7 @@ scour
 scowl
 screen
 scummvm
+scx
 sddm
 sddm-kcm
 seahorse
@@ -5165,7 +5174,6 @@ usb-modeswitch-data
 usbredir
 usbutils
 userspace-rcu
-usrbinjava
 usrbinvi
 usrsctp
 utf8proc
@@ -5311,6 +5319,7 @@ xrandr
 xrdb
 xrdp
 xrestop
+xscorch
 xscreensaver
 xsel
 xset
Author	SHA1	Message	Date
Arjan van de Ven	f092f66d8d	update packages file	2024-12-19 06:03:26 +00:00
Brett T. Warden	704e8c90b8	Cleanup parsing of version from specfile in catchup targets Make sure we only parse %{version} one time while doing a catchup.	2024-12-05 17:11:40 -08:00
Brett T. Warden	1ca80a16a3	Implement catchup targets Implement a new target 'catchup' that will backport upstream commits from the current package version to HEAD. Implement a new target 'catchup-<commit\|tag>' that will backport upstream commits up to the target, as resolvable by git. This powers 'catchup'. Rework the target 'backport-<commit>' to clone and use the upstream git repository instead of using GitHub URLs. This also simplifies the resolution of targets to full commit hashes, as needed to ensure unique patch names and entries in 'series'. 'make catchup' will backport all the patches to catch this package up to the upstream's HEAD 'make catchup-v5.0' will backport all the patches to catch this package up to tag "v5.0" upstream. 'make catchup-ffdcba' will backport all the patches between this package's current version and the upstream commit ffdcba. 'make backport-ffdcba' will backport ONLY upstream commit ffdcba. All targets will produce patches named "backport-<commit>.patch", where <commit> is the full SHA1 commit hash, regardless of whether you used an abbreviated hash (or a tag, for catchup-%). Patches are added to 'series' in chronological order, unless they're already anywhere in that file.	2024-12-05 16:00:31 -08:00
Arjan van de Ven	27e359bda0	update packages file	2024-12-05 19:57:20 +00:00
Brett T. Warden	3db02dd609	Implement backport-<commit> target For packages with a GitHub repo configured in options.conf, allow downloading and applying backport patches via the 'backport-<commit>' target. If given an abbreviated commit ID, it will still create a backport-<commit>.patch file with the full commit hash, plus add it (if it does not already exist) to the end of the series file. Because this handles a single commit at a time, this should be wrappable by a future Makefile target that applies individual commits to catch up to a target tag, for example.	2024-12-02 16:13:06 -08:00
Arjan van de Ven	5866d7afbf	update packages file	2024-11-25 21:15:54 +00:00