rpms/guitarix
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Rebuild for eigen3-3.3.1

Browse Source 
Add patch to fix Glib::RefPtr null checks
This commit is contained in:
Rich Mattes 2016-12-28 20:33:31 -05:00
parent cc43515802
commit eb1cb49244
2 changed files with 49 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
guitarix-0.35.0-glib.patch Normal file
View File

@ -0,0 +1,42 @@
diff -up ./src/gx_head/engine/gx_system.cpp.glib ./src/gx_head/engine/gx_system.cpp
--- ./src/gx_head/engine/gx_system.cpp.glib 2016-12-28 20:22:44.773717749 -0500
+++ ./src/gx_head/engine/gx_system.cpp 2016-12-28 20:22:58.771251220 -0500
@@ -329,7 +329,7 @@ IRFileListing::IRFileListing(const std::
"," G_FILE_ATTRIBUTE_STANDARD_DISPLAY_NAME
"," G_FILE_ATTRIBUTE_STANDARD_FAST_CONTENT_TYPE);
Glib::RefPtr<Gio::FileInfo> file_info;
- while ((file_info = child_enumeration->next_file()) != 0) {
+ while (file_info = child_enumeration->next_file()) {
if (file_info->get_attribute_string(G_FILE_ATTRIBUTE_STANDARD_FAST_CONTENT_TYPE) == "audio/x-wav") {
listing.push_back(
FileName(
@@ -349,7 +349,7 @@ static void list_subdirs(const Glib::Ref
file->enumerate_children(G_FILE_ATTRIBUTE_STANDARD_NAME
"," G_FILE_ATTRIBUTE_STANDARD_DISPLAY_NAME);
Glib::RefPtr<Gio::FileInfo> file_info;
- while ((file_info = child_enumeration->next_file()) != 0) {
+ while (file_info = child_enumeration->next_file()) {
if (file_info->get_file_type() == Gio::FILE_TYPE_DIRECTORY) {
Glib::RefPtr<Gio::File> child = file->get_child(
file_info->get_attribute_byte_string(G_FILE_ATTRIBUTE_STANDARD_NAME));
diff -up ./src/gx_head/engine/ladspaback.cpp.glib ./src/gx_head/engine/ladspaback.cpp
--- ./src/gx_head/engine/ladspaback.cpp.glib 2016-04-24 00:18:37.000000000 -0400
+++ ./src/gx_head/engine/ladspaback.cpp 2016-12-28 20:22:31.664218123 -0500
@@ -1622,7 +1622,7 @@ void LadspaPluginList::load(gx_system::C
"," G_FILE_ATTRIBUTE_STANDARD_FAST_CONTENT_TYPE);
Glib::RefPtr<Gio::FileInfo> file_info;
- while ((file_info = child_enumeration->next_file()) != 0) {
+ while (file_info = child_enumeration->next_file()) {
if (file_info->get_attribute_string(G_FILE_ATTRIBUTE_STANDARD_FAST_CONTENT_TYPE) == "application/x-sharedlib") {
std::string nm = file_info->get_attribute_byte_string(G_FILE_ATTRIBUTE_STANDARD_NAME);
if (lib_is_blacklisted(nm)) {
@@ -1650,7 +1650,7 @@ void LadspaPluginList::load(gx_system::C
"," G_FILE_ATTRIBUTE_STANDARD_FAST_CONTENT_TYPE);
Glib::RefPtr<Gio::FileInfo> file_info;
- while ((file_info = child_enumeration->next_file()) != 0) {
+ while (file_info = child_enumeration->next_file()) {
//if not f.endswith((".rdf",".rdfs")):
if (file_info->get_attribute_string(G_FILE_ATTRIBUTE_STANDARD_FAST_CONTENT_TYPE) == "application/rdf+xml") {
std::string nm = file_info->get_attribute_byte_string(G_FILE_ATTRIBUTE_STANDARD_NAME);

8
guitarix.spec
View File

@ -5,7 +5,7 @@
Name: guitarix
Version: 0.35.0
Release: 2%{?dist}
Release: 3%{?dist}
Summary: Mono amplifier to JACK
Group: Applications/Multimedia
License: GPLv2+
@ -13,6 +13,7 @@ URL: http://guitarix.sourceforge.net/
Source0: http://sourceforge.net/projects/%{name}/files/%{name}/%{altname2}-%{version}.tar.xz
Patch1: guitarix-0.35.0-abs-fix.patch
Patch2: guitarix-0.35.0-glib.patch
BuildRequires: desktop-file-utils
BuildRequires: faust
@ -136,6 +137,7 @@ guitarix, but can also be used by any other ladspa host.
%prep
%setup -q -n %{name}-%{version}
%patch1 -p1
%patch2 -p1 -b .glib
# The build system does not use these bundled libraries by default. But
# just to make sure:
@ -220,6 +222,10 @@ chmod 755 %{buildroot}%{_libdir}/glade/modules/libgladegx.so
%{_libdir}/lv2/*
%changelog
* Thu Dec 29 2016 Rich Mattes <richmattes@gmail.com> - 0.35.0-3
- Rebuild for eigen3-3.3.1
- Add patch to fix Glib::RefPtr null checks
* Sat May 07 2016 Brendan Jones <brendan.jones.it@gmail.com> 0.35.0-2
- Add Roboto-condensed requires