[Midnightbsd-cvs] mports: x11-toolkits/qt33: Update to 3.3.8

laffer1 at midnightbsd.org laffer1 at midnightbsd.org
Sun May 4 14:56:15 EDT 2008


Log Message:
-----------
Update to 3.3.8

Modified Files:
--------------
    mports/x11-toolkits/qt33:
        Makefile (r1.8 -> r1.9)
        distinfo (r1.2 -> r1.3)
        pkg-plist (r1.4 -> r1.5)
    mports/x11-toolkits/qt33/files:
        0001-dnd_optimization.patch (r1.1 -> r1.2)
        0007-qpixmap_constants.patch (r1.1 -> r1.2)

-------------- next part --------------
Index: pkg-plist
===================================================================
RCS file: /home/cvs/mports/x11-toolkits/qt33/pkg-plist,v
retrieving revision 1.4
retrieving revision 1.5
diff -L x11-toolkits/qt33/pkg-plist -L x11-toolkits/qt33/pkg-plist -u -r1.4 -r1.5
--- x11-toolkits/qt33/pkg-plist
+++ x11-toolkits/qt33/pkg-plist
@@ -415,7 +415,7 @@
 lib/libqt-mt.so
 lib/libqt-mt.so.3
 lib/libqt-mt.so.3.3
-lib/libqt-mt.so.3.3.7
+lib/libqt-mt.so.3.3.8
 lib/libqui.prl
 lib/libqui.so
 lib/libqui.so.1
@@ -2365,6 +2365,7 @@
 share/qt/templates/Tab_Dialog.ui
 translations/assistant_de.qm
 translations/qt_ar.qm
+translations/qt_ca.qm
 translations/qt_cs.qm
 translations/qt_de.qm
 translations/qt_es.qm
Index: Makefile
===================================================================
RCS file: /home/cvs/mports/x11-toolkits/qt33/Makefile,v
retrieving revision 1.8
retrieving revision 1.9
diff -L x11-toolkits/qt33/Makefile -L x11-toolkits/qt33/Makefile -u -r1.8 -r1.9
--- x11-toolkits/qt33/Makefile
+++ x11-toolkits/qt33/Makefile
@@ -8,8 +8,7 @@
 #
 
 PORTNAME=	qt
-PORTVERSION=	3.3.7
-PORTREVISION=	3
+PORTVERSION=	3.3.8
 CATEGORIES?=	x11-toolkits ipv6
 MASTER_SITES=	${MASTER_SITE_QT}
 DISTNAME=	qt-x11-free-${PORTVERSION}
@@ -24,6 +23,8 @@
 		png:${PORTSDIR}/graphics/png \
 		jpeg:${PORTSDIR}/graphics/jpeg
 
+EXTRA_PATCHES=	${PATCHDIR}/0081-format-string-fixes.diff
+
 USE_BZIP2=	yes
 REINPLACE_ARGS=	-i ""
 USE_XLIB=	yes
@@ -53,7 +54,8 @@
 	--exclude '${DISTNAME}/examples' --exclude '${DISTNAME}/tutorial' \
 	--exclude '${DISTNAME}/extensions/nsplugin/src/[^q]*' \
 	--exclude '${DISTNAME}/include/jri*' \
-	--exclude '${DISTNAME}/include/np*'
+	--exclude '${DISTNAME}/include/np*' \
+	--exclude '${DISTNAME}/doc/html/qmake*'
 
 OPTIONS=	CUPS "Enable CUPS support" on \
 		KDE_PATCHES "Apply KDE patches" off \
@@ -94,7 +96,7 @@
 .endif
 
 .if !defined(WITHOUT_OPENGL)
-USE_GL=		yes
+USE_GL=		glu
 CONFIGURE_ARGS+=-dlopen-opengl
 .elif defined(WITHOUT_OPENGL)
 CONFIGURE_ARGS+=-disable-opengl
@@ -115,7 +117,7 @@
 .endif
 
 .if defined(WITH_KDE_PATCHES)
