Sat Feb 5 19:37:13 2011 UTC ()
Correct previous patch to fix build with gcc4.4


(markd)
diff -r1.66 -r1.67 pkgsrc/misc/kdeaddons3/Makefile
diff -r1.36 -r1.37 pkgsrc/misc/kdeaddons3/distinfo
diff -r1.3 -r1.4 pkgsrc/misc/kdeaddons3/patches/patch-ab
cvs diff -r1.66 -r1.67 pkgsrc/misc/kdeaddons3/Attic/Makefile (expand / switch to unified diff)

--- pkgsrc/misc/kdeaddons3/Attic/Makefile 2011/01/13 13:38:47 1.66
+++ pkgsrc/misc/kdeaddons3/Attic/Makefile 2011/02/05 19:37:13 1.67
@@ -1,17 +1,17 @@ @@ -1,17 +1,17 @@
1# $NetBSD: Makefile,v 1.66 2011/01/13 13:38:47 wiz Exp $ 1# $NetBSD: Makefile,v 1.67 2011/02/05 19:37:13 markd Exp $
2 2
3DISTNAME= kdeaddons-${_KDE_VERSION} 3DISTNAME= kdeaddons-${_KDE_VERSION}
4PKGREVISION= 7 4PKGREVISION= 8
5CATEGORIES= misc 5CATEGORIES= misc
6COMMENT= Add ons for the KDE integrated X11 desktop 6COMMENT= Add ons for the KDE integrated X11 desktop
7 7
8PKG_DESTDIR_SUPPORT= user-destdir 8PKG_DESTDIR_SUPPORT= user-destdir
9 9
10.include "../../meta-pkgs/kde3/Makefile.kde3" 10.include "../../meta-pkgs/kde3/Makefile.kde3"
11 11
12REPLACE_PERL+= knewsticker-scripts/bbc.pl \ 12REPLACE_PERL+= knewsticker-scripts/bbc.pl \
13 knewsticker-scripts/newsrss.pl \ 13 knewsticker-scripts/newsrss.pl \
14 knewsticker-scripts/stock.pl 14 knewsticker-scripts/stock.pl
15 15
16.include "../../mk/bsd.prefs.mk" 16.include "../../mk/bsd.prefs.mk"
17 17
cvs diff -r1.36 -r1.37 pkgsrc/misc/kdeaddons3/Attic/distinfo (expand / switch to unified diff)

--- pkgsrc/misc/kdeaddons3/Attic/distinfo 2011/01/20 12:00:31 1.36
+++ pkgsrc/misc/kdeaddons3/Attic/distinfo 2011/02/05 19:37:13 1.37
@@ -1,7 +1,7 @@ @@ -1,7 +1,7 @@
1$NetBSD: distinfo,v 1.36 2011/01/20 12:00:31 markd Exp $ 1$NetBSD: distinfo,v 1.37 2011/02/05 19:37:13 markd Exp $
2 2
3SHA1 (kdeaddons-3.5.10.tar.bz2) = 5342e2f0a21e9028d9aaa2ee253f89f615ee57de 3SHA1 (kdeaddons-3.5.10.tar.bz2) = 5342e2f0a21e9028d9aaa2ee253f89f615ee57de
4RMD160 (kdeaddons-3.5.10.tar.bz2) = eada207a25f9cff0c10732e03bc8d9d813f79bd2 4RMD160 (kdeaddons-3.5.10.tar.bz2) = eada207a25f9cff0c10732e03bc8d9d813f79bd2
5Size (kdeaddons-3.5.10.tar.bz2) = 1741779 bytes 5Size (kdeaddons-3.5.10.tar.bz2) = 1741779 bytes
6SHA1 (patch-aa) = 68cea80eaf8f9c457f9d4a74a32f0da549699878 6SHA1 (patch-aa) = 68cea80eaf8f9c457f9d4a74a32f0da549699878
7SHA1 (patch-ab) = 3342980ba895b5b7154c8b70eba0a7cd0d5eb6bc 7SHA1 (patch-ab) = 863ba6f46568a30f16bb0564c2cb969ce1c999b7
cvs diff -r1.3 -r1.4 pkgsrc/misc/kdeaddons3/patches/Attic/patch-ab (expand / switch to unified diff)

--- pkgsrc/misc/kdeaddons3/patches/Attic/patch-ab 2011/01/20 12:00:31 1.3
+++ pkgsrc/misc/kdeaddons3/patches/Attic/patch-ab 2011/02/05 19:37:13 1.4
@@ -1,13 +1,15 @@ @@ -1,13 +1,15 @@
1$NetBSD: patch-ab,v 1.3 2011/01/20 12:00:31 markd Exp $ 1$NetBSD: patch-ab,v 1.4 2011/02/05 19:37:13 markd Exp $
 2
 3Fix build with gcc4.4
2 4
3--- kate/tabbarextension/plugin_katetabbarextension.h.orig 2008-08-19 18:10:36.000000000 +0000 5--- kate/tabbarextension/plugin_katetabbarextension.h.orig 2008-08-19 18:10:36.000000000 +0000
4+++ kate/tabbarextension/plugin_katetabbarextension.h 6+++ kate/tabbarextension/plugin_katetabbarextension.h
5@@ -53,7 +53,7 @@ class KateTabBarButton; 7@@ -53,7 +53,7 @@ class KateTabBarButton;
6 class MyPtrList : public QPtrList <KateTabBarButton> 8 class MyPtrList : public QPtrList <KateTabBarButton>
7 { 9 {
8 public: 10 public:
9- MyPtrList() { QPtrList<KateTabBarButton>::QPtrList(); } 11- MyPtrList() { QPtrList<KateTabBarButton>::QPtrList(); }
10+ MyPtrList() { QPtrList(); } 12+ MyPtrList() { QPtrList<KateTabBarButton>(); }
11  13
12 virtual int compareItems ( QPtrCollection::Item item1_, QPtrCollection::Item item2_ ); 14 virtual int compareItems ( QPtrCollection::Item item1_, QPtrCollection::Item item2_ );
13 }; 15 };