[pkgsrc/trunk]: pkgsrc/x11/qt4-libs Changes 4.1.3:

To: pkgsrc-changes-hg%NetBSD.org@localhost
Subject: [pkgsrc/trunk]: pkgsrc/x11/qt4-libs Changes 4.1.3:
From: adam <adam%pkgsrc.org@localhost>
Date: Thu, 14 Oct 2021 03:32:28 +0000
details:   https://anonhg.NetBSD.org/pkgsrc/rev/913ba67c2087
branches:  trunk
changeset: 513615:913ba67c2087
user:      adam <adam%pkgsrc.org@localhost>
date:      Wed May 31 19:18:07 2006 +0000

description:
Changes 4.1.3:
* Bug fixes and improvements

diffstat:

 x11/qt4-libs/Makefile         |   9 +--------
 x11/qt4-libs/Makefile.common  |   3 +--
 x11/qt4-libs/PLIST            |   7 +------
 x11/qt4-libs/buildlink3.mk    |   4 ++--
 x11/qt4-libs/distinfo         |  10 +++++-----
 x11/qt4-libs/options.mk       |  11 +++++++++--
 x11/qt4-libs/patches/patch-ad |   6 +++---
 7 files changed, 22 insertions(+), 28 deletions(-)

diffs (153 lines):

diff -r dfa7bdcda4b2 -r 913ba67c2087 x11/qt4-libs/Makefile
--- a/x11/qt4-libs/Makefile     Wed May 31 19:09:15 2006 +0000
+++ b/x11/qt4-libs/Makefile     Wed May 31 19:18:07 2006 +0000
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.3 2006/04/17 13:45:59 wiz Exp $
+# $NetBSD: Makefile,v 1.4 2006/05/31 19:18:07 adam Exp $
 
 .include "../../x11/qt4-libs/Makefile.common"
 
 PKGNAME=       qt4-libs-${QTVERSION}
-PKGREVISION=   1
 COMMENT=       C++ X GUI toolkit
 
 BUILD_TARGET=          sub-src
@@ -41,12 +40,6 @@
                ${WRKSRC}/plugins/accessible/lib${plug}.la \
                ${QTPREFIX}/plugins/accessible/
 .endfor
-       ${INSTALL_LIB_DIR} ${QTPREFIX}/plugins/codecs
-.for plug in qcncodecs qjpcodecs qkrcodecs qtwcodecs
-       ${LIBTOOL} --mode=install ${INSTALL_LIB} \
-               ${WRKSRC}/plugins/codecs/lib${plug}.la \
-               ${QTPREFIX}/plugins/codecs/
-.endfor
        ${INSTALL_LIB_DIR} ${QTPREFIX}/plugins/imageformats/
 .for plug in qgif qjpeg qmng
        ${LIBTOOL} --mode=install ${INSTALL_LIB} \
diff -r dfa7bdcda4b2 -r 913ba67c2087 x11/qt4-libs/Makefile.common
--- a/x11/qt4-libs/Makefile.common      Wed May 31 19:09:15 2006 +0000
+++ b/x11/qt4-libs/Makefile.common      Wed May 31 19:18:07 2006 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.2 2006/03/01 21:10:55 minskim Exp $
+# $NetBSD: Makefile.common,v 1.3 2006/05/31 19:18:07 adam Exp $
 
 DISTNAME=      qt-x11-opensource-src-${QTVERSION}
 CATEGORIES=    x11
@@ -19,7 +19,6 @@
 QTPREFIX=              ${PREFIX}/qt4
 
 CONFIGURE_ARGS+=       -prefix "${QTPREFIX}" -shared -sm
-CONFIGURE_ARGS+=       -no-sql-sqlite
 CONFIGURE_ARGS+=       -release
 CONFIGURE_ARGS+=       -system-libjpeg
 CONFIGURE_ARGS+=       -system-libmng
