Accepting request 538204 from KDE:Extra

- Update to 2.8.1

OBS-URL: https://build.opensuse.org/request/show/538204
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/gammaray?expand=0&rev=5
This commit is contained in:
Dominique Leuenberger 2017-11-09 13:01:39 +00:00 committed by Git OBS Bridge
commit 60e9b7f737
5 changed files with 97 additions and 36 deletions

View File

@ -0,0 +1,33 @@
diff --git a/ui/resources/CMakeLists.txt b/ui/resources/CMakeLists.txt
index f0a9ac1c..c116f04c 100644
--- a/ui/resources/CMakeLists.txt
+++ b/ui/resources/CMakeLists.txt
@@ -2,14 +2,14 @@
if(UNIX AND NOT APPLE AND GAMMARAY_BUILD_UI)
foreach(size 16 24 32 48 64 128 256 512)
- foreach(scale 1 2 3)
+ #foreach(scale 1 2 3)
set(scaled_size ${size}x${size})
- if(${scale} GREATER 1)
- set(scaled_size ${size}x${size}@${scale})
- endif()
+ #if(${scale} GREATER 1)
+ # set(scaled_size ${size}x${size}@${scale})
+ #endif()
- set(source gammaray/GammaRay-${scaled_size}x.png)
+ set(source gammaray/GammaRay-${scaled_size}.png)
if(EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/${source})
install(
@@ -17,7 +17,7 @@ if(UNIX AND NOT APPLE AND GAMMARAY_BUILD_UI)
DESTINATION "${ICON_INSTALL_DIR}/hicolor/${scaled_size}/apps" RENAME GammaRay.png
)
endif()
- endforeach(scale)
+ #endforeach(scale)
endforeach(size)
endif()

View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:8d033f50ea62f9ff804cc4b8fa40b03f21c23481b4a98d03a65cc718124476c5
size 8299922

3
gammaray-2.8.1.tar.gz Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:b01533a524d6f66e4e15d94b7528c7c4d6d8dfc104621849be6155df6b52fc3f
size 8442832

View File

@ -1,3 +1,19 @@
-------------------------------------------------------------------
Wed Nov 1 18:47:50 UTC 2017 - christophe@krop.fr
- Update to 2.8.1:
* Fix compilation with interestingly packaged qmllint on Ubuntu.
* Fix error handling in LLDB injector when LLDB scripting support is not available.
* Fix tree view corruption when searching.
* Fix linking with backward-cpp in BFD mode using a static libbdf.
* Fix assert when launching a Windows target using a Qt debug build.
* Fix crash during attaching on Windows.
* Fix build with MSVC2010 and Qt4.8.
* Fix attach dialog not seeing 32bit processes on 64bit Windows systems.
* Add support for Qt 5.9.2.
- Add Fix_icons_installation.patch.
-------------------------------------------------------------------
Sat Jun 17 10:30:15 UTC 2017 - fabian@ritter-vogt.de

View File

