Mailinglist Archive: opensuse-commit (1903 mails)

< Previous Next >
commit hydrogen for openSUSE:Factory
Hello community,

here is the log from the commit of package hydrogen for openSUSE:Factory
checked in at 2019-04-08 10:40:24
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/hydrogen (Old)
and /work/SRC/openSUSE:Factory/.hydrogen.new.3908 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Package is "hydrogen"

Mon Apr 8 10:40:24 2019 rev:38 rq:692148 version:0.9.9pre1

Changes:
--------
--- /work/SRC/openSUSE:Factory/hydrogen/hydrogen.changes 2018-03-07
10:40:11.706537303 +0100
+++ /work/SRC/openSUSE:Factory/.hydrogen.new.3908/hydrogen.changes
2019-04-08 10:40:53.231303476 +0200
@@ -1,0 +2,9 @@
+Sun Apr 7 14:27:51 UTC 2019 - plater <davejplater@xxxxxxxxx>
+
+- Update to 1.0.0-beta named version 0.9.9pre1
+- Now builds with qt5
+- Rebased hydrogen-0.9.6-lib64.patch, hydrogen-gcc47.patch and
+ hydrogen-no-current-time.patch.
+- Removed hydrogen-0.9.6-desktop.patch.
+
+-------------------------------------------------------------------

Old:
----
hydrogen-0.9.6-desktop.patch
hydrogen-0.9.7.tar.gz

New:
----
hydrogen-0.9.9pre1.tar.gz

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ hydrogen.spec ++++++
--- /var/tmp/diff_new_pack.m39jZi/_old 2019-04-08 10:40:54.459303775 +0200
+++ /var/tmp/diff_new_pack.m39jZi/_new 2019-04-08 10:40:54.459303775 +0200
@@ -1,7 +1,7 @@
#
# spec file for package hydrogen
#
-# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -16,26 +16,25 @@
#


-%define soversion 0
+%define soversion 1
%define soage 0
%define sorevision 0
+%define tarvers 1.0.0
# WARNING: ATM librubberband2 support is experimental currently it is
recommended that you disable
# this config option to ensure backwards compatibility with songs created
under 0.9.5 which use
# rubberband. Use the rubberband -cli package instead.
%define librubberband 0
Name: hydrogen
-Version: 0.9.7
+Version: 0.9.9pre1
Release: 0
Summary: A Real-Time Drum Machine and Sequencer
# NOTE: Don't forget to update the libsuffix macro.
-License: GPL-2.0+
+License: GPL-2.0-or-later
Group: Productivity/Multimedia/Sound/Midi
Url: http://www.hydrogen-music.org/
-Source0: %{name}-%{version}.tar.gz
+Source0:
https://github.com/hydrogen-music/%{name}/archive/%{tarvers}-beta1.tar.gz#/%{name}-%{version}.tar.gz
Source1: h2cli.1
Source2: COPYING
-# Fixup the desktop file.
-Patch0: hydrogen-0.9.6-desktop.patch
# Remove current date and time from sources.
Patch1: hydrogen-no-current-time.patch
# libhydrogencore has no soname and installs in _libexecdir
@@ -53,26 +52,19 @@
BuildRequires: pkgconfig
BuildRequires: update-desktop-files
BuildRequires: util-linux
-BuildRequires: pkgconfig(Qt3Support)
-BuildRequires: pkgconfig(QtCLucene)
-BuildRequires: pkgconfig(QtCore)
-BuildRequires: pkgconfig(QtDBus)
-BuildRequires: pkgconfig(QtDeclarative)
-BuildRequires: pkgconfig(QtDesigner)
-BuildRequires: pkgconfig(QtDesignerComponents)
-BuildRequires: pkgconfig(QtGui)
-BuildRequires: pkgconfig(QtHelp)
-BuildRequires: pkgconfig(QtMultimedia)
-BuildRequires: pkgconfig(QtNetwork)
-BuildRequires: pkgconfig(QtOpenGL)
-BuildRequires: pkgconfig(QtScript)
-BuildRequires: pkgconfig(QtScriptTools)
-BuildRequires: pkgconfig(QtSql)
-BuildRequires: pkgconfig(QtSvg)
-BuildRequires: pkgconfig(QtTest)
-BuildRequires: pkgconfig(QtUiTools)
-BuildRequires: pkgconfig(QtXml)
-BuildRequires: pkgconfig(QtXmlPatterns)
+BuildRequires: cmake(Qt5LinguistTools)
+BuildRequires: cmake(Qt5Test)
+BuildRequires: pkgconfig(Qt5Concurrent)
+BuildRequires: pkgconfig(Qt5Core) >= 5.6
+BuildRequires: pkgconfig(Qt5DBus)
+BuildRequires: pkgconfig(Qt5Gui)
+BuildRequires: pkgconfig(Qt5Network)
+BuildRequires: pkgconfig(Qt5OpenGL)
+BuildRequires: pkgconfig(Qt5Sql)
+BuildRequires: pkgconfig(Qt5Widgets)
+BuildRequires: pkgconfig(Qt5X11Extras)
+BuildRequires: pkgconfig(Qt5Xml)
+BuildRequires: pkgconfig(Qt5XmlPatterns)
BuildRequires: pkgconfig(alsa)
BuildRequires: pkgconfig(flac)
BuildRequires: pkgconfig(flac++)
@@ -84,9 +76,6 @@
BuildRequires: pkgconfig(raptor2)
BuildRequires: pkgconfig(sndfile)
BuildRequires: pkgconfig(zlib)
-#%%if 0%%{?suse_version} <= 1140
-#BuildRequires: libqt4-devel-doc-data
-#%%endif
#pkgconfig(ladspa-1.13)
%if 0%{?librubberband} == 1
BuildRequires: pkgconfig(rubberband)
@@ -131,24 +120,16 @@
link with libhydrogen-core.

