From 0d5fb4d9c0e903bd3fbd90f6a4fa10087d84c428 Mon Sep 17 00:00:00 2001 From: David P Date: Mon, 8 May 2017 12:02:01 -0300 Subject: Fixed some things in AppArmor OpenRC init script --- pcr/apparmor-openrc/PKGBUILD | 10 +++++----- pcr/apparmor-openrc/apparmor-init | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/pcr/apparmor-openrc/PKGBUILD b/pcr/apparmor-openrc/PKGBUILD index ccf78fa01..bd8db8b14 100644 --- a/pcr/apparmor-openrc/PKGBUILD +++ b/pcr/apparmor-openrc/PKGBUILD @@ -2,7 +2,7 @@ pkgname=apparmor-openrc pkgver=20160816 -pkgrel=1 +pkgrel=2 pkgdesc="OpenRC apparmor init script" arch=('any') url="http://apparmor.net/" @@ -11,11 +11,11 @@ depends=('apparmor' 'openrc') install='apparmor.install' _filename='apparmor-init' source=("https://gitweb.gentoo.org/repo/gentoo.git/plain/sys-apps/apparmor/files/$_filename") -sha256sums=('6357f9645587de19c46d824215ca4c3be99c488e8da9bd0e403b69e33ba8ed07') +sha256sums=('fb8d7b46e682b452ba3061cca6eaf32b6a8f542208e35ea823e8c9c3bc89f764') -pkgver() { - date +%Y%m%d -} +#pkgver() { +# date +%Y%m%d +#} _inst_initd(){ install -Dm755 ${srcdir}/$1.initd ${pkgdir}/etc/init.d/$1 diff --git a/pcr/apparmor-openrc/apparmor-init b/pcr/apparmor-openrc/apparmor-init index 48877e4b6..2c7836b48 100644 --- a/pcr/apparmor-openrc/apparmor-init +++ b/pcr/apparmor-openrc/apparmor-init @@ -56,7 +56,7 @@ aa_log_end_msg() { eend $1 } -. /usr/libexec/rc.apparmor.functions +. /usr/lib/apparmor/rc.apparmor.functions start() { ebegin "Starting AppArmor" -- cgit v1.2.3 From 1b0d520a56890414e0b2321f413bdd061e421002 Mon Sep 17 00:00:00 2001 From: David P Date: Mon, 8 May 2017 12:15:37 -0300 Subject: Updated Apparmor This is an update for the apparmor package --- pcr/apparmor/PKGBUILD | 51 +++++++++++++++++++++++------------------ pcr/apparmor/apparmor_load.sh | 2 +- pcr/apparmor/apparmor_unload.sh | 5 +--- 3 files changed, 31 insertions(+), 27 deletions(-) diff --git a/pcr/apparmor/PKGBUILD b/pcr/apparmor/PKGBUILD index 070f4c64f..def30d3e4 100644 --- a/pcr/apparmor/PKGBUILD +++ b/pcr/apparmor/PKGBUILD @@ -1,36 +1,43 @@ -# Mantainer (Arch): Thomas Kuther -# Contributor (Arch): Gianni Vialetto -# Contributor (Arch): Paul N. Maxwell -# Contributor (Arch): Thomas Mudrunka -# Contributor (Arch): Max Fierke -# Maintainer: Omar Vega Ramos +# Maintainer: David P. +# Contributor: Omar Vega Ramos +# Contributor: Marcin Wieczorek +# Contributor: Thomas Kuther +# Contributor: Gianni Vialetto +# Contributor: Paul N. Maxwell +# Contributor: Thomas Mudrunka +# Contributor: Max Fierke pkgbase=apparmor pkgname=($pkgbase apparmor-parser apparmor-libapparmor apparmor-utils apparmor-profiles apparmor-pam apparmor-vim) -pkgver=2.10 +pkgver=2.11.0 #_majorver=${pkgver%.*} # bleh, AUR... -_majorver=2.10 -pkgrel=2 +_majorver=2.11 +pkgrel=1 pkgdesc='Linux application security framework - mandatory access control for programs' arch=('i686' 'x86_64') license=('GPL') url='http://wiki.apparmor.net/index.php/Main_Page' -makedepends=('bzr' 'flex' 'swig' 'perl' 'python' 'perl-locale-gettext' 'perl-rpc-xml' 'audit') +makedepends=('flex' 'swig' 'perl' 'python' 'perl-locale-gettext' 'perl-rpc-xml' 'audit') -source=("https://launchpad.net/$pkgname/${_majorver}/$pkgver/+download/$pkgname-$pkgver.tar.gz" +source=(https://launchpad.net/$pkgname/${_majorver}/${_majorver}/+download/${pkgname}-${pkgver}.tar.gz{,.asc} "apparmor_load.sh" "apparmor_unload.sh" "apparmor.service") -sha256sums=('4d0e224257a29671b694bd9054edf0dd213aa690fd02844ecf3329b86ac506f4' - 'd2fea5a62bacae350cfe56bad1b293c12afe803bec10e546b901324e582e89af' - '076aebfa815543f85d26215056a921996fbff14d1678ddfa07ab50dbfda94ba1' +sha256sums=('b1c489ea11e7771b8e6b181532cafbf9ebe6603e3cb00e2558f21b7a5bdd739a' + 'SKIP' + '124300162dab2a923c024b91c5a977dbee901376a22eefc64cad2f91319876d5' + '9704478ae13fe1c3fb2747afac86c31b1b4593493f0e1425ae2b77d47878e32e' 'eea47ec2a3fb0c1104193bed91586cfccda745f2e0a473f6d1d2a0d2fe42c413') +# 3D3664BB: AppArmor Development Team (AppArmor signing key) +validpgpkeys=('3ECDCBA5FB34D254961CC53F6689E64E3D3664BB') + #Configuration core_perl_dir='/usr/bin/core_perl' export MAKEFLAGS+=" POD2MAN=${core_perl_dir}/pod2man" export MAKEFLAGS+=" POD2HTML=${core_perl_dir}/pod2html" +export MAKEFLAGS+=" PODCHECKER=${core_perl_dir}/podchecker" export MAKEFLAGS+=" PROVE=${core_perl_dir}/prove" export MAKEFLAGS+=" PYTHON=python3" @@ -52,7 +59,7 @@ prepare() { cd "${srcdir}/${pkgbase}-${pkgver}/profiles/apparmor.d" # /usr merge vs. profiles for i in `find . -name "*sbin*"`; do sed -i -e 's@sbin@bin@g' ${i} && mv ${i} ${i/sbin/bin}; done - for i in klogd ping syslog-ng syslogd; do + for i in klogd ping syslog-ng syslogd; do sed -e "s@/bin/${i}@/usr/bin/${i}@g" \ -e "s@bin\.${i}@usr\.bin\.${i}@g" \ -i bin.${i} && \ @@ -94,7 +101,7 @@ package_apparmor() { package_apparmor-parser() { pkgdesc='AppArmor parser - loads AA profiles to kernel module' - depends=('apparmor-libapparmor' 'bash') + depends=('apparmor-libapparmor') cd "${srcdir}/${pkgbase}-${pkgver}" make -C parser install DESTDIR=${pkgdir} @@ -108,18 +115,18 @@ package_apparmor-libapparmor() { depends=('python') cd "${srcdir}/${pkgbase}-${pkgver}" - make -C libraries/libapparmor install DESTDIR=${pkgdir} + make -C libraries/libapparmor install DESTDIR="${pkgdir}" install -D -m644 "libraries/libapparmor/swig/perl/LibAppArmor.pm" "${pkgdir}/usr/lib/perl5/vendor_perl/" } package_apparmor-utils() { pkgdesc='AppArmor userspace utilities' - depends=('perl' 'perl-locale-gettext' 'perl-term-readkey' - 'perl-file-tail' 'perl-rpc-xml' 'python' 'bash') + depends=('perl' 'perl-locale-gettext' 'perl-term-readkey' + 'perl-file-tail' 'perl-rpc-xml' 'python') install='apparmor-utils.install' cd "${srcdir}/${pkgbase}-${pkgver}" - make -C utils install DESTDIR=${pkgdir} BINDIR=${pkgdir}/usr/bin + make -C utils install DESTDIR="${pkgdir}" BINDIR="${pkgdir}/usr/bin" install -D -m755 "${srcdir}/apparmor_load.sh" "${pkgdir}/usr/bin/apparmor_load.sh" install -D -m755 "${srcdir}/apparmor_unload.sh" "${pkgdir}/usr/bin/apparmor_unload.sh" install -D -m644 "${srcdir}/apparmor.service" "${pkgdir}/usr/lib/systemd/system/apparmor.service" @@ -135,7 +142,7 @@ package_apparmor-profiles() { backup=(`echo ${_profiles[@]}`) cd "${srcdir}/${pkgbase}-${pkgver}" - make -C profiles install DESTDIR=${pkgdir} + make -C profiles install DESTDIR="${pkgdir}" } package_apparmor-pam() { @@ -143,7 +150,7 @@ package_apparmor-pam() { depends=('apparmor-libapparmor' 'pam') cd "${srcdir}/${pkgbase}-${pkgver}" - make -C changehat/pam_apparmor install DESTDIR=${pkgdir}/usr + make -C changehat/pam_apparmor install DESTDIR="${pkgdir}/usr" install -D -m644 changehat/pam_apparmor/README "${pkgdir}/usr/share/doc/apparmor/README.pam_apparmor" } package_apparmor-vim() { diff --git a/pcr/apparmor/apparmor_load.sh b/pcr/apparmor/apparmor_load.sh index 30ce04086..663ebc045 100644 --- a/pcr/apparmor/apparmor_load.sh +++ b/pcr/apparmor/apparmor_load.sh @@ -2,4 +2,4 @@ aa_profiles='/etc/apparmor.d/' aa_log='/var/log/apparmor.init.log' -/usr/bin/apparmor_parser -r $(find "$aa_profiles" -maxdepth 1 -type f) 2>> "$aa_log" +find "$aa_profiles" -maxdepth 1 -type f -exec /usr/bin/apparmor_parser -r {} + 2>> "$aa_log" diff --git a/pcr/apparmor/apparmor_unload.sh b/pcr/apparmor/apparmor_unload.sh index de13938ab..f2d987dc2 100644 --- a/pcr/apparmor/apparmor_unload.sh +++ b/pcr/apparmor/apparmor_unload.sh @@ -2,7 +2,4 @@ aa_profiles='/etc/apparmor.d/' aa_log='/var/log/apparmor.init.log' -PROFILES=`find "$aa_profiles" -maxdepth 1 -type f` -for profile in $PROFILES; do - apparmor_parser -R "$profile" 2>> "$aa_log" -done +find "$aa_profiles" -maxdepth 1 -type f -exec /usr/bin/apparmor_parser -R {} \; 2>> "$aa_log" -- cgit v1.2.3 From cf107ba5b7bd235ccd6acc2243ad51d73199d43f Mon Sep 17 00:00:00 2001 From: David P Date: Mon, 8 May 2017 13:48:08 -0300 Subject: Updated arno-iptables-firewall Updated the checksums and fixed the url variable --- pcr/arno-iptables-firewall/PKGBUILD | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pcr/arno-iptables-firewall/PKGBUILD b/pcr/arno-iptables-firewall/PKGBUILD index 38cd370b4..368f5c160 100644 --- a/pcr/arno-iptables-firewall/PKGBUILD +++ b/pcr/arno-iptables-firewall/PKGBUILD @@ -7,7 +7,7 @@ pkgver=2.0.1e pkgrel=1 pkgdesc="A secure stateful firewall for both single and multi-homed machine" arch=('any') -url=(http://rocky.eld.leidenuniv.nl/joomla/) +url='http://rocky.eld.leidenuniv.nl/joomla/' license=('GPL') depends=('iptables' 'iproute2') makedepends=('patch') @@ -67,3 +67,6 @@ package() { # systemd script install -D -m 0644 ${srcdir}/${pkgname}.service ${pkgdir}/usr/lib/systemd/system/${pkgname}.service } +md5sums=('8adb951fb5bc40a6dbe57fb1f1f2c4c6' + 'd4c8252c8b8ee53132bffc9b5912f89a' + '7384fbc95f69f10d5d6e4c7ff89b92dc') -- cgit v1.2.3 From 7dad8cba7a5e894f80e65314d368ac311524e405 Mon Sep 17 00:00:00 2001 From: David P Date: Mon, 8 May 2017 13:54:47 -0300 Subject: Fixed aurvote and added checksums --- pcr/aurvote/PKGBUILD | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pcr/aurvote/PKGBUILD b/pcr/aurvote/PKGBUILD index 25dd1887d..da55eb338 100644 --- a/pcr/aurvote/PKGBUILD +++ b/pcr/aurvote/PKGBUILD @@ -6,10 +6,11 @@ pkgver=1.6 pkgrel=1 pkgdesc="Tool to vote for favorite AUR packages" url="http://git.archlinux.fr/aurvote.git/" -license="GPL" +license=('GPL') arch=('any') depends=('curl') source=($pkgname) +md5sums=('03d149edf8b691578e0da1972de6f448') package() { install -D -m 755 "$srcdir/$pkgname" "$pkgdir/usr/bin/$pkgname" -- cgit v1.2.3 From d0395dedc45a57584309d7d8b24e012061354d9d Mon Sep 17 00:00:00 2001 From: David P Date: Mon, 8 May 2017 17:46:37 -0300 Subject: Added cadabra2 --- pcr/cadabra2/PKGBUILD | 35 +++++++++++++++++++++++++++++++++++ pcr/cadabra2/package.install | 11 +++++++++++ pcr/cadabra2/package.patch | 28 ++++++++++++++++++++++++++++ 3 files changed, 74 insertions(+) create mode 100644 pcr/cadabra2/PKGBUILD create mode 100644 pcr/cadabra2/package.install create mode 100644 pcr/cadabra2/package.patch diff --git a/pcr/cadabra2/PKGBUILD b/pcr/cadabra2/PKGBUILD new file mode 100644 index 000000000..394910098 --- /dev/null +++ b/pcr/cadabra2/PKGBUILD @@ -0,0 +1,35 @@ +# Maintainer: David P. +# Contributor: Tarn Burton + +pkgname='cadabra2' +pkgver=2.1.4 +pkgrel=1 +pkgdesc="A computer algebra system designed specifically for the solution of problems encountered in field theory." +arch=('i686' 'x86_64') +url="http://cadabra.science/" +license=('GPL') +conflicts=('cadabra2-git') +depends=('python-matplotlib' 'gtkmm3' 'jsoncpp' 'mathjax' 'boost-libs' 'python-sympy' 'texlive-core') +makedepends=('cmake' 'boost' 'git') +source=("$pkgname::git+https://github.com/kpeeters/cadabra2#tag=$pkgver" "package.patch") +md5sums=('SKIP' + '2cf414a7280fd64858d1d19d38d4bd8c') +install=package.install + +prepare() { + cd "${srcdir}/${pkgname}" + patch -Np1 -i ../package.patch +} + +build() { + cd $pkgname + mkdir -p build + cd build + cmake -DCMAKE_SKIP_RPATH=true -DCMAKE_INSTALL_PREFIX=/usr .. + make +} + +package() { + cd "${pkgname}/build" + make DESTDIR="${pkgdir}" install +} diff --git a/pcr/cadabra2/package.install b/pcr/cadabra2/package.install new file mode 100644 index 000000000..bcc3dee5a --- /dev/null +++ b/pcr/cadabra2/package.install @@ -0,0 +1,11 @@ +post_install() { + mktexlsr +} + +post_upgrade() { + post_install $1 +} + +post_remove() { + post_install $1 +} diff --git a/pcr/cadabra2/package.patch b/pcr/cadabra2/package.patch new file mode 100644 index 000000000..63320f971 --- /dev/null +++ b/pcr/cadabra2/package.patch @@ -0,0 +1,28 @@ +diff -aur -bZwB -x .git cadabra2.old/frontend/CMakeLists.txt cadabra2/frontend/CMakeLists.txt +--- cadabra2.old/frontend/CMakeLists.txt 2017-01-29 09:40:31.904324635 -0500 ++++ cadabra2/frontend/CMakeLists.txt 2017-01-29 09:40:54.937598647 -0500 +@@ -25,8 +25,8 @@ + execute_process(COMMAND kpsewhich -var-value=TEXMFLOCAL OUTPUT_VARIABLE INSTALL_LATEX_DIR OUTPUT_STRIP_TRAILING_WHITESPACE) + endif() + # Get the last path in the LaTeX install dir, if there is more than one separated by a ':'. +-#string(REPLACE ":" ";" INSTALL_LATEX_DIR "${INSTALL_LATEX_DIR}") +-#list(GET INSTALL_LATEX_DIR -1 INSTALL_LATEX_DIR) ++string(REPLACE ":" ";" INSTALL_LATEX_DIR "${INSTALL_LATEX_DIR}") ++list(GET INSTALL_LATEX_DIR -1 INSTALL_LATEX_DIR) + set(INSTALL_LATEX_DIR "${INSTALL_LATEX_DIR}/tex/latex/cadabra2") + message("-- Installing LaTeX style files in ${INSTALL_LATEX_DIR}") + install(DIRECTORY DESTINATION ${INSTALL_LATEX_DIR} DIRECTORY_PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE +diff -aur -bZwB -x .git cadabra2.old/tests/CMakeLists.txt cadabra2/tests/CMakeLists.txt +--- cadabra2.old/tests/CMakeLists.txt 2017-01-29 09:40:31.907657960 -0500 ++++ cadabra2/tests/CMakeLists.txt 2017-01-29 09:40:54.937598647 -0500 +@@ -37,8 +37,8 @@ + foreach(NBTEST ${NBTESTS}) + add_custom_command(OUTPUT ${CDBOUT}/${NBTEST}.cdb + DEPENDS ${CNBIN}/${NBTEST}.cnb ${DC} +- COMMAND cadabra2cadabra +- ARGS ${CNBIN}/${NBTEST}.cnb ${CDBOUT}/${NBTEST}.cdb ++ COMMAND env ++ ARGS LD_LIBRARY_PATH=${CMAKE_BINARY_DIR}/client_server ${CMAKE_BINARY_DIR}/client_server/cadabra2cadabra ${CNBIN}/${NBTEST}.cnb ${CDBOUT}/${NBTEST}.cdb + COMMENT "Creating ${NBTEST} notebook...") + add_custom_target("${NBTEST}_test" ALL echo -n DEPENDS ${CDBOUT}/${NBTEST}.cdb) + add_test(${NBTEST} ${CMAKE_SOURCE_DIR}/core/cadabra2 ${CDBOUT}/${NBTEST}.cdb) -- cgit v1.2.3 From e0014343d0d6035b8468edf69bc9345afc56da9c Mon Sep 17 00:00:00 2001 From: David P Date: Mon, 8 May 2017 17:54:16 -0300 Subject: Fixed collada-dom PKGBUILD --- pcr/collada-dom/PKGBUILD | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pcr/collada-dom/PKGBUILD b/pcr/collada-dom/PKGBUILD index d4756c879..7e4ce717b 100644 --- a/pcr/collada-dom/PKGBUILD +++ b/pcr/collada-dom/PKGBUILD @@ -5,7 +5,7 @@ pkgver=2.4.0 pkgrel=4 pkgdesc="An API that provides a C++ object representation of a ${pkgname::7} XML instance document" url=http://sourceforge.net/projects/$pkgname -license=MIT +license=('MIT') arch=( mips64el x86_64 @@ -20,8 +20,8 @@ makedepends=( boost cmake ) -source=http://downloads.sf.net/$pkgname/$pkgname-$pkgver-libsrc.tgz -sha512sums=4c8cdc159acc89564b46615a0bc73a5ba84a1a5aa41d38661cd0e33a705ce5fd032e9a308fc89f93ec10620892067d757cbff8f1b9ce53da7626ea0e27b0eda5 +source=("http://downloads.sf.net/$pkgname/$pkgname-$pkgver-libsrc.tgz") +sha512sums=('4c8cdc159acc89564b46615a0bc73a5ba84a1a5aa41d38661cd0e33a705ce5fd032e9a308fc89f93ec10620892067d757cbff8f1b9ce53da7626ea0e27b0eda5') prepare() { cd $srcdir/$pkgname-$pkgver-libsrc -- cgit v1.2.3 From 0a460333cde2921bb6075fd5e1c18dfa4c5e8ada Mon Sep 17 00:00:00 2001 From: Jesús Eduardo Date: Mon, 8 May 2017 18:10:07 -0500 Subject: update calibre v2.84.0 --- ...Remove-code-that-contacts-calibre-servers-to-check-u.patch | 4 ++-- libre/calibre/PKGBUILD | 11 ++++++----- libre/calibre/libre.patch | 4 ++-- 3 files changed, 10 insertions(+), 9 deletions(-) diff --git a/libre/calibre/0001-Remove-code-that-contacts-calibre-servers-to-check-u.patch b/libre/calibre/0001-Remove-code-that-contacts-calibre-servers-to-check-u.patch index 9610b29f8..443d9968b 100644 --- a/libre/calibre/0001-Remove-code-that-contacts-calibre-servers-to-check-u.patch +++ b/libre/calibre/0001-Remove-code-that-contacts-calibre-servers-to-check-u.patch @@ -1,5 +1,5 @@ ---- calibre-2.83.0/src/calibre/gui2/update.py.orig 2017-04-26 14:55:30.824093338 -0300 -+++ calibre-2.83.0/src/calibre/gui2/update.py 2017-04-26 15:00:09.807495982 -0300 +--- calibre-2.84.0/src/calibre/gui2/update.py.orig 2017-04-26 14:55:30.824093338 -0300 ++++ calibre-2.84.0/src/calibre/gui2/update.py 2017-04-26 15:00:09.807495982 -0300 @@ -1,19 +1,17 @@ __license__ = 'GPL v3' __copyright__ = '2008, Kovid Goyal ' diff --git a/libre/calibre/PKGBUILD b/libre/calibre/PKGBUILD index de610dbbf..f4bfa672b 100644 --- a/libre/calibre/PKGBUILD +++ b/libre/calibre/PKGBUILD @@ -6,12 +6,12 @@ # Contributor (Arch): Andrea Fagiani # Contributor (Arch): Larry Hajali # Contributor (Arch): Eli Schwartz -# Maintainer: André Silva +# Contributor: André Silva # Contributor: Márcio Silva pkgname=calibre -pkgver=2.83.0 -pkgrel=2.parabola1 +pkgver=2.84.0 +pkgrel=1.parabola pkgdesc="Ebook management application, without nonfree decompression engine for RAR archives" arch=('i686' 'x86_64' 'armv7h') url="https://calibre-ebook.com/" @@ -35,13 +35,14 @@ mksource=("http://download.$pkgname-ebook.com/${pkgver}/$pkgname-${pkgver}.tar.x 'libre.patch' '0001-Remove-new_version_notification.patch' '0001-Remove-code-that-contacts-calibre-servers-to-check-u.patch') -source=("https://repo.parabola.nu/other/${pkgname}-libre/${pkgname}-libre-${pkgver}.tar.xz"{,.sig}) +source=("https://download.calibre-ebook.com/${pkgver}/calibre-${pkgver}.tar.xz" + "https://calibre-ebook.com/signatures/${pkgname}-${pkgver}.tar.xz.sig") mksha512sums=('a28aa52379bc317e648087b28859a8e2c50dd4e2ccb3352e135f896ad95ab9c85c1fba162fe3acd5056be80e7c4e9481ea1396cb638661cfdb27795051124821' 'SKIP' '14800a1895fd8a5e942e282688081c607730e866e825df53918c49d973ae3e6eb78a5d48354b6e1cf58953e8e0cf9ca030e9278ec296f8de222c9bd8b2945bf4' 'd95ea4e9911b62d466c2a590746c2a42c38834988bd505df7a0af3a76bde9d273f0ada405eb12ef0506da0a098d31adabe5b1b44acd23db8349ffd233d1c1b1d' 'f81c2f269399a44763ca77a5ceb4031ea0efd06e87b7c0e3a34cbf5765b0ee35ba66373a3d721bdfc947085994066cca77546bada2c39a6cbb5a4743a5c4fa04') -sha512sums=('cd1a2aea95e5d0b4f3ddf7a75e45da6076e1e3c56619dce38bbce4fb2533e792a663f7a8754e894da6ff5943349e375c58c0b11ac1f7b7f81e4a7c05de507423' +sha512sums=('83bd3b6393f7d7bf6f5bb8496444b5973df144dcf9be8d7e0b1fb21ec456a30c2abb5cf4090ecaa18cf97ffc9272e483a89ee3bbd294c5a31d1228e7b44fd275' 'SKIP') validpgpkeys=('3CE1780F78DD88DF45194FD706BC317B515ACE7C') diff --git a/libre/calibre/libre.patch b/libre/calibre/libre.patch index 739322d7a..06525e2a3 100644 --- a/libre/calibre/libre.patch +++ b/libre/calibre/libre.patch @@ -685,8 +685,8 @@ index fc85e1b7a..87b62caf3 100644 msgstr "" #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/comicconf.py:51 ---- calibre-2.83.0/resources/images.qrc.orig 2017-04-13 00:02:36.000000000 -0300 -+++ calibre-2.83.0/resources/images.qrc 2017-04-26 14:52:54.508461078 -0300 +--- calibre-2.84.0/resources/images.qrc.orig 2017-04-13 00:02:36.000000000 -0300 ++++ calibre-2.84.0/resources/images.qrc 2017-04-26 14:52:54.508461078 -0300 @@ -183,11 +183,9 @@ images/mimetypes/html.png images/mimetypes/xps.png -- cgit v1.2.3