diff -r dfa7bdcda4b2 -r 913ba67c2087 x11/qt4-libs/PLIST
--- a/x11/qt4-libs/PLIST        Wed May 31 19:09:15 2006 +0000
+++ b/x11/qt4-libs/PLIST        Wed May 31 19:18:07 2006 +0000
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.2 2006/02/25 09:25:00 adam Exp $
+@comment $NetBSD: PLIST,v 1.3 2006/05/31 19:18:07 adam Exp $
 lib/pkgconfig/Qt3Support.pc
 lib/pkgconfig/QtCore.pc
 lib/pkgconfig/QtGui.pc
@@ -21,15 +21,10 @@
 qt4/lib/libQtXml.la
 qt4/plugins/accessible/libqtaccessiblecompatwidgets.la
 qt4/plugins/accessible/libqtaccessiblewidgets.la
-qt4/plugins/codecs/libqcncodecs.la
-qt4/plugins/codecs/libqjpcodecs.la
-qt4/plugins/codecs/libqkrcodecs.la
-qt4/plugins/codecs/libqtwcodecs.la
 qt4/plugins/imageformats/libqgif.la
 qt4/plugins/imageformats/libqjpeg.la
 qt4/plugins/imageformats/libqmng.la
 @dirrm qt4/plugins/imageformats
-@dirrm qt4/plugins/codecs
 @dirrm qt4/plugins/accessible
 @dirrm qt4/plugins
 @dirrm qt4/lib
diff -r dfa7bdcda4b2 -r 913ba67c2087 x11/qt4-libs/buildlink3.mk
--- a/x11/qt4-libs/buildlink3.mk        Wed May 31 19:09:15 2006 +0000
+++ b/x11/qt4-libs/buildlink3.mk        Wed May 31 19:18:07 2006 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.5 2006/04/17 13:45:59 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.6 2006/05/31 19:18:07 adam Exp $
 
 BUILDLINK_DEPTH:=              ${BUILDLINK_DEPTH}+
 QT4_LIBS_BUILDLINK3_MK:=       ${QT4_LIBS_BUILDLINK3_MK}+
