Update of /cvsroot/fink/dists/10.4/stable/main/finkinfo/libs
In directory
sfp-cvsdas-3.v30.ch3.sourceforge.com:/tmp/cvs-serv30619/stable/main/finkinfo/libs
Modified Files:
libsmoke.info libsmoke.patch
Log Message:
build-fixes from unstable
Index: libsmoke.info
===================================================================
RCS file: /cvsroot/fink/dists/10.4/stable/main/finkinfo/libs/libsmoke.info,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- libsmoke.info 9 May 2010 14:47:40 -0000 1.4
+++ libsmoke.info 14 Oct 2010 05:11:23 -0000 1.5
@@ -1,8 +1,8 @@
Package: libsmoke
Version: 3.5.6
-Revision: 1023
+Revision: 1025
Epoch: 1
-Distribution: 10.4, 10.5
+#Distribution: 10.4, 10.5
Architecture: i386, powerpc
Description: Library for Qt and KDE language bindings
License: BSD
@@ -13,14 +13,15 @@
arts-dev (>= 1.5.3-1021),
autoconf (>= 2.60-1),
automake1.9,
+ fink (>= 0.24.12),
freeglut,
kdelibs3-unified-dev (>= %v-1021),
libart2,
- libgettext3-dev,
+ libgettext8-dev,
libiconv-dev,
libidn,
- libjpeg,
- libpng3 (>= 1.2.5-1),
+ libjpeg8,
+ libpng14,
libtool14 (>= 1.5.10-1),
pcre,
qt3 (>= 3.3.6-1027),
@@ -44,7 +45,10 @@
Source2-MD5: e2dccadc3d36718ef9a7e3c7789e2bdf
Source2ExtractDir: kdebindings-%v
SourceDirectory: kdebindings-%v
+PatchFile: %n.patch
+Patchfile-MD5: e29676c6dbb5d6e8f681b003d74776df
PatchScript: <<
+ %{default_script}
perl -pi -e 's,-O2,-Os,g; s,doc/HTML,doc/kde,g;
s,/usr/share/doc/packages/qt3/html,%p/share/doc/qt3/html,g;' admin/*
perl -pi -e 's/(AC_DEFUN\()([^[]+)(,)/\1\[\2]\3/' dcopc/glib.m4
dcopc/gtk.m4
<<
@@ -81,6 +85,7 @@
Depends: <<
freeglut-shlibs,
kdelibs3-unified-shlibs (>= %v-1021),
+ libpng14-shlibs,
qt3-shlibs (>= 3.3.6-1027)
<<
Files: <<
Index: libsmoke.patch
===================================================================
RCS file: /cvsroot/fink/dists/10.4/stable/main/finkinfo/libs/libsmoke.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- libsmoke.patch 17 Jul 2008 03:36:32 -0000 1.1
+++ libsmoke.patch 14 Oct 2010 05:11:23 -0000 1.2
@@ -1,8 +1,12 @@
---- PerlQt-3/smoke/Makefile.am 2003-12-23 13:02:08.000000000 -0500
-+++ PerlQt-3-new/smoke/Makefile.am 2005-12-19 17:00:38.000000000 -0500
-@@ -1,4 +1,4 @@
--SUBDIRS = qt kde
-+SUBDIRS = qt
+diff -Nurd -x'*~' kdebindings-3.5.6.orig/smoke/kde/Makefile.am
kdebindings-3.5.6/smoke/kde/Makefile.am
+--- kdebindings-3.5.6.orig/smoke/kde/Makefile.am 2005-10-10
10:54:57.000000000 -0400
++++ kdebindings-3.5.6/smoke/kde/Makefile.am 2010-06-24 17:31:12.000000000
-0400
+@@ -9,7 +9,7 @@
+ libsmokekde_la_LDFLAGS = -version-info 3:2:2 -no-undefined $(all_libraries)
$(GLINC) $(KDE_RPATH)
- include_HEADERS = smoke.h
+ # the libraries to link against.
+-libsmokekde_la_LIBADD = $(LIB_KHTML) -lkjs -lfontconfig $(LIB_KMDI)
$(LIB_KNS) $(LIB_KSPELL) $(LIB_KUTILS) $(LIB_KDEPRINT) $(GLLIB)
++libsmokekde_la_LIBADD = $(LIB_KHTML) -lkjs -lfontconfig $(LIB_KMDI)
$(LIB_KNS) $(LIB_KSPELL) $(LIB_KUTILS) $(LIB_KDEPRINT) $(GLLIB) -lDCOP -lqt-mt
$(LIB_KDECORE) $(LIB_KDEUI) $(LIB_KIO) -lkdefx $(LIB_KPARTS)
+ x_sources = x_1.cpp x_2.cpp x_3.cpp x_4.cpp x_5.cpp x_6.cpp x_7.cpp \
+ x_8.cpp x_9.cpp x_10.cpp x_11.cpp x_12.cpp x_13.cpp x_14.cpp x_15.cpp \
------------------------------------------------------------------------------
Beautiful is writing same markup. Internet Explorer 9 supports
standards for HTML5, CSS3, SVG 1.1, ECMAScript5, and DOM L2 & L3.
Spend less time writing and rewriting code and more time creating great
experiences on the web. Be a part of the beta today.
http://p.sf.net/sfu/beautyoftheweb
_______________________________________________
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
http://news.gmane.org/gmane.os.apple.fink.cvs