%prep
-%setup -q
-%patch0
-%patch1
-%patch2
-%patch3
+%setup -q -n %{name}-%{tarvers}-beta1
+
+%autopatch -p1

# copy licence with correct fsf address
install -m 0644 %{SOURCE2} ./

%build

-mkdir -p Build && pushd Build
-cmake -L ../ -DCMAKE_INSTALL_PREFIX:PATH=%{_prefix} \
- -DCMAKE_LIBRARY_ARCHITECTURE:STRING=%{_arch} \
- -DCMAKE_CXX_FLAGS:STRING="%{optflags} -ggdb" \
- -DCMAKE_C_FLAGS:STRING="%{optflags} -ggdb" \
- -DCMAKE_BUILD_TYPE:STRING=Release \
- -DCMAKE_VERBOSE_MAKEFILE:BOOL=on \
+%cmake \
-DWANT_SHARED:BOOL=on \
-DWANT_LIBARCHIVE:BOOL=on \
-DWANT_LRDF:BOOL=off \
@@ -157,14 +138,14 @@
-DCMAKE_CURRENT_LIBRARY_DIR:PATH="%{_lib}" \
-Dcoreversion:STRING=%{soversion} \
-Dsoage:STRING=%{soage} \
- -Dsorevision:STRING=%{sorevision} \
+ -Dsorevision:STRING=%{sorevision}

# For some reason cmake won't produce a correct soname with only the version
so this is a hack to fix it.
pushd src/core/CMakeFiles/hydrogen-core.dir && \
-cat link.txt|sed
's/-soname,libhydrogen-core.so.0.0.0/-soname,libhydrogen-core.so.0/'>\
+cat link.txt|sed
's/-soname,libhydrogen-core.so.%{tarvers}/-soname,libhydrogen-core.so.%{soversion}/'>\
link.txt~;mv link.txt~ link.txt

-cat relink.txt|sed
's/-soname,libhydrogen-core.so.0.0.0/-soname,libhydrogen-core.so.0/'>\
+cat relink.txt|sed
's/-soname,libhydrogen-core.so.%{tarvers}/-soname,libhydrogen-core.so.%{soversion}/'>\
relink.txt~;mv relink.txt~ relink.txt

popd
@@ -174,15 +155,14 @@
# LD_LIBRARY_PATH=%%{_libdir}/mpi/gcc/openmpi/%%{_lib}
# LD_RUN_PATH=%%{_libdir}

