From fb51215cbc6995007d8cc82a24e106393057d5c2 Mon Sep 17 00:00:00 2001
From: Philippe Pittoli <karchnu@karchnu.fr>
Date: Sat, 13 Mar 2021 14:19:33 +0100
Subject: [PATCH] patches are working, source split is implemented

---
 Makefile              |  2 ++
 bin/create-split.subr | 11 ++++++++++-
 file1.patch           | 11 +++++++++++
 file2.patch           | 11 +++++++++++
 package.mk            | 40 ++++++++++++++++++++++++++++++++--------
 5 files changed, 66 insertions(+), 9 deletions(-)
 create mode 100644 file1.patch
 create mode 100644 file2.patch

diff --git a/Makefile b/Makefile
index c632539..c1bd4cd 100644
--- a/Makefile
+++ b/Makefile
@@ -3,6 +3,8 @@ name    = xz
 version = 5.2.4
 URL = https://tukaani.org/xz/xz-$(version).tar.xz
 
+patches = file1.patch file2.patch
+
 # for test purposes
 SYSCONF=.
 
diff --git a/bin/create-split.subr b/bin/create-split.subr
index 0ce6d6a..7062583 100644
--- a/bin/create-split.subr
+++ b/bin/create-split.subr
@@ -13,6 +13,13 @@ move_content(){
 	mv -v "${content}" "${new_dir}"
 }
 
+remove_empty_directories(){
+	# Search for directories, reverse the order then try to remove them.
+	find . -type d | sort -r | while read dir; do
+		rmdir "${dir}" 2>/dev/null
+	done
+}
+
 # usage: create_split new_root regex [regex...]
 create_split(){
 	new_root=$1 ; shift
@@ -24,8 +31,10 @@ create_split(){
 				if [ $? -eq 0 ] ; then
 					move_content "${new_root}" "${F}"
 				fi
-				: # Do not end the function with a potential error.
 			done
 		fi
 	done
+
+	remove_empty_directories
+	: # Do not end the function with a potential error.
 }
diff --git a/file1.patch b/file1.patch
new file mode 100644
index 0000000..e407ef4
--- /dev/null
+++ b/file1.patch
@@ -0,0 +1,11 @@
+--- README
++++ README2
+@@ -1,6 +1,6 @@
+ 
+-XZ Utils
+-========
++XZ Utils YEAH!!
++===============
+ 
+     0. Overview
+     1. Documentation
diff --git a/file2.patch b/file2.patch
new file mode 100644
index 0000000..e0440d5
--- /dev/null
+++ b/file2.patch
@@ -0,0 +1,11 @@
+--- THANKS
++++ THANKS2
+@@ -2,6 +2,8 @@
+ Thanks
+ ======
+ 
++Thanks ME!
++
+ Some people have helped more, some less, but nevertheless everyone's help
+ has been important. :-) In alphabetical order:
+   - Mark Adler
diff --git a/package.mk b/package.mk
index 0ca3d2c..5021c5d 100644
--- a/package.mk
+++ b/package.mk
@@ -3,8 +3,6 @@
 # Used by default for working directory and log file names
 gen_uuid != uuidgen
 
-# TODO: patches => automatic patching + meta
-
 # Main configuration variables
 
 SLOT ?= /usr/baguette
@@ -19,6 +17,7 @@ ARCH_DETECTED != uname -m
 ARCH ?= $(ARCH_DETECTED)
 
 keep_build_env ?= false
+patches ?=
 
 Q ?= @
 
@@ -97,6 +96,8 @@ create_build_dir:
 	$(Q)mkdir -p $(pkg_build_par_dir)
 create_fake_root_dir:
 	$(Q)mkdir -p $(pkg_fake_root_dir)
+create_fake_root_src_dir:
+	$(Q)mkdir -p $(pkg_fake_root_src_dir)
 create_repository_dir:
 	$(Q)mkdir -p $(repository_directory)/$(ARCH)
 
@@ -138,6 +139,18 @@ extract_tar.%:
 extract: create_build_dir extract_$(ext)
 	@echo "Extracting: done"
 
+#
+# Patching
+#
+
+$(patches):
+	@echo "Copying patch '$@' in $(pkg_build_par_dir)"
+	$(Q)cp $@ $(pkg_build_par_dir)
+	@echo "Applying patch '$@'"
+	$(Q)cd $(pkg_build_dir) && patch < ../$@
+
+patching: $(patches)
+
 #
 # Configure
 #
@@ -206,7 +219,7 @@ fake_root_install: create_fake_root_dir pre_fake_root_install fake_root_install_
 #
 
 export name version release