-EXTRA_PATCHES=	${PATCHDIR}/0001-dnd_optimization.patch \
+EXTRA_PATCHES+=	${PATCHDIR}/0001-dnd_optimization.patch \
 		${PATCHDIR}/0002-dnd_active_window_fix.patch \
 		${PATCHDIR}/0007-qpixmap_constants.patch \
 		${PATCHDIR}/0015-qiconview-finditem.patch \
@@ -133,7 +135,13 @@
 		${PATCHDIR}/0056-khotkeys_input_84434.patch \
 		${PATCHDIR}/0059-qpopup_has_mouse.patch \
 		${PATCHDIR}/0060-qpopup_ignore_mousepos.patch \
-		${PATCHDIR}/0061-qscrollview-propagate-horizontal-wheelevent.patch
+		${PATCHDIR}/0061-qscrollview-propagate-horizontal-wheelevent.patch \
+		${PATCHDIR}/0073-xinerama-aware-qpopup.patch \
+		${PATCHDIR}/0076-fix-qprocess.diff \
+		${PATCHDIR}/0078-argb-visual-hack.patch \
+		${PATCHDIR}/0079-compositing-types.patch \
+		${PATCHDIR}/0080-net-wm-sync-request.patch \
+		${PATCHDIR}/xxxx-qt-font-default-subst.patch
 PKGNAMESUFFIX=	-copy
 COMMENT+=	(+ KDE patches)
 CONFLICTS+=	qt-3.3.*
@@ -141,11 +149,6 @@
 CONFLICTS+=	qt-copy-[0-9]*
 .endif
 
-.if exists(${X11BASE}/include/qt2/qapp.h)
-BROKEN=	You have QT2 headers installed!  Installing this port
-BROKEN+= will result in conflicts between QT3 and QT2!
-.endif
-
 post-patch:
 .if defined(PLATFORM)
 	@${REINPLACE_CMD} -e 's|$$outpath/bin/qmake|${QTBASE}/bin/qmake|g' \
@@ -169,6 +172,7 @@
 post-configure:
 	@${REINPLACE_CMD} -e \
 		's|/lib/pkgconfig/|/libdata/pkgconfig/|g' \
+		-e 's|^INCPATH.*=|INCPATH  = -I../include|g' \
 			${WRKSRC}/src/Makefile
 
 post-build:
Index: distinfo
===================================================================
RCS file: /home/cvs/mports/x11-toolkits/qt33/distinfo,v
retrieving revision 1.2
retrieving revision 1.3
diff -L x11-toolkits/qt33/distinfo -L x11-toolkits/qt33/distinfo -u -r1.2 -r1.3
--- x11-toolkits/qt33/distinfo
+++ x11-toolkits/qt33/distinfo
@@ -1,3 +1,3 @@
-MD5 (KDE/qt-x11-free-3.3.7.tar.bz2) = 655e21cf6a7e66daf8ec6ceda81aae1e
-SHA256 (KDE/qt-x11-free-3.3.7.tar.bz2) = 48c05b501029f0640db665fbc7f981a0efbf69ad3cf87a43c5eea4872f4f7ba1
-SIZE (KDE/qt-x11-free-3.3.7.tar.bz2) = 14564513
+MD5 (KDE/qt-x11-free-3.3.8.tar.bz2) = cf3c43a7dfde5bfb76f8001102fe6e85
+SHA256 (KDE/qt-x11-free-3.3.8.tar.bz2) = e8c3f703d00a4e2ab9ba63fd474caa8a9d0aa3d7f1d5451dd162bec9d778a449
+SIZE (KDE/qt-x11-free-3.3.8.tar.bz2) = 14360483
Index: 0001-dnd_optimization.patch
===================================================================
RCS file: /home/cvs/mports/x11-toolkits/qt33/files/0001-dnd_optimization.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -L x11-toolkits/qt33/files/0001-dnd_optimization.patch -L x11-toolkits/qt33/files/0001-dnd_optimization.patch -u -r1.1 -r1.2
--- x11-toolkits/qt33/files/0001-dnd_optimization.patch
+++ x11-toolkits/qt33/files/0001-dnd_optimization.patch
@@ -5,8 +5,9 @@
 See http://lists.kde.org/?t=104388858900001&r=1&w=2
 
 