-popd
-
%install

#export QTDIR=%%{_libdir}/qt4/
-pushd Build
-%make_install VERBOSE_MAKEFILE=1
+%cmake_install VERBOSE_MAKEFILE=1
+mkdir -p %{buildroot}%{_libdir} && cp -v
build/src/core/libhydrogen-core.so.%{tarvers} %{buildroot}%{_libdir}/
# libhydrogen-core's internal SONAME = libhydrogen-core.so.0 so we provide a
link.
-cd %{buildroot}%{_libdir} && ln -s libhydrogen-core.so.0.0.0
libhydrogen-core.so.0
+pushd %{buildroot}%{_libdir} && ln -s libhydrogen-core.so.%{tarvers}
libhydrogen-core.so.%{soversion}
+ln -s libhydrogen-core.so.%{tarvers} libhydrogen-core.so
popd

# Install the h2cli man page created by help2man
@@ -230,6 +210,7 @@
%{_datadir}/appdata/%{name}.appdata.xml
%{_datadir}/applications/%{name}.desktop
%{_datadir}/icons/hicolor/scalable/apps/h2-icon.svg
+%{_datadir}/pixmaps/h2-icon.svg

%post -n libhydrogen-core%{soversion} -p /sbin/ldconfig
%postun -n libhydrogen-core%{soversion} -p /sbin/ldconfig