-export URL description dependencies conflicts provides
+export URL description dependencies conflicts provides patches
 
 package_base = $(repository_directory)/$(ARCH)/$(name)-$(version)-r$(release).$(baguette_ext)
 package_base: $(package_base)
@@ -222,12 +235,18 @@ export pkg_fake_root_man_dir  = $(pkg_fake_root_dir)-man
 export pkg_fake_root_dev_dir  = $(pkg_fake_root_dir)-dev
 export pkg_fake_root_libs_dir = $(pkg_fake_root_dir)-libs
 
+extract_src_zip:
+	$(Q)cd $(pkg_fake_root_src_dir) && unzip $(tarball)
+extract_src_tar.%:
+	$(Q)cd $(pkg_fake_root_src_dir) && tar xf $(tarball)
+
 package_src = $(repository_directory)/$(ARCH)/$(name)-src-$(version)-r$(release).$(baguette_ext)
-package_src: $(package_src)
+package_src: create_fake_root_src_dir extract_src_$(ext) $(package_src)
 $(package_src):
-	@echo "Packaging $@ (work in progress)"
-	@#cd $(pkg_fake_root_dir) && create-split-src >> $(log_file).info 2>> $(log_file).err
-	@#cd $(pkg_fake_root_src_dir) && dependencies="" conflicts="" provides="" create-package $@ \
+	@echo "Packaging $@"
+	@-cd $(pkg_fake_root_src_dir) ; for F in `ls data* 2>/dev/null` ; do rm $F ; done; :
+	$(Q)cp -v $(patches) $(pkg_fake_root_src_dir)
+	$(Q)cd $(pkg_fake_root_src_dir) && dependencies="" conflicts="" provides="" create-package $@ \
 		 >> $(log_file).info 2>> $(log_file).err
 
 package_doc = $(repository_directory)/$(ARCH)/$(name)-doc-$(version)-r$(release).$(baguette_ext)
@@ -235,6 +254,7 @@ package_doc: $(package_doc)
 $(package_doc):
 	@echo "Packaging $@"
 	$(Q)cd $(pkg_fake_root_dir) && create-split-doc >> $(log_file).info 2>> $(log_file).err
+	@-cd $(pkg_fake_root_doc_dir) ; for F in `ls data* 2>/dev/null` ; do rm $F ; done; :
 	$(Q)cd $(pkg_fake_root_doc_dir) && dependencies="" conflicts="" provides="" create-package $@ \
 		>> $(log_file).info 2>> $(log_file).err
 
@@ -243,6 +263,7 @@ package_man: $(package_man)
 $(package_man):
 	@echo "Packaging $@"
 	$(Q)cd $(pkg_fake_root_dir) && create-split-man >> $(log_file).info 2>> $(log_file).err
+	@-cd $(pkg_fake_root_man_dir) ; for F in `ls data* 2>/dev/null` ; do rm $F ; done; :
 	$(Q)cd $(pkg_fake_root_man_dir) && dependencies="" conflicts="" provides="" create-package $@ \
 		>> $(log_file).info 2>> $(log_file).err
 
@@ -251,6 +272,7 @@ package_dev: $(package_dev)
 $(package_dev):
 	@echo "Packaging $@"
 	$(Q)cd $(pkg_fake_root_dir) && create-split-dev >> $(log_file).info 2>> $(log_file).err
+	@-cd $(pkg_fake_root_dev_dir) ; for F in `ls data* 2>/dev/null` ; do rm $F ; done; :
 	$(Q)cd $(pkg_fake_root_dev_dir) && dependencies="" conflicts="" provides="" create-package $@ \
 		>> $(log_file).info 2>> $(log_file).err
 
@@ -259,6 +281,7 @@ package_libs: $(package_libs)
 $(package_libs):
 	@echo "Packaging $@"
 	$(Q)cd $(pkg_fake_root_dir) && create-split-libs >> $(log_file).info 2>> $(log_file).err
+	@-cd $(pkg_fake_root_libs_dir) ; for F in `ls data* 2>/dev/null` ; do rm $F ; done; :
 	$(Q)cd $(pkg_fake_root_libs_dir) && dependencies="" conflicts="" provides="" create-package $@ \
 		>> $(log_file).info 2>> $(log_file).err
 
@@ -274,12 +297,13 @@ splits: package_src package_doc package_man package_dev package_libs
 # The main package is the last to be created since it includes
 # all content that wasn't matched by splits.
 packages: create_repository_dir splits package_base
-build-env: check_binaries download extract
+build-env: check_binaries download extract patching
 create: build-env configure build fake_root_install packages clean_working_dir
 
 
 # Targets not representing a file on the FS.
 .PHONY: check_binaries download* splits package* build-env \
+	$(patches) \
 	pre_* post_* configure* build* fake_root_install* create*
 
 # Ignoring errors on these targets.