From 741f48c71b98645d5d3b63f9d3502c8144e5331c Mon Sep 17 00:00:00 2001
From: "B. Stack" <bgstack15@gmail.com>
Date: Sat, 19 Aug 2023 19:54:58 -0400
Subject: handle dpkg-gensymbols problem

---
 gtk-classic-build-deb.sh | 15 ++++++++++++---
 1 file changed, 12 insertions(+), 3 deletions(-)

(limited to 'gtk-classic-build-deb.sh')

diff --git a/gtk-classic-build-deb.sh b/gtk-classic-build-deb.sh
index ed9ff3a..86c93f9 100755
--- a/gtk-classic-build-deb.sh
+++ b/gtk-classic-build-deb.sh
@@ -8,7 +8,8 @@
 # Purpose: combine gtk+3.0 from debian and gtk3-classic into a .deb suite for Devuan Ceres
 # History:
 #    2023-01-11 switch package release to stackrpms
-#    2023-08-19 support gtk3-classic upstream
+#    2023-05-26 add 3.24.38 env var
+#    2023-08-19 support gtk3-classic upstream with sub-version numbers that come after a dash
 # Usage:
 #    make
 # References:
@@ -55,7 +56,7 @@ else
    echo "${classic_vers}" > "${WORKDIR}/classic_vers"
 
    #### Find versions of gtk+3.0 available to debian
-   debian_vers="$( rmadison gtk+3.0 | awk -F='|' '{gsub(" ","");print $2,$2,$3}' | awk '{gsub("-[0-9]+","",$1);print}' | sort -r --sort=version | grep -v debug )"
+   debian_vers="$( rmadison gtk+3.0 | awk -F'|' '{gsub(" ","");print $2,$2,$3}' | awk '{gsub("-[0-9]+","",$1);print}' | sort -r --sort=version | grep -v debug )"
    echo "${debian_vers}" > "${WORKDIR}/debian_vers"
 
    #### Find highest matching version
@@ -65,12 +66,16 @@ else
    deb_version="$( echo "${highest_ver}" | awk '{print $2}' )"
    classic_version="${raw_version}"
    # so now check if there are "3.24.38-4" dash number version tags in the classic repo. This is bad form, but who am I to correct such venerable people?
+   sub_version=1
    highest_raw_sub_version="$( grep -e "^${raw_version}" "${WORKDIR}/classic_vers" | head -n1 )"
+   echo "${highest_raw_sub_version}" | grep -q -e '-' && sub_version="$( echo "${highest_raw_sub_version}" | awk -F'-' '{print $2}' )"
+   sub_version=$(( sub_version + 100 ))
    classic_version="${highest_raw_sub_version}"
 
    # and $3 is the distro name like "experimental" which is not needed.
    echo "Found highest version: ${highest_ver}"
    echo "and will use highest classic sub-version ${highest_raw_sub_version}"
+   echo "will use release number ${sub_version}"
 fi
 
 #### Fetch debian sources
@@ -93,7 +98,7 @@ cd "${WORKDIR}/gtk+-${raw_version}"
 tar -Jxf "${WORKDIR}/gtk+3.0_${deb_version}.debian.tar.xz"
 mv debian/changelog debian/changelog.orig
 {
-   echo "gtk+3.0 (${raw_version}-101+stackrpms) obs; urgency=medium"
+   echo "gtk+3.0 (${raw_version}-${sub_version}+stackrpms) obs; urgency=medium"
    echo ""
    echo "  * Rebuild gtk3 with gtk3-classic patches"
    echo "  * Add filechooser-icon-view from dudemanguy"
@@ -124,6 +129,10 @@ case "${raw_version}" in
       sed -r -i 's/(appearance__smaller-statusbar.patch|file-chooser__places-sidebar.patch)//g;' debian/patches/series
       sed -i -r debian/rules -e '2aDEB_BUILD_OPTIONS := nocheck'
       ;;
+   3.24.38)
+      # suppress "dpkg-gensymbols: error: some new symbols appeared in the symbols file" about new symbols related to show_mount_eject.
+      sed -i -r debian/rules -e '2aexport DPKG_GENSYMBOLS_CHECK_LEVEL=1'
+      ;;
 esac
 
 #### Build .dsc and tarballs for OBS
-- 
cgit