---- src/kernel/qdnd_x11.cpp.sav	2003-02-05 16:09:45.000000000 +0100
-+++ src/kernel/qdnd_x11.cpp	2003-02-07 16:14:49.000000000 +0100
+
+--- src/kernel/qdnd_x11.cpp
++++ src/kernel/qdnd_x11.cpp
 @@ -49,13 +49,15 @@
  #include "qdragobject.h"
  #include "qobjectlist.h"
@@ -25,7 +26,7 @@
  #undef KeyPress
  #undef KeyRelease
  
-@@ -249,20 +251,47 @@ class QShapedPixmapWidget : public QWidg
+@@ -253,20 +255,47 @@ class QShapedPixmapWidget : public QWidg
  public:
      QShapedPixmapWidget(int screen = -1) :
  	QWidget(QApplication::desktop()->screen( screen ),
@@ -75,8 +76,8 @@
 +    QPoint oldhot;
  };
  
- QShapedPixmapWidget * qt_xdnd_deco = 0;
-@@ -859,6 +888,45 @@ void QDragManager::timerEvent( QTimerEve
+ static QShapedPixmapWidget * qt_xdnd_deco = 0;
+@@ -872,6 +901,45 @@ void QDragManager::timerEvent( QTimerEve
  	move( QCursor::pos() );
  }
  
@@ -122,7 +123,7 @@
  bool QDragManager::eventFilter( QObject * o, QEvent * e)
  {
      if ( beingCancelled ) {
-@@ -881,8 +949,10 @@ bool QDragManager::eventFilter( QObject 
+@@ -894,8 +962,10 @@ bool QDragManager::eventFilter( QObject 
  
      if ( e->type() == QEvent::MouseMove ) {
  	QMouseEvent* me = (QMouseEvent *)e;
@@ -135,16 +136,16 @@
  	return TRUE;
      } else if ( e->type() == QEvent::MouseButtonRelease ) {
  	qApp->removeEventFilter( this );
-@@ -1106,7 +1176,7 @@ void QDragManager::move( const QPoint & 
- 	delete qt_xdnd_deco;
- 	qt_xdnd_deco = new QShapedPixmapWidget( screen );
+@@ -1136,7 +1206,7 @@ void QDragManager::move( const QPoint & 
+ 	    qt_xdnd_deco->grabMouse();
+ 	}
      }
 -    updatePixmap();
 +    updatePixmap( globalPos );
  
      if ( qt_xdnd_source_sameanswer.contains( globalPos ) &&
  	 qt_xdnd_source_sameanswer.isValid() ) {
-@@ -1679,7 +1749,7 @@ bool QDragManager::drag( QDragObject * o
+@@ -1729,7 +1799,7 @@ bool QDragManager::drag( QDragObject * o
      // qt_xdnd_source_object persists until we get an xdnd_finish message
  }
  
@@ -153,7 +154,7 @@
  {
      if ( qt_xdnd_deco ) {
  	QPixmap pm;
-@@ -1694,9 +1764,8 @@ void QDragManager::updatePixmap()
+@@ -1744,9 +1814,8 @@ void QDragManager::updatePixmap()
  		defaultPm = new QPixmap(default_pm);
  	    pm = *defaultPm;
  	}
@@ -165,7 +166,7 @@
  	    //if ( willDrop ) {
  	    qt_xdnd_deco->show();
  	    //} else {
-@@ -1705,4 +1774,9 @@ void QDragManager::updatePixmap()
+@@ -1755,4 +1824,9 @@ void QDragManager::updatePixmap()
      }
  }
  
@@ -175,8 +176,8 @@
 +}
 +
  #endif // QT_NO_DRAGANDDROP
---- src/kernel/qdragobject.h.sav	2002-11-01 19:25:07.000000000 +0100
-+++ src/kernel/qdragobject.h	2001-01-01 01:01:00.000000000 +0100
+--- src/kernel/qdragobject.h
++++ src/kernel/qdragobject.h
 @@ -245,6 +245,7 @@ private:
      void move( const QPoint & );
      void drop();
Index: 0007-qpixmap_constants.patch
===================================================================
RCS file: /home/cvs/mports/x11-toolkits/qt33/files/0007-qpixmap_constants.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -L x11-toolkits/qt33/files/0007-qpixmap_constants.patch -L x11-toolkits/qt33/files/0007-qpixmap_constants.patch -u -r1.1 -r1.2
--- x11-toolkits/qt33/files/0007-qpixmap_constants.patch
+++ x11-toolkits/qt33/files/0007-qpixmap_constants.patch
@@ -4,9 +4,10 @@
 
 See 0005-qpixmap_mitshm.patch for details.
 
---- src/kernel/qpixmap_x11.cpp.sav	Tue Nov 26 15:32:21 2002
-+++ src/kernel/qpixmap_x11.cpp	Tue Nov 26 15:37:21 2002
-@@ -1278,9 +1278,6 @@ bool QPixmap::convertFromImage( const QI
+
+--- src/kernel/qpixmap_x11.cpp
++++ src/kernel/qpixmap_x11.cpp
+@@ -1123,9 +1123,6 @@ bool QPixmap::convertFromImage( const QI
  	    return FALSE;
  	int    bppc = xi->bits_per_pixel;
  
@@ -16,7 +17,7 @@
  	bool contig_bits = n_bits(red_mask) == rbits &&
                             n_bits(green_mask) == gbits &&
                             n_bits(blue_mask) == bbits;
-@@ -1329,32 +1326,70 @@ bool QPixmap::convertFromImage( const QI
+@@ -1174,32 +1171,70 @@ bool QPixmap::convertFromImage( const QI
  	    }
  	    init=TRUE;
  	}
@@ -103,7 +104,7 @@
  #define GET_PIXEL_DITHER_TC \
  		int r = qRed  ( *p ); \
  		int g = qGreen( *p ); \
-@@ -1374,91 +1409,177 @@ bool QPixmap::convertFromImage( const QI
+@@ -1220,91 +1255,177 @@ bool QPixmap::convertFromImage( const QI
  		    ? g << green_shift : g >> -green_shift; \
  		b = blue_shift  > 0 \
  		    ? b << blue_shift  : b >> -blue_shift; \
@@ -353,17 +354,17 @@
      }
  
      if ( d == 8 && !trucol ) {			// 8 bit pixmap
-@@ -1738,15 +1859,24 @@ bool QPixmap::convertFromImage( const QI
+@@ -1554,15 +1675,24 @@ bool QPixmap::convertFromImage( const QI
  
- 		if (image.depth() == 32) {
- 		    const int *iptr = (const int *) image.bits();
--		    int max = w * h;
--		    while (max--)
--			*aptr++ = *iptr++ >> 24; // squirt
+                 if (image.depth() == 32) {
+                     const int *iptr = (const int *) image.bits();
+-                    int max = w * h;
+-                    while (max--)
+-                        *aptr++ = *iptr++ >> 24; // squirt
 +                    if( axi->bytes_per_line == (int)w ) {
-+		        int max = w * h;
-+		        while (max--)
-+			    *aptr++ = *iptr++ >> 24; // squirt
++                        int max = w * h;
++                        while (max--)
++                            *aptr++ = *iptr++ >> 24; // squirt
 +                    } else {
 +                        for (uint i = 0; i < h; ++i ) {
 +                            for (uint j = 0; j < w; ++j )
@@ -371,13 +372,13 @@
 +                            aptr += ( axi->bytes_per_line - w );
 +                        }
 +                    }
- 		} else if (image.depth() == 8) {
- 		    const QRgb * const rgb = image.colorTable();
- 		    for (uint y = 0; y < h; ++y) {
- 			const uchar *iptr = image.scanLine(y);
- 			for (uint x = 0; x < w; ++x)
- 			    *aptr++ = qAlpha(rgb[*iptr++]);
+                 } else if (image.depth() == 8) {
+                     const QRgb * const rgb = image.colorTable();
+                     for (uint y = 0; y < h; ++y) {
+                         const uchar *iptr = image.scanLine(y);
+                         for (uint x = 0; x < w; ++x)
+                             *aptr++ = qAlpha(rgb[*iptr++]);
 +                        aptr += ( axi->bytes_per_line - w );
- 		    }
- 		}
+                     }
+                 }
  


More information about the Midnightbsd-cvs mailing list