[arch-commits] Commit in tellico/repos/community-x86_64 (5 files)
Jan Steffens
heftig at archlinux.org
Fri Apr 19 21:13:58 UTC 2019
Date: Friday, April 19, 2019 @ 21:13:57
Author: heftig
Revision: 452068
archrelease: copy trunk to community-x86_64
Added:
tellico/repos/community-x86_64/PKGBUILD
(from rev 452067, tellico/trunk/PKGBUILD)
tellico/repos/community-x86_64/compilefix.diff
(from rev 452067, tellico/trunk/compilefix.diff)
tellico/repos/community-x86_64/tellico.changelog
(from rev 452067, tellico/trunk/tellico.changelog)
Deleted:
tellico/repos/community-x86_64/PKGBUILD
tellico/repos/community-x86_64/tellico.changelog
-------------------+
PKGBUILD | 82 +++++++++++++++++----------------
compilefix.diff | 128 ++++++++++++++++++++++++++++++++++++++++++++++++++++
tellico.changelog | 118 +++++++++++++++++++++++------------------------
3 files changed, 230 insertions(+), 98 deletions(-)
Deleted: PKGBUILD
===================================================================
--- PKGBUILD 2019-04-19 21:13:43 UTC (rev 452067)
+++ PKGBUILD 2019-04-19 21:13:57 UTC (rev 452068)
@@ -1,39 +0,0 @@
-# Maintainer: Jaroslav Lichtblau <svetlemodry at archlinux.org>
-# Contributor: Ray Rashif <schiv at archlinux.org
-# Contributor: Andrea Scarpino <andrea at archlinux.org>
-# Contributor: Douglas Soares de Andrade <dsa at aur.archlinux.org>
-
-pkgname=tellico
-pkgver=3.1.4
-pkgrel=2
-pkgdesc="A collection manager for KDE"
-arch=('x86_64')
-url="http://tellico-project.org/"
-license=('GPL')
-depends=('exempi' 'hicolor-icon-theme' 'kio' 'libksane' 'libkcddb' 'libcddb'
- 'libcdio' 'kfilemetadata' 'knewstuff' 'kxmlgui' 'kitemmodels'
- 'python2' 'solid' 'khtml' 'yaz' 'taglib' 'poppler-qt5' 'qt5-base')
-makedepends=('cmake' 'extra-cmake-modules' 'kdoctools' 'libkcddb')
-changelog=$pkgname.changelog
-source=(http://tellico-project.org/files/$pkgname-$pkgver.tar.xz)
-sha256sums=('8f611e3be8be095de38fe27d76f3ddeae09962c9aec00298031cc3e71eae95f9')
-
-build() {
- cd "${srcdir}"
-
- mkdir build && cd build
-
- cmake ../$pkgname-$pkgver \
- -DCMAKE_BUILD_TYPE=Release \
- -DCMAKE_INSTALL_PREFIX=/usr \
- -DWITH_Nepomuk=OFF
- make
-}
-
-package() {
- cd "${srcdir}"/build
-
- make DESTDIR="${pkgdir}" install
-# fix python 2.7 path
- find "${pkgdir}" -iname "*.py" | xargs sed -i 's|#!/usr/bin/env python|#!/usr/bin/env python2|'
-}
Copied: tellico/repos/community-x86_64/PKGBUILD (from rev 452067, tellico/trunk/PKGBUILD)
===================================================================
--- PKGBUILD (rev 0)
+++ PKGBUILD 2019-04-19 21:13:57 UTC (rev 452068)
@@ -0,0 +1,43 @@
+# Maintainer: Jaroslav Lichtblau <svetlemodry at archlinux.org>
+# Contributor: Ray Rashif <schiv at archlinux.org
+# Contributor: Andrea Scarpino <andrea at archlinux.org>
+# Contributor: Douglas Soares de Andrade <dsa at aur.archlinux.org>
+
+pkgname=tellico
+pkgver=3.1.4
+pkgrel=3
+pkgdesc="A collection manager for KDE"
+arch=('x86_64')
+url="http://tellico-project.org/"
+license=('GPL')
+depends=('exempi' 'hicolor-icon-theme' 'kio' 'libksane' 'libkcddb' 'libcddb'
+ 'libcdio' 'kfilemetadata' 'knewstuff' 'kxmlgui' 'kitemmodels'
+ 'python2' 'solid' 'khtml' 'yaz' 'taglib' 'poppler-qt5' 'qt5-base')
+makedepends=('cmake' 'extra-cmake-modules' 'kdoctools' 'libkcddb')
+changelog=$pkgname.changelog
+source=(http://tellico-project.org/files/$pkgname-$pkgver.tar.xz
+ compilefix.diff)
+sha256sums=('8f611e3be8be095de38fe27d76f3ddeae09962c9aec00298031cc3e71eae95f9'
+ '7f0a13e2047b61b104dfc38e456e6d51808d3f5080e0aff97e75d6a161327069')
+
+prepare() {
+ cd $pkgname-$pkgver
+
+ # Fix "error: template with C linkage"
+ patch -Np1 -i ../compilefix.diff
+}
+
+build() {
+ cmake -H$pkgname-$pkgver -Bbuild \
+ -DCMAKE_BUILD_TYPE=Release \
+ -DCMAKE_INSTALL_PREFIX=/usr \
+ -DWITH_Nepomuk=OFF
+ cmake --build build
+}
+
+package() {
+ DESTDIR="${pkgdir}" cmake --build build --target install
+
+ # fix python 2.7 path
+ find "${pkgdir}" -iname "*.py" | xargs sed -i 's|#!/usr/bin/env python|#!/usr/bin/env python2|'
+}
Copied: tellico/repos/community-x86_64/compilefix.diff (from rev 452067, tellico/trunk/compilefix.diff)
===================================================================
--- compilefix.diff (rev 0)
+++ compilefix.diff 2019-04-19 21:13:57 UTC (rev 452068)
@@ -0,0 +1,128 @@
+diff -u -r tellico-3.1.4/src/barcode/barcode_v4l.cpp tellico-3.1.4-compilefix/src/barcode/barcode_v4l.cpp
+--- tellico-3.1.4/src/barcode/barcode_v4l.cpp 2018-12-19 01:27:45.878263787 +0000
++++ tellico-3.1.4-compilefix/src/barcode/barcode_v4l.cpp 2019-04-19 21:00:33.821249938 +0000
+@@ -31,9 +31,7 @@
+ #include <errno.h>
+ #include <sys/ioctl.h>
+
+-extern "C" {
+ #include <libv4l1.h>
+-}
+
+ using barcodeRecognition::barcode_v4l;
+
+diff -u -r tellico-3.1.4/src/fetch/z3950connection.cpp tellico-3.1.4-compilefix/src/fetch/z3950connection.cpp
+--- tellico-3.1.4/src/fetch/z3950connection.cpp 2018-12-19 01:27:45.898264238 +0000
++++ tellico-3.1.4-compilefix/src/fetch/z3950connection.cpp 2019-04-19 21:00:07.934520303 +0000
+@@ -38,11 +38,9 @@
+ #include <QApplication>
+
+ #ifdef HAVE_YAZ
+-extern "C" {
+ #include <yaz/zoom.h>
+ #include <yaz/marcdisp.h>
+ #include <yaz/yaz-version.h>
+-}
+ #endif
+
+ namespace {
+diff -u -r tellico-3.1.4/src/translators/bibteximporter.h tellico-3.1.4-compilefix/src/translators/bibteximporter.h
+--- tellico-3.1.4/src/translators/bibteximporter.h 2018-12-19 01:27:45.930264959 +0000
++++ tellico-3.1.4-compilefix/src/translators/bibteximporter.h 2019-04-19 20:57:10.950756820 +0000
+@@ -29,7 +29,6 @@
+ #include "../datavectors.h"
+
+ #include <config.h>
+-extern "C" {
+ #ifdef HAVE_LIBBTPARSE
+ /* btparse has a struct member 'class' */
+ #define class errclass
+@@ -38,7 +37,6 @@
+ #else
+ #include "btparse/btparse.h"
+ #endif
+-}
+
+ #include <QList>
+ #include <QHash>
+diff -u -r tellico-3.1.4/src/translators/csvparser.cpp tellico-3.1.4-compilefix/src/translators/csvparser.cpp
+--- tellico-3.1.4/src/translators/csvparser.cpp 2018-12-19 01:27:45.930264959 +0000
++++ tellico-3.1.4-compilefix/src/translators/csvparser.cpp 2019-04-19 20:55:35.283857957 +0000
+@@ -29,13 +29,11 @@
+
+ #include <config.h>
+
+-extern "C" {
+ #ifdef HAVE_LIBCSV
+ #include <csv.h>
+ #else
+ #include "libcsv/libcsv.h"
+ #endif
+-}
+
+ typedef int(*SpaceFunc)(char);
+
+diff -u -r tellico-3.1.4/src/translators/freedb_util.cpp tellico-3.1.4-compilefix/src/translators/freedb_util.cpp
+--- tellico-3.1.4/src/translators/freedb_util.cpp 2018-12-19 01:27:45.930264959 +0000
++++ tellico-3.1.4-compilefix/src/translators/freedb_util.cpp 2019-04-19 20:54:32.787039744 +0000
+@@ -29,12 +29,10 @@
+
+ #include <QList>
+
+-extern "C" {
+ #ifdef HAVE_CDIO
+ #include <cdio/cdio.h>
+ #include <cdio/cdtext.h>
+ #endif
+-}
+
+ namespace {
+ #ifdef HAVE_CDIO
+diff -u -r tellico-3.1.4/src/translators/htmlexporter.cpp tellico-3.1.4-compilefix/src/translators/htmlexporter.cpp
+--- tellico-3.1.4/src/translators/htmlexporter.cpp 2018-12-19 01:27:45.934265049 +0000
++++ tellico-3.1.4-compilefix/src/translators/htmlexporter.cpp 2019-04-19 20:53:32.223559678 +0000
+@@ -61,10 +61,8 @@
+ #include <QApplication>
+ #include <QLocale>
+
+-extern "C" {
+ #include <libxml/HTMLparser.h>
+ #include <libxml/HTMLtree.h>
+-}
+
+ using Tellico::Export::HTMLExporter;
+
+diff -u -r tellico-3.1.4/src/translators/xslthandler.cpp tellico-3.1.4-compilefix/src/translators/xslthandler.cpp
+--- tellico-3.1.4/src/translators/xslthandler.cpp 2018-12-19 01:27:45.934265049 +0000
++++ tellico-3.1.4-compilefix/src/translators/xslthandler.cpp 2019-04-19 20:56:02.820591433 +0000
+@@ -32,14 +32,12 @@
+ #include <QTextCodec>
+ #include <QVector>
+
+-extern "C" {
+ #include <libxslt/xslt.h>
+ #include <libxslt/transform.h>
+ #include <libxslt/xsltutils.h>
+ #include <libxslt/extensions.h>
+
+ #include <libexslt/exslt.h>
+-}
+
+ // I don't want any network I/O at all
+ static const int xml_options = XML_PARSE_NOENT | XML_PARSE_NONET | XML_PARSE_NOCDATA;
+diff -u -r tellico-3.1.4/src/translators/xslthandler.h tellico-3.1.4-compilefix/src/translators/xslthandler.h
+--- tellico-3.1.4/src/translators/xslthandler.h 2018-12-19 01:27:45.934265049 +0000
++++ tellico-3.1.4-compilefix/src/translators/xslthandler.h 2019-04-19 20:52:38.586763182 +0000
+@@ -29,12 +29,10 @@
+ #include <QHash>
+ #include <QString>
+
+-extern "C" {
+ // for xmlDocPtr
+ #include <libxml/tree.h>
+ // for xsltStyleSheetPtr
+ #include <libxslt/xsltInternals.h>
+-}
+
+ class QUrl;
+ class QDomDocument;
Deleted: tellico.changelog
===================================================================
--- tellico.changelog 2019-04-19 21:13:43 UTC (rev 452067)
+++ tellico.changelog 2019-04-19 21:13:57 UTC (rev 452068)
@@ -1,59 +0,0 @@
-2018-12-20 Jaroslav Lichtblau <svetlemodry at archlinux.org>
- * tellico 3.1.4-1
-
-2018-09-13 Jaroslav Lichtblau <svetlemodry at archlinux.org>
- * tellico 3.1.3-1
-
-2018-04-02 Jaroslav Lichtblau <svetlemodry at archlinux.org>
- * tellico 3.1.2-1
-
-2018-01-16 Jaroslav Lichtblau <svetlemodry at archlinux.org>
- * tellico 3.1.1-1
-
-2018-01-11 Jaroslav Lichtblau <svetlemodry at archlinux.org>
- * tellico 3.1-3 libcdio API and ABI changes rebuild
-
-2017-12-02 Jaroslav Lichtblau <svetlemodry at archlinux.org>
- * tellico 3.1-2 FS#56026 fix
-
-2017-10-18 Jaroslav Lichtblau <svetlemodry at archlinux.org>
- * tellico 3.1-1
-
-2017-03-31 Jaroslav Lichtblau <svetlemodry at archlinux.org>
- * tellico 3.0.2-1
-
-2017-02-21 Jaroslav Lichtblau <svetlemodry at archlinux.org>
- * tellico 3.0.1-1
-
-2016-12-20 Jaroslav Lichtblau <svetlemodry at archlinux.org>
- * tellico 3.0-4 FS#52202 fix
-
-2016-12-18 Jaroslav Lichtblau <svetlemodry at archlinux.org>
- * tellico 3.0-3 FS#52188 fix
-
-2016-11-09 Jaroslav Lichtblau <svetlemodry at archlinux.org>
- * tellico 3.0-1
-
-2016-04-30 Jaroslav Lichtblau <svetlemodry at archlinux.org>
- * tellico 2.3.11-2 pacman hooks rebuild
-
-2015-12-11 Jaroslav Lichtblau <svetlemodry at archlinux.org>
- * tellico 2.3.11-1
-
-2015-02-16 Jaroslav Lichtblau <svetlemodry at archlinux.org>
- * tellico 2.3.10-1
-
-2014-06-28 Jaroslav Lichtblau <svetlemodry at archlinux.org>
- * tellico 2.3.9-1
-
-2014-03-09 Andrea Scarpino <andrea at archlinux.org>
- * tellico 2.3.8-5 be sure Nepomuk support is disabled
-
-2014-03-09 Jaroslav Lichtblau <svetlemodry at archlinux.org>
- * tellico 2.3.8-4 nepomuk support dropped in KDE SC 4.13 packages
-
-2013-07-14 Jaroslav Lichtblau <svetlemodry at archlinux.org>
- * tellico 2.3.8-1
-
-2013-01-30 Jaroslav Lichtblau <svetlemodry at archlinux.org>
- * tellico 2.3.7-1
Copied: tellico/repos/community-x86_64/tellico.changelog (from rev 452067, tellico/trunk/tellico.changelog)
===================================================================
--- tellico.changelog (rev 0)
+++ tellico.changelog 2019-04-19 21:13:57 UTC (rev 452068)
@@ -0,0 +1,59 @@
+2018-12-20 Jaroslav Lichtblau <svetlemodry at archlinux.org>
+ * tellico 3.1.4-1
+
+2018-09-13 Jaroslav Lichtblau <svetlemodry at archlinux.org>
+ * tellico 3.1.3-1
+
+2018-04-02 Jaroslav Lichtblau <svetlemodry at archlinux.org>
+ * tellico 3.1.2-1
+
+2018-01-16 Jaroslav Lichtblau <svetlemodry at archlinux.org>
+ * tellico 3.1.1-1
+
+2018-01-11 Jaroslav Lichtblau <svetlemodry at archlinux.org>
+ * tellico 3.1-3 libcdio API and ABI changes rebuild
+
+2017-12-02 Jaroslav Lichtblau <svetlemodry at archlinux.org>
+ * tellico 3.1-2 FS#56026 fix
+
+2017-10-18 Jaroslav Lichtblau <svetlemodry at archlinux.org>
+ * tellico 3.1-1
+
+2017-03-31 Jaroslav Lichtblau <svetlemodry at archlinux.org>
+ * tellico 3.0.2-1
+
+2017-02-21 Jaroslav Lichtblau <svetlemodry at archlinux.org>
+ * tellico 3.0.1-1
+
+2016-12-20 Jaroslav Lichtblau <svetlemodry at archlinux.org>
+ * tellico 3.0-4 FS#52202 fix
+
+2016-12-18 Jaroslav Lichtblau <svetlemodry at archlinux.org>
+ * tellico 3.0-3 FS#52188 fix
+
+2016-11-09 Jaroslav Lichtblau <svetlemodry at archlinux.org>
+ * tellico 3.0-1
+
+2016-04-30 Jaroslav Lichtblau <svetlemodry at archlinux.org>
+ * tellico 2.3.11-2 pacman hooks rebuild
+
+2015-12-11 Jaroslav Lichtblau <svetlemodry at archlinux.org>
+ * tellico 2.3.11-1
+
+2015-02-16 Jaroslav Lichtblau <svetlemodry at archlinux.org>
+ * tellico 2.3.10-1
+
+2014-06-28 Jaroslav Lichtblau <svetlemodry at archlinux.org>
+ * tellico 2.3.9-1
+
+2014-03-09 Andrea Scarpino <andrea at archlinux.org>
+ * tellico 2.3.8-5 be sure Nepomuk support is disabled
+
+2014-03-09 Jaroslav Lichtblau <svetlemodry at archlinux.org>
+ * tellico 2.3.8-4 nepomuk support dropped in KDE SC 4.13 packages
+
+2013-07-14 Jaroslav Lichtblau <svetlemodry at archlinux.org>
+ * tellico 2.3.8-1
+
+2013-01-30 Jaroslav Lichtblau <svetlemodry at archlinux.org>
+ * tellico 2.3.7-1
More information about the arch-commits
mailing list