++++++ hydrogen-0.9.6-lib64.patch ++++++
--- /var/tmp/diff_new_pack.m39jZi/_old 2019-04-08 10:40:54.571303803 +0200
+++ /var/tmp/diff_new_pack.m39jZi/_new 2019-04-08 10:40:54.575303804 +0200
@@ -1,7 +1,7 @@
-Index: src/core/CMakeLists.txt
+Index: hydrogen-1.0.0-beta1/src/core/CMakeLists.txt
===================================================================
---- src/core/CMakeLists.txt.orig 2011-01-14 13:03:25.000000000 +0200
-+++ src/core/CMakeLists.txt 2011-10-09 19:32:55.758068137 +0200
+--- hydrogen-1.0.0-beta1.orig/src/core/CMakeLists.txt 2018-03-14
12:03:22.000000000 +0200
++++ hydrogen-1.0.0-beta1/src/core/CMakeLists.txt 2019-04-07
15:15:44.037816201 +0200
@@ -5,7 +5,7 @@ FILE(GLOB_RECURSE hydrogen_INCLUDES incl
FILE(GLOB_RECURSE hydrogen_SOURCES src/*.cpp src/*.cc src/*.c)
LIST(APPEND hydrogen_INCLUDES
${CMAKE_CURRENT_BINARY_DIR}/include/hydrogen/config.h)
@@ -11,17 +11,24 @@
INCLUDE_DIRECTORIES( include
${CMAKE_SOURCE_DIR}/include # regular headers
${CMAKE_CURRENT_BINARY_DIR}/include # generated config.h
-@@ -27,7 +27,7 @@ INCLUDE_DIRECTORIES( include
- ${RUBBERBAND_INCLUDE_DIR}
+@@ -26,7 +26,7 @@ INCLUDE_DIRECTORIES( include
+ ${RUBBERBAND_INCLUDE_DIRS}
)

-TARGET_LINK_LIBRARIES(hydrogen-core-${VERSION}
+TARGET_LINK_LIBRARIES(hydrogen-core
- ${QT_QTCORE_LIBRARY}
- ${QT_QTXML_LIBRARY}
- ${QT_QTXMLPATTERNS_LIBRARY}
-@@ -52,14 +52,20 @@ TARGET_LINK_LIBRARIES(hydrogen-core-${VE
- ${NSMSESSION_LIBRARIES}
+ ${LIBTAR_LIBRARIES}
+ ${LIBARCHIVE_LIBRARIES}
+ ${LIBSNDFILE_LIBRARIES}
+@@ -48,20 +48,27 @@ TARGET_LINK_LIBRARIES(hydrogen-core-${VE
+ ${OSC_LIBRARIES}
+ )
+
+-TARGET_LINK_LIBRARIES(hydrogen-core-${VERSION}
++TARGET_LINK_LIBRARIES(hydrogen-core
+ Qt5::Core
+ Qt5::Xml
+ Qt5::XmlPatterns
)

-#SET_TARGET_PROPERTIES(hydrogen-core-${VERSION} PROPERTIES PUBLIC_HEADER
"${hydrogen_INCLUDES}" )
@@ -43,102 +50,89 @@
# do not copy directory hierarchy
#PUBLIC_HEADER DESTINATION include/hydrogen
-)
++

- IF(NOT APPPLE AND NOT WIN32)
+ IF(NOT APPLE AND NOT WIN32)
INSTALL(DIRECTORY include DESTINATION "${CMAKE_INSTALL_PREFIX}"
FILES_MATCHING PATTERN "*.h" PATTERN ".svn" EXCLUDE)
-Index: src/gui/CMakeLists.txt
+Index: hydrogen-1.0.0-beta1/src/gui/CMakeLists.txt
===================================================================
---- src/gui/CMakeLists.txt.orig 2011-01-06 11:31:10.000000000 +0200
-+++ src/gui/CMakeLists.txt 2011-10-08 01:15:00.448239957 +0200
-@@ -49,11 +49,11 @@ INCLUDE_DIRECTORIES(
-
+--- hydrogen-1.0.0-beta1.orig/src/gui/CMakeLists.txt 2018-03-14
12:03:22.000000000 +0200
++++ hydrogen-1.0.0-beta1/src/gui/CMakeLists.txt 2019-04-07
15:17:18.029435707 +0200
+@@ -51,10 +51,10 @@ ENDIF()
ADD_EXECUTABLE(hydrogen WIN32 MACOSX_BUNDLE ${hydrogen_SRCS} ${hydrogen_MOC}
${hydrogen_UIS_H} ${CMAKE_SOURCE_DIR}/windows/icon.rc)
+
TARGET_LINK_LIBRARIES(hydrogen
-- hydrogen-core-${VERSION}
-+ hydrogen-core
- ${QT_QTGUI_LIBRARY}
- ${QT_QTNETWORK_LIBRARY}
+- hydrogen-core-${VERSION}
++ hydrogen-core
+ Qt5::Widgets
)
-
+ qt5_use_modules(hydrogen Widgets)
-ADD_DEPENDENCIES(hydrogen hydrogen-core-${VERSION})
+ADD_DEPENDENCIES(hydrogen hydrogen-core)

INSTALL(TARGETS hydrogen RUNTIME DESTINATION bin BUNDLE DESTINATION bin )
-Index: src/player/CMakeLists.txt
+Index: hydrogen-1.0.0-beta1/src/player/CMakeLists.txt
===================================================================
---- src/player/CMakeLists.txt.orig 2011-01-07 19:29:23.000000000 +0200
-+++ src/player/CMakeLists.txt 2011-10-08 01:17:08.357343032 +0200
-@@ -9,10 +9,10 @@ INCLUDE_DIRECTORIES(
-
+--- hydrogen-1.0.0-beta1.orig/src/player/CMakeLists.txt 2018-03-14
12:03:22.000000000 +0200
++++ hydrogen-1.0.0-beta1/src/player/CMakeLists.txt 2019-04-07
15:27:27.705029162 +0200
+@@ -10,10 +10,10 @@ INCLUDE_DIRECTORIES(
ADD_EXECUTABLE(h2player WIN32 MACOSX_BUNDLE ${h2player_SRCS} )
+
TARGET_LINK_LIBRARIES(h2player
-- hydrogen-core-${VERSION}
-+ hydrogen-core
- ${QT_QTGUI_LIBRARY}
- )
+- hydrogen-core-${VERSION}
++ hydrogen-core
+ Qt5::Widgets
+ )

-ADD_DEPENDENCIES(h2player hydrogen-core-${VERSION})
+ADD_DEPENDENCIES(h2player hydrogen-core)

INSTALL(TARGETS h2player RUNTIME DESTINATION bin BUNDLE DESTINATION bin )
-Index: src/cli/CMakeLists.txt
+Index: hydrogen-1.0.0-beta1/src/cli/CMakeLists.txt
===================================================================
---- src/cli/CMakeLists.txt.orig 2011-01-07 19:29:23.000000000 +0200
-+++ src/cli/CMakeLists.txt 2011-10-08 01:19:05.056788023 +0200
-@@ -10,11 +10,11 @@ INCLUDE_DIRECTORIES(
-
+--- hydrogen-1.0.0-beta1.orig/src/cli/CMakeLists.txt 2018-03-14
12:03:22.000000000 +0200
++++ hydrogen-1.0.0-beta1/src/cli/CMakeLists.txt 2019-04-07
15:21:32.515260232 +0200
+@@ -12,12 +12,12 @@ INCLUDE_DIRECTORIES(
ADD_EXECUTABLE(h2cli WIN32 MACOSX_BUNDLE ${h2cli_SRCS} )
+
TARGET_LINK_LIBRARIES(h2cli
-- hydrogen-core-${VERSION}
-+ hydrogen-core
- ${QT_QTGUI_LIBRARY}
- ${LASH_LIBRARIES}
- )
+- hydrogen-core-${VERSION}
++ hydrogen-core
+ Qt5::Widgets
+ ${LASH_LIBRARIES}
+ ${OSC_LIBRARIES}
+ )

-ADD_DEPENDENCIES(h2cli hydrogen-core-${VERSION})
+ADD_DEPENDENCIES(h2cli hydrogen-core)

INSTALL(TARGETS h2cli RUNTIME DESTINATION bin BUNDLE DESTINATION bin )
-Index: src/synth/CMakeLists.txt
-===================================================================
---- src/synth/CMakeLists.txt.orig 2011-01-07 19:29:23.000000000 +0200
-+++ src/synth/CMakeLists.txt 2011-10-08 01:22:45.011088604 +0200
-@@ -9,10 +9,10 @@ INCLUDE_DIRECTORIES(
-
- ADD_EXECUTABLE(h2synth WIN32 MACOSX_BUNDLE ${h2synth_SRCS} )
- TARGET_LINK_LIBRARIES(h2synth
-- hydrogen-core-${VERSION}
-+ hydrogen-core
- ${QT_QTGUI_LIBRARY}
- )
-
--ADD_DEPENDENCIES(h2synth hydrogen-core-${VERSION})
-+ADD_DEPENDENCIES(h2synth hydrogen-core)
-
- INSTALL(TARGETS h2synth RUNTIME DESTINATION bin BUNDLE DESTINATION bin )
-Index: src/tests/CMakeLists.txt
+Index: hydrogen-1.0.0-beta1/src/tests/CMakeLists.txt
===================================================================
---- src/tests/CMakeLists.txt.orig 2011-01-07 22:38:10.000000000 +0200
-+++ src/tests/CMakeLists.txt 2011-10-08 01:20:13.158713653 +0200
-@@ -11,8 +11,8 @@ FILE(GLOB_RECURSE TESTS_SRCS *.cpp)
- link_directories()
+--- hydrogen-1.0.0-beta1.orig/src/tests/CMakeLists.txt 2018-03-14
12:03:22.000000000 +0200
++++ hydrogen-1.0.0-beta1/src/tests/CMakeLists.txt 2019-04-07
15:25:14.043840330 +0200
+@@ -12,10 +12,10 @@ link_directories()
add_executable(tests ${TESTS_SRCS})
+
target_link_libraries(tests
-- hydrogen-core-${VERSION}
-+ hydrogen-core
+- hydrogen-core-${VERSION}
++ hydrogen-core
${CPPUNIT_LIBRARIES}
+ Qt5::Core
)
+
-add_dependencies(tests hydrogen-core-${VERSION})
+add_dependencies(tests hydrogen-core)

-Index: CMakeLists.txt
+Index: hydrogen-1.0.0-beta1/CMakeLists.txt
===================================================================
---- CMakeLists.txt.orig 2011-09-13 03:35:18.000000000 +0200
-+++ CMakeLists.txt 2011-10-09 19:33:45.071516565 +0200
-@@ -101,6 +101,7 @@ ELSE()
+--- hydrogen-1.0.0-beta1.orig/CMakeLists.txt 2018-03-14 12:03:22.000000000
+0200
++++ hydrogen-1.0.0-beta1/CMakeLists.txt 2019-04-07 15:33:38.055450755
+0200
+@@ -98,7 +98,7 @@ ELSE()
+ ENDIF()

IF(WANT_SHARED)
- SET(H2CORE_LIBRARY_TYPE SHARED)
+- SET(H2CORE_LIBRARY_TYPE SHARED)
+ SET(H2CORE_LIBRARY_SONAME ${coreversion}.${soage}.${sorevision})
ELSE()
SET(H2CORE_LIBRARY_TYPE STATIC)

++++++ hydrogen-gcc47.patch ++++++
--- /var/tmp/diff_new_pack.m39jZi/_old 2019-04-08 10:40:54.619303815 +0200
+++ /var/tmp/diff_new_pack.m39jZi/_new 2019-04-08 10:40:54.619303815 +0200
@@ -1,7 +1,7 @@
-Index: src/gui/src/SongEditor/SongEditor.cpp
+Index: hydrogen-1.0.0-beta1/src/gui/src/SongEditor/SongEditor.cpp
===================================================================
---- src/gui/src/SongEditor/SongEditor.cpp.orig 2011-07-13 07:20:49.000000000
+0200
-+++ src/gui/src/SongEditor/SongEditor.cpp 2012-03-17 21:26:39.717208076
+0100
+--- hydrogen-1.0.0-beta1.orig/src/gui/src/SongEditor/SongEditor.cpp
2018-03-14 12:03:22.000000000 +0200
++++ hydrogen-1.0.0-beta1/src/gui/src/SongEditor/SongEditor.cpp 2019-04-07
11:57:23.663368541 +0200
@@ -21,6 +21,7 @@
*/

@@ -10,10 +10,10 @@
#include <algorithm>
#include <memory>

-Index: src/gui/src/MainForm.cpp
+Index: hydrogen-1.0.0-beta1/src/gui/src/MainForm.cpp
===================================================================
---- src/gui/src/MainForm.cpp.orig 2011-07-04 23:27:45.000000000 +0200
-+++ src/gui/src/MainForm.cpp 2012-03-17 21:33:34.983627498 +0100
+--- hydrogen-1.0.0-beta1.orig/src/gui/src/MainForm.cpp 2018-03-14
12:03:22.000000000 +0200
++++ hydrogen-1.0.0-beta1/src/gui/src/MainForm.cpp 2019-04-07
11:57:23.663368541 +0200
@@ -20,6 +20,7 @@
*
*/

++++++ hydrogen-no-current-time.patch ++++++
--- /var/tmp/diff_new_pack.m39jZi/_old 2019-04-08 10:40:54.639303819 +0200
+++ /var/tmp/diff_new_pack.m39jZi/_new 2019-04-08 10:40:54.643303820 +0200
@@ -1,8 +1,8 @@
-Index: src/cli/main.cpp
+Index: hydrogen-1.0.0-beta1/src/cli/main.cpp
===================================================================
---- src/cli/main.cpp.orig 2016-11-05 10:22:50.000000000 +0200
-+++ src/cli/main.cpp 2017-04-12 13:59:21.056205885 +0200
-@@ -429,7 +429,7 @@ int main(int argc, char *argv[])
+--- hydrogen-1.0.0-beta1.orig/src/cli/main.cpp 2019-04-07 14:12:50.730941725
+0200
++++ hydrogen-1.0.0-beta1/src/cli/main.cpp 2019-04-07 14:13:01.875398756
+0200
+@@ -432,7 +432,7 @@ int main(int argc, char *argv[])
/* Show some information */
void showInfo()
{
@@ -11,11 +11,11 @@
cout << "Copyright 2002-2008 Alessandro Cominu" << endl;

if ( Object::count_active() ) {
-Index: src/gui/src/AboutDialog.cpp
+Index: hydrogen-1.0.0-beta1/src/gui/src/AboutDialog.cpp
===================================================================
---- src/gui/src/AboutDialog.cpp.orig 2016-11-05 10:22:50.000000000 +0200
-+++ src/gui/src/AboutDialog.cpp 2017-04-12 14:00:34.654509868 +0200
-@@ -43,7 +43,7 @@ AboutDialog::AboutDialog(QWidget* parent
+--- hydrogen-1.0.0-beta1.orig/src/gui/src/AboutDialog.cpp 2019-04-07
14:12:50.730941725 +0200
++++ hydrogen-1.0.0-beta1/src/gui/src/AboutDialog.cpp 2019-04-07
14:13:01.875398756 +0200
+@@ -42,7 +42,7 @@ AboutDialog::AboutDialog(QWidget* parent
move( 240, 100 );

QString about;
@@ -24,23 +24,10 @@
about += tr( "<b>Website</b><br>" );
about += "http://www.hydrogen-music.org<br><br>";
about += tr( "<b>Project page</b><br>");
-Index: src/gui/src/main.cpp
+Index: hydrogen-1.0.0-beta1/src/gui/src/SplashScreen.cpp
===================================================================
---- src/gui/src/main.cpp.orig 2016-11-05 10:22:50.000000000 +0200
-+++ src/gui/src/main.cpp 2017-04-12 14:02:21.285847368 +0200
-@@ -485,7 +485,7 @@ int main(int argc, char *argv[])
- */
- void showInfo()
- {
-- cout << "\nHydrogen " + H2Core::get_version() + " [" + __DATE__ + "]
[http://www.hydrogen-music.org]"; << endl;
-+ cout << "\nHydrogen " + H2Core::get_version() + " [" + + "]
[http://www.hydrogen-music.org]"; << endl;
- cout << "Copyright 2002-2008 Alessandro Cominu" << endl;
- cout << "Copyright 2008-2016 The hydrogen development team" << endl;
-
-Index: src/gui/src/SplashScreen.cpp
-===================================================================
---- src/gui/src/SplashScreen.cpp.orig 2016-11-05 10:22:50.000000000 +0200
-+++ src/gui/src/SplashScreen.cpp 2017-04-12 14:03:36.176190995 +0200
+--- hydrogen-1.0.0-beta1.orig/src/gui/src/SplashScreen.cpp 2019-04-07
14:12:50.730941725 +0200
++++ hydrogen-1.0.0-beta1/src/gui/src/SplashScreen.cpp 2019-04-07
14:13:01.875398756 +0200
@@ -51,7 +51,7 @@ SplashScreen::SplashScreen()
p.setFont( font );
p.setPen( QColor( 20, 20, 20 ) );
@@ -50,3 +37,16 @@
p.drawText( 5, 5, width - 10, 40, Qt::AlignRight | Qt::AlignTop,
version );

p.end();
+Index: hydrogen-1.0.0-beta1/src/gui/src/main.cpp
+===================================================================
+--- hydrogen-1.0.0-beta1.orig/src/gui/src/main.cpp 2019-04-07
14:12:50.730941725 +0200
++++ hydrogen-1.0.0-beta1/src/gui/src/main.cpp 2019-04-07 14:18:14.288222255
+0200
+@@ -149,7 +149,7 @@ int main(int argc, char *argv[])
+
+ QCommandLineParser parser;
+
+- QString aboutText = QString( "\nHydrogen " ) +
QString::fromStdString( H2Core::get_version() ) + QString( " [" ) +
QString::fromStdString( __DATE__ ) + QString( "]
[http://www.hydrogen-music.org]"; ) +
++ QString aboutText = QString( "\nHydrogen " ) +
QString::fromStdString( H2Core::get_version() ) + QString( " [" ) +
QString::fromStdString( "" ) + QString( "] [http://www.hydrogen-music.org]"; ) +
+ QString( "\nCopyright 2002-2008 Alessandro Cominu\nCopyright
2008-2018 The hydrogen development team" ) +
+ QString( "\nHydrogen comes with ABSOLUTELY NO WARRANTY\nThis is
free software, and you are welcome to redistribute it under certain conditions.
See the file COPYING for details.\n" );
+


< Previous Next >
This Thread
  • No further messages