build_patched.sh: stop building wayfire and firedecor as both packages are now in unstable

build_custom.sh

@@ -38,73 +38,6 @@ set -u
 #		./build.sh
 #fi
 
-if [ -z "$(reprepro listfilter reform "Package (== wayfire)")" ]; then
-	rm -Rf "$WORKDIR"
-	mkdir --mode=0777 "$WORKDIR"
-	(
-		cd "$WORKDIR"
-		cd ../wayfire
-		git clone --recursive https://github.com/WayfireWM/wayfire.git wayfire-src
-
-		git -C wayfire-src reset --hard 04d964eeeafde3fcdb6f15a4142301a8882df41e
-		git -C wayfire-src clean -df
-
-		WFCOMMIT=$(git -C wayfire-src rev-parse --short HEAD)
-		WFDATE=$(date +%Y-%m-%d)
-		WFVERTAR="0.8~$WFDATE"
-		WFVER="wayfire_$WFVERTAR-git$WFCOMMIT"
-
-		mv wayfire-src "$WFVER"
-		# because debian meson.pm disables https://mesonbuild.com/Wrap-dependency-system-manual.html
-		cp -Rv wayfire-debian-wrap-workaround/* "$WFVER/subprojects/"
-		tar cvfz "$WORKDIR/wayfire_$WFVERTAR.orig.tar.gz" "$WFVER"
-
-		cd "$WORKDIR"
-		cp -Rv ../wayfire/debian "$WFVER"
-		cd "$WFVER"
-		echo "wayfire ($WFVERTAR-git$WFCOMMIT) $OURSUITE; urgency=medium" > debian/changelog
-		cat debian/changelog.tail >> debian/changelog
-
-		sbuild --chroot $BASESUITE-$BUILD_ARCH \
-				--host="$HOST_ARCH" \
-				--no-arch-all --arch-any \
-				--profiles="cross,$COMMON_BUILD_PROFILES" \
-				$COMMON_SBUILD_OPTS \
-				--extra-repository="$SRC_LIST_PATCHED"
-		cd ..
-
-		# build the firedecor plugin
-		cd "$WORKDIR"
-		cd ../firedecor
-		git clone --recursive https://github.com/mntmn/Firedecor.git firedecor-src
-
-		FDCOMMIT=$(git -C firedecor-src rev-parse --short HEAD)
-		FDDATE=$(date +%Y-%m-%d)
-		FDVERTAR="0.1~$FDDATE"
-		FDVER="firedecor_$FDVERTAR-git$FDCOMMIT"
-
-		mv firedecor-src "$FDVER"
-		tar cvfz "$WORKDIR/firedecor_$FDVERTAR.orig.tar.gz" "$FDVER"
-
-		cd "$WORKDIR"
-		cp -Rv ../firedecor/debian "$FDVER"
-		cd "$FDVER"
-		echo "firedecor ($FDVERTAR-git$FDCOMMIT) $OURSUITE; urgency=medium" > debian/changelog
-		cat debian/changelog.tail >> debian/changelog
-
-		sbuild --chroot $BASESUITE-$BUILD_ARCH \
-				--host="$HOST_ARCH" \
-				--no-arch-all --arch-any \
-				--profiles="cross,$COMMON_BUILD_PROFILES" \
-				$COMMON_SBUILD_OPTS \
-				--extra-package=".."
-		# includes wayfire
-		dcmd mv -v ../*.changes "$ROOTDIR/changes"
-		cd ..
-	)
-	rm -Rf "$WORKDIR"
-fi
-
 # simplified version of $our_version from build_patched.sh because the binary
 # version is always equal to the source version here
 our_version=$(reprepro --list-format '${version}\n' -T deb listfilter "$OURSUITE" "\$Source (== reform-tools)" | uniq)

build_patched.sh

@@ -21,6 +21,9 @@ for p in patches/*; do
 		continue
 	fi
 
+	# We print '${version}_${source}\n' and then do sed filtering to get
+	# to the version of the source package and discard the (possibly
+	# differing) version of the binary packages it builds using sed.
 	# shellcheck disable=SC2016
 	our_version=$(reprepro --list-format '${version}_${source}\n' -T deb listfilter "$OURSUITE" "\$Source (== $p)" | sed 's/.*_.*(\(.*\))$/\1/;s/_.*//' | uniq)
 	their_version=$(chdist_base apt-get source --only-source -t "$BASESUITE" --no-act "$p" | sed "s/^Selected version '\\([^']*\\)' ($BASESUITE) for .*/\\1/;t;d")