From 7eb5851329e89e4d40fe88edc9d0f96f13de34d0 Mon Sep 17 00:00:00 2001 From: lecramyajiv Date: Thu, 7 Mar 2024 17:28:15 +0530 Subject: [PATCH] multimedia/winff: Updated for version 1.6.3 Signed-off-by: Willy Sudiarto Raharjo --- multimedia/winff/changelog | 11 ++++++ multimedia/winff/doinst.sh | 10 ----- multimedia/winff/patches/unit3-pas.patch | 14 ++----- multimedia/winff/winff.SlackBuild | 50 +++++++++++++----------- multimedia/winff/winff.info | 6 +-- 5 files changed, 45 insertions(+), 46 deletions(-) diff --git a/multimedia/winff/changelog b/multimedia/winff/changelog index b5055aa11d..a67e2f90bc 100644 --- a/multimedia/winff/changelog +++ b/multimedia/winff/changelog @@ -110,3 +110,14 @@ Upgraded to the latest git commit 31b79e3. Added -pie and -zdefs hardening flags to linker. Bumped the build no. + +27/02/2024: + +Updated to version 1.6.3 + +03/03/2024: + +Resubmit to SBo +Modify the SlackBuild to avoid creating object code files to /usr/share/lazarus +when compiling winff and remove unused function in doinst.sh Thanks to Andrew Clemons +for pointing it out. diff --git a/multimedia/winff/doinst.sh b/multimedia/winff/doinst.sh index aea0f894eb..5fb28930db 100644 --- a/multimedia/winff/doinst.sh +++ b/multimedia/winff/doinst.sh @@ -1,13 +1,3 @@ if [ -x /usr/bin/update-desktop-database ]; then /usr/bin/update-desktop-database -q usr/share/applications >/dev/null 2>&1 fi - -if [ -x /usr/bin/update-mime-database ]; then - /usr/bin/update-mime-database usr/share/mime >/dev/null 2>&1 -fi - -if [ -e usr/share/icons/hicolor/icon-theme.cache ]; then - if [ -x /usr/bin/gtk-update-icon-cache ]; then - /usr/bin/gtk-update-icon-cache -f usr/share/icons/hicolor >/dev/null 2>&1 - fi -fi diff --git a/multimedia/winff/patches/unit3-pas.patch b/multimedia/winff/patches/unit3-pas.patch index dbaebd1469..1d99d96642 100644 --- a/multimedia/winff/patches/unit3-pas.patch +++ b/multimedia/winff/patches/unit3-pas.patch @@ -1,5 +1,5 @@ ---- unit3.pas 2023-10-03 19:20:47.000000000 +0530 -+++ unit3n.pas 2024-01-11 19:39:32.735999220 +0530 +--- unit3.pas 2024-02-19 19:19:13.000000000 +0530 ++++ unit3n.pas 2024-02-27 18:15:24.377843083 +0530 @@ -1,8 +1,8 @@ unit Unit3; @@ -19,18 +19,12 @@ procedure lblURLZeranoClick(Sender: TObject); procedure lblWeatherfordClick(Sender: TObject); procedure lblURLWinffOrgClick(Sender: TObject); -@@ -127,32 +126,27 @@ - lbThanks.items.add('marcelocripe'); - - frmAbout.lblWinff.Caption := StringReplace(frmAbout.lblWinff.Caption, '%s', '1.6.2',[]); -- frmAbout.lblCopyright.Caption := StringReplace(frmAbout.lblCopyright.Caption, '%s', '2006-2023',[]); -+ frmAbout.lblCopyright.Caption := StringReplace(frmAbout.lblCopyright.Caption, '%s', '2006-2024',[]); - end; +@@ -132,27 +131,22 @@ procedure TfrmAbout.lblBellardClick(Sender: TObject); begin - -+ frmMain.LaunchBrowser('https://bellard.org/'); ++ frmMain.LaunchBrowser('https://bellard.org/'); end; procedure TfrmAbout.lblGeversClick(Sender: TObject); diff --git a/multimedia/winff/winff.SlackBuild b/multimedia/winff/winff.SlackBuild index e8fb6909b1..70d2b7209e 100644 --- a/multimedia/winff/winff.SlackBuild +++ b/multimedia/winff/winff.SlackBuild @@ -31,9 +31,8 @@ cd $(dirname $0) ; CWD=$(pwd) PRGNAM=winff -VERSION=${VERSION:-20231003_31b79e3} -LONGNAM=${LONGNAM:-31b79e3aab5172dfeda874471debc31b09bedb2d} -BUILD=${BUILD:-2} +VERSION=${VERSION:-1.6.3} +BUILD=${BUILD:-1} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} @@ -72,10 +71,9 @@ trap 'echo "$0 FAILED at line $LINENO!" | tee -a $OUTPUT/error-${PRGNAM}.log' E rm -rf $PKG mkdir -p $TMP $PKG $OUTPUT cd $TMP -rm -rf $PRGNAM-$VERSION -rm -rf $PRGNAM-$LONGNAM -tar xvf $CWD/$PRGNAM-$LONGNAM.tar.gz -cd $PRGNAM-$LONGNAM +rm -rf $PRGNAM-$PRGNAM-$VERSION +tar xvf $CWD/$PRGNAM-$PRGNAM-$VERSION.tar.gz +cd $PRGNAM-$PRGNAM-$VERSION chown -R root:root . find -L . \ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \ @@ -104,38 +102,43 @@ find languages -type f -not \( -name 'winff.po' -or -name 'winff.pot' -or -name cd languages -patch --verbose --unified < $CWD/patches/winff-po.patch patch --verbose --unified < $CWD/patches/winff-pot.patch patch --verbose --unified < $CWD/patches/winff-en.patch -cd ../.. +cd .. + +# Adapted from https://slackbuilds.org/slackbuilds/15.0/system/doublecmd-qt5/doublecmd-qt5.SlackBuild +# This should technically prevent lazbuild to put object code files in /usr/share/lazarus when builing +# pascal applications using lazbuild + +echo "we are now copying /usr/share/lazarus to $(pwd) to avoid putting object code files in /usr/share/lazarus when compiling winff" + +cp -a /usr/share/lazarus ./ echo "Building WinFF with QT5 Widget insted of GTK" -HOME=$(pwd) lazbuild --lazarusdir=/usr/share/lazarus \ - --widgetset=qt5 --cpu=$CPU \ - -B $TMP/$PRGNAM-$LONGNAM/$PRGNAM/winff.lpr +$(pwd)/lazarus/lazbuild --lazarusdir="$(pwd)/lazarus" --widgetset=qt5 --cpu=$CPU -B winff.lpr -install -s -m 0755 -D $TMP/$PRGNAM-$LONGNAM/$PRGNAM/$PRGNAM $PKG/usr/bin/$PRGNAM +install -s -m 0755 -D $TMP/$PRGNAM-$PRGNAM-$VERSION/$PRGNAM/$PRGNAM $PKG/usr/bin/$PRGNAM mkdir -pv $PKG/usr/share/$PRGNAM -cp -a $TMP/$PRGNAM-$LONGNAM/$PRGNAM/languages $PKG/usr/share/$PRGNAM/ -cp -a $TMP/$PRGNAM-$LONGNAM/$PRGNAM/presets.xml $PKG/usr/share/$PRGNAM/ -install -m 0644 $TMP/$PRGNAM-$LONGNAM/$PRGNAM/scripts/check_presets.sh $PKG/usr/share/$PRGNAM/ +cp -a $TMP/$PRGNAM-$PRGNAM-$VERSION/$PRGNAM/languages $PKG/usr/share/$PRGNAM/ +cp -a $TMP/$PRGNAM-$PRGNAM-$VERSION/$PRGNAM/presets.xml $PKG/usr/share/$PRGNAM/ +install -m 0644 $TMP/$PRGNAM-$PRGNAM-$VERSION/$PRGNAM/scripts/check_presets.sh $PKG/usr/share/$PRGNAM/ mkdir -pv $PKG/usr/man/man1 -gzip -c9 $TMP/$PRGNAM-$LONGNAM/$PRGNAM/$PRGNAM.1 > $PKG/usr/man/man1/$PRGNAM.1.gz +gzip -c9 $TMP/$PRGNAM-$PRGNAM-$VERSION/$PRGNAM/$PRGNAM.1 > $PKG/usr/man/man1/$PRGNAM.1.gz install -m 0644 -D $CWD/$PRGNAM.desktop $PKG/usr/share/applications/$PRGNAM.desktop -install -m 0644 -D $TMP/$PRGNAM-$LONGNAM/$PRGNAM/winff-icons/48x48/$PRGNAM.png $PKG/usr/share/pixmaps/$PRGNAM.png +install -m 0644 -D $TMP/$PRGNAM-$PRGNAM-$VERSION/$PRGNAM/winff-icons/48x48/$PRGNAM.png $PKG/usr/share/pixmaps/$PRGNAM.png mkdir -pv $PKG/usr/doc/$PRGNAM-$VERSION -cp -a $TMP/$PRGNAM-$LONGNAM/$PRGNAM/COPYING $PKG/usr/doc/$PRGNAM-$VERSION -cp -a $TMP/$PRGNAM-$LONGNAM/$PRGNAM/AUTHORS $PKG/usr/doc/$PRGNAM-$VERSION -cp -a $TMP/$PRGNAM-$LONGNAM/$PRGNAM/{README-Presets.txt,changelog.txt} $PKG/usr/doc/$PRGNAM-$VERSION -cp -a $TMP/$PRGNAM-$LONGNAM/$PRGNAM/docs/*.{pdf,txt} $PKG/usr/doc/$PRGNAM-$VERSION -cp -a $TMP/$PRGNAM-$LONGNAM/README.md $PKG/usr/doc/$PRGNAM-$VERSION +cp -a $TMP/$PRGNAM-$PRGNAM-$VERSION/$PRGNAM/COPYING $PKG/usr/doc/$PRGNAM-$VERSION +cp -a $TMP/$PRGNAM-$PRGNAM-$VERSION/$PRGNAM/AUTHORS $PKG/usr/doc/$PRGNAM-$VERSION +cp -a $TMP/$PRGNAM-$PRGNAM-$VERSION/$PRGNAM/{README-Presets.txt,changelog.txt} $PKG/usr/doc/$PRGNAM-$VERSION +cp -a $TMP/$PRGNAM-$PRGNAM-$VERSION/$PRGNAM/docs/*.{pdf,txt} $PKG/usr/doc/$PRGNAM-$VERSION +cp -a $TMP/$PRGNAM-$PRGNAM-$VERSION/README.md $PKG/usr/doc/$PRGNAM-$VERSION cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild mkdir -pv $PKG/install @@ -144,3 +147,4 @@ cat $CWD/doinst.sh > $PKG/install/doinst.sh cd $PKG /sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE + diff --git a/multimedia/winff/winff.info b/multimedia/winff/winff.info index 445f6ef481..5ac2f04f02 100644 --- a/multimedia/winff/winff.info +++ b/multimedia/winff/winff.info @@ -1,8 +1,8 @@ PRGNAM="winff" -VERSION="20231003_31b79e3" +VERSION="1.6.3" HOMEPAGE="https://github.com/WinFF/winff" -DOWNLOAD="https://github.com/WinFF/winff/archive/31b79e3/winff-31b79e3aab5172dfeda874471debc31b09bedb2d.tar.gz" -MD5SUM="4b3e1cc80b2185f8edd0eec8340ab835" +DOWNLOAD="https://github.com/WinFF/winff/archive/winff-1.6.3/winff-winff-1.6.3.tar.gz" +MD5SUM="7a85f02bd23acef5b916166f83586e82" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="libqtpas lazarus"