11.2.r84

* update profile version detection

2 files changed, 30 insertions, 9 deletions

diff --git a/.SRCINFO b/.SRCINFO
index a7c40fc8475c..5355de3c9a56 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = midori-git
-	pkgdesc = Web browser forked from Floorp
-	pkgver = 11.2.r53.ge7cddb76
+	pkgdesc = Web browser based on Floorp
+	pkgver = 11.2.r84.gd26e7523
 	pkgrel = 1
 	url = https://github.com/goastian/midori-desktop
 	arch = x86_64
diff --git a/PKGBUILD b/PKGBUILD
index 1d086619c786..fd06005ce2e7 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -16,9 +16,9 @@
 ## basic info
 _pkgname="midori"
 pkgname="$_pkgname${_pkgtype:-}"
-pkgver=11.2.r53.ge7cddb76
+pkgver=11.2.r84.gd26e7523
 pkgrel=1
-pkgdesc="Web browser forked from Floorp"
+pkgdesc="Web browser based on Floorp"
 url="https://github.com/goastian/midori-desktop"
 arch=('x86_64')
 license=('MPL-2.0')
@@ -249,17 +249,38 @@ build() {
   export MACH_BUILD_PYTHON_NATIVE_PACKAGE_SOURCE=pip
   export MOZBUILD_STATE_PATH="$srcdir/mozbuild"
   export MOZ_BUILD_DATE="$(date -u${SOURCE_DATE_EPOCH:+d @$SOURCE_DATE_EPOCH} +%Y%m%d%H%M%S)"
-  export MOZ_ENABLE_FULL_SYMBOLS=1
   export MOZ_NOSPAM=1
-  export MOZ_SOURCE_REPO="$_repo"
 
   # LTO/PGO needs more open files
   ulimit -n 4096
 
+  # Do 3-tier PGO
   if [[ "${_build_pgo::1}" == "t" ]] ; then
-    # Do 3-tier PGO
-    local _old_profdata="${SRCDEST:-$startdir}/$_pkgname-merged.profdata"
-    local _old_jarlog="${SRCDEST:-$startdir}/$_pkgname-jarlog"
+    # find previous profile file...
+    local _old_profdata _old_jarlog _pkgver_old tmp_old tmp_new
+    _pkgver_prof=$(
+      cd "${SRCDEST:-$startdir}"
+      for i in *.profdata ; do [ -f "$i" ] && echo "$i" ; done \
+        | sort -rV | head -1 | sed -E 's&^[^0-9]+-([0-9\.]+)-merged.profdata&\1&'
+    )
+
+    # new profile for new major version
+    if [ "${_pkgver_prof%%.*}" != "${pkgver%%.*}" ] ; then
+      _build_pgo_reuse=false
+      _pkgver_prof="$pkgver"
+    fi
+
+    # new profile for new minor version
+    _tmp_old=$(echo "${_pkgver_prof}" | cut -d'-' -f2 | cut -d'.' -f2)
+    _tmp_new=$(echo "${pkgver}" | cut -d'-' -f2 | cut -d'.' -f2)
+
+    if [ "${_tmp_new:-0}" -gt "${_tmp_old:-0}" ] ; then
+      _build_pgo_reuse=false
+      _pkgver_prof="$pkgver"
+    fi
+
+    local _old_profdata="${SRCDEST:-$startdir}/$_pkgname-$_pkgver_prof-merged.profdata"
+    local _old_jarlog="${SRCDEST:-$startdir}/$_pkgname-$_pkgver_prof-jarlog"
 
     # Restore old profile
     if [[ "${_build_pgo_reuse::1}" == "t" ]] ; then