Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package flacon for openSUSE:Factory checked
in at 2023-06-21 22:38:46
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/flacon (Old)
and /work/SRC/openSUSE:Factory/.flacon.new.15902 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "flacon"
Wed Jun 21 22:38:46 2023 rev:13 rq:1093985 version:11.2.0
Changes:
--------
--- /work/SRC/openSUSE:Factory/flacon/flacon.changes 2023-05-30
22:03:10.667270338 +0200
+++ /work/SRC/openSUSE:Factory/.flacon.new.15902/flacon.changes 2023-06-21
22:39:35.082272061 +0200
@@ -1,0 +2,8 @@
+Tue Jun 20 12:43:18 UTC 2023 - Andrea Manzini <andrea.manz...@suse.com>
+
+- Update to 11.2.0:
+ * The "convert" button on the toolbar can trigger two actions:
+ Convert - Converts all tracks (previous behavior)
+ Convert selected - Converts only selected tracks
+
+-------------------------------------------------------------------
Old:
----
flacon-11.1.0.tar.gz
New:
----
flacon-11.2.0.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ flacon.spec ++++++
--- /var/tmp/diff_new_pack.pXz7qf/_old 2023-06-21 22:39:35.722275913 +0200
+++ /var/tmp/diff_new_pack.pXz7qf/_new 2023-06-21 22:39:35.726275937 +0200
@@ -18,7 +18,7 @@
Name: flacon
-Version: 11.1.0
+Version: 11.2.0
Release: 0
Summary: Audio File Encoder
License: LGPL-2.1-or-later
++++++ flacon-11.1.0.tar.gz -> flacon-11.2.0.tar.gz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/flacon-11.1.0/.github/workflows/build-appimage.yml
new/flacon-11.2.0/.github/workflows/build-appimage.yml
--- old/flacon-11.1.0/.github/workflows/build-appimage.yml 2023-05-28
14:23:24.000000000 +0200
+++ new/flacon-11.2.0/.github/workflows/build-appimage.yml 2023-06-17
10:16:26.000000000 +0200
@@ -15,6 +15,20 @@
runs-on: ubuntu-20.04
steps:
+ - name: Set env
+ run: |
+ echo "RELEASE_DATE=$(date +%Y.%m.%d_%H.%M.%S)" >> ${GITHUB_ENV}
+ echo "RELEASE_VERSION=${GITHUB_REF#refs/*/}" >> $GITHUB_ENV
+
+ [[ "${GITHUB_REF_TYPE}" = "tag" ]] && echo
APPIMAGE_NAME="flacon-${GITHUB_REF_NAME:1}-x86_64.AppImage" >> $GITHUB_ENV
+ [[ "${GITHUB_REF_TYPE}" != "tag" ]] && echo
APPIMAGE_NAME="flacon-$(date +%Y.%m.%d_%H.%M.%S)-x86_64.AppImage" >> $GITHUB_ENV
+
+ echo "==============================="
+ export
+ echo "-------------------------------"
+ cat $GITHUB_ENV
+ echo "==============================="
+
- uses: actions/checkout@v3
- name: Install packages
@@ -30,7 +44,10 @@
sudo apt-get -y install flac mac alacenc vorbis-tools wavpack lame
ttaenc faac opus-tools sox
- name: Clone tools
- run: git clone --depth 1 https://github.com/SokoloffA/nightly-tools.git
~/tools
+ run: |
+ git clone --depth 1 https://github.com/SokoloffA/nightly-tools.git
~/tools
+ echo PATH=~/tools/appimage/usr/bin:$PATH >> $GITHUB_ENV
+ echo LD_LIBRARY_PATH=~/tools/appimage/usr/lib >> $GITHUB_ENV
- name: Create Build Environment
run: |
@@ -52,9 +69,9 @@
shell: bash
run: make install
- - name: Build AppImage
+ - name: Build AppImage dir
working-directory: ${{github.workspace}}/build/app
- run: |
+ run: |
echo "==============================="
export PATH=~/tools/appimage/usr/bin:$PATH
export LD_LIBRARY_PATH=~/tools/appimage/usr/lib
@@ -66,10 +83,20 @@
for prog in ${PROGRAMS}; do echo " * Copy ${prog}"; src=$(which
"$prog"); dest=${src#/}; cp -f "${src}" "usr/bin/"; done
echo "= Build image ================="
linuxdeploy --verbosity=3 --plugin qt --appdir
"${{github.workspace}}/build/app"
- appimagetool "${{github.workspace}}/build/app"
"${{github.workspace}}/build/flacon-x86_64.AppImage"
+
+ - name: Check external programs
+ working-directory: ${{github.workspace}}
+ run: |
+ scripts/check-extprograms.sh . ${{github.workspace}}/build/app/usr/bin
+
+ - name: Build AppImage file
+ working-directory: ${{github.workspace}}/build/app
+ run: |
+ appimagetool "${{github.workspace}}/build/app"
"${{github.workspace}}/build/${{ env.APPIMAGE_NAME }}"
+
- name: Upload artifact
uses: actions/upload-artifact@v3
with:
- name: flacon-x86_64.AppImage
- path: "${{github.workspace}}/build/flacon-x86_64.AppImage"
+ name: ${{ env.APPIMAGE_NAME }}
+ path: "${{github.workspace}}/build/${{ env.APPIMAGE_NAME }}"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/flacon-11.1.0/.github/workflows/build-mac-app.yml
new/flacon-11.2.0/.github/workflows/build-mac-app.yml
--- old/flacon-11.1.0/.github/workflows/build-mac-app.yml 2023-05-28
14:23:24.000000000 +0200
+++ new/flacon-11.2.0/.github/workflows/build-mac-app.yml 2023-06-17
10:16:26.000000000 +0200
@@ -2,46 +2,124 @@
on: [push]
-env:
- BUILD_TYPE: Release
jobs:
- build:
+ build-arm64:
+ uses: ./.github/workflows/build-mac-flacon.yml
+ name: arm64
+ with:
+ arch: arm64
+
+ build-x86_64:
+ uses: ./.github/workflows/build-mac-flacon.yml
+ name: x86_64
+ with:
+ arch: x86_64
+
+
+ flacon-app:
runs-on: macos-latest
+ needs:
+ - build-arm64
+ - build-x86_64
+
steps:
- - uses: actions/checkout@v2
+ - uses: actions/checkout@v3
+
+ - name: Set env
+ run: |
+ echo "--------------------------------------------"
+ export
+ echo "--------------------------------------------"
+
+ echo "RELEASE_DATE=$(date +%Y.%m.%d_%H.%M.%S)" >> ${GITHUB_ENV}
+ grep "RELEASE_DATE" ${GITHUB_ENV}
+
+ echo "RELEASE_VERSION=${GITHUB_REF#refs/*/}" >> ${GITHUB_ENV}
+ grep "RELEASE_VERSION" ${GITHUB_ENV}
- - name: Check license
- run: ./scripts/checkLicense.sh .
+ [[ "${GITHUB_REF_TYPE}" = "tag" ]] && echo
ARTIFACT_NAME="Flacon-${GITHUB_REF_NAME:1}.app" >> ${GITHUB_ENV}
+ [[ "${GITHUB_REF_TYPE}" != "tag" ]] && echo
ARTIFACT_NAME="Flacon-$(date +%Y.%m.%d_%H.%M.%S).app" >> ${GITHUB_ENV}
+ grep "ARTIFACT_NAME" ${GITHUB_ENV}
- - name: Install packages
- run: |
- brew install qt5 pkg-config uchardet taglib
+ [[ "${GITHUB_REF_TYPE}" = "tag" ]] && echo
TAR_NAME="Flacon-${GITHUB_REF_NAME:1}.tar" >> ${GITHUB_ENV}
+ [[ "${GITHUB_REF_TYPE}" != "tag" ]] && echo TAR_NAME="Flacon-$(date
+%Y.%m.%d_%H.%M.%S).tar" >> ${GITHUB_ENV}
+ grep "TAR_NAME" ${GITHUB_ENV}
- - name: Install Saprkle
+ echo "--------------------------------------------"
+ cat ${GITHUB_ENV}
+ echo "--------------------------------------------"
+
+ - name: Download arm64
+ uses: actions/download-artifact@v3
+ with:
+ name: Flacon-arm64
+
+
+ - name: Extract arm64
+ env:
+ ARCH: arm64
+ shell: bash
run: |
- curl -s -L
https://github.com/sparkle-project/Sparkle/releases/download/1.26.0/Sparkle-1.26.0.tar.xz
> Sparkle.tar.xz
- tar xf Sparkle.tar.xz Sparkle.framework
+ mkdir -p ${{ env.ARCH }}
+ tar xvf Flacon-${{env.ARCH}}.tar -C ${{env.ARCH}}
- - name: Create Build Environment
- run: cmake -E make_directory ${{github.workspace}}/build
- - name: Run CMake
+ - name: Download x86_64
+ uses: actions/download-artifact@v3
+ with:
+ name: Flacon-x86_64
+
+
+ - name: Extract x86_64
+ env:
+ ARCH: x86_64
shell: bash
- working-directory: ${{github.workspace}}/build
run: |
- cmake \
- -DQt5_DIR=$(brew --prefix qt5)/lib/cmake/Qt5 \
- -DBUILD_TESTS=No \
- -DMAC_BUNDLE=Yes \
- -DCMAKE_INSTALL_PREFIX=${CUR_DIR} \
- -DCMAKE_OSX_DEPLOYMENT_TARGET="10.10.1" \
- -DCMAKE_FRAMEWORK_PATH=$GITHUB_WORKSPACE \
- $GITHUB_WORKSPACE
+ mkdir -p ${{ env.ARCH }}
+ tar xvf Flacon-${{env.ARCH}}.tar -C ${{env.ARCH}}
+
- - name: Build
- working-directory: ${{github.workspace}}/build
+ - name: Install tools
shell: bash
- run: make -j 8
+ run: |
+ git clone https://github.com/flacon/flacon.third-party.git
${HOME}/flacon.third-party
+ mkdir -p ${HOME}/bin/
+ cp ${HOME}/flacon.third-party/bin/* ${HOME}/bin/
+
+
+ - name: Create universal application
+ shell: bash
+ run: |
+ lipo-app x86_64/Flacon.app arm64/Flacon.app Flacon.app
+
+
+ - name: Check external programs
+ run: |
+ ${{github.workspace}}/scripts/check-extprograms.sh .
Flacon.app/Contents/MacOS
+
+
+ - name: Check libraries
+ shell: bash
+ working-directory: ${{github.workspace}}
+ run: |
+ ${HOME}/bin/macdeploy.py check-libs Flacon.app
+
+ - name: Prepare artifacts
+ working-directory: ${{ env.HOME }}
+ run : |
+ tar -C . -cf ${{env.TAR_NAME}} Flacon.app
+ cp ${{github.workspace}}/.github/workflows/makedmg.sh .
+ cp ${{github.workspace}}/.github/workflows/dmg_settings.json .
+
+
+ - name: Upload artifact
+ uses: actions/upload-artifact@v3
+ with:
+ name: ${{ env.ARTIFACT_NAME }}
+ path: |
+ ${{env.TAR_NAME}}
+ makedmg.sh
+ dmg_settings.json
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/flacon-11.1.0/.github/workflows/build-mac-flacon.yml
new/flacon-11.2.0/.github/workflows/build-mac-flacon.yml
--- old/flacon-11.1.0/.github/workflows/build-mac-flacon.yml 1970-01-01
01:00:00.000000000 +0100
+++ new/flacon-11.2.0/.github/workflows/build-mac-flacon.yml 2023-06-17
10:16:26.000000000 +0200
@@ -0,0 +1,104 @@
+name: Build Flacon
+
+on:
+ workflow_call:
+ inputs:
+ arch:
+ required: true
+ type: string
+
+env:
+ BREW_DIR: /opt/flacon-homebrew/${{ inputs.arch }}
+ ARM_BREW_DIR: /opt/flacon-homebrew/arm64
+ X86_BREW_DIR: /opt/flacon-homebrew/x86_64
+ FLACON_PROGRAMS: flacon-programs-${{ inputs.arch }}
+ BUNDLE_DIR: ${{github.workspace}}/build/Flacon.app
+
+jobs:
+ build:
+ runs-on: macos-latest
+
+ steps:
+ - uses: actions/checkout@v3
+
+ - name: Check license
+ run: ./scripts/checkLicense.sh .
+
+ - name: Install tools
+ shell: bash
+ run: |
+ git clone https://github.com/flacon/flacon.third-party.git
${HOME}/flacon.third-party
+ mkdir -p ${HOME}/bin/
+ cp ${HOME}/flacon.third-party/bin/* ${HOME}/bin/
+
+ - name: Install homebrew arm64
+ shell: bash
+ run: |
+ curl -s -L
https://github.com/flacon/flacon.third-party/releases/download/v0.1/flacon-homebrew-arm64.tgz
> ${HOME}/flacon-homebrew-arm64.tgz
+ sudo tar xf ${HOME}/flacon-homebrew-arm64.tgz -C /
+
+
+ - name: Install homebrew x86_64
+ shell: bash
+ run: |
+ curl -s -L
https://github.com/flacon/flacon.third-party/releases/download/v0.1/flacon-homebrew-x86_64.tgz
> ${HOME}/flacon-homebrew-x86_64.tgz
+ sudo tar xf ${HOME}/flacon-homebrew-x86_64.tgz -C /
+
+
+ - name: Fixing homebrew Qt binaries
+ shell: bash
+ run: |
+ rm -rf ${ARM_BREW_DIR}/opt/qt5/bin/
+ ln -s ${X86_BREW_DIR}/opt/qt5/bin/ ${ARM_BREW_DIR}/opt/qt5/bin
+
+ - name: Install Saprkle
+ shell: bash
+ run: |
+ curl -s -L
https://github.com/sparkle-project/Sparkle/releases/download/1.26.0/Sparkle-1.26.0.tar.xz
> ${HOME}/Sparkle.tar.xz
+ mkdir -p ${HOME}/Library/Frameworks
+ tar xf ${HOME}/Sparkle.tar.xz -C ${HOME}/Library/Frameworks
Sparkle.framework
+
+
+ - name: Build
+ shell: bash
+ working-directory: ${{github.workspace}}
+ run: |
+ export PKG_CONFIG_PATH="${BREW_DIR}/lib/pkgconfig"
+ cmake \
+ -DBUILD_TESTS=No \
+ -DMAC_BUNDLE=Yes \
+ -DCMAKE_PREFIX_PATH=${BREW_DIR}/opt/qt5/lib/cmake \
+ -DCMAKE_INSTALL_PREFIX=build \
+ -DCMAKE_OSX_DEPLOYMENT_TARGET=10.10.1 \
+ -Bbuild \
+ -DCMAKE_OSX_ARCHITECTURES=${{ inputs.arch }} \
+ ${{github.workspace}}
+
+ make -Cbuild -j 8
+ make -Cbuild install
+
+
+ - name: Copy third-party binaries and libraries
+ shell: bash
+ working-directory: ${{github.workspace}}
+ run: |
+ curl -s -L
https://github.com/flacon/flacon.third-party/releases/download/v0.1/flacon-programs-${{inputs.arch}}.tgz
> ${HOME}/flacon-programs-${{inputs.arch}}.tgz
+ sudo tar xf ${HOME}/flacon-programs-${{inputs.arch}}.tgz -C
${BUNDLE_DIR}/Contents --strip 1
+
+
+ - name: Check libraries
+ shell: bash
+ working-directory: ${{github.workspace}}
+ run: |
+ ${HOME}/bin/macdeploy.py check-libs ${BUNDLE_DIR}/
+
+
+ - name: Prepare artifacts
+ run : |
+ tar -C ${{github.workspace}}/build -cf
${{github.workspace}}/Flacon-${{ inputs.arch }}.tar Flacon.app
+
+ - name: Upload artifact
+ uses: actions/upload-artifact@v3
+ with:
+ name: Flacon-${{ inputs.arch }}
+ path: ${{github.workspace}}/Flacon-${{ inputs.arch }}.tar
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/flacon-11.1.0/.github/workflows/dmg_settings.json
new/flacon-11.2.0/.github/workflows/dmg_settings.json
--- old/flacon-11.1.0/.github/workflows/dmg_settings.json 1970-01-01
01:00:00.000000000 +0100
+++ new/flacon-11.2.0/.github/workflows/dmg_settings.json 2023-06-17
10:16:26.000000000 +0200
@@ -0,0 +1,25 @@
+{
+ "title": "Flacon",
+ "format": "UDZO",
+ "compression-level": 9,
+ "window": {
+ "position": { "x": 100, "y": 100 },
+ "size": { "width": 500, "height": 270 }
+ },
+ "icon-size": 96,
+
+ "contents": [
+ {
+ "x": 135,
+ "y": 102,
+ "type": "file",
+ "path": "Flacon.app" },
+
+ {
+ "x": 365,
+ "y": 102,
+ "type": "link",
+ "path": "/Applications"
+ }
+ ]
+}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/flacon-11.1.0/.github/workflows/makedmg.sh
new/flacon-11.2.0/.github/workflows/makedmg.sh
--- old/flacon-11.1.0/.github/workflows/makedmg.sh 1970-01-01
01:00:00.000000000 +0100
+++ new/flacon-11.2.0/.github/workflows/makedmg.sh 2023-06-17
10:16:26.000000000 +0200
@@ -0,0 +1,49 @@
+#!/bin/bash
+# v 0.1
+
+APP_NAME=Flacon
+MAKE_DMG=1
+CERT_IDENTITY="Developer ID Application: Alex Sokolov (635H9TYSZJ)"
+
+#--------------------
+
+set -Eeuo pipefail
+#set -x
+
+TAR=$(find . -name "${APP_NAME}-*.tar" | sort | tail -n 1)
+if [[ -z ${TAR} ]]; then
+ echo "Tar file not found" >&2
+ exit 1
+fi
+
+BUNDLE_NAME="${APP_NAME}.app"
+BUNDLE_PATH="./${BUNDLE_NAME}"
+
+rm -rf ${BUNDLE_PATH}
+tar xf ${TAR}
+
+VERSION=$(/usr/libexec/PlistBuddy -c "Print :CFBundleVersion"
${BUNDLE_PATH}/Contents/Info.plist)
+DMG_NAME="./${APP_NAME}-${VERSION}.dmg"
+
+echo "***********************************"
+echo "* App ${APP_NAME}"
+echo "* Version ${VERSION}"
+echo "* DMG ${MAKE_DMG}"
+echo "***********************************"
+
+echo "Sign and verify ..............................."
+codesign --force --deep --verify --sign "${CERT_IDENTITY}" "${BUNDLE_PATH}"
+codesign --all-architectures -v --strict --deep --verbose=1 "${BUNDLE_PATH}"
+spctl --assess --type execute "${BUNDLE_PATH}"
+echo " OK"
+echo ""
+
+echo "Verify signature .............................."
+codesign --all-architectures -v --strict --deep --verbose=1 "${BUNDLE_PATH}"
+spctl --assess --type execute "${BUNDLE_PATH}"
+echo " OK"
+echo ""
+
+if [[ MAKE_DMG ]]; then
+ dmgbuild -s dmg_settings.json "${BUNDLE_PATH}" "${DMG_NAME}"
+fi
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/flacon-11.1.0/CMakeLists.txt
new/flacon-11.2.0/CMakeLists.txt
--- old/flacon-11.1.0/CMakeLists.txt 2023-05-28 14:23:24.000000000 +0200
+++ new/flacon-11.2.0/CMakeLists.txt 2023-06-17 10:16:26.000000000 +0200
@@ -33,7 +33,7 @@
set(MAJOR_VERSION 11)
-set(MINOR_VERSION 1)
+set(MINOR_VERSION 2)
set(PATCH_VERSION 0)
#set(BETA_VERSION beta1)
@@ -193,11 +193,8 @@
gui/aboutdialog
)
-
-
#*******************************************
include("cmake/macos.cmake")
-add_homebrew_qt_prefix_path()
set(CMAKE_INCLUDE_CURRENT_DIR ON)
set(CMAKE_AUTOMOC ON)
@@ -305,6 +302,7 @@
COMMAND gzip -c -n ${CMAKE_CURRENT_BINARY_DIR}/flacon.1 >
${CMAKE_CURRENT_BINARY_DIR}/flacon.1.gz
)
+string(REPLACE "/lib/cmake/Qt5Core" "" QT_DIR "${Qt5Core_DIR}")
if(${CMAKE_SYSTEM_NAME} STREQUAL "Darwin")
set_target_properties(${PROJECT_NAME} PROPERTIES OUTPUT_NAME "Flacon")
@@ -314,6 +312,28 @@
install(FILES ${CMAKE_CURRENT_BINARY_DIR}/Info.plist DESTINATION
Flacon.app/Contents)
install(FILES images/mainicon/Flacon.icns DESTINATION
Flacon.app/Contents/Resources)
+ set(QT_PLUGINS
+ "bearer/libqgenericbearer.dylib"
+ "iconengines/libqsvgicon.dylib"
+ "imageformats/libqgif.dylib"
+ "imageformats/libqicns.dylib"
+ "imageformats/libqico.dylib"
+ "imageformats/libqjpeg.dylib"
+ "platforms/libqcocoa.dylib"
+ "styles/libqmacstyle.dylib"
+ )
+
+ foreach(plugin ${QT_PLUGINS})
+ get_filename_component(dest_dir
"Flacon.app/Contents/PlugIns/${plugin}" DIRECTORY)
+ install(FILES "${QT_DIR}/plugins/${plugin}" DESTINATION "${dest_dir}")
+ endforeach()
+
+
+ set(BUNDLE_DIR "${CMAKE_BINARY_DIR}/Flacon.app")
+ set(DIRS ${CMAKE_PREFIX_PATH} $ENV{HOME}/Library/Frameworks)
+ configure_file(cmake/macdelopy.cmake.in
"${CMAKE_BINARY_DIR}/macdelopy.cmake" @ONLY)
+ install(SCRIPT "${CMAKE_BINARY_DIR}/macdelopy.cmake")
+
else()
install(TARGETS ${PROJECT_NAME} RUNTIME DESTINATION bin)
install(FILES ${QM_FILES} DESTINATION ${TRANSLATIONS_DIR})
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/flacon-11.1.0/cmake/debug.cmake
new/flacon-11.2.0/cmake/debug.cmake
--- old/flacon-11.1.0/cmake/debug.cmake 1970-01-01 01:00:00.000000000 +0100
+++ new/flacon-11.2.0/cmake/debug.cmake 2023-06-17 10:16:26.000000000 +0200
@@ -0,0 +1,52 @@
+# Get all propreties that cmake supports
+execute_process(COMMAND cmake --help-property-list OUTPUT_VARIABLE
CMAKE_PROPERTY_LIST)
+
+# Convert command output into a CMake list
+STRING(REGEX REPLACE ";" "\\\\;" CMAKE_PROPERTY_LIST "${CMAKE_PROPERTY_LIST}")
+STRING(REGEX REPLACE "\n" ";" CMAKE_PROPERTY_LIST "${CMAKE_PROPERTY_LIST}")
+# Fix
https://stackoverflow.com/questions/32197663/how-can-i-remove-the-the-location-property-may-not-be-read-from-target-error-i
+list(FILTER CMAKE_PROPERTY_LIST EXCLUDE REGEX
"^LOCATION$|^LOCATION_|_LOCATION$")
+# For some reason, "TYPE" shows up twice - others might too?
+list(REMOVE_DUPLICATES CMAKE_PROPERTY_LIST)
+
+# build whitelist by filtering down from CMAKE_PROPERTY_LIST in case cmake is
+# a different version, and one of our hardcoded whitelisted properties
+# doesn't exist!
+unset(CMAKE_WHITELISTED_PROPERTY_LIST)
+foreach(prop ${CMAKE_PROPERTY_LIST})
+ if(prop MATCHES
"^(INTERFACE|[_a-z]|IMPORTED_LIBNAME_|MAP_IMPORTED_CONFIG_)|^(COMPATIBLE_INTERFACE_(BOOL|NUMBER_MAX|NUMBER_MIN|STRING)|EXPORT_NAME|IMPORTED(_GLOBAL|_CONFIGURATIONS|_LIBNAME)?|NAME|TYPE|NO_SYSTEM_FROM_IMPORTED)$")
+ list(APPEND CMAKE_WHITELISTED_PROPERTY_LIST ${prop})
+ endif()
+endforeach(prop)
+
+function(print_properties)
+ message ("CMAKE_PROPERTY_LIST = ${CMAKE_PROPERTY_LIST}")
+endfunction(print_properties)
+
+function(print_whitelisted_properties)
+ message ("CMAKE_WHITELISTED_PROPERTY_LIST =
${CMAKE_WHITELISTED_PROPERTY_LIST}")
+endfunction(print_whitelisted_properties)
+
+function(print_target_properties tgt)
+ if(NOT TARGET ${tgt})
+ message("There is no target named '${tgt}'")
+ return()
+ endif()
+
+ get_target_property(target_type ${tgt} TYPE)
+ if(target_type STREQUAL "INTERFACE_LIBRARY")
+ set(PROP_LIST ${CMAKE_WHITELISTED_PROPERTY_LIST})
+ else()
+ set(PROP_LIST ${CMAKE_PROPERTY_LIST})
+ endif()
+
+ foreach (prop ${PROP_LIST})
+ string(REPLACE "<CONFIG>" "${CMAKE_BUILD_TYPE}" prop ${prop})
+ # message ("Checking ${prop}")
+ get_property(propval TARGET ${tgt} PROPERTY ${prop} SET)
+ if (propval)
+ get_target_property(propval ${tgt} ${prop})
+ message ("${tgt} ${prop} = ${propval}")
+ endif()
+ endforeach(prop)
+endfunction(print_target_properties)
\ No newline at end of file
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/flacon-11.1.0/cmake/macdelopy.cmake.in
new/flacon-11.2.0/cmake/macdelopy.cmake.in
--- old/flacon-11.1.0/cmake/macdelopy.cmake.in 1970-01-01 01:00:00.000000000
+0100
+++ new/flacon-11.2.0/cmake/macdelopy.cmake.in 2023-06-17 10:16:26.000000000
+0200
@@ -0,0 +1,31 @@
+
+include(BundleUtilities)
+
+set(BUNDLE_DIR @BUNDLE_DIR@)
+set(DIRS @DIRS@)
+
+set(CMAKE_PREFIX_PATH @CMAKE_PREFIX_PATH@)
+set(CMAKE_INSTALL_PREFIX @CMAKE_INSTALL_PREFIX@)
+
+file (GLOB_RECURSE PLUGINS BUNDLE_PLUGINS_DIR false
"${BUNDLE_DIR}/Contents/PlugIns/*/*")
+
+
+message("%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%")
+message("%% BUNDLE_DIR ${BUNDLE_DIR}")
+message("%% DIRS ${DIRS}")
+message("%% PLUGINS:")
+foreach(p ${PLUGINS})
+ message("%% * ${p}")
+endforeach()
+message("%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%")
+
+
+
+file(WRITE "${BUNDLE_DIR}/Contents/Resources/qt.conf" "[Paths]
+Plugins = PlugIns
+Imports = Resources/qml
+Qml2Imports = Resources/qml
+")
+
+
+fixup_bundle("${BUNDLE_DIR}" "${PLUGINS}" "${DIRS}")
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/flacon-11.1.0/cmake/macos.cmake
new/flacon-11.2.0/cmake/macos.cmake
--- old/flacon-11.1.0/cmake/macos.cmake 2023-05-28 14:23:24.000000000 +0200
+++ new/flacon-11.2.0/cmake/macos.cmake 2023-06-17 10:16:26.000000000 +0200
@@ -29,13 +29,3 @@
file(APPEND ${_OUT_FILE} "${comment_tag}\n")
file(APPEND ${_OUT_FILE} "${genericname_tag}\n")
endfunction()
-
-
-
-# Homebrew has issues, fix it
-macro(add_homebrew_qt_prefix_path)
- if (APPLE)
- file (GLOB dirs /usr/local/Cellar/qt@5/*)
- list(APPEND CMAKE_PREFIX_PATH ${dirs})
- endif()
-endmacro()
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/flacon-11.1.0/extprogram.cpp
new/flacon-11.2.0/extprogram.cpp
--- old/flacon-11.1.0/extprogram.cpp 2023-05-28 14:23:24.000000000 +0200
+++ new/flacon-11.2.0/extprogram.cpp 2023-06-17 10:16:26.000000000 +0200
@@ -52,7 +52,7 @@
ExtProgram::ExtProgram(const QString &name) :
mName(name)
{
-#ifdef MAC_BUNDLE
+#ifdef BUNDLED_PROGRAMS
mPath = QDir(qApp->applicationDirPath()).absoluteFilePath(name);
#endif
}
@@ -60,14 +60,14 @@
void ExtProgram::setPath(const QString &path)
{
Q_UNUSED(path);
-#ifndef MAC_BUNDLE
+#ifndef BUNDLED_PROGRAMS
mPath = path;
#endif
}
QString ExtProgram::find() const
{
-#ifdef MAC_BUNDLE
+#ifdef BUNDLED_PROGRAMS
return mPath;
#else
QStringList paths =
QProcessEnvironment::systemEnvironment().value("PATH").split(PATH_ENV_SEPARATOR);
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/flacon-11.1.0/gui/mainwindow.cpp
new/flacon-11.2.0/gui/mainwindow.cpp
--- old/flacon-11.1.0/gui/mainwindow.cpp 2023-05-28 14:23:24.000000000
+0200
+++ new/flacon-11.2.0/gui/mainwindow.cpp 2023-06-17 10:16:26.000000000
+0200
@@ -260,6 +260,17 @@
/************************************************
************************************************/
+void MainWindow::setStartButtonAction(QAction *action)
+{
+ QToolButton *runBtn = qobject_cast<QToolButton
*>(toolBar->widgetForAction(actionStartConvert));
+ if (runBtn) {
+ runBtn->setDefaultAction(action);
+ }
+}
+
+/************************************************
+
+ ************************************************/
void MainWindow::closeEvent(QCloseEvent *event)
{
if (mConverter && mConverter->isRunning()) {
@@ -1213,6 +1224,13 @@
toolBar->addAction(actionWarnings);
toolBar->addAction(actionErrors);
+
+ QToolButton *runBtn = qobject_cast<QToolButton
*>(toolBar->widgetForAction(actionStartConvert));
+ if (runBtn) {
+ runBtn->setPopupMode(QToolButton::MenuButtonPopup);
+ runBtn->addAction(actionStartConvertSelected);
+ connect(runBtn, &QToolButton::triggered, this,
&MainWindow::setStartButtonAction);
+ }
}
/************************************************
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/flacon-11.1.0/gui/mainwindow.h
new/flacon-11.2.0/gui/mainwindow.h
--- old/flacon-11.1.0/gui/mainwindow.h 2023-05-28 14:23:24.000000000 +0200
+++ new/flacon-11.2.0/gui/mainwindow.h 2023-06-17 10:16:26.000000000 +0200
@@ -133,6 +133,7 @@
void updateTotalProgress(double percent);
bool showExitDialog();
+ void setStartButtonAction(QAction *action);
};
#endif // MAINWINDOW_H
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/flacon-11.1.0/main.cpp new/flacon-11.2.0/main.cpp
--- old/flacon-11.1.0/main.cpp 2023-05-28 14:23:24.000000000 +0200
+++ new/flacon-11.2.0/main.cpp 2023-06-17 10:16:26.000000000 +0200
@@ -131,6 +131,8 @@
{
#ifdef MAC_BUNDLE
QString appDir = QLibraryInfo::location(QLibraryInfo::TranslationsPath);
+#elif APPIMAGE_BUNDLE
+ QString appDir = QLibraryInfo::location(QLibraryInfo::DataPath) +
"/share/flacon/translations";
#else
QString appDir = TRANSLATIONS_DIR;
#endif
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/flacon-11.1.0/misc/com.github.Flacon.metainfo.xml.in
new/flacon-11.2.0/misc/com.github.Flacon.metainfo.xml.in
--- old/flacon-11.1.0/misc/com.github.Flacon.metainfo.xml.in 2023-05-28
14:23:24.000000000 +0200
+++ new/flacon-11.2.0/misc/com.github.Flacon.metainfo.xml.in 2023-06-17
10:16:26.000000000 +0200
@@ -56,9 +56,10 @@
</screenshots>
<releases>
- <release date="2023-05-19" version="11.1.0">
+ <release date="2023-06-17" version="11.2.0">
<description><p>Latest version of Flacon on Flathub.</p></description>
</release>
+ <release date="2023-05-19" version="11.1.0" />
<release date="2023-05-19" version="11.0.0" />
<release date="2023-01-20" version="10.0.0" />
<release date="2022-11-20" version="9.5.1" />
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/flacon-11.1.0/scripts/check-extprograms.sh
new/flacon-11.2.0/scripts/check-extprograms.sh
--- old/flacon-11.1.0/scripts/check-extprograms.sh 1970-01-01
01:00:00.000000000 +0100
+++ new/flacon-11.2.0/scripts/check-extprograms.sh 2023-06-17
10:16:26.000000000 +0200
@@ -0,0 +1,21 @@
+#!/bin/bash
+
+set -e
+
+SRC_DIR=${1:-..}
+BIN_DIR=${2:-${PATH}}
+
+EXTPROGRAM_H=${SRC_DIR}/extprogram.h
+WHICH=$(which which)
+
+PROGS=$(sed -n 's|.*static ExtProgram \*\(.*\)().*|\1|p' "${EXTPROGRAM_H}")
+RES=0
+for PROG in $PROGS; do
+ if PATH=$BIN_DIR $WHICH $PROG > /dev/null 2>&1; then
+ printf "%-20s %s\n" $PROG "OK"
+ else
+ printf "%-20s %s\n" $PROG "NOT FOUND"
+ RES=1
+ fi
+done
+exit $RES
