diff options
author | Markus Brueffer <markus@FreeBSD.org> | 2004-03-16 11:42:53 +0000 |
---|---|---|
committer | Markus Brueffer <markus@FreeBSD.org> | 2004-03-16 11:42:53 +0000 |
commit | 7dcc7f9c81ee5531856313df3e49b8adf21facf1 (patch) | |
tree | f4f2374fecbb3c9386403ba05f9ef7fdb88d8a53 /misc | |
parent | Update to version 1.68, skipping 1.66 and 1.67 which contained bugs I (diff) |
- Update to 0.8.5
- Unbreak on 4.x
Approved by: arved (mentor)
Notes
Notes:
svn path=/head/; revision=104153
Diffstat (limited to 'misc')
-rw-r--r-- | misc/bookcase/Makefile | 3 | ||||
-rw-r--r-- | misc/bookcase/distinfo | 4 | ||||
-rw-r--r-- | misc/bookcase/files/patch-filehandler.h | 10 | ||||
-rw-r--r-- | misc/bookcase/files/patch-image.cpp | 14 | ||||
-rw-r--r-- | misc/bookcase/files/patch-image.h | 12 | ||||
-rw-r--r-- | misc/tellico-kde4/Makefile | 3 | ||||
-rw-r--r-- | misc/tellico-kde4/distinfo | 4 | ||||
-rw-r--r-- | misc/tellico-kde4/files/patch-filehandler.h | 10 | ||||
-rw-r--r-- | misc/tellico-kde4/files/patch-image.cpp | 14 | ||||
-rw-r--r-- | misc/tellico-kde4/files/patch-image.h | 12 | ||||
-rw-r--r-- | misc/tellico/Makefile | 3 | ||||
-rw-r--r-- | misc/tellico/distinfo | 4 | ||||
-rw-r--r-- | misc/tellico/files/patch-filehandler.h | 10 | ||||
-rw-r--r-- | misc/tellico/files/patch-image.cpp | 14 | ||||
-rw-r--r-- | misc/tellico/files/patch-image.h | 12 |
15 files changed, 87 insertions, 42 deletions
diff --git a/misc/bookcase/Makefile b/misc/bookcase/Makefile index e603243d6633..0a14d83e1467 100644 --- a/misc/bookcase/Makefile +++ b/misc/bookcase/Makefile @@ -6,7 +6,7 @@ # PORTNAME= bookcase -PORTVERSION= 0.8.4 +PORTVERSION= 0.8.5 CATEGORIES= misc kde MASTER_SITES= http://www.periapsis.org/bookcase/download/ @@ -24,7 +24,6 @@ post-patch: .if ${OSVERSION} < 500000 CFLAGS+= -D__LIBSTDCPP_PARTIAL_SUPPORT__ -BROKEN= "Does not compile on 4.x" .endif .include "${PORTSDIR}/x11/kde3/Makefile.kde" diff --git a/misc/bookcase/distinfo b/misc/bookcase/distinfo index 577080272d63..e7eb241ab63a 100644 --- a/misc/bookcase/distinfo +++ b/misc/bookcase/distinfo @@ -1,2 +1,2 @@ -MD5 (bookcase-0.8.4.tar.gz) = 301d1c7c046dd02300bbd98bd6b724b0 -SIZE (bookcase-0.8.4.tar.gz) = 1409869 +MD5 (bookcase-0.8.5.tar.gz) = 82e0c1909c23d7736547f5f00b7e5f30 +SIZE (bookcase-0.8.5.tar.gz) = 1410447 diff --git a/misc/bookcase/files/patch-filehandler.h b/misc/bookcase/files/patch-filehandler.h deleted file mode 100644 index 7fa9e472c8a7..000000000000 --- a/misc/bookcase/files/patch-filehandler.h +++ /dev/null @@ -1,10 +0,0 @@ ---- src/filehandler.h.orig Tue Feb 24 01:11:58 2004 -+++ src/filehandler.h Tue Feb 24 01:08:37 2004 -@@ -39,6 +39,7 @@ - - friend class MainWindow; - friend const Data::Image& addImage(const KURL& url); -+class FileRef; - friend class FileRef; - - public: diff --git a/misc/bookcase/files/patch-image.cpp b/misc/bookcase/files/patch-image.cpp new file mode 100644 index 000000000000..fb0621bd7d8a --- /dev/null +++ b/misc/bookcase/files/patch-image.cpp @@ -0,0 +1,14 @@ +--- src/image.cpp.orig Mon Mar 15 22:39:08 2004 ++++ src/image.cpp Mon Mar 15 22:40:08 2004 +@@ -21,11 +21,6 @@ + + using Bookcase::Data::Image; + +-inline +-bool operator== (const Image& img1, const Image& img2) { +- return img1.id() == img2.id(); +-} +- + // I'm using the MD5 hash as the id. I consider it rather unlikely that two images in one + // collection could ever have the same has, and this lets me do a fast comparison of two images + // simply by comparing their ids. diff --git a/misc/bookcase/files/patch-image.h b/misc/bookcase/files/patch-image.h new file mode 100644 index 000000000000..8e0ad07073c6 --- /dev/null +++ b/misc/bookcase/files/patch-image.h @@ -0,0 +1,12 @@ +--- src/image.h.orig Mon Mar 15 22:39:01 2004 ++++ src/image.h Mon Mar 15 22:39:59 2004 +@@ -55,6 +55,8 @@ + } // end namespace + } // end namespace + +-bool operator== (const Bookcase::Data::Image& img1, const Bookcase::Data::Image& img2); ++inline bool operator== (const Bookcase::Data::Image& img1, const Bookcase::Data::Image& img2) { ++ return img1.id() == img2.id(); ++}; + + #endif diff --git a/misc/tellico-kde4/Makefile b/misc/tellico-kde4/Makefile index e603243d6633..0a14d83e1467 100644 --- a/misc/tellico-kde4/Makefile +++ b/misc/tellico-kde4/Makefile @@ -6,7 +6,7 @@ # PORTNAME= bookcase -PORTVERSION= 0.8.4 +PORTVERSION= 0.8.5 CATEGORIES= misc kde MASTER_SITES= http://www.periapsis.org/bookcase/download/ @@ -24,7 +24,6 @@ post-patch: .if ${OSVERSION} < 500000 CFLAGS+= -D__LIBSTDCPP_PARTIAL_SUPPORT__ -BROKEN= "Does not compile on 4.x" .endif .include "${PORTSDIR}/x11/kde3/Makefile.kde" diff --git a/misc/tellico-kde4/distinfo b/misc/tellico-kde4/distinfo index 577080272d63..e7eb241ab63a 100644 --- a/misc/tellico-kde4/distinfo +++ b/misc/tellico-kde4/distinfo @@ -1,2 +1,2 @@ -MD5 (bookcase-0.8.4.tar.gz) = 301d1c7c046dd02300bbd98bd6b724b0 -SIZE (bookcase-0.8.4.tar.gz) = 1409869 +MD5 (bookcase-0.8.5.tar.gz) = 82e0c1909c23d7736547f5f00b7e5f30 +SIZE (bookcase-0.8.5.tar.gz) = 1410447 diff --git a/misc/tellico-kde4/files/patch-filehandler.h b/misc/tellico-kde4/files/patch-filehandler.h deleted file mode 100644 index 7fa9e472c8a7..000000000000 --- a/misc/tellico-kde4/files/patch-filehandler.h +++ /dev/null @@ -1,10 +0,0 @@ ---- src/filehandler.h.orig Tue Feb 24 01:11:58 2004 -+++ src/filehandler.h Tue Feb 24 01:08:37 2004 -@@ -39,6 +39,7 @@ - - friend class MainWindow; - friend const Data::Image& addImage(const KURL& url); -+class FileRef; - friend class FileRef; - - public: diff --git a/misc/tellico-kde4/files/patch-image.cpp b/misc/tellico-kde4/files/patch-image.cpp new file mode 100644 index 000000000000..fb0621bd7d8a --- /dev/null +++ b/misc/tellico-kde4/files/patch-image.cpp @@ -0,0 +1,14 @@ +--- src/image.cpp.orig Mon Mar 15 22:39:08 2004 ++++ src/image.cpp Mon Mar 15 22:40:08 2004 +@@ -21,11 +21,6 @@ + + using Bookcase::Data::Image; + +-inline +-bool operator== (const Image& img1, const Image& img2) { +- return img1.id() == img2.id(); +-} +- + // I'm using the MD5 hash as the id. I consider it rather unlikely that two images in one + // collection could ever have the same has, and this lets me do a fast comparison of two images + // simply by comparing their ids. diff --git a/misc/tellico-kde4/files/patch-image.h b/misc/tellico-kde4/files/patch-image.h new file mode 100644 index 000000000000..8e0ad07073c6 --- /dev/null +++ b/misc/tellico-kde4/files/patch-image.h @@ -0,0 +1,12 @@ +--- src/image.h.orig Mon Mar 15 22:39:01 2004 ++++ src/image.h Mon Mar 15 22:39:59 2004 +@@ -55,6 +55,8 @@ + } // end namespace + } // end namespace + +-bool operator== (const Bookcase::Data::Image& img1, const Bookcase::Data::Image& img2); ++inline bool operator== (const Bookcase::Data::Image& img1, const Bookcase::Data::Image& img2) { ++ return img1.id() == img2.id(); ++}; + + #endif diff --git a/misc/tellico/Makefile b/misc/tellico/Makefile index e603243d6633..0a14d83e1467 100644 --- a/misc/tellico/Makefile +++ b/misc/tellico/Makefile @@ -6,7 +6,7 @@ # PORTNAME= bookcase -PORTVERSION= 0.8.4 +PORTVERSION= 0.8.5 CATEGORIES= misc kde MASTER_SITES= http://www.periapsis.org/bookcase/download/ @@ -24,7 +24,6 @@ post-patch: .if ${OSVERSION} < 500000 CFLAGS+= -D__LIBSTDCPP_PARTIAL_SUPPORT__ -BROKEN= "Does not compile on 4.x" .endif .include "${PORTSDIR}/x11/kde3/Makefile.kde" diff --git a/misc/tellico/distinfo b/misc/tellico/distinfo index 577080272d63..e7eb241ab63a 100644 --- a/misc/tellico/distinfo +++ b/misc/tellico/distinfo @@ -1,2 +1,2 @@ -MD5 (bookcase-0.8.4.tar.gz) = 301d1c7c046dd02300bbd98bd6b724b0 -SIZE (bookcase-0.8.4.tar.gz) = 1409869 +MD5 (bookcase-0.8.5.tar.gz) = 82e0c1909c23d7736547f5f00b7e5f30 +SIZE (bookcase-0.8.5.tar.gz) = 1410447 diff --git a/misc/tellico/files/patch-filehandler.h b/misc/tellico/files/patch-filehandler.h deleted file mode 100644 index 7fa9e472c8a7..000000000000 --- a/misc/tellico/files/patch-filehandler.h +++ /dev/null @@ -1,10 +0,0 @@ ---- src/filehandler.h.orig Tue Feb 24 01:11:58 2004 -+++ src/filehandler.h Tue Feb 24 01:08:37 2004 -@@ -39,6 +39,7 @@ - - friend class MainWindow; - friend const Data::Image& addImage(const KURL& url); -+class FileRef; - friend class FileRef; - - public: diff --git a/misc/tellico/files/patch-image.cpp b/misc/tellico/files/patch-image.cpp new file mode 100644 index 000000000000..fb0621bd7d8a --- /dev/null +++ b/misc/tellico/files/patch-image.cpp @@ -0,0 +1,14 @@ +--- src/image.cpp.orig Mon Mar 15 22:39:08 2004 ++++ src/image.cpp Mon Mar 15 22:40:08 2004 +@@ -21,11 +21,6 @@ + + using Bookcase::Data::Image; + +-inline +-bool operator== (const Image& img1, const Image& img2) { +- return img1.id() == img2.id(); +-} +- + // I'm using the MD5 hash as the id. I consider it rather unlikely that two images in one + // collection could ever have the same has, and this lets me do a fast comparison of two images + // simply by comparing their ids. diff --git a/misc/tellico/files/patch-image.h b/misc/tellico/files/patch-image.h new file mode 100644 index 000000000000..8e0ad07073c6 --- /dev/null +++ b/misc/tellico/files/patch-image.h @@ -0,0 +1,12 @@ +--- src/image.h.orig Mon Mar 15 22:39:01 2004 ++++ src/image.h Mon Mar 15 22:39:59 2004 +@@ -55,6 +55,8 @@ + } // end namespace + } // end namespace + +-bool operator== (const Bookcase::Data::Image& img1, const Bookcase::Data::Image& img2); ++inline bool operator== (const Bookcase::Data::Image& img1, const Bookcase::Data::Image& img2) { ++ return img1.id() == img2.id(); ++}; + + #endif |