[gentoo-commits] gentoo-x86 commit in media-gfx/comical/files: comical-0.8-syslibs.patch comical.desktop

[gentoo-commits] gentoo-x86 commit in media-gfx/comical/files: comical-0.8-syslibs.patch comical.desktop

[Samuli Suominen (ssuominen)]

ssuominen    12/06/16 12:47:32

  Modified:             comical.desktop
  Added:                comical-0.8-syslibs.patch
  Log:
  Ensure x11-libs/wxGTK has USE="X" enabled wrt #407267 and Use system libminizip and libunrar wrt #407269 by Piotr Szymaniak. Remove redudant Comment= from desktop entry. Use CXX and CXXFLAGS instead of CC and CFLAGS for g++. Stop using LDFLAGS for passing libraries and use LDLIBS instead. Install 128x128 icon to hicolor directory and run icon cache update.
  
  (Portage version: 2.2.0_alpha110/cvs/Linux x86_64)

Revision  Changes    Path
1.3                  media-gfx/comical/files/comical.desktop

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/comical/files/comical.desktop?rev=1.3&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/comical/files/comical.desktop?rev=1.3&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/comical/files/comical.desktop?r1=1.2&r2=1.3

Index: comical.desktop
===================================================================
RCS file: /var/cvsroot/gentoo-x86/media-gfx/comical/files/comical.desktop,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- comical.desktop	16 Dec 2009 22:30:42 -0000	1.2
+++ comical.desktop	16 Jun 2012 12:47:32 -0000	1.3
@@ -1,7 +1,6 @@
 [Desktop Entry]
 Name=Comical
 GenericName=Comic Book Reader
-Comment=Comic book reader
 Exec=comical %F
 Icon=comical
 Type=Application



1.1                  media-gfx/comical/files/comical-0.8-syslibs.patch

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/comical/files/comical-0.8-syslibs.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/comical/files/comical-0.8-syslibs.patch?rev=1.1&content-type=text/plain

Index: comical-0.8-syslibs.patch
===================================================================
Use system libminizip (zlib) wrt http://bugs.gentoo.org/407269.
Use system libunrar. Use CXX and CXXFLAGS instead of CC and CFLAGS for g++.
Stop using passing libraries from LDFLAGS and use LDLIBS instead.

--- Makefile
+++ Makefile
@@ -1,5 +1,5 @@
-CC = `wx-config --cxx`
-LDFLAGS = `wx-config --libs` -Lunrar -lunrar -Lunzip -lminiunzip
+CXX ?= `wx-config --cxx`
+LDLIBS = `wx-config --libs` -lunrar `pkg-config --libs minizip`
 INSTALL = install
 INSTALL_PROGRAM = $(INSTALL)
 prefix = /usr/local
@@ -12,18 +12,12 @@
 
 all: comical
 
-comical: $(OBJS) unrar/libunrar.a unzip/libminiunzip.a
-	$(CC) -o $@ $(OBJS) $(LDFLAGS)
+comical: $(OBJS)
+	$(CXX) $(LDFLAGS) $(CXXFLAGS) -o $@ $(OBJS) $(LDLIBS)
 
 $(OBJS):
 	$(MAKE) -C src
 
-unrar/libunrar.a:
-	$(MAKE) lib -C unrar -f makefile.linux
-
-unzip/libminiunzip.a:
-	$(MAKE) -C unzip
-
 install: comical
 	$(INSTALL_PROGRAM) comical $(DESTDIR)$(bindir)/comical
 
@@ -39,8 +33,6 @@
 
 distclean:
 	$(MAKE) clean
-	$(MAKE) clean -C unrar -f makefile.linux
-	$(MAKE) clean -C unzip
 	rm -f $(DEPS) bin2h src/bin2h.o
 
 .PHONY : install install-strip uninstall clean distclean
--- src/ComicBookRAR.h
+++ src/ComicBookRAR.h
@@ -29,7 +29,7 @@
 #define _ComicBookRAR_h_
 
 #include "ComicBook.h"
-#include "dll.hpp"
+#include <dll.hpp>
  
 class ComicBookRAR : public ComicBook {
 
--- src/ComicBookZIP.cpp
+++ src/ComicBookZIP.cpp
@@ -27,7 +27,7 @@
 
 #include "ComicBookZIP.h"
 #include <wx/mstream.h>
-#include "unzip.h"
+#include <unzip.h>
 #include "Exceptions.h"
 #include <cstring>
 #include <errno.h>
--- src/Makefile
+++ src/Makefile
@@ -1,6 +1,5 @@
-INCLUDE = -I../unrar -I../unzip
-CFLAGS = -O2 -Wall -pipe
-CPPFLAGS = `wx-config --cxxflags` $(CFLAGS) -D_UNIX $(INCLUDE)
+CXXFLAGS += -Wall `wx-config --cxxflags` `pkg-config --cflags minizip` -I/usr/include/libunrar
+CPPFLAGS += -D_UNIX $(CXXFLAGS)
 
 .SUFFIXES: .cpp .png .h .d .o
 
@@ -21,11 +20,11 @@
 	@echo -e "};\n\n#endif" >> $@
 
 %.o : %.cpp
-	$(CC) $(CPPFLAGS) -c -o $*.o $<
+	$(CXX) $(CPPFLAGS) -c -o $*.o $<
 
 %.d : %.cpp
 	@set -e; rm -f $@; \
-	 $(CC) -MM -MG $(CPPFLAGS) -MT '$*.o' $< > $@.$$$$; \
+	 $(CXX) -MM -MG $(CPPFLAGS) -MT '$*.o' $< > $@.$$$$; \
 	 sed 's,\($*\)\.o[ :]*,\1.o $@ : ,g' < $@.$$$$ > $@; \
 	 rm -f $@.$$$$