diff options
| author | wiz <wiz@pkgsrc.org> | 2010-06-13 22:43:46 +0000 |
|---|---|---|
| committer | wiz <wiz@pkgsrc.org> | 2010-06-13 22:43:46 +0000 |
| commit | 92e0cb52cb783546e352182244f761180817e141 (patch) | |
| tree | 4a9b97c2969a25f1eeb6596ee96fc25429cef7d5 /x11/qt3-libs | |
| parent | 01bd00f60b043c603cfe4fa796bf28af3a849cca (diff) | |
| download | pkgsrc-92e0cb52cb783546e352182244f761180817e141.tar.gz | |
Bump PKGREVISION for libpng shlib name change.
Also add some patches to remove use of deprecated symbols and fix other
problems when looking for or compiling against libpng-1.4.x.
Diffstat (limited to 'x11/qt3-libs')
| -rw-r--r-- | x11/qt3-libs/Makefile | 4 | ||||
| -rw-r--r-- | x11/qt3-libs/buildlink3.mk | 4 | ||||
| -rw-r--r-- | x11/qt3-libs/distinfo | 3 | ||||
| -rw-r--r-- | x11/qt3-libs/patches/patch-as | 22 |
4 files changed, 28 insertions, 5 deletions
diff --git a/x11/qt3-libs/Makefile b/x11/qt3-libs/Makefile index 444c510e02b..10e6818f19a 100644 --- a/x11/qt3-libs/Makefile +++ b/x11/qt3-libs/Makefile @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.74 2010/01/18 09:59:43 wiz Exp $ +# $NetBSD: Makefile,v 1.75 2010/06/13 22:45:50 wiz Exp $ PKGNAME= qt3-libs-${QTVERSION} -PKGREVISION= 12 +PKGREVISION= 14 MAINTAINER= adam@NetBSD.org COMMENT= C++ X GUI toolkit diff --git a/x11/qt3-libs/buildlink3.mk b/x11/qt3-libs/buildlink3.mk index 6fbd7ad65f1..caef5d397bd 100644 --- a/x11/qt3-libs/buildlink3.mk +++ b/x11/qt3-libs/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.24 2010/01/18 09:59:43 wiz Exp $ +# $NetBSD: buildlink3.mk,v 1.25 2010/06/13 22:45:50 wiz Exp $ BUILDLINK_TREE+= qt3-libs @@ -6,7 +6,7 @@ BUILDLINK_TREE+= qt3-libs QT3_LIBS_BUILDLINK3_MK:= BUILDLINK_API_DEPENDS.qt3-libs+= qt3-libs>=3.2.3 -BUILDLINK_ABI_DEPENDS.qt3-libs?= qt3-libs>=3.3.8nb12 +BUILDLINK_ABI_DEPENDS.qt3-libs?= qt3-libs>=3.3.8nb14 BUILDLINK_PKGSRCDIR.qt3-libs?= ../../x11/qt3-libs BUILDLINK_INCDIRS.qt3-libs+= qt3/include diff --git a/x11/qt3-libs/distinfo b/x11/qt3-libs/distinfo index ca430337abe..ef822cfa610 100644 --- a/x11/qt3-libs/distinfo +++ b/x11/qt3-libs/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.51 2009/07/11 09:11:13 rillig Exp $ +$NetBSD: distinfo,v 1.52 2010/06/13 22:45:50 wiz Exp $ SHA1 (qt-x11-free-3.3.8.tar.bz2) = 91b192cb8e80679607d24ae35d6e20ed68d149d7 RMD160 (qt-x11-free-3.3.8.tar.bz2) = 7b8e4e35f49014eac4fcfe91b7ec0a45c5569cf4 @@ -21,6 +21,7 @@ SHA1 (patch-ao) = 3aacba05b27314cadab7dceba3c21d65bab608d3 SHA1 (patch-ap) = 5040628324d271abfc662c5a6eeb4f1ecf0d4758 SHA1 (patch-aq) = c17ff8b42901ae9a3cc51c33cffe4cffa64b4e4d SHA1 (patch-ar) = 84c0d7153feabcab6558ba84fbaa723f1c238e40 +SHA1 (patch-as) = 4d173ad8adfe40845653e8309fe2fee7c8ac7897 SHA1 (patch-bb) = b6a15a4b2b7b83b89bd3610cf2e48c242dbce2e5 SHA1 (patch-bc) = d8a84e1b66bf1953b53df57ae81d2c98cce69c41 SHA1 (patch-bd) = a116ecf305ee5b5338bf84cb908d695f3baea830 diff --git a/x11/qt3-libs/patches/patch-as b/x11/qt3-libs/patches/patch-as new file mode 100644 index 00000000000..212103a9dc3 --- /dev/null +++ b/x11/qt3-libs/patches/patch-as @@ -0,0 +1,22 @@ +$NetBSD: patch-as,v 1.1 2010/06/13 22:45:50 wiz Exp $ + +--- src/kernel/qpngio.cpp.orig 2007-02-02 14:01:15.000000000 +0000 ++++ src/kernel/qpngio.cpp +@@ -159,7 +159,7 @@ void setup_qt( QImage& image, png_struct + image.setColor( i, qRgba(c,c,c,0xff) ); + } + if ( png_get_valid(png_ptr, info_ptr, PNG_INFO_tRNS) ) { +- const int g = info_ptr->trans_values.gray; ++ const int g = info_ptr->trans_color.gray; + if (g < ncols) { + image.setAlphaBuffer(TRUE); + image.setColor(g, image.color(g) & RGB_MASK); +@@ -187,7 +187,7 @@ void setup_qt( QImage& image, png_struct + info_ptr->palette[i].red, + info_ptr->palette[i].green, + info_ptr->palette[i].blue, +- info_ptr->trans[i] ++ info_ptr->trans_alpha[i] + ) + ); + i++; |