summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--misc/tellico/Makefile6
-rw-r--r--misc/tellico/distinfo10
-rw-r--r--misc/tellico/patches/patch-src_collectionfieldsdialog.cpp23
-rw-r--r--misc/tellico/patches/patch-src_fetch_fetchmanager.h13
4 files changed, 7 insertions, 45 deletions
diff --git a/misc/tellico/Makefile b/misc/tellico/Makefile
index 40ce4f2e5c1..42a270fe2c0 100644
--- a/misc/tellico/Makefile
+++ b/misc/tellico/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.93 2014/11/20 16:04:15 wiz Exp $
+# $NetBSD: Makefile,v 1.94 2014/12/13 07:37:34 mef Exp $
#
-DISTNAME= tellico-2.3.5
-PKGREVISION= 43
+DISTNAME= tellico-2.3.9
CATEGORIES= misc
MASTER_SITES= http://tellico-project.org/files/
EXTRACT_SUFX= .tar.bz2
@@ -29,6 +28,7 @@ pre-build:
.include "../../audio/taglib/buildlink3.mk"
.include "../../devel/exempi/buildlink3.mk"
.include "../../devel/qjson/buildlink3.mk"
+.include "../../graphics/hicolor-icon-theme/buildlink3.mk"
.include "../../graphics/libksane/buildlink3.mk"
.include "../../graphics/qimageblitz/buildlink3.mk"
.include "../../lang/python/application.mk"
diff --git a/misc/tellico/distinfo b/misc/tellico/distinfo
index 8a3ba59fb10..1e7e5f405b2 100644
--- a/misc/tellico/distinfo
+++ b/misc/tellico/distinfo
@@ -1,7 +1,5 @@
-$NetBSD: distinfo,v 1.14 2013/01/17 15:58:01 joerg Exp $
+$NetBSD: distinfo,v 1.15 2014/12/13 07:37:34 mef Exp $
-SHA1 (tellico-2.3.5.tar.bz2) = 336f34e378a711d951bdbb7784a04a6451a5c314
-RMD160 (tellico-2.3.5.tar.bz2) = 83ab99ca415c8e5a9caed1cf7f684ff5fc76b8f5
-Size (tellico-2.3.5.tar.bz2) = 4402734 bytes
-SHA1 (patch-src_collectionfieldsdialog.cpp) = 0c33f6a83249c25b3c9666a919b27f85118418d1
-SHA1 (patch-src_fetch_fetchmanager.h) = 34d2b1d5b00bedd59ba25ad4dd6c4553c60821aa
+SHA1 (tellico-2.3.9.tar.bz2) = 06ba6fe95d9b6866cb881b0c84cd5e617d688b71
+RMD160 (tellico-2.3.9.tar.bz2) = 6760cf187726bcb5026344386a3e026213a60b14
+Size (tellico-2.3.9.tar.bz2) = 4855832 bytes
diff --git a/misc/tellico/patches/patch-src_collectionfieldsdialog.cpp b/misc/tellico/patches/patch-src_collectionfieldsdialog.cpp
deleted file mode 100644
index f9ff142082a..00000000000
--- a/misc/tellico/patches/patch-src_collectionfieldsdialog.cpp
+++ /dev/null
@@ -1,23 +0,0 @@
-$NetBSD: patch-src_collectionfieldsdialog.cpp,v 1.1 2013/01/17 15:58:01 joerg Exp $
-
---- src/collectionfieldsdialog.cpp.orig 2012-01-15 21:30:40.000000000 +0000
-+++ src/collectionfieldsdialog.cpp
-@@ -55,9 +55,9 @@
- #include <QGridLayout>
-
- using namespace Tellico;
--using Tellico::FieldListItem;
- using Tellico::CollectionFieldsDialog;
-
-+namespace Tellico {
- class FieldListItem : public Tellico::GUI::ListWidgetItem {
- public:
- FieldListItem(QListWidget* parent_, Data::FieldPtr field_) : GUI::ListWidgetItem(field_->title(), parent_), m_field(field_) {}
-@@ -68,6 +68,7 @@ public:
- private:
- Data::FieldPtr m_field;
- };
-+}
-
- CollectionFieldsDialog::CollectionFieldsDialog(Tellico::Data::CollPtr coll_, QWidget* parent_)
- : KDialog(parent_),
diff --git a/misc/tellico/patches/patch-src_fetch_fetchmanager.h b/misc/tellico/patches/patch-src_fetch_fetchmanager.h
deleted file mode 100644
index e62e21386b5..00000000000
--- a/misc/tellico/patches/patch-src_fetch_fetchmanager.h
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-src_fetch_fetchmanager.h,v 1.1 2013/01/17 15:58:01 joerg Exp $
-
---- src/fetch/fetchmanager.h.orig 2013-01-16 12:48:51.000000000 +0000
-+++ src/fetch/fetchmanager.h
-@@ -65,6 +65,8 @@ Q_OBJECT
- typedef QString (*FETCHER_ICON_FN)(void);
- typedef StringHash (*FETCHER_OPTIONALFIELDS_FN)(void);
- typedef ConfigWidget* (*FETCHER_CONFIGWIDGET_FN)(QWidget*);
-+
-+public:
- struct FetcherFunction {
- FETCHER_CREATE_FN create;
- FETCHER_NAME_FN name;