OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Thomas Lotterer
Root: /v/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src Date: 27-Sep-2005 13:51:49
Branch: HEAD Handle: 2005092712514900
Modified files:
openpkg-src/qt qt.patch qt.spec
Log:
make sure fontconfig dependency libiconv is found
Summary:
Revision Changes Path
1.14 +0 -32 openpkg-src/qt/qt.patch
1.122 +3 -2 openpkg-src/qt/qt.spec
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/qt/qt.patch
============================================================================
$ cvs diff -u -r1.13 -r1.14 qt.patch
--- openpkg-src/qt/qt.patch 28 Jul 2005 06:36:51 -0000 1.13
+++ openpkg-src/qt/qt.patch 27 Sep 2005 11:51:49 -0000 1.14
@@ -346,35 +346,3 @@
next();
break;
}
-Index: src/3rdparty/zlib/inftrees.c
---- src/3rdparty/zlib/inftrees.c.orig 2004-09-15 16:30:06 +0200
-+++ src/3rdparty/zlib/inftrees.c 2005-07-07 11:33:34 +0200
-@@ -134,7 +134,7 @@
- left -= count[len];
- if (left < 0) return -1; /* over-subscribed */
- }
-- if (left > 0 && (type == CODES || (codes - count[0] != 1)))
-+ if (left > 0 && (type == CODES || max != 1))
- return -1; /* incomplete set */
-
- /* generate offsets into symbol table for each length for sorting */
-Index: src/3rdparty/zlib/inftrees.h
---- src/3rdparty/zlib/inftrees.h.orig 2003-08-11 00:15:50 +0200
-+++ src/3rdparty/zlib/inftrees.h 2005-07-11 08:50:37 +0200
-@@ -36,12 +36,12 @@
- */
-
- /* Maximum size of dynamic tree. The maximum found in a long but non-
-- exhaustive search was 1004 code structures (850 for length/literals
-- and 154 for distances, the latter actually the result of an
-+ exhaustive search was 1444 code structures (852 for length/literals
-+ and 592 for distances, the latter actually the result of an
- exhaustive search). The true maximum is not known, but the value
- below is more than safe. */
--#define ENOUGH 1440
--#define MAXD 154
-+#define ENOUGH 2048
-+#define MAXD 592
-
- /* Type of code to build for inftable() */
- typedef enum {
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/qt/qt.spec
============================================================================
$ cvs diff -u -r1.121 -r1.122 qt.spec
--- openpkg-src/qt/qt.spec 28 Jul 2005 06:36:51 -0000 1.121
+++ openpkg-src/qt/qt.spec 27 Sep 2005 11:51:49 -0000 1.122
@@ -32,8 +32,8 @@
Class: PLUS
Group: XWindow
License: GPL
-Version: 3.3.4
-Release: 20050728
+Version: 3.3.5
+Release: 20050927
# package library options (each 'yes' builds more libraries)
%option with_shared no
@@ -108,6 +108,7 @@
%{l_shtool} subst \
-e 's;freetype2/freetype/;freetype/;g' \
-e 's;freetype2;freetype;g' \
+ -e "s;-lfontconfig;`%{l_prefix}/bin/pkg-config --libs fontconfig`;" \
config.tests/x11/xfreetype.test
# repair nonstandard posix thread test macro usage
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org