@ -18,13 +18,16 @@
%define tarname GammaRay
Name: gammaray
Version: 2.8.0
Version: 2.8.1
Release: 0
Summary: Introspection/Debugging Tool for Qt Applications
License: GPL-2.0+
Group: Development/Tools/Debuggers
Url: http://www.kdab.com/gammaray
Source: https://github.com/KDAB/GammaRay/releases/download/v%{version}/%{name}-%{version}.tar.gz
# PATCH-FIX-UPSTREAM Fix_icons_installation.patch -- Don't try to install multiple copies in exotic subdirs
Patch0: Fix_icons_installation.patch
BuildRequires: binutils-devel
BuildRequires: cmake >= 2.8.11
BuildRequires: fdupes
BuildRequires: kcoreaddons-devel
@ -37,15 +40,19 @@ BuildRequires: graphviz-devel
BuildRequires: graphviz-gnome
BuildRequires: hicolor-icon-theme
BuildRequires: kdstatemachineeditor-devel
BuildRequires: libQt5Core-private-headers-devel >= 5.2.0
BuildRequires: libQt5Gui-private-headers-devel >= 5.2.0
BuildRequires: libQt5Network-private-headers-devel >= 5.2.0
BuildRequires: libqt5-qt3d-devel >= 5.2.0
BuildRequires: libqt5-qtbase-doc >= 5.2.0
BuildRequires: libqt5-qtdeclarative-private-headers-devel >= 5.2.0
BuildRequires: libqt5-qtdoc >= 5.2.0
BuildRequires: libqt5-qttools >= 5.2.0
BuildRequires: libqt5-qtwayland-devel >= 5.2.0
BuildRequires: libQt5Core-private-headers-devel >= 5.3.0
BuildRequires: libQt5Gui-private-headers-devel >= 5.3.0
BuildRequires: libQt5Network-private-headers-devel >= 5.3.0
BuildRequires: libdw-devel
BuildRequires: libqt5-qt3d-devel >= 5.3.0
BuildRequires: libqt5-qtbase-doc >= 5.3.0
BuildRequires: libqt5-qtdeclarative-private-headers-devel >= 5.3.0
BuildRequires: libqt5-qtdoc >= 5.3.0
%if 0%{?suse_version} > 1320
BuildRequires: libqt5-qtscxml-private-headers-devel >= 5.8.0
%endif
BuildRequires: libqt5-qttools >= 5.3.0
BuildRequires: libqt5-qtwayland-devel >= 5.3.0
BuildRequires: libxml2-devel
BuildRequires: python-devel
BuildRequires: update-desktop-files
@ -57,22 +64,25 @@ BuildRequires: wayland-devel
%if 0%{?suse_version} > 1320
BuildRequires: cmake(KF5SyntaxHighlighting) >= 5.28.0
%endif
BuildRequires: cmake(Qt5Bluetooth) >= 5.2.0
BuildRequires: cmake(Qt5Concurrent) >= 5.2.0
BuildRequires: cmake(Qt5Core) >= 5.2.0
BuildRequires: cmake(Qt5Designer) >= 5.2.0
BuildRequires: cmake(Qt5Gui) >= 5.2.0
BuildRequires: cmake(Qt5Network) >= 5.2.0
BuildRequires: cmake(Qt5Positioning) >= 5.2.0
BuildRequires: cmake(Qt5PrintSupport) >= 5.2.0
BuildRequires: cmake(Qt5Qml) >= 5.2.0
BuildRequires: cmake(Qt5Quick) >= 5.2.0
BuildRequires: cmake(Qt5Script) >= 5.2.0
BuildRequires: cmake(Qt5ScriptTools) >= 5.2.0
BuildRequires: cmake(Qt5Svg) >= 5.2.0
BuildRequires: cmake(Qt5Test) >= 5.2.0
BuildRequires: cmake(Qt5WebKitWidgets) >= 5.2.0
BuildRequires: cmake(Qt5Widgets) >= 5.2.0
BuildRequires: cmake(Qt5Bluetooth) >= 5.3.0
BuildRequires: cmake(Qt5Concurrent) >= 5.3.0
BuildRequires: cmake(Qt5Core) >= 5.3.0
BuildRequires: cmake(Qt5Designer) >= 5.3.0
BuildRequires: cmake(Qt5Gui) >= 5.3.0
BuildRequires: cmake(Qt5Network) >= 5.3.0
BuildRequires: cmake(Qt5Positioning) >= 5.3.0
BuildRequires: cmake(Qt5PrintSupport) >= 5.3.0
BuildRequires: cmake(Qt5Qml) >= 5.3.0
BuildRequires: cmake(Qt5Quick) >= 5.3.0
BuildRequires: cmake(Qt5Script) >= 5.3.0
BuildRequires: cmake(Qt5ScriptTools) >= 5.3.0
%if 0%{?suse_version} > 1320
BuildRequires: cmake(Qt5Scxml) >= 5.8.0
%endif
BuildRequires: cmake(Qt5Svg) >= 5.3.0
BuildRequires: cmake(Qt5Test) >= 5.3.0
BuildRequires: cmake(Qt5WebKitWidgets) >= 5.3.0
BuildRequires: cmake(Qt5Widgets) >= 5.3.0
BuildRoot: %{_tmppath}/%{name}-%{version}-build
%description
@ -92,6 +102,7 @@ frameworks in Qt. Development files.
%prep
%setup -q -n %{name}-%{version}
%patch0 -p1
%build
%if "%{_lib}" == "lib64"
@ -122,7 +133,7 @@ mv %{buildroot}%{_datadir}/doc/%{name} %{buildroot}%{_docdir}
%files
%defattr(-,root,root)
%doc CHANGES ReadMe.txt LICENSE.*
%doc CHANGES ReadMe.txt
%dir %{_datadir}/icons/hicolor/512x512/
%dir %{_datadir}/icons/hicolor/512x512/apps/
%{_bindir}/gammaray
@ -131,11 +142,10 @@ mv %{buildroot}%{_datadir}/doc/%{name} %{buildroot}%{_docdir}
%{_docdir}/%{name}/
%{_libdir}/gammaray/
%{_libdir}/libgammaray_*-qt5*.so.*
%{_libdir}/libgammaray_kuserfeedback.so.*
%{_libdir}/libgammaray_client.so.*
%{_libdir}/libgammaray_kuserfeedback.so.*
%{_libdir}/libgammaray_launcher.so.*
# Pseudo-private and pseudo-shared library...
%{_libdir}/libgammaray_launcher_ui.so
%{_libdir}/libgammaray_launcher_ui.so.*
%{_mandir}/man1/gammaray.*
%if 0%{?suse_version} <= 1320
%dir %{_datadir}/appdata
@ -145,12 +155,14 @@ mv %{buildroot}%{_datadir}/doc/%{name} %{buildroot}%{_docdir}
%files devel
%defattr(-,root,root)
%doc LICENSE.*
%{_includedir}/%{name}
%{_libdir}/cmake/GammaRay/
%{_libdir}/libgammaray_*-qt5*.so
%{_libdir}/libgammaray_client.so
%{_libdir}/libgammaray_launcher.so
%{_libdir}/libgammaray_kuserfeedback.so
%{_libdir}/cmake/GammaRay/
%{_includedir}/%{name}
%{_libdir}/libgammaray_launcher.so
%{_libdir}/libgammaray_launcher_ui.so
%{_libdir}/qt5/mkspecs/modules/qt_GammaRay*.pri
%changelog