Date: Friday, January 31, 2020 @ 10:22:00 Author: lcarlier Revision: 560583
upgpkg: gambas3 3.14.3-5: fix Archlinux packager Added: gambas3/trunk/0001-Packager-Fix-ArchLinux-packager.patch Modified: gambas3/trunk/PKGBUILD --------------------------------------------+ 0001-Packager-Fix-ArchLinux-packager.patch | 29 +++++++++++++++++++++++++++ PKGBUILD | 13 +++++++----- 2 files changed, 37 insertions(+), 5 deletions(-) Added: 0001-Packager-Fix-ArchLinux-packager.patch =================================================================== --- 0001-Packager-Fix-ArchLinux-packager.patch (rev 0) +++ 0001-Packager-Fix-ArchLinux-packager.patch 2020-01-31 10:22:00 UTC (rev 560583) @@ -0,0 +1,29 @@ +From 989a1266a20f360f1b2db3635a35cc5bbb95d763 Mon Sep 17 00:00:00 2001 +From: gambas <[email protected]> +Date: Mon, 27 Jan 2020 08:24:52 +0100 +Subject: [PATCH] Packager: Fix ArchLinux packager. + +[DEVELOPMENT ENVIRONMENT] +* BUG: Packager: Fix ArchLinux packager. + +Signed-off-by: Laurent Carlier <[email protected]> +--- + app/src/gambas3/.src/Packager/Package.module | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/app/src/gambas3/.src/Packager/Package.module b/app/src/gambas3/.src/Packager/Package.module +index 2d2ecae5a..2f741237c 100644 +--- a/app/src/gambas3/.src/Packager/Package.module ++++ b/app/src/gambas3/.src/Packager/Package.module +@@ -2467,7 +2467,7 @@ Private Function MakeArchPackage(sSys As String) + + Print #hFile, " install -d ${pkgdir}/usr/bin" + Print #hFile, " install -m755 " & $sName & ".gambas ${pkgdir}/usr/bin" &/ $sName +- If $sName <> sPackageName Then Print #hFile, " ln -s " & Shell$($sName) & " \"$(pkgdir)\"/usr/bin" &/ Shell$(sPackageName) ++ If $sName <> sPackageName Then Print #hFile, " ln -s " & Shell$($sName) & " \"${pkgdir}\"/usr/bin" &/ Shell$(sPackageName) + Print #hFile, " install -D .." &/ Project.Name & ".png \\" + Print #hFile, " ${pkgdir}/usr/share/pixmaps" &/ Project.Name & ".png" + Print #hFile, " install -D .." &/ sPackageName & ".desktop \\" +-- +2.25.0 + Modified: PKGBUILD =================================================================== --- PKGBUILD 2020-01-31 09:24:15 UTC (rev 560582) +++ PKGBUILD 2020-01-31 10:22:00 UTC (rev 560583) @@ -27,7 +27,7 @@ 'gambas3-gb-web-feed' 'gambas3-gb-web-form' 'gambas3-gb-web' 'gambas3-runtime' 'gambas3-devel' 'gambas3-ide' 'gambas3-script') pkgver=3.14.3 -pkgrel=4 +pkgrel=5 pkgdesc="A free development environment based on a Basic interpreter." arch=('x86_64') url="http://gambas.sourceforge.net/"; @@ -44,11 +44,13 @@ source=("https://gitlab.com/gambas/gambas/-/archive/${pkgver}/gambas-${pkgver}.tar.bz2"; gambas-postgresql-12.patch 0001-Fix-segfault-with-poppler-0.83.patch - 0001-Use-GlobalParams-getUtf8Map-found-in-poppler-0.85.patch) + 0001-Use-GlobalParams-getUtf8Map-found-in-poppler-0.85.patch + 0001-Packager-Fix-ArchLinux-packager.patch) sha512sums=('a32d01b4c1126364fb98d2780153c333aaf9d0baf82a9822dbe534d723808ed320bd07792ab38fd1561301c09091920332c406c2f9421f841e723c863c738479' '803ceaa7a3109828b3336d02b7bc4fc1053ba3dca5f06fc97ff8f7785f983c32b657e3a59ab00081e6cfb047c12181b98a9631587de0af60ce1f30d614df5c49' '97aa2241a5faf7580bd0f627c36454b5a310a1265f0fc45e5e194dd4ab51d9b8815ee0ffe1ef7143066920395f484dd7b3a6b3c8ac35b46038218b7bf1355e3e' - '9221508ac0fa1447868ba630bf4885563524db0645d36d613416152a479f786a9443594b6ea2d3638544079b450727ee02fe1fd246498dcaa566fd98c8f0713f') + '9221508ac0fa1447868ba630bf4885563524db0645d36d613416152a479f786a9443594b6ea2d3638544079b450727ee02fe1fd246498dcaa566fd98c8f0713f' + '7bd383a84a7e2337af0ee4672d488cd54256d3e4baee81933b2431239aea91408014d40d5b53aae9b8559dbac4eaac54e332973f7145c0a18d9b81406acd6df5') create_dirs() { install -dm755 ${pkgdir}/usr/lib/gambas3 @@ -59,8 +61,9 @@ cd ${srcdir}/gambas-${pkgver} patch -p1 -i ../gambas-postgresql-12.patch # Workaround build failure with postgresql 12 - patch -p1 -i ../0001-Fix-segfault-with-poppler-0.83.patch # fixed upstream - patch -p1 -i ../0001-Use-GlobalParams-getUtf8Map-found-in-poppler-0.85.patch + patch -p1 -i ../0001-Fix-segfault-with-poppler-0.83.patch # merged upstream + patch -p1 -i ../0001-Use-GlobalParams-getUtf8Map-found-in-poppler-0.85.patch # merged upstream + patch -p1 -i ../0001-Packager-Fix-ArchLinux-packager.patch # merged upstream ./reconf-all }
