From 24f943af54241a7a607546bec7c98290692b87c4 Mon Sep 17 00:00:00 2001 From: Robby Workman Date: Sun, 25 Apr 2021 16:26:26 -0500 Subject: misc/brewtarget: Updated for version 2.3.1. --- misc/brewtarget/brewtarget.SlackBuild | 23 +- misc/brewtarget/brewtarget.info | 6 +- ...desktop.in-Define-only-the-icon-name-no-p.patch | 29 - ...es-brewtarget_icon.svg-to-images-brewtarg.patch | 1172 -------------------- ...instances-of-brewtarget_icon.svg-to-brewt.patch | 105 -- ...on-to-datadir-icons-hicolor-scalable-apps.patch | 37 - 6 files changed, 12 insertions(+), 1360 deletions(-) delete mode 100644 misc/brewtarget/patches/0001-brewtarget.desktop.in-Define-only-the-icon-name-no-p.patch delete mode 100644 misc/brewtarget/patches/0002-Rename-images-brewtarget_icon.svg-to-images-brewtarg.patch delete mode 100644 misc/brewtarget/patches/0003-Change-all-instances-of-brewtarget_icon.svg-to-brewt.patch delete mode 100644 misc/brewtarget/patches/0004-Install-icon-to-datadir-icons-hicolor-scalable-apps.patch diff --git a/misc/brewtarget/brewtarget.SlackBuild b/misc/brewtarget/brewtarget.SlackBuild index fbb3147f6a..3834ebc274 100644 --- a/misc/brewtarget/brewtarget.SlackBuild +++ b/misc/brewtarget/brewtarget.SlackBuild @@ -2,7 +2,7 @@ # Slackware build script for brewtarget -# Copyright 2014 Robby Workman, Northport, Alabama, USA +# Copyright 2014,2021 Robby Workman, Tuscaloosa, Alabama, USA # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -23,13 +23,13 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. PRGNAM=brewtarget -VERSION=${VERSION:-2.0.2} +VERSION=${VERSION:-2.3.1} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} if [ -z "$ARCH" ]; then case "$( uname -m )" in - i?86) ARCH=i486 ;; + i?86) ARCH=i586 ;; arm*) ARCH=arm ;; *) ARCH=$( uname -m ) ;; esac @@ -40,8 +40,8 @@ TMP=${TMP:-/tmp/SBo} PKG=$TMP/package-$PRGNAM OUTPUT=${OUTPUT:-/tmp} -if [ "$ARCH" = "i486" ]; then - SLKCFLAGS="-O2 -march=i486 -mtune=i686" +if [ "$ARCH" = "i586" ]; then + SLKCFLAGS="-O2 -march=i586 -mtune=i686" LIBDIRSUFFIX="" elif [ "$ARCH" = "i686" ]; then SLKCFLAGS="-O2 -march=i686 -mtune=i686" @@ -60,7 +60,7 @@ rm -rf $PKG mkdir -p $TMP $PKG $OUTPUT cd $TMP rm -rf $PRGNAM-$VERSION -tar xvf $CWD/${PRGNAM}_${VERSION}.orig.tar.gz +tar xvf $CWD/${PRGNAM}_${VERSION}.orig.tar.xz cd $PRGNAM-$VERSION chown -R root:root . find -L . \ @@ -69,19 +69,14 @@ find -L . \ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \ -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \; -# All of these are submitted upstream and slated for inclusion -patch -p1 < $CWD/patches/0001-brewtarget.desktop.in-Define-only-the-icon-name-no-p.patch -patch -p1 < $CWD/patches/0002-Rename-images-brewtarget_icon.svg-to-images-brewtarg.patch -patch -p1 < $CWD/patches/0003-Change-all-instances-of-brewtarget_icon.svg-to-brewt.patch -patch -p1 < $CWD/patches/0004-Install-icon-to-datadir-icons-hicolor-scalable-apps.patch - -cd build +mkdir -p build && cd build cmake \ -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \ -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \ -DCMAKE_INSTALL_PREFIX=/usr \ -DDOCDIR="/usr/doc/$PRGNAM-$VERSION" \ - -DCMAKE_BUILD_TYPE=Release .. + -DCMAKE_BUILD_TYPE=Release \ + -Wno-dev .. make make install DESTDIR=$PKG cd .. diff --git a/misc/brewtarget/brewtarget.info b/misc/brewtarget/brewtarget.info index 7f84f0491d..7f627fd643 100644 --- a/misc/brewtarget/brewtarget.info +++ b/misc/brewtarget/brewtarget.info @@ -1,8 +1,8 @@ PRGNAM="brewtarget" -VERSION="2.0.2" +VERSION="2.3.1" HOMEPAGE="http://www.brewtarget.org" -DOWNLOAD="https://launchpad.net/brewtarget/trunk/2.0.2/+download/brewtarget_2.0.2.orig.tar.gz" -MD5SUM="779138ce2263dd4a13bca5e346c1219c" +DOWNLOAD="https://github.com/Brewtarget/brewtarget/releases/download/v2.3.1/brewtarget_2.3.1.orig.tar.xz" +MD5SUM="266b8ae75d76638b1dde314118a766eb" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" diff --git a/misc/brewtarget/patches/0001-brewtarget.desktop.in-Define-only-the-icon-name-no-p.patch b/misc/brewtarget/patches/0001-brewtarget.desktop.in-Define-only-the-icon-name-no-p.patch deleted file mode 100644 index 11c5d41a50..0000000000 --- a/misc/brewtarget/patches/0001-brewtarget.desktop.in-Define-only-the-icon-name-no-p.patch +++ /dev/null @@ -1,29 +0,0 @@ -From c9d4152db8fb929e62a86a75474dcca6f2425022 Mon Sep 17 00:00:00 2001 -From: Robby Workman -Date: Tue, 27 May 2014 22:27:00 -0500 -Subject: [PATCH 1/4] brewtarget.desktop.in: Define only the icon name (no - path/extension) - -This commit defines the icon name as only "brewtarget" - it will -require subsequent commit(s) to change the icon name and location -to which it installs. ---- - brewtarget.desktop.in | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/brewtarget.desktop.in b/brewtarget.desktop.in -index c3ae613..cc96055 100644 ---- a/brewtarget.desktop.in -+++ b/brewtarget.desktop.in -@@ -4,7 +4,7 @@ Exec=brewtarget - Name=Brewtarget - GenericName=Beer calculator - X-KDE-StartupNotify=true --Icon=${brewtarget_ICONS_LOCATION}/brewtarget_icon.svg -+Icon=brewtarget - Terminal=false - Type=Application - --- -1.8.4 - diff --git a/misc/brewtarget/patches/0002-Rename-images-brewtarget_icon.svg-to-images-brewtarg.patch b/misc/brewtarget/patches/0002-Rename-images-brewtarget_icon.svg-to-images-brewtarg.patch deleted file mode 100644 index 4dcab67722..0000000000 --- a/misc/brewtarget/patches/0002-Rename-images-brewtarget_icon.svg-to-images-brewtarg.patch +++ /dev/null @@ -1,1172 +0,0 @@ -From 88ff442772b60f0fe98553afc2a74e92990efbf0 Mon Sep 17 00:00:00 2001 -From: Robby Workman -Date: Tue, 27 May 2014 22:29:43 -0500 -Subject: [PATCH 2/4] Rename images/brewtarget_icon.svg to - images/brewtarget.svg - -This commit depends on subsequent commits to the build -system and such. ---- - images/brewtarget.svg | 571 +++++++++++++++++++++++++++++++++++++++++++++ - images/brewtarget_icon.svg | 571 --------------------------------------------- - 2 files changed, 571 insertions(+), 571 deletions(-) - create mode 100644 images/brewtarget.svg - delete mode 100644 images/brewtarget_icon.svg - -diff --git a/images/brewtarget.svg b/images/brewtarget.svg -new file mode 100644 -index 0000000..77f8f7c ---- /dev/null -+++ b/images/brewtarget.svg -@@ -0,0 +1,571 @@ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ image/svg+xml -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -diff --git a/images/brewtarget_icon.svg b/images/brewtarget_icon.svg -deleted file mode 100644 -index 77f8f7c..0000000 ---- a/images/brewtarget_icon.svg -+++ /dev/null -@@ -1,571 +0,0 @@ -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- image/svg+xml -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- --- -1.8.4 - diff --git a/misc/brewtarget/patches/0003-Change-all-instances-of-brewtarget_icon.svg-to-brewt.patch b/misc/brewtarget/patches/0003-Change-all-instances-of-brewtarget_icon.svg-to-brewt.patch deleted file mode 100644 index 414f5e5629..0000000000 --- a/misc/brewtarget/patches/0003-Change-all-instances-of-brewtarget_icon.svg-to-brewt.patch +++ /dev/null @@ -1,105 +0,0 @@ -From 7ef94eaedbf142e35f36e4dff5f5f24d55569495 Mon Sep 17 00:00:00 2001 -From: Robby Workman -Date: Tue, 27 May 2014 22:31:48 -0500 -Subject: [PATCH 3/4] Change all instances of brewtarget_icon.svg to - brewtarget.svg - ---- - CMakeLists.txt | 2 +- - brewtarget.qrc | 2 +- - images/brewtarget.svg | 2 +- - src/config.in | 2 +- - ui/btSplashScreen.ui | 2 +- - ui/mainWindow.ui | 4 ++-- - 6 files changed, 7 insertions(+), 7 deletions(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 42e7592..0515bd6 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -255,7 +255,7 @@ SET( brewtarget_DESKTOP - - # Icon files to install. - SET( brewtarget_ICONS -- ${ROOTDIR}/images/brewtarget_icon.svg -+ ${ROOTDIR}/images/brewtarget.svg - ) - - SET( TRANSLATIONS_FILES -diff --git a/brewtarget.qrc b/brewtarget.qrc -index c9edfbc..f07b59b 100644 ---- a/brewtarget.qrc -+++ b/brewtarget.qrc -@@ -1,7 +1,7 @@ - - - images/backup.png -- images/brewtarget_icon.svg -+ images/brewtarget.svg - images/bubbles.svg - images/clipboard.svg - images/clock.svg -diff --git a/images/brewtarget.svg b/images/brewtarget.svg -index 77f8f7c..a55fff5 100644 ---- a/images/brewtarget.svg -+++ b/images/brewtarget.svg -@@ -15,7 +15,7 @@ - id="svg11771" - version="1.1" - inkscape:version="0.47 r22583" -- sodipodi:docname="brewtarget_icon.svg"> -+ sodipodi:docname="brewtarget.svg"> - - - - -- :/images/brewtarget_icon.svg -+ :/images/brewtarget.svg - - - -diff --git a/ui/mainWindow.ui b/ui/mainWindow.ui -index 3eac7db..f95f829 100644 ---- a/ui/mainWindow.ui -+++ b/ui/mainWindow.ui -@@ -30,7 +30,7 @@ - - - -- :/images/brewtarget_icon.svg:/images/brewtarget_icon.svg -+ :/images/brewtarget.svg:/images/brewtarget.svg - - - -@@ -89,7 +89,7 @@ - - - -- :/images/brewtarget_icon.svg:/images/brewtarget_icon.svg -+ :/images/brewtarget.svg:/images/brewtarget.svg - - - --- -1.8.4 - diff --git a/misc/brewtarget/patches/0004-Install-icon-to-datadir-icons-hicolor-scalable-apps.patch b/misc/brewtarget/patches/0004-Install-icon-to-datadir-icons-hicolor-scalable-apps.patch deleted file mode 100644 index f2021d478e..0000000000 --- a/misc/brewtarget/patches/0004-Install-icon-to-datadir-icons-hicolor-scalable-apps.patch +++ /dev/null @@ -1,37 +0,0 @@ -From a44f5fcf0779b84c75bf3c6c99f1c659c1da0d14 Mon Sep 17 00:00:00 2001 -From: Robby Workman -Date: Tue, 27 May 2014 22:34:24 -0500 -Subject: [PATCH 4/4] Install icon to $datadir/icons/hicolor/scalable/apps - ---- - CMakeLists.txt | 6 +++--- - 1 file changed, 3 insertions(+), 3 deletions(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 0515bd6..1362c89 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -200,9 +200,9 @@ ENDIF() - - # If it begins with a '/' - IF( IS_ABSOLUTE ${DATAROOTDIR} ) -- SET( brewtarget_ICONS_LOCATION "${DATAROOTDIR}/icons/${CMAKE_PROJECT_NAME}" ) -+ SET( brewtarget_ICONS_LOCATION "${DATAROOTDIR}/icons/hicolor/scalable/apps/" ) - ELSE() -- SET( brewtarget_ICONS_LOCATION "/${DATAROOTDIR}/icons/${CMAKE_PROJECT_NAME}" ) -+ SET( brewtarget_ICONS_LOCATION "/${DATAROOTDIR}/icons/hicolor/scalable/apps/" ) - ENDIF() - - CONFIGURE_FILE( brewtarget.desktop.in brewtarget.desktop ) -@@ -488,7 +488,7 @@ IF( NOT ${BUILD_DESIGNER_PLUGINS} ) - IF( UNIX AND NOT APPLE ) - # Install the icons. - INSTALL( FILES ${brewtarget_ICONS} -- DESTINATION "${DATAROOTDIR}/icons/${CMAKE_PROJECT_NAME}" ) -+ DESTINATION "${DATAROOTDIR}/icons/hicolor/scalable/apps/" ) - - # Install the .desktop file. - INSTALL( FILES ${brewtarget_DESKTOP} --- -1.8.4 - -- cgit v1.2.3