summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'media-sound/qtscrobbler/files')
-rw-r--r--media-sound/qtscrobbler/files/qtscrobbler-0.10-Makefile.patch46
-rw-r--r--media-sound/qtscrobbler/files/qtscrobbler-0.10-free.patch16
2 files changed, 62 insertions, 0 deletions
diff --git a/media-sound/qtscrobbler/files/qtscrobbler-0.10-Makefile.patch b/media-sound/qtscrobbler/files/qtscrobbler-0.10-Makefile.patch
new file mode 100644
index 000000000000..0558b72c9bf5
--- /dev/null
+++ b/media-sound/qtscrobbler/files/qtscrobbler-0.10-Makefile.patch
@@ -0,0 +1,46 @@
+--- src/cli/Makefile
++++ src/cli/Makefile
+@@ -1,4 +1,4 @@
+-CC = g++
++CXX ?= g++
+ mingw = false
+ WINDRES =
+ RES =
+@@ -27,7 +27,7 @@
+ LINKOBJ = scrobble-cli.o libscrobble.o md5.o ConvertUTF.o mtp.o $(RES)
+ endif
+
+-CFLAGS = -Wall -O2 -g $(INCLUDE) $(CURL_FLAGS) $(MTP_FLAGS)
++CXXFLAGS += -Wall $(INCLUDE) $(CURL_FLAGS) $(MTP_FLAGS)
+
+ .PHONY: all all-before all-after clean clean-custom
+
+@@ -37,22 +37,22 @@
+ rm -f *.o *~ *.d $(BIN) $(BIN).exe
+
+ $(BIN): $(OBJ)
+- $(CC) $(LINKOBJ) -o $(BIN) $(LIBS)
++ $(CXX) $(LDFLAGS) $(LINKOBJ) -o $(BIN) $(LIBS)
+
+ scrobble-cli.o: scrobble-cli.cpp
+- $(CC) -c scrobble-cli.cpp -o scrobble-cli.o $(CFLAGS)
++ $(CXX) -c scrobble-cli.cpp -o scrobble-cli.o $(CXXFLAGS)
+
+ libscrobble.o: ../lib/libscrobble.cpp
+- $(CC) -c ../lib/libscrobble.cpp -o libscrobble.o $(CFLAGS)
++ $(CXX) -c ../lib/libscrobble.cpp -o libscrobble.o $(CXXFLAGS)
+
+ md5.o: ../lib/md5.c
+- $(CC) -c ../lib/md5.c -o md5.o $(CFLAGS)
++ $(CXX) -c ../lib/md5.c -o md5.o $(CXXFLAGS)
+
+ ConvertUTF.o: ../lib/ConvertUTF.c
+- $(CC) -c ../lib/ConvertUTF.c -o ConvertUTF.o $(CFLAGS)
++ $(CXX) -c ../lib/ConvertUTF.c -o ConvertUTF.o $(CXXFLAGS)
+
+ mtp.o: ../lib/mtp-libmtp.cpp
+- $(CC) -c ../lib/mtp-libmtp.cpp -o mtp.o $(CFLAGS)
++ $(CXX) -c ../lib/mtp-libmtp.cpp -o mtp.o $(CXXFLAGS)
+
+ install:
+ install -D -m 755 scrobble-cli -p $(DESTDIR)$(bindir)/scrobble-cli
diff --git a/media-sound/qtscrobbler/files/qtscrobbler-0.10-free.patch b/media-sound/qtscrobbler/files/qtscrobbler-0.10-free.patch
new file mode 100644
index 000000000000..d6802751f0e0
--- /dev/null
+++ b/media-sound/qtscrobbler/files/qtscrobbler-0.10-free.patch
@@ -0,0 +1,16 @@
+g++ -c ../lib/mtp-libmtp.cpp -o mtp.o -Wall -I../lib `curl-config --cflags` `pkg-config --cflags libmtp` -DHAVE_LIBMTP
+../lib/mtp-libmtp.cpp: In member function ‘void Scrobble::mtp_iterate(bool)’:
+../lib/mtp-libmtp.cpp:104:30: error: ‘free’ was not declared in this scope
+
+http://bugs.gentoo.org/405667
+
+--- src/lib/mtp-libmtp.cpp
++++ src/lib/mtp-libmtp.cpp
+@@ -16,6 +16,7 @@
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. *
+ ***************************************************************************/
+
++#include <cstdlib> /* free */
+ #include <iostream>
+ #include "libscrobble.h"
+