@@ -12,7 +12,7 @@
 
 .if !empty(QT4_LIBS_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.qt4-libs+=       qt4-libs>=4.1.0
-BUILDLINK_ABI_DEPENDS.qt4-libs?=       qt4-libs>=4.1.2nb1
+BUILDLINK_ABI_DEPENDS.qt4-libs+=       qt4-libs>=4.1.2nb1
 BUILDLINK_PKGSRCDIR.qt4-libs?= ../../x11/qt4-libs
 
 BUILDLINK_INCDIRS.qt4-libs+=   qt4/include
diff -r dfa7bdcda4b2 -r 913ba67c2087 x11/qt4-libs/distinfo
--- a/x11/qt4-libs/distinfo     Wed May 31 19:09:15 2006 +0000
+++ b/x11/qt4-libs/distinfo     Wed May 31 19:18:07 2006 +0000
@@ -1,12 +1,12 @@
-$NetBSD: distinfo,v 1.4 2006/04/03 15:43:26 adam Exp $
+$NetBSD: distinfo,v 1.5 2006/05/31 19:18:07 adam Exp $
 
-SHA1 (qt-x11-opensource-src-4.1.2.tar.gz) = a30ff8594b816528ab08ebcf349a31e244c4278d
-RMD160 (qt-x11-opensource-src-4.1.2.tar.gz) = b4a0031a7c8d72492d8afa1a1190493999cb17ff
-Size (qt-x11-opensource-src-4.1.2.tar.gz) = 27924277 bytes
+SHA1 (qt-x11-opensource-src-4.1.3.tar.gz) = 6728b4891c5e24d4a9e1b7b66cc5915f89453b7c
+RMD160 (qt-x11-opensource-src-4.1.3.tar.gz) = ecd103f99b2d1ca4b88e749faee5553b8c1c53e2
+Size (qt-x11-opensource-src-4.1.3.tar.gz) = 32200887 bytes
 SHA1 (patch-aa) = 5587f3d9c0613f9be04de1eed76175c9342ce5e0
 SHA1 (patch-ab) = 6c42d051ce036820167bcecc0480f7dd6d2f7334
 SHA1 (patch-ac) = 766ca4aba25029765f83c8a72873b603864ea821
-SHA1 (patch-ad) = 95558402aa3a02596cacd359bf5702dc7c038770
+SHA1 (patch-ad) = 1db8ce11816ae2fe8423906c51290c82ddb169ea
 SHA1 (patch-af) = a8576bc098c14cb5a13d45d4231b7ee21441eb89
 SHA1 (patch-ag) = d5b8d3c895f4a87397b90795c61de8be56ab517f
 SHA1 (patch-ah) = 62c50fe48b9ff1ce9fb757b432c8b1db7693e112
diff -r dfa7bdcda4b2 -r 913ba67c2087 x11/qt4-libs/options.mk
--- a/x11/qt4-libs/options.mk   Wed May 31 19:09:15 2006 +0000
+++ b/x11/qt4-libs/options.mk   Wed May 31 19:18:07 2006 +0000
@@ -1,7 +1,7 @@
-# $NetBSD: options.mk,v 1.1.1.1 2006/02/20 12:08:11 adam Exp $
+# $NetBSD: options.mk,v 1.2 2006/05/31 19:18:07 adam Exp $
 
 PKG_OPTIONS_VAR=       PKG_OPTIONS.qt4
-PKG_SUPPORTED_OPTIONS= cups debug
+PKG_SUPPORTED_OPTIONS= cups debug sqlite
 
 .include "../../mk/bsd.options.mk"
 
@@ -18,3 +18,10 @@
 CONFIGURE_ARGS+=       --debug
 INSTALL_UNSTRIPPED=    yes
 .endif
+
+.if !empty(PKG_OPTIONS:Msqlite)
+.  include "../../databases/sqlite3/buildlink3.mk"
+CONFIGURE_ARGS+=       -qt-sql-sqlite
+.else
+CONFIGURE_ARGS+=       -no-sql-sqlite
+.endif
diff -r dfa7bdcda4b2 -r 913ba67c2087 x11/qt4-libs/patches/patch-ad
--- a/x11/qt4-libs/patches/patch-ad     Wed May 31 19:09:15 2006 +0000
+++ b/x11/qt4-libs/patches/patch-ad     Wed May 31 19:18:07 2006 +0000
@@ -1,6 +1,6 @@
-$NetBSD: patch-ad,v 1.2 2006/03/02 06:45:46 minskim Exp $
+$NetBSD: patch-ad,v 1.3 2006/05/31 19:18:07 adam Exp $
 
---- src/corelib/global/qglobal.h.orig  2006-02-16 02:51:07.000000000 -0800
+--- src/corelib/global/qglobal.h.orig  2006-05-14 12:46:59.000000000 +0200
 +++ src/corelib/global/qglobal.h
 @@ -55,6 +55,7 @@
       NETBSD   - NetBSD
@@ -32,7 +32,7 @@
  #if defined(Q_OS_MSDOS) || defined(Q_OS_OS2) || defined(Q_OS_WIN)
  #  undef Q_OS_UNIX
  #elif !defined(Q_OS_UNIX)
-@@ -532,10 +531,7 @@
+@@ -530,10 +529,7 @@
  #  define Q_WS_PM
  #  error "Qt does not work with OS/2 Presentation Manager or Workplace Shell"
  #elif defined(Q_OS_UNIX)
Prev by Date: [pkgsrc/trunk]: pkgsrc/print update to 0.5.3
Next by Date: [pkgsrc/trunk]: pkgsrc/pkgtools/libkver If I should be steward of one be it t...
Previous by Thread: [pkgsrc/trunk]: pkgsrc/print update to 0.5.3
Next by Thread: [pkgsrc/trunk]: pkgsrc/pkgtools/libkver If I should be steward of one be it t...
Indexes:
Home | Main Index | Thread Index | Old Index