Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package drumstick for openSUSE:Factory checked in at 2022-07-26 19:43:38 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/drumstick (Old) and /work/SRC/openSUSE:Factory/.drumstick.new.1533 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "drumstick" Tue Jul 26 19:43:38 2022 rev:16 rq:990769 version:2.6.1 Changes: -------- --- /work/SRC/openSUSE:Factory/drumstick/drumstick.changes 2022-05-03 21:19:07.961010784 +0200 +++ /work/SRC/openSUSE:Factory/.drumstick.new.1533/drumstick.changes 2022-07-26 19:44:00.619644233 +0200 @@ -1,0 +2,8 @@ +Sat Jul 23 07:04:21 UTC 2022 - Christophe Giboudeaux <[email protected]> + +- Update to 2.6.1 + * Fixed generated pkgconfig files + * Fix the wrong icon in KDE+Wayland + * Fixed another issue with installation library dir + +------------------------------------------------------------------- Old: ---- drumstick-2.6.0.tar.bz2 New: ---- drumstick-2.6.1.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ drumstick.spec ++++++ --- /var/tmp/diff_new_pack.I2WGGD/_old 2022-07-26 19:44:01.047578107 +0200 +++ /var/tmp/diff_new_pack.I2WGGD/_new 2022-07-26 19:44:01.051577489 +0200 @@ -18,7 +18,7 @@ Name: drumstick -Version: 2.6.0 +Version: 2.6.1 Release: 0 Summary: MIDI Sequencer C++ Library Bindings License: GPL-2.0-or-later AND GPL-3.0-or-later @@ -152,8 +152,10 @@ sed -i 's#%{_includedir}/QtGui#%{_includedir}/qt5/QtGui#' Doxyfile.in %build -%cmake -DSTATIC_DRUMSTICK=0 -DCMAKE_INSTALL_LIBDIR=%{_lib} +%cmake -DSTATIC_DRUMSTICK=0 + %cmake_build + make %{?_smp_mflags} doxygen %install ++++++ drumstick-2.6.0.tar.bz2 -> drumstick-2.6.1.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/drumstick-2.6.0/CMakeLists.txt new/drumstick-2.6.1/CMakeLists.txt --- old/drumstick-2.6.0/CMakeLists.txt 2022-04-04 14:24:24.010975025 +0200 +++ new/drumstick-2.6.1/CMakeLists.txt 2022-05-20 09:13:38.699662740 +0200 @@ -18,7 +18,7 @@ set(CMAKE_OSX_DEPLOYMENT_TARGET "10.13" CACHE STRING "Minimum OS X deployment version") project( Drumstick - VERSION 2.6.0 + VERSION 2.6.1 LANGUAGES C CXX DESCRIPTION "MIDI C++ Libraries for Qt" HOMEPAGE_URL "https://sourceforge.net/p/drumstick/"; @@ -29,7 +29,7 @@ include(CTest) include(GNUInstallDirs) -set(RELEASE_DATE "April 4, 2022") +set(RELEASE_DATE "May 20, 2022") set(EXECUTABLE_OUTPUT_PATH ${PROJECT_BINARY_DIR}/bin) set(LIBRARY_OUTPUT_PATH ${PROJECT_BINARY_DIR}/lib) @@ -249,6 +249,18 @@ add_subdirectory(tests) endif() +# pkg-config support +if ( IS_ABSOLUTE "${CMAKE_INSTALL_LIBDIR}" ) + set ( pkgconfig_libdir "${CMAKE_INSTALL_LIBDIR}" ) +else () + set ( pkgconfig_libdir "\${exec_prefix}/${CMAKE_INSTALL_LIBDIR}" ) +endif () +if ( IS_ABSOLUTE "${CMAKE_INSTALL_INCLUDEDIR}" ) + set ( pkgconfig_includedir "${CMAKE_INSTALL_INCLUDEDIR}" ) +else () + set ( pkgconfig_includedir "\${prefix}/${CMAKE_INSTALL_INCLUDEDIR}" ) +endif () + if(UNIX AND NOT APPLE) if (BUILD_DOCS) find_package(Doxygen REQUIRED dot) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/drumstick-2.6.0/ChangeLog new/drumstick-2.6.1/ChangeLog --- old/drumstick-2.6.0/ChangeLog 2022-04-04 14:24:24.014975028 +0200 +++ new/drumstick-2.6.1/ChangeLog 2022-05-20 09:13:38.699662740 +0200 @@ -1,3 +1,18 @@ +2022-05-20 + * Release 2.6.1 + +2022-05-19 + * Another fix related to ticket #39: CMAKE_INSTALL_LIBDIR is passed to the compiler + as a symbol named LIBSUFFIX (see library/rt/CMakeLists.txt:69). It needed to be tested + at runtime with QDir::isAbsolutePath(). + * Bumped version to 2.6.1 for the next release. + +2022-05-17 + * Fixed ticket #39: pkg-config files are broken when CMAKE_INSTALL_{INCLUDE,LIB}DIR is absolute + +2022-04-22 + * Using QGuiApplication::setDesktopFileName on utils to fix the wrong icon in KDE+Wayland + 2022-04-04 * Release 2.6.0 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/drumstick-2.6.0/drumstick-alsa.pc.in new/drumstick-2.6.1/drumstick-alsa.pc.in --- old/drumstick-2.6.0/drumstick-alsa.pc.in 2022-04-04 14:24:24.014975028 +0200 +++ new/drumstick-2.6.1/drumstick-alsa.pc.in 2022-05-20 09:13:38.699662740 +0200 @@ -1,7 +1,7 @@ prefix=@CMAKE_INSTALL_PREFIX@ exec_prefix=${prefix} -libdir=${prefix}/@CMAKE_INSTALL_LIBDIR@ -includedir=${prefix}/@CMAKE_INSTALL_INCLUDEDIR@ +libdir=@pkgconfig_libdir@ +includedir=@pkgconfig_includedir@ Name: drumstick-alsa Version: @PROJECT_VERSION@ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/drumstick-2.6.0/drumstick-file.pc.in new/drumstick-2.6.1/drumstick-file.pc.in --- old/drumstick-2.6.0/drumstick-file.pc.in 2022-04-04 14:24:24.014975028 +0200 +++ new/drumstick-2.6.1/drumstick-file.pc.in 2022-05-20 09:13:38.699662740 +0200 @@ -1,7 +1,7 @@ prefix=@CMAKE_INSTALL_PREFIX@ exec_prefix=${prefix} -libdir=${prefix}/@CMAKE_INSTALL_LIBDIR@ -includedir=${prefix}/@CMAKE_INSTALL_INCLUDEDIR@ +libdir=@pkgconfig_libdir@ +includedir=@pkgconfig_includedir@ Name: drumstick-file Version: @PROJECT_VERSION@ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/drumstick-2.6.0/drumstick-rt.pc.in new/drumstick-2.6.1/drumstick-rt.pc.in --- old/drumstick-2.6.0/drumstick-rt.pc.in 2022-04-04 14:24:24.014975028 +0200 +++ new/drumstick-2.6.1/drumstick-rt.pc.in 2022-05-20 09:13:38.699662740 +0200 @@ -1,7 +1,7 @@ prefix=@CMAKE_INSTALL_PREFIX@ exec_prefix=${prefix} -libdir=${prefix}/@CMAKE_INSTALL_LIBDIR@ -includedir=${prefix}/@CMAKE_INSTALL_INCLUDEDIR@ +libdir=@pkgconfig_libdir@ +includedir=@pkgconfig_includedir@ Name: drumstick-rt Version: @PROJECT_VERSION@ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/drumstick-2.6.0/drumstick-widgets.pc.in new/drumstick-2.6.1/drumstick-widgets.pc.in --- old/drumstick-2.6.0/drumstick-widgets.pc.in 2022-04-04 14:24:24.014975028 +0200 +++ new/drumstick-2.6.1/drumstick-widgets.pc.in 2022-05-20 09:13:38.699662740 +0200 @@ -1,7 +1,7 @@ prefix=@CMAKE_INSTALL_PREFIX@ exec_prefix=${prefix} -libdir=${prefix}/@CMAKE_INSTALL_LIBDIR@ -includedir=${prefix}/@CMAKE_INSTALL_INCLUDEDIR@ +libdir=@pkgconfig_libdir@ +includedir=@pkgconfig_includedir@ Name: drumstick-widgets Version: @PROJECT_VERSION@ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/drumstick-2.6.0/library/rt/backendmanager.cpp new/drumstick-2.6.1/library/rt/backendmanager.cpp --- old/drumstick-2.6.0/library/rt/backendmanager.cpp 2022-04-04 14:24:23.962974987 +0200 +++ new/drumstick-2.6.1/library/rt/backendmanager.cpp 2022-05-20 09:13:38.599662504 +0200 @@ -120,7 +120,12 @@ QStringList libs; libs << "../lib/"; #if defined(LIBSUFFIX) - libs << QString("../%1/").arg(QT_STRINGIFY(LIBSUFFIX)); + QString libextra(QT_STRINGIFY(LIBSUFFIX)); + if (QDir::isAbsolutePath(libextra)) { + d->appendDir( libextra + QDir::separator() + QSTR_DRUMSTICK, result ); + } else { + libs << QString("../%1/").arg(libextra); + } #endif foreach(const QString& lib, libs) { d->appendDir( appPath + lib + QSTR_DRUMSTICK, result ); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/drumstick-2.6.0/utils/drumgrid/drumgridmain.cpp new/drumstick-2.6.1/utils/drumgrid/drumgridmain.cpp --- old/drumstick-2.6.0/utils/drumgrid/drumgridmain.cpp 2022-04-04 14:24:23.978975000 +0200 +++ new/drumstick-2.6.1/utils/drumgrid/drumgridmain.cpp 2022-05-20 09:13:38.659662645 +0200 @@ -42,6 +42,7 @@ QCoreApplication::setOrganizationDomain(QSTR_DOMAIN); QCoreApplication::setApplicationName(QSTR_APPNAME); QCoreApplication::setApplicationVersion(QStringLiteral(QT_STRINGIFY(VERSION))); + QGuiApplication::setDesktopFileName("net.sourceforge.drumstick-drumgrid"); QLocale locale; QTranslator qtTranslator; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/drumstick-2.6.0/utils/guiplayer/drumstick-guiplayer.desktop new/drumstick-2.6.1/utils/guiplayer/drumstick-guiplayer.desktop --- old/drumstick-2.6.0/utils/guiplayer/drumstick-guiplayer.desktop 2022-04-04 14:24:23.978975000 +0200 +++ new/drumstick-2.6.1/utils/guiplayer/drumstick-guiplayer.desktop 2022-05-20 09:13:38.671662673 +0200 @@ -1,5 +1,5 @@ [Desktop Entry] -Name=Drumstick MIDI Player +Name=Drumstick ALSA MIDI Player Exec=drumstick-guiplayer %f Icon=drumstick Terminal=false @@ -7,5 +7,5 @@ Categories=AudioVideo;Audio;Midi;Education;Music; Keywords=Music;Midi;Player; MimeType=audio/midi;audio/x-midi;audio/cakewalk; -Comment=Drumstick MIDI Player -Comment[es]=Reproductor MIDI de Drumstick +Comment=Simple MIDI Player +Comment[es]=Reproductor MIDI simple diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/drumstick-2.6.0/utils/guiplayer/playermain.cpp new/drumstick-2.6.1/utils/guiplayer/playermain.cpp --- old/drumstick-2.6.0/utils/guiplayer/playermain.cpp 2022-04-04 14:24:23.978975000 +0200 +++ new/drumstick-2.6.1/utils/guiplayer/playermain.cpp 2022-05-20 09:13:38.667662665 +0200 @@ -42,6 +42,7 @@ QCoreApplication::setOrganizationDomain(GUIPlayer::QSTR_DOMAIN); QCoreApplication::setApplicationName(GUIPlayer::QSTR_APPNAME); QCoreApplication::setApplicationVersion(QStringLiteral(QT_STRINGIFY(VERSION))); + QGuiApplication::setDesktopFileName("net.sourceforge.drumstick-guiplayer"); QLocale locale; QTranslator qtTranslator; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/drumstick-2.6.0/utils/vpiano/drumstick-vpiano.desktop new/drumstick-2.6.1/utils/vpiano/drumstick-vpiano.desktop --- old/drumstick-2.6.0/utils/vpiano/drumstick-vpiano.desktop 2022-04-04 14:24:23.978975000 +0200 +++ new/drumstick-2.6.1/utils/vpiano/drumstick-vpiano.desktop 2022-05-20 09:13:38.655662636 +0200 @@ -6,5 +6,5 @@ Type=Application Categories=AudioVideo;Audio;Midi;Education;Music; Keywords=Music;Midi;Piano;Virtual; -Comment=Drumstick Virtual Piano -Comment[es]=Piano virtual de Drumstick +Comment=Virtual Piano +Comment[es]=Piano virtual diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/drumstick-2.6.0/utils/vpiano/vpianomain.cpp new/drumstick-2.6.1/utils/vpiano/vpianomain.cpp --- old/drumstick-2.6.0/utils/vpiano/vpianomain.cpp 2022-04-04 14:24:23.978975000 +0200 +++ new/drumstick-2.6.1/utils/vpiano/vpianomain.cpp 2022-05-20 09:13:38.655662636 +0200 @@ -77,6 +77,7 @@ QCoreApplication::setApplicationVersion(QStringLiteral(QT_STRINGIFY(VERSION))); QCoreApplication::setAttribute(Qt::AA_SynthesizeMouseForUnhandledTouchEvents, false); QCoreApplication::setAttribute(Qt::AA_SynthesizeTouchForUnhandledMouseEvents, false); + QGuiApplication::setDesktopFileName("net.sourceforge.drumstick-vpiano"); QLocale locale; QTranslator qtTranslator;
