From 13e41520791a0e192689a814cea3f17cd7d747db Mon Sep 17 00:00:00 2001 From: Chaoting Liu Date: Fri, 19 Oct 2018 19:37:27 +0200 Subject: [PATCH] rekonq: update to framework --- libksane4/PKGBUILD | 38 ------------------------------------- libksane4/libksane4.install | 11 ----------- rekonq/PKGBUILD | 35 ++++++++++++++++++---------------- rekonq/rekonq.install | 11 ----------- 4 files changed, 19 insertions(+), 76 deletions(-) delete mode 100644 libksane4/PKGBUILD delete mode 100644 libksane4/libksane4.install delete mode 100644 rekonq/rekonq.install diff --git a/libksane4/PKGBUILD b/libksane4/PKGBUILD deleted file mode 100644 index 1ea65afec..000000000 --- a/libksane4/PKGBUILD +++ /dev/null @@ -1,38 +0,0 @@ - -pkgname=libksane4 -_pkgname=libksane -pkgver=15.08.3 -pkgrel=4 -pkgdesc="An image scanning library" -url="https://projects.kde.org/projects/kde/kdegraphics/libs/libksane" -arch=(x86_64) -license=(GPL LGPL FDL) -depends=(kdelibs sane) -makedepends=(cmake automoc4) -replaces=('kdegraphics-libksane' 'libksane<15.11') -conflicts=('kdegraphics-libksane' 'libksane<15.11') -provides=('kdegraphics-libksane') -install=$pkgname.install -source=("http://download.kde.org/stable/applications/$pkgver/src/$_pkgname-$pkgver.tar.xz") -sha1sums=('2707d84bdcd0ec568ff47066012c3086b07477cc') - -prepare() { - mkdir -p build -} - -build() { - cd build - cmake ../$_pkgname-$pkgver \ - -DCMAKE_BUILD_TYPE=Release \ - -DKDE4_BUILD_TESTS=OFF \ - -DCMAKE_INSTALL_PREFIX=/usr - make -} - -package() { - cd build - make DESTDIR="$pkgdir" install - - # Fix conflicts with libksane>=16.04 - rm -r "$pkgdir"/usr/share -} diff --git a/libksane4/libksane4.install b/libksane4/libksane4.install deleted file mode 100644 index e70c054ec..000000000 --- a/libksane4/libksane4.install +++ /dev/null @@ -1,11 +0,0 @@ -post_install() { - xdg-icon-resource forceupdate --theme hicolor &> /dev/null -} - -post_upgrade() { - post_install -} - -post_remove() { - post_install -} diff --git a/rekonq/PKGBUILD b/rekonq/PKGBUILD index 2cb21af27..ab050d36c 100644 --- a/rekonq/PKGBUILD +++ b/rekonq/PKGBUILD @@ -1,36 +1,39 @@ pkgname=rekonq -pkgver=2.4.2 -pkgrel=6 +pkgver=2.4.2.d8806512 +pkgrel=1 pkgdesc='A WebKit based web browser for KDE' arch=('x86_64') url='http://rekonq.kde.org/' license=('GPL') -depends=('kdelibs' 'qca-ossl') -makedepends=('cmake' 'automoc4' 'docbook-xsl') +depends=('kcmutils' 'kdewebkit' 'kinit') +makedepends=('extra-cmake-modules' 'git') categories=('network') screenshot=('http://rekonq.kde.org/sites/rekonq.kde.org/files/images/Rekonq-0.6.0.png') -install=${pkgname}.install options=("debug") -source=("http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.xz" +source=("git://anongit.kde.org/rekonq.git#branch=frameworks" 'background.png' 'background.diff' 'searchengine.diff') -md5sums=('5d2a5ce7817813f68144203c14419669' +md5sums=('SKIP' 'cd493df91e34030a8195eaf8b6d68140' '71851e61d3282c6b5d1b20ccdc3ab6e3' '7ab9dc2e4397a66c7a64e08265171996') -build(){ - cd ${srcdir}/${pkgname}-${pkgver} +prepare() { + cd ${srcdir}/${pkgname} # Chakra theme: patch -p1 -i "${srcdir}/background.diff" - + cd ${srcdir} - mkdir -p build + mkdir -p build +} + +build(){ cd build - cmake ../${pkgname}-${pkgver} \ - -DCMAKE_BUILD_TYPE=RelWithDebInfo \ - -DCMAKE_INSTALL_PREFIX=/usr + cmake ../${pkgname} \ + -DCMAKE_INSTALL_PREFIX=/usr \ + -DCMAKE_BUILD_TYPE=Release \ + -DLIB_INSTALL_DIR=lib make } @@ -38,6 +41,6 @@ package() { cd ${srcdir}/build make DESTDIR=${pkgdir} install - rm ${pkgdir}/usr/share/apps/rekonq/pics/background.png - #install -m 644 -p ${srcdir}/background.png ${pkgdir}/usr/share/apps/rekonq/pics/background.png + rm ${pkgdir}/usr/share/rekonq/pics/background.png + install -m 644 -p ${srcdir}/background.png ${pkgdir}/usr/share/rekonq/pics/background.png } diff --git a/rekonq/rekonq.install b/rekonq/rekonq.install deleted file mode 100644 index e70c054ec..000000000 --- a/rekonq/rekonq.install +++ /dev/null @@ -1,11 +0,0 @@ -post_install() { - xdg-icon-resource forceupdate --theme hicolor &> /dev/null -} - -post_upgrade() { - post_install -} - -post_remove() { - post_install -}