Packman Build Service PMBS

medialibrary-beta.spec Changed

medialibrary-beta.patch Added

@@ -0,0 +1,91 @@
+--- a/include/medialibrary/IMetadata.h
++++ b/include/medialibrary/IMetadata.h
+@@ -23,6 +23,7 @@
+ #pragma once
+ 
+ #include <string>
++#include <cstdint>
+ 
+ namespace medialibrary
+ {
+--- a/include/medialibrary/filesystem/IFile.h
++++ b/include/medialibrary/filesystem/IFile.h
+@@ -23,6 +23,7 @@
+ #pragma once
+ 
+ #include <string>
++#include <cstdint>
+ 
+ namespace medialibrary
+ {
+--- a/meson.build
++++ b/meson.build
+@@ -18,7 +18,7 @@ if host_machine.system() == 'darwin'
+   macosx_dep = dependency('appleframeworks', modules: 'foundation')
+ endif
+ 
+-medialib_soname_version = '0.0.0'
++medialib_soname_version = '123.4.5'
+ ver_arr = medialib_soname_version.split('.')
+ medialib_major_version = ver_arr0
+ medialib_minor_version = ver_arr1
+--- a/src/Deprecated.h
++++ b/src/Deprecated.h
+@@ -28,6 +28,7 @@
+  */
+ 
+ #include <string>
++#include <cstdint>
+ 
+ namespace medialibrary
+ {
+--- a/src/utils/File.h
++++ b/src/utils/File.h
+@@ -23,6 +23,7 @@
+ #pragma once
+ 
+ #include <string>
++#include <cstdint>
+ 
+ namespace medialibrary
+ {
+--- a/src/utils/Strings.h
++++ b/src/utils/Strings.h
+@@ -23,6 +23,7 @@
+ #pragma once
+ 
+ #include <string>
++#include <cstdint>
+ 
+ namespace medialibrary
+ {
+--- a/src/utils/TitleAnalyzer.h
++++ b/src/utils/TitleAnalyzer.h
+@@ -23,6 +23,7 @@
+ #pragma once
+ 
+ #include <string>
++#include <cstdint>
+ #include <tuple>
+ 
+ namespace medialibrary
+--- a/src/utils/Url.cpp
++++ b/src/utils/Url.cpp
+@@ -30,6 +30,7 @@
+ 
+ #include <stdexcept>
+ #include <cstring>
++#include <cstdint>
+ #include <algorithm>
+ #include <iterator>
+ 
+--- a/src/utils/XxHasher.h
++++ b/src/utils/XxHasher.h
+@@ -24,6 +24,7 @@
+ 
+ #include <string>
+ #include <cstddef>
++#include <cstdint>
+ 
+ namespace medialibrary
+ {

medialibrary-beta.rebase-changes.sh Added

@@ -0,0 +1,72 @@
+#!/bin/bash
+set -e
+unset LANG
+unset ${!LC_*}
+read td < <(mktemp --directory --tmpdir=/dev/shm .XXX)
+trap "rm -rf '${td}'" EXIT
+#
+git_base='0.12.x'
+#
+d_extract="${td}/e"
+d_old="${td}/o"
+d_new="${td}/n"
+#
+read medialibrary_beta_pkg < <(readlink -f "$1")
+read medialibrary_git < <(readlink -f "$2")
+#
+test -f "${medialibrary_git}/.git/config"
+test -f "${medialibrary_beta_pkg}/.osc/_package"
+read pkg < "$_"
+test "${pkg}" = 'medialibrary-beta'
+mkdir "${d_extract}" "${d_old}" "${d_new}"
+pushd "${medialibrary_beta_pkg}" > /dev/null
+for patch in *.patch
+do
+	test -f "${patch}" || continue
+	sed '
+	/^---:blank:/d
+	/^+++:blank:/d
+	/^@@:blank:/d
+	' < "${patch}" > "${d_old}/${patch}"
+done
+pushd "${medialibrary_git}" > /dev/null
+git --no-pager checkout "${git_base}"
+git --no-pager pull
+git --no-pager checkout medialibrary-beta
+git --no-pager rebase "${git_base}"
+git --no-pager format-patch --quiet --output-directory "${d_extract}" "${git_base}..HEAD"
+#
+sed -i -n '
+: sep
+n
+/^---$/b stat
+b sep
+: stat
+n
+/^$/b body
+b stat
+: body
+n
+/^diff:blank:\+--git:blank:\+/b body
+/^index:blank:\+0-9a-f\+/b body
+p
+b body
+' "${d_extract}"/*.patch
+pushd "${d_extract}" > /dev/null
+for patch in *.patch
+do
+	o="${patch}"
+	n="${patch#*-}"
+	mv "${o}" "${n}"
+	sed '
+	/^---:blank:/d
+	/^+++:blank:/d
+	/^@@:blank:/d
+	' < "${n}" > "${d_new}/${n}"
+	if diff -u "${d_old}/${n}" "${d_new}/${n}"
+	then
+		rm "${n}"
+	else
+		mv -vit "${medialibrary_beta_pkg}" "${n}"
+	fi
+done

Changes of Revision 4