[gentoo-commits] gentoo-x86 commit in net-misc/italc/files: italc-1.0.9-strip.patch italc-1.0.9-system-libvncserver.patch italc-1.0.9-qt4-libpath.patch

[Markus Ullmann (jokey)]

jokey       09/01/31 21:21:12

  Added:                italc-1.0.9-strip.patch
                        italc-1.0.9-system-libvncserver.patch
                        italc-1.0.9-qt4-libpath.patch
  Log:
  Fix glibc 2.8 build w/ version bump, add option to build against system libvncserver
  (Portage version: 2.2_rc23/cvs/Linux x86_64)

Revision  Changes    Path
1.1                  net-misc/italc/files/italc-1.0.9-strip.patch

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-misc/italc/files/italc-1.0.9-strip.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-misc/italc/files/italc-1.0.9-strip.patch?rev=1.1&content-type=text/plain

Index: italc-1.0.9-strip.patch
===================================================================
--- ./italc-1.0.9/Makefile.am	2008-07-23 13:25:55.000000000 +0200
+++ ./italc-1.0.9/Makefile.am	2009-01-31 21:59:40.000000000 +0100
@@ -10,13 +10,6 @@
 	rm -rf `find $(distdir) -name *.moc`
 	rm -rf `find $(distdir) -name *_qrc.cpp`
 
-# strip all binaries after installation
-install-exec-hook:
-	cd $(DESTDIR)$(bindir) ; \
-	strip ica; \
-	strip italc
-
-
 if HAVE_RPM
 $(PACKAGE)-$(VERSION).tar.gz: dist
 



1.1                  net-misc/italc/files/italc-1.0.9-system-libvncserver.patch

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-misc/italc/files/italc-1.0.9-system-libvncserver.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-misc/italc/files/italc-1.0.9-system-libvncserver.patch?rev=1.1&content-type=text/plain

Index: italc-1.0.9-system-libvncserver.patch
===================================================================
--- ./italc-1.0.9.orig/ica/Makefile.am	2008-04-17 23:23:57.000000000 +0200
+++ ./italc-1.0.9/ica/Makefile.am	2009-01-31 22:08:53.000000000 +0100
@@ -6,47 +6,14 @@
 IVS_INCLUDES = -I$(srcdir)/x11 -I$(srcdir)/x11/x11vnc -I$(srcdir)/x11/libvncserver
 
 IVS_SRCS =	$(srcdir)/x11/x11vnc.c				\
-		$(srcdir)/x11/libvncserver/auth.c		\
-		$(srcdir)/x11/libvncserver/cargs.c		\
-		$(srcdir)/x11/libvncserver/corre.c		\
-		$(srcdir)/x11/libvncserver/cursor.c		\
-		$(srcdir)/x11/libvncserver/cutpaste.c		\
-		$(srcdir)/x11/libvncserver/d3des.c		\
-		$(srcdir)/x11/libvncserver/draw.c		\
-		$(srcdir)/x11/libvncserver/font.c		\
-		$(srcdir)/x11/libvncserver/hextile.c		\
-		$(srcdir)/x11/libvncserver/httpd.c		\
-		$(srcdir)/x11/libvncserver/main.c		\
-		$(srcdir)/x11/libvncserver/rfbregion.c		\
-		$(srcdir)/x11/libvncserver/rfbserver.c		\
-		$(srcdir)/x11/libvncserver/rre.c		\
-		$(srcdir)/x11/libvncserver/scale.c		\
-		$(srcdir)/x11/libvncserver/selbox.c		\
-		$(srcdir)/x11/libvncserver/sockets.c		\
-		$(srcdir)/x11/libvncserver/stats.c		\
-		$(srcdir)/x11/libvncserver/translate.c		\
-		$(srcdir)/x11/libvncserver/ultra.c		\
-		$(srcdir)/x11/libvncserver/vncauth.c		\
 		$(srcdir)/x11/rfb/rfbregion.h			\
-		$(srcdir)/x11/rfb/default8x16.h			\
-		$(srcdir)/x11/libvncserver/d3des.h		\
-		$(srcdir)/x11/libvncserver/private.h		\
-		$(srcdir)/x11/libvncserver/scale.h		\
-		$(srcdir)/x11/libvncserver/zrleoutstream.h	\
-		$(srcdir)/x11/libvncserver/zrlepalettehelper.h	\
-		$(srcdir)/x11/libvncserver/zrletypes.h		\
-		$(srcdir)/x11/libvncserver/zlib.c		\
-		$(srcdir)/x11/libvncserver/zrle.c		\
-		$(srcdir)/x11/libvncserver/zrleoutstream.c	\
-		$(srcdir)/x11/libvncserver/zrlepalettehelper.c	\
-		$(srcdir)/x11/libvncserver/tight.c
-
+		$(srcdir)/x11/rfb/default8x16.h
 
 if HAVE_LIBPTHREAD
 PTHREADLDADD = -lpthread
 endif
 
-IVSLDADD = @X_LIBS@ $(PTHREADLDADD)
+IVSLDADD = @X_LIBS@ $(PTHREADLDADD) -lvncserver
 
 
 else



1.1                  net-misc/italc/files/italc-1.0.9-qt4-libpath.patch

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-misc/italc/files/italc-1.0.9-qt4-libpath.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-misc/italc/files/italc-1.0.9-qt4-libpath.patch?rev=1.1&content-type=text/plain

Index: italc-1.0.9-qt4-libpath.patch
===================================================================
--- ./italc-1.0.9/acinclude.m4	2008-05-24 11:19:33.000000000 +0200
+++ ./italc-1.0.9/acinclude.m4	2009-01-31 21:24:54.000000000 +0100
@@ -127,9 +127,9 @@
 	fi
         ;;
     *)
-       	QT_LIBS=`ls $QTDIR/lib64/libQt*.so 2> /dev/null` 
+       	QT_LIBS=`ls $QTDIR/lib64/qt4/libQt*.so 2> /dev/null` 
         if test "x$QT_LIBS" = x;  then
-        	QT_LIBS=`ls $QTDIR/lib/libQt*.so 2> /dev/null` 
+        	QT_LIBS=`ls $QTDIR/lib/qt4/libQt*.so 2> /dev/null` 
             	if test "x$QT_LIBS" = x;  then
 			AC_MSG_ERROR([*** Couldn't find any Qt4 libraries])
             	fi