Update of /cvsroot/fink/dists/10.4/unstable/main/finkinfo/libs
In directory vz-cvs-3.sog:/tmp/cvs-serv17954

Modified Files:
        libircclient-qt.info libircclient-qt.patch 
Log Message:
avoid breakage of every package that would use this before it's too late


Index: libircclient-qt.info
===================================================================
RCS file: 
/cvsroot/fink/dists/10.4/unstable/main/finkinfo/libs/libircclient-qt.info,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- libircclient-qt.info        3 Sep 2011 15:42:03 -0000       1.2
+++ libircclient-qt.info        3 Sep 2011 15:46:31 -0000       1.3
@@ -1,6 +1,6 @@
 Info2: <<
 Package: libircclient-qt-%type_pkg[qt]
-Version: 0.5.0
+Version: 0.3.2
 Revision: 1
 Type: qt (x11 mac)
 
@@ -8,15 +8,15 @@
 License: LGPL
 Maintainer: Sjors Gielen <dazj...@dazjorz.com>
 
-Depends: qt4-base-%type_pkg[qt]-qtcore-shlibs, %N-shlibs (>= %v-1)
-BuildDepends: qt4-base-%type_pkg[qt], fink (>= 0.24.12)
+Depends: qt4-%type_pkg[qt]-core-shlibs, %N-shlibs (>= %v-1)
+BuildDepends: qt4-%type_pkg[qt], fink (>= 0.24.12)
 
 Source: 
http://bitbucket.org/jpnurmi/libircclient-qt/downloads/libircclient-qt-src-%v.tar.gz
-Source-MD5: 3f87b31468322bbaadd081c54e336aa7
+Source-MD5: c825f9b5a62f8c214f328c92ba623ea7
 SourceDirectory: libircclient-qt-%v
 
 PatchFile: libircclient-qt.patch
-PatchFile-MD5: 828599e46851e5ade0631cb876c24990
+PatchFile-MD5: f3964242759040d01071cca8f90eee9e
 
 SetCPPFLAGS: -I%p/lib/qt4-%type_pkg[qt]/include
 SetLDFLAGS: -L%p/lib/qt4-%type_pkg[qt]/lib 
-Wl,-install_name,%p/lib/qt4-%type_pkg[qt]/lib
@@ -40,14 +40,18 @@
 mv $QTINSTDIR/include/include $QTINSTDIR/include/ircclient-qt
 cp -R lib/*   $QTINSTDIR/lib
 cp -R doc     %i/share/doc/%N
+
+install_name_tool -id %p/lib/qt4-%type_pkg[qt]/lib/libircclient-qt.1.dylib \
+                      %i/lib/qt4-%type_pkg[qt]/lib/libircclient-qt.1.0.0.dylib
+
 <<
 DocFiles: AUTHORS CHANGELOG COPYING INSTALL README TODO VERSION
 
 SplitOff: <<
   Package: %N-shlibs
   Depends: qt4-%type_pkg[qt]-core-shlibs
-  Files: lib/qt4-%type_pkg[qt]/lib/libircclient-qt.0*.dylib
-  Shlibs: %p/lib/qt4-%type_pkg[qt]/lib/libircclient-qt.0.dylib 0.5.0 %n (>= 
0.5.0-1)
+  Files: lib/qt4-%type_pkg[qt]/lib/libircclient-qt.1*.dylib
+  Shlibs: %p/lib/qt4-%type_pkg[qt]/lib/libircclient-qt.1.dylib 1.0.0 %n (>= 
0.3.2-1)
   Description: IRC client library for Qt applications -- shared library
   DocFiles: AUTHORS CHANGELOG COPYING INSTALL README TODO VERSION
 <<

Index: libircclient-qt.patch
===================================================================
RCS file: 
/cvsroot/fink/dists/10.4/unstable/main/finkinfo/libs/libircclient-qt.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- libircclient-qt.patch       3 Sep 2011 15:42:03 -0000       1.2
+++ libircclient-qt.patch       3 Sep 2011 15:46:31 -0000       1.3
@@ -1,6 +1,6 @@
-diff -Nurd libircclient-qt-0.5.0/icu.pri libircclient-qt-0.5.0-patched/icu.pri
---- libircclient-qt-0.5.0/icu.pri      2010-11-05 18:59:02.000000000 +0100
-+++ libircclient-qt-0.5.0-patched/icu.pri      2011-09-03 17:17:08.000000000 
+0200
+diff -Nurd libircclient-qt-0.3.2/icu.pri libircclient-qt-0.3.2-new/icu.pri
+--- libircclient-qt-0.3.2/icu.pri      2009-08-30 11:35:41.000000000 +0200
++++ libircclient-qt-0.3.2-new/icu.pri  2010-04-30 03:20:28.000000000 +0200
 @@ -15,7 +15,7 @@
      return($$RET)
  }
@@ -8,17 +8,25 @@
 -DEFINES += HAVE_ICU
 +# DEFINES += HAVE_ICU
  contains(DEFINES, HAVE_ICU) {
-     win32:INCLUDEPATH += C:/ICU/include
-     macx:INCLUDEPATH += /opt/local/include
-diff -Nurd libircclient-qt-0.5.0/libircclient-qt.pro 
libircclient-qt-0.5.0-patched/libircclient-qt.pro
---- libircclient-qt-0.5.0/libircclient-qt.pro  2010-11-05 18:59:02.000000000 
+0100
-+++ libircclient-qt-0.5.0-patched/libircclient-qt.pro  2011-09-03 
17:27:04.000000000 +0200
-@@ -34,7 +34,7 @@
-     # makes it easier for other applications to link against it, as Qmake

-     # assumes that.

+     win32:INCLUDEPATH += C:\ICU\include
+     win32:LIBS += -LC:\ICU\lib
+diff -Nurd libircclient-qt-0.3.2/libircclient-qt.pro 
libircclient-qt-0.3.2-new/libircclient-qt.pro
+--- libircclient-qt-0.3.2/libircclient-qt.pro  2010-04-30 14:08:21.000000000 
+0200
++++ libircclient-qt-0.3.2-new/libircclient-qt.pro      2010-04-30 
14:09:03.000000000 +0200
+@@ -21,11 +21,11 @@
+ }

  

--    !qt_no_framework {

-+    0 {

-         CONFIG += lib_bundle

-         FRAMEWORK_HEADERS.version = Versions

-         FRAMEWORK_HEADERS.files = $$HEADERS

+ macx {

+-    CONFIG += lib_bundle

+-    FRAMEWORK_HEADERS.version = Versions

+-    FRAMEWORK_HEADERS.files = $$HEADERS

+-    FRAMEWORK_HEADERS.path = Headers

+-    QMAKE_BUNDLE_DATA += FRAMEWORK_HEADERS

++    # CONFIG += lib_bundle

++    # FRAMEWORK_HEADERS.version = Versions

++    # FRAMEWORK_HEADERS.files = $$HEADERS

++    # FRAMEWORK_HEADERS.path = Headers

++    # QMAKE_BUNDLE_DATA += FRAMEWORK_HEADERS

+ }

+ 

+ CONV_HEADERS += include/Irc include/IrcGlobal include/IrcSession 
include/IrcUtil



------------------------------------------------------------------------------
Special Offer -- Download ArcSight Logger for FREE!
Finally, a world-class log management solution at an even better 
price-free! And you'll get a free "Love Thy Logs" t-shirt when you
download Logger. Secure your free ArcSight Logger TODAY!
http://p.sf.net/sfu/arcsisghtdev2dev
_______________________________________________
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
http://news.gmane.org/gmane.os.apple.fink.cvs

Reply via email to